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

Simplify AsyncResetRegVec and make AsyncResetReg companion object

Browse Source
This commit is contained in:
Andrew Waterman 2016-09-15 14:45:47 -07:00
parent 198a2d7022
commit a94b4af92d
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/scala/uncore/util/BlackBoxRegs.scala
View File

@ -45,7 +45,6 @@ class AsyncResetReg extends BlackBox {
} }
class SimpleRegIO(val w: Int) extends Bundle{ class SimpleRegIO(val w: Int) extends Bundle{
val d = UInt(INPUT, width = w) val d = UInt(INPUT, width = w)
@ -55,29 +54,48 @@ class SimpleRegIO(val w: Int) extends Bundle{
} }
class AsyncResetRegVec(val w: Int, val init: Int) extends Module { class AsyncResetRegVec(val w: Int, val init: BigInt) extends Module {
val io = new SimpleRegIO(w) val io = new SimpleRegIO(w)
val bb_q = Wire(UInt(width = w)) val bb_d = Mux(io.en, io.d, io.q)
val bb_d = Wire(UInt(width = w))
val init_val = Wire(UInt(width = w))
init_val := UInt(init, width = w)
val async_regs = List.fill(w)(Module (new AsyncResetReg)) val async_regs = List.fill(w)(Module (new AsyncResetReg))
bb_q := (async_regs.map(_.io.q)).asUInt() io.q := async_regs.map(_.io.q).asUInt
bb_d := Mux(io.en , io.d , bb_q)
io.q := bb_q
for ((reg, idx) <- async_regs.zipWithIndex) { for ((reg, idx) <- async_regs.zipWithIndex) {
reg.io.clk := clock reg.io.clk := clock
reg.io.rst := reset reg.io.rst := reset
reg.io.init := init_val(idx) reg.io.init := Bool(((init >> idx) & 1) == 1)
reg.io.d := bb_d(idx) reg.io.d := bb_d(idx)
} }
} }
object AsyncResetReg {
def apply(d: Bool, clk: Clock, rst: Bool, init: Bool): Bool = {
val reg = Module(new AsyncResetReg)
reg.io.d := d
reg.io.clk := clk
reg.io.rst := rst
reg.io.init := init
reg.io.q
}
def apply(d: Bool, clk: Clock, rst: Bool): Bool = apply(d, clk, rst, Bool(false))
def apply(updateData: UInt, resetData: BigInt, enable: Bool): UInt = {
val w = updateData.getWidth max resetData.bitLength
val reg = Module(new AsyncResetRegVec(w, resetData))
reg.io.d := updateData
reg.io.en := enable
reg.io.q
}
def apply(updateData: UInt, resetData: BigInt): UInt = apply(updateData, resetData, Bool(true))
def apply(updateData: UInt, enable: Bool): UInt = apply(updateData, BigInt(0), enable)
def apply(updateData: UInt): UInt = apply(updateData, BigInt(0), Bool(true))
}