mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
d9f719f1ad
Currently, to open a target, with "target TARGET_NAME", GDB finds the target_ops instance with "TARGET_NAME" as short name, and then calls its target_ops::open virtual method. In reality, there's no actual target/name lookup, a pointer to the target_ops object was associated with the "target TARGET_NAME" command at add_target time (when GDB is initialized), as the command's context. This creates a chicken and egg situation. Consider the case of wanting to open multiple remote connections. We want to be able to have one remote target_ops instance per connection, but, if we're not connected yet, so we don't yet have an instance to call target->open() on... This patch fixes this by separating out common info about a target_ops to a separate structure (shortname, longname, doc), and changing the add_target routine to take a reference to such an object instead of a pointer to a target_ops, and a pointer to a factory function that is responsible to open an instance of the corresponding target when the user types "target TARGET_NAME". -extern void add_target (struct target_ops *); +extern void add_target (const target_info &info, target_open_ftype *func); I.e. this factory function replaces the target_ops::open virtual method. For static/singleton targets, nothing changes, the target_open_ftype function pushes the global target_ops instance on the target stack. At target_close time, the connection is tor down, but the global target_ops object remains live. However, targets that support being open multiple times will make their target_open_ftype routine allocate a new target_ops instance on the heap [e.g., new remote_target()], and push that on the stack. At target_close time, the new object is destroyed (by the target_ops::close virtual method). Both the core target and the remote targets will support being open multiple times (others could/should too, but those were my stopping point), but not in this patch yet. We need to get rid of more globals first before that'd be useful. Native targets are somewhat special, given find_default_run_target & friends. Those routines also expect to return a target_ops pointer, even before we've open the target. However, we'll never need more than one instance of the native target, so we can assume/require that native targets are global/simpletons, and have the backends register a pointer to the native target_ops. Since all native targets inherit inf_child_target, we can centralize that registration. See add_inf_child_target, get_native_target/set_native_target and find_default_run_target. gdb/ChangeLog: 2018-05-02 Pedro Alves <palves@redhat.com> * aarch64-fbsd-nat.c (_initialize_aarch64_fbsd_nat): Use add_inf_child_target. * aarch64-linux-nat.c (_initialize_aarch64_linux_nat): Use add_inf_child_target. * aix-thread.c (aix_thread_target_info): New. (aix_thread_target) <shortname, longname, doc>: Delete. <info>: New. * alpha-bsd-nat.c (_initialize_alphabsd_nat): Use add_inf_child_target. * alpha-linux-nat.c (_initialize_alpha_linux_nat): Use add_inf_child_target. * amd64-fbsd-nat.c (_initialize_amd64fbsd_nat): Use add_inf_child_target. * amd64-linux-nat.c (_initialize_amd64_linux_nat): Use add_inf_child_target. * amd64-nbsd-nat.c (_initialize_amd64nbsd_nat): Use add_inf_child_target. * amd64-obsd-nat.c (_initialize_amd64obsd_nat): Use add_inf_child_target. * arm-fbsd-nat.c (_initialize_arm_fbsd_nat): Use add_inf_child_target. * arm-linux-nat.c (_initialize_arm_linux_nat): Use add_inf_child_target. * arm-nbsd-nat.c (_initialize_arm_netbsd_nat): Use add_inf_child_target. * bfd-target.c (target_bfd_target_info): New. (target_bfd) <shortname, longname, doc>: Delete. <info>: New. * bsd-kvm.c (bsd_kvm_target_info): New. (bsd_kvm_target) <shortname, longname, doc>: Delete. <info>: New. (bsd_kvm_target::open): Rename to ... (bsd_kvm_target_open): ... this. Adjust. * bsd-uthread.c (bsd_uthread_target_info): New. (bsd_uthread_target) <shortname, longname, doc>: Delete. <info>: New. * corefile.c (core_file_command): Adjust. * corelow.c (core_target_info): New. (core_target) <shortname, longname, doc>: Delete. <info>: New. (core_target::open): Rename to ... (core_target_open): ... this. Adjust. * ctf.c (ctf_target_info): New. (ctf_target) <shortname, longname, doc>: Delete. <info>: New. (ctf_target::open): Rename to ... (ctf_target_open): ... this. (_initialize_ctf): Adjust. * exec.c (exec_target_info): New. (exec_target) <shortname, longname, doc>: Delete. <info>: New. (exec_target::open): Rename to ... (exec_target_open): ... this. * gdbcore.h (core_target_open): Declare. * go32-nat.c (_initialize_go32_nat): Use add_inf_child_target. * hppa-linux-nat.c (_initialize_hppa_linux_nat): Use add_inf_child_target. * hppa-nbsd-nat.c (_initialize_hppanbsd_nat): Use add_inf_child_target. * hppa-obsd-nat.c (_initialize_hppaobsd_nat): Use add_inf_child_target. * i386-darwin-nat.c (_initialize_i386_darwin_nat): Use add_inf_child_target. * i386-fbsd-nat.c (_initialize_i386fbsd_nat): Use add_inf_child_target. * i386-gnu-nat.c (_initialize_i386gnu_nat): Use add_inf_child_target. * i386-linux-nat.c (_initialize_i386_linux_nat): Use add_inf_child_target. * i386-nbsd-nat.c (_initialize_i386nbsd_nat): Use add_inf_child_target. * i386-obsd-nat.c (_initialize_i386obsd_nat): Use add_inf_child_target. * ia64-linux-nat.c (_initialize_ia64_linux_nat): Use add_inf_child_target. * inf-child.c (inf_child_target_info): New. (inf_child_target::info): New. (inf_child_open_target): Remove 'target' parameter. Use get_native_target instead. (inf_child_target::open): Delete. (add_inf_child_target): New. * inf-child.h (inf_child_target) <shortname, longname, doc, open>: Delete. <info>: New. (add_inf_child_target): Declare. (inf_child_open_target): Declare. * linux-thread-db.c (thread_db_target_info): New. (thread_db_target) <shortname, longname, doc>: Delete. <info>: New. * m32r-linux-nat.c (_initialize_m32r_linux_nat): Use add_inf_child_target. * m68k-bsd-nat.c (_initialize_m68kbsd_nat): Use add_inf_child_target. * m68k-linux-nat.c (_initialize_m68k_linux_nat): Use add_inf_child_target. * m88k-bsd-nat.c (_initialize_m88kbsd_nat): Use add_inf_child_target. * make-target-delegates (print_class): Adjust. * mips-fbsd-nat.c (_initialize_mips_fbsd_nat): Use add_inf_child_target. * mips-linux-nat.c (_initialize_mips_linux_nat): Use add_inf_child_target. * mips-nbsd-nat.c (_initialize_mipsnbsd_nat): Use add_inf_child_target. * mips64-obsd-nat.c (_initialize_mips64obsd_nat): Use add_inf_child_target. * nto-procfs.c (nto_native_target_info): New. (nto_procfs_target_native) <shortname, longname, doc>: Delete. <info>: New. (nto_procfs_target_info): New. (nto_procfs_target_procfs) <shortname, longname, doc>: Delete. <info>: New. (init_procfs_targets): Adjust. * ppc-fbsd-nat.c (_initialize_ppcfbsd_nat): Use add_inf_child_target. * ppc-linux-nat.c (_initialize_ppc_linux_nat): Use add_inf_child_target. * ppc-nbsd-nat.c (_initialize_ppcnbsd_nat): Use add_inf_child_target. * ppc-obsd-nat.c (_initialize_ppcobsd_nat): Use add_inf_child_target. * ravenscar-thread.c (ravenscar_target_info): New. (ravenscar_thread_target) <shortname, longname, doc>: Delete. <info>: New. * record-btrace.c (record_btrace_target_info): (record_btrace_target) <shortname, longname, doc>: Delete. <info>: New. (record_btrace_target::open): Rename to ... (record_btrace_target_open): ... this. Adjust. * record-full.c (record_longname, record_doc): New. (record_full_base_target) <shortname, longname, doc>: Delete. <info>: New. (record_full_target_info): New. (record_full_target): <shortname>: Delete. <info>: New. (record_full_core_open_1, record_full_open_1): Update comments. (record_full_base_target::open): Rename to ... (record_full_open): ... this. (cmd_record_full_restore): Update. (_initialize_record_full): Update. * remote-sim.c (remote_sim_target_info): New. (gdbsim_target) <shortname, longname, doc>: Delete. <info>: New. (gdbsim_target::open): Rename to ... (gdbsim_target_open): ... this. (_initialize_remote_sim): Adjust. * remote.c (remote_doc): New. (remote_target_info): New. (remote_target) <shortname, longname, doc>: Delete. <info>: New. (extended_remote_target_info): New. (extended_remote_target) <shortname, longname, doc>: Delete. <info>: New. (remote_target::open_1): Make static. Adjust. * rs6000-nat.c (_initialize_rs6000_nat): Use add_inf_child_target. * s390-linux-nat.c (_initialize_s390_nat): Use add_inf_child_target. * sh-nbsd-nat.c (_initialize_shnbsd_nat): Use add_inf_child_target. * sol-thread.c (thread_db_target_info): New. (sol_thread_target) <shortname, longname, doc>: Delete. <info>: New. * sparc-linux-nat.c (_initialize_sparc_linux_nat): Use add_inf_child_target. * sparc-nbsd-nat.c (_initialize_sparcnbsd_nat): Use add_inf_child_target. * sparc64-fbsd-nat.c (_initialize_sparc64fbsd_nat): Use add_inf_child_target. * sparc64-linux-nat.c (_initialize_sparc64_linux_nat): Use add_inf_child_target. * sparc64-nbsd-nat.c (_initialize_sparc64nbsd_nat): Use add_inf_child_target. * sparc64-obsd-nat.c (_initialize_sparc64obsd_nat): Use add_inf_child_target. * spu-linux-nat.c (_initialize_spu_nat): Use add_inf_child_target. * spu-multiarch.c (spu_multiarch_target_info): New. (spu_multiarch_target) <shortname, longname, doc>: Delete. <info>: New. * target-delegates.c: Regenerate. * target.c: Include <unordered_map>. (target_ops_p): Delete. (DEF_VEC_P(target_ops_p)): Delete. (target_factories): New. (test_target_info): New. (test_target_ops::info): New. (open_target): Adjust to use target_factories. (add_target_with_completer): Rename to ... (add_target): ... this. Change prototype. Register target_info and open callback in target_factories. Register target_info in command context instead of target_ops. (add_target): Delete old implementation. (add_deprecated_target_alias): Change prototype. Adjust. (the_native_target): New. (set_native_target, get_native_target): New. (find_default_run_target): Use the_native_target. (find_attach_target, find_run_target): Simplify. (target_ops::open): Delete. (dummy_target_info): New. (dummy_target::shortname, dummy_target::longname) (dummy_target::doc): Delete. (dummy_target::info): New. (debug_target::shortname, debug_target::longname) (debug_target::doc): Delete. (debug_target::info): New. * target.h (struct target_info): New. (target_ops::~target_ops): Add comment. (target_ops::info): New. (target_ops::shortname, target_ops::longname, target_ops::doc): No longer virtual. Implement in terms of target_info. (set_native_target, get_native_target): Declare. (target_open_ftype): New. (add_target, add_target_with_completer) (add_deprecated_target_alias): Change prototype. (test_target) <shortname, longname, doc>: Delete. <info>: New. * tilegx-linux-nat.c (_initialize_tile_linux_nat): Use add_inf_child_target. * tracefile-tfile.c (tfile_target_info): New. (tfile_target) <shortname, longname, doc>: Delete. <info>: New. (tfile_target::open): Rename to ... (tfile_target_open): ... this. (_initialize_tracefile_tfile): Adjust. * vax-bsd-nat.c (_initialize_vaxbsd_nat): Use add_inf_child_target. * windows-nat.c (_initialize_windows_nat): Use add_inf_child_target. * xtensa-linux-nat.c (_initialize_xtensa_linux_nat): Use add_inf_child_target.
562 lines
15 KiB
C
562 lines
15 KiB
C
/* BSD user-level threads support.
|
||
|
||
Copyright (C) 2005-2018 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 <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include "gdbcore.h"
|
||
#include "gdbthread.h"
|
||
#include "inferior.h"
|
||
#include "objfiles.h"
|
||
#include "observable.h"
|
||
#include "regcache.h"
|
||
#include "solib.h"
|
||
#include "solist.h"
|
||
#include "symfile.h"
|
||
#include "target.h"
|
||
|
||
#include "gdb_obstack.h"
|
||
|
||
#include "bsd-uthread.h"
|
||
|
||
static const target_info bsd_uthread_target_info = {
|
||
"bsd-uthreads",
|
||
N_("BSD user-level threads"),
|
||
N_("BSD user-level threads")
|
||
};
|
||
|
||
struct bsd_uthread_target final : public target_ops
|
||
{
|
||
bsd_uthread_target ()
|
||
{ to_stratum = thread_stratum; }
|
||
|
||
const target_info &info () const override
|
||
{ return bsd_uthread_target_info; }
|
||
|
||
void close () override;
|
||
|
||
void mourn_inferior () override;
|
||
|
||
void fetch_registers (struct regcache *, int) override;
|
||
void store_registers (struct regcache *, int) override;
|
||
|
||
ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
|
||
void resume (ptid_t, int, enum gdb_signal) override;
|
||
|
||
bool thread_alive (ptid_t ptid) override;
|
||
|
||
void update_thread_list () override;
|
||
|
||
const char *extra_thread_info (struct thread_info *) override;
|
||
|
||
const char *pid_to_str (ptid_t) override;
|
||
};
|
||
|
||
static bsd_uthread_target bsd_uthread_ops;
|
||
|
||
|
||
/* Architecture-specific operations. */
|
||
|
||
/* Per-architecture data key. */
|
||
static struct gdbarch_data *bsd_uthread_data;
|
||
|
||
struct bsd_uthread_ops
|
||
{
|
||
/* Supply registers for an inactive thread to a register cache. */
|
||
void (*supply_uthread)(struct regcache *, int, CORE_ADDR);
|
||
|
||
/* Collect registers for an inactive thread from a register cache. */
|
||
void (*collect_uthread)(const struct regcache *, int, CORE_ADDR);
|
||
};
|
||
|
||
static void *
|
||
bsd_uthread_init (struct obstack *obstack)
|
||
{
|
||
struct bsd_uthread_ops *ops;
|
||
|
||
ops = OBSTACK_ZALLOC (obstack, struct bsd_uthread_ops);
|
||
return ops;
|
||
}
|
||
|
||
/* Set the function that supplies registers from an inactive thread
|
||
for architecture GDBARCH to SUPPLY_UTHREAD. */
|
||
|
||
void
|
||
bsd_uthread_set_supply_uthread (struct gdbarch *gdbarch,
|
||
void (*supply_uthread) (struct regcache *,
|
||
int, CORE_ADDR))
|
||
{
|
||
struct bsd_uthread_ops *ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
|
||
ops->supply_uthread = supply_uthread;
|
||
}
|
||
|
||
/* Set the function that collects registers for an inactive thread for
|
||
architecture GDBARCH to SUPPLY_UTHREAD. */
|
||
|
||
void
|
||
bsd_uthread_set_collect_uthread (struct gdbarch *gdbarch,
|
||
void (*collect_uthread) (const struct regcache *,
|
||
int, CORE_ADDR))
|
||
{
|
||
struct bsd_uthread_ops *ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
|
||
ops->collect_uthread = collect_uthread;
|
||
}
|
||
|
||
/* Magic number to help recognize a valid thread structure. */
|
||
#define BSD_UTHREAD_PTHREAD_MAGIC 0xd09ba115
|
||
|
||
/* Check whether the thread structure at ADDR is valid. */
|
||
|
||
static void
|
||
bsd_uthread_check_magic (CORE_ADDR addr)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
ULONGEST magic = read_memory_unsigned_integer (addr, 4, byte_order);
|
||
|
||
if (magic != BSD_UTHREAD_PTHREAD_MAGIC)
|
||
error (_("Bad magic"));
|
||
}
|
||
|
||
/* Thread states. */
|
||
#define BSD_UTHREAD_PS_RUNNING 0
|
||
#define BSD_UTHREAD_PS_DEAD 18
|
||
|
||
/* Address of the pointer to the thread structure for the running
|
||
thread. */
|
||
static CORE_ADDR bsd_uthread_thread_run_addr;
|
||
|
||
/* Address of the list of all threads. */
|
||
static CORE_ADDR bsd_uthread_thread_list_addr;
|
||
|
||
/* Offsets of various "interesting" bits in the thread structure. */
|
||
static int bsd_uthread_thread_state_offset = -1;
|
||
static int bsd_uthread_thread_next_offset = -1;
|
||
static int bsd_uthread_thread_ctx_offset;
|
||
|
||
/* Name of shared threads library. */
|
||
static const char *bsd_uthread_solib_name;
|
||
|
||
/* Non-zero if the thread startum implemented by this module is active. */
|
||
static int bsd_uthread_active;
|
||
|
||
static CORE_ADDR
|
||
bsd_uthread_lookup_address (const char *name, struct objfile *objfile)
|
||
{
|
||
struct bound_minimal_symbol sym;
|
||
|
||
sym = lookup_minimal_symbol (name, NULL, objfile);
|
||
if (sym.minsym)
|
||
return BMSYMBOL_VALUE_ADDRESS (sym);
|
||
|
||
return 0;
|
||
}
|
||
|
||
static int
|
||
bsd_uthread_lookup_offset (const char *name, struct objfile *objfile)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
CORE_ADDR addr;
|
||
|
||
addr = bsd_uthread_lookup_address (name, objfile);
|
||
if (addr == 0)
|
||
return 0;
|
||
|
||
return read_memory_unsigned_integer (addr, 4, byte_order);
|
||
}
|
||
|
||
static CORE_ADDR
|
||
bsd_uthread_read_memory_address (CORE_ADDR addr)
|
||
{
|
||
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
|
||
return read_memory_typed_address (addr, ptr_type);
|
||
}
|
||
|
||
/* If OBJFILE contains the symbols corresponding to one of the
|
||
supported user-level threads libraries, activate the thread stratum
|
||
implemented by this module. */
|
||
|
||
static int
|
||
bsd_uthread_activate (struct objfile *objfile)
|
||
{
|
||
struct gdbarch *gdbarch = target_gdbarch ();
|
||
struct bsd_uthread_ops *ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
|
||
/* Skip if the thread stratum has already been activated. */
|
||
if (bsd_uthread_active)
|
||
return 0;
|
||
|
||
/* There's no point in enabling this module if no
|
||
architecture-specific operations are provided. */
|
||
if (!ops->supply_uthread)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_run_addr =
|
||
bsd_uthread_lookup_address ("_thread_run", objfile);
|
||
if (bsd_uthread_thread_run_addr == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_list_addr =
|
||
bsd_uthread_lookup_address ("_thread_list", objfile);
|
||
if (bsd_uthread_thread_list_addr == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_state_offset =
|
||
bsd_uthread_lookup_offset ("_thread_state_offset", objfile);
|
||
if (bsd_uthread_thread_state_offset == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_next_offset =
|
||
bsd_uthread_lookup_offset ("_thread_next_offset", objfile);
|
||
if (bsd_uthread_thread_next_offset == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_ctx_offset =
|
||
bsd_uthread_lookup_offset ("_thread_ctx_offset", objfile);
|
||
|
||
push_target (&bsd_uthread_ops);
|
||
bsd_uthread_active = 1;
|
||
return 1;
|
||
}
|
||
|
||
/* Cleanup due to deactivation. */
|
||
|
||
void
|
||
bsd_uthread_target::close ()
|
||
{
|
||
bsd_uthread_active = 0;
|
||
bsd_uthread_thread_run_addr = 0;
|
||
bsd_uthread_thread_list_addr = 0;
|
||
bsd_uthread_thread_state_offset = 0;
|
||
bsd_uthread_thread_next_offset = 0;
|
||
bsd_uthread_thread_ctx_offset = 0;
|
||
bsd_uthread_solib_name = NULL;
|
||
}
|
||
|
||
/* Deactivate the thread stratum implemented by this module. */
|
||
|
||
static void
|
||
bsd_uthread_deactivate (void)
|
||
{
|
||
/* Skip if the thread stratum has already been deactivated. */
|
||
if (!bsd_uthread_active)
|
||
return;
|
||
|
||
unpush_target (&bsd_uthread_ops);
|
||
}
|
||
|
||
static void
|
||
bsd_uthread_inferior_created (struct target_ops *ops, int from_tty)
|
||
{
|
||
bsd_uthread_activate (NULL);
|
||
}
|
||
|
||
/* Likely candidates for the threads library. */
|
||
static const char *bsd_uthread_solib_names[] =
|
||
{
|
||
"/usr/lib/libc_r.so", /* FreeBSD */
|
||
"/usr/lib/libpthread.so", /* OpenBSD */
|
||
NULL
|
||
};
|
||
|
||
static void
|
||
bsd_uthread_solib_loaded (struct so_list *so)
|
||
{
|
||
const char **names = bsd_uthread_solib_names;
|
||
|
||
for (names = bsd_uthread_solib_names; *names; names++)
|
||
{
|
||
if (startswith (so->so_original_name, *names))
|
||
{
|
||
solib_read_symbols (so, 0);
|
||
|
||
if (bsd_uthread_activate (so->objfile))
|
||
{
|
||
bsd_uthread_solib_name = so->so_original_name;
|
||
return;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
static void
|
||
bsd_uthread_solib_unloaded (struct so_list *so)
|
||
{
|
||
if (!bsd_uthread_solib_name)
|
||
return;
|
||
|
||
if (strcmp (so->so_original_name, bsd_uthread_solib_name) == 0)
|
||
bsd_uthread_deactivate ();
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::mourn_inferior ()
|
||
{
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
beneath->mourn_inferior ();
|
||
bsd_uthread_deactivate ();
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::fetch_registers (struct regcache *regcache, int regnum)
|
||
{
|
||
struct gdbarch *gdbarch = regcache->arch ();
|
||
struct bsd_uthread_ops *uthread_ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
ptid_t ptid = regcache_get_ptid (regcache);
|
||
CORE_ADDR addr = ptid_get_tid (ptid);
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
CORE_ADDR active_addr;
|
||
scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
|
||
|
||
/* We are doing operations (e.g. reading memory) that rely on
|
||
inferior_ptid. */
|
||
inferior_ptid = ptid;
|
||
|
||
/* Always fetch the appropriate registers from the layer beneath. */
|
||
beneath->fetch_registers (regcache, regnum);
|
||
|
||
/* FIXME: That might have gotten us more than we asked for. Make
|
||
sure we overwrite all relevant registers with values from the
|
||
thread structure. This can go once we fix the underlying target. */
|
||
regnum = -1;
|
||
|
||
active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr);
|
||
if (addr != 0 && addr != active_addr)
|
||
{
|
||
bsd_uthread_check_magic (addr);
|
||
uthread_ops->supply_uthread (regcache, regnum,
|
||
addr + bsd_uthread_thread_ctx_offset);
|
||
}
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::store_registers (struct regcache *regcache, int regnum)
|
||
{
|
||
struct gdbarch *gdbarch = regcache->arch ();
|
||
struct bsd_uthread_ops *uthread_ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
ptid_t ptid = regcache_get_ptid (regcache);
|
||
CORE_ADDR addr = ptid_get_tid (ptid);
|
||
CORE_ADDR active_addr;
|
||
scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
|
||
|
||
/* We are doing operations (e.g. reading memory) that rely on
|
||
inferior_ptid. */
|
||
inferior_ptid = ptid;
|
||
|
||
active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr);
|
||
if (addr != 0 && addr != active_addr)
|
||
{
|
||
bsd_uthread_check_magic (addr);
|
||
uthread_ops->collect_uthread (regcache, regnum,
|
||
addr + bsd_uthread_thread_ctx_offset);
|
||
}
|
||
else
|
||
{
|
||
/* Updating the thread that is currently running; pass the
|
||
request to the layer beneath. */
|
||
beneath->store_registers (regcache, regnum);
|
||
}
|
||
}
|
||
|
||
ptid_t
|
||
bsd_uthread_target::wait (ptid_t ptid, struct target_waitstatus *status,
|
||
int options)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
CORE_ADDR addr;
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
|
||
/* Pass the request to the layer beneath. */
|
||
ptid = beneath->wait (ptid, status, options);
|
||
|
||
/* If the process is no longer alive, there's no point in figuring
|
||
out the thread ID. It will fail anyway. */
|
||
if (status->kind == TARGET_WAITKIND_SIGNALLED
|
||
|| status->kind == TARGET_WAITKIND_EXITED)
|
||
return ptid;
|
||
|
||
/* Fetch the corresponding thread ID, and augment the returned
|
||
process ID with it. */
|
||
addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr);
|
||
if (addr != 0)
|
||
{
|
||
gdb_byte buf[4];
|
||
|
||
/* FIXME: For executables linked statically with the threads
|
||
library, we end up here before the program has actually been
|
||
executed. In that case ADDR will be garbage since it has
|
||
been read from the wrong virtual memory image. */
|
||
if (target_read_memory (addr, buf, 4) == 0)
|
||
{
|
||
ULONGEST magic = extract_unsigned_integer (buf, 4, byte_order);
|
||
if (magic == BSD_UTHREAD_PTHREAD_MAGIC)
|
||
ptid = ptid_build (ptid_get_pid (ptid), 0, addr);
|
||
}
|
||
}
|
||
|
||
/* If INFERIOR_PTID doesn't have a tid member yet, and we now have a
|
||
ptid with tid set, then ptid is still the initial thread of
|
||
the process. Notify GDB core about it. */
|
||
if (ptid_get_tid (inferior_ptid) == 0
|
||
&& ptid_get_tid (ptid) != 0 && !in_thread_list (ptid))
|
||
thread_change_ptid (inferior_ptid, ptid);
|
||
|
||
/* Don't let the core see a ptid without a corresponding thread. */
|
||
if (!in_thread_list (ptid) || is_exited (ptid))
|
||
add_thread (ptid);
|
||
|
||
return ptid;
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::resume (ptid_t ptid, int step, enum gdb_signal sig)
|
||
{
|
||
/* Pass the request to the layer beneath. */
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
beneath->resume (ptid, step, sig);
|
||
}
|
||
|
||
bool
|
||
bsd_uthread_target::thread_alive (ptid_t ptid)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
struct target_ops *beneath = find_target_beneath (this);
|
||
CORE_ADDR addr = ptid_get_tid (ptid);
|
||
|
||
if (addr != 0)
|
||
{
|
||
int offset = bsd_uthread_thread_state_offset;
|
||
ULONGEST state;
|
||
|
||
bsd_uthread_check_magic (addr);
|
||
|
||
state = read_memory_unsigned_integer (addr + offset, 4, byte_order);
|
||
if (state == BSD_UTHREAD_PS_DEAD)
|
||
return false;
|
||
}
|
||
|
||
return beneath->thread_alive (ptid);
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::update_thread_list ()
|
||
{
|
||
pid_t pid = ptid_get_pid (inferior_ptid);
|
||
int offset = bsd_uthread_thread_next_offset;
|
||
CORE_ADDR addr;
|
||
|
||
prune_threads ();
|
||
|
||
addr = bsd_uthread_read_memory_address (bsd_uthread_thread_list_addr);
|
||
while (addr != 0)
|
||
{
|
||
ptid_t ptid = ptid_build (pid, 0, addr);
|
||
|
||
if (!in_thread_list (ptid) || is_exited (ptid))
|
||
{
|
||
/* If INFERIOR_PTID doesn't have a tid member yet, then ptid
|
||
is still the initial thread of the process. Notify GDB
|
||
core about it. */
|
||
if (ptid_get_tid (inferior_ptid) == 0)
|
||
thread_change_ptid (inferior_ptid, ptid);
|
||
else
|
||
add_thread (ptid);
|
||
}
|
||
|
||
addr = bsd_uthread_read_memory_address (addr + offset);
|
||
}
|
||
}
|
||
|
||
/* Possible states a thread can be in. */
|
||
static const char *bsd_uthread_state[] =
|
||
{
|
||
"RUNNING",
|
||
"SIGTHREAD",
|
||
"MUTEX_WAIT",
|
||
"COND_WAIT",
|
||
"FDLR_WAIT",
|
||
"FDLW_WAIT",
|
||
"FDR_WAIT",
|
||
"FDW_WAIT",
|
||
"FILE_WAIT",
|
||
"POLL_WAIT",
|
||
"SELECT_WAIT",
|
||
"SLEEP_WAIT",
|
||
"WAIT_WAIT",
|
||
"SIGSUSPEND",
|
||
"SIGWAIT",
|
||
"SPINBLOCK",
|
||
"JOIN",
|
||
"SUSPENDED",
|
||
"DEAD",
|
||
"DEADLOCK"
|
||
};
|
||
|
||
/* Return a string describing th state of the thread specified by
|
||
INFO. */
|
||
|
||
const char *
|
||
bsd_uthread_target::extra_thread_info (thread_info *info)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
CORE_ADDR addr = ptid_get_tid (info->ptid);
|
||
|
||
if (addr != 0)
|
||
{
|
||
int offset = bsd_uthread_thread_state_offset;
|
||
ULONGEST state;
|
||
|
||
state = read_memory_unsigned_integer (addr + offset, 4, byte_order);
|
||
if (state < ARRAY_SIZE (bsd_uthread_state))
|
||
return bsd_uthread_state[state];
|
||
}
|
||
|
||
return NULL;
|
||
}
|
||
|
||
const char *
|
||
bsd_uthread_target::pid_to_str (ptid_t ptid)
|
||
{
|
||
if (ptid_get_tid (ptid) != 0)
|
||
{
|
||
static char buf[64];
|
||
|
||
xsnprintf (buf, sizeof buf, "process %d, thread 0x%lx",
|
||
ptid_get_pid (ptid), ptid_get_tid (ptid));
|
||
return buf;
|
||
}
|
||
|
||
return normal_pid_to_str (ptid);
|
||
}
|
||
|
||
void
|
||
_initialize_bsd_uthread (void)
|
||
{
|
||
bsd_uthread_data = gdbarch_data_register_pre_init (bsd_uthread_init);
|
||
|
||
gdb::observers::inferior_created.attach (bsd_uthread_inferior_created);
|
||
gdb::observers::solib_loaded.attach (bsd_uthread_solib_loaded);
|
||
gdb::observers::solib_unloaded.attach (bsd_uthread_solib_unloaded);
|
||
}
|