From f690be3e944f94ff1b8e603bc4e57c9bdc61af38 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Sun, 4 Aug 2013 17:05:39 +0000
Subject: [PATCH] [ARM] Disable ori since it breaks Wind Waker.

---
 .../Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp |  2 ++
 .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp    | 16 ----------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
index e19112c1b5..9320d0b0aa 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
@@ -123,10 +123,12 @@ void JitArm::mulli(UGeckoInstruction inst)
 	MUL(RD, RA, rA);
 	gpr.Unlock(rA);
 }
+// Wrong 04-08-2013. Breaks Wind Waker booting
 void JitArm::ori(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
 	JITDISABLE(Integer)
+	Default(inst); return;
 
 	ARMReg RA = gpr.R(inst.RA);
 	ARMReg RS = gpr.R(inst.RS);
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
index 3606784aaf..130c877ccf 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
@@ -464,21 +464,6 @@ void JitArm::lha(UGeckoInstruction inst)
 	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
 	CMP(rA, EXCEPTION_DSI);
 	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)
 	{
@@ -498,7 +483,6 @@ void JitArm::lha(UGeckoInstruction inst)
 	POP(4, R0, R1, R2, R3);
 	MOV(RD, rA);
 	gpr.Unlock(rA, rB);
-#endif
 	SetJumpTarget(DoNotLoad);
 }