rvp: do sext32 before writing to rd for rv32

Signed-off-by: Chih-Min Chao <chihmin.chao@sifive.com>

riscv/insns/aadd.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD((RS1 + RS2)>>1);
+WRITE_RD(sext32((RS1 + RS2)>>1));

riscv/insns/aaddu.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD((0ULL + (uint32_t)RS1 + (uint32_t)RS2)>>1);
+WRITE_RD(sext32((0ULL + (uint32_t)RS1 + (uint32_t)RS2)>>1));

riscv/insns/asub.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD((RS1 - RS2)>>1);
+WRITE_RD(sext32((RS1 - RS2)>>1));

riscv/insns/asubu.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD((0ULL + (uint32_t)RS1 - (uint32_t)RS2)>>1);
+WRITE_RD((sext32(0ULL + (uint32_t)RS1 - (uint32_t)RS2)>>1));

riscv/insns/mqacc_h00.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 0, 16)) >> 15));
+WRITE_RD(sext32(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 0, 16)) >> 15)));

riscv/insns/mqacc_h01.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 1, 16)) >> 15));
+WRITE_RD(sext32(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 1, 16)) >> 15)));

riscv/insns/mqacc_h11.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(RD + (((int32_t)P_FIELD(RS1, 1, 16) * P_FIELD(RS2, 1, 16)) >> 15));
+WRITE_RD(sext32(RD + (((int32_t)P_FIELD(RS1, 1, 16) * P_FIELD(RS2, 1, 16)) >> 15)));

riscv/insns/mqracc_h00.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 0, 16) + 0x4000) >> 15));
+WRITE_RD(sext32(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 0, 16) + 0x4000) >> 15)));

riscv/insns/mqracc_h01.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 1, 16) + 0x4000) >> 15));
+WRITE_RD(sext32(RD + (((int32_t)P_FIELD(RS1, 0, 16) * P_FIELD(RS2, 1, 16) + 0x4000) >> 15)));

riscv/insns/mqracc_h11.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(RD + (((int32_t)P_FIELD(RS1, 1, 16) * P_FIELD(RS2, 1, 16) + 0x4000) >> 15));
+WRITE_RD(sext32(RD + (((int32_t)P_FIELD(RS1, 1, 16) * P_FIELD(RS2, 1, 16) + 0x4000) >> 15)));

riscv/insns/mulh_h0.h

@@ -1,4 +1,4 @@
 require_extension('P');
 require_rv32;
 int64_t mres = sext(RS1,64) * sext(P_FIELD(RS2, 0, 16),64);
-WRITE_RD(mres>>32);
+WRITE_RD(sext32(mres>>16));

riscv/insns/mulh_h1.h

@@ -1,4 +1,4 @@
 require_extension('P');
 require_rv32;
 int64_t mres = sext(RS1,64) * sext(P_FIELD(RS2, 1, 16),64);
-WRITE_RD(mres>>32);
+WRITE_RD(sext32(mres>>16));

riscv/insns/mulhsu_h0.h

@@ -1,4 +1,4 @@
 require_extension('P');
 require_rv32;
 sreg_t mres = sext32(RS1) * (uint32_t)P_FIELD(RS2, 0, 16);
-WRITE_RD(mres >> 32);
+WRITE_RD(sext32(mres >> 16));

riscv/insns/mulhsu_h1.h

@@ -1,4 +1,4 @@
 require_extension('P');
 require_rv32;
 sreg_t mres = sext32(RS1) * (uint32_t)P_FIELD(RS2, 1, 16);
-WRITE_RD(mres >> 32);
+WRITE_RD(sext32(mres >> 16));

riscv/insns/mulq.h

@@ -1,7 +1,7 @@
 require_extension('P');
 require_rv32;
 if ((RS1 != (reg_t)INT32_MIN) || (RS2 != (reg_t)INT32_MIN)) {
-    WRITE_RD((RS1 * RS2) >> 31);
+    WRITE_RD(sext32((RS1 * RS2) >> 31));
   } else {
     WRITE_RD(INT32_MAX);
     P.set_vxsat();

riscv/insns/mulqr.h

@@ -1,7 +1,7 @@
 require_extension('P');
 require_rv32;
 if ((RS1 != (reg_t)INT32_MIN) || (RS2 != (reg_t)INT32_MIN)) {
-    WRITE_RD((((RS1 * RS2) >> 30) + 1) >> 1);
+    WRITE_RD(sext32((((RS1 * RS2) >> 30) + 1) >> 1));
   } else {
     WRITE_RD(INT32_MAX);
     P.set_vxsat();

riscv/insns/nsra.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD((sreg_t)P_RS1_PAIR >> (RS2 & 0x3f));
+WRITE_RD(sext32((sreg_t)P_RS1_PAIR >> (RS2 & 0x3f)));

riscv/insns/nsrai.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD((sreg_t)P_RS1_PAIR >> insn.shamtd());
+WRITE_RD(sext32((sreg_t)P_RS1_PAIR >> insn.shamtd()));

riscv/insns/nsrar.h

@@ -8,4 +8,4 @@ if (shamt == 0) {
 } else {
   result = (val >> shamt) + ((val >> (shamt - 1)) & 1);
 }
-WRITE_RD(result);
+WRITE_RD(sext32(result));

riscv/insns/nsrari.h

@@ -8,4 +8,4 @@ if (shamt == 0) {
 } else {
   result = (val >> shamt) + ((val >> (shamt - 1)) & 1);
 }
-WRITE_RD(result);
+WRITE_RD(sext32(result));

riscv/insns/nsrl.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(P_RS1_PAIR >> (RS2 & 0x3f));
+WRITE_RD(sext32(P_RS1_PAIR >> (RS2 & 0x3f)));

riscv/insns/nsrli.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(P_RS1_PAIR >> insn.shamtd());
+WRITE_RD(sext32(P_RS1_PAIR >> insn.shamtd()));

riscv/insns/sadd.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(P_SAT(xlen, sext_xlen((RS1 << 1) + RS2)));
+WRITE_RD(sext32(P_SAT(xlen, (RS1 + RS2))));

riscv/insns/saddu.h

@@ -1,4 +1,7 @@
 require_extension('P');
 require_rv32;
 bool sat = false;
-WRITE_RD(sat_addu<uint32_t>(RS1, RS2, sat));
+reg_t tmp = sat_addu<uint32_t>(RS1, RS2, sat);
+if (sat)
+  P.set_vxsat();
+WRITE_RD(sext32(tmp));

riscv/insns/ssh1sadd.h

@@ -1,3 +1,3 @@
 require_extension('P');
 require_rv32;
-WRITE_RD(P_SAT(xlen, sext_xlen((RS1 << 1) + RS2)));
+WRITE_RD(sext32(P_SAT(xlen, ((RS1 << 1) + RS2))));

riscv/insns/ssha.h

@@ -1,13 +1,16 @@
 require_extension('P');
 require_rv32;
 sreg_t sshamt = P_FIELD(RS2, 0, 8);
-if (RS1 == 0)
+sreg_t val;
-  WRITE_RD(0);
+if (RS1 == 0) {
-else if (sshamt >= 32) {
+  val = 0;
-  WRITE_RD((RS1 & 0x80000000) ? 0x80000000 : 0x7fffffff);
+} else if (sshamt >= 32) {
+  val = (RS1 & 0x80000000) ? 0x80000000 : 0x7fffffff;
   P.set_vxsat();
+} else if (sshamt <= -32) {
+  val = (RS1 & 0x80000000) ? 0xffffffff : 0;
+} else {
+  val = sshamt >= 0 ? P_SAT(32, static_cast<sreg_t> (RS1) << sshamt) : (RS1 >> -sshamt);
 }
-else if (sshamt <= -32)
+
-  WRITE_RD((RS1 & 0x80000000) ? 0xffffffff : 0);
+WRITE_RD(sext32(val));
-else
-  WRITE_RD(sshamt >= 0 ? P_SAT(32, static_cast<sreg_t> (RS1) << sshamt) : (RS1 >> -sshamt));