Merge pull request #1036 from phire/save-jitil

Save JitIL! Fix bug so JitIL actually runs again.
dolphin-emu · Sep 11, 2014 · a96618b · a96618b
2 parents c6f3424 + 1bbc7b4
commit a96618b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp
@@ -1592,10 +1592,11 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress)
 			// 0b0011111100000111, or 0x3F07.
 			Jit->MOV(32, R(RSCRATCH), Imm32(0x3F07));
 			Jit->AND(32, R(RSCRATCH), M(((char *)&GQR(quantreg)) + 2));
-			Jit->OR(32, R(RSCRATCH), Imm8(w << 3));
+			Jit->MOVZX(32, 8, RSCRATCH2, R(RSCRATCH));
+			Jit->OR(32, R(RSCRATCH2), Imm8(w << 3));
 
-			Jit->MOV(32, R(RSCRATCH2), regLocForInst(RI, getOp1(I)));
-			Jit->CALLptr(MScaled(RSCRATCH, SCALE_8, (u32)(u64)(((JitIL *)jit)->asm_routines.pairedLoadQuantized)));
+			Jit->MOV(32, R(RSCRATCH_EXTRA), regLocForInst(RI, getOp1(I)));
+			Jit->CALLptr(MScaled(RSCRATCH2, SCALE_8, (u32)(u64)(((JitIL *)jit)->asm_routines.pairedLoadQuantized)));
 			Jit->MOVAPD(reg, R(XMM0));
 			RI.fregs[reg] = I;
 			regNormalRegClear(RI, I);
@@ -1644,7 +1645,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress)
 			Jit->AND(32, R(RSCRATCH), PPCSTATE(spr[SPR_GQR0 + quantreg]));
 			Jit->MOVZX(32, 8, RSCRATCH2, R(RSCRATCH));
 
-			Jit->MOV(32, R(RSCRATCH2), regLocForInst(RI, getOp2(I)));
+			Jit->MOV(32, R(RSCRATCH_EXTRA), regLocForInst(RI, getOp2(I)));
 			Jit->MOVAPD(XMM0, fregLocForInst(RI, getOp1(I)));
 			Jit->CALLptr(MScaled(RSCRATCH2, SCALE_8, (u32)(u64)(((JitIL *)jit)->asm_routines.pairedStoreQuantized)));
 			if (RI.IInfo[I - RI.FirstI] & 4)