Merge pull request #1303 from gregoral/riscv-csrrx-bugfix

Fix: RISC-V CSRR instruction definition
uxmal · Dec 4, 2023 · e9b9f52 · e9b9f52
2 parents 3418ed3 + fea0d23
commit e9b9f52
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 10 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -19,3 +19,4 @@ Sven Almgren (blindmatrix)
 David Connolly
 throwaway96
 Johan Mattsson
+Gregor Alujevič
diff --git a/src/Arch/RiscV/InstructionSet.cs b/src/Arch/RiscV/InstructionSet.cs
@@ -443,9 +443,9 @@ public Decoder[] CreateRootDecoders()
                         (0b0011000_00010, Instr(Mnemonic.mret, InstrClass.Transfer | InstrClass.Return)),
                         (0b0001000_00101, Instr(Mnemonic.wfi, InstrClass.Linear))),
 
-                    Instr(Mnemonic.csrrw, d, Csr20, r2),
-                    Instr(Mnemonic.csrrs, d, Csr20, r2),
-                    Instr(Mnemonic.csrrc, d, Csr20, r2),
+                    Instr(Mnemonic.csrrw, d, Csr20, r1),
+                    Instr(Mnemonic.csrrs, d, Csr20, r1),
+                    Instr(Mnemonic.csrrc, d, Csr20, r1),
                     invalid,
                     Instr(Mnemonic.csrrwi, d, Csr20, Imm(15, 5)),
                     Instr(Mnemonic.csrrsi, d, Csr20, Imm(15, 5)),

diff --git a/src/UnitTests/Arch/RiscV/RiscVDisassemblerTests.cs b/src/UnitTests/Arch/RiscV/RiscVDisassemblerTests.cs
@@ -232,10 +232,40 @@ public void RiscV_dasm_c_fsw_32()
             AssertCode("c.fsw\ts0,112(s1)", "A0F8");
         }
 
+        [Test]
+        public void RiscV_dasm_csrrw()
+        {
+            AssertCode("csrrw\tt5,mtvec,a1", "739F5530");
+        }
+
+        [Test]
+        public void RiscV_dasm_csrrs()
+        {
+            AssertCode("csrrs\tt5,mtvec,a1", "73AF5530");
+        }
+
         [Test]
         public void RiscV_dasm_csrrc()
         {
-            AssertCode("csrrc\tzero,mstatus,zero", "73B00230");
+            AssertCode("csrrc\tt5,mtvec,a1", "73BF5530");
+        }
+
+        [Test]
+        public void RiscV_dasm_csrrwi()
+        {
+            AssertCode("csrrwi\tt5,mtvec,0000000B", "73 df 55 30");
+        }
+
+        [Test]
+        public void RiscV_dasm_csrrsi()
+        {
+            AssertCode("csrrsi\tt5,mtvec,0000000B", "73 ef 55 30");
+        }
+
+        [Test]
+        public void RiscV_dasm_csrrci()
+        {
+            AssertCode("csrrci\tt5,mtvec,0000000B", "73 ff 55 30");
         }
 
         [Test]

diff --git a/src/UnitTests/Arch/RiscV/RiscVRewriterTests.cs b/src/UnitTests/Arch/RiscV/RiscVRewriterTests.cs
@@ -1048,9 +1048,9 @@ public void RiscV_rw_c_lw()
         public void RiscV_rw_csrrc()
         {
             Given_HexString("73B00230");
-            AssertCode(     // csrrc	zero,mstatus,zero
+            AssertCode(     // csrrc	zero,mstatus,t0
                 "0|L--|0000000000010000(4): 1 instructions",
-                "1|L--|__csrrc<word64>(mstatus, 0<64>)");
+                "1|L--|__csrrc<word64>(mstatus, t0)");
         }
 
         [Test]
@@ -1066,9 +1066,9 @@ public void RiscV_rw_csrrci()
         public void RiscV_rw_csrrs()
         {
             Given_HexString("73292000");
-            AssertCode(     // csrrs	s2,frm,sp
+            AssertCode(     // csrrs	s2,frm,zero
                 "0|L--|0000000000010000(4): 1 instructions",
-                "1|L--|s2 = __csrrs<word64>(frm, sp)");
+                "1|L--|s2 = __csrrs<word64>(frm, 0<64>)");
         }
 
         [Test]
@@ -1084,9 +1084,9 @@ public void RiscV_rw_csrrsi()
         public void RiscV_rw_csrrw()
         {
             Given_HexString("73900930");
-            AssertCode(     // csrrw	zero,mstatus,zero
+            AssertCode(     // csrrw	zero,mstatus,x19
                 "0|L--|0000000000010000(4): 1 instructions",
-                "1|L--|__csrrw<word64>(mstatus, 0<64>)");
+                "1|L--|__csrrw<word64>(mstatus, s3)");
         }
 
         [Test]