Don't emit symbols seen only in dynamic object, don't read duplicate

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

diff --git a/gdb/core-aout.c b/gdb/core-aout.c
index cb99b0f0135af86bbef666d3888cc83e2a762ffa..403a5ccbbce47a54ff5c9db85cd22b719186b4f4 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 (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
+   1999, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -15,8 +16,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* Typically used on systems that have a.out format executables.
    corefile.c is supposed to contain the more machine-independent
@@ -36,16 +37,14 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include "gdbcore.h"
-#include "value.h"             /* For supply_register.  */
-#include "inferior.h"          /* For ARCH_NUM_REGS. */
+#include "value.h"
+#include "regcache.h"
 
 /* These are needed on various systems to expand REGISTER_U_ADDR.  */
-#ifndef USG
-#include <sys/dir.h>
+#include "gdb_dirent.h"
 #include <sys/file.h>
 #include "gdb_stat.h"
 #include <sys/user.h>
-#endif
 
 #ifndef CORE_REGISTER_ADDR
 #define CORE_REGISTER_ADDR(regno, regptr) register_addr(regno, regptr)
@@ -55,9 +54,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 +72,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,
@@ -101,11 +97,11 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
          && bad_reg < 0)
        bad_reg = regno;
       else
-       supply_register (regno, core_reg_sect + addr);
+       regcache_raw_supply (current_regcache, regno, core_reg_sect + addr);
     }
 
   if (bad_reg >= 0)
-    error ("Register %s not found in core file.", REGISTER_NAME (bad_reg));
+    error (_("Register %s not found in core file."), REGISTER_NAME (bad_reg));
 }
 
 
@@ -115,14 +111,12 @@ 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)
-    error ("Invalid register number %d.", regno);
+  if (regno < 0 || regno >= NUM_REGS)
+    error (_("Invalid register number %d."), regno);
 
   REGISTER_U_ADDR (addr, blockend, regno);
 
@@ -136,13 +130,15 @@ register_addr (regno, blockend)
 
 static struct core_fns aout_core_fns =
 {
-  bfd_target_unknown_flavour,
-  fetch_core_registers,
-  NULL
+  bfd_target_unknown_flavour,          /* core_flavour */
+  default_check_format,                        /* check_format */
+  default_core_sniffer,                        /* core_sniffer */
+  fetch_core_registers,                        /* core_read_registers */
+  NULL                                 /* next */
 };
 
 void
-_initialize_core_aout ()
+_initialize_core_aout (void)
 {
-  add_core_fns (&aout_core_fns);
+  deprecated_add_core_fns (&aout_core_fns);
 }