github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-04-22 04:47:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Smaller fix

Browse source
This commit is contained in:
Markus Wegmann 2017-01-09 17:12:38 +01:00
parent 4e354a640a
commit 2536f1e8df
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
controller.sv
View file

@ -447,8 +447,13 @@ module riscv_controller
if (id_ready_i) begin
if ((jump_in_id_i == BRANCH_COND) & branch_taken_ex_i & id_ready_i)
begin
pc_mux_o = PC_BRANCH;
pc_set_o = 1'b1;
// CONFIG_REGION: NO_JUMP_ADDER
`ifdef NO_JUMP_ADDER
ctrl_fsm_ns = WAIT_BRANCH_EX;
`else
pc_mux_o = PC_BRANCH;
pc_set_o = 1'b1;
`endif
end
ctrl_fsm_ns = DBG_SIGNAL;
@ -669,6 +674,7 @@ module riscv_controller
begin
// there is a branch in the EX stage that is taken
branch_stall_o = 1'b1;
is_decoding_o = 1'b1;
halt_if_o = 1'b1;
if (id_ready_i)
begin
@ -963,7 +969,7 @@ module riscv_controller
`endif // ONLY_ALIGNED
// CONFIG_REGION: MUL_SUPPORT
`ifdef MUL_SUPPORT
`ifdef MUL_SUPPORT
else if (mult_multicycle_i) begin
operand_c_fw_mux_sel_o = SEL_FW_EX;
end

5
id_stage.sv
View file

@ -774,11 +774,12 @@ module riscv_id_stage
always_comb
begin : operand_a_fw_mux
case (operand_a_fw_mux_sel)
// CONFIG_REGION: MERGE_ID_EX
`ifndef MERGE_ID_EX
SEL_FW_EX: operand_a_fw_id = regfile_alu_wdata_fw_i;
`else
// CONFIG_REGION: ONLY_ALIGNED
`ifndef ONLY_ALIGNED
// CONFIG_REGION: MERGE_ID_EX
`ifdef MERGE_ID_EX
SEL_MISALIGNED: operand_a_fw_id = misaligned_addr_i;
`endif
`endif