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

rocketchip: rename identically names devices with _%d (#340)

Browse Source 
* rocketchip: rename identically names devices with _%d

If you connect two devices with the same name in TL2 (totally ok there),
when they get put into the TL1 addrmap, one gets silently overwritten.
This renames the second occurance as _1, third as _2, and so on...

* junctions: blow if duplicates add to addrmap
This commit is contained in:
Wesley W. Terpstra 2016-09-26 13:05:49 -07:00 committed by GitHub
parent 77a0f76289
commit 14cd39e045
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,8 @@ class AddrMap(
var prot = 0 var prot = 0
var cacheable = true var cacheable = true
for (AddrMapEntry(name, r) <- entriesIn) { for (AddrMapEntry(name, r) <- entriesIn) {
require (!mapping.contains(name))
if (r.start != 0) { if (r.start != 0) {
base = r.start base = r.start
} else { } else {

7
src/main/scala/rocketchip/Utils.scala
View File

@ -83,7 +83,12 @@ object GenerateGlobalAddrMap {
} }
}.flatten }.flatten
lazy val tl2AddrMap = new AddrMap(tl2Devices, collapse = true) lazy val uniquelyNamedTL2Devices =
tl2Devices.groupBy(_.name).values.map(_.zipWithIndex.map {
case (e, i) => if (i == 0) e else e.copy(name = e.name + "_" + i)
}).flatten.toList
lazy val tl2AddrMap = new AddrMap(uniquelyNamedTL2Devices, collapse = true)
lazy val pBusIOAddrMap = new AddrMap(AddrMapEntry("TL2", tl2AddrMap) +: (p(ExtMMIOPorts) ++ pDevicesEntries), collapse = true) lazy val pBusIOAddrMap = new AddrMap(AddrMapEntry("TL2", tl2AddrMap) +: (p(ExtMMIOPorts) ++ pDevicesEntries), collapse = true)
val memBase = 0x80000000L val memBase = 0x80000000L