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

Support both Get and GetBlock on ROMSlave

Browse Source
This commit is contained in:
Andrew Waterman 2016-04-30 17:34:12 -07:00
parent 6f052a740c
commit 695c4c5096
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
uncore/src/main/scala/rom.scala
View File

@ -10,7 +10,13 @@ class ROMSlave(contents: Seq[Byte])(implicit val p: Parameters) extends Module
val io = new ClientUncachedTileLinkIO().flip val io = new ClientUncachedTileLinkIO().flip
val acq = Queue(io.acquire, 1) val acq = Queue(io.acquire, 1)
assert(!acq.valid || acq.bits.a_type === Acquire.getType, "unsupported ROMSlave operation") val single_beat = acq.bits.isBuiltInType(Acquire.getType)
val multi_beat = acq.bits.isBuiltInType(Acquire.getBlockType)
assert(!acq.valid || single_beat || multi_beat, "unsupported ROMSlave operation")
val addr_beat = Reg(UInt())
when (io.grant.fire()) { addr_beat := addr_beat + UInt(1) }
when (io.acquire.fire()) { addr_beat := io.acquire.bits.addr_beat }
val byteWidth = tlDataBits / 8 val byteWidth = tlDataBits / 8
val rows = (contents.size + byteWidth - 1)/byteWidth + 1 val rows = (contents.size + byteWidth - 1)/byteWidth + 1
@ -18,15 +24,17 @@ class ROMSlave(contents: Seq[Byte])(implicit val p: Parameters) extends Module
val slice = contents.slice(i*byteWidth, (i+1)*byteWidth) val slice = contents.slice(i*byteWidth, (i+1)*byteWidth)
UInt(slice.foldRight(BigInt(0)) { case (x,y) => (y << 8) + (x.toInt & 0xFF) }, byteWidth*8) UInt(slice.foldRight(BigInt(0)) { case (x,y) => (y << 8) + (x.toInt & 0xFF) }, byteWidth*8)
} }
val rdata = rom(if (rows == 1) UInt(0) else acq.bits.full_addr()(log2Up(contents.size)-1,log2Up(byteWidth))) val raddr = Cat(acq.bits.addr_block, addr_beat)
val rdata = rom(if (rows == 1) UInt(0) else raddr(log2Up(rom.size)-1,0))
val last = !multi_beat || addr_beat === UInt(tlDataBeats-1)
io.grant.valid := acq.valid io.grant.valid := acq.valid
acq.ready := io.grant.ready acq.ready := io.grant.ready && last
io.grant.bits := Grant( io.grant.bits := Grant(
is_builtin_type = Bool(true), is_builtin_type = Bool(true),
g_type = acq.bits.getBuiltInGrantType(), g_type = acq.bits.getBuiltInGrantType(),
client_xact_id = acq.bits.client_xact_id, client_xact_id = acq.bits.client_xact_id,
manager_xact_id = UInt(0), manager_xact_id = UInt(0),
addr_beat = UInt(0), addr_beat = addr_beat,
data = rdata) data = rdata)
} }