Merge pull request #19366 from hrydgard/misc-fixes

Misc logging tweaks

CMakeLists.txt

@@ -143,7 +143,7 @@ if(IOS_APP_STORE)
 	set(CMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION FALSE)
 	set(CMAKE_XCODE_SCHEME_ENABLE_GPU_FRAME_CAPTURE_MODE DISABLED)
 	message("iOS App Store build")
-else()
+elseif(IOS)
 	message("iOS sideload build")
 endif()
 

Core/HLE/sceAtrac.cpp

@@ -677,7 +677,12 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) {
 		return err;
 	}
 	if (atrac->GetTrack().loopinfo.size() == 0) {
-		return hleLogError(Log::ME, ATRAC_ERROR_NO_LOOP_INFORMATION, "no loop information");
+		if (loopNum == -1) {
+			// This is very common and not really a problem.
+			return hleLogDebug(Log::ME, ATRAC_ERROR_NO_LOOP_INFORMATION, "no loop information to write to!");
+		} else {
+			return hleLogError(Log::ME, ATRAC_ERROR_NO_LOOP_INFORMATION, "no loop information to write to!");
+		}
 	}
 
 	atrac->SetLoopNum(loopNum);

Core/HLE/sceIo.cpp

@@ -2291,11 +2291,12 @@ static u32 sceIoGetAsyncStat(int id, u32 poll, u32 address) {
 			return SCE_KERNEL_ERROR_NOASYNC;
 		}
 		return 0; //completed
+	} else {
+		if (id == 0) {
+			return hleLogDebug(Log::sceIo, SCE_KERNEL_ERROR_BADF, "ERROR - sceIoGetAsyncStat with invalid id %d", id);
+		} else {
+			return hleLogError(Log::sceIo, SCE_KERNEL_ERROR_BADF, "ERROR - sceIoGetAsyncStat with invalid id %d", id);
 		}
-	else
-	{
-		ERROR_LOG(Log::sceIo, "ERROR - sceIoGetAsyncStat with invalid id %i", id);
-		return SCE_KERNEL_ERROR_BADF;
 	}
 }
 

Core/HW/MpegDemux.cpp

@@ -197,7 +197,7 @@ bool MpegDemux::demux(int audioChannel)
 	while (m_index < m_readSize && !needMore)
 	{
 		// Search for start code
-		int startCode = 0xFF;
+		u32 startCode = 0xFF;
 		while ((startCode & PACKET_START_CODE_MASK) != PACKET_START_CODE_PREFIX && !isEOF()) {
 			startCode = (startCode << 8) | read8();
 		}

SDL/README.TXT

@@ -21,3 +21,7 @@ Works fine on WSL2 with OpenGL, at least. For more notes, see https://www.ppsspp
 
 Running with valgrind
 =====================
+
+Here's an example where we both use suppressions, and generate new ones (that you can then take from suppressions.log and simplify and copy to valgrind-wsl2.supp):
+
+> valgrind --suppressions=SDL/valgrind-wsl2.supp --gen-suppressions=all --log-file=suppressions.log build/PPSSPPSDL

b.sh

@@ -78,6 +78,9 @@ do
 		--gold) echo "Gold build enabled"
 			CMAKE_ARGS="-DGOLD=ON ${CMAKE_ARGS}"
 			;;
+		--alderlake) echo "Alderlake opt"
+			CMAKE_ARGS="-DCMAKE_C_FLAGS=\"-march=alderlake\" -DCMAKE_CPP_FLAGS=\"-march=alderlake\""
+			;;
 		*) MAKE_OPT="$1 ${MAKE_OPT}"
 			;;
 	esac