Merge pull request #14731 from unknownbrackets/savedata-start

Dialog: Lock volatile when the access thread runs
hrydgard · Aug 15, 2021 · 92e7534 · 92e7534
2 parents f01d4d6 + 04828e8
commit 92e7534
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp
@@ -276,8 +276,15 @@ void __UtilityShutdown() {
 void UtilityDialogInitialize(UtilityDialogType type, int delayUs, int priority) {
 	int partDelay = delayUs / 4;
 	const u32_le insts[] = {
-		// Make sure we don't discard/deadbeef 'em.
+		// Make sure we don't discard/deadbeef a0.
 		(u32_le)MIPS_MAKE_ORI(MIPS_REG_S0, MIPS_REG_A0, 0),
+
+		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A0, MIPS_REG_ZERO, 0),
+		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A1, MIPS_REG_ZERO, 0),
+		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A2, MIPS_REG_ZERO, 0),
+		(u32_le)MIPS_MAKE_SYSCALL("sceSuspendForUser", "sceKernelVolatileMemLock"),
+
+		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A0, MIPS_REG_S0, 0),
 		(u32_le)MIPS_MAKE_SYSCALL("sceUtility", "__UtilityWorkUs"),
 		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A0, MIPS_REG_S0, 0),
 		(u32_le)MIPS_MAKE_SYSCALL("sceUtility", "__UtilityWorkUs"),
@@ -286,12 +293,6 @@ void UtilityDialogInitialize(UtilityDialogType type, int delayUs, int priority)
 		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A0, MIPS_REG_S0, 0),
 		(u32_le)MIPS_MAKE_SYSCALL("sceUtility", "__UtilityWorkUs"),
 
-		// Now actually lock the volatile memory.  Maybe this should be earlier...
-		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A0, MIPS_REG_ZERO, 0),
-		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A1, MIPS_REG_ZERO, 0),
-		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A2, MIPS_REG_ZERO, 0),
-		(u32_le)MIPS_MAKE_SYSCALL("sceSuspendForUser", "sceKernelVolatileMemLock"),
-
 		(u32_le)MIPS_MAKE_ORI(MIPS_REG_A0, MIPS_REG_ZERO, (int)type),
 		(u32_le)MIPS_MAKE_JR_RA(),
 		(u32_le)MIPS_MAKE_SYSCALL("sceUtility", "__UtilityInitDialog"),