X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=bfd%2Firix-core.c;h=41899ac53d6b156bce078c8f2e5851b3bf34db28;hb=08388c79d5a8553465b2de881bed15766837735c;hp=3ee3695b62dab6da423caf8b7a3017f898e747ea;hpb=dc810e3900d47ab2eea86d50231ff2e70b596847;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/irix-core.c b/bfd/irix-core.c
index 3ee3695b62..41899ac53d 100644
--- a/bfd/irix-core.c
+++ b/bfd/irix-core.c
@@ -1,29 +1,32 @@
 /* BFD back-end for Irix core files.
-   Copyright 1993, 1994, 1996, 1999, 2001 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1996, 1999, 2001, 2002, 2004, 2006, 2007
+   Free Software Foundation, Inc.
    Written by Stu Grossman, Cygnus Support.
    Converted to back-end form by Ian Lance Taylor, Cygnus Support
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-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 3 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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, 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.  */
 
 /* This file can only be compiled on systems which use Irix style core
    files (namely, Irix 4 and Irix 5, so far).  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
 #ifdef IRIX_CORE
@@ -40,33 +43,122 @@ struct sgi_core_struct
 #define core_signal(bfd) (core_hdr(bfd)->sig)
 #define core_command(bfd) (core_hdr(bfd)->cmd)
 
+#define irix_core_core_file_matches_executable_p generic_core_file_matches_executable_p
+
 static asection *make_bfd_asection
-  PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
-static const bfd_target *irix_core_core_file_p PARAMS ((bfd *));
-static char *irix_core_core_file_failing_command PARAMS ((bfd *));
-static int irix_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean irix_core_core_file_matches_executable_p
-  PARAMS ((bfd *, bfd *));
-static asymbol *irix_core_make_empty_symbol PARAMS ((bfd *));
-static void swap_abort PARAMS ((void));
+  (bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr);
+
+/* Helper function for irix_core_core_file_p:
+   32-bit and 64-bit versions.  */
+
+#ifdef CORE_MAGIC64
+static int
+do_sections64 (bfd *abfd, struct coreout *coreout)
+{
+  struct vmap64 vmap;
+  char *secname;
+  int i, val;
+
+  for (i = 0; i < coreout->c_nvmap; i++)
+    {
+      val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd);
+      if (val != sizeof vmap)
+	break;
+
+      switch (vmap.v_type)
+	{
+	case VDATA:
+	  secname = ".data";
+	  break;
+	case VSTACK:
+	  secname = ".stack";
+	  break;
+#ifdef VMAPFILE
+	case VMAPFILE:
+	  secname = ".mapfile";
+	  break;
+#endif
+	default:
+	  continue;
+	}
+
+      /* A file offset of zero means that the
+	 section is not contained in the corefile.  */
+      if (vmap.v_offset == 0)
+	continue;
+
+      if (!make_bfd_asection (abfd, secname,
+			      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+			      vmap.v_len, vmap.v_vaddr, vmap.v_offset))
+	/* Fail.  */
+	return 0;
+    }
+
+  return 1;
+}
+#endif
+
+/* 32-bit version.  */
+
+static int
+do_sections (bfd *abfd, struct coreout *coreout)
+{
+  struct vmap vmap;
+  char *secname;
+  int i, val;
+
+  for (i = 0; i < coreout->c_nvmap; i++)
+    {
+      val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd);
+      if (val != sizeof vmap)
+	break;
+
+      switch (vmap.v_type)
+	{
+	case VDATA:
+	  secname = ".data";
+	  break;
+	case VSTACK:
+	  secname = ".stack";
+	  break;
+#ifdef VMAPFILE
+	case VMAPFILE:
+	  secname = ".mapfile";
+	  break;
+#endif
+	default:
+	  continue;
+	}
+
+      /* A file offset of zero means that the
+	 section is not contained in the corefile.  */
+      if (vmap.v_offset == 0)
+	continue;
+
+      if (!make_bfd_asection (abfd, secname,
+			      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
+			      vmap.v_len, vmap.v_vaddr, vmap.v_offset))
+	/* Fail.  */
+	return 0;
+    }
+  return 1;
+}
 
 static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     file_ptr filepos;
+make_bfd_asection (bfd *abfd,
+                   const char *name,
+                   flagword flags,
+                   bfd_size_type size,
+                   bfd_vma vma,
+                   file_ptr filepos)
 {
   asection *asect;
 
-  asect = bfd_make_section_anyway (abfd, name);
+  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);
   if (!asect)
     return NULL;
 
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
+  asect->size = size;
   asect->vma = vma;
   asect->filepos = filepos;
   asect->alignment_power = 4;
@@ -75,12 +167,9 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
 }
 
 static const bfd_target *
-irix_core_core_file_p (abfd)
-     bfd *abfd;
+irix_core_core_file_p (bfd *abfd)
 {
   int val;
-  int i;
-  char *secname;
   struct coreout coreout;
   struct idesc *idg, *idf, *ids;
   bfd_size_type amt;
@@ -93,13 +182,22 @@ irix_core_core_file_p (abfd)
       return 0;
     }
 
-#ifndef CORE_MAGICN32
-#define CORE_MAGICN32 CORE_MAGIC
-#endif
-  if ((coreout.c_magic != CORE_MAGIC && coreout.c_magic != CORE_MAGICN32)
-      || coreout.c_version != CORE_VERSION1)
+  if (coreout.c_version != CORE_VERSION1)
     return 0;
 
+  /* Have we got a corefile?  */
+  switch (coreout.c_magic)
+    {
+    case CORE_MAGIC:	break;
+#ifdef CORE_MAGIC64
+    case CORE_MAGIC64:	break;
+#endif
+#ifdef CORE_MAGICN32
+    case CORE_MAGICN32:	break;
+#endif
+    default:		return 0;	/* Un-identifiable or not corefile.  */
+    }
+
   amt = sizeof (struct sgi_core_struct);
   core_hdr (abfd) = (struct sgi_core_struct *) bfd_zalloc (abfd, amt);
   if (!core_hdr (abfd))
@@ -109,47 +207,21 @@ irix_core_core_file_p (abfd)
   core_signal (abfd) = coreout.c_sigcause;
 
   if (bfd_seek (abfd, coreout.c_vmapoffset, SEEK_SET) != 0)
-    return NULL;
+    goto fail;
 
-  for (i = 0; i < coreout.c_nvmap; i++)
+  /* Process corefile sections.  */
+#ifdef CORE_MAGIC64
+  if (coreout.c_magic == (int) CORE_MAGIC64)
     {
-      struct vmap vmap;
-
-      val = bfd_bread ((PTR) &vmap, (bfd_size_type) sizeof vmap, abfd);
-      if (val != sizeof vmap)
-	break;
-
-      switch (vmap.v_type)
-	{
-	case VDATA:
-	  secname = ".data";
-	  break;
-	case VSTACK:
-	  secname = ".stack";
-	  break;
-#ifdef VMAPFILE
-	case VMAPFILE:
-	  secname = ".mapfile";
-	  break;
-#endif
-	default:
-	  continue;
-	}
-
-      /* A file offset of zero means that the section is not contained
-	 in the corefile.  */
-      if (vmap.v_offset == 0)
-	continue;
-
-      if (!make_bfd_asection (abfd, secname,
-			      SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS,
-			      vmap.v_len,
-			      vmap.v_vaddr,
-			      vmap.v_offset))
-	return NULL;
+      if (! do_sections64 (abfd, & coreout))
+	goto fail;
     }
+  else
+#endif
+    if (! do_sections (abfd, & coreout))
+      goto fail;
 
-  /* Make sure that the regs are contiguous within the core file. */
+  /* Make sure that the regs are contiguous within the core file.  */
 
   idg = &coreout.c_idesc[I_GPREGS];
   idf = &coreout.c_idesc[I_FPREGS];
@@ -157,77 +229,55 @@ irix_core_core_file_p (abfd)
 
   if (idg->i_offset + idg->i_len != idf->i_offset
       || idf->i_offset + idf->i_len != ids->i_offset)
-    return 0;			/* Can't deal with non-contig regs */
+    goto fail;			/* Can't deal with non-contig regs */
 
   if (bfd_seek (abfd, idg->i_offset, SEEK_SET) != 0)
-    return NULL;
+    goto fail;
 
-  make_bfd_asection (abfd, ".reg",
-		     SEC_HAS_CONTENTS,
-		     idg->i_len + idf->i_len + ids->i_len,
-		     0,
-		     idg->i_offset);
+  if (!make_bfd_asection (abfd, ".reg",
+			  SEC_HAS_CONTENTS,
+			  idg->i_len + idf->i_len + ids->i_len,
+			  0,
+			  idg->i_offset))
+    goto fail;
 
   /* OK, we believe you.  You're a core file (sure, sure).  */
   bfd_default_set_arch_mach (abfd, bfd_arch_mips, 0);
 
   return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, core_hdr (abfd));
+  core_hdr (abfd) = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
 }
 
 static char *
-irix_core_core_file_failing_command (abfd)
-     bfd *abfd;
+irix_core_core_file_failing_command (bfd *abfd)
 {
   return core_command (abfd);
 }
 
 static int
-irix_core_core_file_failing_signal (abfd)
-     bfd *abfd;
+irix_core_core_file_failing_signal (bfd *abfd)
 {
   return core_signal (abfd);
 }
 
-static boolean
-irix_core_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;			/* XXX - FIXME */
-}
-
-static asymbol *
-irix_core_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  bfd_size_type amt = sizeof (asymbol);
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, amt);
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
-#define irix_core_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
-#define irix_core_get_symtab _bfd_nosymbols_get_symtab
-#define irix_core_print_symbol _bfd_nosymbols_print_symbol
-#define irix_core_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define irix_core_bfd_is_local_label_name \
-  _bfd_nosymbols_bfd_is_local_label_name
-#define irix_core_get_lineno _bfd_nosymbols_get_lineno
-#define irix_core_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define irix_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define irix_core_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define irix_core_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
 /* If somebody calls any byte-swapping routines, shoot them.  */
 static void
-swap_abort()
+swap_abort(void)
 {
   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 )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
+
+#define	NO_GET ((bfd_vma (*) (const void *)) swap_abort)
+#define	NO_PUT ((void (*) (bfd_vma, void *)) swap_abort)
+#define	NO_GETS ((bfd_signed_vma (*) (const void *)) swap_abort)
+#define	NO_GET64 ((bfd_uint64_t (*) (const void *)) swap_abort)
+#define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
+#define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
 const bfd_target irix_core_vec =
   {
@@ -242,41 +292,41 @@ const bfd_target irix_core_vec =
     0,			                                   /* symbol prefix */
     ' ',						   /* ar_pad_char */
     16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit data */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit data */
+    NO_GET64, NO_GETS64, NO_PUT64,	/* 64 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 32 bit hdrs */
+    NO_GET, NO_GETS, NO_PUT,		/* 16 bit hdrs */
 
     {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     irix_core_core_file_p	/* a core file */
+      _bfd_dummy_target,		/* unknown format */
+      _bfd_dummy_target,		/* object file */
+      _bfd_dummy_target,		/* archive */
+      irix_core_core_file_p		/* a core file */
     },
     {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
     },
     {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
+      bfd_false, bfd_false,
+      bfd_false, bfd_false
     },
 
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (irix_core),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (irix_core),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+    BFD_JUMP_TABLE_GENERIC (_bfd_generic),
+    BFD_JUMP_TABLE_COPY (_bfd_generic),
+    BFD_JUMP_TABLE_CORE (irix_core),
+    BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
+    BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
+    BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
+    BFD_JUMP_TABLE_WRITE (_bfd_generic),
+    BFD_JUMP_TABLE_LINK (_bfd_nolink),
+    BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
     NULL,
 
     (PTR) 0			/* backend_data */
-};
+  };
 
 #endif /* IRIX_CORE */