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

Fix ITIM loads (#716)

Browse Source 
An incorrectly-set ready signal caused bad data to be read from the RAM.
This commit is contained in:
Andrew Waterman 2017-05-01 17:41:25 -07:00 committed by Yunsup Lee
parent dd85d7e0a0
commit d6e69066a5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
riscv-tools

@ -1 +1 @@
Subproject commit 1bf2c200443a20291b4f35d565c54eb96dcdf40d Subproject commit 25bb7e1305d9220dddfbded12c087e8f1372b952

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

@ -101,7 +101,7 @@ class ICacheModule(outer: ICache) extends LazyModuleImp(outer)
val s0_slaveValid = tl_in.map(_.a.fire()).getOrElse(false.B) val s0_slaveValid = tl_in.map(_.a.fire()).getOrElse(false.B)
val s1_slaveValid = RegNext(s0_slaveValid, false.B) val s1_slaveValid = RegNext(s0_slaveValid, false.B)
val s2_slaveValid = RegNext(s1_slaveValid, false.B) val s2_slaveValid = RegNext(s1_slaveValid, false.B)
val s3_slaveValid = RegNext(s2_slaveValid, false.B) val s3_slaveValid = RegNext(false.B)
val s_ready :: s_request :: s_refill :: Nil = Enum(UInt(), 3) val s_ready :: s_request :: s_refill :: Nil = Enum(UInt(), 3)
val state = Reg(init=s_ready) val state = Reg(init=s_ready)
@ -226,7 +226,7 @@ class ICacheModule(outer: ICache) extends LazyModuleImp(outer)
io.resp.valid := s2_valid && s2_hit && !s2_disparity io.resp.valid := s2_valid && s2_hit && !s2_disparity
tl_in.map { tl => tl_in.map { tl =>
tl.a.ready := !tl_out.d.fire() && !s1_slaveValid && !s2_slaveValid && !(tl.d.valid && !tl.d.ready) tl.a.ready := !(tl_out.d.valid || s1_slaveValid || s2_slaveValid || s3_slaveValid)
val s1_a = RegEnable(tl.a.bits, s0_slaveValid) val s1_a = RegEnable(tl.a.bits, s0_slaveValid)
when (s0_slaveValid) { when (s0_slaveValid) {
val a = tl.a.bits val a = tl.a.bits
@ -257,7 +257,7 @@ class ICacheModule(outer: ICache) extends LazyModuleImp(outer)
val respValid = RegInit(false.B) val respValid = RegInit(false.B)
respValid := s2_slaveValid || (respValid && !tl.d.ready) respValid := s2_slaveValid || (respValid && !tl.d.ready)
when (s2_slaveValid) { when (s2_slaveValid) {
when (edge_in.get.hasData(s1_a)) { s3_slaveValid := true } when (edge_in.get.hasData(s1_a) || s2_data_decoded.correctable) { s3_slaveValid := true }
def byteEn(i: Int) = !(edge_in.get.hasData(s1_a) && s1_a.mask(i)) def byteEn(i: Int) = !(edge_in.get.hasData(s1_a) && s1_a.mask(i))
s1s3_slaveData := (0 until wordBits/8).map(i => Mux(byteEn(i), s2_data_decoded.corrected, s1s3_slaveData)(8*(i+1)-1, 8*i)).asUInt s1s3_slaveData := (0 until wordBits/8).map(i => Mux(byteEn(i), s2_data_decoded.corrected, s1s3_slaveData)(8*(i+1)-1, 8*i)).asUInt
} }