2002-12-06 Andrew Cagney <ac131313@redhat.com>

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

diff --git a/gdb/core-aout.c b/gdb/core-aout.c
index 367090ff6d42bd9fb615ea12134a8f53b3a625c7..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
@@ -80,7 +81,7 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
   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,
@@ -116,7 +117,7 @@ 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);