diff options
| author | nakeee <nakeee@gmail.com> | 2009-07-05 16:18:17 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-07-05 16:18:17 +0000 |
| commit | 36883d6a48fae0cc31aeb39be1a2b98f7970f7bd (patch) | |
| tree | d7a4616ed91a487ff2f14fed48022a0df289c5a9 /Source/Core/DSPCore/Src/DSPCore.cpp | |
| parent | 0932c11b9c361aca795bdf905b6040688905844f (diff) | |
Returned the exception in action check, it seems that we are missing how 2 exceptions are
handled together. For example SSBM got both 32 and 4 exception together but with the hack 4 is
lost. Removed some junk from LLE logging
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3682 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore/Src/DSPCore.cpp')
| -rw-r--r-- | Source/Core/DSPCore/Src/DSPCore.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DSPCore/Src/DSPCore.cpp b/Source/Core/DSPCore/Src/DSPCore.cpp index 6a70432552..c143852251 100644 --- a/Source/Core/DSPCore/Src/DSPCore.cpp +++ b/Source/Core/DSPCore/Src/DSPCore.cpp @@ -156,7 +156,7 @@ void DSPCore_SetException(u8 level) void DSPCore_CheckExternalInterrupt()
{
// check if there is an external interrupt
- if (g_dsp.cr & CR_EXTERNAL_INT)
+ if (g_dsp.cr & CR_EXTERNAL_INT && !g_dsp.exception_in_progress_hack)
{
#ifdef DEBUG_EXP
NOTICE_LOG(DSPLLE, "trying External interupt fired");
@@ -176,7 +176,7 @@ void DSPCore_CheckExternalInterrupt() void DSPCore_CheckExceptions()
{
- if (g_dsp.exceptions != 0) {
+ if (g_dsp.exceptions != 0 && !g_dsp.exception_in_progress_hack) {
#ifdef DEBUG_EXP
NOTICE_LOG(DSPLLE, "trying exception %d fired", g_dsp.exceptions);
#endif
|