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

fix full_addr() function in TileLink

Browse Source
This commit is contained in:
Howard Mao 2016-07-01 15:17:41 -07:00
parent 61e3e5b45a
commit 10a46a36ae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
uncore/src/main/scala/tilelink/Definitions.scala
View File

@ -293,7 +293,10 @@ class AcquireMetadata(implicit p: Parameters) extends ClientToManagerChannel
with HasAcquireType with HasAcquireType
with HasAcquireUnion { with HasAcquireUnion {
/** Complete physical address for block, beat or operand */ /** Complete physical address for block, beat or operand */
def full_addr(dummy: Int = 0) = Cat(this.addr_block, this.addr_beat, this.addr_byte()) def full_addr(dummy: Int = 0) =
Cat(this.addr_block, this.addr_beat,
Mux(isBuiltInType() && Acquire.typesWithAddrByte.contains(this.a_type),
this.addr_byte(), UInt(0, tlByteAddrBits)))
} }
/** [[uncore.AcquireMetadata]] with an extra field containing the data beat */ /** [[uncore.AcquireMetadata]] with an extra field containing the data beat */
@ -349,6 +352,7 @@ object Acquire {
def typesWithData = Vec(putType, putBlockType, putAtomicType) def typesWithData = Vec(putType, putBlockType, putAtomicType)
def typesWithMultibeatData = Vec(putBlockType) def typesWithMultibeatData = Vec(putBlockType)
def typesOnSubBlocks = Vec(putType, getType, putAtomicType) def typesOnSubBlocks = Vec(putType, getType, putAtomicType)
def typesWithAddrByte = Vec(getType, putAtomicType)
/** Mapping between each built-in Acquire type and a built-in Grant type. */ /** Mapping between each built-in Acquire type and a built-in Grant type. */
def getBuiltInGrantType(a_type: UInt): UInt = { def getBuiltInGrantType(a_type: UInt): UInt = {