notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: only override default cycle_multiplier
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
new_dynarec.c
diff --git
a/libpcsxcore/new_dynarec/new_dynarec.c
b/libpcsxcore/new_dynarec/new_dynarec.c
index
a8fdf47
..
f6ea299
100644
(file)
--- a/
libpcsxcore/new_dynarec/new_dynarec.c
+++ b/
libpcsxcore/new_dynarec/new_dynarec.c
@@
-465,13
+465,13
@@
static void do_clear_cache(void)
#define NO_CYCLE_PENALTY_THR 12
#define NO_CYCLE_PENALTY_THR 12
-int cycle_multiplier; // 100 for 1.0
+int cycle_multiplier
= CYCLE_MULT_DEFAULT
; // 100 for 1.0
int cycle_multiplier_override;
int cycle_multiplier_old;
static int CLOCK_ADJUST(int x)
{
int cycle_multiplier_override;
int cycle_multiplier_old;
static int CLOCK_ADJUST(int x)
{
- int m = cycle_multiplier_override
+ int m = cycle_multiplier_override
&& cycle_multiplier == CYCLE_MULT_DEFAULT
? cycle_multiplier_override : cycle_multiplier;
int s=(x>>31)|1;
return (x * m + s * 50) / 100;
? cycle_multiplier_override : cycle_multiplier;
int s=(x>>31)|1;
return (x * m + s * 50) / 100;