Added a check for a redundant mov in the fastmem writes code.

Fixes issue 6905.
dolphin-emu · Jan 13, 2014 · 8b53385 · 8b53385
1 parent e00c3ce
commit 8b53385
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBackpatch.cpp
@@ -117,13 +117,17 @@ const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info, u32 r
 		PanicAlert("Incorrect use of SafeWriteRegToReg");
 	if (addrReg != ABI_PARAM1)
 	{
-		MOV(64, R(ABI_PARAM1), R((X64Reg)dataReg));
-		MOV(64, R(ABI_PARAM2), R((X64Reg)addrReg));
+		if (ABI_PARAM1 != dataReg)
+			MOV(64, R(ABI_PARAM1), R((X64Reg)dataReg));
+		if (ABI_PARAM2 != addrReg)
+			MOV(64, R(ABI_PARAM2), R((X64Reg)addrReg));
 	}
 	else
 	{
-		MOV(64, R(ABI_PARAM2), R((X64Reg)addrReg));
-		MOV(64, R(ABI_PARAM1), R((X64Reg)dataReg));
+		if (ABI_PARAM2 != addrReg)
+			MOV(64, R(ABI_PARAM2), R((X64Reg)addrReg));
+		if (ABI_PARAM1 != dataReg)
+			MOV(64, R(ABI_PARAM1), R((X64Reg)dataReg));
 	}
 
 	if (info.displacement)