X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felfcore.h;h=724d607d3a6773bd5d95e992e597617e439e0599;hb=6913c89ac7bc62da99c5bb292de820098a2bacd2;hp=ef71762e113e98d5ab763323e9c953a485a468e4;hpb=7898dedac0f0bd75d7363d13427c4a1e72b66f66;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elfcore.h b/bfd/elfcore.h index ef71762e11..724d607d3a 100644 --- a/bfd/elfcore.h +++ b/bfd/elfcore.h @@ -1,22 +1,22 @@ /* ELF core file support for BFD. - Copyright 1995, 1996, 1997, 1998, 2000, 2001 + Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -This file is part of BFD, the Binary File Descriptor library. + 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 -(at your option) any later version. + 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 + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -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. */ + 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. */ char* elf_core_file_failing_command (abfd) @@ -32,7 +32,7 @@ elf_core_file_failing_signal (abfd) return elf_tdata (abfd)->core_signal; } -boolean +bfd_boolean elf_core_file_matches_executable_p (core_bfd, exec_bfd) bfd *core_bfd; bfd *exec_bfd; @@ -44,22 +44,22 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd) if (core_bfd->xvec != exec_bfd->xvec) { bfd_set_error (bfd_error_system_call); - return false; + return FALSE; } /* See if the name in the corefile matches the executable name. */ - corename = elf_tdata (core_bfd)->core_program; if (corename != NULL) { const char* execname = strrchr (exec_bfd->filename, '/'); + execname = execname ? execname + 1 : exec_bfd->filename; if (strcmp(execname, corename) != 0) - return false; + return FALSE; } - return true; + return TRUE; } /* Core files are simply standard ELF formatted files that partition @@ -71,35 +71,37 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd) register set) and the floating point register set are stored in a segment of type PT_NOTE. We handcraft a couple of extra bfd sections that allow standard bfd access to the general registers (.reg) and the - floating point registers (.reg2). - - */ + floating point registers (.reg2). */ const bfd_target * elf_core_file_p (abfd) bfd *abfd; { - Elf_External_Ehdr x_ehdr; /* Elf file header, external form */ - Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */ - Elf_Internal_Phdr *i_phdrp = NULL; /* Elf program header, internal form */ + Elf_External_Ehdr x_ehdr; /* Elf file header, external form. */ + Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form. */ + Elf_Internal_Phdr *i_phdrp; /* Elf program header, internal form. */ unsigned int phindex; struct elf_backend_data *ebd; - struct elf_obj_tdata *preserved_tdata = elf_tdata (abfd); - struct elf_obj_tdata *new_tdata = NULL; + struct bfd_preserve preserve; + bfd_size_type amt; + + preserve.marker = NULL; /* Read in the ELF header in external format. */ - if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr)) + if (bfd_bread ((PTR) &x_ehdr, (bfd_size_type) sizeof (x_ehdr), abfd) + != sizeof (x_ehdr)) { if (bfd_get_error () != bfd_error_system_call) - bfd_set_error (bfd_error_wrong_format); - return NULL; + goto wrong; + else + goto fail; } /* Check the magic number. */ - if (elf_file_p (&x_ehdr) == false) + if (! elf_file_p (&x_ehdr)) goto wrong; - /* FIXME: Check EI_VERSION here ! */ + /* FIXME: Check EI_VERSION here ! */ /* Check the address size ("class"). */ if (x_ehdr.e_ident[EI_CLASS] != ELFCLASS) @@ -108,11 +110,11 @@ elf_core_file_p (abfd) /* Check the byteorder. */ switch (x_ehdr.e_ident[EI_DATA]) { - case ELFDATA2MSB: /* Big-endian */ + case ELFDATA2MSB: /* Big-endian. */ if (! bfd_big_endian (abfd)) goto wrong; break; - case ELFDATA2LSB: /* Little-endian */ + case ELFDATA2LSB: /* Little-endian. */ if (! bfd_little_endian (abfd)) goto wrong; break; @@ -121,11 +123,14 @@ elf_core_file_p (abfd) } /* Give abfd an elf_obj_tdata. */ - new_tdata = - (struct elf_obj_tdata *) bfd_zalloc (abfd, sizeof (struct elf_obj_tdata)); - if (new_tdata == NULL) - return NULL; - elf_tdata (abfd) = new_tdata; + amt = sizeof (struct elf_obj_tdata); + preserve.marker = bfd_zalloc (abfd, amt); + if (preserve.marker == NULL) + goto fail; + if (!bfd_preserve_save (abfd, &preserve)) + goto fail; + + elf_tdata (abfd) = preserve.marker; /* Swap in the rest of the header, now that we have the byte order. */ i_ehdrp = elf_elfheader (abfd); @@ -161,7 +166,11 @@ elf_core_file_p (abfd) if ((*target_ptr)->flavour != bfd_target_elf_flavour) continue; back = (struct elf_backend_data *) (*target_ptr)->backend_data; - if (back->elf_machine_code == i_ehdrp->e_machine) + if (back->elf_machine_code == i_ehdrp->e_machine + || (back->elf_machine_alt1 != 0 + && i_ehdrp->e_machine == back->elf_machine_alt1) + || (back->elf_machine_alt2 != 0 + && i_ehdrp->e_machine == back->elf_machine_alt2)) { /* target_ptr is an ELF backend which matches this object file, so reject the generic ELF target. */ @@ -181,12 +190,12 @@ elf_core_file_p (abfd) goto wrong; /* Move to the start of the program headers. */ - if (bfd_seek (abfd, i_ehdrp->e_phoff, SEEK_SET) != 0) + if (bfd_seek (abfd, (file_ptr) i_ehdrp->e_phoff, SEEK_SET) != 0) goto wrong; /* Allocate space for the program headers. */ - i_phdrp = (Elf_Internal_Phdr *) - bfd_alloc (abfd, sizeof (*i_phdrp) * i_ehdrp->e_phnum); + amt = sizeof (*i_phdrp) * i_ehdrp->e_phnum; + i_phdrp = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt); if (!i_phdrp) goto fail; @@ -196,21 +205,17 @@ elf_core_file_p (abfd) for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex) { Elf_External_Phdr x_phdr; - if (bfd_read ((PTR) &x_phdr, sizeof (x_phdr), 1, abfd) + + if (bfd_bread ((PTR) &x_phdr, (bfd_size_type) sizeof (x_phdr), abfd) != sizeof (x_phdr)) goto fail; elf_swap_phdr_in (abfd, &x_phdr, i_phdrp + phindex); } - /* Process each program header. */ - for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex) - { - if (!_bfd_elfcore_section_from_phdr (abfd, i_phdrp + phindex, phindex)) - goto fail; - } - - /* Set the machine architecture. */ + /* Set the machine architecture. Do this before processing the + program headers since we need to know the architecture type + when processing the notes of some systems' core files. */ if (! bfd_default_set_arch_mach (abfd, ebd->arch, 0)) { /* It's OK if this fails for the generic target. */ @@ -218,26 +223,37 @@ elf_core_file_p (abfd) goto fail; } + /* Process each program header. */ + for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex) + if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex)) + goto fail; + /* Save the entry point from the ELF header. */ bfd_get_start_address (abfd) = i_ehdrp->e_entry; /* Let the backend double check the format and override global information. */ - if (ebd->elf_backend_object_p) - { - if ((*ebd->elf_backend_object_p) (abfd) == false) - goto wrong; - } + if (ebd->elf_backend_object_p + && (! (*ebd->elf_backend_object_p) (abfd))) + goto wrong; + bfd_preserve_finish (abfd, &preserve); return abfd->xvec; wrong: + /* There is way too much undoing of half-known state here. The caller, + bfd_check_format_matches, really shouldn't iterate on live bfd's to + check match/no-match like it does. We have to rely on that a call to + bfd_default_set_arch_mach with the previously known mach, undoes what + was done by the first bfd_default_set_arch_mach (with mach 0) here. + For this to work, only elf-data and the mach may be changed by the + target-specific elf_backend_object_p function. Note that saving the + whole bfd here and restoring it would be even worse; the first thing + you notice is that the cached bfd file position gets out of sync. */ bfd_set_error (bfd_error_wrong_format); + fail: - if (i_phdrp != NULL) - bfd_release (abfd, i_phdrp); - if (new_tdata != NULL) - bfd_release (abfd, new_tdata); - elf_tdata (abfd) = preserved_tdata; + if (preserve.marker != NULL) + bfd_preserve_restore (abfd, &preserve); return NULL; }