diff options
| author | twinaphex | 2012-11-28 06:35:30 +0100 |
|---|---|---|
| committer | twinaphex | 2012-11-28 06:35:30 +0100 |
| commit | b194a2ecd43debbb3724e332b660b993725acd52 (patch) | |
| tree | a41deacfa7a6841e97d67fce60bb7f39b54b12be /libpcsxcore/new_dynarec | |
| parent | b6514bd168106e978a0af0f5043d5da6fd35800a (diff) | |
| parent | 06d2e1a58b6eb7fb449f79f7e807343bd8d39b59 (diff) | |
| download | pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.gz pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.bz2 pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'libpcsxcore/new_dynarec')
| -rw-r--r-- | libpcsxcore/new_dynarec/emu_if.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c index 85ec174..588bc63 100644 --- a/libpcsxcore/new_dynarec/emu_if.c +++ b/libpcsxcore/new_dynarec/emu_if.c @@ -299,7 +299,6 @@ static void ari64_reset() pending_exception = 1; } -#ifdef __arm__ // execute until predefined leave points // (HLE softcall exit and BIOS fastboot end) static void ari64_execute_until() @@ -322,7 +321,6 @@ static void ari64_execute() evprintf("drc left @%08x\n", psxRegs.pc); } } -#endif static void ari64_clear(u32 addr, u32 size) { @@ -360,7 +358,7 @@ extern void intExecuteBlockT(); R3000Acpu psxRec = { ari64_init, ari64_reset, -#if defined(__arm__) +#ifndef DRC_DISABLE ari64_execute, ari64_execute_until, #else @@ -377,7 +375,7 @@ void do_insn_trace() {} void do_insn_cmp() {} #endif -#if defined(__x86_64__) || defined(__i386__) +#ifdef DRC_DISABLE unsigned int address; int pending_exception, stop; unsigned int next_interupt; @@ -387,7 +385,7 @@ int new_dynarec_hacks; void *psxH_ptr; void *zeromem_ptr; u8 zero_mem[0x1000]; -void new_dynarec_init() {} +void new_dynarec_init() { (void)ari64_execute; } void new_dyna_start() {} void new_dynarec_cleanup() {} void new_dynarec_clear_full() {} |