From 7d7672a58c82341268c6f5d856c558e768aa3974 Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 30 Jan 2022 17:34:42 +0200 Subject: [PATCH] rm the old debugger stuff, like in libretro fork --- Makefile | 7 ++++--- frontend/main.c | 4 ++-- libpcsxcore/psxcounters.c | 3 ++- libpcsxcore/psxinterpreter.c | 3 ++- libpcsxcore/psxmem.c | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 3dac458b..7616cac5 100644 --- a/Makefile +++ b/Makefile @@ -39,13 +39,14 @@ CFLAGS += -DPCNT endif # core -OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/database.o libpcsxcore/debug.o \ - libpcsxcore/decode_xa.o libpcsxcore/disr3000a.o libpcsxcore/mdec.o \ +OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/database.o \ + libpcsxcore/decode_xa.o libpcsxcore/mdec.o \ libpcsxcore/misc.o libpcsxcore/plugins.o libpcsxcore/ppf.o libpcsxcore/psxbios.o \ libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o libpcsxcore/psxhle.o \ libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \ - libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o + libpcsxcore/sio.o libpcsxcore/spu.o OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o +#OBJS += libpcsxcore/debug.o libpcsxcore/socket.o libpcsxcore/disr3000a.o ifeq "$(ARCH)" "arm" OBJS += libpcsxcore/gte_arm.o endif diff --git a/frontend/main.c b/frontend/main.c index 4631618e..23436450 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -43,8 +43,8 @@ static void check_memcards(void); #endif // don't include debug.h - it breaks ARM build (R1 redefined) -void StartDebugger(); -void StopDebugger(); +static void StartDebugger() {} +static void StopDebugger() {} int ready_to_go, g_emu_want_quit, g_emu_resetting; unsigned long gpuDisp; diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index b2cc07b2..ff0efbce 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -23,7 +23,8 @@ #include "psxcounters.h" #include "gpu.h" -#include "debug.h" +//#include "debug.h" +#define DebugVSync() /******************************************************************************/ diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c index f7898e9a..19a5fc4e 100644 --- a/libpcsxcore/psxinterpreter.c +++ b/libpcsxcore/psxinterpreter.c @@ -25,9 +25,10 @@ #include "r3000a.h" #include "gte.h" #include "psxhle.h" -#include "debug.h" #include "psxinterpreter.h" #include +//#include "debug.h" +#define ProcessDebug() static int branch = 0; static int branch2 = 0; diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c index 04aeec27..46cee0ca 100644 --- a/libpcsxcore/psxmem.c +++ b/libpcsxcore/psxmem.c @@ -27,7 +27,8 @@ #include "psxmem_map.h" #include "r3000a.h" #include "psxhw.h" -#include "debug.h" +//#include "debug.h" +#define DebugCheckBP(...) #include "memmap.h" -- 2.39.2