Skip to content

Commit

Permalink
Merge pull request #1299 from comex/blr-opt-infinite-loop
Browse files Browse the repository at this point in the history
If the stack overflow trap region has already been tripped, don't continue to ignore faults there.
  • Loading branch information
skidau committed Oct 19, 2014
2 parents 615ebe7 + c524767 commit 033a349
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Source/Core/Core/PowerPC/Jit64/Jit.cpp
Expand Up @@ -150,7 +150,7 @@ bool Jit64::HandleFault(uintptr_t access_address, SContext* ctx)
{
uintptr_t stack = (uintptr_t)m_stack, diff = access_address - stack;
// 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.");
m_enable_blr_optimization = false;
Expand Down

0 comments on commit 033a349

Please sign in to comment.