Fix dmac regression

hrydgard · Jan 20, 2025 · a2d436b · a2d436b
1 parent eba460f
commit a2d436b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Core/HLE/AtracCtx2.cpp b/Core/HLE/AtracCtx2.cpp
@@ -6,8 +6,8 @@
 #include "Core/HW/Atrac3Standalone.h"
 
 // Convenient command line:
-// Windows\x64\debug\PPSSPPHeadless.exe  --root pspautotests/tests/../ --compare --timeout=5 --new-atrac --graphics=software pspautotests/tests/audio/atrac/decode.prx
-
+// Windows\x64\debug\PPSSPPHeadless.exe  --root pspautotests/tests/../ -o --compare --timeout=30 --graphics=software pspautotests/tests/audio/atrac/... --ignore pspautotests/tests/audio/atrac/second/resetting.prx --ignore pspautotests/tests/audio/atrac/second/replay.prx
+//
 // See the big comment in sceAtrac.cpp for an overview of the different modes of operation.
 //
 // Test cases

diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
@@ -716,9 +716,8 @@ static int sceAtracReinit(int at3Count, int at3plusCount) {
 
 	// This seems to deinit things.  Mostly, it cause a reschedule on next deinit (but -1, -1 does not.)
 	if (at3Count == 0 && at3plusCount == 0) {
-		INFO_LOG(Log::ME, "sceAtracReinit(%d, %d): deinit", at3Count, at3plusCount);
 		atracInited = false;
-		return hleDelayResult(0, "atrac reinit", 200);
+		return hleDelayResult(hleLogSuccessInfoI(Log::ME, 0, "deinit"), "atrac reinit", 200);
 	}
 
 	// First, ATRAC3+.  These IDs seem to cost double (probably memory.)

diff --git a/Core/HLE/sceDmac.cpp b/Core/HLE/sceDmac.cpp
@@ -44,7 +44,7 @@ void __DmacDoState(PointerWrap &p) {
 	Do(p, dmacMemcpyDeadline);
 }
 
-static void __DmacMemcpy(u32 dst, u32 src, u32 size, int *delay) {
+static int __DmacMemcpy(u32 dst, u32 src, u32 size) {
 	bool skip = false;
 	if (Memory::IsVRAMAddress(src) || Memory::IsVRAMAddress(dst)) {
 		skip = gpu->PerformMemoryCopy(dst, src, size);
@@ -65,7 +65,9 @@ static void __DmacMemcpy(u32 dst, u32 src, u32 size, int *delay) {
 		// Approx. 225 MiB/s or 235929600 B/s, so let's go with 236 B/us.
 		int delayUs = size / 236;
 		dmacMemcpyDeadline = CoreTiming::GetTicks() + usToCycles(delayUs);
-		*delay = delayUs;
+		return delayUs;
+	} else {
+		return 0;
 	}
 }
 
@@ -87,9 +89,9 @@ static u32 sceDmacMemcpy(u32 dst, u32 src, u32 size) {
 		// Might matter for overlapping copies.
 	}
 
-	int delay = 0;
-	__DmacMemcpy(dst, src, size, &delay);
-	return hleDelayResult(hleLogDebug(Log::HLE, 0), "dmac-memcpy", delay);
+	int delay = __DmacMemcpy(dst, src, size);
+	int result = hleLogDebug(Log::HLE, 0);
+	return delay ? hleDelayResult(result, "dmac-memcpy", delay) : delay;
 }
 
 static u32 sceDmacTryMemcpy(u32 dst, u32 src, u32 size) {
@@ -107,9 +109,9 @@ static u32 sceDmacTryMemcpy(u32 dst, u32 src, u32 size) {
 		return hleLogDebug(Log::HLE, SCE_KERNEL_ERROR_BUSY, "busy");
 	}
 
-	int delay = 0;
-	__DmacMemcpy(dst, src, size, &delay);
-	return hleDelayResult(hleLogDebug(Log::HLE, 0), "dmac-try-copy", delay);
+	int delay = __DmacMemcpy(dst, src, size);
+	int result = hleLogDebug(Log::HLE, 0);
+	return delay ? hleDelayResult(result, "dmac-memcpy", delay) : delay;
 }
 
 const HLEFunction sceDmac[] = {