ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3154 from lioncash/fallback 

DSPEmitter: Rename Default() to FallBackToInterpreter()
This commit is contained in:
Matthew Parlane 2015-10-09 11:31:48 +13:00
parent ec28d7df92 307ef88af6
commit 400a737ef9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/DSP/DSPEmitter.cpp
View File

@ -108,7 +108,7 @@ bool DSPEmitter::FlagsNeeded()
return false; return false;
} }
void DSPEmitter::Default(UDSPInstruction inst) void DSPEmitter::FallBackToInterpreter(UDSPInstruction inst)
{ {
if (opTable[inst]->reads_pc) if (opTable[inst]->reads_pc)
{ {
@ -172,7 +172,7 @@ void DSPEmitter::EmitInstruction(UDSPInstruction inst)
// Main instruction // Main instruction
if (!opTable[inst]->jitFunc) if (!opTable[inst]->jitFunc)
{ {
Default(inst); FallBackToInterpreter(inst);
INFO_LOG(DSPLLE, "Instruction not JITed(main part): %04x\n", inst); INFO_LOG(DSPLLE, "Instruction not JITed(main part): %04x\n", inst);
} }
else else

2
Source/Core/Core/DSP/DSPEmitter.h
View File

@ -36,7 +36,7 @@ public:
bool FlagsNeeded(); bool FlagsNeeded();
void Default(UDSPInstruction inst); void FallBackToInterpreter(UDSPInstruction inst);
// CC Util // CC Util
void Update_SR_Register64(Gen::X64Reg val = Gen::EAX); void Update_SR_Register64(Gen::X64Reg val = Gen::EAX);

12
Source/Core/Core/DSP/Jit/DSPJitBranch.cpp
View File

@ -134,7 +134,7 @@ static void r_jcc(const UDSPInstruction opc, DSPEmitter& emitter)
// aaaa aaaa aaaa aaaa // aaaa aaaa aaaa aaaa
// Jump to addressA if condition cc has been met. Set program counter to // Jump to addressA if condition cc has been met. Set program counter to
// address represented by value that follows this "jmp" instruction. // 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) void DSPEmitter::jcc(const UDSPInstruction opc)
{ {
MOV(16, M(&(g_dsp.pc)), Imm16(compilePC + 2)); MOV(16, M(&(g_dsp.pc)), Imm16(compilePC + 2));
@ -154,7 +154,7 @@ static void r_jmprcc(const UDSPInstruction opc, DSPEmitter& emitter)
// JMPcc $R // JMPcc $R
// 0001 0111 rrr0 cccc // 0001 0111 rrr0 cccc
// Jump to address; set program counter to a value from register $R. // 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) void DSPEmitter::jmprcc(const UDSPInstruction opc)
{ {
MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1)); 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 // Call function if condition cc has been met. Push program counter of
// instruction following "call" to $st0. Set program counter to address // instruction following "call" to $st0. Set program counter to address
// represented by value that follows this "call" instruction. // 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) void DSPEmitter::call(const UDSPInstruction opc)
{ {
MOV(16, M(&(g_dsp.pc)), Imm16(compilePC + 2)); 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 // Call function if condition cc has been met. Push program counter of
// instruction following "call" to call stack $st0. Set program counter to // instruction following "call" to call stack $st0. Set program counter to
// register $R. // 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) void DSPEmitter::callr(const UDSPInstruction opc)
{ {
MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1)); MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1));
@ -218,7 +218,7 @@ static void r_ifcc(const UDSPInstruction opc, DSPEmitter& emitter)
// IFcc // IFcc
// 0000 0010 0111 cccc // 0000 0010 0111 cccc
// Execute following opcode if the condition has been met. // 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) void DSPEmitter::ifcc(const UDSPInstruction opc)
{ {
MOV(16, M(&g_dsp.pc), Imm16((compilePC + 1) + opTable[dsp_imem_read(compilePC + 1)]->size)); 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 // 0000 0010 1101 cccc
// Return from subroutine if condition cc has been met. Pops stored PC // Return from subroutine if condition cc has been met. Pops stored PC
// from call stack $st0 and sets $pc to this location. // 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) void DSPEmitter::ret(const UDSPInstruction opc)
{ {
MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1)); MOV(16, M(&g_dsp.pc), Imm16(compilePC + 1));