PR 6844

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

diff --git a/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c
index fa066ecd537f1fa819234c430f5c213b18a076e5..7b0695aafc1459e3a90cd2d75c5b93036284a99d 100644 (file)
--- a/bfd/aix5ppc-core.c
+++ b/bfd/aix5ppc-core.c
@@ -1,14 +1,14 @@
 /* IBM RS/6000 "XCOFF" back-end for BFD.
 /* IBM RS/6000 "XCOFF" back-end for BFD.

-   Copyright 2001, 2002, 2004
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008

    Free Software Foundation, Inc.
    Written by Tom Rix
    Free Software Foundation, Inc.
    Written by Tom Rix

-   Contributed by Redhat.
+   Contributed by Red Hat Inc.

 
    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
 
    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
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,25 +18,21 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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 "sysdep.h"

 #include "bfd.h"
 
 #include "bfd.h"
 

+const bfd_target *xcoff64_core_p (bfd *);
+bfd_boolean xcoff64_core_file_matches_executable_p (bfd *, bfd *);
+char *xcoff64_core_file_failing_command (bfd *);
+int xcoff64_core_file_failing_signal (bfd *);
+

 #ifdef AIX_5_CORE
 
 #ifdef AIX_5_CORE
 

-#include "sysdep.h"

 #include "libbfd.h"
 
 #include "libbfd.h"
 

-const bfd_target *xcoff64_core_p
-  PARAMS ((bfd *));
-bfd_boolean xcoff64_core_file_matches_executable_p
-  PARAMS ((bfd *, bfd *));
-char *xcoff64_core_file_failing_command
-  PARAMS ((bfd *));
-int xcoff64_core_file_failing_signal
-  PARAMS ((bfd *));
-

 /* Aix 5.1 system include file.  */
 
 /* Need to define this macro so struct ld_info64 get included.  */
 /* Aix 5.1 system include file.  */
 
 /* Need to define this macro so struct ld_info64 get included.  */


@@ -44,15 +40,20 @@ int xcoff64_core_file_failing_signal
 #include <sys/ldr.h>
 #include <core.h>
 
 #include <sys/ldr.h>
 #include <core.h>
 

+/* The default architecture and machine for matching core files.  */
+#define DEFAULT_ARCHITECTURE   bfd_arch_powerpc
+#define DEFAULT_MACHINE                bfd_mach_ppc_620
+

 #define        core_hdr(abfd)          ((struct core_dumpxx *) abfd->tdata.any)
 
 #define CHECK_FILE_OFFSET(s, v) \
   ((bfd_signed_vma)(v) < 0 || (bfd_signed_vma)(v) > (bfd_signed_vma)(s).st_size)
 
 const bfd_target *
 #define        core_hdr(abfd)          ((struct core_dumpxx *) abfd->tdata.any)
 
 #define CHECK_FILE_OFFSET(s, v) \
   ((bfd_signed_vma)(v) < 0 || (bfd_signed_vma)(v) > (bfd_signed_vma)(s).st_size)
 
 const bfd_target *

-xcoff64_core_p (abfd)
-     bfd *abfd;
+xcoff64_core_p (bfd *abfd)

 {
 {

+  enum bfd_architecture arch;
+  unsigned long mach;

   struct core_dumpxx core, *new_core_hdr;
   struct stat statbuf;
   asection *sec;
   struct core_dumpxx core, *new_core_hdr;
   struct stat statbuf;
   asection *sec;


@@ -60,7 +61,8 @@ xcoff64_core_p (abfd)
   bfd_vma ld_offset;
   bfd_size_type i;
   struct vm_infox vminfo;
   bfd_vma ld_offset;
   bfd_size_type i;
   struct vm_infox vminfo;

-  bfd_target *return_value = NULL;
+  const bfd_target *return_value = NULL;
+  flagword flags;

 
   /* Get the header.  */
   if (bfd_seek (abfd, 0, SEEK_SET) != 0)
 
   /* Get the header.  */
   if (bfd_seek (abfd, 0, SEEK_SET) != 0)


@@ -111,30 +113,32 @@ xcoff64_core_p (abfd)
       return return_value;
     }
 
       return return_value;
     }
 

-  new_core_hdr = (struct core_dumpxx *)
-    bfd_zalloc (abfd, sizeof (struct core_dumpxx));
+  new_core_hdr = bfd_zalloc (abfd, sizeof (struct core_dumpxx));

   if (NULL == new_core_hdr)
     return return_value;
 
   memcpy (new_core_hdr, &core, sizeof (struct core_dumpxx));
   if (NULL == new_core_hdr)
     return return_value;
 
   memcpy (new_core_hdr, &core, sizeof (struct core_dumpxx));

-  core_hdr(abfd) = (char *)new_core_hdr;
+  /* The core_hdr() macro is no longer used here because it would
+     expand to code relying on gcc's cast-as-lvalue extension,
+     which was removed in gcc 4.0.  */
+  abfd->tdata.any = new_core_hdr;

 
   /* .stack section.  */
 
   /* .stack section.  */

-  sec = bfd_make_section_anyway (abfd, ".stack");
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".stack", flags);

   if (NULL == sec)
     return return_value;
 
   if (NULL == sec)
     return return_value;
 

-  sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;

   sec->size = core.c_size;
   sec->vma = core.c_stackorg;
   sec->filepos = core.c_stack;
 
   /* .reg section for all registers.  */
   sec->size = core.c_size;
   sec->vma = core.c_stackorg;
   sec->filepos = core.c_stack;
 
   /* .reg section for all registers.  */

-  sec = bfd_make_section_anyway (abfd, ".reg");
+  flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".reg", flags);

   if (NULL == sec)
     return return_value;
 
   if (NULL == sec)
     return return_value;
 

-  sec->flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;

   sec->size = sizeof (struct __context64);
   sec->vma = 0;
   sec->filepos = 0;
   sec->size = sizeof (struct __context64);
   sec->vma = 0;
   sec->filepos = 0;


@@ -144,11 +148,11 @@ xcoff64_core_p (abfd)
      To actually find out how long this section is in this particular
      core dump would require going down the whole list of struct
      ld_info's.   See if we can just fake it.  */
      To actually find out how long this section is in this particular
      core dump would require going down the whole list of struct
      ld_info's.   See if we can just fake it.  */

-  sec = bfd_make_section_anyway (abfd, ".ldinfo");
+  flags = SEC_HAS_CONTENTS;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".ldinfo", flags);

   if (NULL == sec)
     return return_value;
 
   if (NULL == sec)
     return return_value;
 

-  sec->flags = SEC_HAS_CONTENTS;

   sec->size = core.c_lsize;
   sec->vma = 0;
   sec->filepos = core.c_loader;
   sec->size = core.c_lsize;
   sec->vma = 0;
   sec->filepos = core.c_loader;


@@ -158,11 +162,11 @@ xcoff64_core_p (abfd)
      regions.  */
 
   /* .data section from executable.  */
      regions.  */
 
   /* .data section from executable.  */

-  sec = bfd_make_section_anyway (abfd, ".data");
+  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+  sec = bfd_make_section_anyway_with_flags (abfd, ".data", flags);

   if (NULL == sec)
     return return_value;
 
   if (NULL == sec)
     return return_value;
 

-  sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;

   sec->size = core.c_datasize;
   sec->vma = core.c_dataorg;
   sec->filepos = core.c_data;
   sec->size = core.c_datasize;
   sec->vma = core.c_dataorg;
   sec->filepos = core.c_data;


@@ -181,11 +185,11 @@ xcoff64_core_p (abfd)
 
       if (ldinfo.ldinfo_core)
        {
 
       if (ldinfo.ldinfo_core)
        {

-         sec = bfd_make_section_anyway (abfd, ".data");
+         flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+         sec = bfd_make_section_anyway_with_flags (abfd, ".data", flags);

          if (NULL == sec)
            return return_value;
 
          if (NULL == sec)
            return return_value;
 

-         sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;

          sec->size = ldinfo.ldinfo_datasize;
          sec->vma = ldinfo.ldinfo_dataorg;
          sec->filepos = ldinfo.ldinfo_core;
          sec->size = ldinfo.ldinfo_datasize;
          sec->vma = ldinfo.ldinfo_dataorg;
          sec->filepos = ldinfo.ldinfo_core;


@@ -209,18 +213,23 @@ xcoff64_core_p (abfd)
 
       if (vminfo.vminfo_offset)
        {
 
       if (vminfo.vminfo_offset)
        {

-         sec = bfd_make_section_anyway (abfd, ".vmdata");
+         flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
+         sec = bfd_make_section_anyway_with_flags (abfd, ".vmdata", flags);

          if (NULL == sec)
            return return_value;
 
          if (NULL == sec)
            return return_value;
 

-         sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;

          sec->size = vminfo.vminfo_size;
          sec->vma = vminfo.vminfo_addr;
          sec->filepos = vminfo.vminfo_offset;
        }
     }
 
          sec->size = vminfo.vminfo_size;
          sec->vma = vminfo.vminfo_addr;
          sec->filepos = vminfo.vminfo_offset;
        }
     }
 

-  return_value = abfd->xvec;   /* This is garbage for now.  */
+  /* Set the architecture and machine.  */
+  arch = DEFAULT_ARCHITECTURE;
+  mach = DEFAULT_MACHINE;
+  bfd_default_set_arch_mach (abfd, arch, mach);
+
+  return_value = (bfd_target *) abfd->xvec;    /* This is garbage for now.  */

 
  xcoff64_core_p_error:
   if (bfd_get_error () != bfd_error_system_call)
 
  xcoff64_core_p_error:
   if (bfd_get_error () != bfd_error_system_call)


@@ -232,9 +241,7 @@ xcoff64_core_p (abfd)
 /* Return `TRUE' if given core is from the given executable.  */
 
 bfd_boolean
 /* Return `TRUE' if given core is from the given executable.  */
 
 bfd_boolean

-xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
+xcoff64_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)

 {
   struct core_dumpxx core;
   char *path, *s;
 {
   struct core_dumpxx core;
   char *path, *s;


@@ -298,8 +305,7 @@ xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
 }
 
 char *
 }
 
 char *

-xcoff64_core_file_failing_command (abfd)
-     bfd *abfd;
+xcoff64_core_file_failing_command (bfd *abfd)

 {
   struct core_dumpxx *c = core_hdr (abfd);
   char *return_value = 0;
 {
   struct core_dumpxx *c = core_hdr (abfd);
   char *return_value = 0;


@@ -311,8 +317,7 @@ xcoff64_core_file_failing_command (abfd)
 }
 
 int
 }
 
 int

-xcoff64_core_file_failing_signal (abfd)
-     bfd *abfd;
+xcoff64_core_file_failing_signal (bfd *abfd)

 {
   struct core_dumpxx *c = core_hdr (abfd);
   int return_value = 0;
 {
   struct core_dumpxx *c = core_hdr (abfd);
   int return_value = 0;


@@ -325,41 +330,27 @@ xcoff64_core_file_failing_signal (abfd)
 
 #else /* AIX_5_CORE */
 
 
 #else /* AIX_5_CORE */
 

-const bfd_target *xcoff64_core_p
-  PARAMS ((bfd *));
-bfd_boolean xcoff64_core_file_matches_executable_p
-  PARAMS ((bfd *, bfd *));
-char *xcoff64_core_file_failing_command
-  PARAMS ((bfd *));
-int xcoff64_core_file_failing_signal
-  PARAMS ((bfd *));
-

 const bfd_target *
 const bfd_target *

-xcoff64_core_p (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+xcoff64_core_p (bfd *abfd ATTRIBUTE_UNUSED)

 {
   bfd_set_error (bfd_error_wrong_format);
   return 0;
 }
 
 bfd_boolean
 {
   bfd_set_error (bfd_error_wrong_format);
   return 0;
 }
 
 bfd_boolean

-xcoff64_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd ATTRIBUTE_UNUSED;
-     bfd *exec_bfd ATTRIBUTE_UNUSED;
+xcoff64_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)

 {
 {

-  return FALSE;
+  return generic_core_file_matches_executable_p (core_bfd, exec_bfd);

 }
 
 char *
 }
 
 char *

-xcoff64_core_file_failing_command (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+xcoff64_core_file_failing_command (bfd *abfd ATTRIBUTE_UNUSED)

 {
   return 0;
 }
 
 int
 {
   return 0;
 }
 
 int

-xcoff64_core_file_failing_signal (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+xcoff64_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED)

 {
   return 0;
 }
 {
   return 0;
 }