add shiftright

diff --git a/riscv/insns/sra.h b/riscv/insns/sra.h
index 403b9b733a5e3cce36c7885e906a80f4dace1309..f3b4df2ccb1d90431e6c486e69256f599a599f79 100644 (file)
--- a/riscv/insns/sra.h
+++ b/riscv/insns/sra.h
@@ -1 +1 @@
-WRITE_RD(sext_xlen(sext_xlen(RS1) >> (RS2 & (xlen-1))));
+WRITE_RD(sext_xlen(rv_sr(sext_xlen(RS1), (RS2 & (xlen-1)))));

diff --git a/riscv/insns/srai.h b/riscv/insns/srai.h
index 7ae1d4e5af36affad7c319225e89508b8bbce504..f089b5b106e24fc373f8ed1f4a57e39a12884d17 100644 (file)
--- a/riscv/insns/srai.h
+++ b/riscv/insns/srai.h
@@ -1,2 +1,2 @@
 require(SHAMT < xlen);
-WRITE_RD(sext_xlen(sext_xlen(RS1) >> SHAMT));
+WRITE_RD(sext_xlen(rv_sr(sext_xlen(RS1), SHAMT)));

diff --git a/riscv/insns/sraiw.h b/riscv/insns/sraiw.h
index b344459bf423c61a8e04e823ba5052a79e482102..ac9832b4631432bbaa85a88f9fa0382c2926d2fe 100644 (file)
--- a/riscv/insns/sraiw.h
+++ b/riscv/insns/sraiw.h
@@ -1,2 +1,2 @@
 require_rv64;
-WRITE_RD(sext32(int32_t(RS1) >> SHAMT));
+WRITE_RD(sext32(rv_sr(int32_t(RS1), SHAMT)));

diff --git a/riscv/insns/sraw.h b/riscv/insns/sraw.h
index ca9c0c76ce8e855cb6fd2cdec9087c84b8b26daf..b197770083a08a78d9884634a6662b0146996ffd 100644 (file)
--- a/riscv/insns/sraw.h
+++ b/riscv/insns/sraw.h
@@ -1,2 +1,2 @@
 require_rv64;
-WRITE_RD(sext32(int32_t(RS1) >> (RS2 & 0x1F)));
+WRITE_RD(sext32(rv_sr(int32_t(RS1), (RS2 & 0x1F))));

diff --git a/riscv/insns/srl.h b/riscv/insns/srl.h
index 0dabe9ecde160c95c58e72248cd78b22918d5d3d..c6f92acbd41f7aa975e3b45e7e5d97575b935320 100644 (file)
--- a/riscv/insns/srl.h
+++ b/riscv/insns/srl.h
@@ -1 +1 @@
-WRITE_RD(sext_xlen(zext_xlen(RS1) >> (RS2 & (xlen-1))));
+WRITE_RD(sext_xlen(rv_sr(zext_xlen(RS1), (RS2 & (xlen-1)))));

diff --git a/riscv/insns/srli.h b/riscv/insns/srli.h
index ea0b40d6549b5f1f9ea51b1d8d5988e514ac0ef4..fa4d441c0b692eb3843f855ada5363601314b044 100644 (file)
--- a/riscv/insns/srli.h
+++ b/riscv/insns/srli.h
@@ -1,2 +1,2 @@
 require(SHAMT < xlen);
-WRITE_RD(sext_xlen(zext_xlen(RS1) >> SHAMT));
+WRITE_RD(sext_xlen(rv_sr(zext_xlen(RS1), SHAMT)));

diff --git a/riscv/insns/srliw.h b/riscv/insns/srliw.h
index c657d3da8bbeb078318900619b4eda189086ed1a..d2850e47eb1a03fbde51f05aeb394adbcd0b9564 100644 (file)
--- a/riscv/insns/srliw.h
+++ b/riscv/insns/srliw.h
@@ -1,2 +1,2 @@
 require_rv64;
-WRITE_RD(sext32((uint32_t)RS1 >> SHAMT));
+WRITE_RD(sext32(rv_sr((uint32_t)RS1, SHAMT)));

diff --git a/riscv/insns/srlw.h b/riscv/insns/srlw.h
index a8eb4519859382c5b0b3a9f93bb34a48b1edceef..45a249471ea1ad954d95aa48c0a24683785269ee 100644 (file)
--- a/riscv/insns/srlw.h
+++ b/riscv/insns/srlw.h
@@ -1,2 +1,2 @@
 require_rv64;
-WRITE_RD(sext32((uint32_t)RS1 >> (RS2 & 0x1F)));
+WRITE_RD(sext32(rv_sr((uint32_t)RS1, (RS2 & 0x1F))));

diff --git a/riscv/sv_insn_redirect.cc b/riscv/sv_insn_redirect.cc
index 0cba560499ee10951204a71301368a85ddf1cb3d..30619ddcec8807f5adb0085d6ba3e37b0a441ec5 100644 (file)
--- a/riscv/sv_insn_redirect.cc
+++ b/riscv/sv_insn_redirect.cc
@@ -272,6 +272,11 @@ reg_t sv_proc_t::rv_sl(reg_t lhs, reg_t rhs)
     return lhs << rhs;
 }
 
+reg_t sv_proc_t::rv_sr(reg_t lhs, reg_t rhs)
+{
+    return lhs >> rhs;
+}
+
 reg_t sv_proc_t::rv_lt(reg_t lhs, reg_t rhs)
 {
     return lhs < rhs;

diff --git a/riscv/sv_insn_redirect.h b/riscv/sv_insn_redirect.h
index b32d96f94e2617af6b393acfa0c1eb3d45ea3789..81a7ee93e9520f0f90ef85a29412213a7865d276 100644 (file)
--- a/riscv/sv_insn_redirect.h
+++ b/riscv/sv_insn_redirect.h
@@ -105,6 +105,7 @@ public:
     reg_t rv_or(reg_t lhs, reg_t rhs);
     reg_t rv_xor(reg_t lhs, reg_t rhs);
     reg_t rv_sl(reg_t lhs, reg_t rhs);
+    reg_t rv_sr(reg_t lhs, reg_t rhs);
     reg_t rv_lt(reg_t lhs, reg_t rhs);
     sreg_t rv_lt(sreg_t lhs, sreg_t rhs);