1
0

Reg standardization

This commit is contained in:
Henry Cook 2013-08-13 17:53:19 -07:00
parent 11e131af47
commit 9b70ecf546
6 changed files with 7 additions and 7 deletions

2
chisel

@ -1 +1 @@
Subproject commit 97ac878580bdd9bf9d4cf05d33d64689dfc6627a Subproject commit 58cb89a8831312a6a875372f9142fb444a593589

@ -1 +1 @@
Subproject commit 2d3caa3e269f238b1a8ccaa28f0c348dc12acf61 Subproject commit 744846b72e7af011aca74fa5ded131552152af62

View File

@ -255,7 +255,7 @@ class Top extends Module {
val io = new VLSITopIO(HTIF_WIDTH) val io = new VLSITopIO(HTIF_WIDTH)
val resetSigs = Vec.fill(uc.nTiles){Bool()} val resetSigs = Vec.fill(uc.nTiles){Bool()}
val tileList = (0 until uc.nTiles).map(r => Module(new Tile(resetSignal = resetSigs(r))(rc))) val tileList = (0 until uc.nTiles).map(r => Module(new Tile(_reset = resetSigs(r))(rc)))
val uncore = Module(new Uncore(HTIF_WIDTH, tileList)) val uncore = Module(new Uncore(HTIF_WIDTH, tileList))
var error_mode = Bool(false) var error_mode = Bool(false)

View File

@ -99,7 +99,7 @@ class FPGATop extends Module {
val io = new FPGATopIO(htif_width) val io = new FPGATopIO(htif_width)
val resetSigs = Vec.fill(uc.nTiles){Bool()} val resetSigs = Vec.fill(uc.nTiles){Bool()}
val tileList = (0 until uc.nTiles).map(r => Module(new Tile(resetSignal = resetSigs(r))(rc))) val tileList = (0 until uc.nTiles).map(r => Module(new Tile(_reset = resetSigs(r))(rc)))
val uncore = Module(new FPGAUncore(htif_width, tileList)) val uncore = Module(new FPGAUncore(htif_width, tileList))
io.debug.error_mode := Bool(false) io.debug.error_mode := Bool(false)

View File

@ -109,7 +109,7 @@ class ReferenceChipCrossbarNetwork(endpoints: Seq[CoherenceAgentRole])(implicit
// Shims for converting between logical network IOs and physical network IOs // Shims for converting between logical network IOs and physical network IOs
//TODO: Could be less verbose if you could override subbundles after a <> //TODO: Could be less verbose if you could override subbundles after a <>
def DefaultFromCrossbarShim[T <: Data](in: FBCIO[T]): FLNIO[T] = { def DefaultFromCrossbarShim[T <: Data](in: FBCIO[T]): FLNIO[T] = {
val out = Decoupled(new LogicalNetworkIO()(in.bits.payload.clone)).asDirectionless val out = Decoupled(new LogicalNetworkIO()(in.bits.payload.clone))
out.bits.header := in.bits.header out.bits.header := in.bits.header
out.bits.payload := in.bits.payload out.bits.payload := in.bits.payload
out.valid := in.valid out.valid := in.valid
@ -127,7 +127,7 @@ class ReferenceChipCrossbarNetwork(endpoints: Seq[CoherenceAgentRole])(implicit
out out
} }
def DefaultToCrossbarShim[T <: Data](in: FLNIO[T]): FBCIO[T] = { def DefaultToCrossbarShim[T <: Data](in: FLNIO[T]): FBCIO[T] = {
val out = Decoupled(new PhysicalNetworkIO()(in.bits.payload.clone)).asDirectionless val out = Decoupled(new PhysicalNetworkIO()(in.bits.payload.clone))
out.bits.header := in.bits.header out.bits.header := in.bits.header
out.bits.payload := in.bits.payload out.bits.payload := in.bits.payload
out.valid := in.valid out.valid := in.valid

2
uncore

@ -1 +1 @@
Subproject commit 295a4a5d69987d58de5edea6fad4e750100cffa3 Subproject commit 113ba96c49b7cff56ab93e55768838d59f8491d3