From da3749819197875c10eeec54551401ac19090902 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 6 Sep 2016 19:58:03 +0200 Subject: Two minor bugfixes --- picorv32.v | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'picorv32.v') diff --git a/picorv32.v b/picorv32.v index cb7b84f..a980e38 100644 --- a/picorv32.v +++ b/picorv32.v @@ -1494,7 +1494,7 @@ module picorv32 #( timer <= cpuregs_rs1; cpu_state <= cpu_state_fetch; end - is_lb_lh_lw_lbu_lhu: begin + is_lb_lh_lw_lbu_lhu && !instr_trap: begin `debug($display("LD_RS1: %2d 0x%08x", decoded_rs1, cpuregs_rs1);) reg_op1 <= cpuregs_rs1; cpu_state <= cpu_state_ldmem; @@ -1525,7 +1525,7 @@ module picorv32 #( reg_op2 <= cpuregs_rs2; (* parallel_case *) case (1'b1) - is_sb_sh_sw: begin + is_sb_sh_sw && !instr_trap: begin cpu_state <= cpu_state_stmem; mem_do_rinst <= 1; end -- cgit