diff --git a/Source/Core/Core/DSP/DSPEmitter.cpp b/Source/Core/Core/DSP/DSPEmitter.cpp index 89aba1b105..db27373a66 100644 --- a/Source/Core/Core/DSP/DSPEmitter.cpp +++ b/Source/Core/Core/DSP/DSPEmitter.cpp @@ -108,7 +108,7 @@ bool DSPEmitter::FlagsNeeded() return false; } -void DSPEmitter::Default(UDSPInstruction inst) +void DSPEmitter::FallBackToInterpreter(UDSPInstruction inst) { if (opTable[inst]->reads_pc) { @@ -172,7 +172,7 @@ void DSPEmitter::EmitInstruction(UDSPInstruction inst) // Main instruction if (!opTable[inst]->jitFunc) { - Default(inst); + FallBackToInterpreter(inst); INFO_LOG(DSPLLE, "Instruction not JITed(main part): %04x\n", inst); } else diff --git a/Source/Core/Core/DSP/DSPEmitter.h b/Source/Core/Core/DSP/DSPEmitter.h index f5b01dd391..dc5600c668 100644 --- a/Source/Core/Core/DSP/DSPEmitter.h +++ b/Source/Core/Core/DSP/DSPEmitter.h @@ -36,7 +36,7 @@ public: bool FlagsNeeded(); - void Default(UDSPInstruction inst); + void FallBackToInterpreter(UDSPInstruction inst); // CC Util void Update_SR_Register64(Gen::X64Reg val = Gen::EAX); diff --git a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp index d77d071750..a1d22d51f5 100644 --- a/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp +++ b/Source/Core/Core/DSP/Jit/DSPJitBranch.cpp @@ -134,7 +134,7 @@ static void r_jcc(const UDSPInstruction opc, DSPEmitter& emitter) // aaaa aaaa aaaa aaaa // Jump to addressA if condition cc has been met. Set program counter to // address represented by value that follows this "jmp" instruction. -// NOTE: Cannot use Default(opc) here because of the need to write branch exit +// NOTE: Cannot use FallBackToInterpreter(opc) here because of the need to write branch exit void DSPEmitter::jcc(const UDSPInstruction opc) { MOV(16, M(&(g_dsp.pc)), Imm16(compilePC + 2)); @@ -154,7 +154,7 @@ static void r_jmprcc(const UDSPInstruction opc, DSPEmitter& emitter) // JMPcc $R // 0001 0111 rrr0 cccc // Jump to address; set program counter to a value from register $R. -// NOTE: Cannot use Default(opc) here because of the need to write branch exit +// NOTE: Cannot use FallBackToInterpreter(opc) here because of the need to write branch exit void DSPEmitter::jmprcc(const UDSPInstruction opc) { MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1)); @@ -181,7 +181,7 @@ static void r_call(const UDSPInstruction opc, DSPEmitter& emitter) // Call function if condition cc has been met. Push program counter of // instruction following "call" to $st0. Set program counter to address // represented by value that follows this "call" instruction. -// NOTE: Cannot use Default(opc) here because of the need to write branch exit +// NOTE: Cannot use FallBackToInterpreter(opc) here because of the need to write branch exit void DSPEmitter::call(const UDSPInstruction opc) { MOV(16, M(&(g_dsp.pc)), Imm16(compilePC + 2)); @@ -203,7 +203,7 @@ static void r_callr(const UDSPInstruction opc, DSPEmitter& emitter) // Call function if condition cc has been met. Push program counter of // instruction following "call" to call stack $st0. Set program counter to // register $R. -// NOTE: Cannot use Default(opc) here because of the need to write branch exit +// NOTE: Cannot use FallBackToInterpreter(opc) here because of the need to write branch exit void DSPEmitter::callr(const UDSPInstruction opc) { MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1)); @@ -218,7 +218,7 @@ static void r_ifcc(const UDSPInstruction opc, DSPEmitter& emitter) // IFcc // 0000 0010 0111 cccc // Execute following opcode if the condition has been met. -// NOTE: Cannot use Default(opc) here because of the need to write branch exit +// NOTE: Cannot use FallBackToInterpreter(opc) here because of the need to write branch exit void DSPEmitter::ifcc(const UDSPInstruction opc) { MOV(16, M(&g_dsp.pc), Imm16((compilePC + 1) + opTable[dsp_imem_read(compilePC + 1)]->size)); @@ -238,7 +238,7 @@ static void r_ret(const UDSPInstruction opc, DSPEmitter& emitter) // 0000 0010 1101 cccc // Return from subroutine if condition cc has been met. Pops stored PC // from call stack $st0 and sets $pc to this location. -// NOTE: Cannot use Default(opc) here because of the need to write branch exit +// NOTE: Cannot use FallBackToInterpreter(opc) here because of the need to write branch exit void DSPEmitter::ret(const UDSPInstruction opc) { MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1));