Merge branch 'master' into JeanRochCoulon-patch-2

openhwgroup · Dec 19, 2024 · b878429 · b878429
2 parents 61fdce5 + d4b3378
commit b878429
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/cva6_rvfi.sv b/core/cva6_rvfi.sv
@@ -284,8 +284,8 @@ module cva6_rvfi
                   ex_commit_cause == riscv::ENV_CALL_UMODE));
       rvfi_instr_o[i].valid <= valid;
       rvfi_instr_o[i].insn  <= mem_q[commit_pointer[i]].instr;
-      // when trap, the instruction is not executed
-      rvfi_instr_o[i].trap  <= exception;
+      // when synchronous trap, the instruction is not executed
+      rvfi_instr_o[i].trap  <= exception && !ex_commit_cause[31];
 
       if (exception && ex_commit_cause[31]) begin
         rvfi_intr[i] <= 'b101;