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

DSP Jit: Some small fixes to SR set functions 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5333 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2010-04-11 20:03:38 +00:00
parent db78c01ee1
commit d0e7e03c78
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DSPCore/Src/DSPEmitter.h
View File

@ -50,8 +50,8 @@ public:
void STACKALIGN RunBlock(int cycles); void STACKALIGN RunBlock(int cycles);
// Register helpers // Register helpers
void setSR(u16 bit); void setCompileSR(u16 bit);
void clrSR(u16 bit); void clrCompileSR(u16 bit);
// Memory helper functions // Memory helper functions
void increment_addr_reg(int reg); void increment_addr_reg(int reg);

46
Source/Core/DSPCore/Src/Jit/DSPJitMisc.cpp
View File

@ -129,30 +129,20 @@ void DSPEmitter::addarn(const UDSPInstruction opc)
//---- //----
void DSPEmitter::setSR(u16 bit) { void DSPEmitter::setCompileSR(u16 bit) {
// (1 << bit) // g_dsp.r[DSP_REG_SR] |= bit
MOV(32, R(EAX), Imm32(1)); OR(16, M(&g_dsp.r[DSP_REG_SR]), Imm8(bit));
SHR(32, R(EAX), Imm32(bit));
// g_dsp.r[DSP_REG_SR] |= EAX compileSR |= bit;
MOV(16, R(ECX), M(&g_dsp.r[DSP_REG_SR]));
OR(32, R(ECX), R(EAX));
compileSR |= (1 << bit);
} }
void DSPEmitter::clrSR(u16 bit) { void DSPEmitter::clrCompileSR(u16 bit) {
// ~(1 << bit)
MOV(32, R(EAX), Imm32(1));
SHR(32, R(EAX), Imm32(bit));
NOT(32, R(EAX));
// g_dsp.r[DSP_REG_SR] &= EAX // g_dsp.r[DSP_REG_SR] &= bit
MOV(16, R(ECX), M(&g_dsp.r[DSP_REG_SR])); AND(16, M(&g_dsp.r[DSP_REG_SR]), Imm8(~bit));
AND(32, R(ECX), R(EAX));
compileSR &= ~(1 << bit); compileSR &= ~bit;
} }
// SBCLR #I // SBCLR #I
// 0001 0011 aaaa aiii // 0001 0011 aaaa aiii
@ -160,9 +150,9 @@ void DSPEmitter::clrSR(u16 bit) {
// immediate value I. // immediate value I.
void DSPEmitter::sbclr(const UDSPInstruction opc) void DSPEmitter::sbclr(const UDSPInstruction opc)
{ {
u16 bit = (opc & 0x7) + 6; u8 bit = (opc & 0x7) + 6;
clrSR(bit); clrCompileSR(1 << bit);
} }
// SBSET #I // SBSET #I
@ -172,7 +162,8 @@ void DSPEmitter::sbclr(const UDSPInstruction opc)
void DSPEmitter::sbset(const UDSPInstruction opc) void DSPEmitter::sbset(const UDSPInstruction opc)
{ {
u8 bit = (opc & 0x7) + 6; u8 bit = (opc & 0x7) + 6;
setSR(bit);
setCompileSR(1 << bit);
} }
// This is a bunch of flag setters, flipping bits in SR. So far so good, // This is a bunch of flag setters, flipping bits in SR. So far so good,
@ -184,30 +175,29 @@ void DSPEmitter::srbith(const UDSPInstruction opc)
{ {
// M0/M2 change the multiplier mode (it can multiply by 2 for free). // M0/M2 change the multiplier mode (it can multiply by 2 for free).
case 0xa: // M2 case 0xa: // M2
clrSR(SR_MUL_MODIFY); clrCompileSR(SR_MUL_MODIFY);
break; break;
case 0xb: // M0 case 0xb: // M0
setSR(SR_MUL_MODIFY); setCompileSR(SR_MUL_MODIFY);
break; break;
// If set, treat multiplicands as unsigned. // If set, treat multiplicands as unsigned.
// If clear, treat them as signed. // If clear, treat them as signed.
case 0xc: // CLR15 case 0xc: // CLR15
clrSR(SR_MUL_UNSIGNED); clrCompileSR(SR_MUL_UNSIGNED);
break; break;
case 0xd: // SET15 case 0xd: // SET15
setSR(SR_MUL_UNSIGNED); setCompileSR(SR_MUL_UNSIGNED);
break; break;
// Automatic 40-bit sign extension when loading ACx.M. // Automatic 40-bit sign extension when loading ACx.M.
// SET40 changes something very important: see the LRI instruction above. // SET40 changes something very important: see the LRI instruction above.
case 0xe: // SET16 (CLR40) case 0xe: // SET16 (CLR40)
clrSR(SR_40_MODE_BIT); clrCompileSR(SR_40_MODE_BIT);
break; break;
case 0xf: // SET40 case 0xf: // SET40
setSR(SR_40_MODE_BIT); setCompileSR(SR_40_MODE_BIT);
g_dsp.r[DSP_REG_SR] |= SR_40_MODE_BIT;
break; break;
default: default: