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

uniquify tilelink conf val name for easier subtyping

Browse Source
This commit is contained in:
Henry Cook 2014-04-26 14:58:38 -07:00
parent f8f29c69b8
commit 3f53d532c2
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,24 +4,24 @@ import Chisel._
case class TileLinkConfiguration(co: CoherencePolicyWithUncached, ln: LogicalNetworkConfiguration, addrBits: Int, masterXactIdBits: Int, clientXactIdBits: Int, dataBits: Int, writeMaskBits: Int, wordAddrBits: Int, atomicOpBits: Int) case class TileLinkConfiguration(co: CoherencePolicyWithUncached, ln: LogicalNetworkConfiguration, addrBits: Int, masterXactIdBits: Int, clientXactIdBits: Int, dataBits: Int, writeMaskBits: Int, wordAddrBits: Int, atomicOpBits: Int)
abstract trait TileLinkSubBundle extends Bundle { abstract trait TileLinkSubBundle extends Bundle {
implicit val conf: TileLinkConfiguration implicit val tlconf: TileLinkConfiguration
override def clone = this.getClass.getConstructors.head.newInstance(conf).asInstanceOf[this.type] override def clone = this.getClass.getConstructors.head.newInstance(tlconf).asInstanceOf[this.type]
} }
trait HasPhysicalAddress extends TileLinkSubBundle { trait HasPhysicalAddress extends TileLinkSubBundle {
val addr = UInt(width = conf.addrBits) val addr = UInt(width = tlconf.addrBits)
} }
trait HasClientTransactionId extends TileLinkSubBundle { trait HasClientTransactionId extends TileLinkSubBundle {
val client_xact_id = Bits(width = conf.clientXactIdBits) val client_xact_id = Bits(width = tlconf.clientXactIdBits)
} }
trait HasMasterTransactionId extends TileLinkSubBundle { trait HasMasterTransactionId extends TileLinkSubBundle {
val master_xact_id = Bits(width = conf.masterXactIdBits) val master_xact_id = Bits(width = tlconf.masterXactIdBits)
} }
trait HasTileLinkData extends TileLinkSubBundle { trait HasTileLinkData extends TileLinkSubBundle {
val data = Bits(width = conf.dataBits) val data = Bits(width = tlconf.dataBits)
} }
trait SourcedMessage extends Bundle trait SourcedMessage extends Bundle
@ -64,14 +64,14 @@ object Acquire
} }
} }
class Acquire(implicit val conf: TileLinkConfiguration) extends ClientSourcedMessage class Acquire(implicit val tlconf: TileLinkConfiguration) extends ClientSourcedMessage
with HasPhysicalAddress with HasPhysicalAddress
with HasClientTransactionId with HasClientTransactionId
with HasTileLinkData { with HasTileLinkData {
val a_type = UInt(width = conf.co.acquireTypeWidth) val a_type = UInt(width = tlconf.co.acquireTypeWidth)
val write_mask = Bits(width = conf.writeMaskBits) val write_mask = Bits(width = tlconf.writeMaskBits)
val subword_addr = Bits(width = conf.wordAddrBits) val subword_addr = Bits(width = tlconf.wordAddrBits)
val atomic_opcode = Bits(width = conf.atomicOpBits) val atomic_opcode = Bits(width = tlconf.atomicOpBits)
} }
object Probe object Probe
@ -85,10 +85,10 @@ object Probe
} }
} }
class Probe(implicit val conf: TileLinkConfiguration) extends MasterSourcedMessage class Probe(implicit val tlconf: TileLinkConfiguration) extends MasterSourcedMessage
with HasPhysicalAddress with HasPhysicalAddress
with HasMasterTransactionId { with HasMasterTransactionId {
val p_type = UInt(width = conf.co.probeTypeWidth) val p_type = UInt(width = tlconf.co.probeTypeWidth)
} }
object Release object Release
@ -116,12 +116,12 @@ object Release
} }
} }
class Release(implicit val conf: TileLinkConfiguration) extends ClientSourcedMessage class Release(implicit val tlconf: TileLinkConfiguration) extends ClientSourcedMessage
with HasPhysicalAddress with HasPhysicalAddress
with HasClientTransactionId with HasClientTransactionId
with HasMasterTransactionId with HasMasterTransactionId
with HasTileLinkData { with HasTileLinkData {
val r_type = UInt(width = conf.co.releaseTypeWidth) val r_type = UInt(width = tlconf.co.releaseTypeWidth)
} }
object Grant object Grant
@ -141,14 +141,14 @@ object Grant
} }
} }
class Grant(implicit val conf: TileLinkConfiguration) extends MasterSourcedMessage class Grant(implicit val tlconf: TileLinkConfiguration) extends MasterSourcedMessage
with HasTileLinkData with HasTileLinkData
with HasClientTransactionId with HasClientTransactionId
with HasMasterTransactionId { with HasMasterTransactionId {
val g_type = UInt(width = conf.co.grantTypeWidth) val g_type = UInt(width = tlconf.co.grantTypeWidth)
} }
class GrantAck(implicit val conf: TileLinkConfiguration) extends ClientSourcedMessage with HasMasterTransactionId class GrantAck(implicit val tlconf: TileLinkConfiguration) extends ClientSourcedMessage with HasMasterTransactionId
class UncachedTileLinkIO(implicit conf: TileLinkConfiguration) extends Bundle { class UncachedTileLinkIO(implicit conf: TileLinkConfiguration) extends Bundle {