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

[ARM] Disable ori since it breaks Wind Waker.

This commit is contained in:
Ryan Houdek 2013-08-04 17:05:39 +00:00
parent af71100867
commit f690be3e94
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
View File

@ -123,10 +123,12 @@ void JitArm::mulli(UGeckoInstruction inst)
MUL(RD, RA, rA); MUL(RD, RA, rA);
gpr.Unlock(rA); gpr.Unlock(rA);
} }
// Wrong 04-08-2013. Breaks Wind Waker booting
void JitArm::ori(UGeckoInstruction inst) void JitArm::ori(UGeckoInstruction inst)
{ {
INSTRUCTION_START INSTRUCTION_START
JITDISABLE(Integer) JITDISABLE(Integer)
Default(inst); return;
ARMReg RA = gpr.R(inst.RA); ARMReg RA = gpr.R(inst.RA);
ARMReg RS = gpr.R(inst.RS); ARMReg RS = gpr.R(inst.RS);

16
Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
View File

@ -464,21 +464,6 @@ void JitArm::lha(UGeckoInstruction inst)
LDR(rA, R9, PPCSTATE_OFF(Exceptions)); LDR(rA, R9, PPCSTATE_OFF(Exceptions));
CMP(rA, EXCEPTION_DSI); CMP(rA, EXCEPTION_DSI);
FixupBranch DoNotLoad = B_CC(CC_EQ); FixupBranch DoNotLoad = B_CC(CC_EQ);
#if 0 // FASTMEM
// Backpatch route
// Gets loaded in to RD
// Address is in R10
gpr.Unlock(rA, rB);
if (inst.RA)
{
ARMReg RA = gpr.R(inst.RA);
MOV(R10, RA); // - 4
}
else
MOV(R10, 0); // - 4
LoadToReg(RD, R10, 16, (u32)inst.SIMM_16);
#else
if (inst.RA) if (inst.RA)
{ {
@ -498,7 +483,6 @@ void JitArm::lha(UGeckoInstruction inst)
POP(4, R0, R1, R2, R3); POP(4, R0, R1, R2, R3);
MOV(RD, rA); MOV(RD, rA);
gpr.Unlock(rA, rB); gpr.Unlock(rA, rB);
#endif
SetJumpTarget(DoNotLoad); SetJumpTarget(DoNotLoad);
} }