GameDB: Rename VU0Kickstart -> VUKickstart

Clean up a couple of bits in microVU

.github/workflows/scripts/validation/lint-gamedb/lint-gamedb.py

@@ -32,7 +32,7 @@ allowed_game_fixes = [
     "VIF1StallHack",
     "GIFFIFOHack",
     "GoemonTlbHack",
-    "VU0KickstartHack",
+    "VUKickstartHack",
     "IbitHack",
     "RatchetDynaHack",
 ]

pcsx2/Config.h

@@ -40,7 +40,7 @@ enum GamefixId
 	Fix_GIFFIFO,
 	Fix_GoemonTlbMiss,
 	Fix_Ibit,
-	Fix_VU0Kickstart,
+	Fix_VUKickstart,
 	Fix_RatchetDyna,
 
 	GamefixId_COUNT
@@ -349,7 +349,7 @@ struct Pcsx2Config
 			GIFFIFOHack : 1,			// Enabled the GIF FIFO (more correct but slower)
 			GoemonTlbHack : 1,			// Gomeon tlb miss hack. The game need to access unmapped virtual address. Instead to handle it as exception, tlb are preloaded at startup
 			IbitHack : 1,				// I bit hack. Needed to stop constant VU recompilation in some games
-			VU0KickstartHack : 1,		// Gives new VU programs a slight head start and runs VU's ahead of EE to avoid VU register reading/writing issues
+			VUKickstartHack : 1,		// Gives new VU programs a slight head start and runs VU's ahead of EE to avoid VU register reading/writing issues
 			RatchetDynaHack : 1;		// Dynamically patch bad COP2 timing in EE program as it cannot be patched traditionally
 		BITFIELD_END
 

pcsx2/Pcsx2Config.cpp

@@ -285,7 +285,7 @@ const wxChar *const tbl_GamefixNames[] =
 	L"GIFFIFO",
 	L"GoemonTlb",
 	L"Ibit",
-	L"VU0Kickstart",
+	L"VUKickstart",
 	L"RatchetDyna"
 };
 
@@ -346,7 +346,7 @@ void Pcsx2Config::GamefixOptions::Set( GamefixId id, bool enabled )
 		case Fix_GIFFIFO:		GIFFIFOHack			= enabled;  break;
 		case Fix_GoemonTlbMiss: GoemonTlbHack		= enabled;  break;
 		case Fix_Ibit:			IbitHack			= enabled;  break;
-		case Fix_VU0Kickstart:	VU0KickstartHack	= enabled; break;
+		case Fix_VUKickstart:	VUKickstartHack	= enabled; break;
 		case Fix_RatchetDyna:	RatchetDynaHack		= enabled; break;
 		jNO_DEFAULT;
 	}
@@ -370,7 +370,7 @@ bool Pcsx2Config::GamefixOptions::Get( GamefixId id ) const
 		case Fix_GIFFIFO:		return GIFFIFOHack;
 		case Fix_GoemonTlbMiss: return GoemonTlbHack;
 		case Fix_Ibit:			return IbitHack;
-		case Fix_VU0Kickstart:	return VU0KickstartHack;
+		case Fix_VUKickstart:	return VUKickstartHack;
 		case Fix_RatchetDyna:	return RatchetDynaHack;
 		jNO_DEFAULT;
 	}
@@ -394,7 +394,7 @@ void Pcsx2Config::GamefixOptions::LoadSave( IniInterface& ini )
 	IniBitBool( GIFFIFOHack );
 	IniBitBool( GoemonTlbHack );
 	IniBitBool( IbitHack );
-	IniBitBool( VU0KickstartHack );
+	IniBitBool( VUKickstartHack );
 	IniBitBool( RatchetDynaHack );
 }
 

pcsx2/VUmicro.cpp

@@ -22,7 +22,7 @@
 void BaseVUmicroCPU::ExecuteBlock(bool startUp) {
 	const u32& stat	= VU0.VI[REG_VPU_STAT].UL;
 	const int  test = m_Idx ? 0x100 : 1;
-	const int  s = EmuConfig.Gamefixes.VU0KickstartHack ? 16 : 0; // Kick Start Cycles (Jak needs at least 4 due to writing values after they're read
+	const int  s = EmuConfig.Gamefixes.VUKickstartHack ? 16 : 0; // Kick Start Cycles (Jak needs at least 4 due to writing values after they're read
 
 	if (m_Idx && THREAD_VU1)
 	{

pcsx2/x86/microVU_Branch.inl

@@ -15,7 +15,6 @@
 
 #pragma once
 
-extern bool  doEarlyExit (microVU& mVU);
 extern void  mVUincCycles(microVU& mVU, int x);
 extern void* mVUcompile  (microVU& mVU, u32 startPC, uptr pState);
 extern void* mVUcompileSingleInstruction(microVU& mVU, u32 startPC, uptr pState, microFlagCycles& mFC);
@@ -56,10 +55,8 @@ void mVUDTendProgram(mV, microFlagCycles* mFC, int isEbit) {
 		if (mVUinfo.doXGKICK && xPC >= mVUinfo.XGKICKPC) {
 			mVU_XGKICK_DELAY(mVU);
 		}
-		if (doEarlyExit(mVU)) {
-			if (!isVU1) xFastCall((void*)mVU0clearlpStateJIT);
-			else		xFastCall((void*)mVU1clearlpStateJIT);
-		}
+		if (!isVU1) xFastCall((void*)mVU0clearlpStateJIT);
+		else		xFastCall((void*)mVU1clearlpStateJIT);
 	}
 
 	// Save P/Q Regs
@@ -154,12 +151,10 @@ void mVUendProgram(mV, microFlagCycles* mFC, int isEbit) {
 		if (mVUinfo.doXGKICK) {
 			mVU_XGKICK_DELAY(mVU);
 		}
-		if (doEarlyExit(mVU)) {
-			if (!isVU1)
-				xFastCall((void*)mVU0clearlpStateJIT);
-			else
-				xFastCall((void*)mVU1clearlpStateJIT);
-		}
+		if (!isVU1)
+			xFastCall((void*)mVU0clearlpStateJIT);
+		else
+			xFastCall((void*)mVU1clearlpStateJIT);
 	}
 
 	// Save P/Q Regs

pcsx2/x86/microVU_Compile.inl

@@ -358,11 +358,6 @@ void mVUdebugPrintBlocks(microVU& mVU, bool isEndPC) {
 	}
 }
 
-// vu0 is allowed to exit early, so are dev builds (for inf loops)
-__fi bool doEarlyExit(microVU& mVU) {
-	return true;// IsDevBuild || !isVU1;
-}
-
 // Saves Pipeline State for resuming from early exits
 __fi void mVUsavePipelineState(microVU& mVU) {
 	u32* lpS = (u32*)&mVU.prog.lpState;
@@ -374,33 +369,21 @@ __fi void mVUsavePipelineState(microVU& mVU) {
 // Test cycles to see if we need to exit-early...
 void mVUtestCycles(microVU& mVU, microFlagCycles& mFC) {
 	iPC = mVUstartPC;
-	if (doEarlyExit(mVU)) {
-		xMOV(eax, ptr32[&mVU.cycles]);
-		if (!EmuConfig.Gamefixes.VU0KickstartHack)
-			xSUB(eax, mVUcycles); // Running behind, make sure we have time to run the block
-		else
-			xSUB(eax, 1); // Running ahead, make sure cycles left are above 0
-		xCMP(eax, 0);
-		xForwardJGE32 skip;
-		mVUsavePipelineState(mVU);
-		if (isVU0) {
-			// TEST32ItoM((uptr)&mVU.regs().flags, VUFLAG_MFLAGSET);
-			// xFowardJZ32 vu0jmp;
-			// mVUbackupRegs(mVU, true);
-			// xFastCall(mVUwarning0, mVU.prog.cur->idx, xPC); // VU0 is allowed early exit for COP2 Interlock Simulation
-			// mVUrestoreRegs(mVU, true);
-			mVUendProgram(mVU, &mFC, 0);
-			// vu0jmp.SetTarget();
-		}
-		else {
-			/*mVUbackupRegs(mVU, true);
-			xFastCall(mVUwarning1, mVU.prog.cur->idx, xPC);
-			mVUrestoreRegs(mVU, true);
-			mVUsavePipelineState(mVU);*/
-			mVUendProgram(mVU, &mFC, 0);
-		}
-		skip.SetTarget();
-	}
+
+	xMOV(eax, ptr32[&mVU.cycles]);
+	if (!EmuConfig.Gamefixes.VUKickstartHack)
+		xSUB(eax, mVUcycles); // Running behind, make sure we have time to run the block
+	else
+		xSUB(eax, 1); // Running ahead, make sure cycles left are above 0
+
+	xCMP(eax, 0);
+	xForwardJGE32 skip;
+
+	mVUsavePipelineState(mVU);
+	mVUendProgram(mVU, &mFC, 0);
+
+	skip.SetTarget();
+
 	xSUB(ptr32[&mVU.cycles], mVUcycles);
 }
 
@@ -438,7 +421,7 @@ __fi void mVUinitFirstPass(microVU& mVU, uptr pState, u8* thisPtr) {
 	if ((uptr)&mVUregs != pState) {	// Loads up Pipeline State Info
 		memcpy((u8*)&mVUregs, (u8*)pState, sizeof(microRegInfo));
 	}
-	if (doEarlyExit(mVU) && ((uptr)&mVU.prog.lpState != pState)) {
+	if (((uptr)&mVU.prog.lpState != pState)) {
 		memcpy((u8*)&mVU.prog.lpState, (u8*)pState, sizeof(microRegInfo));
 	}
 	mVUblock.x86ptrStart	= thisPtr;