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

If any PMPs are supported, all CSRs exist

Browse Source
This commit is contained in:
Andrew Waterman 2017-03-29 22:20:58 -07:00
parent 8f73a58d90
commit 3546c8d133
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/rocket/CSR.scala
View File

@ -141,6 +141,8 @@ object CSR
val firstHPM = 3 val firstHPM = 3
val nCtr = 32 val nCtr = 32
val nHPM = nCtr - firstHPM val nHPM = nCtr - firstHPM
val maxPMPs = 16
} }
class PerfCounterIO(implicit p: Parameters) extends CoreBundle class PerfCounterIO(implicit p: Parameters) extends CoreBundle
@ -419,10 +421,14 @@ class CSRFile(perfEventSets: EventSets = new EventSets(Seq()))(implicit p: Param
val pmpCfgPerCSR = xLen / new PMPConfig().getWidth val pmpCfgPerCSR = xLen / new PMPConfig().getWidth
def pmpCfgIndex(i: Int) = (xLen / 32) * (i / pmpCfgPerCSR) def pmpCfgIndex(i: Int) = (xLen / 32) * (i / pmpCfgPerCSR)
for (i <- 0 until reg_pmp.size by pmpCfgPerCSR) if (reg_pmp.nonEmpty) {
read_mapping += (CSRs.pmpcfg0 + pmpCfgIndex(i)) -> reg_pmp.map(_.cfg).slice(i, i + pmpCfgPerCSR).asUInt require(reg_pmp.size <= CSR.maxPMPs)
for ((pmp, i) <- reg_pmp zipWithIndex) val read_pmp = reg_pmp.padTo(CSR.maxPMPs, 0.U.asTypeOf(new PMP))
read_mapping += (CSRs.pmpaddr0 + i) -> pmp.addr for (i <- 0 until read_pmp.size by pmpCfgPerCSR)
read_mapping += (CSRs.pmpcfg0 + pmpCfgIndex(i)) -> read_pmp.map(_.cfg).slice(i, i + pmpCfgPerCSR).asUInt
for ((pmp, i) <- read_pmp zipWithIndex)
read_mapping += (CSRs.pmpaddr0 + i) -> pmp.addr
}
for (i <- 0 until nCustomMrwCsrs) { for (i <- 0 until nCustomMrwCsrs) {
val addr = 0xff0 + i val addr = 0xff0 + i