#include <ctf-impl.h>
#include <stddef.h>
+#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <elf.h>
#include <bfd.h>
+#include "swap.h"
+#include "ctf-endian.h"
#include "elf-bfd.h"
/* Make a new struct ctf_archive_internal wrapper for a ctf_archive or a
- ctf_file. Closes ARC and/or FP on error. Arrange to free the SYMSECT and
- STRSECT interior on close. */
+ ctf_file. Closes ARC and/or FP on error. Arrange to free the SYMSECT or
+ STRSECT, as needed, on close (though the STRSECT interior is bound to the bfd
+ * and is not actually freed by this machinery). */
static struct ctf_archive_internal *
ctf_new_archive_internal (int is_archive, struct ctf_archive *arc,
ctfsect.cts_name = _CTF_SECTION;
ctfsect.cts_entsize = 1;
- ctfsect.cts_size = bfd_section_size (abfd, ctf_asect);
+ ctfsect.cts_size = bfd_section_size (ctf_asect);
ctfsect.cts_data = contents;
if ((arc = ctf_bfdopen_ctfsect (abfd, &ctfsect, errp)) != NULL)
int is_archive;
#ifdef HAVE_BFD_ELF
- asection *sym_asect;
ctf_sect_t symsect, strsect;
+ Elf_Internal_Shdr *strhdr;
+ Elf_Internal_Shdr *symhdr = &elf_symtab_hdr (abfd);
+ size_t symcount = symhdr->sh_size / symhdr->sh_entsize;
+ Elf_Internal_Sym *isymbuf;
+ bfd_byte *symtab;
+ const char *strtab = NULL;
/* TODO: handle SYMTAB_SHNDX. */
- if ((sym_asect = bfd_section_from_elf_index (abfd,
- elf_onesymtab (abfd))) != NULL)
+ if ((symtab = malloc (symhdr->sh_size)) == NULL)
{
- Elf_Internal_Shdr *symhdr = &elf_symtab_hdr (abfd);
- asection *str_asect = NULL;
- bfd_byte *contents;
-
- if (symhdr->sh_link != SHN_UNDEF &&
- symhdr->sh_link <= elf_numsections (abfd))
- str_asect = bfd_section_from_elf_index (abfd, symhdr->sh_link);
+ bfderrstr = "Cannot malloc symbol table";
+ goto err;
+ }
- Elf_Internal_Shdr *strhdr = elf_elfsections (abfd)[symhdr->sh_link];
+ isymbuf = bfd_elf_get_elf_syms (abfd, symhdr, symcount, 0,
+ NULL, symtab, NULL);
+ free (isymbuf);
+ if (isymbuf == NULL)
+ {
+ bfderrstr = "Cannot read symbol table";
+ goto err_free_sym;
+ }
- if (sym_asect && str_asect)
+ if (elf_elfsections (abfd) != NULL
+ && symhdr->sh_link < elf_numsections (abfd))
+ {
+ strhdr = elf_elfsections (abfd)[symhdr->sh_link];
+ if (strhdr->contents == NULL)
{
- if (!bfd_malloc_and_get_section (abfd, str_asect, &contents))
+ if ((strtab = bfd_elf_get_str_section (abfd, symhdr->sh_link)) == NULL)
{
- bfderrstr = "Cannot malloc string table";
- free (contents);
- goto err;
+ bfderrstr = "Cannot read string table";
+ goto err_free_sym;
}
- strsect.cts_data = contents;
- strsect.cts_name = (char *) strsect.cts_data + strhdr->sh_name;
- strsect.cts_size = bfd_section_size (abfd, str_asect);
- strsect.cts_entsize = strhdr->sh_size;
- strsectp = &strsect;
-
- if (!bfd_malloc_and_get_section (abfd, sym_asect, &contents))
- {
- bfderrstr = "Cannot malloc symbol table";
- free (contents);
- goto err_free_str;
- }
-
- symsect.cts_name = (char *) strsect.cts_data + symhdr->sh_name;
- symsect.cts_entsize = symhdr->sh_size;
- symsect.cts_size = bfd_section_size (abfd, sym_asect);
- symsect.cts_data = contents;
- symsectp = &symsect;
}
+ else
+ strtab = (const char *) strhdr->contents;
+ }
+
+ if (strtab)
+ {
+ /* The names here are more or less arbitrary, but there is no point
+ thrashing around digging the name out of the shstrtab given that we don't
+ use it for anything but debugging. */
+
+ strsect.cts_data = strtab;
+ strsect.cts_name = ".strtab";
+ strsect.cts_size = strhdr->sh_size;
+ strsectp = &strsect;
+
+ assert (symhdr->sh_entsize == get_elf_backend_data (abfd)->s->sizeof_sym);
+ symsect.cts_name = ".symtab";
+ symsect.cts_entsize = symhdr->sh_entsize;
+ symsect.cts_size = symhdr->sh_size;
+ symsect.cts_data = symtab;
+ symsectp = &symsect;
}
#endif
is_archive = 1;
if ((arc = ctf_arc_bufopen ((void *) ctfsect->cts_data,
ctfsect->cts_size, errp)) == NULL)
- goto err_free_sym;
+ goto err_free_str;
}
else
{
{
ctf_dprintf ("ctf_internal_open(): cannot open CTF: %s\n",
ctf_errmsg (*errp));
- goto err_free_sym;
+ goto err_free_str;
}
}
arci = ctf_new_archive_internal (is_archive, arc, fp, symsectp, strsectp,
if (arci)
return arci;
- err_free_sym:
+ err_free_str: ;
#ifdef HAVE_BFD_ELF
- free ((void *) symsect.cts_data);
-err_free_str:
- free ((void *) strsect.cts_data);
+ err_free_sym:
+ free (symtab);
#endif
err: _libctf_unused_;
if (bfderrstr)
if ((nbytes = ctf_pread (fd, &ctfhdr, sizeof (ctfhdr), 0)) <= 0)
return (ctf_set_open_errno (errp, nbytes < 0 ? errno : ECTF_FMT));
- /* If we have read enough bytes to form a CTF header and the magic
- string matches, attempt to interpret the file as raw CTF. */
+ /* If we have read enough bytes to form a CTF header and the magic string
+ matches, in either endianness, attempt to interpret the file as raw
+ CTF. */
- if ((size_t) nbytes >= sizeof (ctf_preamble_t) &&
- ctfhdr.ctp_magic == CTF_MAGIC)
+ if ((size_t) nbytes >= sizeof (ctf_preamble_t)
+ && (ctfhdr.ctp_magic == CTF_MAGIC
+ || ctfhdr.ctp_magic == bswap_16 (CTF_MAGIC)))
{
ctf_file_t *fp = NULL;
void *data;
- if (ctfhdr.ctp_version > CTF_VERSION)
- return (ctf_set_open_errno (errp, ECTF_CTFVERS));
-
if ((data = ctf_mmap (st.st_size, 0, fd)) == NULL)
return (ctf_set_open_errno (errp, errno));
if ((fp = ctf_simple_open (data, (size_t) st.st_size, NULL, 0, 0,
NULL, 0, errp)) == NULL)
- ctf_munmap (data, (size_t) st.st_size);
+ {
+ ctf_munmap (data, (size_t) st.st_size);
+ return NULL; /* errno is set for us. */
+ }
+
fp->ctf_data_mmapped = data;
fp->ctf_data_mmapped_len = (size_t) st.st_size;
if ((nbytes = ctf_pread (fd, &arc_magic, sizeof (arc_magic), 0)) <= 0)
return (ctf_set_open_errno (errp, nbytes < 0 ? errno : ECTF_FMT));
- if ((size_t) nbytes >= sizeof (uint64_t) && arc_magic == CTFA_MAGIC)
+ if ((size_t) nbytes >= sizeof (uint64_t) && le64toh (arc_magic) == CTFA_MAGIC)
{
struct ctf_archive *arc;
projects / deliverable / binutils-gdb.git / blobdiff