mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-09 04:21:49 +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.
233 lines
6.3 KiB
C
233 lines
6.3 KiB
C
/* Native-dependent code for Motorola 68000 BSD's.
|
||
|
||
Copyright (C) 2004-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 "inferior.h"
|
||
#include "regcache.h"
|
||
|
||
#include <sys/types.h>
|
||
#include <sys/ptrace.h>
|
||
#include <machine/reg.h>
|
||
|
||
#include "m68k-tdep.h"
|
||
#include "inf-ptrace.h"
|
||
|
||
struct m68k_bsd_nat_target final : public inf_ptrace_target
|
||
{
|
||
void fetch_registers (struct regcache *, int) override;
|
||
void store_registers (struct regcache *, int) override;
|
||
};
|
||
|
||
static m68k_bsd_nat_target the_m68k_bsd_nat_target;
|
||
|
||
static int
|
||
m68kbsd_gregset_supplies_p (int regnum)
|
||
{
|
||
return (regnum >= M68K_D0_REGNUM && regnum <= M68K_PC_REGNUM);
|
||
}
|
||
|
||
static int
|
||
m68kbsd_fpregset_supplies_p (int regnum)
|
||
{
|
||
return (regnum >= M68K_FP0_REGNUM && regnum <= M68K_FPI_REGNUM);
|
||
}
|
||
|
||
/* Supply the general-purpose registers stored in GREGS to REGCACHE. */
|
||
|
||
static void
|
||
m68kbsd_supply_gregset (struct regcache *regcache, const void *gregs)
|
||
{
|
||
const char *regs = gregs;
|
||
int regnum;
|
||
|
||
for (regnum = M68K_D0_REGNUM; regnum <= M68K_PC_REGNUM; regnum++)
|
||
regcache_raw_supply (regcache, regnum, regs + regnum * 4);
|
||
}
|
||
|
||
/* Supply the floating-point registers stored in FPREGS to REGCACHE. */
|
||
|
||
static void
|
||
m68kbsd_supply_fpregset (struct regcache *regcache, const void *fpregs)
|
||
{
|
||
struct gdbarch *gdbarch = regcache->arch ();
|
||
const char *regs = fpregs;
|
||
int regnum;
|
||
|
||
for (regnum = M68K_FP0_REGNUM; regnum <= M68K_FPI_REGNUM; regnum++)
|
||
regcache_raw_supply (regcache, regnum,
|
||
regs + m68kbsd_fpreg_offset (gdbarch, regnum));
|
||
}
|
||
|
||
/* Collect the general-purpose registers from REGCACHE and store them
|
||
in GREGS. */
|
||
|
||
static void
|
||
m68kbsd_collect_gregset (const struct regcache *regcache,
|
||
void *gregs, int regnum)
|
||
{
|
||
char *regs = gregs;
|
||
int i;
|
||
|
||
for (i = M68K_D0_REGNUM; i <= M68K_PC_REGNUM; i++)
|
||
{
|
||
if (regnum == -1 || regnum == i)
|
||
regcache_raw_collect (regcache, i, regs + i * 4);
|
||
}
|
||
}
|
||
|
||
/* Collect the floating-point registers from REGCACHE and store them
|
||
in FPREGS. */
|
||
|
||
static void
|
||
m68kbsd_collect_fpregset (struct regcache *regcache,
|
||
void *fpregs, int regnum)
|
||
{
|
||
struct gdbarch *gdbarch = regcache->arch ();
|
||
char *regs = fpregs;
|
||
int i;
|
||
|
||
for (i = M68K_FP0_REGNUM; i <= M68K_FPI_REGNUM; i++)
|
||
{
|
||
if (regnum == -1 || regnum == i)
|
||
regcache_raw_collect (regcache, i,
|
||
regs + m68kbsd_fpreg_offset (gdbarch, i));
|
||
}
|
||
}
|
||
|
||
|
||
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
|
||
for all registers (including the floating-point registers). */
|
||
|
||
void
|
||
m68k_bsd_nat_target::fetch_registers (struct regcache *regcache, int regnum)
|
||
{
|
||
pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
|
||
|
||
if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
|
||
{
|
||
struct reg regs;
|
||
|
||
if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1)
|
||
perror_with_name (_("Couldn't get registers"));
|
||
|
||
m68kbsd_supply_gregset (regcache, ®s);
|
||
}
|
||
|
||
if (regnum == -1 || m68kbsd_fpregset_supplies_p (regnum))
|
||
{
|
||
struct fpreg fpregs;
|
||
|
||
if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
|
||
perror_with_name (_("Couldn't get floating point status"));
|
||
|
||
m68kbsd_supply_fpregset (regcache, &fpregs);
|
||
}
|
||
}
|
||
|
||
/* Store register REGNUM back into the inferior. If REGNUM is -1, do
|
||
this for all registers (including the floating-point registers). */
|
||
|
||
void
|
||
m68k_bsd_nat_target::store_registers (struct regcache *regcache, int regnum)
|
||
{
|
||
pid_t pid = ptid_get_pid (regcache_get_ptid (regcache));
|
||
|
||
if (regnum == -1 || m68kbsd_gregset_supplies_p (regnum))
|
||
{
|
||
struct reg regs;
|
||
|
||
if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1)
|
||
perror_with_name (_("Couldn't get registers"));
|
||
|
||
m68kbsd_collect_gregset (regcache, ®s, regnum);
|
||
|
||
if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1)
|
||
perror_with_name (_("Couldn't write registers"));
|
||
}
|
||
|
||
if (regnum == -1 || m68kbsd_fpregset_supplies_p (regnum))
|
||
{
|
||
struct fpreg fpregs;
|
||
|
||
if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
|
||
perror_with_name (_("Couldn't get floating point status"));
|
||
|
||
m68kbsd_collect_fpregset (regcache, &fpregs, regnum);
|
||
|
||
if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
|
||
perror_with_name (_("Couldn't write floating point status"));
|
||
}
|
||
}
|
||
|
||
|
||
/* Support for debugging kernel virtual memory images. */
|
||
|
||
#include <machine/pcb.h>
|
||
|
||
#include "bsd-kvm.h"
|
||
|
||
/* OpenBSD doesn't have these. */
|
||
#ifndef PCB_REGS_FP
|
||
#define PCB_REGS_FP 10
|
||
#endif
|
||
#ifndef PCB_REGS_SP
|
||
#define PCB_REGS_SP 11
|
||
#endif
|
||
|
||
static int
|
||
m68kbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
|
||
{
|
||
int regnum, tmp;
|
||
int i = 0;
|
||
|
||
/* The following is true for NetBSD 1.6.2:
|
||
|
||
The pcb contains %d2...%d7, %a2...%a7 and %ps. This accounts for
|
||
all callee-saved registers. From this information we reconstruct
|
||
the register state as it would look when we just returned from
|
||
cpu_switch(). */
|
||
|
||
/* The stack pointer shouldn't be zero. */
|
||
if (pcb->pcb_regs[PCB_REGS_SP] == 0)
|
||
return 0;
|
||
|
||
for (regnum = M68K_D2_REGNUM; regnum <= M68K_D7_REGNUM; regnum++)
|
||
regcache_raw_supply (regcache, regnum, &pcb->pcb_regs[i++]);
|
||
for (regnum = M68K_A2_REGNUM; regnum <= M68K_SP_REGNUM; regnum++)
|
||
regcache_raw_supply (regcache, regnum, &pcb->pcb_regs[i++]);
|
||
|
||
tmp = pcb->pcb_ps & 0xffff;
|
||
regcache_raw_supply (regcache, M68K_PS_REGNUM, &tmp);
|
||
|
||
read_memory (pcb->pcb_regs[PCB_REGS_FP] + 4, (char *) &tmp, sizeof tmp);
|
||
regcache_raw_supply (regcache, M68K_PC_REGNUM, &tmp);
|
||
|
||
return 1;
|
||
}
|
||
|
||
void
|
||
_initialize_m68kbsd_nat (void)
|
||
{
|
||
add_inf_child_target (&the_m68k_bsd_nat_target);
|
||
|
||
/* Support debugging kernel virtual memory images. */
|
||
bsd_kvm_add_target (m68kbsd_supply_pcb);
|
||
}
|