MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* elfcode.h (struct bfd_preserve): New.

Browse Source 
(elf_object_p): Replace preserved_* vars with instance of above.
	Save and restore arch_info pointer rather than arch, mach so that
	more cases can be restored.  Save and restore new section_tail,
	section_htab structure, and init appropriately.  Move "rest of
	section header" code so that i_shdrp needs no NULL initialisation.
	Free old section_htab on success.
	* elfcore.h (elf_core_file_p): Likewise.
This commit is contained in:
Alan Modra 2001-12-18 07:12:19 +00:00
parent ff4d2c954c
commit ed59115573
3 changed files with 103 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bfd/ChangeLog
View File

@ -1,3 +1,14 @@
2001-12-18 Alan Modra <amodra@bigpond.net.au>
* elfcode.h (struct bfd_preserve): New.
(elf_object_p): Replace preserved_* vars with instance of above.
Save and restore arch_info pointer rather than arch, mach so that
more cases can be restored. Save and restore new section_tail,
section_htab structure, and init appropriately. Move "rest of
section header" code so that i_shdrp needs no NULL initialisation.
Free old section_htab on success.
* elfcore.h (elf_core_file_p): Likewise.
2001-12-17 Tom Rix <trix@redhat.com> 2001-12-17 Tom Rix <trix@redhat.com>
* coffcode.h (sec_to_styp_flags): Add STYP_EXCEPT and STYP_TYPCHK for * coffcode.h (sec_to_styp_flags): Add STYP_EXCEPT and STYP_TYPCHK for

64
bfd/elfcode.h
View File

@ -503,6 +503,16 @@ elf_file_p (x_ehdrp)
&& (x_ehdrp->e_ident[EI_MAG3] == ELFMAG3)); && (x_ehdrp->e_ident[EI_MAG3] == ELFMAG3));
} }
struct bfd_preserve
{
const struct bfd_arch_info *arch_info;
struct elf_obj_tdata *tdata;
struct bfd_hash_table section_htab;
struct sec *sections;
struct sec **section_tail;
unsigned int section_count;
};
/* Check to see if the file associated with ABFD matches the target vector /* Check to see if the file associated with ABFD matches the target vector
that ABFD points to. that ABFD points to.
@ -519,23 +529,16 @@ elf_object_p (abfd)
Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */ Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
Elf_External_Shdr x_shdr; /* Section header table entry, external form */ Elf_External_Shdr x_shdr; /* Section header table entry, external form */
Elf_Internal_Shdr i_shdr; Elf_Internal_Shdr i_shdr;
Elf_Internal_Shdr *i_shdrp = NULL; /* Section header table, internal form */ Elf_Internal_Shdr *i_shdrp; /* Section header table, internal form */
unsigned int shindex; unsigned int shindex;
char *shstrtab; /* Internal copy of section header stringtab */ char *shstrtab; /* Internal copy of section header stringtab */
struct elf_backend_data *ebd; struct elf_backend_data *ebd;
struct elf_obj_tdata *preserved_tdata = elf_tdata (abfd); struct bfd_preserve preserve;
struct sec *preserved_sections = abfd->sections;
unsigned int preserved_section_count = abfd->section_count;
enum bfd_architecture previous_arch = bfd_get_arch (abfd);
unsigned long previous_mach = bfd_get_mach (abfd);
struct elf_obj_tdata *new_tdata = NULL; struct elf_obj_tdata *new_tdata = NULL;
asection *s; asection *s;
bfd_size_type amt; bfd_size_type amt;
/* Clear section information, since there might be a recognized bfd that preserve.arch_info = abfd->arch_info;
we now check if we can replace, and we don't want to append to it. */
abfd->sections = NULL;
abfd->section_count = 0;
/* Read in the ELF header in external format. */ /* Read in the ELF header in external format. */
@ -582,8 +585,21 @@ elf_object_p (abfd)
new_tdata = (struct elf_obj_tdata *) bfd_zalloc (abfd, amt); new_tdata = (struct elf_obj_tdata *) bfd_zalloc (abfd, amt);
if (new_tdata == NULL) if (new_tdata == NULL)
goto got_no_match; goto got_no_match;
preserve.tdata = elf_tdata (abfd);
elf_tdata (abfd) = new_tdata; elf_tdata (abfd) = new_tdata;
/* Clear section information, since there might be a recognized bfd that
we now check if we can replace, and we don't want to append to it. */
preserve.sections = abfd->sections;
preserve.section_tail = abfd->section_tail;
preserve.section_count = abfd->section_count;
preserve.section_htab = abfd->section_htab;
abfd->sections = NULL;
abfd->section_tail = &abfd->sections;
abfd->section_count = 0;
if (!bfd_hash_table_init (&abfd->section_htab, bfd_section_hash_newfunc))
goto got_no_match;
/* Now that we know the byte order, swap in the rest of the header */ /* Now that we know the byte order, swap in the rest of the header */
i_ehdrp = elf_elfheader (abfd); i_ehdrp = elf_elfheader (abfd);
elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp); elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
@ -711,10 +727,9 @@ elf_object_p (abfd)
} }
for ( ; shindex < num_sec; shindex++) for ( ; shindex < num_sec; shindex++)
elf_elfsections (abfd)[shindex] = shdrp++; elf_elfsections (abfd)[shindex] = shdrp++;
}
/* Read in the rest of the section header table and convert it to /* Read in the rest of the section header table and convert it
internal form. */ to internal form. */
for (shindex = 1; shindex < i_ehdrp->e_shnum; shindex++) for (shindex = 1; shindex < i_ehdrp->e_shnum; shindex++)
{ {
if (bfd_bread ((PTR) & x_shdr, (bfd_size_type) sizeof x_shdr, abfd) if (bfd_bread ((PTR) & x_shdr, (bfd_size_type) sizeof x_shdr, abfd)
@ -732,6 +747,8 @@ elf_object_p (abfd)
!= 0)) != 0))
abfd->flags &= ~D_PAGED; abfd->flags &= ~D_PAGED;
} }
}
if (i_ehdrp->e_shstrndx) if (i_ehdrp->e_shstrndx)
{ {
if (! bfd_section_from_shdr (abfd, i_ehdrp->e_shstrndx)) if (! bfd_section_from_shdr (abfd, i_ehdrp->e_shstrndx))
@ -818,6 +835,10 @@ elf_object_p (abfd)
} }
} }
/* It would be nice to be able to free more memory here, eg. old
elf_elfsections, old tdata, but that's not possible since these
blocks are sitting inside obj_alloc'd memory. */
bfd_hash_table_free (&preserve.section_htab);
return (abfd->xvec); return (abfd->xvec);
got_wrong_format_error: got_wrong_format_error:
@ -830,15 +851,22 @@ elf_object_p (abfd)
target-specific elf_backend_object_p function. Note that saving 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 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. */ you notice is that the cached bfd file position gets out of sync. */
bfd_default_set_arch_mach (abfd, previous_arch, previous_mach);
bfd_set_error (bfd_error_wrong_format); bfd_set_error (bfd_error_wrong_format);
got_no_match: got_no_match:
abfd->arch_info = preserve.arch_info;
if (new_tdata != NULL) if (new_tdata != NULL)
{
/* bfd_release frees all memory more recently bfd_alloc'd than
its arg, as well as its arg. */
bfd_release (abfd, new_tdata); bfd_release (abfd, new_tdata);
elf_tdata (abfd) = preserved_tdata; elf_tdata (abfd) = preserve.tdata;
abfd->sections = preserved_sections; abfd->section_htab = preserve.section_htab;
abfd->section_count = preserved_section_count; abfd->sections = preserve.sections;
return (NULL); abfd->section_tail = preserve.section_tail;
abfd->section_count = preserve.section_count;
}
return NULL;
} }
/* ELF .o/exec file writing */ /* ELF .o/exec file writing */

44
bfd/elfcore.h
View File

@ -81,21 +81,14 @@ elf_core_file_p (abfd)
{ {
Elf_External_Ehdr x_ehdr; /* Elf file header, external form */ Elf_External_Ehdr x_ehdr; /* Elf file header, external form */
Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */ Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */
Elf_Internal_Phdr *i_phdrp = NULL; /* Elf program header, internal form */ Elf_Internal_Phdr *i_phdrp; /* Elf program header, internal form */
unsigned int phindex; unsigned int phindex;
struct elf_backend_data *ebd; struct elf_backend_data *ebd;
struct elf_obj_tdata *preserved_tdata = elf_tdata (abfd); struct bfd_preserve preserve;
struct sec *preserved_sections = abfd->sections;
unsigned int preserved_section_count = abfd->section_count;
enum bfd_architecture previous_arch = bfd_get_arch (abfd);
unsigned long previous_mach = bfd_get_mach (abfd);
struct elf_obj_tdata *new_tdata = NULL; struct elf_obj_tdata *new_tdata = NULL;
bfd_size_type amt; bfd_size_type amt;
/* Clear section information, since there might be a recognized bfd that preserve.arch_info = abfd->arch_info;
we now check if we can replace, and we don't want to append to it. */
abfd->sections = NULL;
abfd->section_count = 0;
/* Read in the ELF header in external format. */ /* Read in the ELF header in external format. */
if (bfd_bread ((PTR) &x_ehdr, (bfd_size_type) sizeof (x_ehdr), abfd) if (bfd_bread ((PTR) &x_ehdr, (bfd_size_type) sizeof (x_ehdr), abfd)
@ -136,8 +129,21 @@ elf_core_file_p (abfd)
new_tdata = (struct elf_obj_tdata *) bfd_zalloc (abfd, amt); new_tdata = (struct elf_obj_tdata *) bfd_zalloc (abfd, amt);
if (new_tdata == NULL) if (new_tdata == NULL)
return NULL; return NULL;
preserve.tdata = elf_tdata (abfd);
elf_tdata (abfd) = new_tdata; elf_tdata (abfd) = new_tdata;
/* Clear section information, since there might be a recognized bfd that
we now check if we can replace, and we don't want to append to it. */
preserve.sections = abfd->sections;
preserve.section_tail = abfd->section_tail;
preserve.section_count = abfd->section_count;
preserve.section_htab = abfd->section_htab;
abfd->sections = NULL;
abfd->section_tail = &abfd->sections;
abfd->section_count = 0;
if (!bfd_hash_table_init (&abfd->section_htab, bfd_section_hash_newfunc))
goto fail;
/* Swap in the rest of the header, now that we have the byte order. */ /* Swap in the rest of the header, now that we have the byte order. */
i_ehdrp = elf_elfheader (abfd); i_ehdrp = elf_elfheader (abfd);
elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp); elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
@ -240,6 +246,7 @@ elf_core_file_p (abfd)
goto wrong; goto wrong;
} }
bfd_hash_table_free (&preserve.section_htab);
return abfd->xvec; return abfd->xvec;
wrong: wrong:
@ -252,15 +259,20 @@ wrong:
target-specific elf_backend_object_p function. Note that saving 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 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. */ you notice is that the cached bfd file position gets out of sync. */
bfd_default_set_arch_mach (abfd, previous_arch, previous_mach);
bfd_set_error (bfd_error_wrong_format); bfd_set_error (bfd_error_wrong_format);
fail: fail:
if (i_phdrp != NULL) abfd->arch_info = preserve.arch_info;
bfd_release (abfd, i_phdrp);
if (new_tdata != NULL) if (new_tdata != NULL)
{
/* bfd_release frees all memory more recently bfd_alloc'd than
its arg, as well as its arg. */
bfd_release (abfd, new_tdata); bfd_release (abfd, new_tdata);
elf_tdata (abfd) = preserved_tdata; elf_tdata (abfd) = preserve.tdata;
abfd->sections = preserved_sections; abfd->section_htab = preserve.section_htab;
abfd->section_count = preserved_section_count; abfd->sections = preserve.sections;
abfd->section_tail = preserve.section_tail;
abfd->section_count = preserve.section_count;
}
return NULL; return NULL;
} }