X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcisco-core.c;h=7d63118aef608b6d74ebcdbf5658ab49720a2178;hb=761c7f08fff8fe6c0ac4f5c5e21f2152b46e0700;hp=9d1fb6f20f758e4ea3ae6736a67ad50520d9ea3c;hpb=e60b52c622c0f0183143ddfe011a09bb5c0e1dce;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c
index 9d1fb6f20f..7d63118aef 100644
--- a/bfd/cisco-core.c
+++ b/bfd/cisco-core.c
@@ -1,6 +1,6 @@
 /* BFD back-end for CISCO crash dumps.
-
-Copyright 1994 Free Software Foundation, Inc.
+   Copyright 1994, 1997, 1999, 2000, 2001, 2002, 2004, 2006
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -16,7 +16,7 @@ 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.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -65,11 +65,17 @@ typedef struct {
   char database[4];		/* Base of .data section (not in V3 crash info) */
   char bssbase[4];		/* Base of .bss section (not in V3 crash info) */
 } crashinfo_external;
-
+
 struct cisco_core_struct
 {
   int sig;
 };
+
+static const bfd_target *cisco_core_file_validate PARAMS ((bfd *, int));
+static const bfd_target *cisco_core_file_p PARAMS ((bfd *));
+char *cisco_core_file_failing_command PARAMS ((bfd *));
+int cisco_core_file_failing_signal PARAMS ((bfd *));
+#define cisco_core_file_matches_executable_p generic_core_file_matches_executable_p
 
 /* Examine the file for a crash info struct at the offset given by
    CRASH_INFO_LOC.  */
@@ -88,11 +94,13 @@ cisco_core_file_validate (abfd, crash_info_loc)
   unsigned int rambase;
   sec_ptr asect;
   struct stat statbuf;
+  bfd_size_type amt;
+  flagword flags;
 
-  if (bfd_seek (abfd, crash_info_loc, SEEK_SET) != 0)
+  if (bfd_seek (abfd, (file_ptr) crash_info_loc, SEEK_SET) != 0)
     return NULL;
 
-  nread = bfd_read (buf, 1, 4, abfd);
+  nread = bfd_bread (buf, (bfd_size_type) 4, abfd);
   if (nread != 4)
     {
       if (bfd_get_error () != bfd_error_system_call)
@@ -101,14 +109,14 @@ cisco_core_file_validate (abfd, crash_info_loc)
     }
   crashinfo_offset = MASK_ADDR (bfd_get_32 (abfd, buf));
 
-  if (bfd_seek (abfd, crashinfo_offset, SEEK_SET) != 0)
+  if (bfd_seek (abfd, (file_ptr) crashinfo_offset, SEEK_SET) != 0)
     {
       /* Most likely we failed because of a bogus (huge) offset */
       bfd_set_error (bfd_error_wrong_format);
       return NULL;
     }
 
-  nread = bfd_read (&crashinfo, 1, sizeof (crashinfo), abfd);
+  nread = bfd_bread (&crashinfo, (bfd_size_type) sizeof (crashinfo), abfd);
   if (nread != sizeof (crashinfo))
     {
       if (bfd_get_error () != bfd_error_system_call)
@@ -147,9 +155,8 @@ cisco_core_file_validate (abfd, crash_info_loc)
 
   /* OK, we believe you.  You're a core file.  */
 
-  abfd->tdata.cisco_core_data =
-    ((struct cisco_core_struct *)
-     bfd_zmalloc (sizeof (struct cisco_core_struct)));
+  amt = sizeof (struct cisco_core_struct);
+  abfd->tdata.cisco_core_data = (struct cisco_core_struct *) bfd_zmalloc (amt);
   if (abfd->tdata.cisco_core_data == NULL)
     return NULL;
 
@@ -232,58 +239,42 @@ cisco_core_file_validate (abfd, crash_info_loc)
       break;
     }
 
-  abfd->sections = NULL;
-  abfd->section_count = 0;
-
-  /* Create a ".reg" section to allow access to the saved
-     registers.  */
+  /* Create a ".data" section that maps the entire file, which is
+     essentially a dump of the target system's RAM.  */
 
-  asect = (asection *) bfd_zmalloc (sizeof (asection));
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+  asect = bfd_make_section_anyway_with_flags (abfd, ".data", flags);
   if (asect == NULL)
     goto error_return;
-  asect->name = ".reg";
-  asect->flags = SEC_HAS_CONTENTS;
-  asect->vma = 0;
-  asect->filepos = bfd_get_32 (abfd, crashinfo.registers) - rambase;
-  /* Since we don't know the exact size of the saved register info,
-     choose a register section size that is either the remaining part
-     of the file, or 1024, whichever is smaller.  */
-  nread = statbuf.st_size - asect->filepos;
-  asect->_raw_size = (nread < 1024) ? nread : 1024;
-  asect->next = abfd->sections;
-  abfd->sections = asect;
-  ++abfd->section_count;
+  /* The size of memory is the size of the core file itself.  */
+  asect->size = statbuf.st_size;
+  asect->vma = rambase;
+  asect->filepos = 0;
 
   /* Create a ".crash" section to allow access to the saved
      crash information.  */
 
-  asect = (asection *) bfd_zmalloc (sizeof (asection));
+  flags = SEC_HAS_CONTENTS;
+  asect = bfd_make_section_anyway_with_flags (abfd, ".crash", flags);
   if (asect == NULL)
     goto error_return;
-  asect->name = ".crash";
-  asect->flags = SEC_HAS_CONTENTS;
   asect->vma = 0;
   asect->filepos = crashinfo_offset;
-  asect->_raw_size = sizeof (crashinfo);
-  asect->next = abfd->sections;
-  abfd->sections = asect;
-  ++abfd->section_count;
+  asect->size = sizeof (crashinfo);
 
-  /* Create a ".data" section that maps the entire file, which is
-     essentially a dump of the target system's RAM.  */
+  /* Create a ".reg" section to allow access to the saved
+     registers.  */
 
-  asect = (asection *) bfd_zmalloc (sizeof (asection));
+  asect = bfd_make_section_anyway_with_flags (abfd, ".reg", flags);
   if (asect == NULL)
     goto error_return;
-  asect->name = ".data";
-  asect->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
-  /* The size of memory is the size of the core file itself.  */
-  asect->_raw_size = statbuf.st_size;
-  asect->vma = rambase;
-  asect->filepos = 0;
-  asect->next = abfd->sections;
-  abfd->sections = asect;
-  ++abfd->section_count;
+  asect->vma = 0;
+  asect->filepos = bfd_get_32 (abfd, crashinfo.registers) - rambase;
+  /* Since we don't know the exact size of the saved register info,
+     choose a register section size that is either the remaining part
+     of the file, or 1024, whichever is smaller.  */
+  nread = statbuf.st_size - asect->filepos;
+  asect->size = (nread < 1024) ? nread : 1024;
 
   return abfd->xvec;
 
@@ -291,17 +282,10 @@ cisco_core_file_validate (abfd, crash_info_loc)
      and there is an error of some kind.  */
 
  error_return:
-  {
-    sec_ptr nextsect;
-    for (asect = abfd->sections; asect != NULL;)
-      {
-	nextsect = asect->next;
-	free (asect);
-	asect = nextsect;
-      }
-    free (abfd->tdata.cisco_core_data);
-    return NULL;
-  }
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
 }
 
 static const bfd_target *
@@ -322,25 +306,17 @@ cisco_core_file_p (abfd)
 
 char *
 cisco_core_file_failing_command (abfd)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
 {
   return NULL;
 }
 
 int
 cisco_core_file_failing_signal (abfd)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
 {
   return abfd->tdata.cisco_core_data->sig;
 }
-
-boolean
-cisco_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
-{
-  return true;
-}
 
 extern const bfd_target cisco_core_little_vec;