redirect store insns through sv_proc_t for elwidth adjustment

diff --git a/riscv/insns/c_fsd.h b/riscv/insns/c_fsd.h
index d038d9a03e959c3d5b41b864b8656c44051d393a..cd8a3b0753ed23b0f08027ba8e3cd58a3fe92b2b 100644 (file)
--- a/riscv/insns/c_fsd.h
+++ b/riscv/insns/c_fsd.h
@@ -1,4 +1,4 @@
 require_extension('C');
 require_extension('D');
 require_fp;
-MMU.store_uint64(rv_add(RVC_RS1S, insn.rvc_ld_imm()), ((freg_t)RVC_FRS2S).v[0]);
+MMU.store_uint64(insn.rvc_rs1s(), insn.rvc_ld_imm(), ((freg_t)RVC_FRS2S).v[0]); // RVC_RS1S

diff --git a/riscv/insns/c_fsw.h b/riscv/insns/c_fsw.h
index 2f032109f614c1ac7104326f376870b584ec55e9..988096b4a27b30782ca5aeb9a62005590da4224b 100644 (file)
--- a/riscv/insns/c_fsw.h
+++ b/riscv/insns/c_fsw.h
@@ -2,7 +2,7 @@ require_extension('C');
 if (xlen == 32) {
   require_extension('F');
   require_fp;
-  MMU.store_uint32(rv_add(RVC_RS1S, insn.rvc_lw_imm()), ((freg_t)RVC_FRS2S).v[0]);
+  MMU.store_uint32(insn.rvc_rs1s(), insn.rvc_lw_imm(), ((freg_t)RVC_FRS2S).v[0]); //RVC_RS1S
 } else { // c.sd
-  MMU.store_uint64(rv_add(RVC_RS1S, insn.rvc_ld_imm()), RVC_RS2S);
+  MMU.store_uint64(insn.rvc_rs1s(), insn.rvc_ld_imm(), RVC_RS2S); //RVC_RS1S, 
 }

diff --git a/riscv/insns/c_sw.h b/riscv/insns/c_sw.h
index 098b4b423254eba22273c3c31f70ece18d140a39..29b99d47298cbc23fe9af69de5f9d0ba6f9554ce 100644 (file)
--- a/riscv/insns/c_sw.h
+++ b/riscv/insns/c_sw.h
@@ -1,2 +1,2 @@
 require_extension('C');
-MMU.store_uint32(rv_add(RVC_RS1S, insn.rvc_lw_imm()), RVC_RS2S);
+MMU.store_uint32(insn.rvc_rs1s(), insn.rvc_lw_imm(), RVC_RS2S); // RVC_RS1S

diff --git a/riscv/insns/fsd.h b/riscv/insns/fsd.h
index 038380644a2f833c52c9494e6c214712db99965f..16b009b5fa6bd1d0a2da8a5084999c08898857fd 100644 (file)
--- a/riscv/insns/fsd.h
+++ b/riscv/insns/fsd.h
@@ -1,3 +1,3 @@
 require_extension('D');
 require_fp;
-MMU.store_uint64(rv_add(RS1, insn.s_imm()), ((freg_t)FRS2).v[0]);
+MMU.store_uint64(insn.rs1(), insn.s_imm(), ((freg_t)FRS2).v[0]); // RS1

diff --git a/riscv/insns/fsw.h b/riscv/insns/fsw.h
index d1252464cf7bad3cae47aa085333a1a0e6fda770..37fca6a9d2c573d37cff46d4422d2d3909eae8df 100644 (file)
--- a/riscv/insns/fsw.h
+++ b/riscv/insns/fsw.h
@@ -1,3 +1,3 @@
 require_extension('F');
 require_fp;
-MMU.store_uint32(rv_add(RS1, insn.s_imm()), ((freg_t)FRS2).v[0]);
+MMU.store_uint32(insn.rs1(), insn.s_imm(), ((freg_t)FRS2).v[0]); // RS1

diff --git a/riscv/insns/sb.h b/riscv/insns/sb.h
index ad656cf6c793040e9b0bc411db23d11c9c51058f..0a968d9466c4e06df328222565add6cb4137dc2b 100644 (file)
--- a/riscv/insns/sb.h
+++ b/riscv/insns/sb.h
@@ -1 +1 @@
-MMU.store_uint8(rv_add(RS1, insn.s_imm()), RS2);
+MMU.store_uint8(insn.rs1(), insn.s_imm(), RS2); // RS1

diff --git a/riscv/insns/sd.h b/riscv/insns/sd.h
index df56fbe46f22268fe75ab654e2f714eca322286f..f92237ce7be4ff94068a5ecd63592e89b612765e 100644 (file)
--- a/riscv/insns/sd.h
+++ b/riscv/insns/sd.h
@@ -1,2 +1,2 @@
 require_rv64;
-MMU.store_uint64(rv_add(RS1, insn.s_imm()), RS2);
+MMU.store_uint64(insn.rs1(), insn.s_imm(), RS2); // RS1

diff --git a/riscv/insns/sh.h b/riscv/insns/sh.h
index e216392ce733f34422ff23b047903e229514777a..13e5786c68bac702139b360307c660859546481c 100644 (file)
--- a/riscv/insns/sh.h
+++ b/riscv/insns/sh.h
@@ -1 +1 @@
-MMU.store_uint16(rv_add(RS1, insn.s_imm()), RS2);
+MMU.store_uint16(insn.rs1(), insn.s_imm(), RS2); // RS1

diff --git a/riscv/insns/sw.h b/riscv/insns/sw.h
index 32c28519d918c3a5f725f5d7959616b133d0359f..d8a567f2029c3611695fc725f2b6e3124076b61c 100644 (file)
--- a/riscv/insns/sw.h
+++ b/riscv/insns/sw.h
@@ -1 +1 @@
-MMU.store_uint32(rv_add(RS1, insn.s_imm()), RS2);
+MMU.store_uint32(insn.rs1(), insn.s_imm(), RS2); // RS1