Add support for 64bit NETBSD cores

1 files changed, 73 insertions, 45 deletions

diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
index 7498990a4e..adadead8d1 100644
--- a/bfd/netbsd-core.c
+++ b/bfd/netbsd-core.c
@@ -1,44 +1,47 @@
 /* BFD back end for NetBSD style core files
    Copyright 1988, 1989, 1991, 1992, 1993, 1996, 1998, 1999, 2000, 2001,
-   2002
+   2002, 2004
    Free Software Foundation, Inc.
    Written by Paul Kranenburg, EUR
 
-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 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.  */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
+#include "libaout.h"           /* BFD a.out internal data structures.  */
 
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <signal.h>
 #include <sys/core.h>
 
-/*
- * FIXME: On NetBSD/sparc CORE_FPU_OFFSET should be (sizeof (struct trapframe))
- */
+/* The machine ID for OpenBSD/sparc64 and older versions of
+   NetBSD/sparc64 overlaps with M_MIPS1.  */
+#define M_SPARC64_OPENBSD	M_MIPS1
 
-struct netbsd_core_struct {
-	struct core core;
+/* FIXME: On NetBSD/sparc CORE_FPU_OFFSET should be (sizeof (struct trapframe)).  */
+
+struct netbsd_core_struct
+{
+  struct core core;
 } *rawptr;
 
-/* forward declarations */
+/* Forward declarations.  */
 
 static const bfd_target *netbsd_core_file_p
   PARAMS ((bfd *abfd));
@@ -68,7 +71,7 @@ netbsd_core_file_p (abfd)
   val = bfd_bread ((void *) &core, amt, abfd);
   if (val != sizeof core)
     {
-      /* Too small to be a core file */
+      /* Too small to be a core file.  */
       bfd_set_error (bfd_error_wrong_format);
       return 0;
     }
@@ -160,6 +163,27 @@ netbsd_core_file_p (abfd)
 #endif
     }
 
+ /* Set architecture from machine ID.  */
+ switch (CORE_GETMID (core))
+   {
+   case M_X86_64_NETBSD:
+     bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
+     break;
+
+   case M_386_NETBSD:
+     bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_i386_i386);
+     break;
+
+   case M_SPARC_NETBSD:
+     bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc);
+     break;
+
+   case M_SPARC64_NETBSD:
+   case M_SPARC64_OPENBSD:
+     bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc_v9);
+     break;
+   }
+ 
   /* OK, we believe you.  You're a core file (sure, sure).  */
   return abfd->xvec;
 
@@ -191,15 +215,19 @@ netbsd_core_file_matches_executable_p  (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 */
+  /* FIXME, We have no way of telling at this point.  */
+  return TRUE;
 }
 
 /* If somebody calls any byte-swapping routines, shoot them.  */
+
 static void
 swap_abort ()
 {
-  abort (); /* This way doesn't require any declaration for ANSI to fuck up */
+ /* This way doesn't require any declaration for ANSI to fuck up.  */
+  abort ();
 }
+
 #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 \
@@ -209,33 +237,33 @@ const bfd_target netbsd_core_vec =
   {
     "netbsd-core",
     bfd_target_unknown_flavour,
-    BFD_ENDIAN_UNKNOWN,		/* target byte order */
-    BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
+    BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+    BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+    (HAS_RELOC | EXEC_P |	/* Object flags.  */
      HAS_LINENO | HAS_DEBUG |
      HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    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 */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     netbsd_core_file_p		/* a core file */
+    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* Section flags.  */
+    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.  */
+
+    {					/* bfd_check_format.  */
+     _bfd_dummy_target,			/* Unknown format.  */
+     _bfd_dummy_target,			/* Object file.  */
+     _bfd_dummy_target,			/* Archive.  */
+     netbsd_core_file_p			/* A core file.  */
     },
-    {				/* bfd_set_format */
+    {					/* bfd_set_format.  */
      bfd_false, bfd_false,
      bfd_false, bfd_false
     },
-    {				/* bfd_write_contents */
+    {					/* bfd_write_contents.  */
      bfd_false, bfd_false,
      bfd_false, bfd_false
     },
@@ -252,5 +280,5 @@ const bfd_target netbsd_core_vec =
 
     NULL,
 
-    (PTR) 0			/* backend_data */
+    (PTR) 0			        /* Backend_data.  */
 };