notaz.gp2x.de
/
mupen64plus-pandora.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing launcher
[mupen64plus-pandora.git]
/
source
/
mupen64plus-core
/
src
/
r4300
/
interupt.c
diff --git
a/source/mupen64plus-core/src/r4300/interupt.c
b/source/mupen64plus-core/src/r4300/interupt.c
old mode 100644
(file)
new mode 100755
(executable)
index
3225559
..
102d8a8
--- a/
source/mupen64plus-core/src/r4300/interupt.c
+++ b/
source/mupen64plus-core/src/r4300/interupt.c
@@
-126,7
+126,8
@@
void add_interupt_event(int type, unsigned int delay)
if(Count > 0x80000000) SPECIAL_done = 0;
if (get_event(type)) {
if(Count > 0x80000000) SPECIAL_done = 0;
if (get_event(type)) {
- DebugMessage(M64MSG_WARNING, "two events of type 0x%x in interrupt queue", type);
+ //DebugMessage(M64MSG_WARNING, "two events of type 0x%x in interrupt queue", type);
+ return; // silently return...
}
if (q == NULL)
}
if (q == NULL)
@@
-423,9
+424,9
@@
void gen_interupt(void)
case COMPARE_INT:
remove_interupt_event();
case COMPARE_INT:
remove_interupt_event();
- Count+=
2
;
+ Count+=
count_per_op
;
add_interupt_event_count(COMPARE_INT, Compare);
add_interupt_event_count(COMPARE_INT, Compare);
- Count-=
2
;
+ Count-=
count_per_op
;
Cause = (Cause | 0x8000) & 0xFFFFFF83;
if ((Status & 7) != 1) return;
Cause = (Cause | 0x8000) & 0xFFFFFF83;
if ((Status & 7) != 1) return;