/* IBM RS/6000 "XCOFF" back-end for BFD.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
- 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
- Free Software Foundation, Inc.
+ Copyright (C) 1990-2017 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.
#undef SCNHDR
-/* ------------------------------------------------------------------------ */
-/* Support for core file stuff.. */
-/* ------------------------------------------------------------------------ */
+/* Support for core file stuff. */
#include <sys/user.h>
#define __LDINFO_PTRACE32__ /* for __ld_info32 */
/* 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
/* Union of old and new core dump structures. */
-typedef union {
+typedef union
+{
#ifdef AIX_CORE_DUMPX_CORE
- struct core_dumpx new_dump; /* new AIX 4.3+ core dump */
+ struct core_dumpx new_dump; /* New AIX 4.3+ core dump. */
#else
- struct core_dump new_dump; /* 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
- 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
-typedef union {
+typedef union
+{
#ifdef AIX_CORE_DUMPX_CORE
struct vm_infox new_dump;
#else
struct vm_info new_dump;
#endif
+#ifndef BFD64
struct vm_info old;
+#endif
} 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) (!(c).new_dump.c_entries)
+# endif
#else
# define CORE_NEW(c) 0
#endif
/* 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. */
/* Read the trailing portion of the structure. */
if (CORE_NEW (*core))
size = sizeof (core->new_dump);
+#ifndef BFD64
else
size = sizeof (core->old);
+#endif
size -= CORE_COMMONSZ;
return bfd_bread ((char *) core + CORE_COMMONSZ, size, abfd) == 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_stackend = COLD_STACKEND;
c_lsize = 0x7ffffff;
c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);
+#endif
proc64 = 0;
}
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);
}
+#endif
c_regoff = (char *) c_regptr - (char *) &core;
if (bfd_stat (abfd, &statbuf) < 0)
}
/* 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;
/* 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 (_("%s: warning core file truncated"),
+ bfd_get_filename (abfd));
/* Allocate core file header. */
+#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;
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;
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;
c_vmregions = core.old.c_vmregions;
c_vmm = (file_ptr) (ptr_to_uint) core.old.c_vmm;
}
+#endif
/* .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,
- (bfd_vma) CDATA_ADDR (c_datasize),
+ (bfd_vma) core_dataorg,
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
- size = (int) ((LdInfo *) 0)->l32.ldinfo_filename;
+ size = (unsigned long) ((LdInfo *) 0)->l32.ldinfo_filename;
while (1)
{
{
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;
}
file_ptr vminfo_offset;
bfd_vma vminfo_addr;
+#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;
vminfo_size = vminfo.new_dump.vminfo_size;
vminfo_offset = vminfo.new_dump.vminfo_offset;
}
+#ifndef BFD64
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;
}
+#endif
if (vminfo_offset)
if (!make_bfd_asection (abfd, ".vmdata",
if (CORE_NEW (core))
c_loader = CNEW_LOADER (core.new_dump);
+#ifndef BFD64
else
c_loader = (file_ptr) (ptr_to_uint) COLD_LOADER (core.old);
+#endif
if (CORE_NEW (core) && CNEW_PROC64 (core.new_dump))
size = (int) ((LdInfo *) 0)->l64.ldinfo_filename;
rs6000coff_core_file_failing_command (bfd *abfd)
{
CoreHdr *core = core_hdr (abfd);
+#ifndef BFD64
char *com = CORE_NEW (*core) ?
CNEW_COMM (core->new_dump) : COLD_COMM (core->old);
+#else
+ char *com = CNEW_COMM (core->new_dump);
+#endif
if (*com)
return com;
rs6000coff_core_file_failing_signal (bfd *abfd)
{
CoreHdr *core = core_hdr (abfd);
+#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 */