X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcore-aout.c;h=fea1a0f08d656efe245e61a47dd6ade7ff081fb3;hb=4b14d3e4e0d9ba2ff2f9397312f884f8fc9a1135;hp=68dc1d4e05ea2d7eb9f5b5fb61619ced52bac4e5;hpb=4ff3dfab548b25c2b413095dc021e6ab32fab22b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/core-aout.c b/gdb/core-aout.c
index 68dc1d4e05..fea1a0f08d 100644
--- a/gdb/core-aout.c
+++ b/gdb/core-aout.c
@@ -1,21 +1,22 @@
 /* Extract registers from a "standard" core file, for GDB.
-   Copyright (C) 1988-1995  Free Software Foundation, Inc.
+   Copyright (C) 1988-1998  Free Software Foundation, Inc.
 
-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 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.
+   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.  */
+   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.  */
 
 /* Typically used on systems that have a.out format executables.
    corefile.c is supposed to contain the more machine-independent
@@ -25,22 +26,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "defs.h"
 
 #ifdef HAVE_PTRACE_H
-# include <ptrace.h>
+#include <ptrace.h>
 #else
-# ifdef HAVE_SYS_PTRACE_H
-#  include <sys/ptrace.h>
-# endif
+#ifdef HAVE_SYS_PTRACE_H
+#include <sys/ptrace.h>
+#endif
 #endif
 
 #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"		/* For supply_register.  */
+#include "inferior.h"		/* For ARCH_NUM_REGS. */
 
 /* 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>
@@ -56,17 +57,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 static void fetch_core_registers PARAMS ((char *, unsigned, int, CORE_ADDR));
 
+void _initialize_core_aout PARAMS ((void));
+
 /* Extract the register values out of the core file and store
    them where `read_register' will find them.
 
    CORE_REG_SECT points to the register values themselves, read into memory.
    CORE_REG_SIZE is the size of that area.
    WHICH says which set of registers we are handling (0 = int, 2 = float
-         on machines where they are discontiguous).
+   on machines where they are discontiguous).
    REG_ADDR is the offset from u.u_ar0 to the register values relative to
-            core_reg_sect.  This is used with old-fashioned core files to
-	    locate the registers in a large upage-plus-stack ".reg" section.
-	    Original upage address X is at location core_reg_sect+x+reg_addr.
+   core_reg_sect.  This is used with old-fashioned core files to
+   locate the registers in a large upage-plus-stack ".reg" section.
+   Original upage address X is at location core_reg_sect+x+reg_addr.
  */
 
 static void
@@ -79,7 +82,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
   int regno;
   CORE_ADDR addr;
   int bad_reg = -1;
-  CORE_ADDR reg_ptr = -reg_addr; /* Original u.u_ar0 is -reg_addr. */
+  CORE_ADDR reg_ptr = -reg_addr;	/* Original u.u_ar0 is -reg_addr. */
   int numregs = ARCH_NUM_REGS;
 
   /* If u.u_ar0 was an absolute address in the core file, relativize it now,
@@ -97,12 +100,12 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
       if (addr >= core_reg_size
 	  && bad_reg < 0)
 	bad_reg = regno;
-    else
-      supply_register (regno, core_reg_sect + addr);
+      else
+	supply_register (regno, core_reg_sect + addr);
     }
 
   if (bad_reg >= 0)
-    error ("Register %s not found in core file.", reg_names[bad_reg]);
+    error ("Register %s not found in core file.", REGISTER_NAME (bad_reg));
 }
 
 
@@ -127,15 +130,17 @@ register_addr (regno, blockend)
 }
 
 #endif /* REGISTER_U_ADDR */
-
 
+
 /* Register that we are able to handle aout (trad-core) file formats.  */
 
 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