Code clean-up to be pushed to master

openhwgroup · Aug 30, 2024 · e489571 · e489571
1 parent a66efad
commit e489571
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 96 deletions.
diff --git a/core/commit_stage.sv b/core/commit_stage.sv
@@ -103,7 +103,7 @@ module commit_stage
   // );
 
   for (genvar i = 0; i < CVA6Cfg.NrCommitPorts; i++) begin : gen_waddr
-    assign waddr_o[i] = commit_instr_i[i].rd[4:0];
+    assign waddr_o[i] = commit_instr_i[i].rd;
   end
 
   assign pc_o = commit_instr_i[0].pc;

diff --git a/core/cva6_rvfi.sv b/core/cva6_rvfi.sv
@@ -301,9 +301,9 @@ module cva6_rvfi
       rvfi_instr_o[i].cause <= ex_commit_cause;
       rvfi_instr_o[i].mode <= (CVA6Cfg.DebugEn && debug_mode) ? 2'b10 : priv_lvl;
       rvfi_instr_o[i].ixl <= CVA6Cfg.XLEN == 64 ? 2 : 1;
-      rvfi_instr_o[i].rs1_addr <= commit_instr_rs1[i][4:0];
-      rvfi_instr_o[i].rs2_addr <= commit_instr_rs2[i][4:0];
-      rvfi_instr_o[i].rd_addr <= commit_instr_rd[i][4:0];
+      rvfi_instr_o[i].rs1_addr <= commit_instr_rs1[i];
+      rvfi_instr_o[i].rs2_addr <= commit_instr_rs2[i];
+      rvfi_instr_o[i].rd_addr <= commit_instr_rd[i];
       rvfi_instr_o[i].rd_wdata <= (CVA6Cfg.FpPresent && is_rd_fpr(
           commit_instr_op[i]
       )) ? commit_instr_result[i] : wdata[i];