1
0

tile: BaseTileModule => BaseTileModuleImp

This commit is contained in:
Henry Cook 2018-01-02 17:55:54 -08:00
parent b0e1bc3071
commit 320900f76c
5 changed files with 9 additions and 9 deletions

View File

@ -39,10 +39,10 @@ abstract class GroundTestTile(params: GroundTestTileParams)
val dcacheOpt = params.dcache.map { dc => LazyModule(new DCache(0)) }
override lazy val module = new GroundTestTileModule(this)
override lazy val module = new GroundTestTileModuleImp(this)
}
class GroundTestTileModule(outer: GroundTestTile) extends BaseTileModule(outer) {
class GroundTestTileModuleImp(outer: GroundTestTile) extends BaseTileModuleImp(outer) {
val status = IO(new GroundTestStatus)
val halt_and_catch_fire = None

View File

@ -580,10 +580,10 @@ class TraceGenerator(val params: TraceGenParams)(implicit val p: Parameters) ext
class TraceGenTile(val id: Int, val params: TraceGenParams)(implicit p: Parameters) extends GroundTestTile(params) {
val masterNode: TLOutwardNode = dcacheOpt.map(_.node).getOrElse(TLIdentityNode())
override lazy val module = new TraceGenTileModule(this)
override lazy val module = new TraceGenTileModuleImp(this)
}
class TraceGenTileModule(outer: TraceGenTile) extends GroundTestTileModule(outer) {
class TraceGenTileModuleImp(outer: TraceGenTile) extends GroundTestTileModuleImp(outer) {
val tracegen = Module(new TraceGenerator(outer.params))
tracegen.io.hartid := constants.hartid

View File

@ -125,7 +125,7 @@ trait HasTileParameters {
abstract class BaseTile(tileParams: TileParams, val crossing: CoreplexClockCrossing)
(implicit p: Parameters) extends LazyModule with HasTileParameters with HasCrossing
{
def module: BaseTileModule[BaseTile]
def module: BaseTileModuleImp[BaseTile]
def masterNode: TLOutwardNode
def slaveNode: TLInwardNode
def intInwardNode: IntInwardNode
@ -171,7 +171,7 @@ abstract class BaseTile(tileParams: TileParams, val crossing: CoreplexClockCross
}
}
class BaseTileModule[+L <: BaseTile](val outer: L) extends LazyModuleImp(outer) with HasTileParameters {
class BaseTileModuleImp[+L <: BaseTile](val outer: L) extends LazyModuleImp(outer) with HasTileParameters {
require(xLen == 32 || xLen == 64)
require(paddrBits <= maxPAddrBits)

View File

@ -91,7 +91,7 @@ trait HasLazyRoCC extends CanHavePTW { this: BaseTile =>
}
trait HasLazyRoCCModule[+L <: BaseTile with HasLazyRoCC] extends CanHavePTWModule
with HasCoreParameters { this: BaseTileModule[L] =>
with HasCoreParameters { this: BaseTileModuleImp[L] =>
val roccCore = Wire(new RoCCCoreIO()(outer.p))

View File

@ -92,10 +92,10 @@ class RocketTile(
Resource(cpuDevice, "reg").bind(ResourceInt(BigInt(hartId)))
}
override lazy val module = new RocketTileModule(this)
override lazy val module = new RocketTileModuleImp(this)
}
class RocketTileModule(outer: RocketTile) extends BaseTileModule(outer)
class RocketTileModuleImp(outer: RocketTile) extends BaseTileModuleImp(outer)
with HasLazyRoCCModule[RocketTile]
with HasHellaCacheModule
with HasICacheFrontendModule {