diff options
Diffstat (limited to 'rtl/core/control/stall.sv')
| -rw-r--r-- | rtl/core/control/stall.sv | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/rtl/core/control/stall.sv b/rtl/core/control/stall.sv index edf9265..223fecb 100644 --- a/rtl/core/control/stall.sv +++ b/rtl/core/control/stall.sv @@ -2,23 +2,20 @@ module core_control_stall ( - input logic clk, - - input datapath_decode dec, - input psr_decode dec_psr, - input data_decode dec_data, - input snd_decode dec_snd, - - input ctrl_cycle next_cycle, - input logic final_update_flags, - update_flags, - final_writeback, - writeback, - input reg_num final_rd, - - output logic stall, - bubble, - next_bubble + input logic clk, + + input insn_decode dec, + + input ctrl_cycle next_cycle, + input logic final_update_flags, + update_flags, + final_writeback, + writeback, + input reg_num final_rd, + + output logic stall, + bubble, + next_bubble ); logic pc_writeback_hazard, flags_hazard, data_hazard, rn_hazard, @@ -30,10 +27,10 @@ module core_control_stall assign pc_writeback_hazard = final_writeback && final_rd == `R15; assign flags_hazard = flags_dependency && updating_flags; assign data_hazard = final_writeback && (rn_hazard || snd_hazard); - assign rn_hazard = dec_data.uses_rn && (final_rd == dec_data.rn || dec_data.rn == `R15); - assign snd_hazard = !dec_snd.is_imm && (dec_snd.r == final_rd || dec_snd.r == `R15); + assign rn_hazard = dec.data.uses_rn && (final_rd == dec.data.rn || dec.data.rn == `R15); + assign snd_hazard = !dec.snd.is_imm && (dec.snd.r == final_rd || dec.snd.r == `R15); - assign flags_dependency = dec_psr.update_flags || dec.conditional; + assign flags_dependency = dec.psr.update_flags || dec.ctrl.conditional; assign updating_flags = final_update_flags || update_flags; always_ff @(posedge clk) |