Hardware
/
VexRiscv
mirror of https://github.com/SpinalHDL/VexRiscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fetcher RVC ensure redo keep PC(1) 

Fix BranchTarget RVC inibition
This commit is contained in:
Charles Papon 2020-02-23 10:44:44 +01:00
parent 5ea0b57d1b
commit 01e5112680
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/vexriscv/plugin/Fetcher.scala
View File

@ -247,7 +247,6 @@ abstract class IBusFetcherImpl(val resetVector : BigInt,
val bufferValid = RegInit(False) val bufferValid = RegInit(False)
val bufferData = Reg(Bits(16 bits)) val bufferData = Reg(Bits(16 bits))
val isInputLowRvc = input.rsp.inst(1 downto 0) =/= 3 val isInputLowRvc = input.rsp.inst(1 downto 0) =/= 3
val isInputHighRvc = input.rsp.inst(17 downto 16) =/= 3 val isInputHighRvc = input.rsp.inst(17 downto 16) =/= 3
val throw2BytesReg = RegInit(False) val throw2BytesReg = RegInit(False)
@ -283,6 +282,10 @@ abstract class IBusFetcherImpl(val resetVector : BigInt,
throw2BytesReg := False throw2BytesReg := False
bufferValid := False bufferValid := False
} }
if(fetchPc.redo != null) {
fetchPc.redo.payload(1) setWhen(throw2BytesReg)
}
}) })
@ -576,7 +579,7 @@ abstract class IBusFetcherImpl(val resetVector : BigInt,
} }
//Do not trigger prediction hit when it is one for the upper RVC word and we aren't there yet //Do not trigger prediction hit when it is one for the upper RVC word and we aren't there yet
decompressorContextOutput.hit clearWhen(decompressorContext.line.last2Bytes && !decompressor.throw2Bytes) decompressorContextOutput.hit clearWhen(decompressorContext.line.last2Bytes && (decompressor.bufferValid || (!decompressor.throw2Bytes && decompressor.isInputLowRvc)))
decodePc.predictionPcLoad.valid := injectorContext.line.branchWish.msb && injectorContext.hit && !injectorContext.hazard && injector.decodeInput.fire decodePc.predictionPcLoad.valid := injectorContext.line.branchWish.msb && injectorContext.hit && !injectorContext.hazard && injector.decodeInput.fire
decodePc.predictionPcLoad.payload := injectorContext.line.target decodePc.predictionPcLoad.payload := injectorContext.line.target