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: remove yet more n64 stuff
[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
1733a2a
..
2c82f58
100644
(file)
--- a/
libpcsxcore/new_dynarec/emu_if.c
+++ b/
libpcsxcore/new_dynarec/emu_if.c
@@
-25,7
+25,6
@@
#define evprintf(...)
char invalid_code[0x100000];
#define evprintf(...)
char invalid_code[0x100000];
-static u32 scratch_buf[8*8*2] __attribute__((aligned(64)));
u32 event_cycles[PSXINT_COUNT];
static void schedule_timeslice(void)
u32 event_cycles[PSXINT_COUNT];
static void schedule_timeslice(void)
@@
-191,6
+190,8
@@
void new_dyna_freeze(void *f, int mode)
//printf("drc: %d block info entries %s\n", size/8, mode ? "saved" : "loaded");
}
//printf("drc: %d block info entries %s\n", size/8, mode ? "saved" : "loaded");
}
+#ifndef DRC_DISABLE
+
/* GTE stuff */
void *gte_handlers[64];
/* GTE stuff */
void *gte_handlers[64];
@@
-303,6
+304,7
@@
const uint64_t gte_reg_writes[64] = {
static int ari64_init()
{
static int ari64_init()
{
+ static u32 scratch_buf[8*8*2] __attribute__((aligned(64)));
extern void (*psxCP2[64])();
extern void psxNULL();
extern unsigned char *out;
extern void (*psxCP2[64])();
extern void psxNULL();
extern unsigned char *out;
@@
-417,25
+419,11
@@
static void ari64_shutdown()
new_dyna_pcsx_mem_shutdown();
}
new_dyna_pcsx_mem_shutdown();
}
-extern void intExecute();
-extern void intExecuteT();
-extern void intExecuteBlock();
-extern void intExecuteBlockT();
-#ifndef DRC_DBG
-#define intExecuteT intExecute
-#define intExecuteBlockT intExecuteBlock
-#endif
-
R3000Acpu psxRec = {
ari64_init,
ari64_reset,
R3000Acpu psxRec = {
ari64_init,
ari64_reset,
-#ifndef DRC_DISABLE
ari64_execute,
ari64_execute_until,
ari64_execute,
ari64_execute_until,
-#else
- intExecuteT,
- intExecuteBlockT,
-#endif
ari64_clear,
#ifdef ICACHE_EMULATION
ari64_notify,
ari64_clear,
#ifdef ICACHE_EMULATION
ari64_notify,
@@
-443,13
+431,8
@@
R3000Acpu psxRec = {
ari64_shutdown
};
ari64_shutdown
};
-// TODO: rm
-#ifndef DRC_DBG
-void do_insn_trace() {}
-void do_insn_cmp() {}
-#endif
+#else // if DRC_DISABLE
-#ifdef DRC_DISABLE
unsigned int address;
int pending_exception, stop;
unsigned int next_interupt;
unsigned int address;
int pending_exception, stop;
unsigned int next_interupt;
@@
-462,7
+445,7
@@
u8 zero_mem[0x1000];
unsigned char *out;
void *mem_rtab;
void *scratch_buf_ptr;
unsigned char *out;
void *mem_rtab;
void *scratch_buf_ptr;
-void new_dynarec_init() {
(void)ari64_execute;
}
+void new_dynarec_init() {}
void new_dyna_start() {}
void new_dynarec_cleanup() {}
void new_dynarec_clear_full() {}
void new_dyna_start() {}
void new_dynarec_cleanup() {}
void new_dynarec_clear_full() {}
@@
-506,6
+489,7
@@
static u32 memcheck_read(u32 a)
return *(u32 *)(psxM + (a & 0x1ffffc));
}
return *(u32 *)(psxM + (a & 0x1ffffc));
}
+#if 0
void do_insn_trace(void)
{
static psxRegisters oldregs;
void do_insn_trace(void)
{
static psxRegisters oldregs;
@@
-567,6
+551,7
@@
void do_insn_trace(void)
}
#endif
}
}
#endif
}
+#endif
static const char *regnames[offsetof(psxRegisters, intCycle) / 4] = {
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
static const char *regnames[offsetof(psxRegisters, intCycle) / 4] = {
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",