From bbe1eef1e585e19d5493882e55f2b7902df9827a Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 17 Mar 2017 13:55:55 -0400 Subject: hppa-obsd-nat: Use ptid from regcache instead of inferior_ptid gdb/ChangeLog: * hppa-obsd-nat.c (hppaobsd_fetch_registers, hppaobsd_store_registers): Use ptid from regcache. --- gdb/ChangeLog | 5 +++++ gdb/hppa-obsd-nat.c | 20 ++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3c07a7f..f3d14dd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2017-03-17 Simon Marchi + * hppa-obsd-nat.c (hppaobsd_fetch_registers, + hppaobsd_store_registers): Use ptid from regcache. + +2017-03-17 Simon Marchi + * hppa-nbsd-nat.c (hppanbsd_fetch_registers, hppanbsd_store_registers): Use ptid from regcache. diff --git a/gdb/hppa-obsd-nat.c b/gdb/hppa-obsd-nat.c index 66af86b..7a255c9 100644 --- a/gdb/hppa-obsd-nat.c +++ b/gdb/hppa-obsd-nat.c @@ -189,12 +189,13 @@ static void hppaobsd_fetch_registers (struct target_ops *ops, struct regcache *regcache, int regnum) { + pid_t pid = ptid_get_pid (regcache_get_ptid (regcache)); + if (regnum == -1 || hppaobsd_gregset_supplies_p (regnum)) { struct reg regs; - if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, 0) == -1) + if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't get registers")); hppaobsd_supply_gregset (regcache, ®s); @@ -204,8 +205,7 @@ hppaobsd_fetch_registers (struct target_ops *ops, { struct fpreg fpregs; - if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) perror_with_name (_("Couldn't get floating point status")); hppaobsd_supply_fpregset (regcache, &fpregs); @@ -223,14 +223,12 @@ hppaobsd_store_registers (struct target_ops *ops, { struct reg regs; - if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, 0) == -1) + if (ptrace (PT_GETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't get registers")); hppaobsd_collect_gregset (regcache, ®s, regnum); - if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, 0) == -1) + if (ptrace (PT_SETREGS, pid, (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't write registers")); } @@ -238,14 +236,12 @@ hppaobsd_store_registers (struct target_ops *ops, { struct fpreg fpregs; - if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + if (ptrace (PT_GETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) perror_with_name (_("Couldn't get floating point status")); hppaobsd_collect_fpregset (regcache, &fpregs, regnum); - if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + if (ptrace (PT_SETFPREGS, pid, (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) perror_with_name (_("Couldn't write floating point status")); } } -- cgit v1.1