From 9d7b391487dae1c5df7cb7cf7e630b2c906c6328 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Sat, 20 Jul 2024 17:09:41 +0930
Subject: [PATCH] RSP: Fix up LSV in the recompiler

---
 .../Recompiler/RspRecompilerOps.cpp                   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Source/Project64-rsp-core/Recompiler/RspRecompilerOps.cpp b/Source/Project64-rsp-core/Recompiler/RspRecompilerOps.cpp
index 2f68bb9bf..5937e4757 100644
--- a/Source/Project64-rsp-core/Recompiler/RspRecompilerOps.cpp
+++ b/Source/Project64-rsp-core/Recompiler/RspRecompilerOps.cpp
@@ -6076,6 +6076,11 @@ void Compile_Opcode_LSV(void)
 #ifndef CompileLsv
     Cheat_r4300iOpcode(RSP_Opcode_LSV, "RSP_Opcode_LSV");
 #else
+    if (RSPOpC.del > 14)
+    {
+        Cheat_r4300iOpcodeNoMessage(RSP_Opcode_LSV, "RSP_Opcode_LSV");
+        return;
+    }
     CPU_Message("  %X %s", CompilePC, RSPInstruction(CompilePC, RSPOpC.Value).NameAndParam().c_str());
 
     char Reg[256];
@@ -6107,7 +6112,10 @@ void Compile_Opcode_LSV(void)
     }
 
     MoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, GPR_Name(RSPOpC.base), x86_EBX);
-    if (offset != 0) AddConstToX86Reg(x86_EBX, offset);
+    if (offset != 0)
+    {
+        AddConstToX86Reg(x86_EBX, offset);
+    }
     AndConstToX86Reg(x86_EBX, 0x0FFF);
 
     if (Compiler.bAlignVector == true)
@@ -6120,6 +6128,7 @@ void Compile_Opcode_LSV(void)
     else
     {
         LeaSourceAndOffset(x86_EAX, x86_EBX, 1);
+        AndConstToX86Reg(x86_EAX, 0x0FFF);
         XorConstToX86Reg(x86_EBX, 3);
         XorConstToX86Reg(x86_EAX, 3);