Merge pull request #19173 from hrydgard/ir-interpreter-prefix-check

IRInterpreter compiler: Reject all vec2ops where the prefix is unknown while compiling
hrydgard · May 22, 2024 · b6ce56d · b6ce56d
2 parents dc68f40 + 5e3abe3
commit b6ce56d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp
@@ -884,7 +884,7 @@ static int sysclib_sprintf(u32 dst, u32 fmt) {
 
 	DEBUG_LOG(SCEKERNEL, "sysclib_sprintf result string has length %d, content:", (int)result.length());
 	DEBUG_LOG(SCEKERNEL, "%s", result.c_str());
-	if (!Memory::IsValidRange(dst, result.length() + 1)) {
+	if (!Memory::IsValidRange(dst, (u32)result.length() + 1)) {
 		ERROR_LOG(SCEKERNEL, "sysclib_sprintf result string is too long or dst is invalid");
 		return 0;
 	}

diff --git a/Core/MIPS/IR/IRCompVFPU.cpp b/Core/MIPS/IR/IRCompVFPU.cpp
@@ -969,6 +969,11 @@ namespace MIPSComp {
 
 	void IRFrontend::Comp_VV2Op(MIPSOpcode op) {
 		CONDITIONAL_DISABLE(VFPU_VEC);
+
+		if (js.HasUnknownPrefix()) {
+			DISABLE;
+		}
+
 		int optype = (op >> 16) & 0x1f;
 		if (optype == 0) {
 			if (js.HasUnknownPrefix() || !IsPrefixWithinSize(js.prefixS, op))