VU: Sync tighter when VU Kickstart is disabled + Improved M-Bit Sync

2021-09-18 23:06:12 +01:00 · 2021-09-18 23:06:12 +01:00 · 8fe0061751
parent ee9672858c
commit 8fe0061751
6 changed files with 43 additions and 103 deletions
--- a/bin/GameIndex.yaml
+++ b/bin/GameIndex.yaml
@ -6825,10 +6825,8 @@ SLED-53745:
  name: "Total Overdose [Demo]"
  region: "PAL-M5"
 SLED-53845:
-  name: "Matrix - Path of Neo [Demo]"
+  name: "Matrix, The - Path of Neo [Demo]"
  region: "PAL-E"
-  gameFixes:
-  - VUKickstartHack
 SLED-53937:
  name: "Black [Demo]"
  region: "PAL-M5"
@ -12853,13 +12851,9 @@ SLES-53046:
 SLES-53047:
  name: "Punisher, The"
  region: "PAL-E-F"
-  gameFixes:
-    - VUKickstartHack # Fixes Character SPS and Flying Characters.
 SLES-53049:
  name: "Punisher, The"
  region: "PAL-I-S"
-  gameFixes:
-    - VUKickstartHack # Fixes Character SPS and Flying Characters.
 SLES-53052:
  name: "Robots"
  region: "PAL-M5"
@ -12983,8 +12977,6 @@ SLES-53114:
  region: "PAL-M5"
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLES-53119:
  name: "Kessen III"
  region: "PAL-E"
@ -13017,8 +13009,6 @@ SLES-53131:
  region: "PAL-E"
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLES-53138:
  name: "Outlaw Volleyball - Remixed"
  region: "PAL-M4"
@ -13127,8 +13117,6 @@ SLES-53194:
 SLES-53195:
  name: "Punisher, The"
  region: "PAL-E"
-  gameFixes:
-    - VUKickstartHack # Fixes Character SPS and Flying Characters.
 SLES-53196:
  name: "Destroy All Humans!"
  region: "PAL-M4"
@ -13149,8 +13137,6 @@ SLES-53201:
 SLES-53203:
  name: "Punisher, The"
  region: "PAL-R"
-  gameFixes:
-    - VUKickstartHack # Fixes Character SPS and Flying Characters.
 SLES-53218:
  name: "Dancing Stage MAX"
  region: "PAL-M5"
@ -13586,8 +13572,6 @@ SLES-53461:
 SLES-53462:
  name: "Matrix, The - Path of Neo"
  region: "PAL-M5"
-  gameFixes:
-    - VUKickstartHack
 SLES-53463:
  name: "NHL '06"
  region: "PAL-E"
@ -14126,8 +14110,6 @@ SLES-53656:
  region: "PAL-M4"
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLES-53657:
  name: "Shrek - Super Slam"
  region: "PAL-E"
@ -14382,8 +14364,6 @@ SLES-53758:
 SLES-53759:
  name: "Matrix, The - Path of Neo"
  region: "PAL-M5"
-  gameFixes:
-  - VUKickstartHack
 SLES-53760:
  name: "Rugby Challenge 2006"
  region: "PAL-M5"
@ -14457,8 +14437,6 @@ SLES-53799:
  name: "Matrix, The - Path of Neo"
  region: "PAL-M4"
  compat: 5
-  gameFixes:
-  - VUKickstartHack
 SLES-53800:
  name: "Rampage - Total Destruction"
  region: "PAL-M5"
@ -14681,8 +14659,6 @@ SLES-53909:
  region: "PAL-G"
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLES-53910:
  name: "Agent Hugo"
  region: "PAL-R"
@ -18837,8 +18813,6 @@ SLKA-25264:
  region: "NTSC-K"
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLKA-25265:
  name: "Devil May Cry 3"
  region: "NTSC-K"
@ -24817,7 +24791,7 @@ SLPM-66176:
  region: "NTSC-J"
  compat: 5
 SLPM-66177:
-  name: "Matrix,The - Path of Neo"
+  name: "Matrix, The - Path of Neo"
  region: "NTSC-J"
 SLPM-66178:
  name: "Pop'n Music 7 [Konami The Best]"
@ -25096,8 +25070,6 @@ SLPM-66263:
  region: "NTSC-J"
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLPM-66264:
  name: "Canvas 2 - Niji-iro no Sketch [Deluxe Pack]"
  region: "NTSC-J"
@ -25602,8 +25574,6 @@ SLPM-66427:
  region: "NTSC-J"
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLPM-66429:
  name: "Special Forces - Fire for Effect"
  region: "NTSC-J"
@ -35733,8 +35703,6 @@ SLUS-20864:
  name: "Punisher, The"
  region: "NTSC-U"
  compat: 5
-  gameFixes:
-    - VUKickstartHack # Fixes Character SPS and Flying Characters.
 SLUS-20865:
  name: "Backyard Baseball"
  region: "NTSC-U"
@ -36995,8 +36963,6 @@ SLUS-21145:
  compat: 5
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLUS-21146:
  name: "Far East of Eden"
  region: "NTSC-U"
@ -37483,8 +37449,6 @@ SLUS-21250:
  compat: 5
  speedHacks:
    mvuFlagSpeedHack: 0  # Fixes bad graphics.
-  gameFixes:
-  - VUKickstartHack
 SLUS-21251:
  name: "FlatOut 2"
  region: "NTSC-U"
@ -37604,8 +37568,6 @@ SLUS-21273:
  name: "Matrix, The - Path of Neo"
  region: "NTSC-U"
  compat: 5
-  gameFixes:
-    - VUKickstartHack
 SLUS-21274:
  name: "OutRun 2006: Coast 2 Coast"
  region: "NTSC-U"
@ -40847,8 +40809,6 @@ SLUS-29137:
 SLUS-29138:
  name: "Punisher, The [Demo]"
  region: "NTSC-U"
-  gameFixes:
-    - VUKickstartHack # Fixes Character SPS and Flying Characters.
 SLUS-29139:
  name: "Shadow of Rome [Demo]"
  region: "NTSC-U"
--- a/pcsx2/SPR.cpp
+++ b/pcsx2/SPR.cpp
@ -30,10 +30,22 @@ static void TestClearVUs(u32 madr, u32 qwc, bool isWrite)
 {
 	if (madr >= 0x11000000 && (madr < 0x11010000))
 	{
-		// Sync the VU's if they're running, writing/reading from VU memory while they're running can be timing sensitive.
+		// Access to VU memory is only allowed when the VU is stopped
 		// Use Psychonauts for testing
-		CpuVU0->ExecuteBlock(0);
-		CpuVU1->ExecuteBlock(0);
+
+		if ((madr < 0x11008000) && (VU0.VI[REG_VPU_STAT].UL & 0x1))
+		{
+			_vu0FinishMicro();
+			//Catch up VU1 too
+			CpuVU1->ExecuteBlock(0);
+		}
+		if ((madr >= 0x11008000) && (VU0.VI[REG_VPU_STAT].UL & 0x100) && !THREAD_VU1)
+		{
+			CpuVU1->Execute(vu1RunCycles);
+			cpuRegs.cycle = VU1.cycle;
+			//Catch up VU0 too
+			CpuVU0->ExecuteBlock(0);
+		}

 		if (madr < 0x11004000)
 		{
--- a/pcsx2/VU0.cpp
+++ b/pcsx2/VU0.cpp
@ -59,7 +59,7 @@ __fi void _vu0run(bool breakOnMbit, bool addCycles) {
 	if (!(VU0.VI[REG_VPU_STAT].UL & 1)) return;

 	//VU0 is ahead of the EE and M-Bit is already encountered, so no need to wait for it, just catch up the EE
-	if ((VU0.flags & VUFLAG_MFLAGSET) && breakOnMbit && (s32)(cpuRegs.cycle - VU0.cycle) < 0)
+	if ((VU0.flags & VUFLAG_MFLAGSET) && breakOnMbit && (s32)(cpuRegs.cycle - VU0.cycle) <= 0)
 	{
 		cpuRegs.cycle = VU0.cycle;
 		return;
@ -78,6 +78,7 @@ __fi void _vu0run(bool breakOnMbit, bool addCycles) {
 	{
 		cpuRegs.cycle += (VU0.cycle - startcycle);
 		CpuVU1->ExecuteBlock(0); // Catch up VU1 as it's likely fallen behind
+		cpuSetNextEventDelta(4);
 	}
 }

--- a/pcsx2/VUmicro.cpp
+++ b/pcsx2/VUmicro.cpp
@ -33,41 +33,20 @@ void BaseVUmicroCPU::ExecuteBlock(bool startUp)
 		return;
 	}

-	// VU currently flushes XGKICK on VU1 end so no need for this, yet
-	/*if (!(stat & test))
+	
+	if (!(stat & test))
 	{
-		if (m_Idx == 1 && VU1.xgkickenable)
+		// VU currently flushes XGKICK on VU1 end so no need for this, yet
+		/*if (m_Idx == 1 && VU1.xgkickenable)
 		{
 			_vuXGKICKTransfer((cpuRegs.cycle - VU1.xgkicklastcycle), false);
-		}
+		}*/
 		return;
-	}*/
+	}

-	// You might be looking at this and thinking, what the hell is going on? What's with all these conditions?
-	// Well, basically M-Bit timed games are REALLY picky, so we need some extra checks in to make sure the VU
-	// doesn't go too long without updating/syncing as games will wait for an M-Bit then transfer a bunch of stuff
-	// since they will know what the timing is going to be on them, so we need to keep it somewhat tight.
-	// For everything else (Especially stuff that needs kickstart), they can do what they like.
 	if (startUp) // Start Executing a microprogram (When kickstarted)
 	{
 		Execute(s); // Kick start VU
-
-		if (stat & test)
-		{
-			if (m_Idx)
-				cpuRegs.cycle = VU1.cycle;
-			else
-				cpuRegs.cycle = VU0.cycle;
-
-			u32 nextblockcycles = m_Idx ? VU1.nextBlockCycles : VU0.nextBlockCycles;
-
-			bool useNextBlocks = (VU0.flags & VUFLAG_MFLAGSET) || VU0.blockhasmbit || !EmuConfig.Cpu.Recompiler.EnableVU0;
-			
-			if(useNextBlocks)
-				cpuSetNextEventDelta(nextblockcycles);
-			else if(s)
-				cpuSetNextEventDelta(s);
-		}
 	}
 	else // Continue Executing
 	{
@ -85,19 +64,6 @@ void BaseVUmicroCPU::ExecuteBlock(bool startUp)
 			if (delta >= nextblockcycles && delta > 0) // When running behind, make sure we have enough cycles passed for the block to run
 				Execute(delta);
 		}
-
-		if ((stat & test) && (!EmuConfig.Gamefixes.VUKickstartHack || (!m_Idx && !EmuConfig.Cpu.Recompiler.EnableVU0)))
-		{
-			// Queue up next required time to run a block
-			nextblockcycles = m_Idx ? VU1.nextBlockCycles : VU0.nextBlockCycles;
-			cycle = m_Idx ? VU1.cycle : VU0.cycle;
-			nextblockcycles = nextblockcycles - (cycle - cpuRegs.cycle);
-
-			if (nextblockcycles > 0 || (VU0.flags & VUFLAG_MFLAGSET) || VU0.blockhasmbit)
-			{
-				cpuSetNextEventDelta(nextblockcycles);
-			}
-		}
 	}
 }

--- a/pcsx2/x86/ix86-32/iR5900LoadStore.cpp
+++ b/pcsx2/x86/ix86-32/iR5900LoadStore.cpp
@ -929,7 +929,7 @@ void recLQC2()
 	xForwardJZ32 skipvuidle;
 	xSUB(eax, ptr32[&VU0.cycle]);
 	xSUB(eax, ptr32[&VU0.nextBlockCycles]);
-	xCMP(eax, 8);
+	xCMP(eax, EmuConfig.Gamefixes.VUKickstartHack ? 8 : 0);
 	xForwardJL32 skip;
 	xLoadFarAddr(arg1reg, CpuVU0);
 	xFastCall((void*)BaseVUmicroCPU::ExecuteBlockJIT, arg1reg);
@ -967,6 +967,7 @@ void recSQC2()
 {
 	iFlushCall(FLUSH_EVERYTHING);

+
 	xMOV(eax, ptr32[&cpuRegs.cycle]);
 	xADD(eax, scaleblockcycles_clear());
 	xMOV(ptr32[&cpuRegs.cycle], eax); // update cycles
@ -974,7 +975,7 @@ void recSQC2()
 	xForwardJZ32 skipvuidle;
 	xSUB(eax, ptr32[&VU0.cycle]);
 	xSUB(eax, ptr32[&VU0.nextBlockCycles]);
-	xCMP(eax, 8);
+	xCMP(eax, EmuConfig.Gamefixes.VUKickstartHack ? 8 : 0);
 	xForwardJL32 skip;
 	xLoadFarAddr(arg1reg, CpuVU0);
 	xFastCall((void*)BaseVUmicroCPU::ExecuteBlockJIT, arg1reg);
--- a/pcsx2/x86/microVU_Macro.inl
+++ b/pcsx2/x86/microVU_Macro.inl
@ -294,9 +294,9 @@ void COP2_Interlock(bool mBitSync)
 		xForwardJZ32 skipvuidle;
 		if (mBitSync)
 		{
-			xSUB(eax, ptr32[&vu0Regs.cycle]);
-			xSUB(eax, ptr32[&vu0Regs.nextBlockCycles]);
-			xCMP(eax, 8);
+			xSUB(eax, ptr32[&VU0.cycle]);
+			xSUB(eax, ptr32[&VU0.nextBlockCycles]);
+			xCMP(eax, 0);
 			xForwardJL32 skip;
 			xLoadFarAddr(arg1reg, CpuVU0);
 			xFastCall((void*)BaseVUmicroCPU::ExecuteBlockJIT, arg1reg);
@ -337,9 +337,9 @@ static void recCFC2()
 		xMOV(ptr32[&cpuRegs.cycle], eax); // update cycles
 		xTEST(ptr32[&VU0.VI[REG_VPU_STAT].UL], 0x1);
 		xForwardJZ32 skipvuidle;
-		xSUB(eax, ptr32[&vu0Regs.cycle]);
-		xSUB(eax, ptr32[&vu0Regs.nextBlockCycles]);
-		xCMP(eax, 8);
+		xSUB(eax, ptr32[&VU0.cycle]);
+		xSUB(eax, ptr32[&VU0.nextBlockCycles]);
+		xCMP(eax, EmuConfig.Gamefixes.VUKickstartHack ? 8 : 0);
 		xForwardJL32 skip;
 		xLoadFarAddr(arg1reg, CpuVU0);
 		xFastCall((void*)BaseVUmicroCPU::ExecuteBlockJIT, arg1reg);
@ -423,9 +423,9 @@ static void recCTC2()

 		xTEST(ptr32[&VU0.VI[REG_VPU_STAT].UL], 0x1);
 		xForwardJZ32 skipvuidle;
-		xSUB(eax, ptr32[&vu0Regs.cycle]);
-		xSUB(eax, ptr32[&vu0Regs.nextBlockCycles]);
-		xCMP(eax, 8);
+		xSUB(eax, ptr32[&VU0.cycle]);
+		xSUB(eax, ptr32[&VU0.nextBlockCycles]);
+		xCMP(eax, EmuConfig.Gamefixes.VUKickstartHack ? 8 : 0);
 		xForwardJL32 skip;
 		xLoadFarAddr(arg1reg, CpuVU0);
 		xFastCall((void*)BaseVUmicroCPU::ExecuteBlockJIT, arg1reg);
@ -517,9 +517,9 @@ static void recQMFC2()

 		xTEST(ptr32[&VU0.VI[REG_VPU_STAT].UL], 0x1);
 		xForwardJZ32 skipvuidle;
-		xSUB(eax, ptr32[&vu0Regs.cycle]);
-		xSUB(eax, ptr32[&vu0Regs.nextBlockCycles]);
-		xCMP(eax, 8);
+		xSUB(eax, ptr32[&VU0.cycle]);
+		xSUB(eax, ptr32[&VU0.nextBlockCycles]);
+		xCMP(eax, EmuConfig.Gamefixes.VUKickstartHack ? 8 : 0);
 		xForwardJL32 skip;
 		xLoadFarAddr(arg1reg, CpuVU0);
 		xFastCall((void*)BaseVUmicroCPU::ExecuteBlockJIT, arg1reg);
@ -552,9 +552,9 @@ static void recQMTC2()

 		xTEST(ptr32[&VU0.VI[REG_VPU_STAT].UL], 0x1);
 		xForwardJZ32 skipvuidle;
-		xSUB(eax, ptr32[&vu0Regs.cycle]);
-		xSUB(eax, ptr32[&vu0Regs.nextBlockCycles]);
-		xCMP(eax, 8);
+		xSUB(eax, ptr32[&VU0.cycle]);
+		xSUB(eax, ptr32[&VU0.nextBlockCycles]);
+		xCMP(eax, EmuConfig.Gamefixes.VUKickstartHack ? 8 : 0);
 		xForwardJL32 skip;
 		xLoadFarAddr(arg1reg, CpuVU0);
 		xFastCall((void*)BaseVUmicroCPU::ExecuteBlockJIT, arg1reg);