Fix wfi probe with multiple harts

SpinalHDL · Apr 3, 2024 · 156d6a2 · 156d6a2
1 parent 9172027
commit 156d6a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/scala/vexiiriscv/execute/lsu/LsuPlugin.scala b/src/main/scala/vexiiriscv/execute/lsu/LsuPlugin.scala
@@ -475,7 +475,7 @@ class LsuPlugin(var layer : LaneLayer,
           val capture = False
           val reserved = RegInit(False) setWhen(capture) //TODO punish on double reserve !
           val address = RegNextWhen(apply(l1.PHYSICAL_ADDRESS), capture)
-          when(!elp.isFreezed() && l1.SEL && !l1.ABORD && !IO) {
+          when(!elp.isFreezed() && l1.SEL && !l1.ABORD && !IO) { //TODO this is probably missing some case
             when(l1.STORE){
               reserved := False
             } elsewhen(apply(l1.ATOMIC)){

diff --git a/src/main/scala/vexiiriscv/test/VexiiRiscvProbe.scala b/src/main/scala/vexiiriscv/test/VexiiRiscvProbe.scala
@@ -527,8 +527,8 @@ class VexiiRiscvProbe(cpu : VexiiRiscv, kb : Option[konata.Backend], var withRvl
 
   def checkCommits(): Unit = {
     val wfi = proxies.wfi.toInt
-    for(hart <- harts) {
-      if(((wfi >> hart.hartId) & 1) != 0){
+    for((hart, localHartId) <- harts.zipWithIndex) {
+      if(((wfi >> localHartId) & 1) != 0){
         hart.lastCommitAt = cycle
       }
       if (checkLiveness && hart.lastCommitAt + 4000l < cycle) {