From: Andrew Waterman <waterman@s144.Millennium.Berkeley.EDU>
Date: Fri, 8 Apr 2011 23:34:35 +0000 (-0700)
Subject: [sim] fixed multiply-high in rv32
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=98598ca5e2b27a49292e6dd6fd444c7838824d5a;p=riscv-isa-sim.git

[sim] fixed multiply-high in rv32
---

diff --git a/riscv/insns/mulhsu.h b/riscv/insns/mulhsu.h
index 506424d..e5f1c95 100644
--- a/riscv/insns/mulhsu.h
+++ b/riscv/insns/mulhsu.h
@@ -5,4 +5,4 @@ if(xpr64)
   RD = (int128_t(a) * uint128_t(b)) >> 64;
 }
 else
-  RD = sext32((sreg_t(RS1) * reg_t(RS2)) >> 32);
+  RD = sext32((sreg_t(RS1) * reg_t((uint32_t)RS2)) >> 32);
diff --git a/riscv/insns/mulhu.h b/riscv/insns/mulhu.h
index b6f45dd..6334426 100644
--- a/riscv/insns/mulhu.h
+++ b/riscv/insns/mulhu.h
@@ -1,4 +1,4 @@
 if(xpr64)
   RD = (uint128_t(RS1) * uint128_t(RS2)) >> 64;
 else
-  RD = sext32((RS1 * RS2) >> 32);
+  RD = sext32(((uint64_t)(uint32_t)RS1 * (uint64_t)(uint32_t)RS2) >> 32);