[DYNAREC] Added a DMB_ISH before fetching jmp address (helps Bastion,…

… probably other too)
ptitSeb · Aug 27, 2023 · 6079f39 · 6079f39
1 parent 2dcd274
commit 6079f39
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/dynarec/dynarec_arm_helper.c b/src/dynarec/dynarec_arm_helper.c
@@ -264,13 +264,15 @@ void jump_to_next(dynarec_arm_t* dyn, uintptr_t ip, int reg, int ninst)
         if(reg!=xEIP) {
             MOV_REG(xEIP, reg);
         }
+        DMB_ISH();
         MOV32(x2, getJumpTable());
         MOV_REG_LSR_IMM5(x3, xEIP, JMPTABL_SHIFT);
         LDR_REG_LSL_IMM5(x2, x2, x3, 2);    // shiftsizeof(uintptr_t)
         UBFX(x3, xEIP, 0, JMPTABL_SHIFT);
         LDR_REG_LSL_IMM5(x3, x2, x3, 2);    // shiftsizeof(uintptr_t)
     } else {
         uintptr_t p = getJumpTableAddress(ip); 
+        DMB_ISH();
         MOV32(x2, p);
         MOV32_(xEIP, ip);
         LDR_IMM9(x3, x2, 0);
@@ -288,6 +290,7 @@ void ret_to_epilog(dynarec_arm_t* dyn, int ninst)
         MESSAGE(LOG_DUMP, "Ret next\n");
         POP1(xEIP);
         MOV32(x2, getJumpTable());
+        DMB_ISH();
         MOV_REG_LSR_IMM5(x3, xEIP, JMPTABL_SHIFT);
         LDR_REG_LSL_IMM5(x2, x2, x3, 2);    // shiftsizeof(uintptr_t)
         UBFX(x3, xEIP, 0, JMPTABL_SHIFT);
@@ -310,6 +313,7 @@ void retn_to_epilog(dynarec_arm_t* dyn, int ninst, int n)
         } else {
             ADD_IMM8(xESP, xESP, n);
         }
+        DMB_ISH();
         MOV32(x2, getJumpTable());
         MOV_REG_LSR_IMM5(x3, xEIP, JMPTABL_SHIFT);
         LDR_REG_LSL_IMM5(x2, x2, x3, 2);    // shiftsizeof(uintptr_t)
@@ -326,6 +330,7 @@ void retn_to_epilog(dynarec_arm_t* dyn, int ninst, int n)
 void iret_to_epilog(dynarec_arm_t* dyn, int ninst)
 {
     MESSAGE(LOG_DUMP, "IRet epilog\n");
+    DMB_ISH();
     // POP IP
     POP1(xEIP);
     // POP CS