From c209c016b35a085ccc6044dead7e0b8461b239ca Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 13 Sep 2016 23:21:31 +0200 Subject: More fixes related to assertpmux checks --- picorv32.v | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'picorv32.v') diff --git a/picorv32.v b/picorv32.v index 1b45388..f7ff31a 100644 --- a/picorv32.v +++ b/picorv32.v @@ -1043,6 +1043,13 @@ module picorv32 #( is_beq_bne_blt_bge_bltu_bgeu <= 0; is_compare <= 0; + instr_beq <= 0; + instr_bne <= 0; + instr_blt <= 0; + instr_bge <= 0; + instr_bltu <= 0; + instr_bgeu <= 0; + instr_addi <= 0; instr_slti <= 0; instr_sltiu <= 0; @@ -1155,9 +1162,9 @@ module picorv32 #( alu_out_0 = !alu_lts; instr_bgeu: alu_out_0 = !alu_ltu; - is_slti_blt_slt: + is_slti_blt_slt && (!TWO_CYCLE_COMPARE || !{instr_beq,instr_bne,instr_bge,instr_bgeu}): alu_out_0 = alu_lts; - is_sltiu_bltu_sltu: + is_sltiu_bltu_sltu && (!TWO_CYCLE_COMPARE || !{instr_beq,instr_bne,instr_bge,instr_bgeu}): alu_out_0 = alu_ltu; endcase -- cgit