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

Provide separate masks for local & global BusErrorUnit interrupts

Browse Source
This commit is contained in:
Andrew Waterman 2017-11-06 18:01:51 -08:00
parent be3a3e0187
commit d8d4504995
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/rocket/BusErrorUnit.scala
View File

@ -48,8 +48,9 @@ class BusErrorUnit[T <: BusErrors](t: => T, params: BusErrorUnitParams)(implicit
val value = Reg(UInt(width = sources.flatten.map(_.bits.getWidth).max)) val value = Reg(UInt(width = sources.flatten.map(_.bits.getWidth).max))
require(value.getWidth <= regWidth) require(value.getWidth <= regWidth)
val enable = Reg(init = Vec(sources.map(_.nonEmpty.B))) val enable = Reg(init = Vec(sources.map(_.nonEmpty.B)))
val interrupt = Reg(init = Vec.fill(sources.size)(false.B)) val global_interrupt = Reg(init = Vec.fill(sources.size)(false.B))
val accrued = Reg(init = Vec.fill(sources.size)(false.B)) val accrued = Reg(init = Vec.fill(sources.size)(false.B))
val local_interrupt = Reg(init = Vec.fill(sources.size)(false.B))
for ((((s, en), acc), i) <- (sources zip enable zip accrued).zipWithIndex; if s.nonEmpty) { for ((((s, en), acc), i) <- (sources zip enable zip accrued).zipWithIndex; if s.nonEmpty) {
when (s.get.valid) { when (s.get.valid) {
@ -62,8 +63,8 @@ class BusErrorUnit[T <: BusErrors](t: => T, params: BusErrorUnitParams)(implicit
} }
val (int_out, _) = intNode.out(0) val (int_out, _) = intNode.out(0)
io.interrupt := (accrued.asUInt & interrupt.asUInt).orR io.interrupt := (accrued.asUInt & local_interrupt.asUInt).orR
int_out(0) := io.interrupt int_out(0) := (accrued.asUInt & global_interrupt.asUInt).orR
def reg(r: UInt) = RegField.bytes(r, (r.getWidth + 7)/8) def reg(r: UInt) = RegField.bytes(r, (r.getWidth + 7)/8)
def reg(v: Vec[Bool]) = v.map(r => RegField(1, r)) def reg(v: Vec[Bool]) = v.map(r => RegField(1, r))
@ -73,14 +74,16 @@ class BusErrorUnit[T <: BusErrors](t: => T, params: BusErrorUnitParams)(implicit
reg(cause), reg(cause),
reg(value), reg(value),
reg(enable), reg(enable),
reg(interrupt), reg(global_interrupt),
reg(accrued))):_*) reg(accrued),
reg(local_interrupt))):_*)
// hardwire mask bits for unsupported sources to 0 // hardwire mask bits for unsupported sources to 0
for ((s, i) <- sources.zipWithIndex; if s.isEmpty) { for ((s, i) <- sources.zipWithIndex; if s.isEmpty) {
enable(i) := false enable(i) := false
interrupt(i) := false global_interrupt(i) := false
accrued(i) := false accrued(i) := false
local_interrupt(i) := false
} }
} }
} }