Merge pull request #14730 from unknownbrackets/savedata-shutdown

Dialog: Prevent reschedule on shutdown start
hrydgard · Aug 15, 2021 · ed3201a · ed3201a
2 parents 92e7534 + 5d17ec7
commit ed3201a
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/Core/Dialog/PSPDialog.cpp b/Core/Dialog/PSPDialog.cpp
@@ -122,7 +122,7 @@ void PSPDialog::ChangeStatusInit(int delayUs) {
 
 void PSPDialog::ChangeStatusShutdown(int delayUs) {
 	// If we're doing shutdown right away and skipped start, we don't run the dialog thread.
-	bool skipDialogShutdown = status == SCE_UTILITY_STATUS_NONE;
+	bool skipDialogShutdown = status == SCE_UTILITY_STATUS_NONE && pendingStatus == SCE_UTILITY_STATUS_NONE;
 	ChangeStatus(SCE_UTILITY_STATUS_SHUTDOWN, 0);
 
 	auto params = GetCommonParam();

diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
@@ -697,11 +697,15 @@ void *GetQuickSyscallFunc(MIPSOpcode op) {
 }
 
 static double hleSteppingTime = 0.0;
-void hleSetSteppingTime(double t)
-{
+void hleSetSteppingTime(double t) {
 	hleSteppingTime += t;
 }
 
+static double hleFlipTime = 0.0;
+void hleSetFlipTime(double t) {
+	hleFlipTime = t;
+}
+
 void CallSyscall(MIPSOpcode op)
 {
 	PROFILE_THIS_SCOPE("syscall");
@@ -734,8 +738,11 @@ void CallSyscall(MIPSOpcode op)
 		int funcnum = callno & 0xFFF;
 		int modulenum = (callno & 0xFF000) >> 12;
 		double total = time_now_d() - start - hleSteppingTime;
+		if (total >= hleFlipTime)
+			total -= hleFlipTime;
 		_dbg_assert_msg_(total >= 0.0, "Time spent in syscall became negative");
 		hleSteppingTime = 0.0;
+		hleFlipTime = 0.0;
 		updateSyscallStats(modulenum, funcnum, total);
 	}
 }

diff --git a/Core/HLE/HLE.h b/Core/HLE/HLE.h
@@ -117,6 +117,8 @@ void hleDebugBreak();
 void hleSkipDeadbeef();
 // Set time spent in debugger (for more useful debug stats while debugging.)
 void hleSetSteppingTime(double t);
+// Set time spent in realtime sync.
+void hleSetFlipTime(double t);
 // Check if the current syscall context is kernel.
 bool hleIsKernelMode();
 // Enqueue a MIPS function to be called after this HLE call finishes.

diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
@@ -972,8 +972,13 @@ void __DisplaySetFramebuf(u32 topaddr, int linesize, int pixelFormat, int sync)
 		// IMMEDIATE means that the buffer is fine. We can just flip immediately.
 		// Doing it in non-buffered though creates problems (black screen) on occasion though
 		// so let's not.
-		if (!flippedThisFrame && g_Config.iRenderingMode != FB_NON_BUFFERED_MODE)
+		if (!flippedThisFrame && g_Config.iRenderingMode != FB_NON_BUFFERED_MODE) {
+			double before_flip = time_now_d();
 			__DisplayFlip(0);
+			double after_flip = time_now_d();
+			// Ignore for debug stats.
+			hleSetFlipTime(after_flip - before_flip);
+		}
 	} else {
 		// Delay the write until vblank
 		latchedFramebuf = fbstate;

diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp
@@ -390,6 +390,8 @@ static u32 sceGeDrawSync(u32 mode) {
 	//wait/check entire drawing state
 	if (PSP_CoreParameter().compat.flags().DrawSyncEatCycles)
 		hleEatCycles(500000); //HACK(?) : Potential fix for Crash Tag Team Racing and a few Gundam games
+	else
+		hleEatCycles(1240);
 	DEBUG_LOG(SCEGE, "sceGeDrawSync(mode=%d)  (0=wait for completion, 1=peek)", mode);
 	return gpu->DrawSync(mode);
 }

diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp
@@ -40,10 +40,6 @@
 #include "GPU/GPUCommon.h"
 #include "GPU/GPUState.h"
 
-void __DisableInterrupts();
-void __EnableInterrupts();
-bool __InterruptsEnabled();
-
 // Seems like some > 16 are taken but not available.  Probably kernel only?
 static const u32 PSP_NUMBER_SUBINTERRUPTS = 32;
 

diff --git a/Core/HLE/sceKernelInterrupt.h b/Core/HLE/sceKernelInterrupt.h
@@ -128,6 +128,8 @@ class IntrHandler
 	std::map<int, SubIntrHandler> subIntrHandlers;
 };
 
+void __DisableInterrupts();
+void __EnableInterrupts();
 bool __InterruptsEnabled();
 bool __IsInInterrupt();
 void __InterruptsInit();

diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
@@ -2063,7 +2063,8 @@ int __KernelStartThread(SceUID threadToStartID, int argSize, u32 argBlockPtr, bo
 			Core_ExecException(startThread->context.pc, currentMIPS->pc, ExecExceptionType::THREAD);
 		}
 		__KernelChangeReadyState(cur, currentThread, true);
-		hleReSchedule("thread started");
+		if (__InterruptsEnabled())
+			hleReSchedule("thread started");
 	}
 
 	// Starting a thread automatically resumes the dispatch thread if the new thread has worse priority.

diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp
@@ -35,6 +35,7 @@
 #include "Core/System.h"
 
 #include "Core/HLE/sceKernel.h"
+#include "Core/HLE/sceKernelInterrupt.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/scePower.h"
@@ -326,8 +327,12 @@ void UtilityDialogShutdown(UtilityDialogType type, int delayUs, int priority) {
 
 	CleanupDialogThreads();
 	_assert_(accessThread == nullptr);
+	bool prevInterrupts = __InterruptsEnabled();
+	__DisableInterrupts();
 	accessThread = new HLEHelperThread("ScePafJob", insts, (uint32_t)ARRAY_SIZE(insts), priority, 0x200);
 	accessThread->Start(partDelay, 0);
+	if (prevInterrupts)
+		__EnableInterrupts();
 }
 
 static int UtilityWorkUs(int us) {