Check the correct arch_info object's mach field: all PowerPC machines are

[deliverable/binutils-gdb.git] / bfd / osf-core.c

diff --git a/bfd/osf-core.c b/bfd/osf-core.c
index 671f4af495c01cc30e5d608be9c5a99d5cfc1159..95292a3e4bc0b85f35515f8ccdd77ba8340ac7ad 100644 (file)
--- a/bfd/osf-core.c
+++ b/bfd/osf-core.c
@@ -1,5 +1,6 @@
 /* BFD back-end for OSF/1 core files.
-   Copyright 1993, 94, 95, 97, 1998 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1995, 1998, 1999, 2001, 2002
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -29,25 +30,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* forward declarations */
 
-static asection *
-make_bfd_asection PARAMS ((bfd *, CONST char *, flagword, bfd_size_type,
-                          bfd_vma, file_ptr));
-static asymbol *
-osf_core_make_empty_symbol PARAMS ((bfd *));
-static const bfd_target *
-osf_core_core_file_p PARAMS ((bfd *));
-static char *
-osf_core_core_file_failing_command PARAMS ((bfd *));
-static int
-osf_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean
-osf_core_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-static void
-swap_abort PARAMS ((void));
+static asection *make_bfd_asection
+  PARAMS ((bfd *, const char *, flagword, bfd_size_type, bfd_vma, file_ptr));
+static const bfd_target *osf_core_core_file_p
+  PARAMS ((bfd *));
+static char *osf_core_core_file_failing_command
+  PARAMS ((bfd *));
+static int osf_core_core_file_failing_signal
+  PARAMS ((bfd *));
+static bfd_boolean osf_core_core_file_matches_executable_p
+  PARAMS ((bfd *, bfd *));
+static void swap_abort
+  PARAMS ((void));
 
 /* These are stored in the bfd's tdata */
 
-struct osf_core_struct 
+struct osf_core_struct
 {
   int sig;
   char cmd[MAXCOMLEN + 1];
@@ -60,7 +58,7 @@ struct osf_core_struct
 static asection *
 make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
      bfd *abfd;
-     CONST char *name;
+     const char *name;
      flagword flags;
      bfd_size_type _raw_size;
      bfd_vma vma;
@@ -81,16 +79,6 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
   return asect;
 }
 
-static asymbol *
-osf_core_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
 static const bfd_target *
 osf_core_core_file_p (abfd)
      bfd *abfd;
@@ -99,8 +87,10 @@ osf_core_core_file_p (abfd)
   int i;
   char *secname;
   struct core_filehdr core_header;
+  bfd_size_type amt;
 
-  val = bfd_read ((PTR)&core_header, 1, sizeof core_header, abfd);
+  amt = sizeof core_header;
+  val = bfd_bread ((PTR) &core_header, amt, abfd);
   if (val != sizeof core_header)
     return NULL;
 
@@ -108,7 +98,7 @@ osf_core_core_file_p (abfd)
     return NULL;
 
   core_hdr (abfd) = (struct osf_core_struct *)
-    bfd_zalloc (abfd, sizeof (struct osf_core_struct));
+    bfd_zalloc (abfd, (bfd_size_type) sizeof (struct osf_core_struct));
   if (!core_hdr (abfd))
     return NULL;
 
@@ -120,7 +110,8 @@ osf_core_core_file_p (abfd)
       struct core_scnhdr core_scnhdr;
       flagword flags;
 
-      val = bfd_read ((PTR)&core_scnhdr, 1, sizeof core_scnhdr, abfd);
+      amt = sizeof core_scnhdr;
+      val = bfd_bread ((PTR) &core_scnhdr, amt, abfd);
       if (val != sizeof core_scnhdr)
        break;
 
@@ -152,12 +143,18 @@ osf_core_core_file_p (abfd)
                              (bfd_size_type) core_scnhdr.size,
                              (bfd_vma) core_scnhdr.vaddr,
                              (file_ptr) core_scnhdr.scnptr))
-       return NULL;
+       goto fail;
     }
 
   /* OK, we believe you.  You're a core file (sure, sure).  */
 
   return abfd->xvec;
+
+ fail:
+  bfd_release (abfd, core_hdr (abfd));
+  core_hdr (abfd) = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
 }
 
 static char *
@@ -176,24 +173,14 @@ osf_core_core_file_failing_signal (abfd)
 }
 
 /* ARGSUSED */
-static boolean
+static bfd_boolean
 osf_core_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 */
+  return TRUE;         /* FIXME, We have no way of telling at this point */
 }
 \f
-#define osf_core_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
-#define osf_core_get_symtab _bfd_nosymbols_get_symtab
-#define osf_core_print_symbol _bfd_nosymbols_print_symbol
-#define osf_core_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define osf_core_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
-#define osf_core_get_lineno _bfd_nosymbols_get_lineno
-#define osf_core_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define osf_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define osf_core_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define osf_core_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
 /* If somebody calls any byte-swapping routines, shoot them.  */
 static void
 swap_abort()
@@ -209,8 +196,8 @@ const bfd_target osf_core_vec =
   {
     "osf-core",
     bfd_target_unknown_flavour,
-    BFD_ENDIAN_BIG,            /* target byte order */
-    BFD_ENDIAN_BIG,            /* target headers byte order */
+    BFD_ENDIAN_LITTLE,         /* target byte order */
+    BFD_ENDIAN_LITTLE,         /* target headers byte order */
     (HAS_RELOC | EXEC_P |      /* object flags */
      HAS_LINENO | HAS_DEBUG |
      HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
@@ -239,16 +226,18 @@ const bfd_target osf_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 (osf_core),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (osf_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 (osf_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 */
 };