From 9583b29548ca9634a751b3e06007c8bacbbdd96f Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Tue, 20 Apr 1993 06:01:56 +0000 Subject: [PATCH] * irix4-nat.c (fetch_core_registers): Special version of this for Irix 4.x, which stores regs a bit differently from other /proc based systems. * procfs.c, core-svr4.c: Move fetch_core_registers from procfs.c to new file core-svr4.c. * config/i386/i386sol2.mh, config/i386/i386v4.mh, config/m68k/amix.mh, config/i386/ncr3000.mh, config/sparc/sun4sol2.mh: Add core-svr4.o to NATDEPFILES. * config/mips/irix4.mh: Add corelow.o to NATDEPFILES. --- gdb/ChangeLog | 12 ++++ gdb/config/m68k/amix.mh | 2 +- gdb/config/mips/irix4.mh | 2 +- gdb/config/sparc/sun4sol2.mh | 2 +- gdb/core-svr4.c | 109 +++++++++++++++++++++++++++++++++++ gdb/irix4-nat.c | 18 +++++- gdb/procfs.c | 60 ------------------- 7 files changed, 141 insertions(+), 64 deletions(-) create mode 100644 gdb/core-svr4.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1b5c316cb48..6f2ca5a53f8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +Mon Apr 19 22:52:33 1993 Stu Grossman (grossman@cygnus.com) + + * irix4-nat.c (fetch_core_registers): Special version of this for + Irix 4.x, which stores regs a bit differently from other /proc + based systems. + * procfs.c, core-svr4.c: Move fetch_core_registers from procfs.c + to new file core-svr4.c. + * config/i386/i386sol2.mh, config/i386/i386v4.mh, config/m68k/amix.mh, + config/i386/ncr3000.mh, config/sparc/sun4sol2.mh: Add core-svr4.o + to NATDEPFILES. + * config/mips/irix4.mh: Add corelow.o to NATDEPFILES. + Mon Apr 19 11:13:34 1993 Jim Kingdon (kingdon@cygnus.com) * i387-tdep.c: Remove unused #includes. diff --git a/gdb/config/m68k/amix.mh b/gdb/config/m68k/amix.mh index ad3afed0382..118661921f3 100644 --- a/gdb/config/m68k/amix.mh +++ b/gdb/config/m68k/amix.mh @@ -1,6 +1,6 @@ # Host: Commodore Amiga running SVR4. NAT_FILE= nm-sysv4.h -NATDEPFILES= corelow.o procfs.o fork-child.o +NATDEPFILES= corelow.o core-svr4.o procfs.o fork-child.o XDEPFILES= XM_FILE= xm-amix.h SYSV_DEFINE=-DSYSV diff --git a/gdb/config/mips/irix4.mh b/gdb/config/mips/irix4.mh index 854fa69821a..f93e6be864e 100644 --- a/gdb/config/mips/irix4.mh +++ b/gdb/config/mips/irix4.mh @@ -2,7 +2,7 @@ XDEPFILES= XM_FILE= xm-irix4.h NAT_FILE= nm-irix4.h -NATDEPFILES= fork-child.o procfs.o irix4-nat.o +NATDEPFILES= fork-child.o procfs.o irix4-nat.o corelow.o ALLOCA=alloca.o ALLOCA1=alloca.o MUNCH_DEFINE=-B diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh index 394cd4f254e..46ccfcfd2dc 100644 --- a/gdb/config/sparc/sun4sol2.mh +++ b/gdb/config/sparc/sun4sol2.mh @@ -2,7 +2,7 @@ XDEPFILES= XM_FILE= xm-sun4sol2.h NAT_FILE= nm-sysv4.h -NATDEPFILES= corelow.o exec.o solib.o procfs.o fork-child.o +NATDEPFILES= corelow.o core-svr4.o exec.o solib.o procfs.o fork-child.o SYSV_DEFINE=-DSYSV REGEX=regex.o REGEX1=regex.o diff --git a/gdb/core-svr4.c b/gdb/core-svr4.c new file mode 100644 index 00000000000..e0743fdf37a --- /dev/null +++ b/gdb/core-svr4.c @@ -0,0 +1,109 @@ +/* Machine independent support for SVR4 core files for GDB. + Copyright 1993 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 2 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, write to the Free Software +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + + +/* N O T E S + +This version of fetch_core_registers() is used by most systems that +implement /proc. For these systems, the general registers are laid out +the same way in both the core file and the gregset_p structure. The +current exception to this is Irix-4.*, where the gregset_p structure is +split up into two pieces in the core file. + +The general register and floating point register sets are manipulated by +separate ioctl's. This file makes the assumption that if FP0_REGNUM is +defined, then support for the floating point register set is desired, +regardless of whether or not the actual target has floating point hardware. + + */ + +#include "defs.h" + +#include +#include +#include +#include +#include + +#include "inferior.h" +#include "target.h" +#include "command.h" +#include "gdbcore.h" + +/* + +GLOBAL FUNCTION + + fetch_core_registers -- fetch current registers from core file data + +SYNOPSIS + + void fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, + int which, unsigned in reg_addr) + +DESCRIPTION + + Read the values of either the general register set (WHICH equals 0) + or the floating point register set (WHICH equals 2) from the core + file data (pointed to by CORE_REG_SECT), and update gdb's idea of + their current values. The CORE_REG_SIZE parameter is ignored. + +NOTES + + Use the indicated sizes to validate the gregset and fpregset + structures. +*/ + +void +fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) + char *core_reg_sect; + unsigned core_reg_size; + int which; + unsigned int reg_addr; /* Unused in this version */ +{ + gregset_t gregset; + fpregset_t fpregset; + + if (which == 0) + { + if (core_reg_size != sizeof (gregset)) + { + warning ("wrong size gregset struct in core file"); + } + else + { + memcpy ((char *) &gregset, core_reg_sect, sizeof (gregset)); + supply_gregset (&gregset); + } + } + else if (which == 2) + { + if (core_reg_size != sizeof (fpregset)) + { + warning ("wrong size fpregset struct in core file"); + } + else + { + memcpy ((char *) &fpregset, core_reg_sect, sizeof (fpregset)); +#if defined (FP0_REGNUM) + supply_fpregset (&fpregset); +#endif + } + } +} diff --git a/gdb/irix4-nat.c b/gdb/irix4-nat.c index c524c99349a..b13e288b818 100644 --- a/gdb/irix4-nat.c +++ b/gdb/irix4-nat.c @@ -1,5 +1,5 @@ /* Native support for the SGI Iris running IRIX version 4, for GDB. - Copyright 1988, 1989, 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright 1988, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. Contributed by Alessandro Forin(af@cs.cmu.edu) at CMU and by Per Bothner(bothner@cs.wisc.edu) at U.Wisconsin. Implemented for Irix 4.x by Garrett A. Wollman. @@ -148,3 +148,19 @@ get_longjmp_target(pc) return 1; } + +void +fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) + char *core_reg_sect; + unsigned core_reg_size; + int which; /* Unused */ + unsigned int reg_addr; /* Unused */ +{ + if (core_reg_size != REGISTER_BYTES) + { + warning ("wrong size gregset struct in core file"); + return; + } + + memcpy ((char *)registers, core_reg_sect, core_reg_size); +} diff --git a/gdb/procfs.c b/gdb/procfs.c index 86885cc4977..002ddd66274 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -2260,66 +2260,6 @@ procfs_fetch_registers (regno) /* -GLOBAL FUNCTION - - fetch_core_registers -- fetch current registers from core file data - -SYNOPSIS - - void fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, - int which, unsigned in reg_addr) - -DESCRIPTION - - Read the values of either the general register set (WHICH equals 0) - or the floating point register set (WHICH equals 2) from the core - file data (pointed to by CORE_REG_SECT), and update gdb's idea of - their current values. The CORE_REG_SIZE parameter is ignored. - -NOTES - - Use the indicated sizes to validate the gregset and fpregset - structures. -*/ - -void -fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) - char *core_reg_sect; - unsigned core_reg_size; - int which; - unsigned int reg_addr; /* Unused in this version */ -{ - - if (which == 0) - { - if (core_reg_size != sizeof (pi.gregset)) - { - warning ("wrong size gregset struct in core file"); - } - else - { - memcpy ((char *) &pi.gregset, core_reg_sect, sizeof (pi.gregset)); - supply_gregset (&pi.gregset); - } - } - else if (which == 2) - { - if (core_reg_size != sizeof (pi.fpregset)) - { - warning ("wrong size fpregset struct in core file"); - } - else - { - memcpy ((char *) &pi.fpregset, core_reg_sect, sizeof (pi.fpregset)); -#if defined (FP0_REGNUM) - supply_fpregset (&pi.fpregset); -#endif - } - } -} - -/* - LOCAL FUNCTION proc_init_failed - called whenever /proc access initialization fails -- 2.30.2