summaryrefslogtreecommitdiff
path: root/Source/Core/DSPCore/Src/DSPCore.cpp
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2009-07-06 19:19:03 +0000
committernakeee <nakeee@gmail.com>2009-07-06 19:19:03 +0000
commitce6e8ed798007545a42aaf36099176355d070003 (patch)
treeb50636732020c356489f07ac4a9aca4e01accf35 /Source/Core/DSPCore/Src/DSPCore.cpp
parentc44dabfe8b935da4a6b3970ffc0575d21f9f606d (diff)
DSPLLE: More minor clean up, some log mistake fixes and revert the +1 loop (it seems to got
zelda ucode stuck for some weird reason) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3694 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore/Src/DSPCore.cpp')
-rw-r--r--Source/Core/DSPCore/Src/DSPCore.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DSPCore/Src/DSPCore.cpp b/Source/Core/DSPCore/Src/DSPCore.cpp
index 21f99b2a18..713c3f9111 100644
--- a/Source/Core/DSPCore/Src/DSPCore.cpp
+++ b/Source/Core/DSPCore/Src/DSPCore.cpp
@@ -170,7 +170,7 @@ void DSPCore_CheckExternalInterrupt()
g_dsp.cr &= ~CR_EXTERNAL_INT;
} else {
#ifdef DEBUG_EXP
- ERROR_LOG(DSPLLE, "External interupt firing failed");
+ ERROR_LOG(DSPLLE, "External interrupt firing failed");
#endif
}
@@ -189,8 +189,8 @@ void DSPCore_CheckExceptions()
// check exceptions should it be 0..7 or 7..0?
for (int i = 0; i < 8; i++) {
// Seems exp int is not masked by sr_int_enable
- if (dsp_SR_is_flag_set(SR_INT_ENABLE) || i == EXP_INT) {
- if (g_dsp.exceptions & (1 << i)) {
+ if (g_dsp.exceptions & (1 << i)) {
+ if (dsp_SR_is_flag_set(SR_INT_ENABLE) || i == EXP_INT) {
_assert_msg_(MASTER_LOG, !g_dsp.exception_in_progress_hack, "assert while exception");
// store pc and sr until RTI
@@ -201,11 +201,11 @@ void DSPCore_CheckExceptions()
g_dsp.exceptions &= ~(1 << i);
g_dsp.exception_in_progress_hack = true;
break;
- }
- } else {
+ } else {
#ifdef DEBUG_EXP
- ERROR_LOG(DSPLLE, "Firing exception %d failed");
+ ERROR_LOG(DSPLLE, "Firing exception %d failed");
#endif
+ }
}
}
}