Merge pull request #7217 from hilesaz/master

Fix to VFPU register allocation. Fixes #7174
hrydgard · Dec 23, 2014 · 98f1ac9 · 98f1ac9
2 parents 53ab7ab + a9b7656
commit 98f1ac9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp
@@ -121,7 +121,7 @@ JitOptions::JitOptions()
 	continueBranches = false;
 	continueJumps = false;
 	continueMaxInstructions = 300;
-	enableVFPUSIMD = false;
+	enableVFPUSIMD = true;
 	// Set by Asm if needed.
 	reserveR15ForAsm = false;
 }

diff --git a/Core/MIPS/x86/RegCacheFPU.cpp b/Core/MIPS/x86/RegCacheFPU.cpp
@@ -354,6 +354,9 @@ X64Reg FPURegCache::LoadRegsVS(const u8 *v, int n) {
 		for (int i = 0; i < 4; ++i) {
 			xrsLoaded[i] = false;
 		}
+		for (int i = 2; i < n; ++i){
+			xrs[i] = INVALID_REG;
+		}
 		regsLoaded = 0;
 	}