diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 723d237315..842b1c3de7 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -231,8 +231,7 @@ void Jit64::Shutdown() farcode.Shutdown(); } -// This is only called by FallBackToInterpreter() in this file. It will execute an instruction with the interpreter functions. -void Jit64::WriteCallInterpreter(UGeckoInstruction inst) +void Jit64::FallBackToInterpreter(UGeckoInstruction inst) { gpr.Flush(); fpr.Flush(); @@ -247,11 +246,6 @@ void Jit64::WriteCallInterpreter(UGeckoInstruction inst) ABI_PopRegistersAndAdjustStack({}, 0); } -void Jit64::FallBackToInterpreter(UGeckoInstruction _inst) -{ - WriteCallInterpreter(_inst.hex); -} - void Jit64::HLEFunction(UGeckoInstruction _inst) { gpr.Flush(); diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h index fe0376e921..12232edc76 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.h +++ b/Source/Core/Core/PowerPC/Jit64/Jit.h @@ -104,7 +104,6 @@ public: void WriteExceptionExit(); void WriteExternalExceptionExit(); void WriteRfiExitDestInRSCRATCH(); - void WriteCallInterpreter(UGeckoInstruction _inst); bool Cleanup(); void GenerateConstantOverflow(bool overflow); diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index d457f6e766..c05c031d1c 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -288,23 +288,6 @@ void JitIL::Shutdown() farcode.Shutdown(); } - -void JitIL::WriteCallInterpreter(UGeckoInstruction inst) -{ - if (js.isLastInstruction) - { - MOV(32, PPCSTATE(pc), Imm32(js.compilerPC)); - MOV(32, PPCSTATE(npc), Imm32(js.compilerPC + 4)); - } - Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst); - ABI_CallFunctionC((void*)instr, inst.hex); - if (js.isLastInstruction) - { - MOV(32, R(RSCRATCH), PPCSTATE(npc)); - WriteRfiExitDestInOpArg(R(RSCRATCH)); - } -} - void JitIL::FallBackToInterpreter(UGeckoInstruction _inst) { ibuild.EmitFallBackToInterpreter( diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h index aaf5ea6569..3efb1f3905 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.h +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.h @@ -82,7 +82,6 @@ public: void WriteExitDestInOpArg(const Gen::OpArg& arg); void WriteExceptionExit(); void WriteRfiExitDestInOpArg(const Gen::OpArg& arg); - void WriteCallInterpreter(UGeckoInstruction _inst); void Cleanup(); void WriteCode(u32 exitAddress);