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

Update firrtl and remove firrtl hack in plic

Browse Source
This commit is contained in:
Andrew Waterman 2016-08-02 14:37:59 -07:00
parent f04aefc95c
commit 791a27748b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firrtl

@ -1 +1 @@
Subproject commit 81f631bc87aa22fff8569e96ae5c4e429df9e1d4 Subproject commit 3e2ff71db633315455a72b00fc277dda18aca317

2
uncore/src/main/scala/devices/Plic.scala
View File

@ -112,7 +112,7 @@ class PLIC(val cfg: PLICConfig)(implicit val p: Parameters) extends Module
if (cfg.nHarts == 1) UInt(0) if (cfg.nHarts == 1) UInt(0)
else (addr - cfg.hartBase)(log2Up(cfg.hartOffset(cfg.nHarts))-1,log2Up(cfg.hartOffset(1))) else (addr - cfg.hartBase)(log2Up(cfg.hartOffset(cfg.nHarts))-1,log2Up(cfg.hartOffset(1)))
val hart = Wire(init = claimant) val hart = Wire(init = claimant)
val myMaxDev = maxDevs(claimant) + UInt(0) // XXX FIRRTL bug w/o the + UInt(0) val myMaxDev = maxDevs(claimant)
val myEnables = enables(hart) val myEnables = enables(hart)
val rdata = Wire(init = UInt(0, tlDataBits)) val rdata = Wire(init = UInt(0, tlDataBits))
val masked_wdata = (acq.bits.data & acq.bits.full_wmask()) | (rdata & ~acq.bits.full_wmask()) val masked_wdata = (acq.bits.data & acq.bits.full_wmask()) | (rdata & ~acq.bits.full_wmask())