This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] ARM NPTL support
- From: Daniel Jacobowitz <drow at false dot org>
- To: gdb-patches at sourceware dot org
- Date: Tue, 30 May 2006 11:58:57 -0400
- Subject: [commit] ARM NPTL support
I thought I'd done this ages ago, but it slipped through. This
simple patch adds ARM NPTL debugging support to both native GDB
and gdbserver. And, it doesn't have the proc_service warts that it had the
first time I posted it, since I fixed that for the equivalent MIPS patch.
--
Daniel Jacobowitz
CodeSourcery
2006-05-30 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.in (arm-linux-nat.o): Update dependencies.
* arm-linux-nat.c: Include "gdb_proc_service.h".
(PTRACE_GET_THREAD_AREA): Define.
(ps_get_thread_area): New function.
2006-05-30 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.in (linux-arm-low.o): Update dependencies.
* linux-arm-low.c: Include "gdb_proc_service.h".
(PTRACE_GET_THREAD_AREA): Define.
(ps_get_thread_area): New function.
Index: src/gdb/Makefile.in
===================================================================
--- src.orig/gdb/Makefile.in 2006-05-26 09:03:09.000000000 -0400
+++ src/gdb/Makefile.in 2006-05-26 09:13:02.000000000 -0400
@@ -1769,7 +1769,7 @@ arch-utils.o: arch-utils.c $(defs_h) $(a
$(floatformat_h)
arm-linux-nat.o: arm-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \
$(gdb_string_h) $(regcache_h) $(arm_tdep_h) $(gregset_h) \
- $(target_h) $(linux_nat_h)
+ $(target_h) $(linux_nat_h) $(gdb_proc_service_h)
arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \
$(gdbtypes_h) $(floatformat_h) $(gdbcore_h) $(frame_h) $(regcache_h) \
$(doublest_h) $(solib_svr4_h) $(osabi_h) $(arm_tdep_h) \
Index: src/gdb/arm-linux-nat.c
===================================================================
--- src.orig/gdb/arm-linux-nat.c 2006-05-26 09:03:10.000000000 -0400
+++ src/gdb/arm-linux-nat.c 2006-05-26 09:13:02.000000000 -0400
@@ -37,6 +37,13 @@
/* Prototypes for supply_gregset etc. */
#include "gregset.h"
+/* Defines ps_err_e, struct ps_prochandle. */
+#include "gdb_proc_service.h"
+
+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA 22
+#endif
+
extern int arm_apcs_32;
#define typeNone 0x00
@@ -694,6 +701,23 @@ arm_linux_kernel_u_size (void)
return (sizeof (struct user));
}
+/* Fetch the thread-local storage pointer for libthread_db. */
+
+ps_err_e
+ps_get_thread_area (const struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+{
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+ return PS_ERR;
+
+ /* IDX is the bias from the thread pointer to the beginning of the
+ thread descriptor. It has to be subtracted due to implementation
+ quirks in libthread_db. */
+ *base = (void *) ((char *)*base - idx);
+
+ return PS_OK;
+}
+
static unsigned int
get_linux_version (unsigned int *vmajor,
unsigned int *vminor,
Index: src/gdb/gdbserver/Makefile.in
===================================================================
--- src.orig/gdb/gdbserver/Makefile.in 2006-05-26 09:03:22.000000000 -0400
+++ src/gdb/gdbserver/Makefile.in 2006-05-26 09:13:02.000000000 -0400
@@ -269,7 +269,8 @@ linux_low_h = $(srcdir)/linux-low.h
linux-low.o: linux-low.c $(linux_low_h) $(server_h)
$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< @USE_THREAD_DB@
-linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h)
+linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) \
+ $(gdb_proc_service_h)
linux-cris-low.o: linux-cris-low.c $(linux_low_h) $(server_h)
linux-crisv32-low.o: linux-crisv32-low.c $(linux_low_h) $(server_h)
linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h) \
Index: src/gdb/gdbserver/linux-arm-low.c
===================================================================
--- src.orig/gdb/gdbserver/linux-arm-low.c 2006-05-26 09:03:22.000000000 -0400
+++ src/gdb/gdbserver/linux-arm-low.c 2006-05-26 09:15:20.000000000 -0400
@@ -1,5 +1,6 @@
/* GNU/Linux/ARM specific low level interface, for the remote server for GDB.
- Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006
Free Software Foundation, Inc.
This file is part of GDB.
@@ -22,6 +23,14 @@
#include "server.h"
#include "linux-low.h"
+#include <sys/ptrace.h>
+
+#include "gdb_proc_service.h"
+
+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA 22
+#endif
+
#ifdef HAVE_SYS_REG_H
#include <sys/reg.h>
#endif
@@ -105,6 +114,23 @@ arm_reinsert_addr ()
return pc;
}
+/* Fetch the thread-local storage pointer for libthread_db. */
+
+ps_err_e
+ps_get_thread_area (const struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+{
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+ return PS_ERR;
+
+ /* IDX is the bias from the thread pointer to the beginning of the
+ thread descriptor. It has to be subtracted due to implementation
+ quirks in libthread_db. */
+ *base = (void *) ((char *)*base - idx);
+
+ return PS_OK;
+}
+
struct linux_target_ops the_low_target = {
arm_num_regs,
arm_regmap,