Merge pull request #10275 from AdmiralCurtiss/twX-5-byte-jmp

Jit64: Use farcode for exception exit in twX.
dolphin-emu · Dec 18, 2021 · d8e347c · d8e347c
2 parents 08d907d + 4856013
commit d8e347c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -2559,9 +2559,11 @@ void Jit64::twX(UGeckoInstruction inst)
       fixups.push_back(f);
     }
   }
-  FixupBranch dont_trap = J();
 
+  if (!fixups.empty())
   {
+    SwitchToFarCode();
+
     RCForkGuard gpr_guard = gpr.Fork();
     RCForkGuard fpr_guard = fpr.Fork();
 
@@ -2577,9 +2579,9 @@ void Jit64::twX(UGeckoInstruction inst)
     fpr.Flush();
 
     WriteExceptionExit();
-  }
 
-  SetJumpTarget(dont_trap);
+    SwitchToNearCode();
+  }
 
   if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
   {