From ec277ca6b51eac4b82afa381c53bbd4acc6db0ba Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Thu, 20 Oct 2005 03:34:53 +0000 Subject: 2005-03-25 Daniel Jacobowitz * gdb/Makefile.in (arm-linux-nat.o): Update dependencies. * gdb/arm-linux-nat.c: Include "gdb_proc_service.h". (PTRACE_GET_THREAD_AREA): Define. (ps_get_thread_area): New function. * gdb/gdbserver/Makefile.in (linux-arm-low.o): Update dependencies. * gdb/gdbserver/linux-arm-low.c: Include "../gdb_proc_service.h". (PTRACE_GET_THREAD_AREA): Define. (ps_get_thread_area): New function. --- ChangeLog.csl | 12 ++++++++++++ gdb/Makefile.in | 2 +- gdb/arm-linux-nat.c | 26 +++++++++++++++++++++++++- gdb/gdbserver/Makefile.in | 5 +++-- gdb/gdbserver/linux-arm-low.c | 23 +++++++++++++++++++++++ 5 files changed, 64 insertions(+), 4 deletions(-) diff --git a/ChangeLog.csl b/ChangeLog.csl index d4bf69d5883..23422c9acc9 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,15 @@ +2005-03-25 Daniel Jacobowitz + + * gdb/Makefile.in (arm-linux-nat.o): Update dependencies. + * gdb/arm-linux-nat.c: Include "gdb_proc_service.h". + (PTRACE_GET_THREAD_AREA): Define. + (ps_get_thread_area): New function. + + * gdb/gdbserver/Makefile.in (linux-arm-low.o): Update dependencies. + * gdb/gdbserver/linux-arm-low.c: Include "../gdb_proc_service.h". + (PTRACE_GET_THREAD_AREA): Define. + (ps_get_thread_area): New function. + 2005-03-25 Daniel Jacobowitz * gdb/elfread.c (elf_symtab_read): Skip symbols which BFD considers diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 02eaa44d4fd..02bfcef36c1 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1734,7 +1734,7 @@ arch-utils.o: arch-utils.c $(defs_h) $(arch_utils_h) $(buildsym_h) \ $(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) $(gdb_assert_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) \ diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index 84aaaf6b4e8..c29c783074d 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -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 @@ -95,7 +102,7 @@ get_thread_id (ptid_t ptid) tid = PIDGET (ptid); return tid; } -#define GET_THREAD_ID(PTID) get_thread_id ((PTID)); +#define GET_THREAD_ID(PTID) get_thread_id (PTID) static void fetch_nwfpe_single (unsigned int fn, FPA11 * fpa11) @@ -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, diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 830f6f6ee99..baa36059773 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -1,5 +1,5 @@ # Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GDB. @@ -264,7 +264,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) diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index 7c23b17789a..2cbccd9af52 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -22,6 +22,12 @@ #include "server.h" #include "linux-low.h" +#include "../gdb_proc_service.h" + +#ifndef PTRACE_GET_THREAD_AREA +#define PTRACE_GET_THREAD_AREA 22 +#endif + #ifdef HAVE_SYS_REG_H #include #endif @@ -94,6 +100,23 @@ arm_reinsert_addr () collect_register_by_name ("lr", &pc); 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, -- cgit v1.2.1