Avoid use of __int128_t

It is nonstandard, and GCC doesn't support it on 32-bit platforms. The
resulting code for MULH[[S]U] is crappier, but that doesn't really matter,
as these instructions are dynamically infrequent.

3 files changed, 6 insertions, 14 deletions

diff --git a/riscv/insns/mulh.h b/riscv/insns/mulh.h
index f63869d..8ae7520 100644
--- a/riscv/insns/mulh.h
+++ b/riscv/insns/mulh.h
@@ -1,8 +1,4 @@
-if(xpr64)
-{
-  int64_t a = RS1;
-  int64_t b = RS2;
-  WRITE_RD((int128_t(a) * int128_t(b)) >> 64);
-}
+if (xpr64)
+  WRITE_RD(mulh(RS1, RS2));
 else
   WRITE_RD(sext32((sext32(RS1) * sext32(RS2)) >> 32));
diff --git a/riscv/insns/mulhsu.h b/riscv/insns/mulhsu.h
index d62256e..3168ade 100644
--- a/riscv/insns/mulhsu.h
+++ b/riscv/insns/mulhsu.h
@@ -1,8 +1,4 @@
-if(xpr64)
-{
-  int64_t a = RS1;
-  uint64_t b = RS2;
-  WRITE_RD((int128_t(a) * uint128_t(b)) >> 64);
-}
+if (xpr64)
+  WRITE_RD(mulhsu(RS1, RS2));
 else
   WRITE_RD(sext32((sext32(RS1) * reg_t((uint32_t)RS2)) >> 32));
diff --git a/riscv/insns/mulhu.h b/riscv/insns/mulhu.h
index 2d6f48c..b03b870 100644
--- a/riscv/insns/mulhu.h
+++ b/riscv/insns/mulhu.h
@@ -1,4 +1,4 @@
-if(xpr64)
-  WRITE_RD((uint128_t(RS1) * uint128_t(RS2)) >> 64);
+if (xpr64)
+  WRITE_RD(mulhu(RS1, RS2));
 else
   WRITE_RD(sext32(((uint64_t)(uint32_t)RS1 * (uint64_t)(uint32_t)RS2) >> 32));