* osabi.c (gdb_osabi_name): Add entry for GDB_OSABI_INTERIX.

[deliverable/binutils-gdb.git] / gdb / core-aout.c

diff --git a/gdb/core-aout.c b/gdb/core-aout.c
index fea1a0f08d656efe245e61a47dd6ade7ff081fb3..0329302dc1e360573a3b0349c0599b40c2b7b90d 100644 (file)
--- a/gdb/core-aout.c
+++ b/gdb/core-aout.c
@@ -1,5 +1,6 @@
 /* Extract registers from a "standard" core file, for GDB.
-   Copyright (C) 1988-1998  Free Software Foundation, Inc.
+   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
+   1999, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -37,7 +38,7 @@
 #include <sys/param.h>
 #include "gdbcore.h"
 #include "value.h"             /* For supply_register.  */
-#include "inferior.h"          /* For ARCH_NUM_REGS. */
+#include "regcache.h"
 
 /* These are needed on various systems to expand REGISTER_U_ADDR.  */
 #ifndef USG
@@ -55,9 +56,9 @@
 #include <sys/core.h>
 #endif
 
-static void fetch_core_registers PARAMS ((char *, unsigned, int, CORE_ADDR));
+static void fetch_core_registers (char *, unsigned, int, CORE_ADDR);
 
-void _initialize_core_aout PARAMS ((void));
+void _initialize_core_aout (void);
 
 /* Extract the register values out of the core file and store
    them where `read_register' will find them.
@@ -73,17 +74,14 @@ void _initialize_core_aout PARAMS ((void));
  */
 
 static void
-fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
-     char *core_reg_sect;
-     unsigned core_reg_size;
-     int which;
-     CORE_ADDR reg_addr;
+fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
+                     CORE_ADDR reg_addr)
 {
   int regno;
   CORE_ADDR addr;
   int bad_reg = -1;
   CORE_ADDR reg_ptr = -reg_addr;       /* Original u.u_ar0 is -reg_addr. */
-  int numregs = ARCH_NUM_REGS;
+  int numregs = NUM_REGS;
 
   /* If u.u_ar0 was an absolute address in the core file, relativize it now,
      so we can use it as an offset into core_reg_sect.  When we're done,
@@ -115,13 +113,11 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
    BLOCKEND is the address of the end of the user structure.  */
 
 CORE_ADDR
-register_addr (regno, blockend)
-     int regno;
-     CORE_ADDR blockend;
+register_addr (int regno, CORE_ADDR blockend)
 {
   CORE_ADDR addr;
 
-  if (regno < 0 || regno >= ARCH_NUM_REGS)
+  if (regno < 0 || regno >= NUM_REGS)
     error ("Invalid register number %d.", regno);
 
   REGISTER_U_ADDR (addr, blockend, regno);
@@ -144,7 +140,7 @@ static struct core_fns aout_core_fns =
 };
 
 void
-_initialize_core_aout ()
+_initialize_core_aout (void)
 {
   add_core_fns (&aout_core_fns);
 }