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

tilelink: don't accidentally make a malformed union

Browse Source 
Closes #55
This commit is contained in:
Wesley W. Terpstra 2016-06-08 16:15:51 -07:00 committed by Henry Cook
parent 31b72625aa
commit a1ebc73477
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
uncore/src/main/scala/tilelink.scala
View File

@ -358,13 +358,25 @@ object Acquire {
operand_size: UInt, operand_size: UInt,
opcode: UInt, opcode: UInt,
wmask: UInt, wmask: UInt,
alloc: Bool): UInt = { alloc: Bool)
(implicit p: Parameters): UInt = {
val tlExternal = p(TLKey(p(TLId)))
val tlWriteMaskBits = tlExternal.writeMaskBits
val tlByteAddrBits = log2Up(tlWriteMaskBits)
// These had better be the right size when we cat them together!
val my_addr_byte = (UInt(0, tlByteAddrBits) | addr_byte)(tlByteAddrBits-1, 0)
val my_operand_size = (UInt(0, MT_SZ) | operand_size)(MT_SZ-1, 0)
val my_opcode = (UInt(0, M_SZ) | opcode)(M_SZ-1, 0)
val my_wmask = (UInt(0, tlWriteMaskBits) | wmask)(tlWriteMaskBits-1, 0)
MuxLookup(a_type, UInt(0), Array( MuxLookup(a_type, UInt(0), Array(
Acquire.getType -> Cat(addr_byte, operand_size, opcode, alloc), Acquire.getType -> Cat(my_addr_byte, my_operand_size, my_opcode, alloc),
Acquire.getBlockType -> Cat(operand_size, opcode, alloc), Acquire.getBlockType -> Cat(my_operand_size, my_opcode, alloc),
Acquire.putType -> Cat(wmask, alloc), Acquire.putType -> Cat(my_wmask, alloc),
Acquire.putBlockType -> Cat(wmask, alloc), Acquire.putBlockType -> Cat(my_wmask, alloc),
Acquire.putAtomicType -> Cat(addr_byte, operand_size, opcode, alloc), Acquire.putAtomicType -> Cat(my_addr_byte, my_operand_size, my_opcode, alloc),
Acquire.getPrefetchType -> Cat(M_XRD, alloc), Acquire.getPrefetchType -> Cat(M_XRD, alloc),
Acquire.putPrefetchType -> Cat(M_XWR, alloc))) Acquire.putPrefetchType -> Cat(M_XWR, alloc)))
} }