Merge pull request #8886 from JosJuice/stack-check-instruction

PatchEngine: Attempt to fix crash in IsStackSane
dolphin-emu · Aug 8, 2020 · 3101d95 · 3101d95
2 parents 6356cc8 + 364ef76
commit 3101d95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/Core/Core/PatchEngine.cpp b/Source/Core/Core/PatchEngine.cpp
@@ -231,7 +231,8 @@ static bool IsStackSane()
 
   // Check the link register makes sense (that it points to a valid IBAT address)
   const u32 address = PowerPC::HostRead_U32(next_SP + 4);
-  return PowerPC::HostIsInstructionRAMAddress(address) && 0 != PowerPC::HostRead_U32(address);
+  return PowerPC::HostIsInstructionRAMAddress(address) &&
+         0 != PowerPC::HostRead_Instruction(address);
 }
 
 bool ApplyFramePatches()

diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
@@ -423,8 +423,7 @@ TryReadInstResult TryReadInstruction(u32 address)
 
 u32 HostRead_Instruction(const u32 address)
 {
-  UGeckoInstruction inst = HostRead_U32(address);
-  return inst.hex;
+  return ReadFromHardware<XCheckTLBFlag::OpcodeNoException, u32>(address);
 }
 
 static void Memcheck(u32 address, u32 var, bool write, size_t size)