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

Revert "replace remaining uses of Vec.fill"

Browse Source 
This reverts commit 16dca2186b95945ad2ba5f906113101de0726617.
This commit is contained in:
Andrew Waterman 2015-09-25 17:05:07 -07:00
parent a9c6cced2d
commit e75674c0cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
junctions/src/main/scala/nasti.scala
View File

@ -485,8 +485,8 @@ class NASTICrossbar(nMasters: Int, nSlaves: Int, addrmap: Seq[(BigInt, BigInt)])
val slaves = Vec(new NASTIIO, nSlaves) val slaves = Vec(new NASTIIO, nSlaves)
} }
val routers = Vec(nMasters, Module(new NASTIRouter(addrmap)).io) val routers = Vec.fill(nMasters) { Module(new NASTIRouter(addrmap)).io }
val arbiters = Vec(nSlaves, Module(new NASTIArbiter(nMasters)).io) val arbiters = Vec.fill(nSlaves) { Module(new NASTIArbiter(nMasters)).io }
for (i <- 0 until nMasters) { for (i <- 0 until nMasters) {
routers(i).master <> io.masters(i) routers(i).master <> io.masters(i)

2
junctions/src/main/scala/smi.scala
View File

@ -116,7 +116,7 @@ class SMIIONASTIReadIOConverter(val dataWidth: Int, val addrWidth: Int)
val recvInd = Reg(init = UInt(0, wordCountBits)) val recvInd = Reg(init = UInt(0, wordCountBits))
val sendDone = Reg(init = Bool(false)) val sendDone = Reg(init = Bool(false))
val buffer = Reg(init = Vec(maxWordsPerBeat, Bits(0, dataWidth))) val buffer = Reg(init = Vec.fill(maxWordsPerBeat) { Bits(0, dataWidth) })
io.ar.ready := (state === s_idle) io.ar.ready := (state === s_idle)