i386-linux-nat.c cleanup

[Mark Kettenis <kettenis at wins dot uva dot nl>]

FYI,

I just checked in a patch that cleans up i386-linux-nat.c.  There were
a good number of inconsistencies in the comments and coding style.
The patch also eliminates some unused variables and converts
everything to ISO C.  This patch also uses elf-prefixed register set
types instead of the unprefixed ones, such that GDB compiles again
with glibc 2.1.3 (which has been released a few days ago).

I realize that this patch make applying outstanding patches hard.  I'm
aware of only one though: Tom Tromey's patch to make GDB work again on
Linux 2.0.  I'll take responsibiity for integrating this patch and
I'll try to do it today.

If you have any outstanding patches and regenerating them is a
problem, feel free to submit them as patches against the previous
revision of i386-linux-nat.c, which is 1.1.1.8.

Mark


2000-03-05  Mark Kettenis  <kettenis@gnu.org>

	* i386-linux-nat.c: Use elf_gregset_t and elf_fpregset_t instead
	of gregset_t and fpregset_t.  Those are the only names that are
	guaranteed to specify the right types for all supported Linux
	systems out there.
	Various doc fixes and gratitious local variable renames, all in an
	attempt to stress similarities between the code and unify the
	terminology used.  Use ISO-C all over.
	(regmap): Remove trailing comma.
	(FPREG_ADDR): Renamed from FPREGSET_T_FPREG_ADDR.
	(convert_to_gregset): Make static.  Remove GDB_REGS argument.  It
	is unnecessary and wasn't used anyway.  All callers changed.
	(convert_to_fpregset, convert_to_xfpregset): Likewise.
	(fetch_regs, store_regs): Remove unused variable `regno'.
	(fill_fpregs): If REGNO is not -1, only update the specified
	register.
	(fetch_core_registers): Renamed from
	i386_linux_fetch_core_registers.  There is no need for a unique
	name since the function is static anyway.
	(linux_elf_core_fns): Renamed from i386_linux_nat_core_functions
	since it is more descriptive.


Index: i386-linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-linux-nat.c,v
retrieving revision 1.1.1.8
retrieving revision 1.2
diff -u -p -r1.1.1.8 -r1.2
--- i386-linux-nat.c	2000/01/18 00:54:14	1.1.1.8
+++ i386-linux-nat.c	2000/03/05 16:39:11	1.2
@@ -1,26 +1,27 @@
 /* Native-dependent code for Linux running on i386's, for GDB.
 
-This file is part of GDB.
+   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 
-/* For i386_linux_skip_solib_resolver */
+/* For i386_linux_skip_solib_resolver.  */
 #include "symtab.h"
 #include "frame.h"
 #include "symfile.h"
@@ -34,30 +35,41 @@ Foundation, Inc., 59 Temple Place - Suit
 #include <sys/reg.h>
 #endif
 
-/*
- * Some systems (Linux) may have threads implemented as pseudo-processes, 
- * in which case we may be tracing more than one process at a time.
- * In that case, inferior_pid will contain the main process ID and the 
- * individual thread (process) id mashed together.  These macros are 
- * used to separate them out.  The definitions may be overridden in tm.h
- */
+/* On Linux, threads are implemented as pseudo-processes, in which
+   case we may be tracing more than one process at a time.  In that
+   case, inferior_pid will contain the main process ID and the
+   individual thread (process) ID mashed together.  These macros are
+   used to separate them out.  These definitions should be overridden
+   if thread support is included.  */
 
 #if !defined (PIDGET)	/* Default definition for PIDGET/TIDGET.  */
 #define PIDGET(PID)	PID
 #define TIDGET(PID)	0
 #endif
 
-/* This is a duplicate of the table in i386-xdep.c. */
 
+/* The register sets used in Linux ELF core-dumps are identical to the
+   register sets in `struct user' that is used for a.out core-dumps,
+   and is also used by `ptrace'.  The corresponding types are
+   `elf_gregset_t' for the general-purpose registers (with
+   `elf_greg_t' the type of a single GP register) and `elf_fpregset_t'
+   for the floating-point registers.
+
+   Those types used to be available under the names `gregset_t' and
+   `fpregset_t' too, and this file used those names in the past.  But
+   those names are now used for the register sets used in the
+   `mcontext_t' type, and have a different size and layout.  */
+
+/* Mapping between the general-purpose registers in `struct user'
+   format and GDB's register array layout.  */
 static int regmap[] = 
 {
   EAX, ECX, EDX, EBX,
   UESP, EBP, ESI, EDI,
   EIP, EFL, CS, SS,
-  DS, ES, FS, GS,
+  DS, ES, FS, GS
 };
 
-
 /* Which ptrace request retrieves which registers?
    These apply to the corresponding SET requests as well.  */
 #define GETREGS_SUPPLIES(regno) \
@@ -90,129 +102,124 @@ int have_ptrace_getxfpregs =
 #endif
 ;
 
-
 
-/* Transfering the general registers between GDB, inferiors and core files.  */
+/* Transfering the general-purpose registers between GDB, inferiors
+   and core files.  */
 
-/* Given a pointer to a general register set in struct user format
-   (gregset_t *), unpack the register contents and supply them as
-   gdb's idea of the current register values. */
+/* Fill GDB's register array with the genereal-purpose register values
+   in *GREGSETP.  */
+
 void
-supply_gregset (gregsetp)
-     gregset_t *gregsetp;
+supply_gregset (elf_gregset_t *gregsetp)
 {
-  register int regi;
-  register greg_t *regp = (greg_t *) gregsetp;
+  elf_greg_t *regp = (elf_greg_t *) gregsetp;
+  int regi;
 
   for (regi = 0; regi < NUM_GREGS; regi++)
-    {
-      supply_register (regi, (char *) (regp + regmap[regi]));
-    }
+    supply_register (regi, (char *) (regp + regmap[regi]));
 }
 
+/* Convert the valid general-purpose register values in GDB's register
+   array to `struct user' format and store them in *GREGSETP.  The
+   array VALID indicates which register values are valid.  If VALID is
+   NULL, all registers are assumed to be valid.  */
 
-/* Fill in a gregset_t object with selected data from a gdb-format
-   register file.
-   - GREGSETP points to the gregset_t object to be filled.
-   - GDB_REGS points to the GDB-style register file providing the data.
-   - VALID is an array indicating which registers in GDB_REGS are
-     valid; the parts of *GREGSETP that would hold registers marked
-     invalid in GDB_REGS are left unchanged.  If VALID is zero, all
-     registers are assumed to be valid.  */
-void
-convert_to_gregset (gregset_t *gregsetp,
-		    char *gdb_regs,
-		    signed char *valid)
+static void
+convert_to_gregset (elf_gregset_t *gregsetp, signed char *valid)
 {
+  elf_greg_t *regp = (elf_greg_t *) gregsetp;
   int regi;
-  register greg_t *regp = (greg_t *) gregsetp;
 
   for (regi = 0; regi < NUM_GREGS; regi++)
     if (! valid || valid[regi])
       *(regp + regmap[regi]) = * (int *) &registers[REGISTER_BYTE (regi)];
 }
-
 
-/* Store GDB's value for REGNO in *GREGSETP.  If REGNO is -1, do all
-   of them.  */
+/* Fill register REGNO (if it is a general-purpose register) in
+   *GREGSETPS with the value in GDB's register array.  If REGNO is -1,
+   do this for all registers.  */
 void
-fill_gregset (gregset_t *gregsetp,
-	      int regno)
+fill_gregset (elf_gregset_t *gregsetp, int regno)
 {
   if (regno == -1)
-    convert_to_gregset (gregsetp, registers, 0);
-  else if (regno >= 0 && regno < NUM_GREGS)
     {
+      convert_to_gregset (gregsetp, NULL);
+      return;
+    }
+
+  if (GETREGS_SUPPLIES (regno))
+    {
       signed char valid[NUM_GREGS];
+
       memset (valid, 0, sizeof (valid));
       valid[regno] = 1;
-      convert_to_gregset (gregsetp, registers, valid);
+
+      convert_to_gregset (gregsetp, valid);
     }
 }
 
+/* Fetch all general-purpose registers from process/thread TID and
+   store their values in GDB's register array.  */
 
-/* Read the general registers from the process, and store them
-   in registers[].  */
 static void
 fetch_regs (int tid)
 {
-  int ret, regno;
-  gregset_t buf;
+  elf_gregset_t regs;
+  int ret;
 
-  ret = ptrace (PTRACE_GETREGS, tid, 0, (int) &buf);
+  ret = ptrace (PTRACE_GETREGS, tid, 0, (int) &regs);
   if (ret < 0)
     {
-      warning ("Couldn't get registers");
+      warning ("Couldn't get registers.");
       return;
     }
 
-  supply_gregset (&buf);
+  supply_gregset (&regs);
 }
 
+/* Store all valid general-purpose registers in GDB's register array
+   into the process/thread specified by TID.  */
 
-/* Set the inferior's general registers to the values in registers[]
-   --- but only those registers marked as valid.  */
 static void
 store_regs (int tid)
 {
-  int ret, regno;
-  gregset_t buf;
+  elf_gregset_t regs;
+  int ret;
 
-  ret = ptrace (PTRACE_GETREGS, tid, 0, (int) &buf);
+  ret = ptrace (PTRACE_GETREGS, tid, 0, (int) &regs);
   if (ret < 0)
     {
-      warning ("Couldn't get registers");
+      warning ("Couldn't get registers.");
       return;
     }
 
-  convert_to_gregset (&buf, registers, register_valid);
+  convert_to_gregset (&regs, register_valid);
 
-  ret = ptrace (PTRACE_SETREGS, tid, 0, (int)buf);
+  ret = ptrace (PTRACE_SETREGS, tid, 0, (int) &regs);
   if (ret < 0)
     {
-      warning ("Couldn't write registers");
+      warning ("Couldn't write registers.");
       return;
     }
 }
 
-
 
 /* Transfering floating-point registers between GDB, inferiors and cores.  */
 
-/* What is the address of st(N) within the fpregset_t structure F?  */
-#define FPREGSET_T_FPREG_ADDR(f, n) \
-  ((char *) &(f)->st_space + (n) * 10)
+/* What is the address of st(N) within the floating-point register set F?  */
+#define FPREG_ADDR(f, n) ((char *) &(f)->st_space + (n) * 10)
 
-/* Fill GDB's register file with the floating-point register values in
+/* Fill GDB's register array with the floating-point register values in
    *FPREGSETP.  */
+
 void 
-supply_fpregset (fpregset_t *fpregsetp)
+supply_fpregset (elf_fpregset_t *fpregsetp)
 {
-  int i;
+  int reg;
 
   /* Supply the floating-point registers.  */
-  for (i = 0; i < 8; i++)
-    supply_register (FP0_REGNUM + i, FPREGSET_T_FPREG_ADDR (fpregsetp, i));
+  for (reg = 0; reg < 8; reg++)
+    supply_register (FP0_REGNUM + reg, FPREG_ADDR (fpregsetp, reg));
 
   supply_register (FCTRL_REGNUM, (char *) &fpregsetp->cwd);
   supply_register (FSTAT_REGNUM, (char *) &fpregsetp->swd);
@@ -233,28 +240,22 @@ supply_fpregset (fpregset_t *fpregsetp)
   }
 }
 
+/* Convert the valid floating-point register values in GDB's register
+   array to `struct user' format and store them in *FPREGSETP.  The
+   array VALID indicates which register values are valid.  If VALID is
+   NULL, all registers are assumed to be valid.  */
 
-/* Fill in an fpregset_t structure with selected data from a
-   gdb-format register file.
-   - FPREGSETP points to the structure to be filled. 
-   - GDB_REGS points to the GDB-style register file providing the data.
-   - VALID is an array indicating which registers in GDB_REGS are
-     valid; the parts of *FPREGSETP that would hold registers marked
-     invalid in GDB_REGS are left unchanged.  If VALID is zero, all
-     registers are assumed to be valid.  */
-void
-convert_to_fpregset (fpregset_t *fpregsetp,
-		     char *gdb_regs,
-		     signed char *valid)
+static void
+convert_to_fpregset (elf_fpregset_t *fpregsetp, signed char *valid)
 {
-  int i;
+  int reg;
 
   /* Fill in the floating-point registers.  */
-  for (i = 0; i < 8; i++)
-    if (!valid || valid[i])
-      memcpy (FPREGSET_T_FPREG_ADDR (fpregsetp, i),
-	      &registers[REGISTER_BYTE (FP0_REGNUM + i)],
-	      REGISTER_RAW_SIZE(FP0_REGNUM + i));
+  for (reg = 0; reg < 8; reg++)
+    if (!valid || valid[reg])
+      memcpy (FPREG_ADDR (fpregsetp, reg),
+	      &registers[REGISTER_BYTE (FP0_REGNUM + reg)],
+	      REGISTER_RAW_SIZE(FP0_REGNUM + reg));
 
 #define fill(MEMBER, REGNO)						\
   if (! valid || valid[(REGNO)])					\
@@ -281,62 +282,72 @@ convert_to_fpregset (fpregset_t *fpregse
 	 | ((*(int *) &registers[REGISTER_BYTE (FOP_REGNUM)] & ((1 << 11) - 1))
 	    << 16));
 }
-
 
-/* Given a pointer to a floating point register set in (fpregset_t *)
-   format, update all of the registers from gdb's idea of the current
-   floating point register set.  */
+/* Fill register REGNO (if it is a floating-point register) in
+   *FPREGSETP with the value in GDB's register array.  If REGNO is -1,
+   do this for all registers.  */
 
 void
-fill_fpregset (fpregset_t *fpregsetp,
-	       int regno)
+fill_fpregset (elf_fpregset_t *fpregsetp, int regno)
 {
-  convert_to_fpregset (fpregsetp, registers, 0);
+  if (regno == -1)
+    {
+      convert_to_fpregset (fpregsetp, NULL);
+      return;
+    }
+
+  if (GETFPREGS_SUPPLIES(regno))
+    {
+      signed char valid[MAX_NUM_REGS];
+      
+      memset (valid, 0, sizeof (valid));
+      valid[regno] = 1;
+	      
+      convert_to_fpregset (fpregsetp, valid);
+    }
 }
 
+/* Fetch all floating-point registers from process/thread TID and store
+   thier values in GDB's register array.  */
 
-/* Get the whole floating point state of the process and store the
-   floating point stack into registers[].  */
 static void
 fetch_fpregs (int tid)
 {
-  int ret, regno;
-  fpregset_t buf;
+  elf_fpregset_t fpregs;
+  int ret;
 
-  ret = ptrace (PTRACE_GETFPREGS, tid, 0, (int) &buf);
+  ret = ptrace (PTRACE_GETFPREGS, tid, 0, (int) &fpregs);
   if (ret < 0)
     {
-      warning ("Couldn't get floating point status");
+      warning ("Couldn't get floating point status.");
       return;
     }
 
-  /* ptrace fills an fpregset_t, so we can use the same function we do
-     for core files.  */
-  supply_fpregset (&buf);
+  supply_fpregset (&fpregs);
 }
 
+/* Store all valid floating-point registers in GDB's register array
+   into the process/thread specified by TID.  */
 
-/* Set the inferior's floating-point registers to the values in
-   registers[] --- but only those registers marked valid.  */
 static void
 store_fpregs (int tid)
 {
+  elf_fpregset_t fpregs;
   int ret;
-  fpregset_t buf;
 
-  ret = ptrace (PTRACE_GETFPREGS, tid, 0, (int) &buf);
+  ret = ptrace (PTRACE_GETFPREGS, tid, 0, (int) &fpregs);
   if (ret < 0)
     {
-      warning ("Couldn't get floating point status");
+      warning ("Couldn't get floating point status.");
       return;
     }
 
-  convert_to_fpregset (&buf, registers, register_valid);
+  convert_to_fpregset (&fpregs, register_valid);
 
-  ret = ptrace (PTRACE_SETFPREGS, tid, 0, (int) &buf);
+  ret = ptrace (PTRACE_SETFPREGS, tid, 0, (int) &fpregs);
   if (ret < 0)
     {
-      warning ("Couldn't write floating point status");
+      warning ("Couldn't write floating point status.");
       return;
     }
 }
@@ -344,7 +355,6 @@ store_fpregs (int tid)
 
 /* Transfering floating-point and SSE registers to and from GDB.  */
 
-
 /* PTRACE_GETXFPREGS is a Cygnus invention, since we wrote our own
    Linux kernel patch for SSE support.  That patch may or may not
    actually make it into the official distribution.  If you find that
@@ -353,6 +363,10 @@ store_fpregs (int tid)
    you can delete this code.  */
 
 #ifdef HAVE_PTRACE_GETXFPREGS
+
+/* Fill GDB's register array with the floating-point and SSE register
+   values in *XFPREGS.  */
+
 static void
 supply_xfpregset (struct user_xfpregs_struct *xfpregs)
 {
@@ -388,10 +402,13 @@ supply_xfpregset (struct user_xfpregs_st
   supply_register (MXCSR_REGNUM, (char *) &xfpregs->mxcsr);
 }
 
+/* Convert the valid floating-point and SSE registers in GDB's
+   register array to `struct user' format and store them in *XFPREGS.
+   The array VALID indicates which registers are valid.  If VALID is
+   NULL, all registers are assumed to be valid.  */
 
 static void
 convert_to_xfpregset (struct user_xfpregs_struct *xfpregs,
-		      char *gdb_regs,
 		      signed char *valid)
 {
   int reg;
@@ -436,14 +453,15 @@ convert_to_xfpregset (struct user_xfpreg
 	      REGISTER_RAW_SIZE (XMM0_REGNUM + reg));
 }
 
+/* Fetch all registers covered by the PTRACE_SETXFPREGS request from
+   process/thread TID and store their values in GDB's register array.
+   Return non-zero if successful, zero otherwise.  */
 
-/* Make a PTRACE_GETXFPREGS request, and supply all the register
-   values that yields to GDB.  */
 static int
 fetch_xfpregs (int tid)
 {
-  int ret;
   struct user_xfpregs_struct xfpregs;
+  int ret;
 
   if (! have_ptrace_getxfpregs) 
     return 0;
@@ -457,7 +475,7 @@ fetch_xfpregs (int tid)
 	  return 0;
 	}
 
-      warning ("couldn't read floating-point and SSE registers.");
+      warning ("Couldn't read floating-point and SSE registers.");
       return 0;
     }
 
@@ -465,14 +483,15 @@ fetch_xfpregs (int tid)
   return 1;
 }
 
+/* Store all valid registers in GDB's register array covered by the
+   PTRACE_SETXFPREGS request into the process/thread specified by TID.
+   Return non-zero if successful, zero otherwise.  */
 
-/* Send all the valid register values in GDB's register file covered
-   by the PTRACE_SETXFPREGS request to the inferior.  */
 static int
 store_xfpregs (int tid)
 {
-  int ret;
   struct user_xfpregs_struct xfpregs;
+  int ret;
 
   if (! have_ptrace_getxfpregs)
     return 0;
@@ -486,11 +505,11 @@ store_xfpregs (int tid)
 	  return 0;
 	}
 
-      warning ("couldn't read floating-point and SSE registers.");
+      warning ("Couldn't read floating-point and SSE registers.");
       return 0;
     }
 
-  convert_to_xfpregset (&xfpregs, registers, register_valid);
+  convert_to_xfpregset (&xfpregs, register_valid);
 
   if (ptrace (PTRACE_SETXFPREGS, tid, 0, &xfpregs) < 0)
     {
@@ -501,13 +520,13 @@ store_xfpregs (int tid)
   return 1;
 }
 
-
-/* Fill the XMM registers in the register file with dummy values.  For
+/* Fill the XMM registers in the register array with dummy values.  For
    cases where we don't have access to the XMM registers.  I think
    this is cleaner than printing a warning.  For a cleaner solution,
    we should gdbarchify the i386 family.  */
+
 static void
-dummy_sse_values ()
+dummy_sse_values (void)
 {
   /* C doesn't have a syntax for NaN's, so write it out as an array of
      longs.  */
@@ -526,30 +545,30 @@ dummy_sse_values ()
    PTRACE_GETXFPREGS.  */
 static int store_xfpregs (int tid) { return 0; }
 static int fetch_xfpregs (int tid) { return 0; }
-static void dummy_sse_values () {}
+static void dummy_sse_values (void) {}
 
 #endif
 
 
 /* Transferring arbitrary registers between GDB and inferior.  */
 
-/* Fetch registers from the child process.
-   Fetch all if regno == -1, otherwise fetch all ordinary
-   registers or all floating point registers depending
-   upon the value of regno. */
+/* Fetch register REGNO from the child process.  If REGNO is -1, do
+   this for all registers (including the floating point and SSE
+   registers).  */
 
 void
 fetch_inferior_registers (int regno)
 {
-  /* linux lwp id's are process id's */
   int tid;
 
+  /* Linux LWP ID's are process ID's.  */
   if ((tid = TIDGET (inferior_pid)) == 0)
-    tid = inferior_pid;		/* not a threaded program */
+    tid = inferior_pid;		/* Not a threaded program.  */
 
-  /* Use the xfpregs requests whenever possible, since they transfer
-     more registers in one system call, and we'll cache the results.
-     But remember that fetch_xfpregs can fail, and return zero.  */
+  /* Use the PTRACE_GETXFPREGS request whenever possible, since it
+     transfers more registers in one system call, and we'll cache the
+     results.  But remember that fetch_xfpregs can fail, and return
+     zero.  */
   if (regno == -1)
     {
       fetch_regs (tid);
@@ -585,25 +604,20 @@ fetch_inferior_registers (int regno)
 		  "got request for bad register number %d", regno);
 }
 
-
-/* Store our register values back into the inferior.
-   If REGNO is -1, do this for all registers.
-   Otherwise, REGNO specifies which register, which
-   then determines whether we store all ordinary
-   registers or all of the floating point registers. */
-
+/* Store register REGNO back into the child process.  If REGNO is -1,
+   do this for all registers (including the floating point and SSE
+   registers).  */
 void
-store_inferior_registers (regno)
-     int regno;
+store_inferior_registers (int regno)
 {
-  /* linux lwp id's are process id's */
   int tid;
 
+  /* Linux LWP ID's are process ID's.  */
   if ((tid = TIDGET (inferior_pid)) == 0)
-    tid = inferior_pid;		/* not a threaded program */
+    tid = inferior_pid;		/* Not a threaded program.  */
 
-  /* Use the xfpregs requests whenever possible, since they transfer
-     more registers in one system call.  But remember that
+  /* Use the PTRACE_SETXFPREGS requests whenever possibl, since it
+     transfers more registers in one system call.  But remember that
      store_xfpregs can fail, and return zero.  */
   if (regno == -1)
     {
@@ -626,16 +640,15 @@ store_inferior_registers (regno)
 	return;
 
       /* Either our processor or our kernel doesn't support the SSE
-	 registers, so just write the FP registers in the traditional way.  */
+	 registers, so just write the FP registers in the traditional
+	 way.  */
       store_fpregs (tid);
       return;
     }
 
-  internal_error ("i386-linux-nat.c (store_inferior_registers): "
-		  "got request to store bad register number %d", regno);
+  internal_error ("Got request to store bad register number %d.", regno);
 }
 
-
 
 /* Interpreting register set info found in core files.  */
 
@@ -651,26 +664,25 @@ store_inferior_registers (regno)
    register contents.  CORE_REG_SIZE is its size.
 
    WHICH says which register set corelow suspects this is:
-   0 --- the general register set, in gregset format
-   2 --- the floating-point register set, in fpregset format
-   3 --- the extended floating-point register set, in struct
-         user_xfpregs_struct format
+     0 --- the general-purpose register set, in elf_gregset_t format
+     2 --- the floating-point register set, in elf_fpregset_t format
+     3 --- the extended floating-point register set, in struct
+           user_xfpregs_struct format
+
+   REG_ADDR isn't used on Linux.  */
 
-   DUMMY isn't used on Linux.  */
 static void
-i386_linux_fetch_core_registers (char *core_reg_sect,
-				 unsigned core_reg_size,
-				 int which,
-				 CORE_ADDR dummy)
+fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
+		      int which, CORE_ADDR reg_addr)
 {
-  gregset_t gregset;
-  fpregset_t fpregset;
+  elf_gregset_t gregset;
+  elf_fpregset_t fpregset;
 
   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 (&gregset, core_reg_sect, sizeof (gregset));
@@ -680,7 +692,7 @@ i386_linux_fetch_core_registers (char *c
 
     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 (&fpregset, core_reg_sect, sizeof (fpregset));
@@ -691,9 +703,10 @@ i386_linux_fetch_core_registers (char *c
 #ifdef HAVE_PTRACE_GETXFPREGS
       {
 	struct user_xfpregs_struct xfpregset;
+
       case 3:
-	if (core_reg_size != sizeof (struct user_xfpregs_struct))
-	  warning ("wrong size user_xfpregs_struct in core file");
+	if (core_reg_size != sizeof (xfpregset))
+	  warning ("Wrong size user_xfpregs_struct in core file.");
 	else
 	  {
 	    memcpy (&xfpregset, core_reg_sect, sizeof (xfpregset));
@@ -711,18 +724,12 @@ i386_linux_fetch_core_registers (char *c
     }
 }
 
-
-static struct core_fns i386_linux_nat_core_fns =
-{
-  bfd_target_elf_flavour,		/* core_flavour */
-  default_check_format,			/* check_format */
-  default_core_sniffer,			/* core_sniffer */
-  i386_linux_fetch_core_registers,	/* core_read_registers */
-  NULL					/* next */
-};
-
 
 /* Calling functions in shared libraries.  */
+/* FIXME: kettenis/2000-03-05: Doesn't this belong in a
+   target-dependent file?  The function
+   `i386_linux_skip_solib_resolver' is mentioned in
+   `config/i386/tm-linux.h'.  */
 
 /* Find the minimal symbol named NAME, and return both the minsym
    struct and its objfile.  This probably ought to be in minsym.c, but
@@ -790,7 +797,6 @@ skip_hurd_resolver (CORE_ADDR pc)
   return 0;
 }      
 
-
 /* See the comments for SKIP_SOLIB_RESOLVER at the top of infrun.c.
    This function:
    1) decides whether a PLT has sent us into the linker to resolve
@@ -811,12 +817,20 @@ i386_linux_skip_solib_resolver (CORE_ADD
   return 0;
 }
 
-
 
-/* Module initialization.  */
+/* Register that we are able to handle Linux ELF core file formats.  */
+
+static struct core_fns linux_elf_core_fns =
+{
+  bfd_target_elf_flavour,		/* core_flavour */
+  default_check_format,			/* check_format */
+  default_core_sniffer,			/* core_sniffer */
+  fetch_core_registers,			/* core_read_registers */
+  NULL					/* next */
+};
 
 void
 _initialize_i386_linux_nat ()
 {
-  add_core_fns (&i386_linux_nat_core_fns);
+  add_core_fns (&linux_elf_core_fns);
 }