X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Faix5ppc-core.c;h=ba8a4e0524082994bde27078a91d94ef1f406045;hb=ebe2334ee6cb065d2a86688bc9558d62320dd459;hp=89b6d8afe58afef5646bbf8863b06bd056f5166a;hpb=e729279b04301d65a619b1bad04b6aff686899b2;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/aix5ppc-core.c b/bfd/aix5ppc-core.c index 89b6d8afe5..ba8a4e0524 100644 --- a/bfd/aix5ppc-core.c +++ b/bfd/aix5ppc-core.c @@ -1,6 +1,5 @@ /* IBM RS/6000 "XCOFF" back-end for BFD. - Copyright 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 2001-2020 Free Software Foundation, Inc. Written by Tom Rix Contributed by Red Hat Inc. @@ -8,7 +7,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 - 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, @@ -21,18 +20,18 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "bfd.h" - -#ifdef AIX_5_CORE - #include "sysdep.h" -#include "libbfd.h" +#include "bfd.h" -const bfd_target *xcoff64_core_p (bfd *); +bfd_cleanup 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 + +#include "libbfd.h" + /* Aix 5.1 system include file. */ /* Need to define this macro so struct ld_info64 get included. */ @@ -40,14 +39,20 @@ int xcoff64_core_file_failing_signal (bfd *); #include #include +/* 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 * +bfd_cleanup xcoff64_core_p (bfd *abfd) { + enum bfd_architecture arch; + unsigned long mach; struct core_dumpxx core, *new_core_hdr; struct stat statbuf; asection *sec; @@ -55,7 +60,7 @@ xcoff64_core_p (bfd *abfd) bfd_vma ld_offset; bfd_size_type i; struct vm_infox vminfo; - bfd_target *return_value = NULL; + flagword flags; /* Get the header. */ if (bfd_seek (abfd, 0, SEEK_SET) != 0) @@ -103,32 +108,35 @@ xcoff64_core_p (bfd *abfd) { bfd_set_error (bfd_error_file_truncated); - return return_value; + return NULL; } new_core_hdr = bfd_zalloc (abfd, sizeof (struct core_dumpxx)); if (NULL == new_core_hdr) - return return_value; + return NULL; 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. */ - 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; + return NULL; - 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 = 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; + return NULL; - sec->flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY; sec->size = sizeof (struct __context64); sec->vma = 0; sec->filepos = 0; @@ -138,11 +146,11 @@ xcoff64_core_p (bfd *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. */ - 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; + return NULL; - sec->flags = SEC_HAS_CONTENTS; sec->size = core.c_lsize; sec->vma = 0; sec->filepos = core.c_loader; @@ -152,11 +160,11 @@ xcoff64_core_p (bfd *abfd) 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; + return NULL; - sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS; sec->size = core.c_datasize; sec->vma = core.c_dataorg; sec->filepos = core.c_data; @@ -167,19 +175,19 @@ xcoff64_core_p (bfd *abfd) while (1) { if (bfd_seek (abfd, ld_offset, SEEK_SET) != 0) - return return_value; + return NULL; if (sizeof (struct __ld_info64) != bfd_bread (&ldinfo, sizeof (struct __ld_info64), abfd)) - return return_value; + return NULL; 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; + return NULL; - sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS; sec->size = ldinfo.ldinfo_datasize; sec->vma = ldinfo.ldinfo_dataorg; sec->filepos = ldinfo.ldinfo_core; @@ -194,33 +202,38 @@ xcoff64_core_p (bfd *abfd) if (core.c_vmregions) { if (bfd_seek (abfd, core.c_vmm, SEEK_SET) != 0) - return return_value; + return NULL; for (i = 0; i < core.c_vmregions; i++) if (sizeof (struct vm_infox) != bfd_bread (&vminfo, sizeof (struct vm_infox), abfd)) - return return_value; + return NULL; 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; + return NULL; - sec->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS; sec->size = vminfo.vminfo_size; sec->vma = vminfo.vminfo_addr; sec->filepos = vminfo.vminfo_offset; } } - return_value = (bfd_target *) 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 _bfd_no_cleanup; xcoff64_core_p_error: if (bfd_get_error () != bfd_error_system_call) bfd_set_error (bfd_error_wrong_format); - return return_value; + return NULL; } /* Return `TRUE' if given core is from the given executable. */ @@ -275,11 +288,11 @@ xcoff64_core_file_matches_executable_p (bfd *core_bfd, bfd *exec_bfd) } str1 = strrchr (path, '/'); - str2 = strrchr (exec_bfd->filename, '/'); + str2 = strrchr (bfd_get_filename (exec_bfd), '/'); /* 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) return_value = TRUE; @@ -315,12 +328,7 @@ xcoff64_core_file_failing_signal (bfd *abfd) #else /* AIX_5_CORE */ -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 *); - -const bfd_target * +bfd_cleanup xcoff64_core_p (bfd *abfd ATTRIBUTE_UNUSED) { bfd_set_error (bfd_error_wrong_format); @@ -328,10 +336,9 @@ xcoff64_core_p (bfd *abfd ATTRIBUTE_UNUSED) } bfd_boolean -xcoff64_core_file_matches_executable_p (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 *