X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fnetbsd-core.c;h=2787c46eb8912a1c20b05e797f20a85254a0fa1b;hb=6604db2ec02fda3c9b0ec8a117aef7a2fc152678;hp=828c2a1ceb13ab597b5de31126dcb7cc045851a5;hpb=ed288bb597072176e84fc8279707a3f2f475779b;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
index 828c2a1ceb..2787c46eb8 100644
--- a/bfd/netbsd-core.c
+++ b/bfd/netbsd-core.c
@@ -1,5 +1,7 @@
 /* BFD back end for NetBSD style core files
-   Copyright 1988, 89, 91, 92, 93, 96, 1998 Free Software Foundation, Inc.
+   Copyright 1988, 1989, 1991, 1992, 1993, 1996, 1998, 1999, 2000, 2001,
+   2002
+   Free Software Foundation, Inc.
    Written by Paul Kranenburg, EUR
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,7 +18,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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -29,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #include <sys/core.h>
 
 /*
- * FIXME: On NetBSD/sparc CORE_FPU_OFFSET should be (sizeof(struct trapframe))
+ * FIXME: On NetBSD/sparc CORE_FPU_OFFSET should be (sizeof (struct trapframe))
  */
 
 struct netbsd_core_struct {
@@ -38,12 +40,12 @@ struct netbsd_core_struct {
 
 /* forward declarations */
 
-static const bfd_target *	netbsd_core_file_p PARAMS ((bfd *abfd));
-static char *		netbsd_core_file_failing_command PARAMS ((bfd *abfd));
-static int 		netbsd_core_file_failing_signal PARAMS ((bfd *abfd));
-static boolean		netbsd_core_file_matches_executable_p
-			 PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-static void		swap_abort PARAMS ((void));
+static const bfd_target *netbsd_core_file_p PARAMS ((bfd *abfd));
+static char *netbsd_core_file_failing_command PARAMS ((bfd *abfd));
+static int netbsd_core_file_failing_signal PARAMS ((bfd *abfd));
+static boolean netbsd_core_file_matches_executable_p
+  PARAMS ((bfd *core_bfd, bfd *exec_bfd));
+static void swap_abort PARAMS ((void));
 
 /* Handle NetBSD-style core dump file.  */
 
@@ -53,117 +55,116 @@ netbsd_core_file_p (abfd)
      bfd *abfd;
 
 {
-	int		i, val, offset;
-	asection	*asect, *asect2;
-	struct core	core;
-	struct coreseg	coreseg;
-
-	val = bfd_read ((void *)&core, 1, sizeof core, abfd);
-	if (val != sizeof core) {
-		/* Too small to be a core file */
-		bfd_set_error(bfd_error_wrong_format);
-		return 0;
+  int i, val;
+  file_ptr offset;
+  asection *asect, *asect2;
+  struct core core;
+  struct coreseg coreseg;
+  bfd_size_type amt = sizeof core;
+
+  val = bfd_bread ((void *) &core, amt, abfd);
+  if (val != sizeof core)
+    {
+      /* Too small to be a core file */
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  if (CORE_GETMAGIC (core) != COREMAGIC)
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return 0;
+    }
+
+  amt = sizeof (struct netbsd_core_struct);
+  rawptr = (struct netbsd_core_struct *) bfd_zalloc (abfd, amt);
+  if (rawptr == NULL)
+    return 0;
+
+  rawptr->core = core;
+  abfd->tdata.netbsd_core_data = rawptr;
+
+  offset = core.c_hdrsize;
+  for (i = 0; i < core.c_nseg; i++)
+    {
+      const char *sname;
+      flagword flags;
+
+      if (bfd_seek (abfd, offset, SEEK_SET) != 0)
+	goto punt;
+
+      val = bfd_bread ((void *) &coreseg, (bfd_size_type) sizeof coreseg, abfd);
+      if (val != sizeof coreseg)
+	{
+	  bfd_set_error (bfd_error_file_truncated);
+	  goto punt;
 	}
-
-	if (CORE_GETMAGIC(core) != COREMAGIC) {
-		bfd_set_error(bfd_error_wrong_format);
-		return 0;
+      if (CORE_GETMAGIC (coreseg) != CORESEGMAGIC)
+	{
+	  bfd_set_error (bfd_error_wrong_format);
+	  goto punt;
 	}
 
-	rawptr = (struct netbsd_core_struct *)
-		bfd_zalloc (abfd, sizeof (struct netbsd_core_struct));
-	if (rawptr == NULL) {
-		bfd_set_error(bfd_error_no_memory);
-		return 0;
+      offset += core.c_seghdrsize;
+
+      switch (CORE_GETFLAG (coreseg))
+	{
+	case CORE_CPU:
+	  sname = ".reg";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
+	case CORE_DATA:
+	  sname = ".data";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	case CORE_STACK:
+	  sname = ".stack";
+	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
+	  break;
+	default:
+	  sname = ".unknown";
+	  flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
 	}
+      asect = bfd_make_section_anyway (abfd, sname);
+      if (asect == NULL)
+	goto punt;
 
-	rawptr->core = core;
-	abfd->tdata.netbsd_core_data = rawptr;
-
-	offset = core.c_hdrsize;
-	for (i = 0; i < core.c_nseg; i++) {
-
-		if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-			goto punt;
-
-		val = bfd_read ((void *)&coreseg, 1, sizeof coreseg, abfd);
-		if (val != sizeof coreseg) {
-			bfd_set_error(bfd_error_file_truncated);
-			goto punt;
-		}
-		if (CORE_GETMAGIC(coreseg) != CORESEGMAGIC) {
-			bfd_set_error(bfd_error_wrong_format);
-			goto punt;
-		}
-
-		offset += core.c_seghdrsize;
-
-		asect = (asection *) bfd_zalloc (abfd, sizeof(asection));
-		if (asect == NULL) {
-			bfd_set_error(bfd_error_no_memory);
-			goto punt;
-		}
-
-		asect->_raw_size = coreseg.c_size;
-		asect->vma = coreseg.c_addr;
-		asect->filepos = offset;
-		asect->alignment_power = 2;
-		asect->next = abfd->sections;
-		abfd->sections = asect;
-		abfd->section_count++;
-		offset += coreseg.c_size;
-
-		switch (CORE_GETFLAG(coreseg)) {
-		case CORE_CPU:
-			asect->name = ".reg";
-			asect->flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-#ifdef CORE_FPU_OFFSET
-			/* Hackish... */
-			asect->_raw_size = CORE_FPU_OFFSET;
-			asect2 = (asection *)bfd_zalloc (abfd,
-							 sizeof (asection));
-			if (asect2 == NULL) {
-				bfd_set_error(bfd_error_no_memory);
-				goto punt;
-			}
-			asect2->_raw_size = coreseg.c_size - CORE_FPU_OFFSET;
-			asect2->vma = 0;
-			asect2->filepos = asect->filepos + CORE_FPU_OFFSET;
-			asect2->alignment_power = 2;
-			asect2->next = abfd->sections;
-			asect2->name = ".reg2";
-			asect2->flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-			abfd->sections = asect2;
-			abfd->section_count++;
-#endif
+      asect->flags = flags;
+      asect->_raw_size = coreseg.c_size;
+      asect->vma = coreseg.c_addr;
+      asect->filepos = offset;
+      asect->alignment_power = 2;
 
-			break;
-		case CORE_DATA:
-			asect->name = ".data";
-			asect->flags = SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS;
-			break;
-		case CORE_STACK:
-			asect->name = ".stack";
-			asect->flags = SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS;
-			break;
-		}
+      offset += coreseg.c_size;
+
+#ifdef CORE_FPU_OFFSET
+      switch (CORE_GETFLAG (coreseg))
+	{
+	case CORE_CPU:
+	  /* Hackish...  */
+	  asect->_raw_size = CORE_FPU_OFFSET;
+	  asect2 = bfd_make_section_anyway (abfd, ".reg2");
+	  if (asect2 == NULL)
+	    goto punt;
+	  asect2->_raw_size = coreseg.c_size - CORE_FPU_OFFSET;
+	  asect2->vma = 0;
+	  asect2->filepos = asect->filepos + CORE_FPU_OFFSET;
+	  asect2->alignment_power = 2;
+	  asect2->flags = SEC_ALLOC + SEC_HAS_CONTENTS;
+	  break;
 	}
+#endif
+    }
 
-	/* OK, we believe you.  You're a core file (sure, sure).  */
-	return abfd->xvec;
+  /* OK, we believe you.  You're a core file (sure, sure).  */
+  return abfd->xvec;
 
-punt:	{
-		asection	*anext;
-		for (asect = abfd->sections; asect; asect = anext) {
-			anext = asect->next;
-			free((void *)asect);
-		}
-	}
-	free ((void *)rawptr);
-	abfd->tdata.netbsd_core_data = NULL;
-	abfd->sections = NULL;
-	abfd->section_count = 0;
-	return 0;
+ punt:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return 0;
 }
 
 static char*
@@ -186,16 +187,17 @@ netbsd_core_file_failing_signal (abfd)
 /* ARGSUSED */
 static boolean
 netbsd_core_file_matches_executable_p  (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
+     bfd *core_bfd ATTRIBUTE_UNUSED;
+     bfd *exec_bfd ATTRIBUTE_UNUSED;
 {
   return true;		/* FIXME, We have no way of telling at this point */
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
 static void
-swap_abort()
+swap_abort ()
 {
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
+  abort (); /* This way doesn't require any declaration for ANSI to fuck up */
 }
 #define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
 #define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
@@ -236,7 +238,7 @@ const bfd_target netbsd_core_vec =
      bfd_false, bfd_false,
      bfd_false, bfd_false
     },
-    
+
        BFD_JUMP_TABLE_GENERIC (_bfd_generic),
        BFD_JUMP_TABLE_COPY (_bfd_generic),
        BFD_JUMP_TABLE_CORE (netbsd),
@@ -248,6 +250,6 @@ const bfd_target netbsd_core_vec =
        BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
     NULL,
-    
+
     (PTR) 0			/* backend_data */
 };