Merge pull request #1381 from skidau/Remove-false-ext-exception-error

Added a check for external exceptions that have been set
2014-10-25 16:48:44 -04:00 · 2014-10-25 16:48:44 -04:00 · 275755aaaf
parent 4b0c6d8e0f 2c8e77dcc0
commit 275755aaaf
1 changed files with 1 additions and 1 deletions
--- 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)
 		{