From patchwork Fri Aug 21 10:18:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 8333 Received: (qmail 18161 invoked by alias); 21 Aug 2015 10:18:27 -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 18136 invoked by uid 89); 21 Aug 2015 10:18:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.7 required=5.0 tests=AWL, BAYES_00, 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-la0-f41.google.com Received: from mail-la0-f41.google.com (HELO mail-la0-f41.google.com) (209.85.215.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 21 Aug 2015 10:18:23 +0000 Received: by laba3 with SMTP id a3so38613273lab.1 for ; Fri, 21 Aug 2015 03:18:19 -0700 (PDT) X-Received: by 10.152.44.232 with SMTP id h8mr7167858lam.104.1440152299793; Fri, 21 Aug 2015 03:18:19 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id r4sm2141255lag.46.2015.08.21.03.18.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Aug 2015 03:18:18 -0700 (PDT) From: Max Filippov To: gdb-patches@sourceware.org Cc: Maxim Grigoriev , Woody LaRue , Marc Gauthier , Pedro Alves , Max Filippov Subject: [PATCH v3] xtensa: implement NPTL helpers Date: Fri, 21 Aug 2015 13:18:11 +0300 Message-Id: <1440152291-10270-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 (arch/xtensa.h gdb_proc_service.h): New #includes. (ps_get_thread_area): New function. 2015-08-20 Max Filippov gdb/ * arch/xtensa.h: New file. * 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 and move the structure to arch/xtensa.h. --- Changes v2->v3: - move xtensa_elf_gregset_t definition to arch/xtensa.h, include it from xtensa-tdep.h and gdbserver/linux-xtensa-low.c - fix coding style issues in ps_get_thread_area 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/arch/xtensa.h | 48 ++++++++++++++++++++++++++++++++++++++++ gdb/gdbserver/configure.srv | 1 + gdb/gdbserver/linux-xtensa-low.c | 21 ++++++++++++++++++ gdb/xtensa-linux-nat.c | 22 ++++++++++++++++++ gdb/xtensa-linux-tdep.c | 4 ++++ gdb/xtensa-tdep.c | 4 ++++ gdb/xtensa-tdep.h | 24 ++------------------ 7 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 gdb/arch/xtensa.h diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h new file mode 100644 index 0000000..fe96584 --- /dev/null +++ b/gdb/arch/xtensa.h @@ -0,0 +1,48 @@ +/* Common Target-dependent code for the Xtensa port of GDB, the GNU debugger. + + Copyright (C) 2003-2015 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef XTENSA_H +#define XTENSA_H + +#include + +/* Xtensa ELF core file register set representation ('.reg' section). + Copied from target-side ELF header . */ + +typedef uint32_t xtensa_elf_greg_t; + +typedef struct +{ + xtensa_elf_greg_t pc; + xtensa_elf_greg_t ps; + xtensa_elf_greg_t lbeg; + xtensa_elf_greg_t lend; + xtensa_elf_greg_t lcount; + xtensa_elf_greg_t sar; + xtensa_elf_greg_t windowstart; + xtensa_elf_greg_t windowbase; + xtensa_elf_greg_t threadptr; + xtensa_elf_greg_t reserved[7+48]; + xtensa_elf_greg_t ar[64]; +} xtensa_elf_gregset_t; + +#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ + / sizeof (xtensa_elf_greg_t)) + +#endif 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..debe467 100644 --- a/gdb/gdbserver/linux-xtensa-low.c +++ b/gdb/gdbserver/linux-xtensa-low.c @@ -26,6 +26,8 @@ extern const struct target_desc *tdesc_xtensa; #include #include +#include "arch/xtensa.h" +#include "gdb_proc_service.h" #include "xtensa-xtregs.c" @@ -179,6 +181,25 @@ xtensa_breakpoint_at (CORE_ADDR where) xtensa_breakpoint, xtensa_breakpoint_len) == 0; } +/* Called by libthread_db. */ + +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..5538d5b 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,25 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops, store_xtregs (regcache, regnum); } +/* Called by libthread_db. */ + +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..5b28cab 100644 --- a/gdb/xtensa-tdep.h +++ b/gdb/xtensa-tdep.h @@ -18,6 +18,8 @@ along with this program. If not, see . */ +#include "arch/xtensa.h" + /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION whenever the "tdep" structure changes in an incompatible way. */ @@ -81,28 +83,6 @@ typedef enum } xtensa_target_flags_t; -/* Xtensa ELF core file register set representation ('.reg' section). - Copied from target-side ELF header . */ - -typedef uint32_t xtensa_elf_greg_t; - -typedef struct -{ - xtensa_elf_greg_t pc; - xtensa_elf_greg_t ps; - xtensa_elf_greg_t lbeg; - xtensa_elf_greg_t lend; - xtensa_elf_greg_t lcount; - 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 ar[64]; -} xtensa_elf_gregset_t; - -#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ - / sizeof (xtensa_elf_greg_t)) - /* Mask. */ typedef struct