Add remainder (modulus) arithmetic operator bvurem.

Along with tests of its conversion and the function application factory integrity.

Author: NlightNFotis

src/solvers/smt2_incremental/convert_expr_to_smt.cpp

@@ -360,9 +360,11 @@ static smt_termt convert_expr_to_smt(const ieee_float_op_exprt &float_operation)
 
 static smt_termt convert_expr_to_smt(const mod_exprt &truncation_modulo)
 {
-  UNIMPLEMENTED_FEATURE(
-    "Generation of SMT formula for truncation modulo expression: " +
-    truncation_modulo.pretty());
+  PRECONDITION(can_cast_type<bitvector_typet>(truncation_modulo.lhs().type()));
+  PRECONDITION(can_cast_type<bitvector_typet>(truncation_modulo.rhs().type()));
+  return smt_bit_vector_theoryt::remainder(
+    convert_expr_to_smt(truncation_modulo.lhs()),
+    convert_expr_to_smt(truncation_modulo.rhs()));
 }
 
 static smt_termt

src/solvers/smt2_incremental/smt_bit_vector_theory.cpp

@@ -146,3 +146,29 @@ void smt_bit_vector_theoryt::divisiont::validate(
 const smt_function_application_termt::factoryt<
   smt_bit_vector_theoryt::divisiont>
   smt_bit_vector_theoryt::division{};
+
+const char *smt_bit_vector_theoryt::remaindert::identifier()
+{
+  return "bvurem";
+}
+
+smt_sortt smt_bit_vector_theoryt::remaindert::return_sort(
+  const smt_termt &lhs,
+  const smt_termt &rhs)
+{
+  // For now, make sure that they have the same bit-width
+  remaindert::validate(lhs, rhs);
+  const auto width = lhs.get_sort().cast<smt_bit_vector_sortt>()->bit_width();
+  return smt_bit_vector_sortt{width};
+}
+
+void smt_bit_vector_theoryt::remaindert::validate(
+  const smt_termt &lhs,
+  const smt_termt &rhs)
+{
+  validate_bit_vector_predicate_arguments(lhs, rhs);
+}
+
+const smt_function_application_termt::factoryt<
+  smt_bit_vector_theoryt::remaindert>
+  smt_bit_vector_theoryt::remainder{};

src/solvers/smt2_incremental/smt_bit_vector_theory.h

@@ -54,6 +54,14 @@ class smt_bit_vector_theoryt
     static void validate(const smt_termt &lhs, const smt_termt &rhs);
   };
   static const smt_function_application_termt::factoryt<divisiont> division;
+
+  struct remaindert final
+  {
+    static const char *identifier();
+    static smt_sortt return_sort(const smt_termt &lhs, const smt_termt &rhs);
+    static void validate(const smt_termt &lhs, const smt_termt &rhs);
+  };
+  static const smt_function_application_termt::factoryt<remaindert> remainder;
 };
 
 #endif // CPROVER_SOLVERS_SMT2_INCREMENTAL_SMT_BIT_VECTOR_THEORY_H

unit/solvers/smt2_incremental/convert_expr_to_smt.cpp

@@ -347,4 +347,23 @@ TEST_CASE(
     const cbmc_invariants_should_throwt invariants_throw;
     REQUIRE_THROWS(convert_expr_to_smt(div_exprt{one_bvint, false_exprt{}}));
   }
+
+  SECTION(
+    "Unsigned remainder (modulus) from truncating division of two constant "
+    "size bit-vectors")
+  {
+    const auto constructed_term =
+      convert_expr_to_smt(mod_exprt{one_bvint_unsigned, two_bvint_unsigned});
+    const auto expected_term =
+      smt_bit_vector_theoryt::remainder(smt_term_one, smt_term_two);
+    CHECK(constructed_term == expected_term);
+  }
+
+  SECTION(
+    "Ensure that remainder (truncated modulo) node conversion fails if the "
+    "operands are not bit-vector based")
+  {
+    const cbmc_invariants_should_throwt invariants_throw;
+    REQUIRE_THROWS(convert_expr_to_smt(mod_exprt{one_bvint, false_exprt{}}));
+  }
 }

unit/solvers/smt2_incremental/smt_bit_vector_theory.cpp

@@ -225,4 +225,17 @@ TEST_CASE(
     REQUIRE(function_application.arguments()[0].get() == two);
     REQUIRE(function_application.arguments()[1].get() == three);
   }
+
+  SECTION("Remainder")
+  {
+    const auto function_application =
+      smt_bit_vector_theoryt::remainder(two, three);
+    REQUIRE(
+      function_application.function_identifier() ==
+      smt_identifier_termt("bvurem", smt_bit_vector_sortt{8}));
+    REQUIRE(function_application.get_sort() == smt_bit_vector_sortt{8});
+    REQUIRE(function_application.arguments().size() == 2);
+    REQUIRE(function_application.arguments()[0].get() == two);
+    REQUIRE(function_application.arguments()[1].get() == three);
+  }
 }