Merge pull request #2107 from Sonicadvance1/aarch64_fix_lha

[AArch64] Fix fastmem lha/lhax.
dolphin-emu · Feb 23, 2015 · 7a61bd5 · 7a61bd5
2 parents d4733b5 + 859eeb6
commit 7a61bd5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp
@@ -101,10 +101,16 @@ bool JitArm64::DisasmLoadStore(const u8* ptr, u32* flags, ARM64Reg* reg)
 	{
 		*flags |= BackPatchInfo::FLAG_LOAD;
 		*reg = (ARM64Reg)(inst & 0x1F);
-		if ((next_inst & 0x7FFFF000) != 0x5AC00000) // REV
+		if ((next_inst & 0x7FFFF000) == 0x5AC00000) // REV
+		{
+			u32 sxth_inst = *(u32*)(ptr + 8);
+			if ((sxth_inst & 0x7F800000) == 0x13000000) // SXTH
+				*flags |= BackPatchInfo::FLAG_EXTEND;
+		}
+		else
+		{
 			*flags |= BackPatchInfo::FLAG_REVERSE;
-		if ((next_inst & 0x7F800000) == 0x13000000) // SXTH
-			*flags |= BackPatchInfo::FLAG_EXTEND;
+		}
 		return true;
 	}
 	else if (op == 0xE4) // Store