From 886c887e80e7cd68c1bcdb14f23e56dfc91a3d87 Mon Sep 17 00:00:00 2001
From: Tillmann Karras <tilkax@gmail.com>
Date: Fri, 25 Apr 2014 01:11:52 +0200
Subject: [PATCH] Fix Fastmem on CPUs without MOVBE

The problem was that when BSWAP was used, UnsafeWriteRegToReg() returned
the address of that instead of the MOV.
---
 Source/Core/Common/x64Analyzer.cpp              |  1 +
 Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Common/x64Analyzer.cpp b/Source/Core/Common/x64Analyzer.cpp
index 4878f9dea825..c7db683f1ede 100644
--- a/Source/Core/Common/x64Analyzer.cpp
+++ b/Source/Core/Common/x64Analyzer.cpp
@@ -154,6 +154,7 @@ bool DisassembleMov(const unsigned char *codePtr, InstructionInfo *info)
 			info->immediate = *(u32*)codePtr;
 			codePtr += 4;
 			break;
+
 		case 8:
 			info->zeroExtend = true;
 			info->immediate = *(u32*)codePtr;
diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
index ef849dd1f78e..f7020482f43b 100644
--- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
@@ -428,13 +428,23 @@ u8 *EmuCodeBlock::UnsafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acc
 	}
 #if _M_X86_64
 	result = GetWritableCodePtr();
+	OpArg dest = MComplex(RBX, reg_addr, SCALE_1, offset);
 	if (swap)
 	{
-		SwapAndStore(accessSize, MComplex(RBX, reg_addr, SCALE_1, offset), reg_value);
+		if (cpu_info.bMOVBE)
+		{
+			MOVBE(accessSize, dest, R(reg_value));
+		}
+		else
+		{
+			BSWAP(accessSize, reg_value);
+			result = GetWritableCodePtr();
+			MOV(accessSize, dest, R(reg_value));
+		}
 	}
 	else
 	{
-		MOV(accessSize, MComplex(RBX, reg_addr, SCALE_1, offset), R(reg_value));
+		MOV(accessSize, dest, R(reg_value));
 	}
 #else
 	if (swap)