From f33ddd3654faf1571ef765d898040f24cf092355 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 27 Feb 2017 14:21:42 +0100 Subject: Fix in rvfi_mem_ handling (when compressed isa is enabled) --- picorv32.v | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'picorv32.v') diff --git a/picorv32.v b/picorv32.v index 7eba420..e3dd708 100644 --- a/picorv32.v +++ b/picorv32.v @@ -1906,20 +1906,19 @@ module picorv32 #( rvfi_rd_wdata <= 0; end + if (dbg_mem_instr) begin + rvfi_mem_addr <= 0; + rvfi_mem_rmask <= 0; + rvfi_mem_wmask <= 0; + rvfi_mem_rdata <= 0; + rvfi_mem_wdata <= 0; + end else if (dbg_mem_valid && dbg_mem_ready) begin - if (dbg_mem_instr) begin - rvfi_mem_addr <= 0; - rvfi_mem_rmask <= 0; - rvfi_mem_wmask <= 0; - rvfi_mem_rdata <= 0; - rvfi_mem_wdata <= 0; - end else begin - rvfi_mem_addr <= dbg_mem_addr; - rvfi_mem_rmask <= dbg_mem_wstrb ? 0 : ~0; - rvfi_mem_wmask <= dbg_mem_wstrb; - rvfi_mem_rdata <= dbg_mem_rdata; - rvfi_mem_wdata <= dbg_mem_wdata; - end + rvfi_mem_addr <= dbg_mem_addr; + rvfi_mem_rmask <= dbg_mem_wstrb ? 0 : ~0; + rvfi_mem_wmask <= dbg_mem_wstrb; + rvfi_mem_rdata <= dbg_mem_rdata; + rvfi_mem_wdata <= dbg_mem_wdata; end end -- cgit