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
ALL: Huge upstream synch + PerRom DelaySI & CountPerOp parameters
[mupen64plus-pandora.git]
/
source
/
mupen64plus-core
/
src
/
r4300
/
r4300.c
diff --git
a/source/mupen64plus-core/src/r4300/r4300.c
b/source/mupen64plus-core/src/r4300/r4300.c
index
7f58def
..
5b57ce6
100755
(executable)
--- a/
source/mupen64plus-core/src/r4300/r4300.c
+++ b/
source/mupen64plus-core/src/r4300/r4300.c
@@
-45,6
+45,7
@@
unsigned int r4300emu = 0;
int no_compiled_jump = 0;
unsigned int r4300emu = 0;
int no_compiled_jump = 0;
+unsigned int count_per_op = 2;
int llbit, rompause;
#if NEW_DYNAREC != NEW_DYNAREC_ARM
int stop;
int llbit, rompause;
#if NEW_DYNAREC != NEW_DYNAREC_ARM
int stop;
@@
-704,7
+705,7
@@
void update_count(void)
if (r4300emu != CORE_DYNAREC)
{
#endif
if (r4300emu != CORE_DYNAREC)
{
#endif
- Count
= Count + (PC->addr - last_addr)/2
;
+ Count
+= ((PC->addr - last_addr) >> 2) * count_per_op
;
last_addr = PC->addr;
#ifdef NEW_DYNAREC
}
last_addr = PC->addr;
#ifdef NEW_DYNAREC
}