Disables "ForceCheck" on jit invalidation on ARM32, introduced in #16194

I'm not sure if we should call it at all here, but at least this makes games work again on ARM32. Will need more investigation.
hrydgard · Oct 11, 2022 · bc28f54 · bc28f54
1 parent baa9451
commit bc28f54
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp
@@ -585,6 +585,8 @@ void ForceCheck()
 	int cyclesExecuted = slicelength - currentMIPS->downcount;
 	globalTimer += cyclesExecuted;
 	// This will cause us to check for new events immediately.
+	// NOTE: This causes problems on ARM32 in certain contexts due to jo.downcountInRegister.
+	// Not 100% sure what's going on there yet.
 	currentMIPS->downcount = -1;
 	// But let's not eat a bunch more time in Advance() because of this.
 	slicelength = -1;

diff --git a/Core/MIPS/JitCommon/JitState.cpp b/Core/MIPS/JitCommon/JitState.cpp
@@ -37,7 +37,7 @@ namespace MIPSComp {
 
 		// ARM only
 		downcountInRegister = true;
-		useNEONVFPU = false;  // true
+		useNEONVFPU = false;
 		if (Disabled(JitDisable::SIMD))
 			useNEONVFPU = false;
 

diff --git a/Core/MIPS/MIPS.cpp b/Core/MIPS/MIPS.cpp
@@ -370,7 +370,9 @@ void MIPSState::InvalidateICache(u32 address, int length) {
 		if (coreState == CORE_RUNNING || insideJit) {
 			pendingClears.emplace_back(address, length);
 			hasPendingClears = true;
+#if !PPSSPP_ARCH(ARM) // See comment in ForceCheck
 			CoreTiming::ForceCheck();
+#endif
 		} else {
 			MIPSComp::jit->InvalidateCacheAt(address, length);
 		}
@@ -383,7 +385,9 @@ void MIPSState::ClearJitCache() {
 		if (coreState == CORE_RUNNING || insideJit) {
 			pendingClears.emplace_back(0, 0);
 			hasPendingClears = true;
+#if !PPSSPP_ARCH(ARM) // See comment in ForceCheck
 			CoreTiming::ForceCheck();
+#endif
 		} else {
 			MIPSComp::jit->ClearCache();
 		}