[DYNAREC] Small improvment in jmp/ret

ptitSeb · Feb 15, 2023 · 7682cdc · 7682cdc
1 parent 1dcac1b
commit 7682cdc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/dynarec/dynarec_arm.c b/src/dynarec/dynarec_arm.c
@@ -437,7 +437,7 @@ dynarec_log(LOG_DEBUG, "Asked to Fill block %p with %p\n", block, (void*)addr);
     for(int i=0; i<helper.size; ++i)
         if(helper.insts[i].x86.jmp) {
             uintptr_t j = helper.insts[i].x86.jmp;
-            if(j<start || j>=end) {
+            if(j<start || j>=end || j==helper.insts[i].x86.addr) {
                 helper.insts[i].x86.jmp_insts = -1;
                 helper.insts[i].x86.need_after |= X_PEND;
             } else {

diff --git a/src/dynarec/dynarec_arm_00.c b/src/dynarec/dynarec_arm_00.c
@@ -661,7 +661,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             i32 = F32S;
             if(PK(0)==0xC3) {
                 MESSAGE(LOG_DUMP, "PUSH then RET, using indirect\n");
-                MOV32(x3, ip+1);
+                MOV32(x3, addr-4);
                 LDR_IMM9(x1, x3, 0);
                 PUSH1(x1);
             } else {