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
make icache implementation play nice with the dynarec
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
emu_if.c
diff --git
a/libpcsxcore/new_dynarec/emu_if.c
b/libpcsxcore/new_dynarec/emu_if.c
index
f170be7
..
8c96504
100644
(file)
--- a/
libpcsxcore/new_dynarec/emu_if.c
+++ b/
libpcsxcore/new_dynarec/emu_if.c
@@
-10,6
+10,7
@@
#include "emu_if.h"
#include "pcsxmem.h"
#include "../psxhle.h"
#include "emu_if.h"
#include "pcsxmem.h"
#include "../psxhle.h"
+#include "../psxinterpreter.h"
#include "../r3000a.h"
#include "../cdrom.h"
#include "../psxdma.h"
#include "../r3000a.h"
#include "../cdrom.h"
#include "../psxdma.h"
@@
-387,7
+388,6
@@
static void ari64_clear(u32 addr, u32 size)
invalidate_block(start);
}
invalidate_block(start);
}
-#ifdef ICACHE_EMULATION
static void ari64_notify(int note, void *data) {
/*
Should be fixed when ARM dynarec has proper icache emulation.
static void ari64_notify(int note, void *data) {
/*
Should be fixed when ARM dynarec has proper icache emulation.
@@
-403,10
+403,11
@@
static void ari64_notify(int note, void *data) {
}
*/
}
}
*/
}
-#endif
static void ari64_apply_config()
{
static void ari64_apply_config()
{
+ intApplyConfig();
+
if (Config.DisableStalls)
new_dynarec_hacks |= NDHACK_NO_STALLS;
else
if (Config.DisableStalls)
new_dynarec_hacks |= NDHACK_NO_STALLS;
else
@@
-431,9
+432,7
@@
R3000Acpu psxRec = {
ari64_execute,
ari64_execute_until,
ari64_clear,
ari64_execute,
ari64_execute_until,
ari64_clear,
-#ifdef ICACHE_EMULATION
ari64_notify,
ari64_notify,
-#endif
ari64_apply_config,
ari64_shutdown
};
ari64_apply_config,
ari64_shutdown
};