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

support countSlaves on empty address maps

Browse Source
This commit is contained in:
Andrew Waterman 2016-04-27 14:51:52 -07:00
parent 6260ad56e8
commit d3dee2c6c6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,10 +32,17 @@ trait HasAddrMapParameters {
val addrMap = new AddrHashMap(p(GlobalAddrMap)) val addrMap = new AddrHashMap(p(GlobalAddrMap))
} }
abstract class MemRegion { def size: BigInt } abstract class MemRegion {
def size: BigInt
def numSlaves: Int
}
case class MemSize(size: BigInt, prot: Int, cacheable: Boolean = false) extends MemRegion case class MemSize(size: BigInt, prot: Int, cacheable: Boolean = false) extends MemRegion {
case class MemSubmap(size: BigInt, entries: AddrMap) extends MemRegion def numSlaves = 1
}
case class MemSubmap(size: BigInt, entries: AddrMap) extends MemRegion {
val numSlaves = entries.countSlaves
}
object AddrMapConsts { object AddrMapConsts {
val R = 0x1 val R = 0x1
@ -57,17 +64,11 @@ case class AddrMapEntry(name: String, start: Option[BigInt], 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)
class AddrMap(entries: Seq[AddrMapEntry]) extends scala.collection.IndexedSeq[AddrMapEntry] { class AddrMap(entries: Seq[AddrMapEntry]) extends scala.collection.IndexedSeq[AddrMapEntry] {
def apply(index: Int): AddrMapEntry = entries(index) def apply(index: Int): AddrMapEntry = entries(index)
def length: Int = entries.size def length: Int = entries.size
def countSlaves: Int = { def countSlaves: Int = entries.map(_.region.numSlaves).foldLeft(0)(_ + _)
this map { entry: AddrMapEntry => entry.region match {
case MemSize(_, _, _) => 1
case MemSubmap(_, submap) => submap.countSlaves
}} reduceLeft(_ + _)
}
override def tail: AddrMap = new AddrMap(entries.tail) override def tail: AddrMap = new AddrMap(entries.tail)
} }