From patchwork Thu Mar 5 16:25:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 5479 Received: (qmail 28355 invoked by alias); 5 Mar 2015 16:25:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 28319 invoked by uid 89); 5 Mar 2015 16:25:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: glazunov.sibelius.xs4all.nl Received: from sibelius.xs4all.nl (HELO glazunov.sibelius.xs4all.nl) (83.163.83.176) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 05 Mar 2015 16:25:15 +0000 Received: from glazunov.sibelius.xs4all.nl (kettenis@localhost [127.0.0.1]) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3) with ESMTP id t25GPBgK004966 for ; Thu, 5 Mar 2015 17:25:11 +0100 (CET) Received: (from kettenis@localhost) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3/Submit) id t25GPAMC011927; Thu, 5 Mar 2015 17:25:10 +0100 (CET) Date: Thu, 5 Mar 2015 17:25:10 +0100 (CET) Message-Id: <201503051625.t25GPAMC011927@glazunov.sibelius.xs4all.nl> From: Mark Kettenis To: gdb-patches@sourceware.org Subject: [PATCH pushed] Enable rthreads support on OpenBSD/hppa gdb/ 2015-03-05 Mark Kettenis * hppabsd-nat.c: Remove file. * hppaobsd-nat.c: New file. * Makefile.in (ALLDEPFILES): Remove hppabsd-nat.c. Add hppaobsd-nat.c. * config/pa/obsd.mh (NATDEPFILES): Replace hppabsd-nat.o with hppaobsd-nat.o. --- gdb/ChangeLog | 9 ++ gdb/Makefile.in | 4 +- gdb/config/pa/obsd.mh | 2 +- gdb/hppabsd-nat.c | 264 ------------------------------------------------- gdb/hppaobsd-nat.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 277 insertions(+), 267 deletions(-) delete mode 100644 gdb/hppabsd-nat.c create mode 100644 gdb/hppaobsd-nat.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 94ea6ca..5ee18e7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2015-03-05 Mark Kettenis + + * hppabsd-nat.c: Remove file. + * hppaobsd-nat.c: New file. + * Makefile.in (ALLDEPFILES): Remove hppabsd-nat.c. Add + hppaobsd-nat.c. + * config/pa/obsd.mh (NATDEPFILES): Replace hppabsd-nat.o with + hppaobsd-nat.o. + 2015-03-04 Pedro Alves * target.h (struct target_ops) : Delete. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index e837c6f..8c2a4de 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1656,9 +1656,9 @@ ALLDEPFILES = \ go32-nat.c h8300-tdep.c \ hppa-tdep.c hppa-hpux-tdep.c hppa-hpux-nat.c \ hppa-linux-tdep.c hppa-linux-nat.c \ - hppabsd-nat.c hppabsd-tdep.c \ - hppaobsd-tdep.c \ + hppabsd-tdep.c \ hppanbsd-nat.c hppanbsd-tdep.c \ + hppaobsd-nat.c hppaobsd-tdep.c \ i386-tdep.c i386-linux-nat.c \ i386v4-nat.c i386-cygwin-tdep.c \ i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c \ diff --git a/gdb/config/pa/obsd.mh b/gdb/config/pa/obsd.mh index 4e76832..50a1192 100644 --- a/gdb/config/pa/obsd.mh +++ b/gdb/config/pa/obsd.mh @@ -1,2 +1,2 @@ # Host: OpenBSD/hppa -NATDEPFILES= fork-child.o inf-ptrace.o hppabsd-nat.o +NATDEPFILES= fork-child.o inf-ptrace.o obsd-nat.o hppaobsd-nat.o diff --git a/gdb/hppabsd-nat.c b/gdb/hppabsd-nat.c deleted file mode 100644 index 341fe52..0000000 --- a/gdb/hppabsd-nat.c +++ /dev/null @@ -1,264 +0,0 @@ -/* Native-dependent code for HP PA-RISC BSD's. - - Copyright (C) 2004-2015 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 . */ - -#include "defs.h" -#include "inferior.h" -#include "regcache.h" -#include "target.h" - -#include -#include -#include - -#include "hppa-tdep.h" -#include "inf-ptrace.h" - -static int -hppabsd_gregset_supplies_p (int regnum) -{ - return (regnum >= HPPA_R0_REGNUM && regnum <= HPPA_CR27_REGNUM); -} - -static int -hppabsd_fpregset_supplies_p (int regnum) -{ - return (regnum >= HPPA_FP0_REGNUM && regnum <= HPPA_FP31R_REGNUM); -} - -/* Supply the general-purpose registers stored in GREGS to REGCACHE. */ - -static void -hppabsd_supply_gregset (struct regcache *regcache, const void *gregs) -{ - gdb_byte zero[4] = { 0 }; - const char *regs = gregs; - int regnum; - - regcache_raw_supply (regcache, HPPA_R0_REGNUM, &zero); - for (regnum = HPPA_R1_REGNUM; regnum <= HPPA_R31_REGNUM; regnum++) - regcache_raw_supply (regcache, 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); - } - 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); - } -} - -/* Supply the floating-point registers stored in FPREGS to REGCACHE. */ - -static void -hppabsd_supply_fpregset (struct regcache *regcache, const void *fpregs) -{ - const char *regs = fpregs; - int regnum; - - 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); - } -} - -/* Collect the general-purpose registers from REGCACHE and store them - in GREGS. */ - -static void -hppabsd_collect_gregset (const struct regcache *regcache, - void *gregs, int regnum) -{ - char *regs = gregs; - int i; - - for (i = HPPA_R1_REGNUM; i <= HPPA_R31_REGNUM; i++) - { - if (regnum == -1 || regnum == i) - regcache_raw_collect (regcache, 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); - if (regnum == -1 || regnum == HPPA_SAR_REGNUM) - regcache_raw_collect (regcache, 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); - if (regnum == -1 || regnum == HPPA_PCSQ_TAIL_REGNUM) - regcache_raw_collect (regcache, 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); - if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM) - regcache_raw_collect (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); - if (regnum == -1 || regnum == HPPA_SR0_REGNUM) - regcache_raw_collect (regcache, HPPA_SR0_REGNUM, regs + 37 * 4); - if (regnum == -1 || regnum == HPPA_SR1_REGNUM) - regcache_raw_collect (regcache, HPPA_SR1_REGNUM, regs + 38 * 4); - if (regnum == -1 || regnum == HPPA_SR2_REGNUM) - regcache_raw_collect (regcache, HPPA_SR2_REGNUM, regs + 39 * 4); - if (regnum == -1 || regnum == HPPA_SR3_REGNUM) - regcache_raw_collect (regcache, HPPA_SR3_REGNUM, regs + 40 * 4); - if (regnum == -1 || regnum == HPPA_SR4_REGNUM) - regcache_raw_collect (regcache, HPPA_SR4_REGNUM, regs + 41 * 4); - if (regnum == -1 || regnum == HPPA_SR5_REGNUM) - regcache_raw_collect (regcache, HPPA_SR5_REGNUM, regs + 42 * 4); - if (regnum == -1 || regnum == HPPA_SR6_REGNUM) - regcache_raw_collect (regcache, HPPA_SR6_REGNUM, regs + 43 * 4); - if (regnum == -1 || regnum == HPPA_SR7_REGNUM) - regcache_raw_collect (regcache, HPPA_SR7_REGNUM, regs + 44 * 4); - if (regnum == -1 || regnum == HPPA_CR26_REGNUM) - regcache_raw_collect (regcache, HPPA_CR26_REGNUM, regs + 45 * 4); - if (regnum == -1 || regnum == HPPA_CR27_REGNUM) - regcache_raw_collect (regcache, HPPA_CR27_REGNUM, regs + 46 * 4); - } - else - { - if (regnum == -1 || regnum == HPPA_SAR_REGNUM) - regcache_raw_collect (regcache, HPPA_SAR_REGNUM, regs); - if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM) - regcache_raw_collect (regcache, 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); - } -} - -/* Collect the floating-point registers from REGCACHE and store them - in FPREGS. */ - -static void -hppabsd_collect_fpregset (struct regcache *regcache, - void *fpregs, int regnum) -{ - char *regs = fpregs; - int i; - - for (i = HPPA_FP0_REGNUM; i <= HPPA_FP31R_REGNUM; i += 2, regs += 8) - { - if (regnum == -1 || regnum == i || regnum == i + 1) - { - regcache_raw_collect (regcache, i, regs); - regcache_raw_collect (regcache, i + 1, regs + 4); - } - } -} - - -/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this - for all registers (including the floating-point registers). */ - -static void -hppabsd_fetch_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) -{ - if (regnum == -1 || hppabsd_gregset_supplies_p (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name (_("Couldn't get registers")); - - hppabsd_supply_gregset (regcache, ®s); - } - - if (regnum == -1 || hppabsd_fpregset_supplies_p (regnum)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name (_("Couldn't get floating point status")); - - hppabsd_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). */ - -static void -hppabsd_store_registers (struct target_ops *ops, - struct regcache *regcache, int regnum) -{ - if (regnum == -1 || hppabsd_gregset_supplies_p (regnum)) - { - struct reg regs; - - if (ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name (_("Couldn't get registers")); - - hppabsd_collect_gregset (regcache, ®s, regnum); - - if (ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name (_("Couldn't write registers")); - } - - if (regnum == -1 || hppabsd_fpregset_supplies_p (regnum)) - { - struct fpreg fpregs; - - if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name (_("Couldn't get floating point status")); - - hppabsd_collect_fpregset (regcache, &fpregs, regnum); - - if (ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid), - (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name (_("Couldn't write floating point status")); - } -} - -/* Provide a prototype to silence -Wmissing-prototypes. */ -void _initialize_hppabsd_nat (void); - -void -_initialize_hppabsd_nat (void) -{ - struct target_ops *t; - - /* Add in local overrides. */ - t = inf_ptrace_target (); - t->to_fetch_registers = hppabsd_fetch_registers; - t->to_store_registers = hppabsd_store_registers; - add_target (t); -} diff --git a/gdb/hppaobsd-nat.c b/gdb/hppaobsd-nat.c new file mode 100644 index 0000000..fe49b99 --- /dev/null +++ b/gdb/hppaobsd-nat.c @@ -0,0 +1,265 @@ +/* Native-dependent code for OpenBSD/hppa. + + Copyright (C) 2004-2015 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 . */ + +#include "defs.h" +#include "inferior.h" +#include "regcache.h" +#include "target.h" + +#include +#include +#include + +#include "hppa-tdep.h" +#include "inf-ptrace.h" + +#include "obsd-nat.h" + +static int +hppaobsd_gregset_supplies_p (int regnum) +{ + return (regnum >= HPPA_R0_REGNUM && regnum <= HPPA_CR27_REGNUM); +} + +static int +hppaobsd_fpregset_supplies_p (int regnum) +{ + return (regnum >= HPPA_FP0_REGNUM && regnum <= HPPA_FP31R_REGNUM); +} + +/* Supply the general-purpose registers stored in GREGS to REGCACHE. */ + +static void +hppaobsd_supply_gregset (struct regcache *regcache, const void *gregs) +{ + gdb_byte zero[4] = { 0 }; + const char *regs = gregs; + int regnum; + + regcache_raw_supply (regcache, HPPA_R0_REGNUM, &zero); + for (regnum = HPPA_R1_REGNUM; regnum <= HPPA_R31_REGNUM; regnum++) + regcache_raw_supply (regcache, 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); + } + 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); + } +} + +/* Supply the floating-point registers stored in FPREGS to REGCACHE. */ + +static void +hppaobsd_supply_fpregset (struct regcache *regcache, const void *fpregs) +{ + const char *regs = fpregs; + int regnum; + + 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); + } +} + +/* Collect the general-purpose registers from REGCACHE and store them + in GREGS. */ + +static void +hppaobsd_collect_gregset (const struct regcache *regcache, + void *gregs, int regnum) +{ + char *regs = gregs; + int i; + + for (i = HPPA_R1_REGNUM; i <= HPPA_R31_REGNUM; i++) + { + if (regnum == -1 || regnum == i) + regcache_raw_collect (regcache, 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); + if (regnum == -1 || regnum == HPPA_SAR_REGNUM) + regcache_raw_collect (regcache, 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); + if (regnum == -1 || regnum == HPPA_PCSQ_TAIL_REGNUM) + regcache_raw_collect (regcache, 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); + if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM) + regcache_raw_collect (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4); + if (regnum == -1 || regnum == HPPA_SR0_REGNUM) + regcache_raw_collect (regcache, HPPA_SR0_REGNUM, regs + 37 * 4); + if (regnum == -1 || regnum == HPPA_SR1_REGNUM) + regcache_raw_collect (regcache, HPPA_SR1_REGNUM, regs + 38 * 4); + if (regnum == -1 || regnum == HPPA_SR2_REGNUM) + regcache_raw_collect (regcache, HPPA_SR2_REGNUM, regs + 39 * 4); + if (regnum == -1 || regnum == HPPA_SR3_REGNUM) + regcache_raw_collect (regcache, HPPA_SR3_REGNUM, regs + 40 * 4); + if (regnum == -1 || regnum == HPPA_SR4_REGNUM) + regcache_raw_collect (regcache, HPPA_SR4_REGNUM, regs + 41 * 4); + if (regnum == -1 || regnum == HPPA_SR5_REGNUM) + regcache_raw_collect (regcache, HPPA_SR5_REGNUM, regs + 42 * 4); + if (regnum == -1 || regnum == HPPA_SR6_REGNUM) + regcache_raw_collect (regcache, HPPA_SR6_REGNUM, regs + 43 * 4); + if (regnum == -1 || regnum == HPPA_SR7_REGNUM) + regcache_raw_collect (regcache, HPPA_SR7_REGNUM, regs + 44 * 4); + if (regnum == -1 || regnum == HPPA_CR26_REGNUM) + regcache_raw_collect (regcache, HPPA_CR26_REGNUM, regs + 45 * 4); + if (regnum == -1 || regnum == HPPA_CR27_REGNUM) + regcache_raw_collect (regcache, HPPA_CR27_REGNUM, regs + 46 * 4); + } + else + { + if (regnum == -1 || regnum == HPPA_SAR_REGNUM) + regcache_raw_collect (regcache, HPPA_SAR_REGNUM, regs); + if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM) + regcache_raw_collect (regcache, 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); + } +} + +/* Collect the floating-point registers from REGCACHE and store them + in FPREGS. */ + +static void +hppaobsd_collect_fpregset (struct regcache *regcache, + void *fpregs, int regnum) +{ + char *regs = fpregs; + int i; + + for (i = HPPA_FP0_REGNUM; i <= HPPA_FP31R_REGNUM; i += 2, regs += 8) + { + if (regnum == -1 || regnum == i || regnum == i + 1) + { + regcache_raw_collect (regcache, i, regs); + regcache_raw_collect (regcache, i + 1, regs + 4); + } + } +} + + +/* 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) +{ + 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) + perror_with_name (_("Couldn't get registers")); + + hppaobsd_supply_gregset (regcache, ®s); + } + + if (regnum == -1 || hppaobsd_fpregset_supplies_p (regnum)) + { + struct fpreg fpregs; + + if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name (_("Couldn't get floating point status")); + + hppaobsd_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). */ + +static void +hppaobsd_store_registers (struct target_ops *ops, + struct regcache *regcache, int regnum) +{ + 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) + 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) + perror_with_name (_("Couldn't write registers")); + } + + if (regnum == -1 || hppaobsd_fpregset_supplies_p (regnum)) + { + struct fpreg fpregs; + + if (ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid), + (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) + perror_with_name (_("Couldn't write floating point status")); + } +} + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_hppaobsd_nat (void); + +void +_initialize_hppaobsd_nat (void) +{ + 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); +}