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

Merge remote-tracking branch 'origin/master' into ss-frontend

Browse Source 
Conflicts:
	src/main/scala/btb.scala
	src/main/scala/core.scala
This commit is contained in:
Christopher Celio
2014-10-03 04:22:58 -07:00
parent 180d3d365d 655f9ae1af
commit 99614e37aa
8 changed files with 86 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rocket/src/main/scala/dpath.scala
View File

@ -287,6 +287,7 @@ class Datapath extends Module
io.imem.btb_update.bits.pc := mem_reg_pc
io.imem.btb_update.bits.target := io.imem.req.bits.pc
io.imem.btb_update.bits.returnAddr := mem_int_wdata
io.imem.btb_update.bits.br_pc := mem_reg_pc
// for hazard/bypass opportunity detection
io.ctrl.ex_waddr := ex_reg_inst(11,7)