Prevent inifinte redirection when alt is used to redirect an x64 function, like mallochook does (alternative to #3707)

Author: ptitSeb

src/dynarec/dynarec.c

@@ -106,7 +106,7 @@ void* LinkNext(x64emu_t* emu, uintptr_t addr, void* x2, uintptr_t* x3)
 }
 #endif
 
-void DynaCall(x64emu_t* emu, uintptr_t addr)
+void DynaCall(x64emu_t* emu, uintptr_t addr, int no_alt)
 {
     uint64_t old_rsp = R_RSP;
     uint64_t old_rbx = R_RBX;
@@ -131,7 +131,7 @@ void DynaCall(x64emu_t* emu, uintptr_t addr)
     emu->df = d_none;
     if(emu->flags.quitonlongjmp)
         emu->flags.need_jmpbuf = 1;
-    EmuRun(emu, 1);
+    EmuRun(emu, 1, no_alt);
     emu->quit = 0;  // reset Quit flags...
     emu->df = d_none;
     if(emu->flags.quitonlongjmp && emu->flags.longjmp) {
@@ -164,7 +164,7 @@ static dynablock_t* fastDBGetBlock(x64emu_t* emu, uintptr_t addr, int create, in
 }
 #endif
 
-void EmuRun(x64emu_t* emu, int use_dynarec)
+void EmuRun(x64emu_t* emu, int use_dynarec, int no_alt)
 {
     // prepare setjump for signal handling
     JUMPBUFF jmpbuf[1] = {0};
@@ -201,7 +201,10 @@ void EmuRun(x64emu_t* emu, int use_dynarec)
         }
         if(emu->flags.need_jmpbuf)
             emu->flags.need_jmpbuf = 0;
-        R_RIP = (uintptr_t)getAlternate((void*)R_RIP);
+        if(no_alt)
+            no_alt = 0;
+        else
+            R_RIP = (uintptr_t)getAlternate((void*)R_RIP);
 #ifdef DYNAREC
         if(!BOX64ENV(dynarec) || !use_dynarec)
 #endif
@@ -278,5 +281,5 @@ void EmuRun(x64emu_t* emu, int use_dynarec)
 
 void DynaRun(x64emu_t *emu)
 {
-    EmuRun(emu, 1);
+    EmuRun(emu, 1, 0);
 }

src/emu/x64emu.c

@@ -582,7 +582,7 @@ void EmuCall(x64emu_t* emu, uintptr_t addr)
     emu->df = d_none;
     if(emu->flags.quitonlongjmp)
         emu->flags.need_jmpbuf = 1;
-    EmuRun(emu, 0);
+    EmuRun(emu, 0, 0);
     emu->quit = 0;  // reset Quit flags...
     emu->df = d_none;
     if(emu->flags.quitonlongjmp && emu->flags.longjmp) {

src/include/box64cpu.h

@@ -4,10 +4,10 @@
 typedef struct x64emu_s x64emu_t;
 
 int Run(x64emu_t *emu, int step);
-void EmuRun(x64emu_t* emu, int use_dynarec);
+void EmuRun(x64emu_t* emu, int use_dynarec, int no_alt);
 void EmuCall(x64emu_t* emu, uintptr_t addr);
 void StopEmu(x64emu_t* emu, const char* reason, int is32bits);
 void DynaRun(x64emu_t *emu);
-void DynaCall(x64emu_t* emu, uintptr_t addr);
+void DynaCall(x64emu_t* emu, uintptr_t addr, int no_alt);
 
 #endif // __BOX64CPU_H_

src/include/callback.h

@@ -7,6 +7,7 @@ typedef struct x64emu_s x64emu_t;
 
 uint64_t RunFunction(uintptr_t fnc, int nargs, ...);
 uint64_t RunFunctionFmt(uintptr_t fnc, const char* fmt, ...);
+uint64_t RunFunctionFmtNoAlt(uintptr_t fnc, const char* fmt, ...);
 double RunFunctionFmtD(uintptr_t fnc, const char* fmt, ...);
 // save all modified register
 uint64_t RunSafeFunction(uintptr_t fnc, int nargs, ...);

src/libtools/signal32.c

@@ -401,7 +401,7 @@ uint32_t RunFunctionHandler32(int* exit, int dynarec, i386_ucontext_t* sigcontex
     R_CS = 0x23;
 
     if(dynarec)
-        DynaCall(emu, fnc);
+        DynaCall(emu, fnc, 0);
     else
         EmuCall(emu, fnc);
 

src/libtools/signals.c

@@ -133,7 +133,7 @@ uint64_t RunFunctionHandler(x64emu_t* emu, int* exit, int dynarec, x64_ucontext_
     R_CS = 0x33;
 
     if(dynarec)
-        DynaCall(emu, fnc);
+        DynaCall(emu, fnc, 0);
     else
         EmuCall(emu, fnc);
 

src/libtools/threads.c

@@ -784,7 +784,7 @@ int EXPORT my_pthread_once(x64emu_t* emu, int* once, void* cb)
 		R_RBP = R_RSP;      // mov rbp, rsp
 		R_RSP &= ~63LL;
 
-		DynaCall(emu, (uintptr_t)cb);  // using DynaCall, speedup wine 7.21 initialisation
+		DynaCall(emu, (uintptr_t)cb, 0);  // using DynaCall, speedup wine 7.21 initialisation
 
 		R_RSP = R_RBP;          // mov rsp, rbp
 		R_RBP = Pop64(emu);     // pop rbp

src/libtools/threads32.c

@@ -436,7 +436,7 @@ int EXPORT my32_pthread_once(x64emu_t* emu, int* once, void* cb)
         R_EBP = R_ESP;       // mov rbp, rsp
         R_ESP -= 0x200;
         R_ESP &= ~63LL;
-        DynaCall(emu, (uintptr_t)cb);
+        DynaCall(emu, (uintptr_t)cb, 0);
         R_ESP = R_EBP;          // mov rsp, rbp
         R_EBP = Pop32(emu);     // pop rbp
         *once = 1;