From patchwork Fri Aug 21 05:15:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 8332 Received: (qmail 39418 invoked by alias); 21 Aug 2015 05:15:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 39403 invoked by uid 89); 21 Aug 2015 05:15:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.0 required=5.0 tests=AWL, BAYES_05, FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-lb0-f180.google.com Received: from mail-lb0-f180.google.com (HELO mail-lb0-f180.google.com) (209.85.217.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 21 Aug 2015 05:15:50 +0000 Received: by lbbsx3 with SMTP id sx3so36803047lbb.0 for ; Thu, 20 Aug 2015 22:15:47 -0700 (PDT) X-Received: by 10.152.42.244 with SMTP id r20mr6209056lal.90.1440134147110; Thu, 20 Aug 2015 22:15:47 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id xl7sm1907925lbb.42.2015.08.20.22.15.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2015 22:15:46 -0700 (PDT) From: Max Filippov To: gdb-patches@sourceware.org Cc: Maxim Grigoriev , Woody LaRue , Marc Gauthier , Pedro Alves , Max Filippov Subject: [PATCH v2] xtensa: implement NPTL helpers Date: Fri, 21 Aug 2015 08:15:35 +0300 Message-Id: <1440134135-25862-1-git-send-email-jcmvbkbc@gmail.com> These changes allow debugging multithreaded NPTL xtensa applications. 2015-08-20 Max Filippov gdb/gdbserver/ * configure.srv (xtensa*-*-linux*): Add srv_linux_thread_db=yes. * linux-xtensa-low.c (xtensa-tdep.h gdb_proc_service.h): New #includes. (ps_get_thread_area): New function. 2015-08-20 Max Filippov gdb/ * xtensa-linux-nat.c (gdb_proc_service.h): New #include. (ps_get_thread_area): New function. * xtensa-linux-tdep.c (xtensa_linux_init_abi): Add call to set_gdbarch_fetch_tls_load_module_address to enable TLS support. * xtensa-tdep.c (osabi.h): New #include. (xtensa_gdbarch_init): Call gdbarch_init_osabi to register xtensa-specific hooks. * xtensa-tdep.h (struct xtensa_elf_gregset_t): Add threadptr member. --- Changes v1->v2: - add missing #include "osabi.h" to xtensa-tdep.c - add ps_get_thread_area to gdbserver/linux-xtensa-low.c - enable thread_db use in gdbserver/configure.srv gdb/gdbserver/configure.srv | 1 + gdb/gdbserver/linux-xtensa-low.c | 18 ++++++++++++++++++ gdb/xtensa-linux-nat.c | 19 +++++++++++++++++++ gdb/xtensa-linux-tdep.c | 4 ++++ gdb/xtensa-tdep.c | 4 ++++ gdb/xtensa-tdep.h | 3 ++- 6 files changed, 48 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index 0b18d1d..320c26a 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -352,6 +352,7 @@ case "${target}" in xtensa*-*-linux*) srv_regobj=reg-xtensa.o srv_tgtobj="$srv_linux_obj linux-xtensa-low.o" srv_linux_regsets=yes + srv_linux_thread_db=yes ;; tilegx-*-linux*) srv_regobj=reg-tilegx.o srv_regobj="${srv_regobj} reg-tilegx32.o" diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c index 4daccee..a515f97 100644 --- a/gdb/gdbserver/linux-xtensa-low.c +++ b/gdb/gdbserver/linux-xtensa-low.c @@ -25,7 +25,9 @@ void init_registers_xtensa (void); extern const struct target_desc *tdesc_xtensa; #include +#include #include +#include "gdb_proc_service.h" #include "xtensa-xtregs.c" @@ -179,6 +181,22 @@ xtensa_breakpoint_at (CORE_ADDR where) xtensa_breakpoint, xtensa_breakpoint_len) == 0; } +ps_err_e +ps_get_thread_area (const struct ps_prochandle *ph, + lwpid_t lwpid, int idx, void **base) +{ + xtensa_elf_gregset_t regs; + if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 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 *)regs.threadptr - idx); + + return PS_OK; +} + static struct regsets_info xtensa_regsets_info = { xtensa_regsets, /* regsets */ diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c index 77ad3e0..3e5ad5c 100644 --- a/gdb/xtensa-linux-nat.c +++ b/gdb/xtensa-linux-nat.c @@ -37,6 +37,9 @@ #include "gregset.h" #include "xtensa-tdep.h" +/* Defines ps_err_e, struct ps_prochandle. */ +#include "gdb_proc_service.h" + /* Extended register set depends on hardware configs. Keeping these definitions separately allows to introduce hardware-specific overlays. */ @@ -280,6 +283,22 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops, store_xtregs (regcache, regnum); } +ps_err_e +ps_get_thread_area (const struct ps_prochandle *ph, + lwpid_t lwpid, int idx, void **base) +{ + xtensa_elf_gregset_t regs; + if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 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 *)regs.threadptr - idx); + + return PS_OK; +} + void _initialize_xtensa_linux_nat (void); void diff --git a/gdb/xtensa-linux-tdep.c b/gdb/xtensa-linux-tdep.c index 61ea9b0..99e0d3e 100644 --- a/gdb/xtensa-linux-tdep.c +++ b/gdb/xtensa-linux-tdep.c @@ -106,6 +106,10 @@ xtensa_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) xtensa_linux_gdb_signal_from_target); set_gdbarch_gdb_signal_to_target (gdbarch, xtensa_linux_gdb_signal_to_target); + + /* Enable TLS support. */ + set_gdbarch_fetch_tls_load_module_address (gdbarch, + svr4_fetch_objfile_link_map); } /* Provide a prototype to silence -Wmissing-prototypes. */ diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index 55e7d98..4b693ed 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -28,6 +28,7 @@ #include "value.h" #include "dis-asm.h" #include "inferior.h" +#include "osabi.h" #include "floatformat.h" #include "regcache.h" #include "reggroups.h" @@ -3273,6 +3274,9 @@ xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_solib_svr4_fetch_link_map_offsets (gdbarch, svr4_ilp32_fetch_link_map_offsets); + /* Hook in the ABI-specific overrides, if they have been registered. */ + gdbarch_init_osabi (info, gdbarch); + return gdbarch; } diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h index caa2988..1d476ad 100644 --- a/gdb/xtensa-tdep.h +++ b/gdb/xtensa-tdep.h @@ -96,7 +96,8 @@ typedef struct xtensa_elf_greg_t sar; xtensa_elf_greg_t windowstart; xtensa_elf_greg_t windowbase; - xtensa_elf_greg_t reserved[8+48]; + xtensa_elf_greg_t threadptr; + xtensa_elf_greg_t reserved[7+48]; xtensa_elf_greg_t ar[64]; } xtensa_elf_gregset_t;