diff options
| author | comex <comexk@gmail.com> | 2014-10-25 16:48:44 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2014-10-25 16:48:44 -0400 |
| commit | 275755aaaf30f8ad0ca9ffbce53e5a41e9b60a92 (patch) | |
| tree | 305ca19ee350236eb6fb039e6e0acf4db77f8f39 /Source | |
| parent | 4b0c6d8e0f8940a178fce3cff3313e0ee0472df5 (diff) | |
| parent | 2c8e77dcc0917ca6189320a412faa15ce1e5ddf0 (diff) | |
Merge pull request #1381 from skidau/Remove-false-ext-exception-error
Added a check for external exceptions that have been set
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/PowerPC/PowerPC.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index 4aedff8e65..0480677831 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -446,7 +446,7 @@ void CheckExternalExceptions() u32 exceptions = ppcState.Exceptions; // EXTERNAL INTERRUPT - if (MSR & 0x0008000) //hacky...the exception shouldn't be generated if EE isn't set... + if (exceptions && (MSR & 0x0008000)) // Handling is delayed until MSR.EE=1. { if (exceptions & EXCEPTION_EXTERNAL_INT) { |