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

Roll back use of UIntToOH1 ()

Browse Source 
These appear to be equivalent, but the old one seems to fail in Vivado and
this one seems to pass.  This is not yet conclusive.
This commit is contained in:
Andrew Waterman 2017-08-09 18:39:47 -07:00 committed by GitHub
parent 0b8b136831
commit 0a591c5b5b
1 changed files with 2 additions and 2 deletions

4
src/main/scala/rocket/IBuf.scala

@ -77,8 +77,8 @@ class IBuf(implicit p: Parameters) extends CoreModule {
val icMask = (~UInt(0, fetchWidth*coreInstBits) << (nBufValid << log2Ceil(coreInstBits)))(fetchWidth*coreInstBits-1,0)
val inst = icData & icMask | buf.data & ~icMask
val valid = UIntToOH1(nValid, fetchWidth)
val bufMask = UIntToOH1(nBufValid, fetchWidth)
val valid = (UIntToOH(nValid) - 1)(fetchWidth-1, 0)
val bufMask = UIntToOH(nBufValid) - 1
val xcpt = (0 until bufMask.getWidth).map(i => Mux(bufMask(i), buf.xcpt, io.imem.bits.xcpt))
val buf_replay = Mux(buf.replay, bufMask, UInt(0))
val ic_replay = buf_replay | Mux(io.imem.bits.replay, valid & ~bufMask, UInt(0))