From 94ba74a9fa6ebe547ec15e8c5cf41a69878aeb80 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 19 Apr 2003 12:00:48 +0000 Subject: [PATCH] * core-regset.c: Update comments to reflect reality. Re-order includes. (fetch_core_registers): Use switch instead of if. Remove redundant prototype. --- gdb/ChangeLog | 7 +++ gdb/core-regset.c | 109 ++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 62 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d4e197a66d9..e59cf051960 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2003-04-19 Mark Kettenis + + * core-regset.c: Update comments to reflect reality. Re-order + includes. + (fetch_core_registers): Use switch instead of if. Remove + redundant prototype. + 2003-04-18 Jim Blandy * s390-tdep.c (s390_frame_align): New function. diff --git a/gdb/core-regset.c b/gdb/core-regset.c index 16cfde5be66..0600837e1a0 100644 --- a/gdb/core-regset.c +++ b/gdb/core-regset.c @@ -1,5 +1,6 @@ /* Machine independent GDB support for core files on systems using "regsets". - Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000 + + Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2003 Free Software Foundation, Inc. This file is part of GDB. @@ -19,66 +20,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -/* N O T E S - - This file 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. - - */ +/* This file is used by most systems that use ELF for their core + dumps. This includes most systems that have SVR4-ish variant of + /proc. For these systems, the registers are laid out the same way + in core files as in the gregset_t and fpregset_t structures that + are used in the interaction with /proc (Irix 4 is an exception and + therefore doesn't use this file). Quite a few systems without a + SVR4-ish /proc define these structures too, and can make use of + this code too. */ #include "defs.h" +#include "command.h" +#include "gdbcore.h" +#include "inferior.h" +#include "target.h" +#include +#include +#include "gdb_string.h" #include #ifdef HAVE_SYS_PROCFS_H #include #endif -#include -#include -#include "gdb_string.h" -#include "inferior.h" -#include "target.h" -#include "command.h" -#include "gdbcore.h" - -/* Prototypes for supply_gregset etc. */ +/* Prototypes for supply_gregset etc. */ #include "gregset.h" -static void fetch_core_registers (char *, unsigned, int, CORE_ADDR); - -void _initialize_core_regset (void); - -/* - - GLOBAL FUNCTION +/* Provide registers to GDB from a core file. - fetch_core_registers -- fetch current registers from core file + CORE_REG_SECT points to an array of bytes, which are the contents + of a `note' from a core file which BFD thinks might contain + register contents. CORE_REG_SIZE is its size. - SYNOPSIS + WHICH says which register set corelow suspects this is: + 0 --- the general-purpose register set, in gregset_t format + 2 --- the floating-point register set, in fpregset_t format - void fetch_core_registers (char *core_reg_sect, - unsigned core_reg_size, - int which, CORE_ADDR 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 compared to - the size of the gregset or fpgregset structures (as appropriate) to - validate the size of the structure from the core file. The - REG_ADDR parameter is ignored. - - */ + REG_ADDR is ignored. */ static void fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, @@ -87,36 +65,40 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which, gdb_gregset_t gregset; gdb_fpregset_t fpregset; - if (which == 0) + switch (which) { + case 0: if (core_reg_size != sizeof (gregset)) - { - warning ("wrong size gregset struct in core file"); - } + warning ("Wrong size gregset in core file."); else { - memcpy ((char *) &gregset, core_reg_sect, sizeof (gregset)); + memcpy (&gregset, core_reg_sect, sizeof (gregset)); supply_gregset (&gregset); } - } - else if (which == 2) - { + break; + + case 2: if (core_reg_size != sizeof (fpregset)) - { - warning ("wrong size fpregset struct in core file"); - } + warning ("Wrong size fpregset in core file."); else { - memcpy ((char *) &fpregset, core_reg_sect, sizeof (fpregset)); + memcpy (&fpregset, core_reg_sect, sizeof (fpregset)); if (FP0_REGNUM >= 0) supply_fpregset (&fpregset); } + break; + + default: + /* We've covered all the kinds of registers we know about here, + so this must be something we wouldn't know what to do with + anyway. Just ignore it. */ + break; } } -/* Register that we are able to handle ELF file formats using standard - procfs "regset" structures. */ +/* Register that we are able to handle ELF core file formats using + standard procfs "regset" structures. */ static struct core_fns regset_core_fns = { @@ -127,6 +109,9 @@ static struct core_fns regset_core_fns = NULL /* next */ }; +/* Provide a prototype to silence -Wmissing-prototypes. */ +extern void _initialize_core_regset (void); + void _initialize_core_regset (void) { -- 2.30.2