X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fhppa-obsd-nat.c;h=939a532b78537aebb66c48a0bd6e746152617ee2;hb=348fe36b1d64f12c60e08f6313520b3191663063;hp=bc7ef9338b26e380d8c90ee4c96da3b8ed26cd01;hpb=481695ed5f6e0a8a9c9c50bfac1cdd2b3151e6c9;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/hppa-obsd-nat.c b/gdb/hppa-obsd-nat.c index bc7ef9338b..939a532b78 100644 --- a/gdb/hppa-obsd-nat.c +++ b/gdb/hppa-obsd-nat.c @@ -1,6 +1,6 @@ /* Native-dependent code for OpenBSD/hppa. - Copyright (C) 2004-2017 Free Software Foundation, Inc. + Copyright (C) 2004-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -31,6 +31,14 @@ #include "obsd-nat.h" +struct hppa_obsd_nat_target final : public obsd_nat_target +{ + void fetch_registers (struct regcache *, int) override; + void store_registers (struct regcache *, int) override; +}; + +static hppa_obsd_nat_target the_hppa_obsd_nat_target; + static int hppaobsd_gregset_supplies_p (int regnum) { @@ -52,34 +60,34 @@ hppaobsd_supply_gregset (struct regcache *regcache, const void *gregs) const char *regs = gregs; int regnum; - regcache_raw_supply (regcache, HPPA_R0_REGNUM, &zero); + regcache->raw_supply (HPPA_R0_REGNUM, &zero); for (regnum = HPPA_R1_REGNUM; regnum <= HPPA_R31_REGNUM; regnum++) - regcache_raw_supply (regcache, regnum, regs + regnum * 4); + regcache->raw_supply (regnum, regs + regnum * 4); if (sizeof(struct reg) >= 46 * 4) { - regcache_raw_supply (regcache, HPPA_IPSW_REGNUM, regs); - 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_SR0_REGNUM, regs + 37 * 4); - regcache_raw_supply (regcache, HPPA_SR1_REGNUM, regs + 38 * 4); - regcache_raw_supply (regcache, HPPA_SR2_REGNUM, regs + 39 * 4); - regcache_raw_supply (regcache, HPPA_SR3_REGNUM, regs + 40 * 4); - regcache_raw_supply (regcache, HPPA_SR4_REGNUM, regs + 41 * 4); - regcache_raw_supply (regcache, HPPA_SR5_REGNUM, regs + 42 * 4); - regcache_raw_supply (regcache, HPPA_SR6_REGNUM, regs + 43 * 4); - regcache_raw_supply (regcache, HPPA_SR7_REGNUM, regs + 44 * 4); - regcache_raw_supply (regcache, HPPA_CR26_REGNUM, regs + 45 * 4); - regcache_raw_supply (regcache, HPPA_CR27_REGNUM, regs + 46 * 4); + regcache->raw_supply (HPPA_IPSW_REGNUM, regs); + 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_SR0_REGNUM, regs + 37 * 4); + regcache->raw_supply (HPPA_SR1_REGNUM, regs + 38 * 4); + regcache->raw_supply (HPPA_SR2_REGNUM, regs + 39 * 4); + regcache->raw_supply (HPPA_SR3_REGNUM, regs + 40 * 4); + regcache->raw_supply (HPPA_SR4_REGNUM, regs + 41 * 4); + regcache->raw_supply (HPPA_SR5_REGNUM, regs + 42 * 4); + regcache->raw_supply (HPPA_SR6_REGNUM, regs + 43 * 4); + regcache->raw_supply (HPPA_SR7_REGNUM, regs + 44 * 4); + regcache->raw_supply (HPPA_CR26_REGNUM, regs + 45 * 4); + regcache->raw_supply (HPPA_CR27_REGNUM, regs + 46 * 4); } else { - regcache_raw_supply (regcache, HPPA_SAR_REGNUM, regs); - regcache_raw_supply (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 32 * 4); - regcache_raw_supply (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 33 * 4); + regcache->raw_supply (HPPA_SAR_REGNUM, regs); + regcache->raw_supply (HPPA_PCOQ_HEAD_REGNUM, regs + 32 * 4); + regcache->raw_supply (HPPA_PCOQ_TAIL_REGNUM, regs + 33 * 4); } } @@ -94,8 +102,8 @@ hppaobsd_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); } } @@ -112,52 +120,52 @@ hppaobsd_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 (sizeof(struct reg) >= 46 * 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_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_SR0_REGNUM) - regcache_raw_collect (regcache, HPPA_SR0_REGNUM, regs + 37 * 4); + regcache->raw_collect (HPPA_SR0_REGNUM, regs + 37 * 4); if (regnum == -1 || regnum == HPPA_SR1_REGNUM) - regcache_raw_collect (regcache, HPPA_SR1_REGNUM, regs + 38 * 4); + regcache->raw_collect (HPPA_SR1_REGNUM, regs + 38 * 4); if (regnum == -1 || regnum == HPPA_SR2_REGNUM) - regcache_raw_collect (regcache, HPPA_SR2_REGNUM, regs + 39 * 4); + regcache->raw_collect (HPPA_SR2_REGNUM, regs + 39 * 4); if (regnum == -1 || regnum == HPPA_SR3_REGNUM) - regcache_raw_collect (regcache, HPPA_SR3_REGNUM, regs + 40 * 4); + regcache->raw_collect (HPPA_SR3_REGNUM, regs + 40 * 4); 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_SR5_REGNUM) - regcache_raw_collect (regcache, HPPA_SR5_REGNUM, regs + 42 * 4); + regcache->raw_collect (HPPA_SR5_REGNUM, regs + 42 * 4); if (regnum == -1 || regnum == HPPA_SR6_REGNUM) - regcache_raw_collect (regcache, HPPA_SR6_REGNUM, regs + 43 * 4); + regcache->raw_collect (HPPA_SR6_REGNUM, regs + 43 * 4); if (regnum == -1 || regnum == HPPA_SR7_REGNUM) - regcache_raw_collect (regcache, HPPA_SR7_REGNUM, regs + 44 * 4); + regcache->raw_collect (HPPA_SR7_REGNUM, regs + 44 * 4); if (regnum == -1 || regnum == HPPA_CR26_REGNUM) - regcache_raw_collect (regcache, HPPA_CR26_REGNUM, regs + 45 * 4); + regcache->raw_collect (HPPA_CR26_REGNUM, regs + 45 * 4); if (regnum == -1 || regnum == HPPA_CR27_REGNUM) - regcache_raw_collect (regcache, HPPA_CR27_REGNUM, regs + 46 * 4); + regcache->raw_collect (HPPA_CR27_REGNUM, regs + 46 * 4); } else { if (regnum == -1 || regnum == HPPA_SAR_REGNUM) - regcache_raw_collect (regcache, HPPA_SAR_REGNUM, regs); + regcache->raw_collect (HPPA_SAR_REGNUM, regs); if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM) - regcache_raw_collect (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 32 * 4); + regcache->raw_collect (HPPA_PCOQ_HEAD_REGNUM, regs + 32 * 4); if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM) - regcache_raw_collect (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 33 * 4); + regcache->raw_collect (HPPA_PCOQ_TAIL_REGNUM, regs + 33 * 4); } } @@ -175,8 +183,8 @@ hppaobsd_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); } } } @@ -185,11 +193,10 @@ hppaobsd_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 -hppaobsd_fetch_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) +void +hppa_obsd_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 (); if (regnum == -1 || hppaobsd_gregset_supplies_p (regnum)) { @@ -215,9 +222,8 @@ hppaobsd_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 -hppaobsd_store_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) +void +hppa_obsd_nat_target::store_registers (struct regcache *regcache, int regnum) { if (regnum == -1 || hppaobsd_gregset_supplies_p (regnum)) { @@ -246,13 +252,9 @@ hppaobsd_store_registers (struct target_ops *ops, } } +void _initialize_hppaobsd_nat (); void -_initialize_hppaobsd_nat (void) +_initialize_hppaobsd_nat () { - struct target_ops *t; - - t = inf_ptrace_target (); - t->to_fetch_registers = hppaobsd_fetch_registers; - t->to_store_registers = hppaobsd_store_registers; - obsd_add_target (t); + add_inf_child_target (&the_hppa_obsd_nat_target); }