gdb: add target_ops::supports_displaced_step

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

diff --git a/bfd/rs6000-core.c b/bfd/rs6000-core.c
index a61f25caa22c41f602d3fe911dd49fab03a221eb..696e8fdd99105cb4b8222da76c4c19959bcc0279 100644 (file)
--- a/bfd/rs6000-core.c
+++ b/bfd/rs6000-core.c
@@ -1,13 +1,6 @@
 /* IBM RS/6000 "XCOFF" back-end for BFD.
 /* IBM RS/6000 "XCOFF" back-end for BFD.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-   2001, 2002
-   Free Software Foundation, Inc.
-   FIXME: Can someone provide a transliteration of this name into ASCII?
-   Using the following chars caused a compiler warning on HIUX (so I replaced
-   them with octal escapes), and isn't useful without an understanding of what
-   character set it is.
-   Written by Metin G. Ozisik, Mimi Ph\373\364ng-Th\345o V\365,
-     and John Gilmore.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.
+   Written by Metin G. Ozisik, Mimi Phuong-Thao Vo, and John Gilmore.

    Archive support from Damon A. Permezel.
    Contributed by IBM Corporation and Cygnus Support.
 
    Archive support from Damon A. Permezel.
    Contributed by IBM Corporation and Cygnus Support.
 


@@ -15,7 +8,7 @@
 
    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 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,


@@ -25,7 +18,9 @@
 
    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.  */
+

 
 /* This port currently only handles reading object files, except when
    compiled on an RS/6000 host.  -- no archive support, no core files.
 
 /* This port currently only handles reading object files, except when
    compiled on an RS/6000 host.  -- no archive support, no core files.


@@ -44,8 +39,8 @@
 #define _LONG_LONG
 #endif
 
 #define _LONG_LONG
 #endif
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 
 #ifdef AIX_CORE
 #include "libbfd.h"
 
 #ifdef AIX_CORE


@@ -60,9 +55,7 @@
 
 #undef SCNHDR
 
 
 #undef SCNHDR
 

-/* ------------------------------------------------------------------------ */
-/*     Support for core file stuff..                                       */
-/* ------------------------------------------------------------------------ */
+/* Support for core file stuff.  */

 
 #include <sys/user.h>
 #define __LDINFO_PTRACE32__    /* for __ld_info32 */
 
 #include <sys/user.h>
 #define __LDINFO_PTRACE32__    /* for __ld_info32 */


@@ -71,6 +64,9 @@
 #include <sys/core.h>
 #include <sys/systemcfg.h>
 
 #include <sys/core.h>
 #include <sys/systemcfg.h>
 

+/* Borrowed from <sys/inttypes.h> on recent AIX versions.  */
+typedef unsigned long ptr_to_uint;
+

 #define        core_hdr(bfd)           ((CoreHdr *) bfd->tdata.any)
 
 /* AIX 4.1 changed the names and locations of a few items in the core file.
 #define        core_hdr(bfd)           ((CoreHdr *) bfd->tdata.any)
 
 /* AIX 4.1 changed the names and locations of a few items in the core file.


@@ -93,8 +89,9 @@
 
 /* Union of 32-bit and 64-bit versions of ld_info.  */
 
 
 /* Union of 32-bit and 64-bit versions of ld_info.  */
 

-typedef union {
-#ifdef __ld_info32
+typedef union
+{
+#if defined (__ld_info32) || defined (__ld_info64)

   struct __ld_info32 l32;
   struct __ld_info64 l64;
 #else
   struct __ld_info32 l32;
   struct __ld_info64 l64;
 #else


@@ -105,37 +102,60 @@ typedef union {
 
 /* Union of old and new core dump structures.  */
 
 
 /* Union of old and new core dump structures.  */
 

-typedef union {
+typedef union
+{

 #ifdef AIX_CORE_DUMPX_CORE
 #ifdef AIX_CORE_DUMPX_CORE

-  struct core_dumpx new;       /* new AIX 4.3+ core dump */
+  struct core_dumpx new_dump;  /* New AIX 4.3+ core dump.  */

 #else
 #else

-  struct core_dump new;                /* for simpler coding */
+  struct core_dump new_dump;   /* For simpler coding.  */
+#endif
+#ifndef BFD64                  /* Use old only if gdb is 32-bit.  */
+  struct core_dump old;                /* Old AIX 4.2- core dump, still used on
+                                  4.3+ with appropriate SMIT config.  */

 #endif
 #endif

-  struct core_dump old;                /* old AIX 4.2- core dump, still used on
-                                  4.3+ with appropriate SMIT config */

 } CoreHdr;
 
 /* Union of old and new vm_info structures.  */
 
 #ifdef CORE_VERSION_1
 } CoreHdr;
 
 /* Union of old and new vm_info structures.  */
 
 #ifdef CORE_VERSION_1

-typedef union {
+typedef union
+{

 #ifdef AIX_CORE_DUMPX_CORE
 #ifdef AIX_CORE_DUMPX_CORE

-  struct vm_infox new;
+  struct vm_infox new_dump;

 #else
 #else

-  struct vm_info new;
+  struct vm_info new_dump;

 #endif
 #endif

+#ifndef BFD64

   struct vm_info old;
   struct vm_info old;

+#endif

 } VmInfo;
 #endif
 
 /* Return whether CoreHdr C is in new or old format.  */
 
 #ifdef AIX_CORE_DUMPX_CORE
 } VmInfo;
 #endif
 
 /* Return whether CoreHdr C is in new or old format.  */
 
 #ifdef AIX_CORE_DUMPX_CORE

-# define CORE_NEW(c)   (!(c).old.c_entries)
+# ifndef BFD64
+#  define CORE_NEW(c)  (!(c).old.c_entries)
+# else
+#  define CORE_NEW(c)  1
+# endif

 #else
 # define CORE_NEW(c)   0
 #endif
 
 #else
 # define CORE_NEW(c)   0
 #endif
 

+/* Return whether CoreHdr C usese core_dumpxx structure.
+
+   FIXME: the core file format version number used here definitely indicates
+   that struct core_dumpxx should be used to represent the core file header,
+   but that may not be the only such format version number.  */
+
+#ifdef AIX_5_CORE
+# define CORE_DUMPXX_VERSION   267312562
+# define CNEW_IS_CORE_DUMPXX(c) ((c).new_dump.c_version == CORE_DUMPXX_VERSION)
+#else
+# define CNEW_IS_CORE_DUMPXX(c) 0
+#endif
+

 /* Return the c_stackorg field from struct core_dumpx C.  */
 
 #ifdef AIX_CORE_DUMPX_CORE
 /* Return the c_stackorg field from struct core_dumpx C.  */
 
 #ifdef AIX_CORE_DUMPX_CORE


@@ -247,52 +267,61 @@ typedef union {
 
 /* Size of the leading portion that old and new core dump structures have in
    common.  */
 
 /* Size of the leading portion that old and new core dump structures have in
    common.  */

-#define CORE_COMMONSZ  ((int) &((struct core_dump *) 0)->c_entries \
-                        + sizeof (((struct core_dump *) 0)->c_entries))
+#ifdef AIX_CORE_DUMPX_CORE
+#define CORE_COMMONSZ  ((long) &((struct core_dumpx *) 0)->c_entries \
+                       + sizeof (((struct core_dumpx *) 0)->c_entries))
+#else
+#define CORE_COMMONSZ  ((int) &((struct core_dump *) 0)->c_entries \
+                       + sizeof (((struct core_dump *) 0)->c_entries))
+#endif
+/* Define prototypes for certain functions, to avoid a compiler warning
+   saying that they are missing.  */
+
+const bfd_cleanup rs6000coff_core_p (bfd *abfd);
+bfd_boolean rs6000coff_core_file_matches_executable_p (bfd *core_bfd,
+                                                      bfd *exec_bfd);
+char * rs6000coff_core_file_failing_command (bfd *abfd);
+int rs6000coff_core_file_failing_signal (bfd *abfd);

 
 /* Try to read into CORE the header from the core file associated with ABFD.
    Return success.  */
 
 
 /* Try to read into CORE the header from the core file associated with ABFD.
    Return success.  */
 

-static boolean
+static bfd_boolean

 read_hdr (bfd *abfd, CoreHdr *core)
 {
   bfd_size_type size;
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
 read_hdr (bfd *abfd, CoreHdr *core)
 {
   bfd_size_type size;
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)

-    return false;
+    return FALSE;

 
   /* Read the leading portion that old and new core dump structures have in
      common.  */
   size = CORE_COMMONSZ;
   if (bfd_bread (core, size, abfd) != size)
 
   /* Read the leading portion that old and new core dump structures have in
      common.  */
   size = CORE_COMMONSZ;
   if (bfd_bread (core, size, abfd) != size)

-    return false;
+    return FALSE;

 
   /* Read the trailing portion of the structure.  */
   if (CORE_NEW (*core))
 
   /* Read the trailing portion of the structure.  */
   if (CORE_NEW (*core))

-    size = sizeof (core->new);
+    size = sizeof (core->new_dump);
+#ifndef BFD64

   else
     size = sizeof (core->old);
   else
     size = sizeof (core->old);

+#endif

   size -= CORE_COMMONSZ;
   return bfd_bread ((char *) core + CORE_COMMONSZ, size, abfd) == size;
 }
 
 static asection *
   size -= CORE_COMMONSZ;
   return bfd_bread ((char *) core + CORE_COMMONSZ, size, abfd) == size;
 }
 
 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;
 
 {
   asection *asect;
 

-  asect = bfd_make_section_anyway (abfd, name);
+  asect = bfd_make_section_anyway_with_flags (abfd, name, flags);

   if (!asect)
     return NULL;
 
   if (!asect)
     return NULL;
 

-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
+  asect->size = size;

   asect->vma = vma;
   asect->filepos = filepos;
   asect->alignment_power = 8;
   asect->vma = vma;
   asect->filepos = filepos;
   asect->alignment_power = 8;


@@ -303,9 +332,8 @@ make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
 /* Decide if a given bfd represents a `core' file or not. There really is no
    magic number or anything like, in rs6000coff.  */
 
 /* Decide if a given bfd represents a `core' file or not. There really is no
    magic number or anything like, in rs6000coff.  */
 

-const bfd_target *
-rs6000coff_core_p (abfd)
-     bfd *abfd;
+bfd_cleanup
+rs6000coff_core_p (bfd *abfd)

 {
   CoreHdr core;
   struct stat statbuf;
 {
   CoreHdr core;
   struct stat statbuf;


@@ -327,43 +355,54 @@ rs6000coff_core_p (abfd)
       return NULL;
     }
 
       return NULL;
     }
 

+  /* This isn't the right handler for 64-bit core files on AIX 5.x.  */
+  if (CORE_NEW (core) && CNEW_IS_CORE_DUMPXX (core))
+    {
+      bfd_set_error (bfd_error_wrong_format);
+      return NULL;
+    }
+

   /* Copy fields from new or old core structure.  */
   if (CORE_NEW (core))
     {
   /* Copy fields from new or old core structure.  */
   if (CORE_NEW (core))
     {

-      c_flag = core.new.c_flag;
-      c_stack = (file_ptr) core.new.c_stack;
-      c_size = core.new.c_size;
-      c_stackend = CNEW_STACKORG (core.new) + c_size;
-      c_lsize = CNEW_LSIZE (core.new);
-      c_loader = CNEW_LOADER (core.new);
-      proc64 = CNEW_PROC64 (core.new);
+      c_flag = core.new_dump.c_flag;
+      c_stack = (file_ptr) core.new_dump.c_stack;
+      c_size = core.new_dump.c_size;
+      c_stackend = CNEW_STACKORG (core.new_dump) + c_size;
+      c_lsize = CNEW_LSIZE (core.new_dump);
+      c_loader = CNEW_LOADER (core.new_dump);
+#ifndef BFD64
+      proc64 = CNEW_PROC64 (core.new_dump);

     }
   else
     {
       c_flag = core.old.c_flag;
     }
   else
     {
       c_flag = core.old.c_flag;

-      c_stack = (file_ptr) core.old.c_stack;
+      c_stack = (file_ptr) (ptr_to_uint) core.old.c_stack;

       c_size = core.old.c_size;
       c_stackend = COLD_STACKEND;
       c_lsize = 0x7ffffff;
       c_size = core.old.c_size;
       c_stackend = COLD_STACKEND;
       c_lsize = 0x7ffffff;

-      c_loader = (file_ptr) COLD_LOADER (core.old);
+      c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);
+#endif

       proc64 = 0;
     }
 
   if (proc64)
     {
       proc64 = 0;
     }
 
   if (proc64)
     {

-      c_regsize = sizeof (CNEW_CONTEXT64 (core.new));
-      c_regptr = &CNEW_CONTEXT64 (core.new);
+      c_regsize = sizeof (CNEW_CONTEXT64 (core.new_dump));
+      c_regptr = &CNEW_CONTEXT64 (core.new_dump);

     }
   else if (CORE_NEW (core))
     {
     }
   else if (CORE_NEW (core))
     {

-      c_regsize = sizeof (CNEW_MSTSAVE (core.new));
-      c_regptr = &CNEW_MSTSAVE (core.new);
+      c_regsize = sizeof (CNEW_MSTSAVE (core.new_dump));
+      c_regptr = &CNEW_MSTSAVE (core.new_dump);

     }
     }

+#ifndef BFD64

   else
     {
       c_regsize = sizeof (COLD_MSTSAVE (core.old));
       c_regptr = &COLD_MSTSAVE (core.old);
     }
   else
     {
       c_regsize = sizeof (COLD_MSTSAVE (core.old));
       c_regptr = &COLD_MSTSAVE (core.old);
     }

+#endif

   c_regoff = (char *) c_regptr - (char *) &core;
 
   if (bfd_stat (abfd, &statbuf) < 0)
   c_regoff = (char *) c_regptr - (char *) &core;
 
   if (bfd_stat (abfd, &statbuf) < 0)


@@ -413,9 +452,15 @@ rs6000coff_core_p (abfd)
     }
 
   /* Sanity check on the c_tab field.  */
     }
 
   /* Sanity check on the c_tab field.  */

-  if (!CORE_NEW (core) && (c_loader < (file_ptr) sizeof core.old ||
-                          c_loader >= statbuf.st_size ||
-                          c_loader >= c_stack))
+  if (!CORE_NEW (core)
+      && (
+#ifndef BFD64
+         c_loader < (file_ptr) sizeof core.old
+#else
+         c_loader < (file_ptr) sizeof core.new_dump
+#endif
+         || c_loader >= statbuf.st_size
+         || c_loader >= c_stack))

     {
       bfd_set_error (bfd_error_wrong_format);
       return NULL;
     {
       bfd_set_error (bfd_error_wrong_format);
       return NULL;


@@ -423,11 +468,14 @@ rs6000coff_core_p (abfd)
 
   /* Issue warning if the core file was truncated during writing.  */
   if (c_flag & CORE_TRUNC)
 
   /* Issue warning if the core file was truncated during writing.  */
   if (c_flag & CORE_TRUNC)

-    (*_bfd_error_handler) (_("%s: warning core file truncated"),
-                          bfd_get_filename (abfd));
+    _bfd_error_handler (_("%pB: warning core file truncated"), abfd);

 
   /* Allocate core file header.  */
 
   /* Allocate core file header.  */

-  size = CORE_NEW (core) ? sizeof (core.new) : sizeof (core.old);
+#ifndef BFD64
+  size = CORE_NEW (core) ? sizeof (core.new_dump) : sizeof (core.old);
+#else
+  size =  sizeof (core.new_dump);
+#endif

   tmpptr = (char *) bfd_zalloc (abfd, (bfd_size_type) size);
   if (!tmpptr)
     return NULL;
   tmpptr = (char *) bfd_zalloc (abfd, (bfd_size_type) size);
   if (!tmpptr)
     return NULL;


@@ -442,7 +490,7 @@ rs6000coff_core_p (abfd)
       enum bfd_architecture arch;
       unsigned long mach;
 
       enum bfd_architecture arch;
       unsigned long mach;
 

-      switch (CNEW_IMPL (core.new))
+      switch (CNEW_IMPL (core.new_dump))

        {
        case POWER_RS1:
        case POWER_RSC:
        {
        case POWER_RS1:
        case POWER_RSC:


@@ -508,6 +556,7 @@ rs6000coff_core_p (abfd)
     file_ptr ldi_core;
     uint ldi_next;
     bfd_vma ldi_dataorg;
     file_ptr ldi_core;
     uint ldi_next;
     bfd_vma ldi_dataorg;

+    bfd_vma core_dataorg;

 
     /* Fields from new and old core structures.  */
     bfd_size_type c_datasize, c_vmregions;
 
     /* Fields from new and old core structures.  */
     bfd_size_type c_datasize, c_vmregions;


@@ -515,35 +564,45 @@ rs6000coff_core_p (abfd)
 
     if (CORE_NEW (core))
       {
 
     if (CORE_NEW (core))
       {

-       c_datasize = CNEW_DATASIZE (core.new);
-       c_data = (file_ptr) core.new.c_data;
-       c_vmregions = core.new.c_vmregions;
-       c_vmm = (file_ptr) core.new.c_vmm;
+       c_datasize = CNEW_DATASIZE (core.new_dump);
+       c_data = (file_ptr) core.new_dump.c_data;
+       c_vmregions = core.new_dump.c_vmregions;
+       c_vmm = (file_ptr) core.new_dump.c_vmm;

       }
       }

+#ifndef BFD64

     else
       {
        c_datasize = core.old.c_datasize;
     else
       {
        c_datasize = core.old.c_datasize;

-       c_data = (file_ptr) core.old.c_data;
+       c_data = (file_ptr) (ptr_to_uint) core.old.c_data;

        c_vmregions = core.old.c_vmregions;
        c_vmregions = core.old.c_vmregions;

-       c_vmm = (file_ptr) core.old.c_vmm;
+       c_vmm = (file_ptr) (ptr_to_uint) core.old.c_vmm;

       }
       }

+#endif

 
     /* .data section from executable.  */
     if (c_datasize)
       {
 
     /* .data section from executable.  */
     if (c_datasize)
       {

+       /* If Large Memory Model is used, then the .data segment should start from
+          BDATAORG which has been defined in the system header files. */
+
+       if (c_flag & CORE_BIGDATA)
+         core_dataorg = BDATAORG;
+       else
+         core_dataorg = CDATA_ADDR (c_datasize);
+

        if (!make_bfd_asection (abfd, ".data",
                                SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                c_datasize,
        if (!make_bfd_asection (abfd, ".data",
                                SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                c_datasize,

-                               (bfd_vma) CDATA_ADDR (c_datasize),
+                               (bfd_vma) core_dataorg,

                                c_data))
          goto fail;
       }
 
     /* .data sections from loaded objects.  */
     if (proc64)
                                c_data))
          goto fail;
       }
 
     /* .data sections from loaded objects.  */
     if (proc64)

-      size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
+      size = (unsigned long) ((LdInfo *) 0)->l64.ldinfo_filename;

     else
     else

-      size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
+      size = (unsigned long) ((LdInfo *) 0)->l32.ldinfo_filename;

 
     while (1)
       {
 
     while (1)
       {


@@ -563,7 +622,7 @@ rs6000coff_core_p (abfd)
          {
            ldi_core = ldinfo.l32.ldinfo_core;
            ldi_datasize = ldinfo.l32.ldinfo_datasize;
          {
            ldi_core = ldinfo.l32.ldinfo_core;
            ldi_datasize = ldinfo.l32.ldinfo_datasize;

-           ldi_dataorg = (bfd_vma) (long) ldinfo.l32.ldinfo_dataorg;
+           ldi_dataorg = (bfd_vma) (ptr_to_uint) ldinfo.l32.ldinfo_dataorg;

            ldi_next = ldinfo.l32.ldinfo_next;
          }
 
            ldi_next = ldinfo.l32.ldinfo_next;
          }
 


@@ -593,22 +652,28 @@ rs6000coff_core_p (abfd)
            file_ptr vminfo_offset;
            bfd_vma vminfo_addr;
 
            file_ptr vminfo_offset;
            bfd_vma vminfo_addr;
 

-           size = CORE_NEW (core) ? sizeof (vminfo.new) : sizeof (vminfo.old);
+#ifndef BFD64
+           size = CORE_NEW (core) ? sizeof (vminfo.new_dump) : sizeof (vminfo.old);
+#else
+           size = sizeof (vminfo.new_dump);
+#endif

            if (bfd_bread (&vminfo, size, abfd) != size)
              goto fail;
 
            if (CORE_NEW (core))
              {
            if (bfd_bread (&vminfo, size, abfd) != size)
              goto fail;
 
            if (CORE_NEW (core))
              {

-               vminfo_addr = (bfd_vma) vminfo.new.vminfo_addr;
-               vminfo_size = vminfo.new.vminfo_size;
-               vminfo_offset = vminfo.new.vminfo_offset;
+               vminfo_addr = (bfd_vma) vminfo.new_dump.vminfo_addr;
+               vminfo_size = vminfo.new_dump.vminfo_size;
+               vminfo_offset = vminfo.new_dump.vminfo_offset;

              }
              }

+#ifndef BFD64

            else
              {
            else
              {

-               vminfo_addr = (bfd_vma) (long) vminfo.old.vminfo_addr;
+               vminfo_addr = (bfd_vma) (ptr_to_uint) vminfo.old.vminfo_addr;

                vminfo_size = vminfo.old.vminfo_size;
                vminfo_offset = vminfo.old.vminfo_offset;
              }
                vminfo_size = vminfo.old.vminfo_size;
                vminfo_offset = vminfo.old.vminfo_offset;
              }

+#endif

 
            if (vminfo_offset)
              if (!make_bfd_asection (abfd, ".vmdata",
 
            if (vminfo_offset)
              if (!make_bfd_asection (abfd, ".vmdata",


@@ -621,7 +686,7 @@ rs6000coff_core_p (abfd)
   }
 #endif
 
   }
 #endif
 

-  return abfd->xvec;           /* This is garbage for now.  */
+  return _bfd_no_cleanup;

 
  fail:
   bfd_release (abfd, abfd->tdata.any);
 
  fail:
   bfd_release (abfd, abfd->tdata.any);


@@ -630,41 +695,41 @@ rs6000coff_core_p (abfd)
   return NULL;
 }
 
   return NULL;
 }
 

-/* Return `true' if given core is from the given executable.  */
+/* Return `TRUE' if given core is from the given executable.  */

 
 

-boolean
-rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
+bfd_boolean
+rs6000coff_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd)

 {
   CoreHdr core;
   bfd_size_type size;
   char *path, *s;
   size_t alloc;
   const char *str1, *str2;
 {
   CoreHdr core;
   bfd_size_type size;
   char *path, *s;
   size_t alloc;
   const char *str1, *str2;

-  boolean ret;
+  bfd_boolean ret;

   file_ptr c_loader;
 
   if (!read_hdr (core_bfd, &core))
   file_ptr c_loader;
 
   if (!read_hdr (core_bfd, &core))

-    return false;
+    return FALSE;

 
   if (CORE_NEW (core))
 
   if (CORE_NEW (core))

-    c_loader = CNEW_LOADER (core.new);
+    c_loader = CNEW_LOADER (core.new_dump);
+#ifndef BFD64

   else
   else

-    c_loader = (file_ptr) COLD_LOADER (core.old);
+    c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);
+#endif

 
 

-  if (CORE_NEW (core) && CNEW_PROC64 (core.new))
+  if (CORE_NEW (core) && CNEW_PROC64 (core.new_dump))

     size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
   else
     size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
 
   if (bfd_seek (core_bfd, c_loader + size, SEEK_SET) != 0)
     size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
   else
     size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
 
   if (bfd_seek (core_bfd, c_loader + size, SEEK_SET) != 0)

-    return false;
+    return FALSE;

 
   alloc = 100;
   path = bfd_malloc ((bfd_size_type) alloc);
   if (path == NULL)
 
   alloc = 100;
   path = bfd_malloc ((bfd_size_type) alloc);
   if (path == NULL)

-    return false;
+    return FALSE;

   s = path;
 
   while (1)
   s = path;
 
   while (1)


@@ -672,7 +737,7 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
       if (bfd_bread (s, (bfd_size_type) 1, core_bfd) != 1)
        {
          free (path);
       if (bfd_bread (s, (bfd_size_type) 1, core_bfd) != 1)
        {
          free (path);

-         return false;
+         return FALSE;

        }
       if (*s == '\0')
        break;
        }
       if (*s == '\0')
        break;


@@ -686,7 +751,7 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
          if (n == NULL)
            {
              free (path);
          if (n == NULL)
            {
              free (path);

-             return false;
+             return FALSE;

            }
          s = n + (path - s);
          path = n;
            }
          s = n + (path - s);
          path = n;


@@ -694,16 +759,16 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
     }
 
   str1 = strrchr (path, '/');
     }
 
   str1 = strrchr (path, '/');

-  str2 = strrchr (exec_bfd->filename, '/');
+  str2 = strrchr (bfd_get_filename (exec_bfd), '/');

 
   /* step over character '/' */
   str1 = str1 != NULL ? str1 + 1 : path;
 
   /* step over character '/' */
   str1 = str1 != NULL ? str1 + 1 : path;

-  str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
+  str2 = str2 != NULL ? str2 + 1 : bfd_get_filename (exec_bfd);

 
   if (strcmp (str1, str2) == 0)
 
   if (strcmp (str1, str2) == 0)

-    ret = true;
+    ret = TRUE;

   else
   else

-    ret = false;
+    ret = FALSE;

 
   free (path);
 
 
   free (path);
 


@@ -711,12 +776,15 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
 }
 
 char *
 }
 
 char *

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

 {
   CoreHdr *core = core_hdr (abfd);
 {
   CoreHdr *core = core_hdr (abfd);

+#ifndef BFD64

   char *com = CORE_NEW (*core) ?
   char *com = CORE_NEW (*core) ?

-    CNEW_COMM (core->new) : COLD_COMM (core->old);
+    CNEW_COMM (core->new_dump) : COLD_COMM (core->old);
+#else
+  char *com = CNEW_COMM (core->new_dump);
+#endif

 
   if (*com)
     return com;
 
   if (*com)
     return com;


@@ -725,11 +793,14 @@ rs6000coff_core_file_failing_command (abfd)
 }
 
 int
 }
 
 int

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

 {
   CoreHdr *core = core_hdr (abfd);
 {
   CoreHdr *core = core_hdr (abfd);

-  return CORE_NEW (*core) ? core->new.c_signo : core->old.c_signo;
+#ifndef BFD64
+  return CORE_NEW (*core) ? core->new_dump.c_signo : core->old.c_signo;
+#else
+  return  core->new_dump.c_signo;
+#endif

 }
 
 #endif /* AIX_CORE */
 }
 
 #endif /* AIX_CORE */