Fix debugger build on Mac OS X 10.5/ppc

Debugging itself is still not working, but now it does not prevent a successful build for static analysis.
ashiskumarnaik · Apr 9, 2024 · 505893b · 505893b
1 parent c23fdd9
commit 505893b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/librz/debug/p/native/xnu/xnu_debug.c b/librz/debug/p/native/xnu/xnu_debug.c
@@ -500,7 +500,11 @@ RzList *xnu_thread_list(RzDebug *dbg, int pid, RzList *list) {
 #if __arm__ || __arm64__ || __aarch_64__
 #define CPU_PC (dbg->bits == RZ_SYS_BITS_64) ? state.arm64.__pc : state.arm32.__pc
 #elif __POWERPC__
+#if __DARWIN_UNIX03
+#define CPU_PC state.__srr0
+#else
 #define CPU_PC state.srr0
+#endif
 #elif __x86_64__ || __i386__
 #define CPU_PC (dbg->bits == RZ_SYS_BITS_64) ? state.uts.ts64.__rip : state.uts.ts32.__eip
 #endif

diff --git a/librz/debug/p/native/xnu/xnu_debug.h b/librz/debug/p/native/xnu/xnu_debug.h
@@ -72,12 +72,10 @@ int ptrace(int _request, pid_t _pid, caddr_t _addr, int _data);
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 
-// G3
 #if __POWERPC__
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <mach/ppc/_types.h>
 #include <mach/ppc/thread_status.h>
 // iPhone5
 #elif __aarch64
@@ -88,7 +86,6 @@ int ptrace(int _request, pid_t _pid, caddr_t _addr, int _data);
 #elif __arm64
 #include <mach/arm/thread_status.h>
 #else
-// iMac
 /* x86 32/64 */
 #include <mach/i386/thread_status.h>
 #include <sys/ucontext.h>

diff --git a/librz/debug/p/native/xnu/xnu_excthreads.c b/librz/debug/p/native/xnu/xnu_excthreads.c
@@ -45,9 +45,8 @@ RZ_IPI bool xnu_modify_trace_bit(RzDebug *dbg, xnu_thread_t *th, int enable) {
 }
 
 #elif __POWERPC__ // ppc processor
-// XXX poor support at this stage i don't care so much. Once intel and arm done it could be done
-// TODO add better support for ppc
-RZ_IPI bool xnu_modify_trace_bit(RzDebug *dbg, void *th, int enable) {
+// TODO: Implement and test this for ppc too. Below is an old example for reference.
+RZ_IPI bool xnu_modify_trace_bit(RzDebug *dbg, xnu_thread_t *th, int enable) {
 	return false;
 }
 #if 0

diff --git a/librz/debug/p/native/xnu/xnu_threads.c b/librz/debug/p/native/xnu/xnu_threads.c
@@ -109,7 +109,7 @@ RZ_IPI bool rz_xnu_thread_set_drx(RzXnuDebug *ctx, xnu_thread_t *thread) {
 #ifndef PPC_DEBUG_STATE32
 #define PPC_DEBUG_STATE32 1
 #endif
-	ppc_debug_state_t *regs;
+	// ppc_debug_state_t *regs;
 	// thread->flavor = PPC_DEBUG_STATE32;
 	// thread->count  = RZ_MIN (thread->count, sizeof (regs->uds.ds32));
 	return false;