From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24771 invoked by alias); 14 Jan 2006 12:27:31 -0000 Received: (qmail 24758 invoked by uid 22791); 14 Jan 2006 12:27:30 -0000 X-Spam-Check-By: sourceware.org Received: from sibelius.xs4all.nl (HELO sibelius.xs4all.nl) (82.92.89.47) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 14 Jan 2006 12:27:28 +0000 Received: from elgar.sibelius.xs4all.nl (root@elgar.sibelius.xs4all.nl [192.168.0.2]) by sibelius.xs4all.nl (8.13.4/8.13.4) with ESMTP id k0ECROdZ009065 for ; Sat, 14 Jan 2006 13:27:24 +0100 (CET) Received: from elgar.sibelius.xs4all.nl (kettenis@localhost.sibelius.xs4all.nl [127.0.0.1]) by elgar.sibelius.xs4all.nl (8.13.4/8.13.3) with ESMTP id k0ECROIB023067 for ; Sat, 14 Jan 2006 13:27:24 +0100 (CET) Received: (from kettenis@localhost) by elgar.sibelius.xs4all.nl (8.13.4/8.13.4/Submit) id k0ECROxU005109; Sat, 14 Jan 2006 13:27:24 +0100 (CET) Date: Sat, 14 Jan 2006 12:27:00 -0000 Message-Id: <200601141227.k0ECROxU005109@elgar.sibelius.xs4all.nl> From: Mark Kettenis To: gdb-patches@sourceware.org Subject: [commit] Floating-point register support for PA-RISC BSD's Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-01/txt/msg00153.txt.bz2 Seems to work on OpenBSD/hppa and should work on NetBSD/hp700 if there are not too many kernel bugs. Unfortunately I messed up the commit a bit so the log messages for these files are a bit wierd. Sorry. Index: ChangeLog from Mark Kettenis * hppa-tdep.h (enum hppa_regnum): Add HPPA_FP31R_REGNUM. * hppabsd-nat.c (hppabsd_fpregset_supplies_p) (hppabsd_supply_fpregset, hppabsd_collect_fpregset): New functions. (hppabsd_fetch_registers, hppabsd_store_registers): Handle floating-point registers. Index: hppa-tdep.h =================================================================== RCS file: /cvs/src/src/gdb/hppa-tdep.h,v retrieving revision 1.23 diff -u -p -r1.23 hppa-tdep.h --- hppa-tdep.h 17 Dec 2005 22:34:01 -0000 1.23 +++ hppa-tdep.h 14 Jan 2006 12:21:06 -0000 @@ -68,6 +68,7 @@ enum hppa_regnum HPPA_FP0_REGNUM = 64, /* First floating-point. */ HPPA_FP4_REGNUM = 72, HPPA64_FP4_REGNUM = 68, + HPPA_FP31R_REGNUM = 127, /* Last floating-point. */ HPPA_ARG0_REGNUM = 26, /* The first argument of a callee. */ HPPA_ARG1_REGNUM = 25, /* The second argument of a callee. */ Index: hppabsd-nat.c =================================================================== RCS file: /cvs/src/src/gdb/hppabsd-nat.c,v retrieving revision 1.5 diff -u -p -r1.5 hppabsd-nat.c --- hppabsd-nat.c 17 Dec 2005 22:34:01 -0000 1.5 +++ hppabsd-nat.c 14 Jan 2006 12:21:06 -0000 @@ -37,6 +37,12 @@ hppabsd_gregset_supplies_p (int regnum) return (regnum >= HPPA_R0_REGNUM && regnum <= HPPA_PCOQ_TAIL_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 @@ -53,6 +59,22 @@ hppabsd_supply_gregset (struct regcache 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. */ @@ -76,6 +98,26 @@ hppabsd_collect_gregset (const struct re 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 @@ -96,6 +138,17 @@ hppabsd_fetch_registers (int regnum) hppabsd_supply_gregset (regcache, ®s); } + + if (regnum == -1 || hppabsd_fpregset_supplies_p (regnum)) + { + struct fpreg fpregs; + + if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name (_("Couldn't get floating point status")); + + hppabsd_supply_fpregset (current_regcache, &fpregs); + } } /* Store register REGNUM back into the inferior. If REGNUM is -1, do @@ -118,6 +171,21 @@ hppabsd_store_registers (int regnum) (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, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name (_("Couldn't get floating point status")); + + hppabsd_collect_fpregset (current_regcache, &fpregs, regnum); + + if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name (_("Couldn't write floating point status")); + } } /* Provide a prototype to silence -Wmissing-prototypes. */