X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fhppa-linux-nat.c;h=09fa4c38c55cf6357805a62719f69a39b66d0525;hb=db3ad2f031d4da70db35977abbcede0399d81d6b;hp=58650d0eaced8b1a4143a15569d460f34b5c401f;hpb=ecd75fc8eed3bde86036141228074a20e55dcfc9;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c index 58650d0eac..09fa4c38c5 100644 --- a/gdb/hppa-linux-nat.c +++ b/gdb/hppa-linux-nat.c @@ -1,6 +1,6 @@ /* Functions specific to running GDB native on HPPA running GNU/Linux. - Copyright (C) 2004-2014 Free Software Foundation, Inc. + Copyright (C) 2004-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -20,13 +20,14 @@ #include "defs.h" #include "gdbcore.h" #include "regcache.h" -#include #include "inferior.h" #include "target.h" #include "linux-nat.h" +#include "inf-ptrace.h" +#include "gdbarch.h" #include -#include +#include "nat/gdb_ptrace.h" #include #include @@ -34,6 +35,16 @@ #include "hppa-tdep.h" +class hppa_linux_nat_target final : public linux_nat_target +{ +public: + /* Add our register access methods. */ + void fetch_registers (struct regcache *, int) override; + void store_registers (struct regcache *, int) override; +}; + +static hppa_linux_nat_target the_hppa_linux_nat_target; + /* Prototypes for supply_gregset etc. */ #include "gregset.h" @@ -213,20 +224,17 @@ static const int greg_map[] = static void fetch_register (struct regcache *regcache, int regno) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); - int tid; + struct gdbarch *gdbarch = regcache->arch (); + pid_t tid; int val; if (gdbarch_cannot_fetch_register (gdbarch, regno)) { - regcache_raw_supply (regcache, regno, NULL); + regcache->raw_supply (regno, NULL); return; } - /* GNU/Linux LWP ID's are process ID's. */ - tid = ptid_get_lwp (inferior_ptid); - if (tid == 0) - tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */ + tid = get_ptrace_pid (regcache->ptid ()); errno = 0; val = ptrace (PTRACE_PEEKUSER, tid, hppa_linux_register_addr (regno, 0), 0); @@ -235,7 +243,7 @@ fetch_register (struct regcache *regcache, int regno) gdbarch_register_name (gdbarch, regno), regno, safe_strerror (errno)); - regcache_raw_supply (regcache, regno, &val); + regcache->raw_supply (regno, &val); } /* Store one register. */ @@ -243,20 +251,17 @@ fetch_register (struct regcache *regcache, int regno) static void store_register (const struct regcache *regcache, int regno) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); - int tid; + struct gdbarch *gdbarch = regcache->arch (); + pid_t tid; int val; if (gdbarch_cannot_store_register (gdbarch, regno)) return; - /* GNU/Linux LWP ID's are process ID's. */ - tid = ptid_get_lwp (inferior_ptid); - if (tid == 0) - tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */ + tid = get_ptrace_pid (regcache->ptid ()); errno = 0; - regcache_raw_collect (regcache, regno, &val); + regcache->raw_collect (regno, &val); ptrace (PTRACE_POKEUSER, tid, hppa_linux_register_addr (regno, 0), val); if (errno != 0) error (_("Couldn't write register %s (#%d): %s."), @@ -268,14 +273,13 @@ store_register (const struct regcache *regcache, int regno) regno == -1, otherwise fetch all general registers or all floating point registers depending upon the value of regno. */ -static void -hppa_linux_fetch_inferior_registers (struct target_ops *ops, - struct regcache *regcache, int regno) +void +hppa_linux_nat_target::fetch_registers (struct regcache *regcache, int regno) { if (-1 == regno) { for (regno = 0; - regno < gdbarch_num_regs (get_regcache_arch (regcache)); + regno < gdbarch_num_regs (regcache->arch ()); regno++) fetch_register (regcache, regno); } @@ -289,14 +293,13 @@ hppa_linux_fetch_inferior_registers (struct target_ops *ops, regno == -1, otherwise store all general registers or all floating point registers depending upon the value of regno. */ -static void -hppa_linux_store_inferior_registers (struct target_ops *ops, - struct regcache *regcache, int regno) +void +hppa_linux_nat_target::store_registers (struct regcache *regcache, int regno) { if (-1 == regno) { for (regno = 0; - regno < gdbarch_num_regs (get_regcache_arch (regcache)); + regno < gdbarch_num_regs (regcache->arch ()); regno++) store_register (regcache, regno); } @@ -318,7 +321,7 @@ supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregsetp) for (i = 0; i < sizeof (greg_map) / sizeof (greg_map[0]); i++, regp++) { int regno = greg_map[i]; - regcache_raw_supply (regcache, regno, regp); + regcache->raw_supply (regno, regp); } } @@ -337,9 +340,7 @@ fill_gregset (const struct regcache *regcache, int mregno = greg_map[i]; if (regno == -1 || regno == mregno) - { - regcache_raw_collect(regcache, mregno, &(*gregsetp)[i]); - } + regcache->raw_collect (mregno, &(*gregsetp)[i]); } } @@ -356,8 +357,8 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp) for (regi = 0; regi <= 31; regi++) { from = (const char *) &((*fpregsetp)[regi]); - regcache_raw_supply (regcache, 2*regi + HPPA_FP0_REGNUM, from); - regcache_raw_supply (regcache, 2*regi + HPPA_FP0_REGNUM + 1, from + 4); + regcache->raw_supply (2*regi + HPPA_FP0_REGNUM, from); + regcache->raw_supply (2*regi + HPPA_FP0_REGNUM + 1, from + 4); } } @@ -379,24 +380,14 @@ fill_fpregset (const struct regcache *regcache, char *to = (char *) &((*fpregsetp)[(i - HPPA_FP0_REGNUM) / 2]); if ((i - HPPA_FP0_REGNUM) & 1) to += 4; - regcache_raw_collect (regcache, i, to); + regcache->raw_collect (i, to); } } -void _initialize_hppa_linux_nat (void); - void _initialize_hppa_linux_nat (void) { - struct target_ops *t; - - /* Fill in the generic GNU/Linux methods. */ - t = linux_target (); - - /* Add our register access methods. */ - t->to_fetch_registers = hppa_linux_fetch_inferior_registers; - t->to_store_registers = hppa_linux_store_inferior_registers; - /* Register the target. */ - linux_nat_add_target (t); + linux_target = &the_hppa_linux_nat_target; + add_inf_child_target (&the_hppa_linux_nat_target); }