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

Merge branch 'master' into rocc-fpu-port

Browse Source
This commit is contained in:
Sagar Karandikar 2015-11-21 02:24:38 -08:00
commit 65632c875a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rocket/src/main/scala/nbdcache.scala
View File

@ -1079,7 +1079,7 @@ class SimpleHellaCacheIF(implicit p: Parameters) extends Module
val cache = new HellaCacheIO val cache = new HellaCacheIO
} }
val replaying_cmb = Bool() val replaying_cmb = Wire(Bool())
val replaying = Reg(next = replaying_cmb, init = Bool(false)) val replaying = Reg(next = replaying_cmb, init = Bool(false))
replaying_cmb := replaying replaying_cmb := replaying
@ -1099,10 +1099,10 @@ class SimpleHellaCacheIF(implicit p: Parameters) extends Module
val s1_req_fire = Reg(next=s0_req_fire) val s1_req_fire = Reg(next=s0_req_fire)
val s2_req_fire = Reg(next=s1_req_fire) val s2_req_fire = Reg(next=s1_req_fire)
io.cache.req <> req_arb.io.out
io.cache.req.bits.kill := s2_nack io.cache.req.bits.kill := s2_nack
io.cache.req.bits.phys := Bool(true) io.cache.req.bits.phys := Bool(true)
io.cache.req.bits.data := RegEnable(req_arb.io.out.bits.data, s0_req_fire) io.cache.req.bits.data := RegEnable(req_arb.io.out.bits.data, s0_req_fire)
io.cache.req <> req_arb.io.out
/* replay queues: /* replay queues:
replayq1 holds the older request. replayq1 holds the older request.