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

Fix d$ invalidation when the mmu is enabled

This commit is contained in:
Dolu1990 2023-02-22 13:15:57 +01:00
parent 15a665af53
commit 220b599c9a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/scala/vexriscv/ip/DataCache.scala
View File

@ -1063,16 +1063,18 @@ class DataCache(val p : DataCacheConfig, mmuParameter : MemoryTranslatorBusParam
} }
//remove side effects on exceptions //remove side effects on exceptions
when(consistancyHazard || mmuRsp.refilling || io.cpu.writeBack.accessError || io.cpu.writeBack.mmuException || io.cpu.writeBack.unalignedAccess){ when(io.cpu.writeBack.isValid) {
io.mem.cmd.valid := False when(consistancyHazard || mmuRsp.refilling || io.cpu.writeBack.accessError || io.cpu.writeBack.mmuException || io.cpu.writeBack.unalignedAccess) {
tagsWriteCmd.valid := False io.mem.cmd.valid := False
dataWriteCmd.valid := False tagsWriteCmd.valid := False
loaderValid := False dataWriteCmd.valid := False
io.cpu.writeBack.haltIt := False loaderValid := False
if(withInternalLrSc) lrSc.reserved := lrSc.reserved io.cpu.writeBack.haltIt := False
if(withExternalAmo) amo.external.state := LR_CMD if (withInternalLrSc) lrSc.reserved := lrSc.reserved
if (withExternalAmo) amo.external.state := LR_CMD
}
io.cpu.redo setWhen((mmuRsp.refilling || consistancyHazard))
} }
io.cpu.redo setWhen(io.cpu.writeBack.isValid && (mmuRsp.refilling || consistancyHazard))
assert(!(io.cpu.writeBack.isValid && !io.cpu.writeBack.haltIt && io.cpu.writeBack.isStuck), "writeBack stuck by another plugin is not allowed", ERROR) assert(!(io.cpu.writeBack.isValid && !io.cpu.writeBack.haltIt && io.cpu.writeBack.isStuck), "writeBack stuck by another plugin is not allowed", ERROR)
} }