fix ARM build with --disable-dynarec

diff --git a/Makefile b/Makefile
index a7d61d9..49d5476 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,8 @@ libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
 ifeq "$(USE_DYNAREC)" "1"
 OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
 OBJS += libpcsxcore/new_dynarec/pcsxmem.o
 ifeq "$(USE_DYNAREC)" "1"
 OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
 OBJS += libpcsxcore/new_dynarec/pcsxmem.o

+else
+libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -DDRC_DISABLE

 endif
 OBJS += libpcsxcore/new_dynarec/emu_if.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \
 endif
 OBJS += libpcsxcore/new_dynarec/emu_if.o
 libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 85ec174..588bc63 100644 (file)
--- 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;
 }
 
        pending_exception = 1;
 }
 

-#ifdef __arm__

 // execute until predefined leave points
 // (HLE softcall exit and BIOS fastboot end)
 static void ari64_execute_until()
 // 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);
        }
 }
                evprintf("drc left @%08x\n", psxRegs.pc);
        }
 }

-#endif

 
 static void ari64_clear(u32 addr, u32 size)
 {
 
 static void ari64_clear(u32 addr, u32 size)
 {


@@ -360,7 +358,7 @@ extern void intExecuteBlockT();
 R3000Acpu psxRec = {
        ari64_init,
        ari64_reset,
 R3000Acpu psxRec = {
        ari64_init,
        ari64_reset,

-#if defined(__arm__)
+#ifndef DRC_DISABLE

        ari64_execute,
        ari64_execute_until,
 #else
        ari64_execute,
        ari64_execute_until,
 #else


@@ -377,7 +375,7 @@ void do_insn_trace() {}
 void do_insn_cmp() {}
 #endif
 
 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;
 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 *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() {}
 void new_dyna_start() {}
 void new_dynarec_cleanup() {}
 void new_dynarec_clear_full() {}