riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

fix bug in previous JALR commit

Browse Source 
on commit tag 9a122c06d1bf11237d7fb0769d454a67bbb7400e
This commit is contained in:
Yunsup Lee 2013-05-21 18:28:44 -07:00
parent 28f914c3f2
commit c837c1d800
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rocket/src/main/scala/ctrl.scala
View File

@ -521,9 +521,9 @@ class Control(implicit conf: RocketConfiguration) extends Component
val replay_ex_other = wb_dcache_miss && ex_reg_load_use || mem_reg_replay_next val replay_ex_other = wb_dcache_miss && ex_reg_load_use || mem_reg_replay_next
val replay_ex = replay_ex_structural || replay_ex_other val replay_ex = replay_ex_structural || replay_ex_other
ctrl_killx := take_pc_wb || replay_ex ctrl_killx := take_pc_wb || replay_ex
val take_pc_ex = !Mux(ex_reg_jalr, val take_pc_ex = Mux(ex_reg_jalr,
ex_reg_btb_hit && io.dpath.jalr_eq && !replay_ex_other, !(ex_reg_btb_hit && io.dpath.jalr_eq) && !replay_ex_other,
ex_reg_btb_hit === io.dpath.ex_br_taken) ex_reg_btb_hit != io.dpath.ex_br_taken)
// detect 2-cycle load-use delay for LB/LH/SC // detect 2-cycle load-use delay for LB/LH/SC
val ex_slow_bypass = ex_reg_mem_cmd === M_XSC || AVec(MT_B, MT_BU, MT_H, MT_HU).contains(ex_reg_mem_type) val ex_slow_bypass = ex_reg_mem_cmd === M_XSC || AVec(MT_B, MT_BU, MT_H, MT_HU).contains(ex_reg_mem_type)