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

Remove start address option from AddrMapEntries

Browse Source 
It appears to never be used, and clutters things.  The new invariant is
that AddrMaps are relative and AddrHashMaps are absolute.
This commit is contained in:
Andrew Waterman 2016-04-27 14:52:05 -07:00
parent d3dee2c6c6
commit c8b1f0801b
3 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ class AddrMapProt extends Bundle {
val r = Bool() val r = Bool()
} }
case class AddrMapEntry(name: String, start: Option[BigInt], region: MemRegion) case class AddrMapEntry(name: String, region: MemRegion)
case class AddrHashMapEntry(port: Int, start: BigInt, size: BigInt, prot: Int, cacheable: Boolean) case class AddrHashMapEntry(port: Int, start: BigInt, size: BigInt, prot: Int, cacheable: Boolean)
@ -84,26 +84,20 @@ class AddrHashMap(addrmap: AddrMap, start: BigInt = BigInt(0)) {
var ind = 0 var ind = 0
var base = start var base = start
var pairs = Seq[(String, AddrHashMapEntry)]() var pairs = Seq[(String, AddrHashMapEntry)]()
am.foreach { case AddrMapEntry(name, startOpt, region) => am.foreach {
region match { case AddrMapEntry(name, MemSize(size, prot, cacheable)) =>
case MemSize(size, prot, cacheable) => { pairs = (name, AddrHashMapEntry(ind, base, size, prot, cacheable)) +: pairs
if (!startOpt.isEmpty) base = startOpt.get base += size
pairs = (name, AddrHashMapEntry(ind, base, size, prot, cacheable)) +: pairs ind += 1
base += size case AddrMapEntry(name, MemSubmap(size, submap)) =>
ind += 1 val subpairs = genPairs(submap, base).map {
case (subname, AddrHashMapEntry(subind, subbase, subsize, prot, cacheable)) =>
(name + ":" + subname,
AddrHashMapEntry(ind + subind, subbase, subsize, prot, cacheable))
} }
case MemSubmap(size, submap) => { pairs = subpairs ++ pairs
if (!startOpt.isEmpty) base = startOpt.get ind += subpairs.size
val subpairs = genPairs(submap, base).map { base += size
case (subname, AddrHashMapEntry(subind, subbase, subsize, prot, cacheable)) =>
(name + ":" + subname,
AddrHashMapEntry(ind + subind, subbase, subsize, prot, cacheable))
}
pairs = subpairs ++ pairs
ind += subpairs.size
base += size
}
}
} }
pairs pairs
} }

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

@ -505,21 +505,20 @@ class NastiRecursiveInterconnect(
var lastEnd = base var lastEnd = base
var slaveInd = 0 var slaveInd = 0
val levelSize = addrmap.size val levelSize = addrmap.size
val realAddrMap = new ArraySeq[(BigInt, BigInt)](addrmap.size)
addrmap.zipWithIndex.foreach { case (AddrMapEntry(name, startOpt, region), i) => val realAddrMap = addrmap map { case AddrMapEntry(name, region) =>
val start = startOpt.getOrElse(lastEnd) val start = lastEnd
val size = region.size val size = region.size
require(bigIntPow2(size), require(isPow2(size),
s"Region $name size $size is not a power of 2") s"Region $name size $size is not a power of 2")
require(start % size == 0, require(start % size == 0,
f"Region $name start address 0x$start%x not divisible by 0x$size%x" ) f"Region $name start address 0x$start%x not divisible by 0x$size%x" )
require(start >= lastEnd, require(start >= lastEnd,
f"Region $name start address 0x$start%x before previous region end") f"Region $name start address 0x$start%x before previous region end")
realAddrMap(i) = (start, size)
lastEnd = start + size lastEnd = start + size
(start, size)
} }
val routeSel = (addr: UInt) => { val routeSel = (addr: UInt) => {

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

@ -3,10 +3,6 @@ package junctions
import Chisel._ import Chisel._
import cde.Parameters import cde.Parameters
object bigIntPow2 {
def apply(in: BigInt): Boolean = in > 0 && ((in & (in-1)) == 0)
}
class ParameterizedBundle(implicit p: Parameters) extends Bundle { class ParameterizedBundle(implicit p: Parameters) extends Bundle {
override def cloneType = { override def cloneType = {
try { try {