From 1ca63161b3da401f13e573b0b77140d1aa6e37f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 4 Feb 2025 10:18:37 -0600
Subject: [PATCH] More minor fixes

---
 Core/Core.cpp                | 2 +-
 Core/MIPS/x86/CompVFPU.cpp   | 2 +-
 Core/Util/BlockAllocator.cpp | 3 +--
 GPU/Software/SoftGpu.cpp     | 4 +---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Core/Core.cpp b/Core/Core.cpp
index d6a1efeb55..8edff61a3c 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -566,7 +566,7 @@ void Core_MemoryExceptionInfo(u32 address, u32 accessSize, u32 pc, MemoryExcepti
 // Can't be ignored
 void Core_ExecException(u32 address, u32 pc, ExecExceptionType type) {
 	const char *desc = ExecExceptionTypeAsString(type);
-	WARN_LOG(Log::MemMap, "%s: Invalid exec address %08x PC %08x LR %08x", desc, address, pc, currentMIPS->r[MIPS_REG_RA]);
+	WARN_LOG(Log::MemMap, "%s: Invalid exec address %08x pc=%08x ra=%08x", desc, address, pc, currentMIPS->r[MIPS_REG_RA]);
 
 	MIPSExceptionInfo &e = g_exceptionInfo;
 	e = {};
diff --git a/Core/MIPS/x86/CompVFPU.cpp b/Core/MIPS/x86/CompVFPU.cpp
index 1fe06707e4..d4d8129252 100644
--- a/Core/MIPS/x86/CompVFPU.cpp
+++ b/Core/MIPS/x86/CompVFPU.cpp
@@ -309,7 +309,7 @@ void Jit::Comp_SVQ(MIPSOpcode op) {
 			if (!g_Config.bFastMemory) {
 				DISABLE;
 			}
-			DISABLE;
+			DISABLE;  // The code below isn't quite working, so we fall back to interpreter for now.
 
 			gpr.MapReg(rs, true, false);
 			gpr.FlushLockX(ECX);
diff --git a/Core/Util/BlockAllocator.cpp b/Core/Util/BlockAllocator.cpp
index b2b30c2314..a2038f4716 100644
--- a/Core/Util/BlockAllocator.cpp
+++ b/Core/Util/BlockAllocator.cpp
@@ -505,7 +505,6 @@ void BlockAllocator::Block::DoState(PointerWrap &p)
 	// Since we use truncate_cpy, the empty space is not zeroed.  Zero it now.
 	// This avoids saving uninitialized memory.
 	size_t tagLen = strlen(tag);
-	if (tagLen != sizeof(tag))
-		memset(tag + tagLen, 0, sizeof(tag) - tagLen);
+	memset(tag + tagLen, 0, sizeof(tag) - tagLen);
 	DoArray(p, tag, sizeof(tag));
 }
diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp
index 9c82bef5cb..fc6c1bb036 100644
--- a/GPU/Software/SoftGpu.cpp
+++ b/GPU/Software/SoftGpu.cpp
@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <set>
+
 #include "Common/System/Display.h"
 #include "Common/GPU/OpenGL/GLFeatures.h"
 
@@ -430,9 +431,6 @@ SoftGPU::SoftGPU(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
 	Rasterizer::Init();
 	Sampler::Init();
 	drawEngine_ = new SoftwareDrawEngine();
-	if (!drawEngine_)
-		return;
-
 	drawEngine_->SetGPUCommon(this);
 	drawEngine_->Init();
 	drawEngineCommon_ = drawEngine_;