Merge pull request #188 from charlie-rivos/fix_c_addiw

C.ADDIW cannot have an rd of 0
riscv · Sep 16, 2023 · 2c1a8e1 · 2c1a8e1
2 parents 5a75694 + 8759844
commit 2c1a8e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/rv64_c b/rv64_c
@@ -3,15 +3,13 @@ c.ld rd_p rs1_p c_uimm8lo c_uimm8hi     1..0=0 15..13=3
 c.sd rs1_p rs2_p c_uimm8hi c_uimm8lo    1..0=0 15..13=7
 
 #quadrant 1
-c.addiw rd_rs1 c_imm6lo c_imm6hi          1..0=1 15..13=1
+c.addiw rd_rs1_n0 c_imm6lo c_imm6hi       1..0=1 15..13=1
 c.srli rd_rs1_p c_nzuimm6lo c_nzuimm6hi   1..0=1 15..13=4 11..10=0
 c.srai rd_rs1_p c_nzuimm6lo c_nzuimm6hi   1..0=1 15..13=4 11..10=1
 c.subw rd_rs1_p rs2_p                     1..0=1 15..13=4 12..10=0b111 6..5=0
 c.addw rd_rs1_p rs2_p                     1..0=1 15..13=4 12..10=0b111 6..5=1
 
-
 #quadrant 2
 c.slli rd_rs1_n0 c_nzuimm6hi c_nzuimm6lo  1..0=2 15..13=0
 c.ldsp rd_n0 c_uimm9sphi c_uimm9splo      1..0=2 15..13=3
-c.sdsp c_rs2 c_uimm9sp_s                   1..0=2 15..13=7
-
+c.sdsp c_rs2 c_uimm9sp_s                  1..0=2 15..13=7
diff --git a/unratified/rv128_c b/unratified/rv128_c
@@ -5,11 +5,10 @@ c.sq rs1_p rs2_p c_uimm9hi c_uimm9lo    1..0=0 15..13=5
 c.sd rs1_p rs2_p c_uimm8hi c_uimm8lo    1..0=0 15..13=7
 
 #quadrant 1
-c.addiw rd_rs1 c_imm6lo c_imm6hi        1..0=1 15..13=1
+c.addiw rd_rs1_n0 c_imm6lo c_imm6hi     1..0=1 15..13=1
 
 #quadrant 2
 c.lqsp rd c_uimm10sphi c_uimm10splo     1..0=2 15..13=1
-c.ldsp  rd_n0 c_uimm9sphi c_uimm9splo   1..0=2 15..13=3
+c.ldsp rd_n0 c_uimm9sphi c_uimm9splo    1..0=2 15..13=3
 c.sqsp c_rs2 c_uimm10sp_s               1..0=2 15..13=5
 c.sdsp c_rs2 c_uimm9sp_s                1..0=2 15..13=7
-