ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

PatchEngine: Attempt to fix crash in IsStackSane
This commit is contained in:
Tilka 2020-08-08 20:59:48 +01:00 committed by GitHub
parent 6356cc8b08 364ef76ba1
commit 3101d957b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/PatchEngine.cpp
View File

@ -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()

3
Source/Core/Core/PowerPC/MMU.cpp
View File

@ -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)