add mul elwidth redirection

diff --git a/riscv/sv_insn_redirect.cc b/riscv/sv_insn_redirect.cc
index b06f270d664b493e1f560a706b6ce4dc37cb9236..1dcc3d478bd83cf48a7d87ac53b43b8bce947334 100644 (file)
--- a/riscv/sv_insn_redirect.cc
+++ b/riscv/sv_insn_redirect.cc
@@ -580,7 +580,7 @@ sv_sreg_t sv_proc_t::rv_mul(sv_sreg_t const & lhs, sv_reg_t const & rhs)
     if (rv_int_op_prepare(lhs, rhs, vlhs, vrhs, bitwidth)) {
         sv_sreg_t result = lhs * rhs;
         fprintf(stderr, "mul result %lx %lx %lx\n",
-                (int64_t)lhs, (uint64_t)rhs, (uint64_t)result);
+                (int64_t)lhs, (uint64_t)rhs, (int64_t)result);
         return result;
     }
     int64_t result = vlhs * vrhs;
@@ -589,7 +589,17 @@ sv_sreg_t sv_proc_t::rv_mul(sv_sreg_t const & lhs, sv_reg_t const & rhs)
 
 sv_sreg_t sv_proc_t::rv_mul(sv_sreg_t const & lhs, sv_sreg_t const & rhs)
 {
-    return lhs * rhs;
+    uint8_t bitwidth = _insn->src_bitwidth;
+    int64_t vlhs = 0;
+    int64_t vrhs = 0;
+    if (rv_int_op_prepare(lhs, rhs, vlhs, vrhs, bitwidth)) {
+        sv_sreg_t result = lhs * rhs;
+        fprintf(stderr, "mul result %lx %lx %lx\n",
+                (int64_t)lhs, (int64_t)rhs, (int64_t)result);
+        return result;
+    }
+    int64_t result = vlhs * vrhs;
+    return rv_int_op_finish(lhs, rhs, result, bitwidth);
 }
 
 /* 32-bit mulh/mulhu/mulhsu */