Merge branch 'CHERI' into jdw57-512axi

2022-11-14 14:51:54 +00:00
parent 01482abb1b e120b3427d
commit 4af4b647b1
9 changed files with 44 additions and 36 deletions
--- a/src_Core/RISCY_OOO/procs/RV64G_OOO/MemExePipeline.bsv
+++ b/src_Core/RISCY_OOO/procs/RV64G_OOO/MemExePipeline.bsv
@@ -1518,7 +1518,7 @@ module mkMemExePipeline#(MemExeInput inIfc)(MemExePipeline);
        dMem.procReq.req(ProcRq {
            id: zeroExtend(lsqTag),
            addr: addr,
-            toState: multicore ? S : E, // in case of single core, just fetch to E
+            toState: loadTags ? T : (multicore ? S : E), // in case of single core, just fetch to E
            op: Ld,
            byteEn: ?,
            data: ?,