Save flags and defered flags when runing EmuCall ([DYNAREC] Same for …

…DynaCall)
ptitSeb · Sep 17, 2024 · d7c3c3f · d7c3c3f
1 parent 7d77a4b
commit d7c3c3f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/dynarec/dynarec.c b/src/dynarec/dynarec.c
@@ -100,6 +100,7 @@ void DynaCall(x64emu_t* emu, uintptr_t addr)
     uint64_t old_rsi = R_RSI;
     uint64_t old_rbp = R_RBP;
     uint64_t old_rip = R_RIP;
+    x64flags_t old_eflags = emu->eflags;
     // save defered flags
     deferred_flags_t old_df = emu->df;
     multiuint_t old_op1 = emu->op1;
@@ -137,6 +138,7 @@ void DynaCall(x64emu_t* emu, uintptr_t addr)
         emu->res_sav = old_res_sav;
         emu->df_sav = old_df_sav;
         // and the old registers
+        emu->eflags = old_eflags;
         R_RBX = old_rbx;
         R_RDI = old_rdi;
         R_RSI = old_rsi;

diff --git a/src/emu/x64emu.c b/src/emu/x64emu.c
@@ -592,6 +592,18 @@ void EmuCall(x64emu_t* emu, uintptr_t addr)
     uint64_t old_rsi = R_RSI;
     uint64_t old_rbp = R_RBP;
     uint64_t old_rip = R_RIP;
+    x64flags_t old_eflags = emu->eflags;
+    // save defered flags
+    deferred_flags_t old_df = emu->df;
+    multiuint_t old_op1 = emu->op1;
+    multiuint_t old_op2 = emu->op2;
+    multiuint_t old_res = emu->res;
+    multiuint_t old_op1_sav= emu->op1_sav;
+    multiuint_t old_res_sav= emu->res_sav;
+    deferred_flags_t old_df_sav= emu->df_sav;
+    // uc_link
+    void* old_uc_link = emu->uc_link;
+    emu->uc_link = NULL;
     //Push64(emu, GetRBP(emu));   // set frame pointer
     //SetRBP(emu, GetRSP(emu));   // save RSP
     //R_RSP -= 200;
@@ -607,10 +619,21 @@ void EmuCall(x64emu_t* emu, uintptr_t addr)
     Run(emu, 0);
     emu->quit = 0;  // reset Quit flags...
     emu->df = d_none;
+    emu->uc_link = old_uc_link;
     if(emu->flags.quitonlongjmp && emu->flags.longjmp) {
         if(emu->flags.quitonlongjmp==1)
             emu->flags.longjmp = 0;   // don't change anything because of the longjmp
     } else {
+        // restore defered flags
+        emu->df = old_df;
+        emu->op1 = old_op1;
+        emu->op2 = old_op2;
+        emu->res = old_res;
+        emu->op1_sav = old_op1_sav;
+        emu->res_sav = old_res_sav;
+        emu->df_sav = old_df_sav;
+        // and the old registers
+        emu->eflags = old_eflags;
         R_RBX = old_rbx;
         R_RDI = old_rdi;
         R_RSI = old_rsi;