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

wip before moving the fetchHalt

This commit is contained in:
Dolu1990 2018-05-06 16:38:00 +02:00
parent 294293cb70
commit e65757e34c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,9 +289,11 @@ abstract class IBusFetcherImpl(val catchAccessFault : Boolean,
// } // }
if(injectionPort != null){ if(injectionPort != null){
injectionPort.ready := !decode.arbitration.isStuck val state = RegNext(injectionPort.valid) init(False) clearWhen(injectionPort.ready)
injectionPort.ready := !decode.arbitration.isStuck && state
when(injectionPort.valid) { when(injectionPort.valid) {
decode.arbitration.isValid := True decode.arbitration.isValid := True
decode.arbitration.haltItself setWhen(!state)
decode.insert(INSTRUCTION) := injectionPort.payload decode.insert(INSTRUCTION) := injectionPort.payload
} }
} }

4
src/main/scala/vexriscv/plugin/IBusSimplePlugin.scala
View File

@ -109,8 +109,8 @@ class IBusSimplePlugin(interfaceKeepData : Boolean, catchAccessFault : Boolean,
catchAccessFault = catchAccessFault, catchAccessFault = catchAccessFault,
resetVector = BigInt(0x80000000l), resetVector = BigInt(0x80000000l),
keepPcPlus4 = false, keepPcPlus4 = false,
decodePcGen = true, decodePcGen = false,
compressedGen = true, compressedGen = false,
cmdToRspStageCount = 1, cmdToRspStageCount = 1,
rspStageGen = false, rspStageGen = false,
injectorReadyCutGen = false, injectorReadyCutGen = false,