X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fhppa-nbsd-nat.c;h=c35f30daa8ea8e822d08677c6767b860be95acb4;hb=d2d1ea20aef6ed97232280b5e15a52b8d7dc7b7d;hp=98ac4092a59f89c80339a2c453d0d6f421ffc8d7;hpb=481695ed5f6e0a8a9c9c50bfac1cdd2b3151e6c9;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/hppa-nbsd-nat.c b/gdb/hppa-nbsd-nat.c index 98ac4092a5..c35f30daa8 100644 --- a/gdb/hppa-nbsd-nat.c +++ b/gdb/hppa-nbsd-nat.c @@ -1,6 +1,6 @@ /* Native-dependent code for NetBSD/hppa. - Copyright (C) 2008-2017 Free Software Foundation, Inc. + Copyright (C) 2008-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -30,6 +30,14 @@ #include "nbsd-nat.h" +class hppa_nbsd_nat_target final : public nbsd_nat_target +{ + void fetch_registers (struct regcache *, int) override; + void store_registers (struct regcache *, int) override; +}; + +static hppa_nbsd_nat_target the_hppa_nbsd_nat_target; + static int hppanbsd_gregset_supplies_p (int regnum) { @@ -55,19 +63,19 @@ hppanbsd_supply_gregset (struct regcache *regcache, const void *gregs) int regnum; for (regnum = HPPA_R1_REGNUM; regnum <= HPPA_R31_REGNUM; regnum++) - regcache_raw_supply (regcache, regnum, regs + regnum * 4); - - regcache_raw_supply (regcache, HPPA_SAR_REGNUM, regs + 32 * 4); - regcache_raw_supply (regcache, HPPA_PCSQ_HEAD_REGNUM, regs + 33 * 4); - regcache_raw_supply (regcache, HPPA_PCSQ_TAIL_REGNUM, regs + 34 * 4); - regcache_raw_supply (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 35 * 4); - regcache_raw_supply (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); - regcache_raw_supply (regcache, HPPA_IPSW_REGNUM, regs); - regcache_raw_supply (regcache, HPPA_SR4_REGNUM, regs + 41 * 4); - regcache_raw_supply (regcache, HPPA_SR4_REGNUM + 1, regs + 37 * 4); - regcache_raw_supply (regcache, HPPA_SR4_REGNUM + 2, regs + 38 * 4); - regcache_raw_supply (regcache, HPPA_SR4_REGNUM + 3, regs + 39 * 4); - regcache_raw_supply (regcache, HPPA_SR4_REGNUM + 4, regs + 40 * 4); + regcache->raw_supply (regnum, regs + regnum * 4); + + regcache->raw_supply (HPPA_SAR_REGNUM, regs + 32 * 4); + regcache->raw_supply (HPPA_PCSQ_HEAD_REGNUM, regs + 33 * 4); + regcache->raw_supply (HPPA_PCSQ_TAIL_REGNUM, regs + 34 * 4); + regcache->raw_supply (HPPA_PCOQ_HEAD_REGNUM, regs + 35 * 4); + regcache->raw_supply (HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); + regcache->raw_supply (HPPA_IPSW_REGNUM, regs); + regcache->raw_supply (HPPA_SR4_REGNUM, regs + 41 * 4); + regcache->raw_supply (HPPA_SR4_REGNUM + 1, regs + 37 * 4); + regcache->raw_supply (HPPA_SR4_REGNUM + 2, regs + 38 * 4); + regcache->raw_supply (HPPA_SR4_REGNUM + 3, regs + 39 * 4); + regcache->raw_supply (HPPA_SR4_REGNUM + 4, regs + 40 * 4); } /* Supply the floating-point registers stored in FPREGS to REGCACHE. */ @@ -81,8 +89,8 @@ hppanbsd_supply_fpregset (struct regcache *regcache, const void *fpregs) for (regnum = HPPA_FP0_REGNUM; regnum <= HPPA_FP31R_REGNUM; regnum += 2, regs += 8) { - regcache_raw_supply (regcache, regnum, regs); - regcache_raw_supply (regcache, regnum + 1, regs + 4); + regcache->raw_supply (regnum, regs); + regcache->raw_supply (regnum + 1, regs + 4); } } @@ -100,38 +108,38 @@ hppanbsd_collect_gregset (const struct regcache *regcache, for (i = HPPA_R1_REGNUM; i <= HPPA_R31_REGNUM; i++) { if (regnum == -1 || regnum == i) - regcache_raw_collect (regcache, i, regs + i * 4); + regcache->raw_collect (i, regs + i * 4); } if (regnum == -1 || regnum == HPPA_IPSW_REGNUM) - regcache_raw_collect (regcache, HPPA_IPSW_REGNUM, regs); + regcache->raw_collect (HPPA_IPSW_REGNUM, regs); if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM) - regcache_raw_collect (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 35 * 4); + regcache->raw_collect (HPPA_PCOQ_HEAD_REGNUM, regs + 35 * 4); if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM) - regcache_raw_collect (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); + regcache->raw_collect (HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); if (regnum == -1 || regnum == HPPA_SAR_REGNUM) - regcache_raw_collect (regcache, HPPA_SAR_REGNUM, regs + 32 * 4); + regcache->raw_collect (HPPA_SAR_REGNUM, regs + 32 * 4); if (regnum == -1 || regnum == HPPA_PCSQ_HEAD_REGNUM) - regcache_raw_collect (regcache, HPPA_PCSQ_HEAD_REGNUM, regs + 33 * 4); + regcache->raw_collect (HPPA_PCSQ_HEAD_REGNUM, regs + 33 * 4); if (regnum == -1 || regnum == HPPA_PCSQ_TAIL_REGNUM) - regcache_raw_collect (regcache, HPPA_PCSQ_TAIL_REGNUM, regs + 34 * 4); + regcache->raw_collect (HPPA_PCSQ_TAIL_REGNUM, regs + 34 * 4); if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM) - regcache_raw_collect (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 35 * 4); + regcache->raw_collect (HPPA_PCOQ_HEAD_REGNUM, regs + 35 * 4); if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM) - regcache_raw_collect (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); + regcache->raw_collect (HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); if (regnum == -1 || regnum == HPPA_IPSW_REGNUM) - regcache_raw_collect (regcache, HPPA_IPSW_REGNUM, regs); + regcache->raw_collect (HPPA_IPSW_REGNUM, regs); if (regnum == -1 || regnum == HPPA_SR4_REGNUM) - regcache_raw_collect (regcache, HPPA_SR4_REGNUM, regs + 41 * 4); + regcache->raw_collect (HPPA_SR4_REGNUM, regs + 41 * 4); if (regnum == -1 || regnum == HPPA_SR4_REGNUM + 1) - regcache_raw_collect (regcache, HPPA_SR4_REGNUM + 1, regs + 37 * 4); + regcache->raw_collect (HPPA_SR4_REGNUM + 1, regs + 37 * 4); if (regnum == -1 || regnum == HPPA_SR4_REGNUM + 2) - regcache_raw_collect (regcache, HPPA_SR4_REGNUM + 2, regs + 38 * 4); + regcache->raw_collect (HPPA_SR4_REGNUM + 2, regs + 38 * 4); if (regnum == -1 || regnum == HPPA_SR4_REGNUM + 3) - regcache_raw_collect (regcache, HPPA_SR4_REGNUM + 3, regs + 39 * 4); + regcache->raw_collect (HPPA_SR4_REGNUM + 3, regs + 39 * 4); if (regnum == -1 || regnum == HPPA_SR4_REGNUM + 4) - regcache_raw_collect (regcache, HPPA_SR4_REGNUM + 4, regs + 40 * 4); + regcache->raw_collect (HPPA_SR4_REGNUM + 4, regs + 40 * 4); } /* Collect the floating-point registers from REGCACHE and store them @@ -148,8 +156,8 @@ hppanbsd_collect_fpregset (struct regcache *regcache, { if (regnum == -1 || regnum == i || regnum == i + 1) { - regcache_raw_collect (regcache, i, regs); - regcache_raw_collect (regcache, i + 1, regs + 4); + regcache->raw_collect (i, regs); + regcache->raw_collect (i + 1, regs + 4); } } } @@ -158,18 +166,18 @@ hppanbsd_collect_fpregset (struct regcache *regcache, /* Fetch register REGNUM from the inferior. If REGNUM is -1, do this for all registers (including the floating-point registers). */ -static void -hppanbsd_fetch_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) +void +hppa_nbsd_nat_target::fetch_registers (struct regcache *regcache, int regnum) { - pid_t pid = ptid_get_pid (regcache_get_ptid (regcache)); + pid_t pid = regcache->ptid ().pid (); + int lwp = regcache->ptid ().lwp (); if (regnum == -1 || hppanbsd_gregset_supplies_p (regnum)) { struct reg regs; - if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) + if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, lwp) == -1) perror_with_name (_("Couldn't get registers")); hppanbsd_supply_gregset (regcache, ®s); @@ -179,7 +187,7 @@ hppanbsd_fetch_registers (struct target_ops *ops, { struct fpreg fpregs; - if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, lwp) == -1) perror_with_name (_("Couldn't get floating point status")); hppanbsd_supply_fpregset (regcache, &fpregs); @@ -189,22 +197,22 @@ hppanbsd_fetch_registers (struct target_ops *ops, /* Store register REGNUM back into the inferior. If REGNUM is -1, do this for all registers (including the floating-point registers). */ -static void -hppanbsd_store_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) +void +hppa_nbsd_nat_target::store_registers (struct regcache *regcache, int regnum) { - pid_t pid = ptid_get_pid (regcache_get_ptid (regcache)); + pid_t pid = regcache->ptid ().pid (); + int lwp = regcache->ptid ().lwp (); if (regnum == -1 || hppanbsd_gregset_supplies_p (regnum)) { struct reg regs; - if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) + if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, lwp) == -1) perror_with_name (_("Couldn't get registers")); hppanbsd_collect_gregset (regcache, ®s, regnum); - if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) + if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, lwp) == -1) perror_with_name (_("Couldn't write registers")); } @@ -212,28 +220,19 @@ hppanbsd_store_registers (struct target_ops *ops, { struct fpreg fpregs; - if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, lwp) == -1) perror_with_name (_("Couldn't get floating point status")); hppanbsd_collect_fpregset (regcache, &fpregs, regnum); - if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, lwp) == -1) perror_with_name (_("Couldn't write floating point status")); } } +void _initialize_hppanbsd_nat (); void -_initialize_hppanbsd_nat (void) +_initialize_hppanbsd_nat () { - struct target_ops *t; - - /* Add some extra features to the ptrace target. */ - t = inf_ptrace_target (); - - t->to_fetch_registers = hppanbsd_fetch_registers; - t->to_store_registers = hppanbsd_store_registers; - - t->to_pid_to_exec_file = nbsd_pid_to_exec_file; - - add_target (t); + add_inf_child_target (&the_hppa_nbsd_nat_target); }