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

If the stack overflow trap region has already been tripped, don't continue to ignore faults there. 

In the unlikely case that it tripped and then, due to a bug, some other
fault occurred (e.g. stack misalignment), Dolphin would go into an
infinite loop rather than crashing.
This commit is contained in:
comex 2014-10-16 02:14:02 -04:00
parent c1325675c7
commit c5247673cd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -150,7 +150,7 @@ bool Jit64::HandleFault(uintptr_t access_address, SContext* ctx)
{ {
uintptr_t stack = (uintptr_t)m_stack, diff = access_address - stack; uintptr_t stack = (uintptr_t)m_stack, diff = access_address - stack;
// In the trap region? // In the trap region?
if (stack && diff >= GUARD_OFFSET && diff < GUARD_OFFSET + GUARD_SIZE) if (m_enable_blr_optimization && diff >= GUARD_OFFSET && diff < GUARD_OFFSET + GUARD_SIZE)
{ {
WARN_LOG(POWERPC, "BLR cache disabled due to excessive BL in the emulated program."); WARN_LOG(POWERPC, "BLR cache disabled due to excessive BL in the emulated program.");
m_enable_blr_optimization = false; m_enable_blr_optimization = false;