X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Freadelf.c;h=0603381687eae93c3b13079099c73a305432c5e1;hb=67ce483baa43121a17195efe4b14a183e9fd8232;hp=73913347de2eaf477dcf5b4faa03a04294756772;hpb=34e967a5f3ac5fd0353731a259e358d462823290;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/readelf.c b/binutils/readelf.c index 73913347de..7c5a0266bd 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -1,5 +1,5 @@ /* readelf.c -- display contents of an ELF format file - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2018 Free Software Foundation, Inc. Originally developed by Eric Youngdale Modifications by Nick Clifton @@ -119,6 +119,7 @@ #include "elf/m32r.h" #include "elf/m68k.h" #include "elf/m68hc11.h" +#include "elf/s12z.h" #include "elf/mcore.h" #include "elf/mep.h" #include "elf/metag.h" @@ -131,11 +132,14 @@ #include "elf/mt.h" #include "elf/msp430.h" #include "elf/nds32.h" +#include "elf/nfp.h" #include "elf/nios2.h" #include "elf/or1k.h" #include "elf/pj.h" #include "elf/ppc.h" #include "elf/ppc64.h" +#include "elf/pru.h" +#include "elf/riscv.h" #include "elf/rl78.h" #include "elf/rx.h" #include "elf/s390.h" @@ -149,6 +153,7 @@ #include "elf/v850.h" #include "elf/vax.h" #include "elf/visium.h" +#include "elf/wasm32.h" #include "elf/x86-64.h" #include "elf/xc16x.h" #include "elf/xgate.h" @@ -166,21 +171,55 @@ typedef struct elf_section_list { - Elf_Internal_Shdr * hdr; - struct elf_section_list * next; + Elf_Internal_Shdr * hdr; + struct elf_section_list * next; } elf_section_list; +/* Flag bits indicating particular types of dump. */ +#define HEX_DUMP (1 << 0) /* The -x command line switch. */ +#define DISASS_DUMP (1 << 1) /* The -i command line switch. */ +#define DEBUG_DUMP (1 << 2) /* The -w command line switch. */ +#define STRING_DUMP (1 << 3) /* The -p command line switch. */ +#define RELOC_DUMP (1 << 4) /* The -R command line switch. */ + +typedef unsigned char dump_type; + +/* A linked list of the section names for which dumps were requested. */ +struct dump_list_entry +{ + char * name; + dump_type type; + struct dump_list_entry * next; +}; + +typedef struct filedata +{ + const char * file_name; + FILE * handle; + bfd_size_type file_size; + Elf_Internal_Ehdr file_header; + Elf_Internal_Shdr * section_headers; + Elf_Internal_Phdr * program_headers; + char * string_table; + unsigned long string_table_length; + /* A dynamic array of flags indicating for which sections a dump of + some kind has been requested. It is reset on a per-object file + basis and then initialised from the cmdline_dump_sects array, + the results of interpreting the -w switch, and the + dump_sects_byname list. */ + dump_type * dump_sects; + unsigned int num_dump_sects; +} Filedata; + char * program_name = "readelf"; + static unsigned long archive_file_offset; static unsigned long archive_file_size; -static bfd_size_type current_file_size; static unsigned long dynamic_addr; static bfd_size_type dynamic_size; static size_t dynamic_nent; static char * dynamic_strings; static unsigned long dynamic_strings_length; -static char * string_table; -static unsigned long string_table_length; static unsigned long num_dynamic_syms; static Elf_Internal_Sym * dynamic_symbols; static Elf_Internal_Syminfo * dynamic_syminfo; @@ -190,81 +229,51 @@ static char program_interpreter[PATH_MAX]; static bfd_vma dynamic_info[DT_ENCODING]; static bfd_vma dynamic_info_DT_GNU_HASH; static bfd_vma version_info[16]; -static Elf_Internal_Ehdr elf_header; -static Elf_Internal_Shdr * section_headers; -static Elf_Internal_Phdr * program_headers; static Elf_Internal_Dyn * dynamic_section; static elf_section_list * symtab_shndx_list; -static int show_name; -static int do_dynamic; -static int do_syms; -static int do_dyn_syms; -static int do_reloc; -static int do_sections; -static int do_section_groups; -static int do_section_details; -static int do_segments; -static int do_unwind; -static int do_using_dynamic; -static int do_header; -static int do_dump; -static int do_version; -static int do_histogram; -static int do_debugging; -static int do_arch; -static int do_notes; -static int do_archive_index; -static int is_32bit_elf; -static int decompress_dumps; +static bfd_boolean show_name = FALSE; +static bfd_boolean do_dynamic = FALSE; +static bfd_boolean do_syms = FALSE; +static bfd_boolean do_dyn_syms = FALSE; +static bfd_boolean do_reloc = FALSE; +static bfd_boolean do_sections = FALSE; +static bfd_boolean do_section_groups = FALSE; +static bfd_boolean do_section_details = FALSE; +static bfd_boolean do_segments = FALSE; +static bfd_boolean do_unwind = FALSE; +static bfd_boolean do_using_dynamic = FALSE; +static bfd_boolean do_header = FALSE; +static bfd_boolean do_dump = FALSE; +static bfd_boolean do_version = FALSE; +static bfd_boolean do_histogram = FALSE; +static bfd_boolean do_debugging = FALSE; +static bfd_boolean do_arch = FALSE; +static bfd_boolean do_notes = FALSE; +static bfd_boolean do_archive_index = FALSE; +static bfd_boolean is_32bit_elf = FALSE; +static bfd_boolean decompress_dumps = FALSE; struct group_list { - struct group_list * next; - unsigned int section_index; + struct group_list * next; + unsigned int section_index; }; struct group { - struct group_list * root; - unsigned int group_index; + struct group_list * root; + unsigned int group_index; }; -static size_t group_count; -static struct group * section_groups; -static struct group ** section_headers_groups; - - -/* Flag bits indicating particular types of dump. */ -#define HEX_DUMP (1 << 0) /* The -x command line switch. */ -#define DISASS_DUMP (1 << 1) /* The -i command line switch. */ -#define DEBUG_DUMP (1 << 2) /* The -w command line switch. */ -#define STRING_DUMP (1 << 3) /* The -p command line switch. */ -#define RELOC_DUMP (1 << 4) /* The -R command line switch. */ - -typedef unsigned char dump_type; - -/* A linked list of the section names for which dumps were requested. */ -struct dump_list_entry -{ - char * name; - dump_type type; - struct dump_list_entry * next; -}; -static struct dump_list_entry * dump_sects_byname; +static size_t group_count; +static struct group * section_groups; +static struct group ** section_headers_groups; /* A dynamic array of flags indicating for which sections a dump has been requested via command line switches. */ -static dump_type * cmdline_dump_sects = NULL; -static unsigned int num_cmdline_dump_sects = 0; - -/* A dynamic array of flags indicating for which sections a dump of - some kind has been requested. It is reset on a per-object file - basis and then initialised from the cmdline_dump_sects array, - the results of interpreting the -w switch, and the - dump_sects_byname list. */ -static dump_type * dump_sects = NULL; -static unsigned int num_dump_sects = 0; +static Filedata cmdline; +static struct dump_list_entry * dump_sects_byname; /* How to print a vma value. */ typedef enum print_mode @@ -287,19 +296,17 @@ enum versioned_symbol_info symbol_public }; -static const char *get_symbol_version_string - (FILE *file, int is_dynsym, const char *strtab, - unsigned long int strtab_size, unsigned int si, - Elf_Internal_Sym *psym, enum versioned_symbol_info *sym_info, - unsigned short *vna_other); +static const char * get_symbol_version_string + (Filedata *, bfd_boolean, const char *, unsigned long, unsigned, + Elf_Internal_Sym *, enum versioned_symbol_info *, unsigned short *); #define UNKNOWN -1 #define SECTION_NAME(X) \ ((X) == NULL ? _("") \ - : string_table == NULL ? _("") \ - : ((X)->sh_name >= string_table_length ? _("") \ - : string_table + (X)->sh_name)) + : filedata->string_table == NULL ? _("") \ + : ((X)->sh_name >= filedata->string_table_length ? _("") \ + : filedata->string_table + (X)->sh_name)) #define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */ @@ -315,22 +322,50 @@ static const char *get_symbol_version_string #define REMOVE_ARCH_BITS(ADDR) \ do \ { \ - if (elf_header.e_machine == EM_ARM) \ + if (filedata->file_header.e_machine == EM_ARM) \ (ADDR) &= ~1; \ } \ while (0) -/* Retrieve NMEMB structures, each SIZE bytes long from FILE starting at OFFSET + - the offset of the current archive member, if we are examining an archive. - Put the retrieved data into VAR, if it is not NULL. Otherwise allocate a buffer - using malloc and fill that. In either case return the pointer to the start of - the retrieved data or NULL if something went wrong. If something does go wrong - and REASON is not NULL then emit an error message using REASON as part of the - context. */ +/* Print a BFD_VMA to an internal buffer, for use in error messages. + BFD_FMA_FMT can't be used in translated strings. */ + +static const char * +bfd_vmatoa (char *fmtch, bfd_vma value) +{ + /* bfd_vmatoa is used more then once in a printf call for output. + Cycle through an array of buffers. */ + static int buf_pos = 0; + static struct bfd_vmatoa_buf + { + char place[64]; + } buf[4]; + char *ret; + char fmt[32]; + + ret = buf[buf_pos++].place; + buf_pos %= ARRAY_SIZE (buf); + + sprintf (fmt, "%%%s%s", BFD_VMA_FMT, fmtch); + snprintf (ret, sizeof (buf[0].place), fmt, value); + return ret; +} + +/* Retrieve NMEMB structures, each SIZE bytes long from FILEDATA starting at + OFFSET + the offset of the current archive member, if we are examining an + archive. Put the retrieved data into VAR, if it is not NULL. Otherwise + allocate a buffer using malloc and fill that. In either case return the + pointer to the start of the retrieved data or NULL if something went wrong. + If something does go wrong and REASON is not NULL then emit an error + message using REASON as part of the context. */ static void * -get_data (void * var, FILE * file, unsigned long offset, bfd_size_type size, - bfd_size_type nmemb, const char * reason) +get_data (void * var, + Filedata * filedata, + unsigned long offset, + bfd_size_type size, + bfd_size_type nmemb, + const char * reason) { void * mvar; bfd_size_type amt = size * nmemb; @@ -346,8 +381,9 @@ get_data (void * var, FILE * file, unsigned long offset, bfd_size_type size, || (bfd_size_type) ((size_t) nmemb) != nmemb)) { if (reason) - error (_("Size truncation prevents reading 0x%llx elements of size 0x%llx for %s\n"), - (unsigned long long) nmemb, (unsigned long long) size, reason); + error (_("Size truncation prevents reading %s" + " elements of size %s for %s\n"), + bfd_vmatoa ("u", nmemb), bfd_vmatoa ("u", size), reason); return NULL; } @@ -355,27 +391,28 @@ get_data (void * var, FILE * file, unsigned long offset, bfd_size_type size, if (amt < nmemb) { if (reason) - error (_("Size overflow prevents reading 0x%llx elements of size 0x%llx for %s\n"), - (unsigned long long) nmemb, (unsigned long long) size, reason); + error (_("Size overflow prevents reading %s" + " elements of size %s for %s\n"), + bfd_vmatoa ("u", nmemb), bfd_vmatoa ("u", size), reason); return NULL; } /* Be kind to memory chekers (eg valgrind, address sanitizer) by not attempting to allocate memory when the read is bound to fail. */ - if (amt > current_file_size - || offset + archive_file_offset + amt > current_file_size) + if (amt > filedata->file_size + || offset + archive_file_offset + amt > filedata->file_size) { if (reason) - error (_("Reading 0x%llx bytes extends past end of file for %s\n"), - (unsigned long long) amt, reason); + error (_("Reading %s bytes extends past end of file for %s\n"), + bfd_vmatoa ("u", amt), reason); return NULL; } - if (fseek (file, archive_file_offset + offset, SEEK_SET)) + if (fseek (filedata->handle, archive_file_offset + offset, SEEK_SET)) { if (reason) error (_("Unable to seek to 0x%lx for %s\n"), - (unsigned long) archive_file_offset + offset, reason); + archive_file_offset + offset, reason); return NULL; } @@ -390,19 +427,19 @@ get_data (void * var, FILE * file, unsigned long offset, bfd_size_type size, if (mvar == NULL) { if (reason) - error (_("Out of memory allocating 0x%llx bytes for %s\n"), - (unsigned long long) amt, reason); + error (_("Out of memory allocating %s bytes for %s\n"), + bfd_vmatoa ("u", amt), reason); return NULL; } ((char *) mvar)[amt] = '\0'; } - if (fread (mvar, (size_t) size, (size_t) nmemb, file) != nmemb) + if (fread (mvar, (size_t) size, (size_t) nmemb, filedata->handle) != nmemb) { if (reason) - error (_("Unable to read in 0x%llx bytes of %s\n"), - (unsigned long long) amt, reason); + error (_("Unable to read in %s bytes of %s\n"), + bfd_vmatoa ("u", amt), reason); if (mvar != var) free (mvar); return NULL; @@ -411,19 +448,19 @@ get_data (void * var, FILE * file, unsigned long offset, bfd_size_type size, return mvar; } -/* Print a VMA value. */ +/* Print a VMA value in the MODE specified. + Returns the number of characters displayed. */ -static int +static unsigned int print_vma (bfd_vma vma, print_mode mode) { - int nc = 0; + unsigned int nc = 0; switch (mode) { case FULL_HEX: nc = printf ("0x"); - /* Drop through. */ - + /* Fall through. */ case LONG_HEX: #ifdef BFD64 if (is_32bit_elf) @@ -435,12 +472,10 @@ print_vma (bfd_vma vma, print_mode mode) case DEC_5: if (vma <= 99999) return printf ("%5" BFD_VMA_FMT "d", vma); - /* Drop through. */ - + /* Fall through. */ case PREFIX_HEX: nc = printf ("0x"); - /* Drop through. */ - + /* Fall through. */ case HEX: return nc + printf ("%" BFD_VMA_FMT "x", vma); @@ -449,8 +484,11 @@ print_vma (bfd_vma vma, print_mode mode) case UNSIGNED: return printf ("%" BFD_VMA_FMT "u", vma); + + default: + /* FIXME: Report unrecognised mode ? */ + return 0; } - return 0; } /* Display a symbol on stdout. Handles the display of control characters and @@ -464,22 +502,23 @@ print_vma (bfd_vma vma, print_mode mode) Returns the number of emitted characters. */ static unsigned int -print_symbol (int width, const char *symbol) +print_symbol (signed int width, const char *symbol) { bfd_boolean extra_padding = FALSE; - int num_printed = 0; + signed int num_printed = 0; #ifdef HAVE_MBSTATE_T mbstate_t state; #endif - int width_remaining; + unsigned int width_remaining; if (width < 0) { - /* Keep the width positive. This also helps. */ + /* Keep the width positive. This helps the code below. */ width = - width; extra_padding = TRUE; } - assert (width != 0); + else if (width == 0) + return 0; if (do_wide) /* Set the remaining width to a very large value. @@ -552,12 +591,12 @@ print_symbol (int width, const char *symbol) return num_printed; } -/* Returns a pointer to a static buffer containing a printable version of +/* Returns a pointer to a static buffer containing a printable version of the given section's name. Like print_symbol, except that it does not try to print multibyte characters, it just interprets them as hex values. */ static const char * -printable_section_name (const Elf_Internal_Shdr * sec) +printable_section_name (Filedata * filedata, const Elf_Internal_Shdr * sec) { #define MAX_PRINT_SEC_NAME_LEN 128 static char sec_name_buf [MAX_PRINT_SEC_NAME_LEN + 1]; @@ -604,24 +643,27 @@ printable_section_name (const Elf_Internal_Shdr * sec) } static const char * -printable_section_name_from_index (unsigned long ndx) +printable_section_name_from_index (Filedata * filedata, unsigned long ndx) { - if (ndx >= elf_header.e_shnum) + if (ndx >= filedata->file_header.e_shnum) return _(""); - return printable_section_name (section_headers + ndx); + return printable_section_name (filedata, filedata->section_headers + ndx); } /* Return a pointer to section NAME, or NULL if no such section exists. */ static Elf_Internal_Shdr * -find_section (const char * name) +find_section (Filedata * filedata, const char * name) { unsigned int i; - for (i = 0; i < elf_header.e_shnum; i++) - if (streq (SECTION_NAME (section_headers + i), name)) - return section_headers + i; + if (filedata->section_headers == NULL) + return NULL; + + for (i = 0; i < filedata->file_header.e_shnum; i++) + if (streq (SECTION_NAME (filedata->section_headers + i), name)) + return filedata->section_headers + i; return NULL; } @@ -630,13 +672,17 @@ find_section (const char * name) section exists. */ static Elf_Internal_Shdr * -find_section_by_address (bfd_vma addr) +find_section_by_address (Filedata * filedata, bfd_vma addr) { unsigned int i; - for (i = 0; i < elf_header.e_shnum; i++) + if (filedata->section_headers == NULL) + return NULL; + + for (i = 0; i < filedata->file_header.e_shnum; i++) { - Elf_Internal_Shdr *sec = section_headers + i; + Elf_Internal_Shdr *sec = filedata->section_headers + i; + if (addr >= sec->sh_addr && addr < sec->sh_addr + sec->sh_size) return sec; } @@ -645,13 +691,17 @@ find_section_by_address (bfd_vma addr) } static Elf_Internal_Shdr * -find_section_by_type (unsigned int type) +find_section_by_type (Filedata * filedata, unsigned int type) { unsigned int i; - for (i = 0; i < elf_header.e_shnum; i++) + if (filedata->section_headers == NULL) + return NULL; + + for (i = 0; i < filedata->file_header.e_shnum; i++) { - Elf_Internal_Shdr *sec = section_headers + i; + Elf_Internal_Shdr *sec = filedata->section_headers + i; + if (sec->sh_type == type) return sec; } @@ -663,45 +713,54 @@ find_section_by_type (unsigned int type) restricted to the list of sections given in SET. */ static Elf_Internal_Shdr * -find_section_in_set (const char * name, unsigned int * set) +find_section_in_set (Filedata * filedata, const char * name, unsigned int * set) { unsigned int i; + if (filedata->section_headers == NULL) + return NULL; + if (set != NULL) { while ((i = *set++) > 0) - if (streq (SECTION_NAME (section_headers + i), name)) - return section_headers + i; + { + /* See PR 21156 for a reproducer. */ + if (i >= filedata->file_header.e_shnum) + continue; /* FIXME: Should we issue an error message ? */ + + if (streq (SECTION_NAME (filedata->section_headers + i), name)) + return filedata->section_headers + i; + } } - return find_section (name); + return find_section (filedata, name); } -/* Read an unsigned LEB128 encoded value from p. Set *PLEN to the number of - bytes read. */ +/* Read an unsigned LEB128 encoded value from DATA. + Set *LENGTH_RETURN to the number of bytes read. */ static inline unsigned long -read_uleb128 (unsigned char *data, - unsigned int *length_return, +read_uleb128 (unsigned char * data, + unsigned int * length_return, const unsigned char * const end) { return read_leb128 (data, length_return, FALSE, end); } -/* Return true if the current file is for IA-64 machine and OpenVMS ABI. +/* Return TRUE if the current file is for IA-64 machine and OpenVMS ABI. This OS has so many departures from the ELF standard that we test it at many places. */ -static inline int -is_ia64_vms (void) +static inline bfd_boolean +is_ia64_vms (Filedata * filedata) { - return elf_header.e_machine == EM_IA_64 - && elf_header.e_ident[EI_OSABI] == ELFOSABI_OPENVMS; + return filedata->file_header.e_machine == EM_IA_64 + && filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_OPENVMS; } /* Guess the relocation size commonly used by the specific machines. */ -static int +static bfd_boolean guess_is_rela (unsigned int e_machine) { switch (e_machine) @@ -719,6 +778,7 @@ guess_is_rela (unsigned int e_machine) case EM_CYGNUS_M32R: case EM_SCORE: case EM_XGATE: + case EM_NFP: return FALSE; /* Targets that use RELA relocations. */ @@ -771,6 +831,8 @@ guess_is_rela (unsigned int e_machine) case EM_OR1K: case EM_PPC64: case EM_PPC: + case EM_TI_PRU: + case EM_RISCV: case EM_RL78: case EM_RX: case EM_S390: @@ -796,6 +858,7 @@ guess_is_rela (unsigned int e_machine) case EM_XTENSA_OLD: case EM_MICROBLAZE: case EM_MICROBLAZE_OLD: + case EM_WEBASSEMBLY: return TRUE; case EM_68HC05: @@ -821,12 +884,18 @@ guess_is_rela (unsigned int e_machine) } } -static int -slurp_rela_relocs (FILE * file, - unsigned long rel_offset, - unsigned long rel_size, - Elf_Internal_Rela ** relasp, - unsigned long * nrelasp) +/* Load RELA type relocations from FILEDATA at REL_OFFSET extending for REL_SIZE bytes. + Returns TRUE upon success, FALSE otherwise. If successful then a + pointer to a malloc'ed buffer containing the relocs is placed in *RELASP, + and the number of relocs loaded is placed in *NRELASP. It is the caller's + responsibility to free the allocated buffer. */ + +static bfd_boolean +slurp_rela_relocs (Filedata * filedata, + unsigned long rel_offset, + unsigned long rel_size, + Elf_Internal_Rela ** relasp, + unsigned long * nrelasp) { Elf_Internal_Rela * relas; size_t nrelas; @@ -836,10 +905,10 @@ slurp_rela_relocs (FILE * file, { Elf32_External_Rela * erelas; - erelas = (Elf32_External_Rela *) get_data (NULL, file, rel_offset, 1, + erelas = (Elf32_External_Rela *) get_data (NULL, filedata, rel_offset, 1, rel_size, _("32-bit relocation data")); if (!erelas) - return 0; + return FALSE; nrelas = rel_size / sizeof (Elf32_External_Rela); @@ -850,7 +919,7 @@ slurp_rela_relocs (FILE * file, { free (erelas); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrelas; i++) @@ -866,10 +935,10 @@ slurp_rela_relocs (FILE * file, { Elf64_External_Rela * erelas; - erelas = (Elf64_External_Rela *) get_data (NULL, file, rel_offset, 1, + erelas = (Elf64_External_Rela *) get_data (NULL, filedata, rel_offset, 1, rel_size, _("64-bit relocation data")); if (!erelas) - return 0; + return FALSE; nrelas = rel_size / sizeof (Elf64_External_Rela); @@ -880,7 +949,7 @@ slurp_rela_relocs (FILE * file, { free (erelas); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrelas; i++) @@ -893,8 +962,8 @@ slurp_rela_relocs (FILE * file, warning. We know that if we do not have a 64 bit data type that we will never execute this code anyway. */ #ifdef BFD64 - if (elf_header.e_machine == EM_MIPS - && elf_header.e_ident[EI_DATA] != ELFDATA2MSB) + if (filedata->file_header.e_machine == EM_MIPS + && filedata->file_header.e_ident[EI_DATA] != ELFDATA2MSB) { /* In little-endian objects, r_info isn't really a 64-bit little-endian value: it has a 32-bit @@ -914,17 +983,24 @@ slurp_rela_relocs (FILE * file, free (erelas); } + *relasp = relas; *nrelasp = nrelas; - return 1; + return TRUE; } -static int -slurp_rel_relocs (FILE * file, - unsigned long rel_offset, - unsigned long rel_size, - Elf_Internal_Rela ** relsp, - unsigned long * nrelsp) +/* Load REL type relocations from FILEDATA at REL_OFFSET extending for REL_SIZE bytes. + Returns TRUE upon success, FALSE otherwise. If successful then a + pointer to a malloc'ed buffer containing the relocs is placed in *RELSP, + and the number of relocs loaded is placed in *NRELSP. It is the caller's + responsibility to free the allocated buffer. */ + +static bfd_boolean +slurp_rel_relocs (Filedata * filedata, + unsigned long rel_offset, + unsigned long rel_size, + Elf_Internal_Rela ** relsp, + unsigned long * nrelsp) { Elf_Internal_Rela * rels; size_t nrels; @@ -934,10 +1010,10 @@ slurp_rel_relocs (FILE * file, { Elf32_External_Rel * erels; - erels = (Elf32_External_Rel *) get_data (NULL, file, rel_offset, 1, + erels = (Elf32_External_Rel *) get_data (NULL, filedata, rel_offset, 1, rel_size, _("32-bit relocation data")); if (!erels) - return 0; + return FALSE; nrels = rel_size / sizeof (Elf32_External_Rel); @@ -947,7 +1023,7 @@ slurp_rel_relocs (FILE * file, { free (erels); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrels; i++) @@ -963,10 +1039,10 @@ slurp_rel_relocs (FILE * file, { Elf64_External_Rel * erels; - erels = (Elf64_External_Rel *) get_data (NULL, file, rel_offset, 1, + erels = (Elf64_External_Rel *) get_data (NULL, filedata, rel_offset, 1, rel_size, _("64-bit relocation data")); if (!erels) - return 0; + return FALSE; nrels = rel_size / sizeof (Elf64_External_Rel); @@ -976,7 +1052,7 @@ slurp_rel_relocs (FILE * file, { free (erels); error (_("out of memory parsing relocs\n")); - return 0; + return FALSE; } for (i = 0; i < nrels; i++) @@ -989,8 +1065,8 @@ slurp_rel_relocs (FILE * file, warning. We know that if we do not have a 64 bit data type that we will never execute this code anyway. */ #ifdef BFD64 - if (elf_header.e_machine == EM_MIPS - && elf_header.e_ident[EI_DATA] != ELFDATA2MSB) + if (filedata->file_header.e_machine == EM_MIPS + && filedata->file_header.e_ident[EI_DATA] != ELFDATA2MSB) { /* In little-endian objects, r_info isn't really a 64-bit little-endian value: it has a 32-bit @@ -1010,20 +1086,21 @@ slurp_rel_relocs (FILE * file, free (erels); } + *relsp = rels; *nrelsp = nrels; - return 1; + return TRUE; } /* Returns the reloc type extracted from the reloc info field. */ static unsigned int -get_reloc_type (bfd_vma reloc_info) +get_reloc_type (Filedata * filedata, bfd_vma reloc_info) { if (is_32bit_elf) return ELF32_R_TYPE (reloc_info); - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_MIPS: /* Note: We assume that reloc_info has already been adjusted for us. */ @@ -1046,45 +1123,46 @@ get_reloc_symindex (bfd_vma reloc_info) } static inline bfd_boolean -uses_msp430x_relocs (void) +uses_msp430x_relocs (Filedata * filedata) { return - elf_header.e_machine == EM_MSP430 /* Paranoia. */ + filedata->file_header.e_machine == EM_MSP430 /* Paranoia. */ /* GCC uses osabi == ELFOSBI_STANDALONE. */ - && (((elf_header.e_flags & EF_MSP430_MACH) == E_MSP430_MACH_MSP430X) + && (((filedata->file_header.e_flags & EF_MSP430_MACH) == E_MSP430_MACH_MSP430X) /* TI compiler uses ELFOSABI_NONE. */ - || (elf_header.e_ident[EI_OSABI] == ELFOSABI_NONE)); + || (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_NONE)); } /* Display the contents of the relocation data found at the specified offset. */ -static void -dump_relocations (FILE * file, - unsigned long rel_offset, - unsigned long rel_size, - Elf_Internal_Sym * symtab, - unsigned long nsyms, - char * strtab, - unsigned long strtablen, - int is_rela, - int is_dynsym) +static bfd_boolean +dump_relocations (Filedata * filedata, + unsigned long rel_offset, + unsigned long rel_size, + Elf_Internal_Sym * symtab, + unsigned long nsyms, + char * strtab, + unsigned long strtablen, + int is_rela, + bfd_boolean is_dynsym) { - unsigned int i; + unsigned long i; Elf_Internal_Rela * rels; + bfd_boolean res = TRUE; if (is_rela == UNKNOWN) - is_rela = guess_is_rela (elf_header.e_machine); + is_rela = guess_is_rela (filedata->file_header.e_machine); if (is_rela) { - if (!slurp_rela_relocs (file, rel_offset, rel_size, &rels, &rel_size)) - return; + if (!slurp_rela_relocs (filedata, rel_offset, rel_size, &rels, &rel_size)) + return FALSE; } else { - if (!slurp_rel_relocs (file, rel_offset, rel_size, &rels, &rel_size)) - return; + if (!slurp_rel_relocs (filedata, rel_offset, rel_size, &rels, &rel_size)) + return FALSE; } if (is_32bit_elf) @@ -1133,7 +1211,7 @@ dump_relocations (FILE * file, offset = rels[i].r_offset; inf = rels[i].r_info; - type = get_reloc_type (inf); + type = get_reloc_type (filedata, inf); symtab_index = get_reloc_symindex (inf); if (is_32bit_elf) @@ -1172,7 +1250,7 @@ dump_relocations (FILE * file, #endif } - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { default: rtype = NULL; @@ -1197,6 +1275,10 @@ dump_relocations (FILE * file, rtype = elf_m68hc11_reloc_type (type); break; + case EM_S12Z: + rtype = elf_s12z_reloc_type (type); + break; + case EM_68K: rtype = elf_m68k_reloc_type (type); break; @@ -1283,11 +1365,12 @@ dump_relocations (FILE * file, break; case EM_MSP430: - if (uses_msp430x_relocs ()) + if (uses_msp430x_relocs (filedata)) { rtype = elf_msp430x_reloc_type (type); break; } + /* Fall through. */ case EM_MSP430_OLD: rtype = elf_msp430_reloc_type (type); break; @@ -1309,6 +1392,10 @@ dump_relocations (FILE * file, rtype = elf_mips_reloc_type (type); break; + case EM_RISCV: + rtype = elf_riscv_reloc_type (type); + break; + case EM_ALPHA: rtype = elf_alpha_reloc_type (type); break; @@ -1465,6 +1552,10 @@ dump_relocations (FILE * file, rtype = elf_tilepro_reloc_type (type); break; + case EM_WEBASSEMBLY: + rtype = elf_wasm32_reloc_type (type); + break; + case EM_XGATE: rtype = elf_xgate_reloc_type (type); break; @@ -1472,14 +1563,25 @@ dump_relocations (FILE * file, case EM_ALTERA_NIOS2: rtype = elf_nios2_reloc_type (type); break; + + case EM_TI_PRU: + rtype = elf_pru_reloc_type (type); + break; + + case EM_NFP: + if (EF_NFP_MACH (filedata->file_header.e_flags) == E_NFP_MACH_3200) + rtype = elf_nfp3200_reloc_type (type); + else + rtype = elf_nfp_reloc_type (type); + break; } if (rtype == NULL) printf (_("unrecognized: %-7lx"), (unsigned long) type & 0xffffffff); else - printf (do_wide ? "%-22.22s" : "%-17.17s", rtype); + printf (do_wide ? "%-22s" : "%-17.17s", rtype); - if (elf_header.e_machine == EM_ALPHA + if (filedata->file_header.e_machine == EM_ALPHA && rtype != NULL && streq (rtype, "R_ALPHA_LITUSE") && is_rela) @@ -1495,6 +1597,7 @@ dump_relocations (FILE * file, case LITUSE_ALPHA_JSRDIRECT: rtype = "JSRDIRECT"; break; default: rtype = NULL; } + if (rtype) printf (" (%s)", rtype); else @@ -1502,12 +1605,16 @@ dump_relocations (FILE * file, putchar (' '); printf (_(""), (unsigned long) rels[i].r_addend); + res = FALSE; } } else if (symtab_index) { if (symtab == NULL || symtab_index >= nsyms) - printf (_(" bad symbol index: %08lx"), (unsigned long) symtab_index); + { + error (_(" bad symbol index: %08lx in reloc"), (unsigned long) symtab_index); + res = FALSE; + } else { Elf_Internal_Sym * psym; @@ -1518,7 +1625,7 @@ dump_relocations (FILE * file, psym = symtab + symtab_index; version_string - = get_symbol_version_string (file, is_dynsym, + = get_symbol_version_string (filedata, is_dynsym, strtab, strtablen, symtab_index, psym, @@ -1570,30 +1677,30 @@ dump_relocations (FILE * file, if (ELF_ST_TYPE (psym->st_info) == STT_SECTION) { - if (psym->st_shndx < elf_header.e_shnum) - sec_name = SECTION_NAME (section_headers + psym->st_shndx); + if (psym->st_shndx < filedata->file_header.e_shnum) + sec_name = SECTION_NAME (filedata->section_headers + psym->st_shndx); else if (psym->st_shndx == SHN_ABS) sec_name = "ABS"; else if (psym->st_shndx == SHN_COMMON) sec_name = "COMMON"; - else if ((elf_header.e_machine == EM_MIPS + else if ((filedata->file_header.e_machine == EM_MIPS && psym->st_shndx == SHN_MIPS_SCOMMON) - || (elf_header.e_machine == EM_TI_C6000 + || (filedata->file_header.e_machine == EM_TI_C6000 && psym->st_shndx == SHN_TIC6X_SCOMMON)) sec_name = "SCOMMON"; - else if (elf_header.e_machine == EM_MIPS + else if (filedata->file_header.e_machine == EM_MIPS && psym->st_shndx == SHN_MIPS_SUNDEFINED) sec_name = "SUNDEF"; - else if ((elf_header.e_machine == EM_X86_64 - || elf_header.e_machine == EM_L1OM - || elf_header.e_machine == EM_K1OM) + else if ((filedata->file_header.e_machine == EM_X86_64 + || filedata->file_header.e_machine == EM_L1OM + || filedata->file_header.e_machine == EM_K1OM) && psym->st_shndx == SHN_X86_64_LCOMMON) sec_name = "LARGE_COMMON"; - else if (elf_header.e_machine == EM_IA_64 - && elf_header.e_ident[EI_OSABI] == ELFOSABI_HPUX + else if (filedata->file_header.e_machine == EM_IA_64 + && filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_HPUX && psym->st_shndx == SHN_IA_64_ANSI_COMMON) sec_name = "ANSI_COM"; - else if (is_ia64_vms () + else if (is_ia64_vms (filedata) && psym->st_shndx == SHN_IA_64_VMS_SYMVEC) sec_name = "VMS_SYMVEC"; else @@ -1608,7 +1715,10 @@ dump_relocations (FILE * file, else if (strtab == NULL) printf (_(""), psym->st_name); else if (psym->st_name >= strtablen) - printf (_(""), psym->st_name); + { + error (_(""), psym->st_name); + res = FALSE; + } else { print_symbol (22, strtab + psym->st_name); @@ -1639,7 +1749,7 @@ dump_relocations (FILE * file, printf ("%" BFD_VMA_FMT "x", off); } - if (elf_header.e_machine == EM_SPARCV9 + if (filedata->file_header.e_machine == EM_SPARCV9 && rtype != NULL && streq (rtype, "R_SPARC_OLO10")) printf (" + %lx", (unsigned long) ELF64_R_TYPE_DATA (inf)); @@ -1647,7 +1757,7 @@ dump_relocations (FILE * file, putchar ('\n'); #ifdef BFD64 - if (! is_32bit_elf && elf_header.e_machine == EM_MIPS) + if (! is_32bit_elf && filedata->file_header.e_machine == EM_MIPS) { bfd_vma type2 = ELF64_MIPS_R_TYPE2 (inf); bfd_vma type3 = ELF64_MIPS_R_TYPE3 (inf); @@ -1676,6 +1786,8 @@ dump_relocations (FILE * file, } free (rels); + + return res; } static const char * @@ -1846,14 +1958,41 @@ get_ia64_dynamic_type (unsigned long type) } } +static const char * +get_solaris_section_type (unsigned long type) +{ + switch (type) + { + case 0x6fffffee: return "SUNW_ancillary"; + case 0x6fffffef: return "SUNW_capchain"; + case 0x6ffffff0: return "SUNW_capinfo"; + case 0x6ffffff1: return "SUNW_symsort"; + case 0x6ffffff2: return "SUNW_tlssort"; + case 0x6ffffff3: return "SUNW_LDYNSYM"; + case 0x6ffffff4: return "SUNW_dof"; + case 0x6ffffff5: return "SUNW_cap"; + case 0x6ffffff6: return "SUNW_SIGNATURE"; + case 0x6ffffff7: return "SUNW_ANNOTATE"; + case 0x6ffffff8: return "SUNW_DEBUGSTR"; + case 0x6ffffff9: return "SUNW_DEBUG"; + case 0x6ffffffa: return "SUNW_move"; + case 0x6ffffffb: return "SUNW_COMDAT"; + case 0x6ffffffc: return "SUNW_syminfo"; + case 0x6ffffffd: return "SUNW_verdef"; + case 0x6ffffffe: return "SUNW_verneed"; + case 0x6fffffff: return "SUNW_versym"; + case 0x70000000: return "SPARC_GOTDATA"; + default: return NULL; + } +} + static const char * get_alpha_dynamic_type (unsigned long type) { switch (type) { case DT_ALPHA_PLTRO: return "ALPHA_PLTRO"; - default: - return NULL; + default: return NULL; } } @@ -1868,8 +2007,7 @@ get_score_dynamic_type (unsigned long type) case DT_SCORE_GOTSYM: return "SCORE_GOTSYM"; case DT_SCORE_UNREFEXTNO: return "SCORE_UNREFEXTNO"; case DT_SCORE_HIPAGENO: return "SCORE_HIPAGENO"; - default: - return NULL; + default: return NULL; } } @@ -1884,8 +2022,7 @@ get_tic6x_dynamic_type (unsigned long type) case DT_C6000_DSBT_SIZE: return "C6000_DSBT_SIZE"; case DT_C6000_PREEMPTMAP: return "C6000_PREEMPTMAP"; case DT_C6000_DSBT_INDEX: return "C6000_DSBT_INDEX"; - default: - return NULL; + default: return NULL; } } @@ -1895,13 +2032,49 @@ get_nios2_dynamic_type (unsigned long type) switch (type) { case DT_NIOS2_GP: return "NIOS2_GP"; - default: - return NULL; + default: return NULL; } } static const char * -get_dynamic_type (unsigned long type) +get_solaris_dynamic_type (unsigned long type) +{ + switch (type) + { + case 0x6000000d: return "SUNW_AUXILIARY"; + case 0x6000000e: return "SUNW_RTLDINF"; + case 0x6000000f: return "SUNW_FILTER"; + case 0x60000010: return "SUNW_CAP"; + case 0x60000011: return "SUNW_SYMTAB"; + case 0x60000012: return "SUNW_SYMSZ"; + case 0x60000013: return "SUNW_SORTENT"; + case 0x60000014: return "SUNW_SYMSORT"; + case 0x60000015: return "SUNW_SYMSORTSZ"; + case 0x60000016: return "SUNW_TLSSORT"; + case 0x60000017: return "SUNW_TLSSORTSZ"; + case 0x60000018: return "SUNW_CAPINFO"; + case 0x60000019: return "SUNW_STRPAD"; + case 0x6000001a: return "SUNW_CAPCHAIN"; + case 0x6000001b: return "SUNW_LDMACH"; + case 0x6000001d: return "SUNW_CAPCHAINENT"; + case 0x6000001f: return "SUNW_CAPCHAINSZ"; + case 0x60000021: return "SUNW_PARENT"; + case 0x60000023: return "SUNW_ASLR"; + case 0x60000025: return "SUNW_RELAX"; + case 0x60000029: return "SUNW_NXHEAP"; + case 0x6000002b: return "SUNW_NXSTACK"; + + case 0x70000001: return "SPARC_REGISTER"; + case 0x7ffffffd: return "AUXILIARY"; + case 0x7ffffffe: return "USED"; + case 0x7fffffff: return "FILTER"; + + default: return NULL; + } +} + +static const char * +get_dynamic_type (Filedata * filedata, unsigned long type) { static char buff[64]; @@ -1941,6 +2114,7 @@ get_dynamic_type (unsigned long type) case DT_PREINIT_ARRAY: return "PREINIT_ARRAY"; case DT_PREINIT_ARRAYSZ: return "PREINIT_ARRAYSZ"; + case DT_SYMTAB_SHNDX: return "SYMTAB_SHNDX"; case DT_CHECKSUM: return "CHECKSUM"; case DT_PLTPADSZ: return "PLTPADSZ"; @@ -1987,7 +2161,7 @@ get_dynamic_type (unsigned long type) { const char * result; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_MIPS: case EM_MIPS_RS3_LE: @@ -2018,7 +2192,10 @@ get_dynamic_type (unsigned long type) result = get_nios2_dynamic_type (type); break; default: - result = NULL; + if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_dynamic_type (type); + else + result = NULL; break; } @@ -2028,12 +2205,12 @@ get_dynamic_type (unsigned long type) snprintf (buff, sizeof (buff), _("Processor Specific: %lx"), type); } else if (((type >= DT_LOOS) && (type <= DT_HIOS)) - || (elf_header.e_machine == EM_PARISC + || (filedata->file_header.e_machine == EM_PARISC && (type >= OLD_DT_LOOS) && (type <= OLD_DT_HIOS))) { const char * result; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_PARISC: result = get_parisc_dynamic_type (type); @@ -2042,7 +2219,10 @@ get_dynamic_type (unsigned long type) result = get_ia64_dynamic_type (type); break; default: - result = NULL; + if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_dynamic_type (type); + else + result = NULL; break; } @@ -2066,11 +2246,11 @@ get_file_type (unsigned e_type) switch (e_type) { - case ET_NONE: return _("NONE (None)"); - case ET_REL: return _("REL (Relocatable file)"); - case ET_EXEC: return _("EXEC (Executable file)"); - case ET_DYN: return _("DYN (Shared object file)"); - case ET_CORE: return _("CORE (Core file)"); + case ET_NONE: return _("NONE (None)"); + case ET_REL: return _("REL (Relocatable file)"); + case ET_EXEC: return _("EXEC (Executable file)"); + case ET_DYN: return _("DYN (Shared object file)"); + case ET_CORE: return _("CORE (Core file)"); default: if ((e_type >= ET_LOPROC) && (e_type <= ET_HIPROC)) @@ -2090,11 +2270,11 @@ get_machine_name (unsigned e_machine) switch (e_machine) { + /* Please keep this switch table sorted by increasing EM_ value. */ + /* 0 */ case EM_NONE: return _("None"); - case EM_AARCH64: return "AArch64"; case EM_M32: return "WE32100"; case EM_SPARC: return "Sparc"; - case EM_SPU: return "SPU"; case EM_386: return "Intel 80386"; case EM_68K: return "MC68000"; case EM_88K: return "MC88000"; @@ -2102,61 +2282,50 @@ get_machine_name (unsigned e_machine) case EM_860: return "Intel 80860"; case EM_MIPS: return "MIPS R3000"; case EM_S370: return "IBM System/370"; + /* 10 */ case EM_MIPS_RS3_LE: return "MIPS R4000 big-endian"; case EM_OLD_SPARCV9: return "Sparc v9 (old)"; case EM_PARISC: return "HPPA"; - case EM_PPC_OLD: return "Power PC (old)"; + case EM_VPP550: return "Fujitsu VPP500"; case EM_SPARC32PLUS: return "Sparc v8+" ; - case EM_960: return "Intel 90860"; + case EM_960: return "Intel 80960"; case EM_PPC: return "PowerPC"; + /* 20 */ case EM_PPC64: return "PowerPC64"; + case EM_S390_OLD: + case EM_S390: return "IBM S/390"; + case EM_SPU: return "SPU"; + /* 30 */ + case EM_V800: return "Renesas V850 (using RH850 ABI)"; case EM_FR20: return "Fujitsu FR20"; - case EM_FT32: return "FTDI FT32"; case EM_RH32: return "TRW RH32"; case EM_MCORE: return "MCORE"; + /* 40 */ case EM_ARM: return "ARM"; case EM_OLD_ALPHA: return "Digital Alpha (old)"; case EM_SH: return "Renesas / SuperH SH"; case EM_SPARCV9: return "Sparc v9"; case EM_TRICORE: return "Siemens Tricore"; case EM_ARC: return "ARC"; - case EM_ARC_COMPACT: return "ARCompact"; - case EM_ARC_COMPACT2: return "ARCv2"; case EM_H8_300: return "Renesas H8/300"; case EM_H8_300H: return "Renesas H8/300H"; case EM_H8S: return "Renesas H8S"; case EM_H8_500: return "Renesas H8/500"; + /* 50 */ case EM_IA_64: return "Intel IA-64"; case EM_MIPS_X: return "Stanford MIPS-X"; case EM_COLDFIRE: return "Motorola Coldfire"; - case EM_ALPHA: return "Alpha"; - case EM_CYGNUS_D10V: - case EM_D10V: return "d10v"; - case EM_CYGNUS_D30V: - case EM_D30V: return "d30v"; - case EM_CYGNUS_M32R: - case EM_M32R: return "Renesas M32R (formerly Mitsubishi M32r)"; - case EM_CYGNUS_V850: - case EM_V800: return "Renesas V850 (using RH850 ABI)"; - case EM_V850: return "Renesas V850"; - case EM_CYGNUS_MN10300: - case EM_MN10300: return "mn10300"; - case EM_CYGNUS_MN10200: - case EM_MN10200: return "mn10200"; - case EM_MOXIE: return "Moxie"; - case EM_CYGNUS_FR30: - case EM_FR30: return "Fujitsu FR30"; - case EM_CYGNUS_FRV: return "Fujitsu FR-V"; - case EM_PJ_OLD: - case EM_PJ: return "picoJava"; + case EM_68HC12: return "Motorola MC68HC12 Microcontroller"; case EM_MMA: return "Fujitsu Multimedia Accelerator"; case EM_PCP: return "Siemens PCP"; case EM_NCPU: return "Sony nCPU embedded RISC processor"; case EM_NDR1: return "Denso NDR1 microprocesspr"; case EM_STARCORE: return "Motorola Star*Core processor"; case EM_ME16: return "Toyota ME16 processor"; + /* 60 */ case EM_ST100: return "STMicroelectronics ST100 processor"; case EM_TINYJ: return "Advanced Logic Corp. TinyJ embedded processor"; + case EM_X86_64: return "Advanced Micro Devices X86-64"; case EM_PDSP: return "Sony DSP processor"; case EM_PDP10: return "Digital Equipment Corp. PDP-10"; case EM_PDP11: return "Digital Equipment Corp. PDP-11"; @@ -2164,75 +2333,89 @@ get_machine_name (unsigned e_machine) case EM_ST9PLUS: return "STMicroelectronics ST9+ 8/16 bit microcontroller"; case EM_ST7: return "STMicroelectronics ST7 8-bit microcontroller"; case EM_68HC16: return "Motorola MC68HC16 Microcontroller"; - case EM_68HC12: return "Motorola MC68HC12 Microcontroller"; + /* 70 */ case EM_68HC11: return "Motorola MC68HC11 Microcontroller"; case EM_68HC08: return "Motorola MC68HC08 Microcontroller"; case EM_68HC05: return "Motorola MC68HC05 Microcontroller"; case EM_SVX: return "Silicon Graphics SVx"; case EM_ST19: return "STMicroelectronics ST19 8-bit microcontroller"; case EM_VAX: return "Digital VAX"; - case EM_VISIUM: return "CDS VISIUMcore processor"; - case EM_AVR_OLD: - case EM_AVR: return "Atmel AVR 8-bit microcontroller"; case EM_CRIS: return "Axis Communications 32-bit embedded processor"; case EM_JAVELIN: return "Infineon Technologies 32-bit embedded cpu"; case EM_FIREPATH: return "Element 14 64-bit DSP processor"; case EM_ZSP: return "LSI Logic's 16-bit DSP processor"; + /* 80 */ case EM_MMIX: return "Donald Knuth's educational 64-bit processor"; case EM_HUANY: return "Harvard Universitys's machine-independent object format"; case EM_PRISM: return "Vitesse Prism"; - case EM_X86_64: return "Advanced Micro Devices X86-64"; - case EM_L1OM: return "Intel L1OM"; - case EM_K1OM: return "Intel K1OM"; - case EM_S390_OLD: - case EM_S390: return "IBM S/390"; - case EM_SCORE: return "SUNPLUS S+Core"; - case EM_XSTORMY16: return "Sanyo XStormy16 CPU core"; + case EM_AVR_OLD: + case EM_AVR: return "Atmel AVR 8-bit microcontroller"; + case EM_CYGNUS_FR30: + case EM_FR30: return "Fujitsu FR30"; + case EM_CYGNUS_D10V: + case EM_D10V: return "d10v"; + case EM_CYGNUS_D30V: + case EM_D30V: return "d30v"; + case EM_CYGNUS_V850: + case EM_V850: return "Renesas V850"; + case EM_CYGNUS_M32R: + case EM_M32R: return "Renesas M32R (formerly Mitsubishi M32r)"; + case EM_CYGNUS_MN10300: + case EM_MN10300: return "mn10300"; + /* 90 */ + case EM_CYGNUS_MN10200: + case EM_MN10200: return "mn10200"; + case EM_PJ: return "picoJava"; case EM_OR1K: return "OpenRISC 1000"; - case EM_CRX: return "National Semiconductor CRX microprocessor"; - case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY"; - case EM_DLX: return "OpenDLX"; - case EM_IP2K_OLD: - case EM_IP2K: return "Ubicom IP2xxx 8-bit microcontrollers"; - case EM_IQ2000: return "Vitesse IQ2000"; + case EM_ARC_COMPACT: return "ARCompact"; case EM_XTENSA_OLD: case EM_XTENSA: return "Tensilica Xtensa Processor"; case EM_VIDEOCORE: return "Alphamosaic VideoCore processor"; case EM_TMM_GPP: return "Thompson Multimedia General Purpose Processor"; case EM_NS32K: return "National Semiconductor 32000 series"; case EM_TPC: return "Tenor Network TPC processor"; - case EM_ST200: return "STMicroelectronics ST200 microcontroller"; + case EM_SNP1K: return "Trebia SNP 1000 processor"; + /* 100 */ + case EM_ST200: return "STMicroelectronics ST200 microcontroller"; + case EM_IP2K_OLD: + case EM_IP2K: return "Ubicom IP2xxx 8-bit microcontrollers"; case EM_MAX: return "MAX Processor"; case EM_CR: return "National Semiconductor CompactRISC"; case EM_F2MC16: return "Fujitsu F2MC16"; case EM_MSP430: return "Texas Instruments msp430 microcontroller"; - case EM_LATTICEMICO32: return "Lattice Mico32"; - case EM_M32C_OLD: - case EM_M32C: return "Renesas M32c"; - case EM_MT: return "Morpho Techologies MT processor"; case EM_BLACKFIN: return "Analog Devices Blackfin"; case EM_SE_C33: return "S1C33 Family of Seiko Epson processors"; case EM_SEP: return "Sharp embedded microprocessor"; case EM_ARCA: return "Arca RISC microprocessor"; + /* 110 */ case EM_UNICORE: return "Unicore"; case EM_EXCESS: return "eXcess 16/32/64-bit configurable embedded CPU"; case EM_DXP: return "Icera Semiconductor Inc. Deep Execution Processor"; - case EM_NIOS32: return "Altera Nios"; case EM_ALTERA_NIOS2: return "Altera Nios II"; + case EM_CRX: return "National Semiconductor CRX microprocessor"; + case EM_XGATE: return "Motorola XGATE embedded processor"; case EM_C166: case EM_XC16X: return "Infineon Technologies xc16x"; case EM_M16C: return "Renesas M16C series microprocessors"; case EM_DSPIC30F: return "Microchip Technology dsPIC30F Digital Signal Controller"; case EM_CE: return "Freescale Communication Engine RISC core"; + /* 120 */ + case EM_M32C: return "Renesas M32c"; + /* 130 */ case EM_TSK3000: return "Altium TSK3000 core"; case EM_RS08: return "Freescale RS08 embedded processor"; case EM_ECOG2: return "Cyan Technology eCOG2 microprocessor"; + case EM_SCORE: return "SUNPLUS S+Core"; case EM_DSP24: return "New Japan Radio (NJR) 24-bit DSP Processor"; case EM_VIDEOCORE3: return "Broadcom VideoCore III processor"; + case EM_LATTICEMICO32: return "Lattice Mico32"; case EM_SE_C17: return "Seiko Epson C17 family"; + /* 140 */ case EM_TI_C6000: return "Texas Instruments TMS320C6000 DSP family"; case EM_TI_C2000: return "Texas Instruments TMS320C2000 DSP family"; case EM_TI_C5500: return "Texas Instruments TMS320C55x DSP family"; + case EM_TI_PRU: return "TI PRU I/O processor"; + /* 160 */ case EM_MMDSP_PLUS: return "STMicroelectronics 64bit VLIW Data Signal Processor"; case EM_CYPRESS_M8C: return "Cypress M8C microprocessor"; case EM_R32C: return "Renesas R32C series microprocessors"; @@ -2243,27 +2426,82 @@ get_machine_name (unsigned e_machine) case EM_NDS32: return "Andes Technology compact code size embedded RISC processor family"; case EM_ECOG1X: return "Cyan Technology eCOG1X family"; case EM_MAXQ30: return "Dallas Semiconductor MAXQ30 Core microcontrollers"; + /* 170 */ case EM_XIMO16: return "New Japan Radio (NJR) 16-bit DSP Processor"; case EM_MANIK: return "M2000 Reconfigurable RISC Microprocessor"; case EM_CRAYNV2: return "Cray Inc. NV2 vector architecture"; - case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine"; - case EM_CR16: - case EM_MICROBLAZE: - case EM_MICROBLAZE_OLD: return "Xilinx MicroBlaze"; - case EM_RL78: return "Renesas RL78"; case EM_RX: return "Renesas RX"; case EM_METAG: return "Imagination Technologies Meta processor architecture"; case EM_MCST_ELBRUS: return "MCST Elbrus general purpose hardware architecture"; case EM_ECOG16: return "Cyan Technology eCOG16 family"; + case EM_CR16: + case EM_MICROBLAZE: + case EM_MICROBLAZE_OLD: return "Xilinx MicroBlaze"; case EM_ETPU: return "Freescale Extended Time Processing Unit"; case EM_SLE9X: return "Infineon Technologies SLE9X core"; - case EM_AVR32: return "Atmel Corporation 32-bit microprocessor family"; + /* 180 */ + case EM_L1OM: return "Intel L1OM"; + case EM_K1OM: return "Intel K1OM"; + case EM_INTEL182: return "Intel (reserved)"; + case EM_AARCH64: return "AArch64"; + case EM_ARM184: return "ARM (reserved)"; + case EM_AVR32: return "Atmel Corporation 32-bit microprocessor"; case EM_STM8: return "STMicroeletronics STM8 8-bit microcontroller"; case EM_TILE64: return "Tilera TILE64 multicore architecture family"; case EM_TILEPRO: return "Tilera TILEPro multicore architecture family"; - case EM_TILEGX: return "Tilera TILE-Gx multicore architecture family"; + /* 190 */ case EM_CUDA: return "NVIDIA CUDA architecture"; - case EM_XGATE: return "Motorola XGATE embedded processor"; + case EM_TILEGX: return "Tilera TILE-Gx multicore architecture family"; + case EM_CLOUDSHIELD: return "CloudShield architecture family"; + case EM_COREA_1ST: return "KIPO-KAIST Core-A 1st generation processor family"; + case EM_COREA_2ND: return "KIPO-KAIST Core-A 2nd generation processor family"; + case EM_ARC_COMPACT2: return "ARCv2"; + case EM_OPEN8: return "Open8 8-bit RISC soft processor core"; + case EM_RL78: return "Renesas RL78"; + case EM_VIDEOCORE5: return "Broadcom VideoCore V processor"; + case EM_78K0R: return "Renesas 78K0R"; + /* 200 */ + case EM_56800EX: return "Freescale 56800EX Digital Signal Controller (DSC)"; + case EM_BA1: return "Beyond BA1 CPU architecture"; + case EM_BA2: return "Beyond BA2 CPU architecture"; + case EM_XCORE: return "XMOS xCORE processor family"; + case EM_MCHP_PIC: return "Microchip 8-bit PIC(r) family"; + /* 210 */ + case EM_KM32: return "KM211 KM32 32-bit processor"; + case EM_KMX32: return "KM211 KMX32 32-bit processor"; + case EM_KMX16: return "KM211 KMX16 16-bit processor"; + case EM_KMX8: return "KM211 KMX8 8-bit processor"; + case EM_KVARC: return "KM211 KVARC processor"; + case EM_CDP: return "Paneve CDP architecture family"; + case EM_COGE: return "Cognitive Smart Memory Processor"; + case EM_COOL: return "Bluechip Systems CoolEngine"; + case EM_NORC: return "Nanoradio Optimized RISC"; + case EM_CSR_KALIMBA: return "CSR Kalimba architecture family"; + /* 220 */ + case EM_Z80: return "Zilog Z80"; + case EM_VISIUM: return "CDS VISIUMcore processor"; + case EM_FT32: return "FTDI Chip FT32"; + case EM_MOXIE: return "Moxie"; + case EM_AMDGPU: return "AMD GPU"; + case EM_RISCV: return "RISC-V"; + case EM_LANAI: return "Lanai 32-bit processor"; + case EM_BPF: return "Linux BPF"; + case EM_NFP: return "Netronome Flow Processor"; + + /* Large numbers... */ + case EM_MT: return "Morpho Techologies MT processor"; + case EM_ALPHA: return "Alpha"; + case EM_WEBASSEMBLY: return "Web Assembly"; + case EM_DLX: return "OpenDLX"; + case EM_XSTORMY16: return "Sanyo XStormy16 CPU core"; + case EM_IQ2000: return "Vitesse IQ2000"; + case EM_M32C_OLD: + case EM_NIOS32: return "Altera Nios"; + case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine"; + case EM_ADAPTEVA_EPIPHANY: return "Adapteva EPIPHANY"; + case EM_CYGNUS_FRV: return "Fujitsu FR-V"; + case EM_S12Z: return "Freescale S12Z"; + default: snprintf (buff, sizeof (buff), _(": 0x%x"), e_machine); return buff; @@ -2271,28 +2509,104 @@ get_machine_name (unsigned e_machine) } static void -decode_ARM_machine_flags (unsigned e_flags, char buf[]) +decode_ARC_machine_flags (unsigned e_flags, unsigned e_machine, char buf[]) { - unsigned eabi; - int unknown = 0; + /* ARC has two machine types EM_ARC_COMPACT and EM_ARC_COMPACT2. Some + other compilers don't a specific architecture type in the e_flags, and + instead use EM_ARC_COMPACT for old ARC600, ARC601, and ARC700 + architectures, and switch to EM_ARC_COMPACT2 for newer ARCEM and ARCHS + architectures. - eabi = EF_ARM_EABI_VERSION (e_flags); - e_flags &= ~ EF_ARM_EABIMASK; + Th GNU tools follows this use of EM_ARC_COMPACT and EM_ARC_COMPACT2, + but also sets a specific architecture type in the e_flags field. - /* Handle "generic" ARM flags. */ - if (e_flags & EF_ARM_RELEXEC) - { - strcat (buf, ", relocatable executable"); - e_flags &= ~ EF_ARM_RELEXEC; - } + However, when decoding the flags we don't worry if we see an + unexpected pairing, for example EM_ARC_COMPACT machine type, with + ARCEM architecture type. */ - /* Now handle EABI specific flags. */ - switch (eabi) + switch (e_flags & EF_ARC_MACH_MSK) { - default: + /* We only expect these to occur for EM_ARC_COMPACT2. */ + case EF_ARC_CPU_ARCV2EM: + strcat (buf, ", ARC EM"); + break; + case EF_ARC_CPU_ARCV2HS: + strcat (buf, ", ARC HS"); + break; + + /* We only expect these to occur for EM_ARC_COMPACT. */ + case E_ARC_MACH_ARC600: + strcat (buf, ", ARC600"); + break; + case E_ARC_MACH_ARC601: + strcat (buf, ", ARC601"); + break; + case E_ARC_MACH_ARC700: + strcat (buf, ", ARC700"); + break; + + /* The only times we should end up here are (a) A corrupt ELF, (b) A + new ELF with new architecture being read by an old version of + readelf, or (c) An ELF built with non-GNU compiler that does not + set the architecture in the e_flags. */ + default: + if (e_machine == EM_ARC_COMPACT) + strcat (buf, ", Unknown ARCompact"); + else + strcat (buf, ", Unknown ARC"); + break; + } + + switch (e_flags & EF_ARC_OSABI_MSK) + { + case E_ARC_OSABI_ORIG: + strcat (buf, ", (ABI:legacy)"); + break; + case E_ARC_OSABI_V2: + strcat (buf, ", (ABI:v2)"); + break; + /* Only upstream 3.9+ kernels will support ARCv2 ISA. */ + case E_ARC_OSABI_V3: + strcat (buf, ", v3 no-legacy-syscalls ABI"); + break; + case E_ARC_OSABI_V4: + strcat (buf, ", v4 ABI"); + break; + default: + strcat (buf, ", unrecognised ARC OSABI flag"); + break; + } +} + +static void +decode_ARM_machine_flags (unsigned e_flags, char buf[]) +{ + unsigned eabi; + bfd_boolean unknown = FALSE; + + eabi = EF_ARM_EABI_VERSION (e_flags); + e_flags &= ~ EF_ARM_EABIMASK; + + /* Handle "generic" ARM flags. */ + if (e_flags & EF_ARM_RELEXEC) + { + strcat (buf, ", relocatable executable"); + e_flags &= ~ EF_ARM_RELEXEC; + } + + if (e_flags & EF_ARM_PIC) + { + strcat (buf, ", position independent"); + e_flags &= ~ EF_ARM_PIC; + } + + /* Now handle EABI specific flags. */ + switch (eabi) + { + default: strcat (buf, ", "); if (e_flags) - unknown = 1; + unknown = TRUE; break; case EF_ARM_EABI_VER1: @@ -2312,7 +2626,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2343,7 +2657,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2374,10 +2688,9 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } - break; } break; @@ -2410,7 +2723,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2469,7 +2782,7 @@ decode_ARM_machine_flags (unsigned e_flags, char buf[]) break; default: - unknown = 1; + unknown = TRUE; break; } } @@ -2557,8 +2870,8 @@ decode_NDS32_machine_flags (unsigned e_flags, char buf[], size_t size) unsigned arch; unsigned config; unsigned version; - int has_fpu = 0; - int r = 0; + bfd_boolean has_fpu = FALSE; + unsigned int r = 0; static const char *ABI_STRINGS[] = { @@ -2694,19 +3007,19 @@ decode_NDS32_machine_flags (unsigned e_flags, char buf[], size_t size) if (config & E_NDS32_HAS_FPU_INST) { - has_fpu = 1; + has_fpu = TRUE; r += snprintf (buf + r, size -r, ", FPU_SP"); } if (config & E_NDS32_HAS_FPU_DP_INST) { - has_fpu = 1; + has_fpu = TRUE; r += snprintf (buf + r, size -r, ", FPU_DP"); } if (config & E_NDS32_HAS_FPU_MAC_INST) { - has_fpu = 1; + has_fpu = TRUE; r += snprintf (buf + r, size -r, ", FPU_MAC"); } @@ -2754,7 +3067,7 @@ decode_NDS32_machine_flags (unsigned e_flags, char buf[], size_t size) } static char * -get_machine_flags (unsigned e_flags, unsigned e_machine) +get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) { static char buf[1024]; @@ -2768,81 +3081,9 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) break; case EM_ARC_COMPACT2: - switch (e_flags & EF_ARC_MACH_MSK) - { - case EF_ARC_CPU_ARCV2EM: - strcat (buf, ", ARC EM"); - break; - case EF_ARC_CPU_ARCV2HS: - strcat (buf, ", ARC HS"); - break; - case EF_ARC_CPU_GENERIC: - strcat (buf, ", ARC generic"); - break; - case E_ARC_MACH_ARC600: - strcat (buf, ", ARC600"); - break; - case E_ARC_MACH_ARC601: - strcat (buf, ", ARC601"); - break; - case E_ARC_MACH_ARC700: - strcat (buf, ", ARC700"); - break; - default: - strcat (buf, ", unrecognized cpu flag for ARCv2"); - break; - } - switch (e_flags & EF_ARC_OSABI_MSK) - { - case E_ARC_OSABI_ORIG: - strcat (buf, ", (ABI:legacy)"); - break; - case E_ARC_OSABI_V2: - strcat (buf, ", (ABI:v2)"); - break; - /* Only upstream 3.9+ kernels will support ARCv2 ISA. */ - case E_ARC_OSABI_V3: - strcat (buf, ", v3 no-legacy-syscalls ABI"); - break; - default: - strcat (buf, ", unrecognised ARC OSABI flag"); - break; - } - break; - case EM_ARC_COMPACT: - switch (e_flags & EF_ARC_MACH_MSK) - { - case E_ARC_MACH_ARC600: - strcat (buf, ", ARC 600"); - break; - case E_ARC_MACH_ARC601: - strcat (buf, ", ARC 601"); - break; - case E_ARC_MACH_ARC700: - strcat (buf, ", ARC 700"); - break; - default: - strcat (buf, ", Generic ARCompact"); - break; - } - switch (e_flags & EF_ARC_OSABI_MSK) - { - case E_ARC_OSABI_ORIG: - strcat (buf, ", legacy syscall ABI"); - break; - case E_ARC_OSABI_V2: - /* For 3.2+ Linux kernels which use asm-generic - hdrs. */ - strcat (buf, ", v2 syscall ABI"); - break; - case E_ARC_OSABI_V3: - /* Upstream 3.9+ kernels which don't use any legacy - syscalls. */ - strcat (buf, ", v3 no-legacy-syscalls ABI"); - break; - } - break; + decode_ARC_machine_flags (e_flags, e_machine, buf); + break; case EM_ARM: decode_ARM_machine_flags (e_flags, buf); @@ -3151,6 +3392,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_4650: strcat (buf, ", 4650"); break; case E_MIPS_MACH_5400: strcat (buf, ", 5400"); break; case E_MIPS_MACH_5500: strcat (buf, ", 5500"); break; + case E_MIPS_MACH_5900: strcat (buf, ", 5900"); break; case E_MIPS_MACH_SB1: strcat (buf, ", sb1"); break; case E_MIPS_MACH_9000: strcat (buf, ", 9000"); break; case E_MIPS_MACH_LS2E: strcat (buf, ", loongson-2e"); break; @@ -3160,6 +3402,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) case E_MIPS_MACH_OCTEON2: strcat (buf, ", octeon2"); break; case E_MIPS_MACH_OCTEON3: strcat (buf, ", octeon3"); break; case E_MIPS_MACH_XLR: strcat (buf, ", xlr"); break; + case E_MIPS_MACH_IAMR2: strcat (buf, ", interaptiv-mr2"); break; case 0: /* We simply ignore the field in this case to avoid confusion: MIPS ELF does not specify EF_MIPS_MACH, it is a GNU @@ -3213,6 +3456,45 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) decode_NDS32_machine_flags (e_flags, buf, sizeof buf); break; + case EM_NFP: + switch (EF_NFP_MACH (e_flags)) + { + case E_NFP_MACH_3200: + strcat (buf, ", NFP-32xx"); + break; + case E_NFP_MACH_6000: + strcat (buf, ", NFP-6xxx"); + break; + } + break; + + case EM_RISCV: + if (e_flags & EF_RISCV_RVC) + strcat (buf, ", RVC"); + + if (e_flags & EF_RISCV_RVE) + strcat (buf, ", RVE"); + + switch (e_flags & EF_RISCV_FLOAT_ABI) + { + case EF_RISCV_FLOAT_ABI_SOFT: + strcat (buf, ", soft-float ABI"); + break; + + case EF_RISCV_FLOAT_ABI_SINGLE: + strcat (buf, ", single-float ABI"); + break; + + case EF_RISCV_FLOAT_ABI_DOUBLE: + strcat (buf, ", double-float ABI"); + break; + + case EF_RISCV_FLOAT_ABI_QUAD: + strcat (buf, ", quad-float ABI"); + break; + } + break; + case EM_SH: switch ((e_flags & EF_SH_MACH_MASK)) { @@ -3329,7 +3611,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) strcat (buf, ", constant gp"); if ((e_flags & EF_IA_64_ABSOLUTE)) strcat (buf, ", absolute"); - if (elf_header.e_ident[EI_OSABI] == ELFOSABI_OPENVMS) + if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_OPENVMS) { if ((e_flags & EF_IA_64_VMS_LINKAGES)) strcat (buf, ", vms_linkages"); @@ -3442,7 +3724,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine) } static const char * -get_osabi_name (unsigned int osabi) +get_osabi_name (Filedata * filedata, unsigned int osabi) { static char buff[32]; @@ -3463,14 +3745,17 @@ get_osabi_name (unsigned int osabi) case ELFOSABI_NSK: return "HP - Non-Stop Kernel"; case ELFOSABI_AROS: return "AROS"; case ELFOSABI_FENIXOS: return "FenixOS"; + case ELFOSABI_CLOUDABI: return "Nuxi CloudABI"; + case ELFOSABI_OPENVOS: return "Stratus Technologies OpenVOS"; default: if (osabi >= 64) - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_ARM: switch (osabi) { case ELFOSABI_ARM: return "ARM"; + case ELFOSABI_ARM_FDPIC: return "ARM FDPIC"; default: break; } @@ -3510,13 +3795,9 @@ get_aarch64_segment_type (unsigned long type) { switch (type) { - case PT_AARCH64_ARCHEXT: - return "AARCH64_ARCHEXT"; - default: - break; + case PT_AARCH64_ARCHEXT: return "AARCH64_ARCHEXT"; + default: return NULL; } - - return NULL; } static const char * @@ -3524,13 +3805,19 @@ get_arm_segment_type (unsigned long type) { switch (type) { - case PT_ARM_EXIDX: - return "EXIDX"; - default: - break; + case PT_ARM_EXIDX: return "EXIDX"; + default: return NULL; } +} - return NULL; +static const char * +get_s390_segment_type (unsigned long type) +{ + switch (type) + { + case PT_S390_PGSTE: return "S390_PGSTE"; + default: return NULL; + } } static const char * @@ -3538,19 +3825,12 @@ get_mips_segment_type (unsigned long type) { switch (type) { - case PT_MIPS_REGINFO: - return "REGINFO"; - case PT_MIPS_RTPROC: - return "RTPROC"; - case PT_MIPS_OPTIONS: - return "OPTIONS"; - case PT_MIPS_ABIFLAGS: - return "ABIFLAGS"; - default: - break; + case PT_MIPS_REGINFO: return "REGINFO"; + case PT_MIPS_RTPROC: return "RTPROC"; + case PT_MIPS_OPTIONS: return "OPTIONS"; + case PT_MIPS_ABIFLAGS: return "ABIFLAGS"; + default: return NULL; } - - return NULL; } static const char * @@ -3577,11 +3857,8 @@ get_parisc_segment_type (unsigned long type) case PT_PARISC_ARCHEXT: return "PARISC_ARCHEXT"; case PT_PARISC_UNWIND: return "PARISC_UNWIND"; case PT_PARISC_WEAKORDER: return "PARISC_WEAKORDER"; - default: - break; + default: return NULL; } - - return NULL; } static const char * @@ -3595,11 +3872,8 @@ get_ia64_segment_type (unsigned long type) case PT_IA_64_HP_OPT_ANOT: return "HP_OPT_ANNOT"; case PT_IA_64_HP_HSL_ANOT: return "HP_HSL_ANNOT"; case PT_IA_64_HP_STACK: return "HP_STACK"; - default: - break; + default: return NULL; } - - return NULL; } static const char * @@ -3607,16 +3881,30 @@ get_tic6x_segment_type (unsigned long type) { switch (type) { - case PT_C6000_PHATTR: return "C6000_PHATTR"; - default: - break; + case PT_C6000_PHATTR: return "C6000_PHATTR"; + default: return NULL; } +} - return NULL; +static const char * +get_solaris_segment_type (unsigned long type) +{ + switch (type) + { + case 0x6464e550: return "PT_SUNW_UNWIND"; + case 0x6474e550: return "PT_SUNW_EH_FRAME"; + case 0x6ffffff7: return "PT_LOSUNW"; + case 0x6ffffffa: return "PT_SUNWBSS"; + case 0x6ffffffb: return "PT_SUNWSTACK"; + case 0x6ffffffc: return "PT_SUNWDTRACE"; + case 0x6ffffffd: return "PT_SUNWCAP"; + case 0x6fffffff: return "PT_HISUNW"; + default: return NULL; + } } static const char * -get_segment_type (unsigned long p_type) +get_segment_type (Filedata * filedata, unsigned long p_type) { static char buff[32]; @@ -3630,18 +3918,21 @@ get_segment_type (unsigned long p_type) case PT_SHLIB: return "SHLIB"; case PT_PHDR: return "PHDR"; case PT_TLS: return "TLS"; - - case PT_GNU_EH_FRAME: - return "GNU_EH_FRAME"; + case PT_GNU_EH_FRAME: return "GNU_EH_FRAME"; case PT_GNU_STACK: return "GNU_STACK"; case PT_GNU_RELRO: return "GNU_RELRO"; default: - if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) + if (p_type >= PT_GNU_MBIND_LO && p_type <= PT_GNU_MBIND_HI) + { + sprintf (buff, "GNU_MBIND+%#lx", + p_type - PT_GNU_MBIND_LO); + } + else if ((p_type >= PT_LOPROC) && (p_type <= PT_HIPROC)) { const char * result; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_AARCH64: result = get_aarch64_segment_type (p_type); @@ -3662,6 +3953,10 @@ get_segment_type (unsigned long p_type) case EM_TI_C6000: result = get_tic6x_segment_type (p_type); break; + case EM_S390: + case EM_S390_OLD: + result = get_s390_segment_type (p_type); + break; default: result = NULL; break; @@ -3670,13 +3965,13 @@ get_segment_type (unsigned long p_type) if (result != NULL) return result; - sprintf (buff, "LOPROC+%lx", p_type - PT_LOPROC); + sprintf (buff, "LOPROC+%#lx", p_type - PT_LOPROC); } else if ((p_type >= PT_LOOS) && (p_type <= PT_HIOS)) { const char * result; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_PARISC: result = get_parisc_segment_type (p_type); @@ -3685,14 +3980,17 @@ get_segment_type (unsigned long p_type) result = get_ia64_segment_type (p_type); break; default: - result = NULL; + if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_segment_type (p_type); + else + result = NULL; break; } if (result != NULL) return result; - sprintf (buff, "LOOS+%lx", p_type - PT_LOOS); + sprintf (buff, "LOOS+%#lx", p_type - PT_LOOS); } else snprintf (buff, sizeof (buff), _(": %lx"), p_type); @@ -3701,6 +3999,18 @@ get_segment_type (unsigned long p_type) } } +static const char * +get_arc_section_type_name (unsigned int sh_type) +{ + switch (sh_type) + { + case SHT_ARC_ATTRIBUTES: return "ARC_ATTRIBUTES"; + default: + break; + } + return NULL; +} + static const char * get_mips_section_type_name (unsigned int sh_type) { @@ -3764,18 +4074,16 @@ get_parisc_section_type_name (unsigned int sh_type) case SHT_PARISC_SYMEXTN: return "PARISC_SYMEXTN"; case SHT_PARISC_STUBS: return "PARISC_STUBS"; case SHT_PARISC_DLKM: return "PARISC_DLKM"; - default: - break; + default: return NULL; } - return NULL; } static const char * -get_ia64_section_type_name (unsigned int sh_type) +get_ia64_section_type_name (Filedata * filedata, unsigned int sh_type) { /* If the top 8 bits are 0x78 the next 8 are the os/abi ID. */ if ((sh_type & 0xFF000000) == SHT_IA_64_LOPSREG) - return get_osabi_name ((sh_type & 0x00FF0000) >> 16); + return get_osabi_name (filedata, (sh_type & 0x00FF0000) >> 16); switch (sh_type) { @@ -3801,10 +4109,8 @@ get_x86_64_section_type_name (unsigned int sh_type) switch (sh_type) { case SHT_X86_64_UNWIND: return "X86_64_UNWIND"; - default: - break; + default: return NULL; } - return NULL; } static const char * @@ -3812,12 +4118,9 @@ get_aarch64_section_type_name (unsigned int sh_type) { switch (sh_type) { - case SHT_AARCH64_ATTRIBUTES: - return "AARCH64_ATTRIBUTES"; - default: - break; + case SHT_AARCH64_ATTRIBUTES: return "AARCH64_ATTRIBUTES"; + default: return NULL; } - return NULL; } static const char * @@ -3830,10 +4133,8 @@ get_arm_section_type_name (unsigned int sh_type) case SHT_ARM_ATTRIBUTES: return "ARM_ATTRIBUTES"; case SHT_ARM_DEBUGOVERLAY: return "ARM_DEBUGOVERLAY"; case SHT_ARM_OVERLAYSECTION: return "ARM_OVERLAYSECTION"; - default: - break; + default: return NULL; } - return NULL; } static const char * @@ -3841,26 +4142,16 @@ get_tic6x_section_type_name (unsigned int sh_type) { switch (sh_type) { - case SHT_C6000_UNWIND: - return "C6000_UNWIND"; - case SHT_C6000_PREEMPTMAP: - return "C6000_PREEMPTMAP"; - case SHT_C6000_ATTRIBUTES: - return "C6000_ATTRIBUTES"; - case SHT_TI_ICODE: - return "TI_ICODE"; - case SHT_TI_XREF: - return "TI_XREF"; - case SHT_TI_HANDLER: - return "TI_HANDLER"; - case SHT_TI_INITINFO: - return "TI_INITINFO"; - case SHT_TI_PHATTRS: - return "TI_PHATTRS"; - default: - break; + case SHT_C6000_UNWIND: return "C6000_UNWIND"; + case SHT_C6000_PREEMPTMAP: return "C6000_PREEMPTMAP"; + case SHT_C6000_ATTRIBUTES: return "C6000_ATTRIBUTES"; + case SHT_TI_ICODE: return "TI_ICODE"; + case SHT_TI_XREF: return "TI_XREF"; + case SHT_TI_HANDLER: return "TI_HANDLER"; + case SHT_TI_INITINFO: return "TI_INITINFO"; + case SHT_TI_PHATTRS: return "TI_PHATTRS"; + default: return NULL; } - return NULL; } static const char * @@ -3868,10 +4159,22 @@ get_msp430x_section_type_name (unsigned int sh_type) { switch (sh_type) { - case SHT_MSP430_SEC_FLAGS: return "MSP430_SEC_FLAGS"; - case SHT_MSP430_SYM_ALIASES: return "MSP430_SYM_ALIASES"; - case SHT_MSP430_ATTRIBUTES: return "MSP430_ATTRIBUTES"; - default: return NULL; + case SHT_MSP430_SEC_FLAGS: return "MSP430_SEC_FLAGS"; + case SHT_MSP430_SYM_ALIASES: return "MSP430_SYM_ALIASES"; + case SHT_MSP430_ATTRIBUTES: return "MSP430_ATTRIBUTES"; + default: return NULL; + } +} + +static const char * +get_nfp_section_type_name (unsigned int sh_type) +{ + switch (sh_type) + { + case SHT_NFP_MECONFIG: return "NFP_MECONFIG"; + case SHT_NFP_INITREG: return "NFP_INITREG"; + case SHT_NFP_UDEBUG: return "NFP_UDEBUG"; + default: return NULL; } } @@ -3880,19 +4183,20 @@ get_v850_section_type_name (unsigned int sh_type) { switch (sh_type) { - case SHT_V850_SCOMMON: return "V850 Small Common"; - case SHT_V850_TCOMMON: return "V850 Tiny Common"; - case SHT_V850_ZCOMMON: return "V850 Zero Common"; - case SHT_RENESAS_IOP: return "RENESAS IOP"; - case SHT_RENESAS_INFO: return "RENESAS INFO"; - default: return NULL; + case SHT_V850_SCOMMON: return "V850 Small Common"; + case SHT_V850_TCOMMON: return "V850 Tiny Common"; + case SHT_V850_ZCOMMON: return "V850 Zero Common"; + case SHT_RENESAS_IOP: return "RENESAS IOP"; + case SHT_RENESAS_INFO: return "RENESAS INFO"; + default: return NULL; } } static const char * -get_section_type_name (unsigned int sh_type) +get_section_type_name (Filedata * filedata, unsigned int sh_type) { static char buff[32]; + const char * result; switch (sh_type) { @@ -3913,7 +4217,7 @@ get_section_type_name (unsigned int sh_type) case SHT_PREINIT_ARRAY: return "PREINIT_ARRAY"; case SHT_GNU_HASH: return "GNU_HASH"; case SHT_GROUP: return "GROUP"; - case SHT_SYMTAB_SHNDX: return "SYMTAB SECTION INDICIES"; + case SHT_SYMTAB_SHNDX: return "SYMTAB SECTION INDICES"; case SHT_GNU_verdef: return "VERDEF"; case SHT_GNU_verneed: return "VERNEED"; case SHT_GNU_versym: return "VERSYM"; @@ -3926,10 +4230,13 @@ get_section_type_name (unsigned int sh_type) default: if ((sh_type >= SHT_LOPROC) && (sh_type <= SHT_HIPROC)) { - const char * result; - - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { + case EM_ARC: + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + result = get_arc_section_type_name (sh_type); + break; case EM_MIPS: case EM_MIPS_RS3_LE: result = get_mips_section_type_name (sh_type); @@ -3938,7 +4245,7 @@ get_section_type_name (unsigned int sh_type) result = get_parisc_section_type_name (sh_type); break; case EM_IA_64: - result = get_ia64_section_type_name (sh_type); + result = get_ia64_section_type_name (filedata, sh_type); break; case EM_X86_64: case EM_L1OM: @@ -3957,6 +4264,9 @@ get_section_type_name (unsigned int sh_type) case EM_MSP430: result = get_msp430x_section_type_name (sh_type); break; + case EM_NFP: + result = get_nfp_section_type_name (sh_type); + break; case EM_V800: case EM_V850: case EM_CYGNUS_V850: @@ -3970,40 +4280,57 @@ get_section_type_name (unsigned int sh_type) if (result != NULL) return result; - sprintf (buff, "LOPROC+%x", sh_type - SHT_LOPROC); + sprintf (buff, "LOPROC+%#x", sh_type - SHT_LOPROC); } else if ((sh_type >= SHT_LOOS) && (sh_type <= SHT_HIOS)) { - const char * result; - - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_IA_64: - result = get_ia64_section_type_name (sh_type); + result = get_ia64_section_type_name (filedata, sh_type); break; default: - result = NULL; + if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + result = get_solaris_section_type (sh_type); + else + { + switch (sh_type) + { + case SHT_GNU_INCREMENTAL_INPUTS: result = "GNU_INCREMENTAL_INPUTS"; break; + case SHT_GNU_ATTRIBUTES: result = "GNU_ATTRIBUTES"; break; + case SHT_GNU_HASH: result = "GNU_HASH"; break; + case SHT_GNU_LIBLIST: result = "GNU_LIBLIST"; break; + default: + result = NULL; + break; + } + } break; } if (result != NULL) return result; - sprintf (buff, "LOOS+%x", sh_type - SHT_LOOS); + sprintf (buff, "LOOS+%#x", sh_type - SHT_LOOS); } else if ((sh_type >= SHT_LOUSER) && (sh_type <= SHT_HIUSER)) { - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_V800: case EM_V850: case EM_CYGNUS_V850: - return get_v850_section_type_name (sh_type); + result = get_v850_section_type_name (sh_type); + break; default: + result = NULL; break; } - sprintf (buff, "LOUSER+%x", sh_type - SHT_LOUSER); + if (result != NULL) + return result; + + sprintf (buff, "LOUSER+%#x", sh_type - SHT_LOUSER); } else /* This message is probably going to be displayed in a 15 @@ -4096,12 +4423,12 @@ usage (FILE * stream) -R --relocated-dump=\n\ Dump the contents of section as relocated bytes\n\ -z --decompress Decompress section before dumping it\n\ - -w[lLiaprmfFsoRt] or\n\ + -w[lLiaprmfFsoRtUuTgAckK] or\n\ --debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n\ =frames-interp,=str,=loc,=Ranges,=pubtypes,\n\ =gdb_index,=trace_info,=trace_abbrev,=trace_aranges,\n\ - =addr,=cu_index]\n\ - Display the contents of DWARF2 debug sections\n")); + =addr,=cu_index,=links,=follow-links]\n\ + Display the contents of DWARF debug sections\n")); fprintf (stream, _("\ --dwarf-depth=N Do not display DIEs at depth N or greater\n\ --dwarf-start=N Display DIEs starting with N, at the same depth\n\ @@ -4130,33 +4457,35 @@ usage (FILE * stream) the first time. */ static void -request_dump_bynumber (unsigned int section, dump_type type) +request_dump_bynumber (Filedata * filedata, unsigned int section, dump_type type) { - if (section >= num_dump_sects) + if (section >= filedata->num_dump_sects) { dump_type * new_dump_sects; new_dump_sects = (dump_type *) calloc (section + 1, - sizeof (* dump_sects)); + sizeof (* new_dump_sects)); if (new_dump_sects == NULL) error (_("Out of memory allocating dump request table.\n")); else { - /* Copy current flag settings. */ - memcpy (new_dump_sects, dump_sects, num_dump_sects * sizeof (* dump_sects)); + if (filedata->dump_sects) + { + /* Copy current flag settings. */ + memcpy (new_dump_sects, filedata->dump_sects, + filedata->num_dump_sects * sizeof (* new_dump_sects)); - free (dump_sects); + free (filedata->dump_sects); + } - dump_sects = new_dump_sects; - num_dump_sects = section + 1; + filedata->dump_sects = new_dump_sects; + filedata->num_dump_sects = section + 1; } } - if (dump_sects) - dump_sects[section] |= type; - - return; + if (filedata->dump_sects) + filedata->dump_sects[section] |= type; } /* Request a dump by section name. */ @@ -4182,7 +4511,7 @@ request_dump_byname (const char * section, dump_type type) } static inline void -request_dump (dump_type type) +request_dump (Filedata * filedata, dump_type type) { int section; char * cp; @@ -4191,14 +4520,13 @@ request_dump (dump_type type) section = strtoul (optarg, & cp, 0); if (! *cp && section >= 0) - request_dump_bynumber (section, type); + request_dump_bynumber (filedata, section, type); else request_dump_byname (optarg, type); } - static void -parse_args (int argc, char ** argv) +parse_args (Filedata * filedata, int argc, char ** argv) { int c; @@ -4218,100 +4546,100 @@ parse_args (int argc, char ** argv) break; case 'a': - do_syms++; - do_reloc++; - do_unwind++; - do_dynamic++; - do_header++; - do_sections++; - do_section_groups++; - do_segments++; - do_version++; - do_histogram++; - do_arch++; - do_notes++; + do_syms = TRUE; + do_reloc = TRUE; + do_unwind = TRUE; + do_dynamic = TRUE; + do_header = TRUE; + do_sections = TRUE; + do_section_groups = TRUE; + do_segments = TRUE; + do_version = TRUE; + do_histogram = TRUE; + do_arch = TRUE; + do_notes = TRUE; break; case 'g': - do_section_groups++; + do_section_groups = TRUE; break; case 't': case 'N': - do_sections++; - do_section_details++; + do_sections = TRUE; + do_section_details = TRUE; break; case 'e': - do_header++; - do_sections++; - do_segments++; + do_header = TRUE; + do_sections = TRUE; + do_segments = TRUE; break; case 'A': - do_arch++; + do_arch = TRUE; break; case 'D': - do_using_dynamic++; + do_using_dynamic = TRUE; break; case 'r': - do_reloc++; + do_reloc = TRUE; break; case 'u': - do_unwind++; + do_unwind = TRUE; break; case 'h': - do_header++; + do_header = TRUE; break; case 'l': - do_segments++; + do_segments = TRUE; break; case 's': - do_syms++; + do_syms = TRUE; break; case 'S': - do_sections++; + do_sections = TRUE; break; case 'd': - do_dynamic++; + do_dynamic = TRUE; break; case 'I': - do_histogram++; + do_histogram = TRUE; break; case 'n': - do_notes++; + do_notes = TRUE; break; case 'c': - do_archive_index++; + do_archive_index = TRUE; break; case 'x': - request_dump (HEX_DUMP); + request_dump (filedata, HEX_DUMP); break; case 'p': - request_dump (STRING_DUMP); + request_dump (filedata, STRING_DUMP); break; case 'R': - request_dump (RELOC_DUMP); + request_dump (filedata, RELOC_DUMP); break; case 'z': - decompress_dumps++; + decompress_dumps = TRUE; break; case 'w': - do_dump++; + do_dump = TRUE; if (optarg == 0) { - do_debugging = 1; + do_debugging = TRUE; dwarf_select_sections_all (); } else { - do_debugging = 0; + do_debugging = FALSE; dwarf_select_sections_by_letters (optarg); } break; case OPTION_DEBUG_DUMP: - do_dump++; + do_dump = TRUE; if (optarg == 0) - do_debugging = 1; + do_debugging = TRUE; else { - do_debugging = 0; + do_debugging = FALSE; dwarf_select_sections_by_names (optarg); } break; @@ -4330,29 +4658,29 @@ parse_args (int argc, char ** argv) } break; case OPTION_DWARF_CHECK: - dwarf_check = 1; + dwarf_check = TRUE; break; case OPTION_DYN_SYMS: - do_dyn_syms++; + do_dyn_syms = TRUE; break; #ifdef SUPPORT_DISASSEMBLY case 'i': - request_dump (DISASS_DUMP); + request_dump (filedata, DISASS_DUMP); break; #endif case 'v': print_version (program_name); break; case 'V': - do_version++; + do_version = TRUE; break; case 'W': - do_wide++; + do_wide = TRUE; break; default: /* xgettext:c-format */ error (_("Invalid option '-%c'\n"), c); - /* Drop through. */ + /* Fall through. */ case '?': usage (stderr); } @@ -4398,121 +4726,126 @@ get_data_encoding (unsigned int encoding) } } -/* Decode the data held in 'elf_header'. */ +/* Decode the data held in 'filedata->file_header'. */ -static int -process_file_header (void) +static bfd_boolean +process_file_header (Filedata * filedata) { - if ( elf_header.e_ident[EI_MAG0] != ELFMAG0 - || elf_header.e_ident[EI_MAG1] != ELFMAG1 - || elf_header.e_ident[EI_MAG2] != ELFMAG2 - || elf_header.e_ident[EI_MAG3] != ELFMAG3) + Elf_Internal_Ehdr * header = & filedata->file_header; + + if ( header->e_ident[EI_MAG0] != ELFMAG0 + || header->e_ident[EI_MAG1] != ELFMAG1 + || header->e_ident[EI_MAG2] != ELFMAG2 + || header->e_ident[EI_MAG3] != ELFMAG3) { error (_("Not an ELF file - it has the wrong magic bytes at the start\n")); - return 0; + return FALSE; } - init_dwarf_regnames (elf_header.e_machine); + init_dwarf_regnames (header->e_machine); if (do_header) { - int i; + unsigned i; printf (_("ELF Header:\n")); printf (_(" Magic: ")); for (i = 0; i < EI_NIDENT; i++) - printf ("%2.2x ", elf_header.e_ident[i]); + printf ("%2.2x ", header->e_ident[i]); printf ("\n"); printf (_(" Class: %s\n"), - get_elf_class (elf_header.e_ident[EI_CLASS])); + get_elf_class (header->e_ident[EI_CLASS])); printf (_(" Data: %s\n"), - get_data_encoding (elf_header.e_ident[EI_DATA])); + get_data_encoding (header->e_ident[EI_DATA])); printf (_(" Version: %d %s\n"), - elf_header.e_ident[EI_VERSION], - (elf_header.e_ident[EI_VERSION] == EV_CURRENT + header->e_ident[EI_VERSION], + (header->e_ident[EI_VERSION] == EV_CURRENT ? "(current)" - : (elf_header.e_ident[EI_VERSION] != EV_NONE + : (header->e_ident[EI_VERSION] != EV_NONE ? _("") : ""))); printf (_(" OS/ABI: %s\n"), - get_osabi_name (elf_header.e_ident[EI_OSABI])); + get_osabi_name (filedata, header->e_ident[EI_OSABI])); printf (_(" ABI Version: %d\n"), - elf_header.e_ident[EI_ABIVERSION]); + header->e_ident[EI_ABIVERSION]); printf (_(" Type: %s\n"), - get_file_type (elf_header.e_type)); + get_file_type (header->e_type)); printf (_(" Machine: %s\n"), - get_machine_name (elf_header.e_machine)); + get_machine_name (header->e_machine)); printf (_(" Version: 0x%lx\n"), - (unsigned long) elf_header.e_version); + (unsigned long) header->e_version); printf (_(" Entry point address: ")); - print_vma ((bfd_vma) elf_header.e_entry, PREFIX_HEX); + print_vma ((bfd_vma) header->e_entry, PREFIX_HEX); printf (_("\n Start of program headers: ")); - print_vma ((bfd_vma) elf_header.e_phoff, DEC); + print_vma ((bfd_vma) header->e_phoff, DEC); printf (_(" (bytes into file)\n Start of section headers: ")); - print_vma ((bfd_vma) elf_header.e_shoff, DEC); + print_vma ((bfd_vma) header->e_shoff, DEC); printf (_(" (bytes into file)\n")); printf (_(" Flags: 0x%lx%s\n"), - (unsigned long) elf_header.e_flags, - get_machine_flags (elf_header.e_flags, elf_header.e_machine)); + (unsigned long) header->e_flags, + get_machine_flags (filedata, header->e_flags, header->e_machine)); printf (_(" Size of this header: %ld (bytes)\n"), - (long) elf_header.e_ehsize); + (long) header->e_ehsize); printf (_(" Size of program headers: %ld (bytes)\n"), - (long) elf_header.e_phentsize); + (long) header->e_phentsize); printf (_(" Number of program headers: %ld"), - (long) elf_header.e_phnum); - if (section_headers != NULL - && elf_header.e_phnum == PN_XNUM - && section_headers[0].sh_info != 0) - printf (" (%ld)", (long) section_headers[0].sh_info); + (long) header->e_phnum); + if (filedata->section_headers != NULL + && header->e_phnum == PN_XNUM + && filedata->section_headers[0].sh_info != 0) + printf (" (%ld)", (long) filedata->section_headers[0].sh_info); putc ('\n', stdout); printf (_(" Size of section headers: %ld (bytes)\n"), - (long) elf_header.e_shentsize); + (long) header->e_shentsize); printf (_(" Number of section headers: %ld"), - (long) elf_header.e_shnum); - if (section_headers != NULL && elf_header.e_shnum == SHN_UNDEF) - printf (" (%ld)", (long) section_headers[0].sh_size); + (long) header->e_shnum); + if (filedata->section_headers != NULL && header->e_shnum == SHN_UNDEF) + printf (" (%ld)", (long) filedata->section_headers[0].sh_size); putc ('\n', stdout); printf (_(" Section header string table index: %ld"), - (long) elf_header.e_shstrndx); - if (section_headers != NULL - && elf_header.e_shstrndx == (SHN_XINDEX & 0xffff)) - printf (" (%u)", section_headers[0].sh_link); - else if (elf_header.e_shstrndx != SHN_UNDEF - && elf_header.e_shstrndx >= elf_header.e_shnum) + (long) header->e_shstrndx); + if (filedata->section_headers != NULL + && header->e_shstrndx == (SHN_XINDEX & 0xffff)) + printf (" (%u)", filedata->section_headers[0].sh_link); + else if (header->e_shstrndx != SHN_UNDEF + && header->e_shstrndx >= header->e_shnum) printf (_(" ")); putc ('\n', stdout); } - if (section_headers != NULL) + if (filedata->section_headers != NULL) { - if (elf_header.e_phnum == PN_XNUM - && section_headers[0].sh_info != 0) - elf_header.e_phnum = section_headers[0].sh_info; - if (elf_header.e_shnum == SHN_UNDEF) - elf_header.e_shnum = section_headers[0].sh_size; - if (elf_header.e_shstrndx == (SHN_XINDEX & 0xffff)) - elf_header.e_shstrndx = section_headers[0].sh_link; - else if (elf_header.e_shstrndx >= elf_header.e_shnum) - elf_header.e_shstrndx = SHN_UNDEF; - free (section_headers); - section_headers = NULL; + if (header->e_phnum == PN_XNUM + && filedata->section_headers[0].sh_info != 0) + header->e_phnum = filedata->section_headers[0].sh_info; + if (header->e_shnum == SHN_UNDEF) + header->e_shnum = filedata->section_headers[0].sh_size; + if (header->e_shstrndx == (SHN_XINDEX & 0xffff)) + header->e_shstrndx = filedata->section_headers[0].sh_link; + if (header->e_shstrndx >= header->e_shnum) + header->e_shstrndx = SHN_UNDEF; + free (filedata->section_headers); + filedata->section_headers = NULL; } - return 1; + return TRUE; } +/* Read in the program headers from FILEDATA and store them in PHEADERS. + Returns TRUE upon success, FALSE otherwise. Loads 32-bit headers. */ + static bfd_boolean -get_32bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) +get_32bit_program_headers (Filedata * filedata, Elf_Internal_Phdr * pheaders) { Elf32_External_Phdr * phdrs; Elf32_External_Phdr * external; Elf_Internal_Phdr * internal; unsigned int i; - unsigned int size = elf_header.e_phentsize; - unsigned int num = elf_header.e_phnum; + unsigned int size = filedata->file_header.e_phentsize; + unsigned int num = filedata->file_header.e_phnum; /* PR binutils/17531: Cope with unexpected section header sizes. */ if (size == 0 || num == 0) @@ -4525,13 +4858,13 @@ get_32bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) if (size > sizeof * phdrs) warn (_("The e_phentsize field in the ELF header is larger than the size of an ELF program header\n")); - phdrs = (Elf32_External_Phdr *) get_data (NULL, file, elf_header.e_phoff, + phdrs = (Elf32_External_Phdr *) get_data (NULL, filedata, filedata->file_header.e_phoff, size, num, _("program headers")); if (phdrs == NULL) return FALSE; for (i = 0, internal = pheaders, external = phdrs; - i < elf_header.e_phnum; + i < filedata->file_header.e_phnum; i++, internal++, external++) { internal->p_type = BYTE_GET (external->p_type); @@ -4548,15 +4881,18 @@ get_32bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) return TRUE; } +/* Read in the program headers from FILEDATA and store them in PHEADERS. + Returns TRUE upon success, FALSE otherwise. Loads 64-bit headers. */ + static bfd_boolean -get_64bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) +get_64bit_program_headers (Filedata * filedata, Elf_Internal_Phdr * pheaders) { Elf64_External_Phdr * phdrs; Elf64_External_Phdr * external; Elf_Internal_Phdr * internal; unsigned int i; - unsigned int size = elf_header.e_phentsize; - unsigned int num = elf_header.e_phnum; + unsigned int size = filedata->file_header.e_phentsize; + unsigned int num = filedata->file_header.e_phnum; /* PR binutils/17531: Cope with unexpected section header sizes. */ if (size == 0 || num == 0) @@ -4569,13 +4905,13 @@ get_64bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) if (size > sizeof * phdrs) warn (_("The e_phentsize field in the ELF header is larger than the size of an ELF program header\n")); - phdrs = (Elf64_External_Phdr *) get_data (NULL, file, elf_header.e_phoff, + phdrs = (Elf64_External_Phdr *) get_data (NULL, filedata, filedata->file_header.e_phoff, size, num, _("program headers")); if (!phdrs) return FALSE; for (i = 0, internal = pheaders, external = phdrs; - i < elf_header.e_phnum; + i < filedata->file_header.e_phnum; i++, internal++, external++) { internal->p_type = BYTE_GET (external->p_type); @@ -4592,75 +4928,89 @@ get_64bit_program_headers (FILE * file, Elf_Internal_Phdr * pheaders) return TRUE; } -/* Returns 1 if the program headers were read into `program_headers'. */ +/* Returns TRUE if the program headers were read into `program_headers'. */ -static int -get_program_headers (FILE * file) +static bfd_boolean +get_program_headers (Filedata * filedata) { Elf_Internal_Phdr * phdrs; /* Check cache of prior read. */ - if (program_headers != NULL) - return 1; + if (filedata->program_headers != NULL) + return TRUE; - phdrs = (Elf_Internal_Phdr *) cmalloc (elf_header.e_phnum, - sizeof (Elf_Internal_Phdr)); + /* Be kind to memory checkers by looking for + e_phnum values which we know must be invalid. */ + if (filedata->file_header.e_phnum + * (is_32bit_elf ? sizeof (Elf32_External_Phdr) : sizeof (Elf64_External_Phdr)) + >= filedata->file_size) + { + error (_("Too many program headers - %#x - the file is not that big\n"), + filedata->file_header.e_phnum); + return FALSE; + } + phdrs = (Elf_Internal_Phdr *) cmalloc (filedata->file_header.e_phnum, + sizeof (Elf_Internal_Phdr)); if (phdrs == NULL) { error (_("Out of memory reading %u program headers\n"), - elf_header.e_phnum); - return 0; + filedata->file_header.e_phnum); + return FALSE; } if (is_32bit_elf - ? get_32bit_program_headers (file, phdrs) - : get_64bit_program_headers (file, phdrs)) + ? get_32bit_program_headers (filedata, phdrs) + : get_64bit_program_headers (filedata, phdrs)) { - program_headers = phdrs; - return 1; + filedata->program_headers = phdrs; + return TRUE; } free (phdrs); - return 0; + return FALSE; } -/* Returns 1 if the program headers were loaded. */ +/* Returns TRUE if the program headers were loaded. */ -static int -process_program_headers (FILE * file) +static bfd_boolean +process_program_headers (Filedata * filedata) { Elf_Internal_Phdr * segment; unsigned int i; + Elf_Internal_Phdr * previous_load = NULL; - if (elf_header.e_phnum == 0) + if (filedata->file_header.e_phnum == 0) { /* PR binutils/12467. */ - if (elf_header.e_phoff != 0) - warn (_("possibly corrupt ELF header - it has a non-zero program" - " header offset, but no program headers\n")); + if (filedata->file_header.e_phoff != 0) + { + warn (_("possibly corrupt ELF header - it has a non-zero program" + " header offset, but no program headers\n")); + return FALSE; + } else if (do_segments) printf (_("\nThere are no program headers in this file.\n")); - return 0; + return TRUE; } if (do_segments && !do_header) { - printf (_("\nElf file type is %s\n"), get_file_type (elf_header.e_type)); - printf (_("Entry point ")); - print_vma ((bfd_vma) elf_header.e_entry, PREFIX_HEX); - printf (_("\nThere are %d program headers, starting at offset "), - elf_header.e_phnum); - print_vma ((bfd_vma) elf_header.e_phoff, DEC); - printf ("\n"); + printf (_("\nElf file type is %s\n"), get_file_type (filedata->file_header.e_type)); + printf (_("Entry point 0x%s\n"), bfd_vmatoa ("x", filedata->file_header.e_entry)); + printf (ngettext ("There is %d program header, starting at offset %s\n", + "There are %d program headers, starting at offset %s\n", + filedata->file_header.e_phnum), + filedata->file_header.e_phnum, + bfd_vmatoa ("u", filedata->file_header.e_phoff)); } - if (! get_program_headers (file)) - return 0; + if (! get_program_headers (filedata)) + return TRUE; if (do_segments) { - if (elf_header.e_phnum > 1) + if (filedata->file_header.e_phnum > 1) printf (_("\nProgram Headers:\n")); else printf (_("\nProgram Headers:\n")); @@ -4683,13 +5033,13 @@ process_program_headers (FILE * file) dynamic_addr = 0; dynamic_size = 0; - for (i = 0, segment = program_headers; - i < elf_header.e_phnum; + for (i = 0, segment = filedata->program_headers; + i < filedata->file_header.e_phnum; i++, segment++) { if (do_segments) { - printf (" %-14.14s ", get_segment_type (segment->p_type)); + printf (" %-14.14s ", get_segment_type (filedata, segment->p_type)); if (is_32bit_elf) { @@ -4761,15 +5111,46 @@ process_program_headers (FILE * file) (segment->p_flags & PF_R ? 'R' : ' '), (segment->p_flags & PF_W ? 'W' : ' '), (segment->p_flags & PF_X ? 'E' : ' ')); - print_vma (segment->p_align, HEX); + print_vma (segment->p_align, PREFIX_HEX); } - } - if (do_segments) - putc ('\n', stdout); + putc ('\n', stdout); + } switch (segment->p_type) { + case PT_LOAD: +#if 0 /* Do not warn about out of order PT_LOAD segments. Although officially + required by the ELF standard, several programs, including the Linux + kernel, make use of non-ordered segments. */ + if (previous_load + && previous_load->p_vaddr > segment->p_vaddr) + error (_("LOAD segments must be sorted in order of increasing VirtAddr\n")); +#endif + if (segment->p_memsz < segment->p_filesz) + error (_("the segment's file size is larger than its memory size\n")); + previous_load = segment; + break; + + case PT_PHDR: + /* PR 20815 - Verify that the program header is loaded into memory. */ + if (i > 0 && previous_load != NULL) + error (_("the PHDR segment must occur before any LOAD segment\n")); + if (filedata->file_header.e_machine != EM_PARISC) + { + unsigned int j; + + for (j = 1; j < filedata->file_header.e_phnum; j++) + if (filedata->program_headers[j].p_vaddr <= segment->p_vaddr + && (filedata->program_headers[j].p_vaddr + + filedata->program_headers[j].p_memsz) + >= (segment->p_vaddr + segment->p_filesz)) + break; + if (j == filedata->file_header.e_phnum) + error (_("the PHDR segment is not covered by a LOAD segment\n")); + } + break; + case PT_DYNAMIC: if (dynamic_addr) error (_("more than one dynamic segment\n")); @@ -4778,25 +5159,19 @@ process_program_headers (FILE * file) section in the DYNAMIC segment. */ dynamic_addr = segment->p_offset; dynamic_size = segment->p_filesz; - /* PR binutils/17512: Avoid corrupt dynamic section info in the segment. */ - if (dynamic_addr + dynamic_size >= current_file_size) - { - error (_("the dynamic segment offset + size exceeds the size of the file\n")); - dynamic_addr = dynamic_size = 0; - } /* Try to locate the .dynamic section. If there is a section header table, we can easily locate it. */ - if (section_headers != NULL) + if (filedata->section_headers != NULL) { Elf_Internal_Shdr * sec; - sec = find_section (".dynamic"); + sec = find_section (filedata, ".dynamic"); if (sec == NULL || sec->sh_size == 0) { /* A corresponding .dynamic section is expected, but on IA-64/OpenVMS it is OK for it to be missing. */ - if (!is_ia64_vms ()) + if (!is_ia64_vms (filedata)) error (_("no .dynamic section in the dynamic segment\n")); break; } @@ -4818,10 +5193,20 @@ process_program_headers (FILE * file) warn (_("the .dynamic section is not the first section" " in the dynamic segment.\n")); } + + /* PR binutils/17512: Avoid corrupt dynamic section info in the + segment. Check this after matching against the section headers + so we don't warn on debuginfo file (which have NOBITS .dynamic + sections). */ + if (dynamic_addr + dynamic_size >= filedata->file_size) + { + error (_("the dynamic segment offset + size exceeds the size of the file\n")); + dynamic_addr = dynamic_size = 0; + } break; case PT_INTERP: - if (fseek (file, archive_file_offset + (long) segment->p_offset, + if (fseek (filedata->handle, archive_file_offset + (long) segment->p_offset, SEEK_SET)) error (_("Unable to find program interpreter name\n")); else @@ -4833,7 +5218,7 @@ process_program_headers (FILE * file) error (_("Internal error: failed to create format string to display program interpreter\n")); program_interpreter[0] = 0; - if (fscanf (file, fmt, program_interpreter) <= 0) + if (fscanf (filedata->handle, fmt, program_interpreter) <= 0) error (_("Unable to read program interpreter name\n")); if (do_segments) @@ -4844,51 +5229,53 @@ process_program_headers (FILE * file) } } - if (do_segments && section_headers != NULL && string_table != NULL) + if (do_segments + && filedata->section_headers != NULL + && filedata->string_table != NULL) { printf (_("\n Section to Segment mapping:\n")); printf (_(" Segment Sections...\n")); - for (i = 0; i < elf_header.e_phnum; i++) + for (i = 0; i < filedata->file_header.e_phnum; i++) { unsigned int j; Elf_Internal_Shdr * section; - segment = program_headers + i; - section = section_headers + 1; + segment = filedata->program_headers + i; + section = filedata->section_headers + 1; printf (" %2.2d ", i); - for (j = 1; j < elf_header.e_shnum; j++, section++) + for (j = 1; j < filedata->file_header.e_shnum; j++, section++) { if (!ELF_TBSS_SPECIAL (section, segment) && ELF_SECTION_IN_SEGMENT_STRICT (section, segment)) - printf ("%s ", printable_section_name (section)); + printf ("%s ", printable_section_name (filedata, section)); } putc ('\n',stdout); } } - return 1; + return TRUE; } /* Find the file offset corresponding to VMA by using the program headers. */ static long -offset_from_vma (FILE * file, bfd_vma vma, bfd_size_type size) +offset_from_vma (Filedata * filedata, bfd_vma vma, bfd_size_type size) { Elf_Internal_Phdr * seg; - if (! get_program_headers (file)) + if (! get_program_headers (filedata)) { warn (_("Cannot interpret virtual addresses without program headers.\n")); return (long) vma; } - for (seg = program_headers; - seg < program_headers + elf_header.e_phnum; + for (seg = filedata->program_headers; + seg < filedata->program_headers + filedata->file_header.e_phnum; ++seg) { if (seg->p_type != PT_LOAD) @@ -4905,18 +5292,18 @@ offset_from_vma (FILE * file, bfd_vma vma, bfd_size_type size) } -/* Allocate memory and load the sections headers into the global pointer - SECTION_HEADERS. If PROBE is true, this is just a probe and we do not - generate any error messages if the load fails. */ +/* Allocate memory and load the sections headers into FILEDATA->filedata->section_headers. + If PROBE is true, this is just a probe and we do not generate any error + messages if the load fails. */ static bfd_boolean -get_32bit_section_headers (FILE * file, bfd_boolean probe) +get_32bit_section_headers (Filedata * filedata, bfd_boolean probe) { Elf32_External_Shdr * shdrs; Elf_Internal_Shdr * internal; - unsigned int i; - unsigned int size = elf_header.e_shentsize; - unsigned int num = probe ? 1 : elf_header.e_shnum; + unsigned int i; + unsigned int size = filedata->file_header.e_shentsize; + unsigned int num = probe ? 1 : filedata->file_header.e_shnum; /* PR binutils/17531: Cope with unexpected section header sizes. */ if (size == 0 || num == 0) @@ -4930,24 +5317,23 @@ get_32bit_section_headers (FILE * file, bfd_boolean probe) if (!probe && size > sizeof * shdrs) warn (_("The e_shentsize field in the ELF header is larger than the size of an ELF section header\n")); - shdrs = (Elf32_External_Shdr *) get_data (NULL, file, elf_header.e_shoff, + shdrs = (Elf32_External_Shdr *) get_data (NULL, filedata, filedata->file_header.e_shoff, size, num, probe ? NULL : _("section headers")); if (shdrs == NULL) return FALSE; - if (section_headers != NULL) - free (section_headers); - section_headers = (Elf_Internal_Shdr *) cmalloc (num, - sizeof (Elf_Internal_Shdr)); - if (section_headers == NULL) + free (filedata->section_headers); + filedata->section_headers = (Elf_Internal_Shdr *) + cmalloc (num, sizeof (Elf_Internal_Shdr)); + if (filedata->section_headers == NULL) { if (!probe) error (_("Out of memory reading %u section headers\n"), num); return FALSE; } - for (i = 0, internal = section_headers; + for (i = 0, internal = filedata->section_headers; i < num; i++, internal++) { @@ -4961,51 +5347,59 @@ get_32bit_section_headers (FILE * file, bfd_boolean probe) internal->sh_info = BYTE_GET (shdrs[i].sh_info); internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign); internal->sh_entsize = BYTE_GET (shdrs[i].sh_entsize); + if (!probe && internal->sh_link > num) + warn (_("Section %u has an out of range sh_link value of %u\n"), i, internal->sh_link); + if (!probe && internal->sh_flags & SHF_INFO_LINK && internal->sh_info > num) + warn (_("Section %u has an out of range sh_info value of %u\n"), i, internal->sh_info); } free (shdrs); return TRUE; } +/* Like get_32bit_section_headers, except that it fetches 64-bit headers. */ + static bfd_boolean -get_64bit_section_headers (FILE * file, bfd_boolean probe) +get_64bit_section_headers (Filedata * filedata, bfd_boolean probe) { - Elf64_External_Shdr * shdrs; - Elf_Internal_Shdr * internal; - unsigned int i; - unsigned int size = elf_header.e_shentsize; - unsigned int num = probe ? 1 : elf_header.e_shnum; + Elf64_External_Shdr * shdrs; + Elf_Internal_Shdr * internal; + unsigned int i; + unsigned int size = filedata->file_header.e_shentsize; + unsigned int num = probe ? 1 : filedata->file_header.e_shnum; /* PR binutils/17531: Cope with unexpected section header sizes. */ if (size == 0 || num == 0) return FALSE; + if (size < sizeof * shdrs) { if (! probe) error (_("The e_shentsize field in the ELF header is less than the size of an ELF section header\n")); return FALSE; } + if (! probe && size > sizeof * shdrs) warn (_("The e_shentsize field in the ELF header is larger than the size of an ELF section header\n")); - shdrs = (Elf64_External_Shdr *) get_data (NULL, file, elf_header.e_shoff, + shdrs = (Elf64_External_Shdr *) get_data (NULL, filedata, + filedata->file_header.e_shoff, size, num, probe ? NULL : _("section headers")); if (shdrs == NULL) return FALSE; - if (section_headers != NULL) - free (section_headers); - section_headers = (Elf_Internal_Shdr *) cmalloc (num, - sizeof (Elf_Internal_Shdr)); - if (section_headers == NULL) + free (filedata->section_headers); + filedata->section_headers = (Elf_Internal_Shdr *) + cmalloc (num, sizeof (Elf_Internal_Shdr)); + if (filedata->section_headers == NULL) { if (! probe) error (_("Out of memory reading %u section headers\n"), num); return FALSE; } - for (i = 0, internal = section_headers; + for (i = 0, internal = filedata->section_headers; i < num; i++, internal++) { @@ -5019,6 +5413,10 @@ get_64bit_section_headers (FILE * file, bfd_boolean probe) internal->sh_info = BYTE_GET (shdrs[i].sh_info); internal->sh_offset = BYTE_GET (shdrs[i].sh_offset); internal->sh_addralign = BYTE_GET (shdrs[i].sh_addralign); + if (!probe && internal->sh_link > num) + warn (_("Section %u has an out of range sh_link value of %u\n"), i, internal->sh_link); + if (!probe && internal->sh_flags & SHF_INFO_LINK && internal->sh_info > num) + warn (_("Section %u has an out of range sh_info value of %u\n"), i, internal->sh_info); } free (shdrs); @@ -5026,9 +5424,9 @@ get_64bit_section_headers (FILE * file, bfd_boolean probe) } static Elf_Internal_Sym * -get_32bit_elf_symbols (FILE * file, - Elf_Internal_Shdr * section, - unsigned long * num_syms_return) +get_32bit_elf_symbols (Filedata * filedata, + Elf_Internal_Shdr * section, + unsigned long * num_syms_return) { unsigned long number = 0; Elf32_External_Sym * esyms = NULL; @@ -5048,14 +5446,16 @@ get_32bit_elf_symbols (FILE * file, if (section->sh_entsize == 0 || section->sh_entsize > section->sh_size) { error (_("Section %s has an invalid sh_entsize of 0x%lx\n"), - printable_section_name (section), (unsigned long) section->sh_entsize); + printable_section_name (filedata, section), + (unsigned long) section->sh_entsize); goto exit_point; } - if (section->sh_size > current_file_size) + if (section->sh_size > filedata->file_size) { error (_("Section %s has an invalid sh_size of 0x%lx\n"), - printable_section_name (section), (unsigned long) section->sh_size); + printable_section_name (filedata, section), + (unsigned long) section->sh_size); goto exit_point; } @@ -5065,12 +5465,12 @@ get_32bit_elf_symbols (FILE * file, { error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"), (unsigned long) section->sh_size, - printable_section_name (section), + printable_section_name (filedata, section), (unsigned long) section->sh_entsize); goto exit_point; } - esyms = (Elf32_External_Sym *) get_data (NULL, file, section->sh_offset, 1, + esyms = (Elf32_External_Sym *) get_data (NULL, filedata, section->sh_offset, 1, section->sh_size, _("symbols")); if (esyms == NULL) goto exit_point; @@ -5080,19 +5480,19 @@ get_32bit_elf_symbols (FILE * file, shndx = NULL; for (entry = symtab_shndx_list; entry != NULL; entry = entry->next) - if (entry->hdr->sh_link == (unsigned long) (section - section_headers)) + if (entry->hdr->sh_link == (unsigned long) (section - filedata->section_headers)) { - shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file, + shndx = (Elf_External_Sym_Shndx *) get_data (NULL, filedata, entry->hdr->sh_offset, 1, entry->hdr->sh_size, - _("symbol table section indicies")); + _("symbol table section indices")); if (shndx == NULL) goto exit_point; /* PR17531: file: heap-buffer-overflow */ else if (entry->hdr->sh_size / sizeof (Elf_External_Sym_Shndx) < number) { error (_("Index section %s has an sh_size of 0x%lx - expected 0x%lx\n"), - printable_section_name (entry->hdr), + printable_section_name (filedata, entry->hdr), (unsigned long) entry->hdr->sh_size, (unsigned long) section->sh_size); goto exit_point; @@ -5137,9 +5537,9 @@ get_32bit_elf_symbols (FILE * file, } static Elf_Internal_Sym * -get_64bit_elf_symbols (FILE * file, - Elf_Internal_Shdr * section, - unsigned long * num_syms_return) +get_64bit_elf_symbols (Filedata * filedata, + Elf_Internal_Shdr * section, + unsigned long * num_syms_return) { unsigned long number = 0; Elf64_External_Sym * esyms = NULL; @@ -5159,15 +5559,15 @@ get_64bit_elf_symbols (FILE * file, if (section->sh_entsize == 0 || section->sh_entsize > section->sh_size) { error (_("Section %s has an invalid sh_entsize of 0x%lx\n"), - printable_section_name (section), + printable_section_name (filedata, section), (unsigned long) section->sh_entsize); goto exit_point; } - if (section->sh_size > current_file_size) + if (section->sh_size > filedata->file_size) { error (_("Section %s has an invalid sh_size of 0x%lx\n"), - printable_section_name (section), + printable_section_name (filedata, section), (unsigned long) section->sh_size); goto exit_point; } @@ -5178,12 +5578,12 @@ get_64bit_elf_symbols (FILE * file, { error (_("Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n"), (unsigned long) section->sh_size, - printable_section_name (section), + printable_section_name (filedata, section), (unsigned long) section->sh_entsize); goto exit_point; } - esyms = (Elf64_External_Sym *) get_data (NULL, file, section->sh_offset, 1, + esyms = (Elf64_External_Sym *) get_data (NULL, filedata, section->sh_offset, 1, section->sh_size, _("symbols")); if (!esyms) goto exit_point; @@ -5193,19 +5593,19 @@ get_64bit_elf_symbols (FILE * file, shndx = NULL; for (entry = symtab_shndx_list; entry != NULL; entry = entry->next) - if (entry->hdr->sh_link == (unsigned long) (section - section_headers)) + if (entry->hdr->sh_link == (unsigned long) (section - filedata->section_headers)) { - shndx = (Elf_External_Sym_Shndx *) get_data (NULL, file, + shndx = (Elf_External_Sym_Shndx *) get_data (NULL, filedata, entry->hdr->sh_offset, 1, entry->hdr->sh_size, - _("symbol table section indicies")); + _("symbol table section indices")); if (shndx == NULL) goto exit_point; /* PR17531: file: heap-buffer-overflow */ else if (entry->hdr->sh_size / sizeof (Elf_External_Sym_Shndx) < number) { error (_("Index section %s has an sh_size of 0x%lx - expected 0x%lx\n"), - printable_section_name (entry->hdr), + printable_section_name (filedata, entry->hdr), (unsigned long) entry->hdr->sh_size, (unsigned long) section->sh_size); goto exit_point; @@ -5252,20 +5652,20 @@ get_64bit_elf_symbols (FILE * file, } static const char * -get_elf_section_flags (bfd_vma sh_flags) +get_elf_section_flags (Filedata * filedata, bfd_vma sh_flags) { static char buff[1024]; char * p = buff; - int field_size = is_32bit_elf ? 8 : 16; - int sindex; - int size = sizeof (buff) - (field_size + 4 + 1); + unsigned int field_size = is_32bit_elf ? 8 : 16; + signed int sindex; + unsigned int size = sizeof (buff) - (field_size + 4 + 1); bfd_vma os_flags = 0; bfd_vma proc_flags = 0; bfd_vma unknown_flags = 0; static const struct { const char * str; - int len; + unsigned int len; } flags [] = { @@ -5296,8 +5696,12 @@ get_elf_section_flags (bfd_vma sh_flags) /* 20 */ { STRING_COMMA_LEN ("COMPRESSED") }, /* ARM specific. */ /* 21 */ { STRING_COMMA_LEN ("ENTRYSECT") }, - /* 22 */ { STRING_COMMA_LEN ("ARM_NOREAD") }, - /* 23 */ { STRING_COMMA_LEN ("COMDEF") } + /* 22 */ { STRING_COMMA_LEN ("ARM_PURECODE") }, + /* 23 */ { STRING_COMMA_LEN ("COMDEF") }, + /* GNU specific. */ + /* 24 */ { STRING_COMMA_LEN ("GNU_MBIND") }, + /* VLE specific. */ + /* 25 */ { STRING_COMMA_LEN ("VLE") }, }; if (do_section_details) @@ -5330,10 +5734,11 @@ get_elf_section_flags (bfd_vma sh_flags) case SHF_TLS: sindex = 9; break; case SHF_EXCLUDE: sindex = 18; break; case SHF_COMPRESSED: sindex = 20; break; + case SHF_GNU_MBIND: sindex = 24; break; default: sindex = -1; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_IA_64: if (flag == SHF_IA_64_SHORT) @@ -5341,7 +5746,7 @@ get_elf_section_flags (bfd_vma sh_flags) else if (flag == SHF_IA_64_NORECOV) sindex = 11; #ifdef BFD64 - else if (elf_header.e_ident[EI_OSABI] == ELFOSABI_OPENVMS) + else if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_OPENVMS) switch (flag) { case SHF_IA_64_VMS_GLOBAL: sindex = 12; break; @@ -5372,11 +5777,15 @@ get_elf_section_flags (bfd_vma sh_flags) switch (flag) { case SHF_ENTRYSECT: sindex = 21; break; - case SHF_ARM_NOREAD: sindex = 22; break; + case SHF_ARM_PURECODE: sindex = 22; break; case SHF_COMDEF: sindex = 23; break; default: break; } break; + case EM_PPC: + if (flag == SHF_PPC_VLE) + sindex = 25; + break; default: break; @@ -5423,13 +5832,20 @@ get_elf_section_flags (bfd_vma sh_flags) case SHF_TLS: *p = 'T'; break; case SHF_EXCLUDE: *p = 'E'; break; case SHF_COMPRESSED: *p = 'C'; break; + case SHF_GNU_MBIND: *p = 'D'; break; default: - if ((elf_header.e_machine == EM_X86_64 - || elf_header.e_machine == EM_L1OM - || elf_header.e_machine == EM_K1OM) + if ((filedata->file_header.e_machine == EM_X86_64 + || filedata->file_header.e_machine == EM_L1OM + || filedata->file_header.e_machine == EM_K1OM) && flag == SHF_X86_64_LARGE) *p = 'l'; + else if (filedata->file_header.e_machine == EM_ARM + && flag == SHF_ARM_PURECODE) + *p = 'y'; + else if (filedata->file_header.e_machine == EM_PPC + && flag == SHF_PPC_VLE) + *p = 'v'; else if (flag & SHF_MASKOS) { *p = 'o'; @@ -5511,11 +5927,18 @@ get_elf_section_flags (bfd_vma sh_flags) } static unsigned int -get_compression_header (Elf_Internal_Chdr *chdr, unsigned char *buf) +get_compression_header (Elf_Internal_Chdr *chdr, unsigned char *buf, bfd_size_type size) { if (is_32bit_elf) { Elf32_External_Chdr *echdr = (Elf32_External_Chdr *) buf; + + if (size < sizeof (* echdr)) + { + error (_("Compressed section is too small even for a compression header\n")); + return 0; + } + chdr->ch_type = BYTE_GET (echdr->ch_type); chdr->ch_size = BYTE_GET (echdr->ch_size); chdr->ch_addralign = BYTE_GET (echdr->ch_addralign); @@ -5524,6 +5947,13 @@ get_compression_header (Elf_Internal_Chdr *chdr, unsigned char *buf) else { Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) buf; + + if (size < sizeof (* echdr)) + { + error (_("Compressed section is too small even for a compression header\n")); + return 0; + } + chdr->ch_type = BYTE_GET (echdr->ch_type); chdr->ch_size = BYTE_GET (echdr->ch_size); chdr->ch_addralign = BYTE_GET (echdr->ch_addralign); @@ -5531,51 +5961,62 @@ get_compression_header (Elf_Internal_Chdr *chdr, unsigned char *buf) } } -static int -process_section_headers (FILE * file) +static bfd_boolean +process_section_headers (Filedata * filedata) { Elf_Internal_Shdr * section; unsigned int i; - section_headers = NULL; + filedata->section_headers = NULL; - if (elf_header.e_shnum == 0) + if (filedata->file_header.e_shnum == 0) { /* PR binutils/12467. */ - if (elf_header.e_shoff != 0) - warn (_("possibly corrupt ELF file header - it has a non-zero" - " section header offset, but no section headers\n")); + if (filedata->file_header.e_shoff != 0) + { + warn (_("possibly corrupt ELF file header - it has a non-zero" + " section header offset, but no section headers\n")); + return FALSE; + } else if (do_sections) printf (_("\nThere are no sections in this file.\n")); - return 1; + return TRUE; } if (do_sections && !do_header) - printf (_("There are %d section headers, starting at offset 0x%lx:\n"), - elf_header.e_shnum, (unsigned long) elf_header.e_shoff); + printf (ngettext ("There is %d section header, " + "starting at offset 0x%lx:\n", + "There are %d section headers, " + "starting at offset 0x%lx:\n", + filedata->file_header.e_shnum), + filedata->file_header.e_shnum, + (unsigned long) filedata->file_header.e_shoff); if (is_32bit_elf) { - if (! get_32bit_section_headers (file, FALSE)) - return 0; + if (! get_32bit_section_headers (filedata, FALSE)) + return FALSE; + } + else + { + if (! get_64bit_section_headers (filedata, FALSE)) + return FALSE; } - else if (! get_64bit_section_headers (file, FALSE)) - return 0; /* Read in the string table, so that we have names to display. */ - if (elf_header.e_shstrndx != SHN_UNDEF - && elf_header.e_shstrndx < elf_header.e_shnum) + if (filedata->file_header.e_shstrndx != SHN_UNDEF + && filedata->file_header.e_shstrndx < filedata->file_header.e_shnum) { - section = section_headers + elf_header.e_shstrndx; + section = filedata->section_headers + filedata->file_header.e_shstrndx; if (section->sh_size != 0) { - string_table = (char *) get_data (NULL, file, section->sh_offset, - 1, section->sh_size, - _("string table")); + filedata->string_table = (char *) get_data (NULL, filedata, section->sh_offset, + 1, section->sh_size, + _("string table")); - string_table_length = string_table != NULL ? section->sh_size : 0; + filedata->string_table_length = filedata->string_table != NULL ? section->sh_size : 0; } } @@ -5587,7 +6028,7 @@ process_section_headers (FILE * file) symtab_shndx_list = NULL; eh_addr_size = is_32bit_elf ? 4 : 8; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_MIPS: case EM_MIPS_RS3_LE: @@ -5600,14 +6041,14 @@ process_section_headers (FILE * file) earlier compilers provided no way of distinguishing ILP32 objects from LP64 objects, so if there's any doubt, we should assume that the official LP64 form is being used. */ - if ((elf_header.e_flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI64 - && find_section (".gcc_compiled_long32") == NULL) + if ((filedata->file_header.e_flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI64 + && find_section (filedata, ".gcc_compiled_long32") == NULL) eh_addr_size = 8; break; case EM_H8_300: case EM_H8_300H: - switch (elf_header.e_flags & EF_H8_MACH) + switch (filedata->file_header.e_flags & EF_H8_MACH) { case E_H8_MACH_H8300: case E_H8_MACH_H8300HN: @@ -5625,7 +6066,7 @@ process_section_headers (FILE * file) case EM_M32C_OLD: case EM_M32C: - switch (elf_header.e_flags & EF_M32C_CPU_MASK) + switch (filedata->file_header.e_flags & EF_M32C_CPU_MASK) { case EF_M32C_CPU_M16C: eh_addr_size = 2; @@ -5656,8 +6097,8 @@ process_section_headers (FILE * file) CHECK_ENTSIZE_VALUES (section, i, sizeof (Elf32_External_##type), \ sizeof (Elf64_External_##type)) - for (i = 0, section = section_headers; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, section++) { char * name = SECTION_NAME (section); @@ -5671,7 +6112,7 @@ process_section_headers (FILE * file) } CHECK_ENTSIZE (section, i, Sym); - dynamic_symbols = GET_ELF_SYMBOLS (file, section, & num_dynamic_syms); + dynamic_symbols = GET_ELF_SYMBOLS (filedata, section, & num_dynamic_syms); } else if (section->sh_type == SHT_STRTAB && streq (name, ".dynstr")) @@ -5682,7 +6123,7 @@ process_section_headers (FILE * file) continue; } - dynamic_strings = (char *) get_data (NULL, file, section->sh_offset, + dynamic_strings = (char *) get_data (NULL, filedata, section->sh_offset, 1, section->sh_size, _("dynamic strings")); dynamic_strings_length = dynamic_strings == NULL ? 0 : section->sh_size; @@ -5690,6 +6131,7 @@ process_section_headers (FILE * file) else if (section->sh_type == SHT_SYMTAB_SHNDX) { elf_section_list * entry = xmalloc (sizeof * entry); + entry->hdr = section; entry->next = symtab_shndx_list; symtab_shndx_list = entry; @@ -5706,7 +6148,7 @@ process_section_headers (FILE * file) || do_debug_lines || do_debug_pubnames || do_debug_pubtypes || do_debug_aranges || do_debug_frames || do_debug_macinfo || do_debug_str || do_debug_loc || do_debug_ranges - || do_debug_addr || do_debug_cu_index) + || do_debug_addr || do_debug_cu_index || do_debug_links) && (const_strneq (name, ".debug_") || const_strneq (name, ".zdebug_"))) { @@ -5727,25 +6169,28 @@ process_section_headers (FILE * file) || (do_debug_pubtypes && const_strneq (name, "gnu_pubtypes")) || (do_debug_aranges && const_strneq (name, "aranges")) || (do_debug_ranges && const_strneq (name, "ranges")) + || (do_debug_ranges && const_strneq (name, "rnglists")) || (do_debug_frames && const_strneq (name, "frame")) || (do_debug_macinfo && const_strneq (name, "macinfo")) || (do_debug_macinfo && const_strneq (name, "macro")) || (do_debug_str && const_strneq (name, "str")) || (do_debug_loc && const_strneq (name, "loc")) + || (do_debug_loc && const_strneq (name, "loclists")) || (do_debug_addr && const_strneq (name, "addr")) || (do_debug_cu_index && const_strneq (name, "cu_index")) || (do_debug_cu_index && const_strneq (name, "tu_index")) ) - request_dump_bynumber (i, DEBUG_DUMP); + request_dump_bynumber (filedata, i, DEBUG_DUMP); } /* Linkonce section to be combined with .debug_info at link time. */ else if ((do_debugging || do_debug_info) && const_strneq (name, ".gnu.linkonce.wi.")) - request_dump_bynumber (i, DEBUG_DUMP); + request_dump_bynumber (filedata, i, DEBUG_DUMP); else if (do_debug_frames && streq (name, ".eh_frame")) - request_dump_bynumber (i, DEBUG_DUMP); - else if (do_gdb_index && streq (name, ".gdb_index")) - request_dump_bynumber (i, DEBUG_DUMP); + request_dump_bynumber (filedata, i, DEBUG_DUMP); + else if (do_gdb_index && (streq (name, ".gdb_index") + || streq (name, ".debug_names"))) + request_dump_bynumber (filedata, i, DEBUG_DUMP); /* Trace sections for Itanium VMS. */ else if ((do_debugging || do_trace_info || do_trace_abbrevs || do_trace_aranges) @@ -5758,14 +6203,18 @@ process_section_headers (FILE * file) || (do_trace_abbrevs && streq (name, "abbrev")) || (do_trace_aranges && streq (name, "aranges")) ) - request_dump_bynumber (i, DEBUG_DUMP); + request_dump_bynumber (filedata, i, DEBUG_DUMP); } + else if ((do_debugging || do_debug_links) + && (const_strneq (name, ".gnu_debuglink") + || const_strneq (name, ".gnu_debugaltlink"))) + request_dump_bynumber (filedata, i, DEBUG_DUMP); } if (! do_sections) - return 1; + return TRUE; - if (elf_header.e_shnum > 1) + if (filedata->file_header.e_shnum > 1) printf (_("\nSection Headers:\n")); else printf (_("\nSection Header:\n")); @@ -5810,18 +6259,148 @@ process_section_headers (FILE * file) if (do_section_details) printf (_(" Flags\n")); - for (i = 0, section = section_headers; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, section++) { + /* Run some sanity checks on the section header. */ + + /* Check the sh_link field. */ + switch (section->sh_type) + { + case SHT_SYMTAB_SHNDX: + case SHT_GROUP: + case SHT_HASH: + case SHT_GNU_HASH: + case SHT_GNU_versym: + case SHT_REL: + case SHT_RELA: + if (section->sh_link < 1 + || section->sh_link >= filedata->file_header.e_shnum + || (filedata->section_headers[section->sh_link].sh_type != SHT_SYMTAB + && filedata->section_headers[section->sh_link].sh_type != SHT_DYNSYM)) + warn (_("[%2u]: Link field (%u) should index a symtab section.\n"), + i, section->sh_link); + break; + + case SHT_DYNAMIC: + case SHT_SYMTAB: + case SHT_DYNSYM: + case SHT_GNU_verneed: + case SHT_GNU_verdef: + case SHT_GNU_LIBLIST: + if (section->sh_link < 1 + || section->sh_link >= filedata->file_header.e_shnum + || filedata->section_headers[section->sh_link].sh_type != SHT_STRTAB) + warn (_("[%2u]: Link field (%u) should index a string section.\n"), + i, section->sh_link); + break; + + case SHT_INIT_ARRAY: + case SHT_FINI_ARRAY: + case SHT_PREINIT_ARRAY: + if (section->sh_type < SHT_LOOS && section->sh_link != 0) + warn (_("[%2u]: Unexpected value (%u) in link field.\n"), + i, section->sh_link); + break; + + default: + /* FIXME: Add support for target specific section types. */ +#if 0 /* Currently we do not check other section types as there are too + many special cases. Stab sections for example have a type + of SHT_PROGBITS but an sh_link field that links to the .stabstr + section. */ + if (section->sh_type < SHT_LOOS && section->sh_link != 0) + warn (_("[%2u]: Unexpected value (%u) in link field.\n"), + i, section->sh_link); +#endif + break; + } + + /* Check the sh_info field. */ + switch (section->sh_type) + { + case SHT_REL: + case SHT_RELA: + if (section->sh_info < 1 + || section->sh_info >= filedata->file_header.e_shnum + || (filedata->section_headers[section->sh_info].sh_type != SHT_PROGBITS + && filedata->section_headers[section->sh_info].sh_type != SHT_NOBITS + && filedata->section_headers[section->sh_info].sh_type != SHT_NOTE + && filedata->section_headers[section->sh_info].sh_type != SHT_INIT_ARRAY + /* FIXME: Are other section types valid ? */ + && filedata->section_headers[section->sh_info].sh_type < SHT_LOOS)) + { + if (section->sh_info == 0 + && (filedata->file_header.e_type == ET_EXEC + || filedata->file_header.e_type == ET_DYN + /* These next two tests may be redundant, but + they have been left in for paranoia's sake. */ + || streq (SECTION_NAME (section), ".rel.dyn") + || streq (SECTION_NAME (section), ".rela.dyn"))) + /* Dynamic relocations apply to segments, not sections, so + they do not need an sh_info value. */ + ; + else + warn (_("[%2u]: Info field (%u) should index a relocatable section.\n"), + i, section->sh_info); + } + break; + + case SHT_DYNAMIC: + case SHT_HASH: + case SHT_SYMTAB_SHNDX: + case SHT_INIT_ARRAY: + case SHT_FINI_ARRAY: + case SHT_PREINIT_ARRAY: + if (section->sh_info != 0) + warn (_("[%2u]: Unexpected value (%u) in info field.\n"), + i, section->sh_info); + break; + + case SHT_GROUP: + case SHT_SYMTAB: + case SHT_DYNSYM: + /* A symbol index - we assume that it is valid. */ + break; + + default: + /* FIXME: Add support for target specific section types. */ + if (section->sh_type == SHT_NOBITS) + /* NOBITS section headers with non-zero sh_info fields can be + created when a binary is stripped of everything but its debug + information. The stripped sections have their headers + preserved but their types set to SHT_NOBITS. So do not check + this type of section. */ + ; + else if (section->sh_flags & SHF_INFO_LINK) + { + if (section->sh_info < 1 || section->sh_info >= filedata->file_header.e_shnum) + warn (_("[%2u]: Expected link to another section in info field"), i); + } + else if (section->sh_type < SHT_LOOS + && (section->sh_flags & SHF_GNU_MBIND) == 0 + && section->sh_info != 0) + warn (_("[%2u]: Unexpected value (%u) in info field.\n"), + i, section->sh_info); + break; + } + + /* Check the sh_size field. */ + if (section->sh_size > filedata->file_size + && section->sh_type != SHT_NOBITS + && section->sh_type != SHT_NULL + && section->sh_type < SHT_LOOS) + warn (_("Size of section %u is larger than the entire file!\n"), i); + printf (" [%2u] ", i); if (do_section_details) - printf ("%s\n ", printable_section_name (section)); + printf ("%s\n ", printable_section_name (filedata, section)); else print_symbol (-17, SECTION_NAME (section)); printf (do_wide ? " %-15s " : " %-15.15s ", - get_section_type_name (section->sh_type)); + get_section_type_name (filedata, section->sh_type)); if (is_32bit_elf) { @@ -5837,14 +6416,14 @@ process_section_headers (FILE * file) if (do_section_details) fputs (" ", stdout); else - printf (" %3s ", get_elf_section_flags (section->sh_flags)); + printf (" %3s ", get_elf_section_flags (filedata, section->sh_flags)); - if (section->sh_link >= elf_header.e_shnum) + if (section->sh_link >= filedata->file_header.e_shnum) { link_too_big = ""; /* The sh_link value is out of range. Normally this indicates an error but it can have special values in Solaris binaries. */ - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_386: case EM_IAMCU: @@ -5915,7 +6494,7 @@ process_section_headers (FILE * file) if (do_section_details) fputs (" ", stdout); else - printf (" %3s ", get_elf_section_flags (section->sh_flags)); + printf (" %3s ", get_elf_section_flags (filedata, section->sh_flags)); printf ("%2u %3u ", section->sh_link, section->sh_info); @@ -5929,8 +6508,7 @@ process_section_headers (FILE * file) } else if (do_section_details) { - printf (" %-15.15s ", - get_section_type_name (section->sh_type)); + putchar (' '); print_vma (section->sh_addr, LONG_HEX); if ((long) section->sh_offset == section->sh_offset) printf (" %16.16lx", (unsigned long) section->sh_offset); @@ -5964,7 +6542,7 @@ process_section_headers (FILE * file) printf (" "); print_vma (section->sh_entsize, LONG_HEX); - printf (" %3s ", get_elf_section_flags (section->sh_flags)); + printf (" %3s ", get_elf_section_flags (filedata, section->sh_flags)); printf (" %2u %3u %lu\n", section->sh_link, @@ -5974,18 +6552,21 @@ process_section_headers (FILE * file) if (do_section_details) { - printf (" %s\n", get_elf_section_flags (section->sh_flags)); + printf (" %s\n", get_elf_section_flags (filedata, section->sh_flags)); if ((section->sh_flags & SHF_COMPRESSED) != 0) { /* Minimum section size is 12 bytes for 32-bit compression header + 12 bytes for compressed data header. */ unsigned char buf[24]; + assert (sizeof (buf) >= sizeof (Elf64_External_Chdr)); - if (get_data (&buf, (FILE *) file, section->sh_offset, 1, + if (get_data (&buf, filedata, section->sh_offset, 1, sizeof (buf), _("compression header"))) { Elf_Internal_Chdr chdr; - get_compression_header (&chdr, buf); + + (void) get_compression_header (&chdr, buf, sizeof (buf)); + if (chdr.ch_type == ELFCOMPRESS_ZLIB) printf (" ZLIB, "); else @@ -6000,44 +6581,61 @@ process_section_headers (FILE * file) if (!do_section_details) { - if (elf_header.e_machine == EM_X86_64 - || elf_header.e_machine == EM_L1OM - || elf_header.e_machine == EM_K1OM) - printf (_("Key to Flags:\n\ - W (write), A (alloc), X (execute), M (merge), S (strings), l (large)\n\ - I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)\n\ - O (extra OS processing required) o (OS specific), p (processor specific)\n")); - else - printf (_("Key to Flags:\n\ - W (write), A (alloc), X (execute), M (merge), S (strings)\n\ - I (info), L (link order), G (group), T (TLS), E (exclude), x (unknown)\n\ - O (extra OS processing required) o (OS specific), p (processor specific)\n")); + /* The ordering of the letters shown here matches the ordering of the + corresponding SHF_xxx values, and hence the order in which these + letters will be displayed to the user. */ + printf (_("Key to Flags:\n\ + W (write), A (alloc), X (execute), M (merge), S (strings), I (info),\n\ + L (link order), O (extra OS processing required), G (group), T (TLS),\n\ + C (compressed), x (unknown), o (OS specific), E (exclude),\n ")); + if (filedata->file_header.e_machine == EM_X86_64 + || filedata->file_header.e_machine == EM_L1OM + || filedata->file_header.e_machine == EM_K1OM) + printf (_("l (large), ")); + else if (filedata->file_header.e_machine == EM_ARM) + printf (_("y (purecode), ")); + else if (filedata->file_header.e_machine == EM_PPC) + printf (_("v (VLE), ")); + printf ("p (processor specific)\n"); } - return 1; + return TRUE; } static const char * get_group_flags (unsigned int flags) { - static char buff[32]; - switch (flags) - { - case 0: - return ""; + static char buff[128]; + + if (flags == 0) + return ""; + else if (flags == GRP_COMDAT) + return "COMDAT "; - case GRP_COMDAT: - return "COMDAT "; + snprintf (buff, 14, _("[0x%x: "), flags); - default: - snprintf (buff, sizeof (buff), _("[: 0x%x] "), flags); - break; + flags &= ~ GRP_COMDAT; + if (flags & GRP_MASKOS) + { + strcat (buff, ""); + flags &= ~ GRP_MASKOS; } + + if (flags & GRP_MASKPROC) + { + strcat (buff, ""); + flags &= ~ GRP_MASKPROC; + } + + if (flags) + strcat (buff, ""); + + strcat (buff, "]"); return buff; } -static int -process_section_groups (FILE * file) +static bfd_boolean +process_section_groups (Filedata * filedata) { Elf_Internal_Shdr * section; unsigned int i; @@ -6051,37 +6649,37 @@ process_section_groups (FILE * file) /* Don't process section groups unless needed. */ if (!do_unwind && !do_section_groups) - return 1; + return TRUE; - if (elf_header.e_shnum == 0) + if (filedata->file_header.e_shnum == 0) { if (do_section_groups) printf (_("\nThere are no sections to group in this file.\n")); - return 1; + return TRUE; } - if (section_headers == NULL) + if (filedata->section_headers == NULL) { error (_("Section headers are not available!\n")); /* PR 13622: This can happen with a corrupt ELF header. */ - return 0; + return FALSE; } - section_headers_groups = (struct group **) calloc (elf_header.e_shnum, + section_headers_groups = (struct group **) calloc (filedata->file_header.e_shnum, sizeof (struct group *)); if (section_headers_groups == NULL) { error (_("Out of memory reading %u section group headers\n"), - elf_header.e_shnum); - return 0; + filedata->file_header.e_shnum); + return FALSE; } /* Scan the sections for the group section. */ group_count = 0; - for (i = 0, section = section_headers; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, section++) if (section->sh_type == SHT_GROUP) group_count++; @@ -6091,7 +6689,7 @@ process_section_groups (FILE * file) if (do_section_groups) printf (_("\nThere are no section groups in this file.\n")); - return 1; + return TRUE; } section_groups = (struct group *) calloc (group_count, sizeof (struct group)); @@ -6100,7 +6698,7 @@ process_section_groups (FILE * file) { error (_("Out of memory reading %lu groups\n"), (unsigned long) group_count); - return 0; + return FALSE; } symtab_sec = NULL; @@ -6109,13 +6707,13 @@ process_section_groups (FILE * file) num_syms = 0; strtab = NULL; strtab_size = 0; - for (i = 0, section = section_headers, group = section_groups; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers, group = section_groups; + i < filedata->file_header.e_shnum; i++, section++) { if (section->sh_type == SHT_GROUP) { - const char * name = printable_section_name (section); + const char * name = printable_section_name (filedata, section); const char * group_name; unsigned char * start; unsigned char * indices; @@ -6124,8 +6722,8 @@ process_section_groups (FILE * file) Elf_Internal_Sym * sym; /* Get the symbol table. */ - if (section->sh_link >= elf_header.e_shnum - || ((sec = section_headers + section->sh_link)->sh_type + if (section->sh_link >= filedata->file_header.e_shnum + || ((sec = filedata->section_headers + section->sh_link)->sh_type != SHT_SYMTAB)) { error (_("Bad sh_link in group section `%s'\n"), name); @@ -6137,7 +6735,7 @@ process_section_groups (FILE * file) symtab_sec = sec; if (symtab) free (symtab); - symtab = GET_ELF_SYMBOLS (file, symtab_sec, & num_syms); + symtab = GET_ELF_SYMBOLS (filedata, symtab_sec, & num_syms); } if (symtab == NULL) @@ -6157,13 +6755,13 @@ process_section_groups (FILE * file) if (ELF_ST_TYPE (sym->st_info) == STT_SECTION) { if (sym->st_shndx == 0 - || sym->st_shndx >= elf_header.e_shnum) + || sym->st_shndx >= filedata->file_header.e_shnum) { error (_("Bad sh_info in group section `%s'\n"), name); continue; } - group_name = SECTION_NAME (section_headers + sym->st_shndx); + group_name = SECTION_NAME (filedata->section_headers + sym->st_shndx); strtab_sec = NULL; if (strtab) free (strtab); @@ -6173,7 +6771,7 @@ process_section_groups (FILE * file) else { /* Get the string table. */ - if (symtab_sec->sh_link >= elf_header.e_shnum) + if (symtab_sec->sh_link >= filedata->file_header.e_shnum) { strtab_sec = NULL; if (strtab) @@ -6182,13 +6780,13 @@ process_section_groups (FILE * file) strtab_size = 0; } else if (strtab_sec - != (sec = section_headers + symtab_sec->sh_link)) + != (sec = filedata->section_headers + symtab_sec->sh_link)) { strtab_sec = sec; if (strtab) free (strtab); - strtab = (char *) get_data (NULL, file, strtab_sec->sh_offset, + strtab = (char *) get_data (NULL, filedata, strtab_sec->sh_offset, 1, strtab_sec->sh_size, _("string table")); strtab_size = strtab != NULL ? strtab_sec->sh_size : 0; @@ -6201,13 +6799,13 @@ process_section_groups (FILE * file) if (section->sh_entsize > section->sh_size) { error (_("Section %s has sh_entsize (0x%lx) which is larger than its size (0x%lx)\n"), - printable_section_name (section), + printable_section_name (filedata, section), (unsigned long) section->sh_entsize, (unsigned long) section->sh_size); break; } - start = (unsigned char *) get_data (NULL, file, section->sh_offset, + start = (unsigned char *) get_data (NULL, filedata, section->sh_offset, 1, section->sh_size, _("section data")); if (start == NULL) @@ -6235,16 +6833,16 @@ process_section_groups (FILE * file) entry = byte_get (indices, 4); indices += 4; - if (entry >= elf_header.e_shnum) + if (entry >= filedata->file_header.e_shnum) { static unsigned num_group_errors = 0; if (num_group_errors ++ < 10) { error (_("section [%5u] in group section [%5u] > maximum section [%5u]\n"), - entry, i, elf_header.e_shnum - 1); + entry, i, filedata->file_header.e_shnum - 1); if (num_group_errors == 10) - warn (_("Futher error messages about overlarge group section indicies suppressed\n")); + warn (_("Further error messages about overlarge group section indices suppressed\n")); } continue; } @@ -6268,14 +6866,14 @@ process_section_groups (FILE * file) else { /* Intel C/C++ compiler may put section 0 in a - section group. We just warn it the first time + section group. We just warn it the first time and ignore it afterwards. */ - static int warned = 0; + static bfd_boolean warned = FALSE; if (!warned) { error (_("section 0 in group section [%5u]\n"), section_headers_groups [entry]->group_index); - warned++; + warned = TRUE; } } } @@ -6284,8 +6882,8 @@ process_section_groups (FILE * file) if (do_section_groups) { - sec = section_headers + entry; - printf (" [%5u] %s\n", entry, printable_section_name (sec)); + sec = filedata->section_headers + entry; + printf (" [%5u] %s\n", entry, printable_section_name (filedata, sec)); } g = (struct group_list *) xmalloc (sizeof (struct group_list)); @@ -6305,7 +6903,7 @@ process_section_groups (FILE * file) free (symtab); if (strtab) free (strtab); - return 1; + return TRUE; } /* Data used to display dynamic fixups. */ @@ -6330,25 +6928,27 @@ struct ia64_vms_dynimgrela /* Display IA-64 OpenVMS dynamic fixups (used to dynamically link a shared library). */ -static void -dump_ia64_vms_dynamic_fixups (FILE *file, struct ia64_vms_dynfixup *fixup, - const char *strtab, unsigned int strtab_sz) +static bfd_boolean +dump_ia64_vms_dynamic_fixups (Filedata * filedata, + struct ia64_vms_dynfixup * fixup, + const char * strtab, + unsigned int strtab_sz) { - Elf64_External_VMS_IMAGE_FIXUP *imfs; + Elf64_External_VMS_IMAGE_FIXUP * imfs; long i; - const char *lib_name; + const char * lib_name; - imfs = get_data (NULL, file, dynamic_addr + fixup->fixup_rela_off, + imfs = get_data (NULL, filedata, dynamic_addr + fixup->fixup_rela_off, 1, fixup->fixup_rela_cnt * sizeof (*imfs), _("dynamic section image fixups")); if (!imfs) - return; + return FALSE; if (fixup->needed < strtab_sz) lib_name = strtab + fixup->needed; else { - warn ("corrupt library name index of 0x%lx found in dynamic entry", + warn (_("corrupt library name index of 0x%lx found in dynamic entry"), (unsigned long) fixup->needed); lib_name = "???"; } @@ -6375,21 +6975,22 @@ dump_ia64_vms_dynamic_fixups (FILE *file, struct ia64_vms_dynfixup *fixup, } free (imfs); + return TRUE; } /* Display IA-64 OpenVMS dynamic relocations (used to relocate an image). */ -static void -dump_ia64_vms_dynamic_relocs (FILE *file, struct ia64_vms_dynimgrela *imgrela) +static bfd_boolean +dump_ia64_vms_dynamic_relocs (Filedata * filedata, struct ia64_vms_dynimgrela *imgrela) { Elf64_External_VMS_IMAGE_RELA *imrs; long i; - imrs = get_data (NULL, file, dynamic_addr + imgrela->img_rela_off, + imrs = get_data (NULL, filedata, dynamic_addr + imgrela->img_rela_off, 1, imgrela->img_rela_cnt * sizeof (*imrs), _("dynamic section image relocations")); if (!imrs) - return; + return FALSE; printf (_("\nImage relocs\n")); printf @@ -6416,20 +7017,21 @@ dump_ia64_vms_dynamic_relocs (FILE *file, struct ia64_vms_dynimgrela *imgrela) } free (imrs); + return TRUE; } /* Display IA-64 OpenVMS dynamic relocations and fixups. */ -static int -process_ia64_vms_dynamic_relocs (FILE *file) +static bfd_boolean +process_ia64_vms_dynamic_relocs (Filedata * filedata) { struct ia64_vms_dynfixup fixup; struct ia64_vms_dynimgrela imgrela; Elf_Internal_Dyn *entry; - int res = 0; bfd_vma strtab_off = 0; bfd_vma strtab_sz = 0; char *strtab = NULL; + bfd_boolean res = TRUE; memset (&fixup, 0, sizeof (fixup)); memset (&imgrela, 0, sizeof (imgrela)); @@ -6447,7 +7049,7 @@ process_ia64_vms_dynamic_relocs (FILE *file) case DT_STRSZ: strtab_sz = entry->d_un.d_val; if (strtab == NULL) - strtab = get_data (NULL, file, dynamic_addr + strtab_off, + strtab = get_data (NULL, filedata, dynamic_addr + strtab_off, 1, strtab_sz, _("dynamic string section")); break; @@ -6465,17 +7067,16 @@ process_ia64_vms_dynamic_relocs (FILE *file) break; case DT_IA_64_VMS_FIXUP_RELA_OFF: fixup.fixup_rela_off = entry->d_un.d_val; - res++; - dump_ia64_vms_dynamic_fixups (file, &fixup, strtab, strtab_sz); + if (! dump_ia64_vms_dynamic_fixups (filedata, &fixup, strtab, strtab_sz)) + res = FALSE; break; - case DT_IA_64_VMS_IMG_RELA_CNT: imgrela.img_rela_cnt = entry->d_un.d_val; break; case DT_IA_64_VMS_IMG_RELA_OFF: imgrela.img_rela_off = entry->d_un.d_val; - res++; - dump_ia64_vms_dynamic_relocs (file, &imgrela); + if (! dump_ia64_vms_dynamic_relocs (filedata, &imgrela)) + res = FALSE; break; default: @@ -6495,33 +7096,33 @@ static struct int reloc; int size; int rela; -} dynamic_relocations [] = +} + dynamic_relocations [] = { - { "REL", DT_REL, DT_RELSZ, FALSE }, - { "RELA", DT_RELA, DT_RELASZ, TRUE }, - { "PLT", DT_JMPREL, DT_PLTRELSZ, UNKNOWN } + { "REL", DT_REL, DT_RELSZ, FALSE }, + { "RELA", DT_RELA, DT_RELASZ, TRUE }, + { "PLT", DT_JMPREL, DT_PLTRELSZ, UNKNOWN } }; /* Process the reloc section. */ -static int -process_relocs (FILE * file) +static bfd_boolean +process_relocs (Filedata * filedata) { unsigned long rel_size; unsigned long rel_offset; - if (!do_reloc) - return 1; + return TRUE; if (do_using_dynamic) { - int is_rela; + int is_rela; const char * name; - int has_dynamic_reloc; + bfd_boolean has_dynamic_reloc; unsigned int i; - has_dynamic_reloc = 0; + has_dynamic_reloc = FALSE; for (i = 0; i < ARRAY_SIZE (dynamic_relocations); i++) { @@ -6530,7 +7131,8 @@ process_relocs (FILE * file) rel_size = dynamic_info [dynamic_relocations [i].size]; rel_offset = dynamic_info [dynamic_relocations [i].reloc]; - has_dynamic_reloc |= rel_size; + if (rel_size) + has_dynamic_reloc = TRUE; if (is_rela == UNKNOWN) { @@ -6552,17 +7154,18 @@ process_relocs (FILE * file) (_("\n'%s' relocation section at offset 0x%lx contains %ld bytes:\n"), name, rel_offset, rel_size); - dump_relocations (file, - offset_from_vma (file, rel_offset, rel_size), + dump_relocations (filedata, + offset_from_vma (filedata, rel_offset, rel_size), rel_size, dynamic_symbols, num_dynamic_syms, dynamic_strings, dynamic_strings_length, - is_rela, 1); + is_rela, TRUE /* is_dynamic */); } } - if (is_ia64_vms ()) - has_dynamic_reloc |= process_ia64_vms_dynamic_relocs (file); + if (is_ia64_vms (filedata)) + if (process_ia64_vms_dynamic_relocs (filedata)) + has_dynamic_reloc = TRUE; if (! has_dynamic_reloc) printf (_("\nThere are no dynamic relocations in this file.\n")); @@ -6571,10 +7174,10 @@ process_relocs (FILE * file) { Elf_Internal_Shdr * section; unsigned long i; - int found = 0; + bfd_boolean found = FALSE; - for (i = 0, section = section_headers; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, section++) { if ( section->sh_type != SHT_RELA @@ -6588,21 +7191,25 @@ process_relocs (FILE * file) { Elf_Internal_Shdr * strsec; int is_rela; + unsigned long num_rela; printf (_("\nRelocation section ")); - if (string_table == NULL) + if (filedata->string_table == NULL) printf ("%d", section->sh_name); else - printf ("'%s'", printable_section_name (section)); + printf ("'%s'", printable_section_name (filedata, section)); - printf (_(" at offset 0x%lx contains %lu entries:\n"), - rel_offset, (unsigned long) (rel_size / section->sh_entsize)); + num_rela = rel_size / section->sh_entsize; + printf (ngettext (" at offset 0x%lx contains %lu entry:\n", + " at offset 0x%lx contains %lu entries:\n", + num_rela), + rel_offset, num_rela); is_rela = section->sh_type == SHT_RELA; if (section->sh_link != 0 - && section->sh_link < elf_header.e_shnum) + && section->sh_link < filedata->file_header.e_shnum) { Elf_Internal_Shdr * symsec; Elf_Internal_Sym * symtab; @@ -6610,28 +7217,28 @@ process_relocs (FILE * file) unsigned long strtablen = 0; char * strtab = NULL; - symsec = section_headers + section->sh_link; + symsec = filedata->section_headers + section->sh_link; if (symsec->sh_type != SHT_SYMTAB && symsec->sh_type != SHT_DYNSYM) continue; - symtab = GET_ELF_SYMBOLS (file, symsec, & nsyms); + symtab = GET_ELF_SYMBOLS (filedata, symsec, & nsyms); if (symtab == NULL) continue; if (symsec->sh_link != 0 - && symsec->sh_link < elf_header.e_shnum) + && symsec->sh_link < filedata->file_header.e_shnum) { - strsec = section_headers + symsec->sh_link; + strsec = filedata->section_headers + symsec->sh_link; - strtab = (char *) get_data (NULL, file, strsec->sh_offset, + strtab = (char *) get_data (NULL, filedata, strsec->sh_offset, 1, strsec->sh_size, _("string table")); strtablen = strtab == NULL ? 0 : strsec->sh_size; } - dump_relocations (file, rel_offset, rel_size, + dump_relocations (filedata, rel_offset, rel_size, symtab, nsyms, strtab, strtablen, is_rela, symsec->sh_type == SHT_DYNSYM); @@ -6640,18 +7247,33 @@ process_relocs (FILE * file) free (symtab); } else - dump_relocations (file, rel_offset, rel_size, - NULL, 0, NULL, 0, is_rela, 0); + dump_relocations (filedata, rel_offset, rel_size, + NULL, 0, NULL, 0, is_rela, + FALSE /* is_dynamic */); - found = 1; + found = TRUE; } } if (! found) - printf (_("\nThere are no relocations in this file.\n")); + { + /* Users sometimes forget the -D option, so try to be helpful. */ + for (i = 0; i < ARRAY_SIZE (dynamic_relocations); i++) + { + if (dynamic_info [dynamic_relocations [i].size]) + { + printf (_("\nThere are no static relocations in this file.")); + printf (_("\nTo see the dynamic relocations add --use-dynamic to the command line.\n")); + + break; + } + } + if (i == ARRAY_SIZE (dynamic_relocations)) + printf (_("\nThere are no relocations in this file.\n")); + } } - return 1; + return TRUE; } /* An absolute address consists of a section and an offset. If the @@ -6666,20 +7288,21 @@ struct absaddr #define ABSADDR(a) \ ((a).section \ - ? section_headers [(a).section].sh_addr + (a).offset \ + ? filedata->section_headers [(a).section].sh_addr + (a).offset \ : (a).offset) /* Find the nearest symbol at or below ADDR. Returns the symbol name, if found, and the offset from the symbol to ADDR. */ static void -find_symbol_for_address (Elf_Internal_Sym * symtab, - unsigned long nsyms, - const char * strtab, - unsigned long strtab_size, - struct absaddr addr, - const char ** symname, - bfd_vma * offset) +find_symbol_for_address (Filedata * filedata, + Elf_Internal_Sym * symtab, + unsigned long nsyms, + const char * strtab, + unsigned long strtab_size, + struct absaddr addr, + const char ** symname, + bfd_vma * offset) { bfd_vma dist = 0x100000; Elf_Internal_Sym * sym; @@ -6729,7 +7352,7 @@ find_symbol_for_address (Elf_Internal_Sym * symtab, *offset = addr.offset; } -static int +static /* signed */ int symcmp (const void *p, const void *q) { Elf_Internal_Sym *sp = (Elf_Internal_Sym *) p; @@ -6751,26 +7374,27 @@ struct ia64_unw_table_entry struct ia64_unw_aux_info { - struct ia64_unw_table_entry *table; /* Unwind table. */ - unsigned long table_len; /* Length of unwind table. */ - unsigned char * info; /* Unwind info. */ - unsigned long info_size; /* Size of unwind info. */ - bfd_vma info_addr; /* Starting address of unwind info. */ - bfd_vma seg_base; /* Starting address of segment. */ - Elf_Internal_Sym * symtab; /* The symbol table. */ - unsigned long nsyms; /* Number of symbols. */ - Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ - unsigned long nfuns; /* Number of entries in funtab. */ - char * strtab; /* The string table. */ - unsigned long strtab_size; /* Size of string table. */ + struct ia64_unw_table_entry * table; /* Unwind table. */ + unsigned long table_len; /* Length of unwind table. */ + unsigned char * info; /* Unwind info. */ + unsigned long info_size; /* Size of unwind info. */ + bfd_vma info_addr; /* Starting address of unwind info. */ + bfd_vma seg_base; /* Starting address of segment. */ + Elf_Internal_Sym * symtab; /* The symbol table. */ + unsigned long nsyms; /* Number of symbols. */ + Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ + unsigned long nfuns; /* Number of entries in funtab. */ + char * strtab; /* The string table. */ + unsigned long strtab_size; /* Size of string table. */ }; -static void -dump_ia64_unwind (struct ia64_unw_aux_info * aux) +static bfd_boolean +dump_ia64_unwind (Filedata * filedata, struct ia64_unw_aux_info * aux) { struct ia64_unw_table_entry * tp; unsigned long j, nfuns; int in_body; + bfd_boolean res = TRUE; aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym)); for (nfuns = 0, j = 0; j < aux->nsyms; j++) @@ -6788,7 +7412,7 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux) const unsigned char * end; const char * procname; - find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab, + find_symbol_for_address (filedata, aux->funtab, aux->nfuns, aux->strtab, aux->strtab_size, tp->start, &procname, &offset); fputs ("\n<", stdout); @@ -6817,6 +7441,7 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux) { warn (_("Invalid offset %lx in table entry %ld\n"), (long) tp->info.offset, (long) (tp - aux->table)); + res = FALSE; continue; } @@ -6846,12 +7471,14 @@ dump_ia64_unwind (struct ia64_unw_aux_info * aux) } free (aux->funtab); + + return res; } static bfd_boolean -slurp_ia64_unwind_table (FILE * file, - struct ia64_unw_aux_info * aux, - Elf_Internal_Shdr * sec) +slurp_ia64_unwind_table (Filedata * filedata, + struct ia64_unw_aux_info * aux, + Elf_Internal_Shdr * sec) { unsigned long size, nrelas, i; Elf_Internal_Phdr * seg; @@ -6869,13 +7496,13 @@ slurp_ia64_unwind_table (FILE * file, /* First, find the starting address of the segment that includes this section: */ - if (elf_header.e_phnum) + if (filedata->file_header.e_phnum) { - if (! get_program_headers (file)) + if (! get_program_headers (filedata)) return FALSE; - for (seg = program_headers; - seg < program_headers + elf_header.e_phnum; + for (seg = filedata->program_headers; + seg < filedata->program_headers + filedata->file_header.e_phnum; ++seg) { if (seg->p_type != PT_LOAD) @@ -6892,7 +7519,7 @@ slurp_ia64_unwind_table (FILE * file, /* Second, build the unwind table from the contents of the unwind section: */ size = sec->sh_size; - table = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, size, + table = (unsigned char *) get_data (NULL, filedata, sec->sh_offset, 1, size, _("unwind table")); if (!table) return FALSE; @@ -6917,16 +7544,16 @@ slurp_ia64_unwind_table (FILE * file, free (table); /* Third, apply any relocations to the unwind table: */ - for (relsec = section_headers; - relsec < section_headers + elf_header.e_shnum; + for (relsec = filedata->section_headers; + relsec < filedata->section_headers + filedata->file_header.e_shnum; ++relsec) { if (relsec->sh_type != SHT_RELA - || relsec->sh_info >= elf_header.e_shnum - || section_headers + relsec->sh_info != sec) + || relsec->sh_info >= filedata->file_header.e_shnum + || filedata->section_headers + relsec->sh_info != sec) continue; - if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size, + if (!slurp_rela_relocs (filedata, relsec->sh_offset, relsec->sh_size, & rela, & nrelas)) { free (aux->table); @@ -6937,13 +7564,14 @@ slurp_ia64_unwind_table (FILE * file, for (rp = rela; rp < rela + nrelas; ++rp) { - relname = elf_ia64_reloc_type (get_reloc_type (rp->r_info)); + relname = elf_ia64_reloc_type (get_reloc_type (filedata, rp->r_info)); sym = aux->symtab + get_reloc_symindex (rp->r_info); /* PR 17531: file: 9fa67536. */ if (relname == NULL) { - warn (_("Skipping unknown relocation type: %u\n"), get_reloc_type (rp->r_info)); + warn (_("Skipping unknown relocation type: %u\n"), + get_reloc_type (filedata, rp->r_info)); continue; } @@ -6987,31 +7615,33 @@ slurp_ia64_unwind_table (FILE * file, return TRUE; } -static void -ia64_process_unwind (FILE * file) +static bfd_boolean +ia64_process_unwind (Filedata * filedata) { Elf_Internal_Shdr * sec; Elf_Internal_Shdr * unwsec = NULL; Elf_Internal_Shdr * strsec; unsigned long i, unwcount = 0, unwstart = 0; struct ia64_unw_aux_info aux; + bfd_boolean res = TRUE; memset (& aux, 0, sizeof (aux)); - for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec) + for (i = 0, sec = filedata->section_headers; i < filedata->file_header.e_shnum; ++i, ++sec) { if (sec->sh_type == SHT_SYMTAB - && sec->sh_link < elf_header.e_shnum) + && sec->sh_link < filedata->file_header.e_shnum) { - aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms); + aux.symtab = GET_ELF_SYMBOLS (filedata, sec, & aux.nsyms); - strsec = section_headers + sec->sh_link; + strsec = filedata->section_headers + sec->sh_link; if (aux.strtab != NULL) { error (_("Multiple auxillary string tables encountered\n")); free (aux.strtab); + res = FALSE; } - aux.strtab = (char *) get_data (NULL, file, strsec->sh_offset, + aux.strtab = (char *) get_data (NULL, filedata, strsec->sh_offset, 1, strsec->sh_size, _("string table")); aux.strtab_size = aux.strtab != NULL ? strsec->sh_size : 0; @@ -7028,8 +7658,8 @@ ia64_process_unwind (FILE * file) char * suffix; size_t len, len2; - for (i = unwstart, sec = section_headers + unwstart, unwsec = NULL; - i < elf_header.e_shnum; ++i, ++sec) + for (i = unwstart, sec = filedata->section_headers + unwstart, unwsec = NULL; + i < filedata->file_header.e_shnum; ++i, ++sec) if (sec->sh_type == SHT_IA_64_UNWIND) { unwsec = sec; @@ -7049,21 +7679,21 @@ ia64_process_unwind (FILE * file) if (section_headers_groups == NULL || section_headers_groups [i] == NULL) - i = elf_header.e_shnum; + i = filedata->file_header.e_shnum; else { g = section_headers_groups [i]->root; for (; g != NULL; g = g->next) { - sec = section_headers + g->section_index; + sec = filedata->section_headers + g->section_index; if (streq (SECTION_NAME (sec), ELF_STRING_ia64_unwind_info)) break; } if (g == NULL) - i = elf_header.e_shnum; + i = filedata->file_header.e_shnum; } } else if (strneq (SECTION_NAME (unwsec), ELF_STRING_ia64_unwind_once, len)) @@ -7071,7 +7701,7 @@ ia64_process_unwind (FILE * file) /* .gnu.linkonce.ia64unw.FOO -> .gnu.linkonce.ia64unwi.FOO. */ len2 = sizeof (ELF_STRING_ia64_unwind_info_once) - 1; suffix = SECTION_NAME (unwsec) + len; - for (i = 0, sec = section_headers; i < elf_header.e_shnum; + for (i = 0, sec = filedata->section_headers; i < filedata->file_header.e_shnum; ++i, ++sec) if (strneq (SECTION_NAME (sec), ELF_STRING_ia64_unwind_info_once, len2) && streq (SECTION_NAME (sec) + len2, suffix)) @@ -7086,44 +7716,44 @@ ia64_process_unwind (FILE * file) suffix = ""; if (strneq (SECTION_NAME (unwsec), ELF_STRING_ia64_unwind, len)) suffix = SECTION_NAME (unwsec) + len; - for (i = 0, sec = section_headers; i < elf_header.e_shnum; + for (i = 0, sec = filedata->section_headers; i < filedata->file_header.e_shnum; ++i, ++sec) if (strneq (SECTION_NAME (sec), ELF_STRING_ia64_unwind_info, len2) && streq (SECTION_NAME (sec) + len2, suffix)) break; } - if (i == elf_header.e_shnum) + if (i == filedata->file_header.e_shnum) { printf (_("\nCould not find unwind info section for ")); - if (string_table == NULL) + if (filedata->string_table == NULL) printf ("%d", unwsec->sh_name); else - printf ("'%s'", printable_section_name (unwsec)); + printf ("'%s'", printable_section_name (filedata, unwsec)); } else { aux.info_addr = sec->sh_addr; - aux.info = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, + aux.info = (unsigned char *) get_data (NULL, filedata, sec->sh_offset, 1, sec->sh_size, _("unwind info")); aux.info_size = aux.info == NULL ? 0 : sec->sh_size; printf (_("\nUnwind section ")); - if (string_table == NULL) + if (filedata->string_table == NULL) printf ("%d", unwsec->sh_name); else - printf ("'%s'", printable_section_name (unwsec)); + printf ("'%s'", printable_section_name (filedata, unwsec)); printf (_(" at offset 0x%lx contains %lu entries:\n"), (unsigned long) unwsec->sh_offset, (unsigned long) (unwsec->sh_size / (3 * eh_addr_size))); - if (slurp_ia64_unwind_table (file, & aux, unwsec) + if (slurp_ia64_unwind_table (filedata, & aux, unwsec) && aux.table_len > 0) - dump_ia64_unwind (& aux); + dump_ia64_unwind (filedata, & aux); if (aux.table) free ((char *) aux.table); @@ -7138,63 +7768,66 @@ ia64_process_unwind (FILE * file) free (aux.symtab); if (aux.strtab) free ((char *) aux.strtab); + + return res; } struct hppa_unw_table_entry - { - struct absaddr start; - struct absaddr end; - unsigned int Cannot_unwind:1; /* 0 */ - unsigned int Millicode:1; /* 1 */ - unsigned int Millicode_save_sr0:1; /* 2 */ - unsigned int Region_description:2; /* 3..4 */ - unsigned int reserved1:1; /* 5 */ - unsigned int Entry_SR:1; /* 6 */ - unsigned int Entry_FR:4; /* number saved */ /* 7..10 */ - unsigned int Entry_GR:5; /* number saved */ /* 11..15 */ - unsigned int Args_stored:1; /* 16 */ - unsigned int Variable_Frame:1; /* 17 */ - unsigned int Separate_Package_Body:1; /* 18 */ - unsigned int Frame_Extension_Millicode:1; /* 19 */ - unsigned int Stack_Overflow_Check:1; /* 20 */ - unsigned int Two_Instruction_SP_Increment:1;/* 21 */ - unsigned int Ada_Region:1; /* 22 */ - unsigned int cxx_info:1; /* 23 */ - unsigned int cxx_try_catch:1; /* 24 */ - unsigned int sched_entry_seq:1; /* 25 */ - unsigned int reserved2:1; /* 26 */ - unsigned int Save_SP:1; /* 27 */ - unsigned int Save_RP:1; /* 28 */ - unsigned int Save_MRP_in_frame:1; /* 29 */ - unsigned int extn_ptr_defined:1; /* 30 */ - unsigned int Cleanup_defined:1; /* 31 */ - - unsigned int MPE_XL_interrupt_marker:1; /* 0 */ - unsigned int HP_UX_interrupt_marker:1; /* 1 */ - unsigned int Large_frame:1; /* 2 */ - unsigned int Pseudo_SP_Set:1; /* 3 */ - unsigned int reserved4:1; /* 4 */ - unsigned int Total_frame_size:27; /* 5..31 */ - }; +{ + struct absaddr start; + struct absaddr end; + unsigned int Cannot_unwind:1; /* 0 */ + unsigned int Millicode:1; /* 1 */ + unsigned int Millicode_save_sr0:1; /* 2 */ + unsigned int Region_description:2; /* 3..4 */ + unsigned int reserved1:1; /* 5 */ + unsigned int Entry_SR:1; /* 6 */ + unsigned int Entry_FR:4; /* Number saved 7..10 */ + unsigned int Entry_GR:5; /* Number saved 11..15 */ + unsigned int Args_stored:1; /* 16 */ + unsigned int Variable_Frame:1; /* 17 */ + unsigned int Separate_Package_Body:1; /* 18 */ + unsigned int Frame_Extension_Millicode:1; /* 19 */ + unsigned int Stack_Overflow_Check:1; /* 20 */ + unsigned int Two_Instruction_SP_Increment:1; /* 21 */ + unsigned int Ada_Region:1; /* 22 */ + unsigned int cxx_info:1; /* 23 */ + unsigned int cxx_try_catch:1; /* 24 */ + unsigned int sched_entry_seq:1; /* 25 */ + unsigned int reserved2:1; /* 26 */ + unsigned int Save_SP:1; /* 27 */ + unsigned int Save_RP:1; /* 28 */ + unsigned int Save_MRP_in_frame:1; /* 29 */ + unsigned int extn_ptr_defined:1; /* 30 */ + unsigned int Cleanup_defined:1; /* 31 */ + + unsigned int MPE_XL_interrupt_marker:1; /* 0 */ + unsigned int HP_UX_interrupt_marker:1; /* 1 */ + unsigned int Large_frame:1; /* 2 */ + unsigned int Pseudo_SP_Set:1; /* 3 */ + unsigned int reserved4:1; /* 4 */ + unsigned int Total_frame_size:27; /* 5..31 */ +}; struct hppa_unw_aux_info { - struct hppa_unw_table_entry * table; /* Unwind table. */ - unsigned long table_len; /* Length of unwind table. */ - bfd_vma seg_base; /* Starting address of segment. */ - Elf_Internal_Sym * symtab; /* The symbol table. */ - unsigned long nsyms; /* Number of symbols. */ - Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ - unsigned long nfuns; /* Number of entries in funtab. */ - char * strtab; /* The string table. */ - unsigned long strtab_size; /* Size of string table. */ + struct hppa_unw_table_entry * table; /* Unwind table. */ + unsigned long table_len; /* Length of unwind table. */ + bfd_vma seg_base; /* Starting address of segment. */ + Elf_Internal_Sym * symtab; /* The symbol table. */ + unsigned long nsyms; /* Number of symbols. */ + Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ + unsigned long nfuns; /* Number of entries in funtab. */ + char * strtab; /* The string table. */ + unsigned long strtab_size; /* Size of string table. */ }; -static void -dump_hppa_unwind (struct hppa_unw_aux_info * aux) +static bfd_boolean +dump_hppa_unwind (Filedata * filedata, struct hppa_unw_aux_info * aux) { struct hppa_unw_table_entry * tp; unsigned long j, nfuns; + bfd_boolean res = TRUE; aux->funtab = xmalloc (aux->nsyms * sizeof (Elf_Internal_Sym)); for (nfuns = 0, j = 0; j < aux->nsyms; j++) @@ -7208,7 +7841,7 @@ dump_hppa_unwind (struct hppa_unw_aux_info * aux) bfd_vma offset; const char * procname; - find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab, + find_symbol_for_address (filedata, aux->funtab, aux->nfuns, aux->strtab, aux->strtab_size, tp->start, &procname, &offset); @@ -7264,12 +7897,14 @@ dump_hppa_unwind (struct hppa_unw_aux_info * aux) printf ("\n"); free (aux->funtab); + + return res; } -static int -slurp_hppa_unwind_table (FILE * file, - struct hppa_unw_aux_info * aux, - Elf_Internal_Shdr * sec) +static bfd_boolean +slurp_hppa_unwind_table (Filedata * filedata, + struct hppa_unw_aux_info * aux, + Elf_Internal_Shdr * sec) { unsigned long size, unw_ent_size, nentries, nrelas, i; Elf_Internal_Phdr * seg; @@ -7284,14 +7919,13 @@ slurp_hppa_unwind_table (FILE * file, /* First, find the starting address of the segment that includes this section. */ - - if (elf_header.e_phnum) + if (filedata->file_header.e_phnum) { - if (! get_program_headers (file)) - return 0; + if (! get_program_headers (filedata)) + return FALSE; - for (seg = program_headers; - seg < program_headers + elf_header.e_phnum; + for (seg = filedata->program_headers; + seg < filedata->program_headers + filedata->file_header.e_phnum; ++seg) { if (seg->p_type != PT_LOAD) @@ -7309,10 +7943,10 @@ slurp_hppa_unwind_table (FILE * file, /* Second, build the unwind table from the contents of the unwind section. */ size = sec->sh_size; - table = (unsigned char *) get_data (NULL, file, sec->sh_offset, 1, size, + table = (unsigned char *) get_data (NULL, filedata, sec->sh_offset, 1, size, _("unwind table")); if (!table) - return 0; + return FALSE; unw_ent_size = 16; nentries = size / unw_ent_size; @@ -7371,22 +8005,22 @@ slurp_hppa_unwind_table (FILE * file, free (table); /* Third, apply any relocations to the unwind table. */ - for (relsec = section_headers; - relsec < section_headers + elf_header.e_shnum; + for (relsec = filedata->section_headers; + relsec < filedata->section_headers + filedata->file_header.e_shnum; ++relsec) { if (relsec->sh_type != SHT_RELA - || relsec->sh_info >= elf_header.e_shnum - || section_headers + relsec->sh_info != sec) + || relsec->sh_info >= filedata->file_header.e_shnum + || filedata->section_headers + relsec->sh_info != sec) continue; - if (!slurp_rela_relocs (file, relsec->sh_offset, relsec->sh_size, + if (!slurp_rela_relocs (filedata, relsec->sh_offset, relsec->sh_size, & rela, & nrelas)) - return 0; + return FALSE; for (rp = rela; rp < rela + nrelas; ++rp) { - relname = elf_hppa_reloc_type (get_reloc_type (rp->r_info)); + relname = elf_hppa_reloc_type (get_reloc_type (filedata, rp->r_info)); sym = aux->symtab + get_reloc_symindex (rp->r_info); /* R_PARISC_SEGREL32 or R_PARISC_SEGREL64. */ @@ -7418,37 +8052,39 @@ slurp_hppa_unwind_table (FILE * file, aux->table_len = nentries; - return 1; + return TRUE; } -static void -hppa_process_unwind (FILE * file) +static bfd_boolean +hppa_process_unwind (Filedata * filedata) { struct hppa_unw_aux_info aux; Elf_Internal_Shdr * unwsec = NULL; Elf_Internal_Shdr * strsec; Elf_Internal_Shdr * sec; unsigned long i; + bfd_boolean res = TRUE; - if (string_table == NULL) - return; + if (filedata->string_table == NULL) + return FALSE; memset (& aux, 0, sizeof (aux)); - for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec) + for (i = 0, sec = filedata->section_headers; i < filedata->file_header.e_shnum; ++i, ++sec) { if (sec->sh_type == SHT_SYMTAB - && sec->sh_link < elf_header.e_shnum) + && sec->sh_link < filedata->file_header.e_shnum) { - aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms); + aux.symtab = GET_ELF_SYMBOLS (filedata, sec, & aux.nsyms); - strsec = section_headers + sec->sh_link; + strsec = filedata->section_headers + sec->sh_link; if (aux.strtab != NULL) { error (_("Multiple auxillary string tables encountered\n")); free (aux.strtab); + res = FALSE; } - aux.strtab = (char *) get_data (NULL, file, strsec->sh_offset, + aux.strtab = (char *) get_data (NULL, filedata, strsec->sh_offset, 1, strsec->sh_size, _("string table")); aux.strtab_size = aux.strtab != NULL ? strsec->sh_size : 0; @@ -7460,18 +8096,29 @@ hppa_process_unwind (FILE * file) if (!unwsec) printf (_("\nThere are no unwind sections in this file.\n")); - for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec) + for (i = 0, sec = filedata->section_headers; i < filedata->file_header.e_shnum; ++i, ++sec) { if (streq (SECTION_NAME (sec), ".PARISC.unwind")) { - printf (_("\nUnwind section '%s' at offset 0x%lx contains %lu entries:\n"), - printable_section_name (sec), + unsigned long num_unwind = sec->sh_size / (2 * eh_addr_size + 8); + + printf (ngettext ("\nUnwind section '%s' at offset 0x%lx " + "contains %lu entry:\n", + "\nUnwind section '%s' at offset 0x%lx " + "contains %lu entries:\n", + num_unwind), + printable_section_name (filedata, sec), (unsigned long) sec->sh_offset, - (unsigned long) (sec->sh_size / (2 * eh_addr_size + 8))); + num_unwind); - slurp_hppa_unwind_table (file, &aux, sec); + if (! slurp_hppa_unwind_table (filedata, &aux, sec)) + res = FALSE; + if (aux.table_len > 0) - dump_hppa_unwind (&aux); + { + if (! dump_hppa_unwind (filedata, &aux)) + res = FALSE; + } if (aux.table) free ((char *) aux.table); @@ -7483,6 +8130,8 @@ hppa_process_unwind (FILE * file) free (aux.symtab); if (aux.strtab) free ((char *) aux.strtab); + + return res; } struct arm_section @@ -7497,7 +8146,7 @@ struct arm_section struct arm_unw_aux_info { - FILE * file; /* The file containing the unwind sections. */ + Filedata * filedata; /* The file containing the unwind sections. */ Elf_Internal_Sym * symtab; /* The file's symbol table. */ unsigned long nsyms; /* Number of symbols. */ Elf_Internal_Sym * funtab; /* Sorted table of STT_FUNC symbols. */ @@ -7507,8 +8156,10 @@ struct arm_unw_aux_info }; static const char * -arm_print_vma_and_name (struct arm_unw_aux_info *aux, - bfd_vma fn, struct absaddr addr) +arm_print_vma_and_name (Filedata * filedata, + struct arm_unw_aux_info * aux, + bfd_vma fn, + struct absaddr addr) { const char *procname; bfd_vma sym_offset; @@ -7516,7 +8167,7 @@ arm_print_vma_and_name (struct arm_unw_aux_info *aux, if (addr.section == SHN_UNDEF) addr.offset = fn; - find_symbol_for_address (aux->funtab, aux->nfuns, aux->strtab, + find_symbol_for_address (filedata, aux->funtab, aux->nfuns, aux->strtab, aux->strtab_size, addr, &procname, &sym_offset); @@ -7557,7 +8208,8 @@ arm_free_section (struct arm_section *arm_sec) 5) Return TRUE upon success, FALSE otherwise. */ static bfd_boolean -get_unwind_section_word (struct arm_unw_aux_info * aux, +get_unwind_section_word (Filedata * filedata, + struct arm_unw_aux_info * aux, struct arm_section * arm_sec, Elf_Internal_Shdr * sec, bfd_vma word_offset, @@ -7588,17 +8240,17 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, arm_free_section (arm_sec); arm_sec->sec = sec; - arm_sec->data = get_data (NULL, aux->file, sec->sh_offset, 1, + arm_sec->data = get_data (NULL, aux->filedata, sec->sh_offset, 1, sec->sh_size, _("unwind data")); arm_sec->rela = NULL; arm_sec->nrelas = 0; - for (relsec = section_headers; - relsec < section_headers + elf_header.e_shnum; + for (relsec = filedata->section_headers; + relsec < filedata->section_headers + filedata->file_header.e_shnum; ++relsec) { - if (relsec->sh_info >= elf_header.e_shnum - || section_headers + relsec->sh_info != sec + if (relsec->sh_info >= filedata->file_header.e_shnum + || filedata->section_headers + relsec->sh_info != sec /* PR 15745: Check the section type as well. */ || (relsec->sh_type != SHT_REL && relsec->sh_type != SHT_RELA)) @@ -7607,14 +8259,14 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, arm_sec->rel_type = relsec->sh_type; if (relsec->sh_type == SHT_REL) { - if (!slurp_rel_relocs (aux->file, relsec->sh_offset, + if (!slurp_rel_relocs (aux->filedata, relsec->sh_offset, relsec->sh_size, & arm_sec->rela, & arm_sec->nrelas)) return FALSE; } else /* relsec->sh_type == SHT_RELA */ { - if (!slurp_rela_relocs (aux->file, relsec->sh_offset, + if (!slurp_rela_relocs (aux->filedata, relsec->sh_offset, relsec->sh_size, & arm_sec->rela, & arm_sec->nrelas)) return FALSE; @@ -7630,9 +8282,9 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, return FALSE; /* If the offset is invalid then fail. */ - if (word_offset > (sec->sh_size - 4) - /* PR 18879 */ - || (sec->sh_size < 5 && word_offset >= sec->sh_size) + if (/* PR 21343 *//* PR 18879 */ + sec->sh_size < 4 + || word_offset > (sec->sh_size - 4) || ((bfd_signed_vma) word_offset) < 0) return FALSE; @@ -7702,7 +8354,7 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, prelval = offset - (arm_sec->sec->sh_addr + rp->r_offset); /* Check that we are processing the expected reloc type. */ - if (elf_header.e_machine == EM_ARM) + if (filedata->file_header.e_machine == EM_ARM) { relname = elf_arm_reloc_type (ELF32_R_TYPE (rp->r_info)); if (relname == NULL) @@ -7721,7 +8373,7 @@ get_unwind_section_word (struct arm_unw_aux_info * aux, continue; } } - else if (elf_header.e_machine == EM_TI_C6000) + else if (filedata->file_header.e_machine == EM_TI_C6000) { relname = elf_tic6x_reloc_type (ELF32_R_TYPE (rp->r_info)); if (relname == NULL) @@ -7791,9 +8443,9 @@ decode_tic6x_unwind_regmask (unsigned int mask) if (remaining == 0 && more_words) \ { \ data_offset += 4; \ - if (! get_unwind_section_word (aux, data_arm_sec, data_sec, \ + if (! get_unwind_section_word (filedata, aux, data_arm_sec, data_sec, \ data_offset, & word, & addr, NULL)) \ - return; \ + return FALSE; \ remaining = 4; \ more_words--; \ } \ @@ -7809,12 +8461,13 @@ decode_tic6x_unwind_regmask (unsigned int mask) else \ { \ printf (_("[Truncated opcode]\n")); \ - return; \ + return FALSE; \ } \ printf ("0x%02x ", OP) -static void -decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, +static bfd_boolean +decode_arm_unwind_bytecode (Filedata * filedata, + struct arm_unw_aux_info * aux, unsigned int word, unsigned int remaining, unsigned int more_words, @@ -7823,6 +8476,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, struct arm_section * data_arm_sec) { struct absaddr addr; + bfd_boolean res = TRUE; /* Decode the unwinding instructions. */ while (1) @@ -7858,7 +8512,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, else { unsigned int mask = ((op & 0x0f) << 8) | op2; - int first = 1; + bfd_boolean first = TRUE; int i; printf ("pop {"); @@ -7866,7 +8520,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, if (mask & (1 << i)) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("r%d", 4 + i); @@ -7884,14 +8538,14 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, else if ((op & 0xf0) == 0xa0) { int end = 4 + (op & 0x07); - int first = 1; + bfd_boolean first = TRUE; int i; printf (" pop {"); for (i = 4; i <= end; i++) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("r%d", i); @@ -7914,7 +8568,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, else { unsigned int mask = op2 & 0x0f; - int first = 1; + bfd_boolean first = TRUE; int i; printf ("pop {"); @@ -7922,7 +8576,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, if (mask & (1 << i)) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("r%d", i); @@ -7943,7 +8597,10 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, break; } if (i == sizeof (buf)) - printf (_("corrupt change to vsp")); + { + error (_("corrupt change to vsp")); + res = FALSE; + } else { offset = read_uleb128 (buf, &len, buf + i + 1); @@ -8004,7 +8661,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, else { unsigned int mask = op2 & 0x0f; - int first = 1; + bfd_boolean first = TRUE; int i; printf ("pop {"); @@ -8012,7 +8669,7 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, if (mask & (1 << i)) { if (first) - first = 0; + first = FALSE; else printf (", "); printf ("wCGR%d", i); @@ -8021,13 +8678,20 @@ decode_arm_unwind_bytecode (struct arm_unw_aux_info * aux, } } else - printf (_(" [unsupported opcode]")); + { + printf (_(" [unsupported opcode]")); + res = FALSE; + } + printf ("\n"); } + + return res; } -static void -decode_tic6x_unwind_bytecode (struct arm_unw_aux_info * aux, +static bfd_boolean +decode_tic6x_unwind_bytecode (Filedata * filedata, + struct arm_unw_aux_info * aux, unsigned int word, unsigned int remaining, unsigned int more_words, @@ -8081,8 +8745,8 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info * aux, const char *name; struct { - unsigned int offset; - unsigned int reg; + unsigned int offset; + unsigned int reg; } regpos[16]; /* Scan entire instruction first so that GET_OP output is not @@ -8147,9 +8811,8 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info * aux, /* PR 17531: file: id:000001,src:001906+004739,op:splice,rep:2. */ if (i == sizeof (buf)) { - printf ("\n"); warn (_("Corrupt stack pointer adjustment detected\n")); - return; + return FALSE; } offset = read_uleb128 (buf, &len, buf + i + 1); @@ -8170,10 +8833,12 @@ decode_tic6x_unwind_bytecode (struct arm_unw_aux_info * aux, } putchar ('\n'); } + + return TRUE; } static bfd_vma -arm_expand_prel31 (bfd_vma word, bfd_vma where) +arm_expand_prel31 (Filedata * filedata, bfd_vma word, bfd_vma where) { bfd_vma offset; @@ -8181,14 +8846,15 @@ arm_expand_prel31 (bfd_vma word, bfd_vma where) if (offset & 0x40000000) offset |= ~ (bfd_vma) 0x7fffffff; - if (elf_header.e_machine == EM_TI_C6000) + if (filedata->file_header.e_machine == EM_TI_C6000) offset <<= 1; return offset + where; } -static void -decode_arm_unwind (struct arm_unw_aux_info * aux, +static bfd_boolean +decode_arm_unwind (Filedata * filedata, + struct arm_unw_aux_info * aux, unsigned int word, unsigned int remaining, bfd_vma data_offset, @@ -8199,6 +8865,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, unsigned int more_words = 0; struct absaddr addr; bfd_vma sym_name = (bfd_vma) -1; + bfd_boolean res = TRUE; if (remaining == 0) { @@ -8207,9 +8874,9 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, here will always be 0. So we also pass in the sym_name parameter so that we can find the symbol associated with the personality routine. */ - if (! get_unwind_section_word (aux, data_arm_sec, data_sec, data_offset, + if (! get_unwind_section_word (filedata, aux, data_arm_sec, data_sec, data_offset, & word, & addr, & sym_name)) - return; + return FALSE; remaining = 4; } @@ -8220,7 +8887,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, bfd_vma fn; const char *procname; - fn = arm_expand_prel31 (word, data_sec->sh_addr + data_offset); + fn = arm_expand_prel31 (filedata, word, data_sec->sh_addr + data_offset); printf (_(" Personality routine: ")); if (fn == 0 && addr.section == SHN_UNDEF && addr.offset == 0 @@ -8236,7 +8903,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, } } else - procname = arm_print_vma_and_name (aux, fn, addr); + procname = arm_print_vma_and_name (filedata, aux, fn, addr); fputc ('\n', stdout); /* The GCC personality routines use the standard compact @@ -8254,7 +8921,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, if (!remaining) { printf (_(" [Truncated data]\n")); - return; + return FALSE; } more_words = word >> 24; word <<= 8; @@ -8262,7 +8929,7 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, per_index = -1; } else - return; + return TRUE; } else { @@ -8274,9 +8941,12 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, -- ----- ----- ---- 1 0 index Data for personalityRoutine[index] */ - if (elf_header.e_machine == EM_ARM + if (filedata->file_header.e_machine == EM_ARM && (word & 0x70000000)) - warn (_("Corrupt ARM compact model table entry: %x \n"), word); + { + warn (_("Corrupt ARM compact model table entry: %x \n"), word); + res = FALSE; + } per_index = (word >> 24) & 0x7f; printf (_(" Compact model index: %d\n"), per_index); @@ -8294,26 +8964,29 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, } } - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_ARM: if (per_index < 3) { - decode_arm_unwind_bytecode (aux, word, remaining, more_words, - data_offset, data_sec, data_arm_sec); + if (! decode_arm_unwind_bytecode (filedata, aux, word, remaining, more_words, + data_offset, data_sec, data_arm_sec)) + res = FALSE; } else { warn (_("Unknown ARM compact model index encountered\n")); printf (_(" [reserved]\n")); + res = FALSE; } break; case EM_TI_C6000: if (per_index < 3) { - decode_tic6x_unwind_bytecode (aux, word, remaining, more_words, - data_offset, data_sec, data_arm_sec); + if (! decode_tic6x_unwind_bytecode (filedata, aux, word, remaining, more_words, + data_offset, data_sec, data_arm_sec)) + res = FALSE; } else if (per_index < 5) { @@ -8335,18 +9008,24 @@ decode_arm_unwind (struct arm_unw_aux_info * aux, default: error (_("Unsupported architecture type %d encountered when decoding unwind table\n"), - elf_header.e_machine); + filedata->file_header.e_machine); + res = FALSE; } /* Decode the descriptors. Not implemented. */ + + return res; } -static void -dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) +static bfd_boolean +dump_arm_unwind (Filedata * filedata, + struct arm_unw_aux_info * aux, + Elf_Internal_Shdr * exidx_sec) { struct arm_section exidx_arm_sec, extab_arm_sec; unsigned int i, exidx_len; unsigned long j, nfuns; + bfd_boolean res = TRUE; memset (&exidx_arm_sec, 0, sizeof (exidx_arm_sec)); memset (&extab_arm_sec, 0, sizeof (extab_arm_sec)); @@ -8367,26 +9046,29 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) fputc ('\n', stdout); - if (! get_unwind_section_word (aux, & exidx_arm_sec, exidx_sec, + if (! get_unwind_section_word (filedata, aux, & exidx_arm_sec, exidx_sec, 8 * i, & exidx_fn, & fn_addr, NULL) - || ! get_unwind_section_word (aux, & exidx_arm_sec, exidx_sec, + || ! get_unwind_section_word (filedata, aux, & exidx_arm_sec, exidx_sec, 8 * i + 4, & exidx_entry, & entry_addr, NULL)) { free (aux->funtab); arm_free_section (& exidx_arm_sec); arm_free_section (& extab_arm_sec); - return; + return FALSE; } /* ARM EHABI, Section 5: An index table entry consists of 2 words. The first word contains a prel31 offset to the start of a function, with bit 31 clear. */ if (exidx_fn & 0x80000000) - warn (_("corrupt index table entry: %x\n"), exidx_fn); + { + warn (_("corrupt index table entry: %x\n"), exidx_fn); + res = FALSE; + } - fn = arm_expand_prel31 (exidx_fn, exidx_sec->sh_addr + 8 * i); + fn = arm_expand_prel31 (filedata, exidx_fn, exidx_sec->sh_addr + 8 * i); - arm_print_vma_and_name (aux, fn, fn_addr); + arm_print_vma_and_name (filedata, aux, fn, fn_addr); fputs (": ", stdout); if (exidx_entry == 1) @@ -8398,7 +9080,7 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) { print_vma (exidx_entry, PREFIX_HEX); fputc ('\n', stdout); - decode_arm_unwind (aux, exidx_entry, 4, 0, NULL, NULL); + decode_arm_unwind (filedata, aux, exidx_entry, 4, 0, NULL, NULL); } else { @@ -8406,15 +9088,15 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) Elf_Internal_Shdr *table_sec; fputs ("@", stdout); - table = arm_expand_prel31 (exidx_entry, exidx_sec->sh_addr + 8 * i + 4); + table = arm_expand_prel31 (filedata, exidx_entry, exidx_sec->sh_addr + 8 * i + 4); print_vma (table, PREFIX_HEX); printf ("\n"); /* Locate the matching .ARM.extab. */ if (entry_addr.section != SHN_UNDEF - && entry_addr.section < elf_header.e_shnum) + && entry_addr.section < filedata->file_header.e_shnum) { - table_sec = section_headers + entry_addr.section; + table_sec = filedata->section_headers + entry_addr.section; table_offset = entry_addr.offset; /* PR 18879 */ if (table_offset > table_sec->sh_size @@ -8422,24 +9104,29 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) { warn (_("Unwind entry contains corrupt offset (0x%lx) into section %s\n"), (unsigned long) table_offset, - printable_section_name (table_sec)); + printable_section_name (filedata, table_sec)); + res = FALSE; continue; } } else { - table_sec = find_section_by_address (table); + table_sec = find_section_by_address (filedata, table); if (table_sec != NULL) table_offset = table - table_sec->sh_addr; } + if (table_sec == NULL) { warn (_("Could not locate .ARM.extab section containing 0x%lx.\n"), (unsigned long) table); + res = FALSE; continue; } - decode_arm_unwind (aux, 0, 0, table_offset, table_sec, - &extab_arm_sec); + + if (! decode_arm_unwind (filedata, aux, 0, 0, table_offset, table_sec, + &extab_arm_sec)) + res = FALSE; } } @@ -8448,12 +9135,14 @@ dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) free (aux->funtab); arm_free_section (&exidx_arm_sec); arm_free_section (&extab_arm_sec); + + return res; } /* Used for both ARM and C6X unwinding tables. */ -static void -arm_process_unwind (FILE *file) +static bfd_boolean +arm_process_unwind (Filedata * filedata) { struct arm_unw_aux_info aux; Elf_Internal_Shdr *unwsec = NULL; @@ -8461,8 +9150,9 @@ arm_process_unwind (FILE *file) Elf_Internal_Shdr *sec; unsigned long i; unsigned int sec_type; + bfd_boolean res = TRUE; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_ARM: sec_type = SHT_ARM_EXIDX; @@ -8474,31 +9164,32 @@ arm_process_unwind (FILE *file) default: error (_("Unsupported architecture type %d encountered when processing unwind table\n"), - elf_header.e_machine); - return; + filedata->file_header.e_machine); + return FALSE; } - if (string_table == NULL) - return; + if (filedata->string_table == NULL) + return FALSE; memset (& aux, 0, sizeof (aux)); - aux.file = file; + aux.filedata = filedata; - for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec) + for (i = 0, sec = filedata->section_headers; i < filedata->file_header.e_shnum; ++i, ++sec) { - if (sec->sh_type == SHT_SYMTAB && sec->sh_link < elf_header.e_shnum) + if (sec->sh_type == SHT_SYMTAB && sec->sh_link < filedata->file_header.e_shnum) { - aux.symtab = GET_ELF_SYMBOLS (file, sec, & aux.nsyms); + aux.symtab = GET_ELF_SYMBOLS (filedata, sec, & aux.nsyms); - strsec = section_headers + sec->sh_link; + strsec = filedata->section_headers + sec->sh_link; /* PR binutils/17531 file: 011-12666-0.004. */ if (aux.strtab != NULL) { error (_("Multiple string tables found in file.\n")); free (aux.strtab); + res = FALSE; } - aux.strtab = get_data (NULL, file, strsec->sh_offset, + aux.strtab = get_data (NULL, filedata, strsec->sh_offset, 1, strsec->sh_size, _("string table")); aux.strtab_size = aux.strtab != NULL ? strsec->sh_size : 0; } @@ -8509,16 +9200,22 @@ arm_process_unwind (FILE *file) if (unwsec == NULL) printf (_("\nThere are no unwind sections in this file.\n")); else - for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec) + for (i = 0, sec = filedata->section_headers; i < filedata->file_header.e_shnum; ++i, ++sec) { if (sec->sh_type == sec_type) { - printf (_("\nUnwind table index '%s' at offset 0x%lx contains %lu entries:\n"), - printable_section_name (sec), + unsigned long num_unwind = sec->sh_size / (2 * eh_addr_size); + printf (ngettext ("\nUnwind section '%s' at offset 0x%lx " + "contains %lu entry:\n", + "\nUnwind section '%s' at offset 0x%lx " + "contains %lu entries:\n", + num_unwind), + printable_section_name (filedata, sec), (unsigned long) sec->sh_offset, - (unsigned long) (sec->sh_size / (2 * eh_addr_size))); + num_unwind); - dump_arm_unwind (&aux, sec); + if (! dump_arm_unwind (filedata, &aux, sec)) + res = FALSE; } } @@ -8526,37 +9223,37 @@ arm_process_unwind (FILE *file) free (aux.symtab); if (aux.strtab) free ((char *) aux.strtab); + + return res; } -static void -process_unwind (FILE * file) +static bfd_boolean +process_unwind (Filedata * filedata) { struct unwind_handler { - int machtype; - void (* handler)(FILE *); + unsigned int machtype; + bfd_boolean (* handler)(Filedata *); } handlers[] = { { EM_ARM, arm_process_unwind }, { EM_IA_64, ia64_process_unwind }, { EM_PARISC, hppa_process_unwind }, { EM_TI_C6000, arm_process_unwind }, - { 0, 0 } + { 0, NULL } }; int i; if (!do_unwind) - return; + return TRUE; for (i = 0; handlers[i].handler != NULL; i++) - if (elf_header.e_machine == handlers[i].machtype) - { - handlers[i].handler (file); - return; - } + if (filedata->file_header.e_machine == handlers[i].machtype) + return handlers[i].handler (filedata); printf (_("\nThe decoding of unwind sections for machine type %s is not currently supported.\n"), - get_machine_name (elf_header.e_machine)); + get_machine_name (filedata->file_header.e_machine)); + return TRUE; } static void @@ -8578,13 +9275,13 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry) "RLD_ORDER_SAFE" }; unsigned int cnt; - int first = 1; + bfd_boolean first = TRUE; for (cnt = 0; cnt < ARRAY_SIZE (opts); ++cnt) if (entry->d_un.d_val & (1 << cnt)) { printf ("%s%s", first ? "" : " ", opts[cnt]); - first = 0; + first = FALSE; } } break; @@ -8603,7 +9300,7 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry) case DT_MIPS_TIME_STAMP: { - char timebuf[20]; + char timebuf[128]; struct tm * tmp; time_t atime = entry->d_un.d_val; @@ -8632,7 +9329,7 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry) case DT_MIPS_DELTA_SYM_NO: case DT_MIPS_DELTA_CLASSSYM_NO: case DT_MIPS_COMPACT_SIZE: - print_vma (entry->d_un.d_ptr, DEC); + print_vma (entry->d_un.d_val, DEC); break; default: @@ -8673,7 +9370,7 @@ dynamic_section_parisc_val (Elf_Internal_Dyn * entry) { DT_HP_GROUP, "HP_GROUP" }, { DT_HP_PROTECT_LINKAGE_TABLE, "HP_PROTECT_LINKAGE_TABLE" } }; - int first = 1; + bfd_boolean first = TRUE; size_t cnt; bfd_vma val = entry->d_un.d_val; @@ -8683,7 +9380,7 @@ dynamic_section_parisc_val (Elf_Internal_Dyn * entry) if (! first) putchar (' '); fputs (flags[cnt].str, stdout); - first = 0; + first = FALSE; val ^= flags[cnt].bit; } @@ -8785,17 +9482,17 @@ dynamic_section_ia64_val (Elf_Internal_Dyn * entry) putchar ('\n'); } -static int -get_32bit_dynamic_section (FILE * file) +static bfd_boolean +get_32bit_dynamic_section (Filedata * filedata) { Elf32_External_Dyn * edyn; Elf32_External_Dyn * ext; Elf_Internal_Dyn * entry; - edyn = (Elf32_External_Dyn *) get_data (NULL, file, dynamic_addr, 1, + edyn = (Elf32_External_Dyn *) get_data (NULL, filedata, dynamic_addr, 1, dynamic_size, _("dynamic section")); if (!edyn) - return 0; + return FALSE; /* SGI's ELF has more than one section in the DYNAMIC segment, and we might not have the luxury of section headers. Look for the DT_NULL @@ -8816,7 +9513,7 @@ get_32bit_dynamic_section (FILE * file) error (_("Out of memory allocating space for %lu dynamic entries\n"), (unsigned long) dynamic_nent); free (edyn); - return 0; + return FALSE; } for (ext = edyn, entry = dynamic_section; @@ -8829,21 +9526,21 @@ get_32bit_dynamic_section (FILE * file) free (edyn); - return 1; + return TRUE; } -static int -get_64bit_dynamic_section (FILE * file) +static bfd_boolean +get_64bit_dynamic_section (Filedata * filedata) { Elf64_External_Dyn * edyn; Elf64_External_Dyn * ext; Elf_Internal_Dyn * entry; /* Read in the data. */ - edyn = (Elf64_External_Dyn *) get_data (NULL, file, dynamic_addr, 1, + edyn = (Elf64_External_Dyn *) get_data (NULL, filedata, dynamic_addr, 1, dynamic_size, _("dynamic section")); if (!edyn) - return 0; + return FALSE; /* SGI's ELF has more than one section in the DYNAMIC segment, and we might not have the luxury of section headers. Look for the DT_NULL @@ -8865,7 +9562,7 @@ get_64bit_dynamic_section (FILE * file) error (_("Out of memory allocating space for %lu dynamic entries\n"), (unsigned long) dynamic_nent); free (edyn); - return 0; + return FALSE; } /* Convert from external to internal formats. */ @@ -8879,13 +9576,13 @@ get_64bit_dynamic_section (FILE * file) free (edyn); - return 1; + return TRUE; } static void print_dynamic_flags (bfd_vma flags) { - int first = 1; + bfd_boolean first = TRUE; while (flags) { @@ -8895,7 +9592,7 @@ print_dynamic_flags (bfd_vma flags) flags &= ~ flag; if (first) - first = 0; + first = FALSE; else putc (' ', stdout); @@ -8914,8 +9611,8 @@ print_dynamic_flags (bfd_vma flags) /* Parse and display the contents of the dynamic section. */ -static int -process_dynamic_section (FILE * file) +static bfd_boolean +process_dynamic_section (Filedata * filedata) { Elf_Internal_Dyn * entry; @@ -8924,16 +9621,19 @@ process_dynamic_section (FILE * file) if (do_dynamic) printf (_("\nThere is no dynamic section in this file.\n")); - return 1; + return TRUE; } if (is_32bit_elf) { - if (! get_32bit_dynamic_section (file)) - return 0; + if (! get_32bit_dynamic_section (filedata)) + return FALSE; + } + else + { + if (! get_64bit_dynamic_section (filedata)) + return FALSE; } - else if (! get_64bit_dynamic_section (file)) - return 0; /* Find the appropriate symbol table. */ if (dynamic_symbols == NULL) @@ -8953,25 +9653,26 @@ process_dynamic_section (FILE * file) we default to reading in the entire file (!) and processing that. This is overkill, I know, but it should work. */ - section.sh_offset = offset_from_vma (file, entry->d_un.d_val, 0); + section.sh_offset = offset_from_vma (filedata, entry->d_un.d_val, 0); + if ((bfd_size_type) section.sh_offset > filedata->file_size) + { + /* See PR 21379 for a reproducer. */ + error (_("Invalid DT_SYMTAB entry: %lx"), (long) section.sh_offset); + return FALSE; + } if (archive_file_offset != 0) section.sh_size = archive_file_size - section.sh_offset; else - { - if (fseek (file, 0, SEEK_END)) - error (_("Unable to seek to end of file!\n")); - - section.sh_size = ftell (file) - section.sh_offset; - } + section.sh_size = filedata->file_size - section.sh_offset; if (is_32bit_elf) section.sh_entsize = sizeof (Elf32_External_Sym); else section.sh_entsize = sizeof (Elf64_External_Sym); - section.sh_name = string_table_length; + section.sh_name = filedata->string_table_length; - dynamic_symbols = GET_ELF_SYMBOLS (file, §ion, & num_dynamic_syms); + dynamic_symbols = GET_ELF_SYMBOLS (filedata, §ion, & num_dynamic_syms); if (num_dynamic_syms < 1) { error (_("Unable to determine the number of symbols to load\n")); @@ -9000,16 +9701,12 @@ process_dynamic_section (FILE * file) processing that. This is overkill, I know, but it should work. */ - offset = offset_from_vma (file, entry->d_un.d_val, 0); + offset = offset_from_vma (filedata, entry->d_un.d_val, 0); if (archive_file_offset != 0) str_tab_len = archive_file_size - offset; else - { - if (fseek (file, 0, SEEK_END)) - error (_("Unable to seek to end of file\n")); - str_tab_len = ftell (file) - offset; - } + str_tab_len = filedata->file_size - offset; if (str_tab_len < 1) { @@ -9018,7 +9715,7 @@ process_dynamic_section (FILE * file) continue; } - dynamic_strings = (char *) get_data (NULL, file, offset, 1, + dynamic_strings = (char *) get_data (NULL, filedata, offset, 1, str_tab_len, _("dynamic string table")); dynamic_strings_length = dynamic_strings == NULL ? 0 : str_tab_len; @@ -9048,7 +9745,7 @@ process_dynamic_section (FILE * file) else if (entry->d_tag == DT_SYMINSZ) syminsz = entry->d_un.d_val; else if (entry->d_tag == DT_SYMINFO) - dynamic_syminfo_offset = offset_from_vma (file, entry->d_un.d_val, + dynamic_syminfo_offset = offset_from_vma (filedata, entry->d_un.d_val, syminsz); } @@ -9060,17 +9757,17 @@ process_dynamic_section (FILE * file) /* There is a syminfo section. Read the data. */ extsyminfo = (Elf_External_Syminfo *) - get_data (NULL, file, dynamic_syminfo_offset, 1, syminsz, + get_data (NULL, filedata, dynamic_syminfo_offset, 1, syminsz, _("symbol information")); if (!extsyminfo) - return 0; + return FALSE; dynamic_syminfo = (Elf_Internal_Syminfo *) malloc (syminsz); if (dynamic_syminfo == NULL) { error (_("Out of memory allocating %lu byte for dynamic symbol info\n"), (unsigned long) syminsz); - return 0; + return FALSE; } dynamic_syminfo_nent = syminsz / sizeof (Elf_External_Syminfo); @@ -9087,7 +9784,11 @@ process_dynamic_section (FILE * file) } if (do_dynamic && dynamic_addr) - printf (_("\nDynamic section at offset 0x%lx contains %lu entries:\n"), + printf (ngettext ("\nDynamic section at offset 0x%lx " + "contains %lu entry:\n", + "\nDynamic section at offset 0x%lx " + "contains %lu entries:\n", + dynamic_nent), dynamic_addr, (unsigned long) dynamic_nent); if (do_dynamic) printf (_(" Tag Type Name/Value\n")); @@ -9102,11 +9803,9 @@ process_dynamic_section (FILE * file) putchar (' '); print_vma (entry->d_tag, FULL_HEX); - dtype = get_dynamic_type (entry->d_tag); + dtype = get_dynamic_type (filedata, entry->d_tag); printf (" (%s)%*s", dtype, - ((is_32bit_elf ? 27 : 19) - - (int) strlen (dtype)), - " "); + ((is_32bit_elf ? 27 : 19) - (int) strlen (dtype)), " "); } switch (entry->d_tag) @@ -9363,6 +10062,21 @@ process_dynamic_section (FILE * file) printf (" PIE"); val ^= DF_1_PIE; } + if (val & DF_1_KMOD) + { + printf (" KMOD"); + val ^= DF_1_KMOD; + } + if (val & DF_1_WEAKFILTER) + { + printf (" WEAKFILTER"); + val ^= DF_1_WEAKFILTER; + } + if (val & DF_1_NOCOMMON) + { + printf (" NOCOMMON"); + val ^= DF_1_NOCOMMON; + } if (val != 0) printf (" %lx", val); puts (""); @@ -9373,7 +10087,7 @@ process_dynamic_section (FILE * file) case DT_PLTREL: dynamic_info[entry->d_tag] = entry->d_un.d_val; if (do_dynamic) - puts (get_dynamic_type (entry->d_un.d_val)); + puts (get_dynamic_type (filedata, entry->d_un.d_val)); break; case DT_NULL : @@ -9447,6 +10161,7 @@ process_dynamic_section (FILE * file) case DT_SYMENT : case DT_RELENT : dynamic_info[entry->d_tag] = entry->d_un.d_val; + /* Fall through. */ case DT_PLTPADSZ: case DT_MOVEENT : case DT_MOVESZ : @@ -9538,7 +10253,7 @@ process_dynamic_section (FILE * file) if (do_dynamic) { - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_MIPS: case EM_MIPS_RS3_LE: @@ -9559,13 +10274,13 @@ process_dynamic_section (FILE * file) } } - return 1; + return TRUE; } static char * get_ver_flags (unsigned int flags) { - static char buff[32]; + static char buff[128]; buff[0] = 0; @@ -9573,44 +10288,49 @@ get_ver_flags (unsigned int flags) return _("none"); if (flags & VER_FLG_BASE) - strcat (buff, "BASE "); + strcat (buff, "BASE"); if (flags & VER_FLG_WEAK) { if (flags & VER_FLG_BASE) - strcat (buff, "| "); + strcat (buff, " | "); - strcat (buff, "WEAK "); + strcat (buff, "WEAK"); } if (flags & VER_FLG_INFO) { if (flags & (VER_FLG_BASE|VER_FLG_WEAK)) - strcat (buff, "| "); + strcat (buff, " | "); - strcat (buff, "INFO "); + strcat (buff, "INFO"); } if (flags & ~(VER_FLG_BASE | VER_FLG_WEAK | VER_FLG_INFO)) - strcat (buff, _("| ")); + { + if (flags & (VER_FLG_BASE | VER_FLG_WEAK | VER_FLG_INFO)) + strcat (buff, " | "); + + strcat (buff, _("")); + } return buff; } /* Display the contents of the version sections. */ -static int -process_version_sections (FILE * file) +static bfd_boolean +process_version_sections (Filedata * filedata) { Elf_Internal_Shdr * section; unsigned i; - int found = 0; + bfd_boolean found = FALSE; if (! do_version) - return 1; + return TRUE; - for (i = 0, section = section_headers; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, section++) { switch (section->sh_type) @@ -9618,24 +10338,28 @@ process_version_sections (FILE * file) case SHT_GNU_verdef: { Elf_External_Verdef * edefs; - unsigned int idx; - unsigned int cnt; + unsigned long idx; + unsigned long cnt; char * endbuf; - found = 1; + found = TRUE; - printf (_("\nVersion definition section '%s' contains %u entries:\n"), - printable_section_name (section), + printf (ngettext ("\nVersion definition section '%s' " + "contains %u entry:\n", + "\nVersion definition section '%s' " + "contains %u entries:\n", + section->sh_info), + printable_section_name (filedata, section), section->sh_info); printf (_(" Addr: 0x")); printf_vma (section->sh_addr); - printf (_(" Offset: %#08lx Link: %u (%s)"), + printf (_(" Offset: %#08lx Link: %u (%s)\n"), (unsigned long) section->sh_offset, section->sh_link, - printable_section_name_from_index (section->sh_link)); + printable_section_name_from_index (filedata, section->sh_link)); edefs = (Elf_External_Verdef *) - get_data (NULL, file, section->sh_offset, 1,section->sh_size, + get_data (NULL, filedata, section->sh_offset, 1,section->sh_size, _("version definition section")); if (!edefs) break; @@ -9648,12 +10372,8 @@ process_version_sections (FILE * file) Elf_Internal_Verdef ent; Elf_External_Verdaux * eaux; Elf_Internal_Verdaux aux; + unsigned long isum; int j; - int isum; - - /* Check for very large indicies. */ - if (idx > (size_t) (endbuf - (char *) edefs)) - break; vstart = ((char *) edefs) + idx; if (vstart + sizeof (*edef) > endbuf) @@ -9669,7 +10389,7 @@ process_version_sections (FILE * file) ent.vd_aux = BYTE_GET (edef->vd_aux); ent.vd_next = BYTE_GET (edef->vd_next); - printf (_(" %#06x: Rev: %d Flags: %s"), + printf (_(" %#06lx: Rev: %d Flags: %s"), idx, ent.vd_version, get_ver_flags (ent.vd_flags)); printf (_(" Index: %d Cnt: %d "), @@ -9681,6 +10401,8 @@ process_version_sections (FILE * file) vstart += ent.vd_aux; + if (vstart + sizeof (*eaux) > endbuf) + break; eaux = (Elf_External_Verdaux *) vstart; aux.vda_name = BYTE_GET (eaux->vda_name); @@ -9695,6 +10417,14 @@ process_version_sections (FILE * file) for (j = 1; j < ent.vd_cnt; j++) { + if (aux.vda_next < sizeof (*eaux) + && !(j == ent.vd_cnt - 1 && aux.vda_next == 0)) + { + warn (_("Invalid vda_next field of %lx\n"), + aux.vda_next); + j = ent.vd_cnt; + break; + } /* Check for overflow. */ if (aux.vda_next > (size_t) (endbuf - vstart)) break; @@ -9702,26 +10432,34 @@ process_version_sections (FILE * file) isum += aux.vda_next; vstart += aux.vda_next; - eaux = (Elf_External_Verdaux *) vstart; if (vstart + sizeof (*eaux) > endbuf) break; + eaux = (Elf_External_Verdaux *) vstart; aux.vda_name = BYTE_GET (eaux->vda_name); aux.vda_next = BYTE_GET (eaux->vda_next); if (VALID_DYNAMIC_NAME (aux.vda_name)) - printf (_(" %#06x: Parent %d: %s\n"), + printf (_(" %#06lx: Parent %d: %s\n"), isum, j, GET_DYNAMIC_NAME (aux.vda_name)); else - printf (_(" %#06x: Parent %d, name index: %ld\n"), + printf (_(" %#06lx: Parent %d, name index: %ld\n"), isum, j, aux.vda_name); } if (j < ent.vd_cnt) printf (_(" Version def aux past end of section\n")); - /* PR 17531: file: id:000001,src:000172+005151,op:splice,rep:2. */ - if (idx + ent.vd_next <= idx) + /* PR 17531: + file: id:000001,src:000172+005151,op:splice,rep:2. */ + if (ent.vd_next < sizeof (*edef) + && !(cnt == section->sh_info - 1 && ent.vd_next == 0)) + { + warn (_("Invalid vd_next field of %lx\n"), ent.vd_next); + cnt = section->sh_info; + break; + } + if (ent.vd_next > (size_t) (endbuf - ((char *) edefs + idx))) break; idx += ent.vd_next; @@ -9737,22 +10475,26 @@ process_version_sections (FILE * file) case SHT_GNU_verneed: { Elf_External_Verneed * eneed; - unsigned int idx; - unsigned int cnt; + unsigned long idx; + unsigned long cnt; char * endbuf; - found = 1; + found = TRUE; - printf (_("\nVersion needs section '%s' contains %u entries:\n"), - printable_section_name (section), section->sh_info); + printf (ngettext ("\nVersion needs section '%s' " + "contains %u entry:\n", + "\nVersion needs section '%s' " + "contains %u entries:\n", + section->sh_info), + printable_section_name (filedata, section), section->sh_info); printf (_(" Addr: 0x")); printf_vma (section->sh_addr); printf (_(" Offset: %#08lx Link: %u (%s)\n"), (unsigned long) section->sh_offset, section->sh_link, - printable_section_name_from_index (section->sh_link)); + printable_section_name_from_index (filedata, section->sh_link)); - eneed = (Elf_External_Verneed *) get_data (NULL, file, + eneed = (Elf_External_Verneed *) get_data (NULL, filedata, section->sh_offset, 1, section->sh_size, _("Version Needs section")); @@ -9764,13 +10506,10 @@ process_version_sections (FILE * file) { Elf_External_Verneed * entry; Elf_Internal_Verneed ent; + unsigned long isum; int j; - int isum; char * vstart; - if (idx > (size_t) (endbuf - (char *) eneed)) - break; - vstart = ((char *) eneed) + idx; if (vstart + sizeof (*entry) > endbuf) break; @@ -9783,7 +10522,7 @@ process_version_sections (FILE * file) ent.vn_aux = BYTE_GET (entry->vn_aux); ent.vn_next = BYTE_GET (entry->vn_next); - printf (_(" %#06x: Version: %d"), idx, ent.vn_version); + printf (_(" %#06lx: Version: %d"), idx, ent.vn_version); if (VALID_DYNAMIC_NAME (ent.vn_file)) printf (_(" File: %s"), GET_DYNAMIC_NAME (ent.vn_file)); @@ -9813,24 +10552,26 @@ process_version_sections (FILE * file) aux.vna_next = BYTE_GET (eaux->vna_next); if (VALID_DYNAMIC_NAME (aux.vna_name)) - printf (_(" %#06x: Name: %s"), + printf (_(" %#06lx: Name: %s"), isum, GET_DYNAMIC_NAME (aux.vna_name)); else - printf (_(" %#06x: Name index: %lx"), + printf (_(" %#06lx: Name index: %lx"), isum, aux.vna_name); printf (_(" Flags: %s Version: %d\n"), get_ver_flags (aux.vna_flags), aux.vna_other); - /* Check for overflow. */ - if (aux.vna_next > (size_t) (endbuf - vstart) - || (aux.vna_next == 0 && j < ent.vn_cnt - 1)) + if (aux.vna_next < sizeof (*eaux) + && !(j == ent.vn_cnt - 1 && aux.vna_next == 0)) { warn (_("Invalid vna_next field of %lx\n"), aux.vna_next); j = ent.vn_cnt; break; } + /* Check for overflow. */ + if (aux.vna_next > (size_t) (endbuf - vstart)) + break; isum += aux.vna_next; vstart += aux.vna_next; } @@ -9838,12 +10579,15 @@ process_version_sections (FILE * file) if (j < ent.vn_cnt) warn (_("Missing Version Needs auxillary information\n")); - if (ent.vn_next == 0 && cnt < section->sh_info - 1) + if (ent.vn_next < sizeof (*entry) + && !(cnt == section->sh_info - 1 && ent.vn_next == 0)) { - warn (_("Corrupt Version Needs structure - offset to next structure is zero with entries still left to be processed\n")); + warn (_("Invalid vn_next field of %lx\n"), ent.vn_next); cnt = section->sh_info; break; } + if (ent.vn_next > (size_t) (endbuf - ((char *) eneed + idx))) + break; idx += ent.vn_next; } @@ -9867,24 +10611,24 @@ process_version_sections (FILE * file) unsigned long num_syms; long off; - if (section->sh_link >= elf_header.e_shnum) + if (section->sh_link >= filedata->file_header.e_shnum) break; - link_section = section_headers + section->sh_link; + link_section = filedata->section_headers + section->sh_link; total = section->sh_size / sizeof (Elf_External_Versym); - if (link_section->sh_link >= elf_header.e_shnum) + if (link_section->sh_link >= filedata->file_header.e_shnum) break; - found = 1; + found = TRUE; - symbols = GET_ELF_SYMBOLS (file, link_section, & num_syms); + symbols = GET_ELF_SYMBOLS (filedata, link_section, & num_syms); if (symbols == NULL) break; - string_sec = section_headers + link_section->sh_link; + string_sec = filedata->section_headers + link_section->sh_link; - strtab = (char *) get_data (NULL, file, string_sec->sh_offset, 1, + strtab = (char *) get_data (NULL, filedata, string_sec->sh_offset, 1, string_sec->sh_size, _("version string table")); if (!strtab) @@ -9893,19 +10637,23 @@ process_version_sections (FILE * file) break; } - printf (_("\nVersion symbols section '%s' contains %lu entries:\n"), - printable_section_name (section), (unsigned long) total); + printf (ngettext ("\nVersion symbols section '%s' " + "contains %lu entry:\n", + "\nVersion symbols section '%s' " + "contains %lu entries:\n", + total), + printable_section_name (filedata, section), (unsigned long) total); printf (_(" Addr: ")); printf_vma (section->sh_addr); printf (_(" Offset: %#08lx Link: %u (%s)\n"), (unsigned long) section->sh_offset, section->sh_link, - printable_section_name (link_section)); + printable_section_name (filedata, link_section)); - off = offset_from_vma (file, + off = offset_from_vma (filedata, version_info[DT_VERSIONTAGIDX (DT_VERSYM)], total * sizeof (short)); - edata = (unsigned char *) get_data (NULL, file, off, total, + edata = (unsigned char *) get_data (NULL, filedata, off, total, sizeof (short), _("version symbol data")); if (!edata) @@ -9961,7 +10709,7 @@ process_version_sections (FILE * file) unsigned long offset; offset = offset_from_vma - (file, version_info[DT_VERSIONTAGIDX (DT_VERNEED)], + (filedata, version_info[DT_VERSIONTAGIDX (DT_VERNEED)], sizeof (Elf_External_Verneed)); do @@ -9971,7 +10719,7 @@ process_version_sections (FILE * file) Elf_External_Vernaux evna; unsigned long a_off; - if (get_data (&evn, file, offset, sizeof (evn), 1, + if (get_data (&evn, filedata, offset, sizeof (evn), 1, _("version need")) == NULL) break; @@ -9982,7 +10730,7 @@ process_version_sections (FILE * file) do { - if (get_data (&evna, file, a_off, sizeof (evna), + if (get_data (&evna, filedata, a_off, sizeof (evna), 1, _("version need aux (2)")) == NULL) { ivna.vna_next = 0; @@ -10023,12 +10771,12 @@ process_version_sections (FILE * file) unsigned long offset; offset = offset_from_vma - (file, version_info[DT_VERSIONTAGIDX (DT_VERDEF)], + (filedata, version_info[DT_VERSIONTAGIDX (DT_VERDEF)], sizeof evd); do { - if (get_data (&evd, file, offset, sizeof (evd), 1, + if (get_data (&evd, filedata, offset, sizeof (evd), 1, _("version def")) == NULL) { ivd.vd_next = 0; @@ -10054,7 +10802,7 @@ process_version_sections (FILE * file) ivd.vd_aux = BYTE_GET (evd.vd_aux); - if (get_data (&evda, file, + if (get_data (&evda, filedata, offset - ivd.vd_next + ivd.vd_aux, sizeof (evda), 1, _("version def aux")) == NULL) @@ -10097,11 +10845,11 @@ process_version_sections (FILE * file) if (! found) printf (_("\nNo version information found in this file.\n")); - return 1; + return TRUE; } static const char * -get_symbol_binding (unsigned int binding) +get_symbol_binding (Filedata * filedata, unsigned int binding) { static char buff[32]; @@ -10117,9 +10865,9 @@ get_symbol_binding (unsigned int binding) else if (binding >= STB_LOOS && binding <= STB_HIOS) { if (binding == STB_GNU_UNIQUE - && (elf_header.e_ident[EI_OSABI] == ELFOSABI_GNU + && (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_GNU /* GNU is still using the default value 0. */ - || elf_header.e_ident[EI_OSABI] == ELFOSABI_NONE)) + || filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_NONE)) return "UNIQUE"; snprintf (buff, sizeof (buff), _(": %d"), binding); } @@ -10130,7 +10878,7 @@ get_symbol_binding (unsigned int binding) } static const char * -get_symbol_type (unsigned int type) +get_symbol_type (Filedata * filedata, unsigned int type) { static char buff[32]; @@ -10148,20 +10896,20 @@ get_symbol_type (unsigned int type) default: if (type >= STT_LOPROC && type <= STT_HIPROC) { - if (elf_header.e_machine == EM_ARM && type == STT_ARM_TFUNC) + if (filedata->file_header.e_machine == EM_ARM && type == STT_ARM_TFUNC) return "THUMB_FUNC"; - if (elf_header.e_machine == EM_SPARCV9 && type == STT_REGISTER) + if (filedata->file_header.e_machine == EM_SPARCV9 && type == STT_REGISTER) return "REGISTER"; - if (elf_header.e_machine == EM_PARISC && type == STT_PARISC_MILLI) + if (filedata->file_header.e_machine == EM_PARISC && type == STT_PARISC_MILLI) return "PARISC_MILLI"; snprintf (buff, sizeof (buff), _(": %d"), type); } else if (type >= STT_LOOS && type <= STT_HIOS) { - if (elf_header.e_machine == EM_PARISC) + if (filedata->file_header.e_machine == EM_PARISC) { if (type == STT_HP_OPAQUE) return "HP_OPAQUE"; @@ -10170,10 +10918,10 @@ get_symbol_type (unsigned int type) } if (type == STT_GNU_IFUNC - && (elf_header.e_ident[EI_OSABI] == ELFOSABI_GNU - || elf_header.e_ident[EI_OSABI] == ELFOSABI_FREEBSD + && (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_GNU + || filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_FREEBSD /* GNU is still using the default value 0. */ - || elf_header.e_ident[EI_OSABI] == ELFOSABI_NONE)) + || filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_NONE)) return "IFUNC"; snprintf (buff, sizeof (buff), _(": %d"), type); @@ -10200,38 +10948,43 @@ get_symbol_visibility (unsigned int visibility) } static const char * -get_mips_symbol_other (unsigned int other) +get_solaris_symbol_visibility (unsigned int visibility) { - switch (other) + switch (visibility) { - case STO_OPTIONAL: - return "OPTIONAL"; - case STO_MIPS_PLT: - return "MIPS PLT"; - case STO_MIPS_PIC: - return "MIPS PIC"; - case STO_MICROMIPS: - return "MICROMIPS"; - case STO_MICROMIPS | STO_MIPS_PIC: - return "MICROMIPS, MIPS PIC"; - case STO_MIPS16: - return "MIPS16"; - default: - return NULL; + case 4: return "EXPORTED"; + case 5: return "SINGLETON"; + case 6: return "ELIMINATE"; + default: return get_symbol_visibility (visibility); } } static const char * -get_ia64_symbol_other (unsigned int other) +get_mips_symbol_other (unsigned int other) +{ + switch (other) + { + case STO_OPTIONAL: return "OPTIONAL"; + case STO_MIPS_PLT: return "MIPS PLT"; + case STO_MIPS_PIC: return "MIPS PIC"; + case STO_MICROMIPS: return "MICROMIPS"; + case STO_MICROMIPS | STO_MIPS_PIC: return "MICROMIPS, MIPS PIC"; + case STO_MIPS16: return "MIPS16"; + default: return NULL; + } +} + +static const char * +get_ia64_symbol_other (Filedata * filedata, unsigned int other) { - if (is_ia64_vms ()) + if (is_ia64_vms (filedata)) { static char res[32]; res[0] = 0; /* Function types is for images and .STB files only. */ - switch (elf_header.e_type) + switch (filedata->file_header.e_type) { case ET_DYN: case ET_EXEC: @@ -10302,7 +11055,7 @@ get_ppc64_symbol_other (unsigned int other) } static const char * -get_symbol_other (unsigned int other) +get_symbol_other (Filedata * filedata, unsigned int other) { const char * result = NULL; static char buff [32]; @@ -10310,18 +11063,19 @@ get_symbol_other (unsigned int other) if (other == 0) return ""; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_MIPS: result = get_mips_symbol_other (other); break; case EM_IA_64: - result = get_ia64_symbol_other (other); + result = get_ia64_symbol_other (filedata, other); break; case EM_PPC64: result = get_ppc64_symbol_other (other); break; default: + result = NULL; break; } @@ -10333,7 +11087,7 @@ get_symbol_other (unsigned int other) } static const char * -get_symbol_index_type (unsigned int type) +get_symbol_index_type (Filedata * filedata, unsigned int type) { static char buff[32]; @@ -10344,21 +11098,21 @@ get_symbol_index_type (unsigned int type) case SHN_COMMON: return "COM"; default: if (type == SHN_IA_64_ANSI_COMMON - && elf_header.e_machine == EM_IA_64 - && elf_header.e_ident[EI_OSABI] == ELFOSABI_HPUX) + && filedata->file_header.e_machine == EM_IA_64 + && filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_HPUX) return "ANSI_COM"; - else if ((elf_header.e_machine == EM_X86_64 - || elf_header.e_machine == EM_L1OM - || elf_header.e_machine == EM_K1OM) + else if ((filedata->file_header.e_machine == EM_X86_64 + || filedata->file_header.e_machine == EM_L1OM + || filedata->file_header.e_machine == EM_K1OM) && type == SHN_X86_64_LCOMMON) return "LARGE_COM"; else if ((type == SHN_MIPS_SCOMMON - && elf_header.e_machine == EM_MIPS) + && filedata->file_header.e_machine == EM_MIPS) || (type == SHN_TIC6X_SCOMMON - && elf_header.e_machine == EM_TI_C6000)) + && filedata->file_header.e_machine == EM_TI_C6000)) return "SCOM"; else if (type == SHN_MIPS_SUNDEFINED - && elf_header.e_machine == EM_MIPS) + && filedata->file_header.e_machine == EM_MIPS) return "SUND"; else if (type >= SHN_LOPROC && type <= SHN_HIPROC) sprintf (buff, "PRC[0x%04x]", type & 0xffff); @@ -10366,7 +11120,7 @@ get_symbol_index_type (unsigned int type) sprintf (buff, "OS [0x%04x]", type & 0xffff); else if (type >= SHN_LORESERVE) sprintf (buff, "RSV[0x%04x]", type & 0xffff); - else if (type >= elf_header.e_shnum) + else if (type >= filedata->file_header.e_shnum) sprintf (buff, _("bad section index[%3d]"), type); else sprintf (buff, "%3d", type); @@ -10377,7 +11131,7 @@ get_symbol_index_type (unsigned int type) } static bfd_vma * -get_dynamic_data (FILE * file, bfd_size_type number, unsigned int ent_size) +get_dynamic_data (Filedata * filedata, bfd_size_type number, unsigned int ent_size) { unsigned char * e_data; bfd_vma * i_data; @@ -10388,32 +11142,32 @@ get_dynamic_data (FILE * file, bfd_size_type number, unsigned int ent_size) if (sizeof (size_t) < sizeof (bfd_size_type) && (bfd_size_type) ((size_t) number) != number) { - error (_("Size truncation prevents reading %llu elements of size %u\n"), - (unsigned long long) number, ent_size); + error (_("Size truncation prevents reading %s elements of size %u\n"), + bfd_vmatoa ("u", number), ent_size); return NULL; } /* Be kind to memory chekers (eg valgrind, address sanitizer) by not attempting to allocate memory when the read is bound to fail. */ - if (ent_size * number > current_file_size) + if (ent_size * number > filedata->file_size) { - error (_("Invalid number of dynamic entries: %llu\n"), - (unsigned long long) number); + error (_("Invalid number of dynamic entries: %s\n"), + bfd_vmatoa ("u", number)); return NULL; } e_data = (unsigned char *) cmalloc ((size_t) number, ent_size); if (e_data == NULL) { - error (_("Out of memory reading %llu dynamic entries\n"), - (unsigned long long) number); + error (_("Out of memory reading %s dynamic entries\n"), + bfd_vmatoa ("u", number)); return NULL; } - if (fread (e_data, ent_size, (size_t) number, file) != number) + if (fread (e_data, ent_size, (size_t) number, filedata->handle) != number) { - error (_("Unable to read in %llu bytes of dynamic data\n"), - (unsigned long long) (number * ent_size)); + error (_("Unable to read in %s bytes of dynamic data\n"), + bfd_vmatoa ("u", number * ent_size)); free (e_data); return NULL; } @@ -10421,8 +11175,8 @@ get_dynamic_data (FILE * file, bfd_size_type number, unsigned int ent_size) i_data = (bfd_vma *) cmalloc ((size_t) number, sizeof (*i_data)); if (i_data == NULL) { - error (_("Out of memory allocating space for %llu dynamic entries\n"), - (unsigned long long) number); + error (_("Out of memory allocating space for %s dynamic entries\n"), + bfd_vmatoa ("u", number)); free (e_data); return NULL; } @@ -10436,7 +11190,7 @@ get_dynamic_data (FILE * file, bfd_size_type number, unsigned int ent_size) } static void -print_dynamic_symbol (bfd_vma si, unsigned long hn) +print_dynamic_symbol (Filedata * filedata, bfd_vma si, unsigned long hn) { Elf_Internal_Sym * psym; int n; @@ -10458,16 +11212,25 @@ print_dynamic_symbol (bfd_vma si, unsigned long hn) putchar (' '); print_vma (psym->st_size, DEC_5); - printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info))); - printf (" %-6s", get_symbol_binding (ELF_ST_BIND (psym->st_info))); - printf (" %-7s", get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other))); - /* Check to see if any other bits in the st_other field are set. - Note - displaying this information disrupts the layout of the - table being generated, but for the moment this case is very - rare. */ - if (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other)) - printf (" [%s] ", get_symbol_other (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other))); - printf (" %3.3s ", get_symbol_index_type (psym->st_shndx)); + printf (" %-7s", get_symbol_type (filedata, ELF_ST_TYPE (psym->st_info))); + printf (" %-6s", get_symbol_binding (filedata, ELF_ST_BIND (psym->st_info))); + + if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + printf (" %-7s", get_solaris_symbol_visibility (psym->st_other)); + else + { + unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); + + printf (" %-7s", get_symbol_visibility (vis)); + /* Check to see if any other bits in the st_other field are set. + Note - displaying this information disrupts the layout of the + table being generated, but for the moment this case is very + rare. */ + if (psym->st_other ^ vis) + printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis)); + } + + printf (" %3.3s ", get_symbol_index_type (filedata, psym->st_shndx)); if (VALID_DYNAMIC_NAME (psym->st_name)) print_symbol (25, GET_DYNAMIC_NAME (psym->st_name)); else @@ -10476,12 +11239,14 @@ print_dynamic_symbol (bfd_vma si, unsigned long hn) } static const char * -get_symbol_version_string (FILE *file, int is_dynsym, - const char *strtab, - unsigned long int strtab_size, - unsigned int si, Elf_Internal_Sym *psym, - enum versioned_symbol_info *sym_info, - unsigned short *vna_other) +get_symbol_version_string (Filedata * filedata, + bfd_boolean is_dynsym, + const char * strtab, + unsigned long int strtab_size, + unsigned int si, + Elf_Internal_Sym * psym, + enum versioned_symbol_info * sym_info, + unsigned short * vna_other) { unsigned char data[2]; unsigned short vers_data; @@ -10491,16 +11256,16 @@ get_symbol_version_string (FILE *file, int is_dynsym, || version_info[DT_VERSIONTAGIDX (DT_VERSYM)] == 0) return NULL; - offset = offset_from_vma (file, version_info[DT_VERSIONTAGIDX (DT_VERSYM)], + offset = offset_from_vma (filedata, version_info[DT_VERSIONTAGIDX (DT_VERSYM)], sizeof data + si * sizeof (vers_data)); - if (get_data (&data, file, offset + si * sizeof (vers_data), + if (get_data (&data, filedata, offset + si * sizeof (vers_data), sizeof (data), 1, _("version data")) == NULL) return NULL; vers_data = byte_get (data, 2); - if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data <= 1) + if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data == 0) return NULL; /* Usually we'd only see verdef for defined symbols, and verneed for @@ -10521,7 +11286,7 @@ get_symbol_version_string (FILE *file, int is_dynsym, Elf_External_Verdaux evda; unsigned long off; - off = offset_from_vma (file, + off = offset_from_vma (filedata, version_info[DT_VERSIONTAGIDX (DT_VERDEF)], sizeof (Elf_External_Verdef)); @@ -10529,18 +11294,20 @@ get_symbol_version_string (FILE *file, int is_dynsym, { Elf_External_Verdef evd; - if (get_data (&evd, file, off, sizeof (evd), 1, + if (get_data (&evd, filedata, off, sizeof (evd), 1, _("version def")) == NULL) { ivd.vd_ndx = 0; ivd.vd_aux = 0; ivd.vd_next = 0; + ivd.vd_flags = 0; } else { ivd.vd_ndx = BYTE_GET (evd.vd_ndx); ivd.vd_aux = BYTE_GET (evd.vd_aux); ivd.vd_next = BYTE_GET (evd.vd_next); + ivd.vd_flags = BYTE_GET (evd.vd_flags); } off += ivd.vd_next; @@ -10549,10 +11316,13 @@ get_symbol_version_string (FILE *file, int is_dynsym, if (ivd.vd_ndx == (vers_data & VERSYM_VERSION)) { + if (ivd.vd_ndx == 1 && ivd.vd_flags == VER_FLG_BASE) + return NULL; + off -= ivd.vd_next; off += ivd.vd_aux; - if (get_data (&evda, file, off, sizeof (evda), 1, + if (get_data (&evda, filedata, off, sizeof (evda), 1, _("version def aux")) != NULL) { ivda.vda_name = BYTE_GET (evda.vda_name); @@ -10574,14 +11344,14 @@ get_symbol_version_string (FILE *file, int is_dynsym, Elf_Internal_Verneed ivn; Elf_Internal_Vernaux ivna; - offset = offset_from_vma (file, + offset = offset_from_vma (filedata, version_info[DT_VERSIONTAGIDX (DT_VERNEED)], sizeof evn); do { unsigned long vna_off; - if (get_data (&evn, file, offset, sizeof (evn), 1, + if (get_data (&evn, filedata, offset, sizeof (evn), 1, _("version need")) == NULL) { ivna.vna_next = 0; @@ -10599,7 +11369,7 @@ get_symbol_version_string (FILE *file, int is_dynsym, { Elf_External_Vernaux evna; - if (get_data (&evna, file, vna_off, sizeof (evna), 1, + if (get_data (&evna, filedata, vna_off, sizeof (evna), 1, _("version need aux (3)")) == NULL) { ivna.vna_next = 0; @@ -10636,8 +11406,8 @@ get_symbol_version_string (FILE *file, int is_dynsym, } /* Dump the symbol table. */ -static int -process_symbol_table (FILE * file) +static bfd_boolean +process_symbol_table (Filedata * filedata) { Elf_Internal_Shdr * section; bfd_size_type nbuckets = 0; @@ -10651,7 +11421,7 @@ process_symbol_table (FILE * file) bfd_size_type ngnuchains = 0; if (!do_syms && !do_dyn_syms && !do_histogram) - return 1; + return TRUE; if (dynamic_info[DT_HASH] && (do_histogram @@ -10663,15 +11433,15 @@ process_symbol_table (FILE * file) unsigned char nc[8]; unsigned int hash_ent_size = 4; - if ((elf_header.e_machine == EM_ALPHA - || elf_header.e_machine == EM_S390 - || elf_header.e_machine == EM_S390_OLD) - && elf_header.e_ident[EI_CLASS] == ELFCLASS64) + if ((filedata->file_header.e_machine == EM_ALPHA + || filedata->file_header.e_machine == EM_S390 + || filedata->file_header.e_machine == EM_S390_OLD) + && filedata->file_header.e_ident[EI_CLASS] == ELFCLASS64) hash_ent_size = 8; - if (fseek (file, + if (fseek (filedata->handle, (archive_file_offset - + offset_from_vma (file, dynamic_info[DT_HASH], + + offset_from_vma (filedata, dynamic_info[DT_HASH], sizeof nb + sizeof nc)), SEEK_SET)) { @@ -10679,13 +11449,13 @@ process_symbol_table (FILE * file) goto no_hash; } - if (fread (nb, hash_ent_size, 1, file) != 1) + if (fread (nb, hash_ent_size, 1, filedata->handle) != 1) { error (_("Failed to read in number of buckets\n")); goto no_hash; } - if (fread (nc, hash_ent_size, 1, file) != 1) + if (fread (nc, hash_ent_size, 1, filedata->handle) != 1) { error (_("Failed to read in number of chains\n")); goto no_hash; @@ -10694,14 +11464,14 @@ process_symbol_table (FILE * file) nbuckets = byte_get (nb, hash_ent_size); nchains = byte_get (nc, hash_ent_size); - buckets = get_dynamic_data (file, nbuckets, hash_ent_size); - chains = get_dynamic_data (file, nchains, hash_ent_size); + buckets = get_dynamic_data (filedata, nbuckets, hash_ent_size); + chains = get_dynamic_data (filedata, nchains, hash_ent_size); no_hash: if (buckets == NULL || chains == NULL) { if (do_using_dynamic) - return 0; + return FALSE; free (buckets); free (chains); buckets = NULL; @@ -10721,9 +11491,9 @@ process_symbol_table (FILE * file) bfd_vma i, maxchain = 0xffffffff, bitmaskwords; bfd_vma buckets_vma; - if (fseek (file, + if (fseek (filedata->handle, (archive_file_offset - + offset_from_vma (file, dynamic_info_DT_GNU_HASH, + + offset_from_vma (filedata, dynamic_info_DT_GNU_HASH, sizeof nb)), SEEK_SET)) { @@ -10731,7 +11501,7 @@ process_symbol_table (FILE * file) goto no_gnu_hash; } - if (fread (nb, 16, 1, file) != 1) + if (fread (nb, 16, 1, filedata->handle) != 1) { error (_("Failed to read in number of buckets\n")); goto no_gnu_hash; @@ -10746,16 +11516,16 @@ process_symbol_table (FILE * file) else buckets_vma += bitmaskwords * 8; - if (fseek (file, + if (fseek (filedata->handle, (archive_file_offset - + offset_from_vma (file, buckets_vma, 4)), + + offset_from_vma (filedata, buckets_vma, 4)), SEEK_SET)) { error (_("Unable to seek to start of dynamic information\n")); goto no_gnu_hash; } - gnubuckets = get_dynamic_data (file, ngnubuckets, 4); + gnubuckets = get_dynamic_data (filedata, ngnubuckets, 4); if (gnubuckets == NULL) goto no_gnu_hash; @@ -10764,7 +11534,7 @@ process_symbol_table (FILE * file) if (gnubuckets[i] != 0) { if (gnubuckets[i] < gnusymidx) - return 0; + return FALSE; if (maxchain == 0xffffffff || gnubuckets[i] > maxchain) maxchain = gnubuckets[i]; @@ -10775,9 +11545,9 @@ process_symbol_table (FILE * file) maxchain -= gnusymidx; - if (fseek (file, + if (fseek (filedata->handle, (archive_file_offset - + offset_from_vma (file, buckets_vma + + offset_from_vma (filedata, buckets_vma + 4 * (ngnubuckets + maxchain), 4)), SEEK_SET)) { @@ -10787,7 +11557,7 @@ process_symbol_table (FILE * file) do { - if (fread (nb, 4, 1, file) != 1) + if (fread (nb, 4, 1, filedata->handle) != 1) { error (_("Failed to determine last chain length\n")); goto no_gnu_hash; @@ -10800,16 +11570,16 @@ process_symbol_table (FILE * file) } while ((byte_get (nb, 4) & 1) == 0); - if (fseek (file, + if (fseek (filedata->handle, (archive_file_offset - + offset_from_vma (file, buckets_vma + 4 * ngnubuckets, 4)), + + offset_from_vma (filedata, buckets_vma + 4 * ngnubuckets, 4)), SEEK_SET)) { error (_("Unable to seek to start of dynamic information\n")); goto no_gnu_hash; } - gnuchains = get_dynamic_data (file, maxchain, 4); + gnuchains = get_dynamic_data (filedata, maxchain, 4); ngnuchains = maxchain; no_gnu_hash: @@ -10819,7 +11589,7 @@ process_symbol_table (FILE * file) gnubuckets = NULL; ngnubuckets = 0; if (do_using_dynamic) - return 0; + return FALSE; } } @@ -10834,6 +11604,7 @@ process_symbol_table (FILE * file) if (dynamic_info[DT_HASH]) { bfd_vma si; + char *visited; printf (_("\nSymbol table for image:\n")); if (is_32bit_elf) @@ -10841,14 +11612,22 @@ process_symbol_table (FILE * file) else printf (_(" Num Buc: Value Size Type Bind Vis Ndx Name\n")); + visited = xcmalloc (nchains, 1); + memset (visited, 0, nchains); for (hn = 0; hn < nbuckets; hn++) { - if (! buckets[hn]) - continue; - - for (si = buckets[hn]; si < nchains && si > 0; si = chains[si]) - print_dynamic_symbol (si, hn); + for (si = buckets[hn]; si > 0; si = chains[si]) + { + print_dynamic_symbol (filedata, si, hn); + if (si >= nchains || visited[si]) + { + error (_("histogram chain is corrupt\n")); + break; + } + visited[si] = 1; + } } + free (visited); } if (dynamic_info_DT_GNU_HASH) @@ -10867,7 +11646,7 @@ process_symbol_table (FILE * file) do { - print_dynamic_symbol (si, hn); + print_dynamic_symbol (filedata, si, hn); si++; } while (off < ngnuchains && (gnuchains[off++] & 1) == 0); @@ -10875,12 +11654,12 @@ process_symbol_table (FILE * file) } } else if ((do_dyn_syms || (do_syms && !do_using_dynamic)) - && section_headers != NULL) + && filedata->section_headers != NULL) { unsigned int i; - for (i = 0, section = section_headers; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, section++) { unsigned int si; @@ -10899,35 +11678,38 @@ process_symbol_table (FILE * file) if (section->sh_entsize == 0) { printf (_("\nSymbol table '%s' has a sh_entsize of zero!\n"), - printable_section_name (section)); + printable_section_name (filedata, section)); continue; } - printf (_("\nSymbol table '%s' contains %lu entries:\n"), - printable_section_name (section), - (unsigned long) (section->sh_size / section->sh_entsize)); + num_syms = section->sh_size / section->sh_entsize; + printf (ngettext ("\nSymbol table '%s' contains %lu entry:\n", + "\nSymbol table '%s' contains %lu entries:\n", + num_syms), + printable_section_name (filedata, section), + num_syms); if (is_32bit_elf) printf (_(" Num: Value Size Type Bind Vis Ndx Name\n")); else printf (_(" Num: Value Size Type Bind Vis Ndx Name\n")); - symtab = GET_ELF_SYMBOLS (file, section, & num_syms); + symtab = GET_ELF_SYMBOLS (filedata, section, & num_syms); if (symtab == NULL) continue; - if (section->sh_link == elf_header.e_shstrndx) + if (section->sh_link == filedata->file_header.e_shstrndx) { - strtab = string_table; - strtab_size = string_table_length; + strtab = filedata->string_table; + strtab_size = filedata->string_table_length; } - else if (section->sh_link < elf_header.e_shnum) + else if (section->sh_link < filedata->file_header.e_shnum) { Elf_Internal_Shdr * string_sec; - string_sec = section_headers + section->sh_link; + string_sec = filedata->section_headers + section->sh_link; - strtab = (char *) get_data (NULL, file, string_sec->sh_offset, + strtab = (char *) get_data (NULL, filedata, string_sec->sh_offset, 1, string_sec->sh_size, _("string table")); strtab_size = strtab != NULL ? string_sec->sh_size : 0; @@ -10943,20 +11725,27 @@ process_symbol_table (FILE * file) print_vma (psym->st_value, LONG_HEX); putchar (' '); print_vma (psym->st_size, DEC_5); - printf (" %-7s", get_symbol_type (ELF_ST_TYPE (psym->st_info))); - printf (" %-6s", get_symbol_binding (ELF_ST_BIND (psym->st_info))); - printf (" %-7s", get_symbol_visibility (ELF_ST_VISIBILITY (psym->st_other))); - /* Check to see if any other bits in the st_other field are set. - Note - displaying this information disrupts the layout of the - table being generated, but for the moment this case is very rare. */ - if (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other)) - printf (" [%s] ", get_symbol_other (psym->st_other ^ ELF_ST_VISIBILITY (psym->st_other))); - printf (" %4s ", get_symbol_index_type (psym->st_shndx)); + printf (" %-7s", get_symbol_type (filedata, ELF_ST_TYPE (psym->st_info))); + printf (" %-6s", get_symbol_binding (filedata, ELF_ST_BIND (psym->st_info))); + if (filedata->file_header.e_ident[EI_OSABI] == ELFOSABI_SOLARIS) + printf (" %-7s", get_solaris_symbol_visibility (psym->st_other)); + else + { + unsigned int vis = ELF_ST_VISIBILITY (psym->st_other); + + printf (" %-7s", get_symbol_visibility (vis)); + /* Check to see if any other bits in the st_other field are set. + Note - displaying this information disrupts the layout of the + table being generated, but for the moment this case is very rare. */ + if (psym->st_other ^ vis) + printf (" [%s] ", get_symbol_other (filedata, psym->st_other ^ vis)); + } + printf (" %4s ", get_symbol_index_type (filedata, psym->st_shndx)); print_symbol (25, psym->st_name < strtab_size ? strtab + psym->st_name : _("")); version_string - = get_symbol_version_string (file, + = get_symbol_version_string (filedata, section->sh_type == SHT_DYNSYM, strtab, strtab_size, si, psym, &sym_info, &vna_other); @@ -10970,10 +11759,20 @@ process_symbol_table (FILE * file) } putchar ('\n'); + + if (ELF_ST_BIND (psym->st_info) == STB_LOCAL + && si >= section->sh_info + /* Irix 5 and 6 MIPS binaries are known to ignore this requirement. */ + && filedata->file_header.e_machine != EM_MIPS + /* Solaris binaries have been found to violate this requirement as + well. Not sure if this is a bug or an ABI requirement. */ + && filedata->file_header.e_ident[EI_OSABI] != ELFOSABI_SOLARIS) + warn (_("local symbol %u found at index >= %s's sh_info value of %u\n"), + si, printable_section_name (filedata, section), section->sh_info); } free (symtab); - if (strtab != string_table) + if (strtab != filedata->string_table) free (strtab); } } @@ -10990,46 +11789,48 @@ process_symbol_table (FILE * file) unsigned long maxlength = 0; unsigned long nzero_counts = 0; unsigned long nsyms = 0; - unsigned long chained; + char *visited; - printf (_("\nHistogram for bucket list length (total of %lu buckets):\n"), + printf (ngettext ("\nHistogram for bucket list length " + "(total of %lu bucket):\n", + "\nHistogram for bucket list length " + "(total of %lu buckets):\n", + (unsigned long) nbuckets), (unsigned long) nbuckets); lengths = (unsigned long *) calloc (nbuckets, sizeof (*lengths)); if (lengths == NULL) { error (_("Out of memory allocating space for histogram buckets\n")); - return 0; + return FALSE; } + visited = xcmalloc (nchains, 1); + memset (visited, 0, nchains); printf (_(" Length Number %% of total Coverage\n")); for (hn = 0; hn < nbuckets; ++hn) { - for (si = buckets[hn], chained = 0; - si > 0 && si < nchains && si < nbuckets && chained <= nchains; - si = chains[si], ++chained) + for (si = buckets[hn]; si > 0; si = chains[si]) { ++nsyms; if (maxlength < ++lengths[hn]) ++maxlength; + if (si >= nchains || visited[si]) + { + error (_("histogram chain is corrupt\n")); + break; + } + visited[si] = 1; } - - /* PR binutils/17531: A corrupt binary could contain broken - histogram data. Do not go into an infinite loop trying - to process it. */ - if (chained > nchains) - { - error (_("histogram chain is corrupt\n")); - break; - } } + free (visited); counts = (unsigned long *) calloc (maxlength + 1, sizeof (*counts)); if (counts == NULL) { free (lengths); error (_("Out of memory allocating space for histogram counts\n")); - return 0; + return FALSE; } for (hn = 0; hn < nbuckets; ++hn) @@ -11068,14 +11869,18 @@ process_symbol_table (FILE * file) unsigned long nzero_counts = 0; unsigned long nsyms = 0; - printf (_("\nHistogram for `.gnu.hash' bucket list length (total of %lu buckets):\n"), + printf (ngettext ("\nHistogram for `.gnu.hash' bucket list length " + "(total of %lu bucket):\n", + "\nHistogram for `.gnu.hash' bucket list length " + "(total of %lu buckets):\n", + (unsigned long) ngnubuckets), (unsigned long) ngnubuckets); lengths = (unsigned long *) calloc (ngnubuckets, sizeof (*lengths)); if (lengths == NULL) { error (_("Out of memory allocating space for gnu histogram buckets\n")); - return 0; + return FALSE; } printf (_(" Length Number %% of total Coverage\n")); @@ -11101,7 +11906,7 @@ process_symbol_table (FILE * file) { free (lengths); error (_("Out of memory allocating space for gnu histogram counts\n")); - return 0; + return FALSE; } for (hn = 0; hn < ngnubuckets; ++hn) @@ -11127,25 +11932,29 @@ process_symbol_table (FILE * file) free (gnuchains); } - return 1; + return TRUE; } -static int -process_syminfo (FILE * file ATTRIBUTE_UNUSED) +static bfd_boolean +process_syminfo (Filedata * filedata ATTRIBUTE_UNUSED) { unsigned int i; if (dynamic_syminfo == NULL || !do_dynamic) /* No syminfo, this is ok. */ - return 1; + return TRUE; /* There better should be a dynamic symbol section. */ if (dynamic_symbols == NULL || dynamic_strings == NULL) - return 0; + return FALSE; if (dynamic_addr) - printf (_("\nDynamic info segment at offset 0x%lx contains %d entries:\n"), + printf (ngettext ("\nDynamic info segment at offset 0x%lx " + "contains %d entry:\n", + "\nDynamic info segment at offset 0x%lx " + "contains %d entries:\n", + dynamic_syminfo_nent), dynamic_syminfo_offset, dynamic_syminfo_nent); printf (_(" Num: Name BoundTo Flags\n")); @@ -11195,34 +12004,63 @@ process_syminfo (FILE * file ATTRIBUTE_UNUSED) puts (""); } - return 1; + return TRUE; } +#define IN_RANGE(START,END,ADDR,OFF) \ + (((ADDR) >= (START)) && ((ADDR) + (OFF) < (END))) + /* Check to see if the given reloc needs to be handled in a target specific manner. If so then process the reloc and return TRUE otherwise return - FALSE. */ + FALSE. + + If called with reloc == NULL, then this is a signal that reloc processing + for the current section has finished, and any saved state should be + discarded. */ static bfd_boolean -target_specific_reloc_handling (Elf_Internal_Rela * reloc, - unsigned char * start, - Elf_Internal_Sym * symtab) +target_specific_reloc_handling (Filedata * filedata, + Elf_Internal_Rela * reloc, + unsigned char * start, + unsigned char * end, + Elf_Internal_Sym * symtab, + unsigned long num_syms) { - unsigned int reloc_type = get_reloc_type (reloc->r_info); + unsigned int reloc_type = 0; + unsigned long sym_index = 0; + + if (reloc) + { + reloc_type = get_reloc_type (filedata, reloc->r_info); + sym_index = get_reloc_symindex (reloc->r_info); + } - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_MSP430: case EM_MSP430_OLD: { static Elf_Internal_Sym * saved_sym = NULL; + if (reloc == NULL) + { + saved_sym = NULL; + return TRUE; + } + switch (reloc_type) { case 10: /* R_MSP430_SYM_DIFF */ - if (uses_msp430x_relocs ()) + if (uses_msp430x_relocs (filedata)) break; + /* Fall through. */ case 21: /* R_MSP430X_SYM_DIFF */ - saved_sym = symtab + get_reloc_symindex (reloc->r_info); + /* PR 21139. */ + if (sym_index >= num_syms) + error (_("MSP430 SYM_DIFF reloc contains invalid symbol index %lu\n"), + sym_index); + else + saved_sym = symtab + sym_index; return TRUE; case 1: /* R_MSP430_32 or R_MSP430_ABS32 */ @@ -11231,26 +12069,37 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, case 5: /* R_MSP430_16_BYTE */ case 9: /* R_MSP430_8 */ - if (uses_msp430x_relocs ()) + if (uses_msp430x_relocs (filedata)) break; goto handle_sym_diff; case 2: /* R_MSP430_ABS16 */ case 15: /* R_MSP430X_ABS16 */ - if (! uses_msp430x_relocs ()) + if (! uses_msp430x_relocs (filedata)) break; goto handle_sym_diff; handle_sym_diff: if (saved_sym != NULL) { + int reloc_size = reloc_type == 1 ? 4 : 2; bfd_vma value; - value = reloc->r_addend - + (symtab[get_reloc_symindex (reloc->r_info)].st_value - - saved_sym->st_value); + if (sym_index >= num_syms) + error (_("MSP430 reloc contains invalid symbol index %lu\n"), + sym_index); + else + { + value = reloc->r_addend + (symtab[sym_index].st_value + - saved_sym->st_value); - byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2); + if (IN_RANGE (start, end, start + reloc->r_offset, reloc_size)) + byte_put (start + reloc->r_offset, value, reloc_size); + else + /* PR 21137 */ + error (_("MSP430 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); + } saved_sym = NULL; return TRUE; @@ -11270,24 +12119,45 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, { static Elf_Internal_Sym * saved_sym = NULL; + if (reloc == NULL) + { + saved_sym = NULL; + return TRUE; + } + switch (reloc_type) { case 34: /* R_MN10300_ALIGN */ return TRUE; case 33: /* R_MN10300_SYM_DIFF */ - saved_sym = symtab + get_reloc_symindex (reloc->r_info); + if (sym_index >= num_syms) + error (_("MN10300_SYM_DIFF reloc contains invalid symbol index %lu\n"), + sym_index); + else + saved_sym = symtab + sym_index; return TRUE; + case 1: /* R_MN10300_32 */ case 2: /* R_MN10300_16 */ if (saved_sym != NULL) { + int reloc_size = reloc_type == 1 ? 4 : 2; bfd_vma value; - value = reloc->r_addend - + (symtab[get_reloc_symindex (reloc->r_info)].st_value - - saved_sym->st_value); + if (sym_index >= num_syms) + error (_("MN10300 reloc contains invalid symbol index %lu\n"), + sym_index); + else + { + value = reloc->r_addend + (symtab[sym_index].st_value + - saved_sym->st_value); - byte_put (start + reloc->r_offset, value, reloc_type == 1 ? 4 : 2); + if (IN_RANGE (start, end, start + reloc->r_offset, reloc_size)) + byte_put (start + reloc->r_offset, value, reloc_size); + else + error (_("MN10300 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); + } saved_sym = NULL; return TRUE; @@ -11307,12 +12177,24 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, static bfd_vma saved_sym2 = 0; static bfd_vma value; + if (reloc == NULL) + { + saved_sym1 = saved_sym2 = 0; + return TRUE; + } + switch (reloc_type) { case 0x80: /* R_RL78_SYM. */ saved_sym1 = saved_sym2; - saved_sym2 = symtab[get_reloc_symindex (reloc->r_info)].st_value; - saved_sym2 += reloc->r_addend; + if (sym_index >= num_syms) + error (_("RL78_SYM reloc contains invalid symbol index %lu\n"), + sym_index); + else + { + saved_sym2 = symtab[sym_index].st_value; + saved_sym2 += reloc->r_addend; + } return TRUE; case 0x83: /* R_RL78_OPsub. */ @@ -11322,12 +12204,20 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, break; case 0x41: /* R_RL78_ABS32. */ - byte_put (start + reloc->r_offset, value, 4); + if (IN_RANGE (start, end, start + reloc->r_offset, 4)) + byte_put (start + reloc->r_offset, value, 4); + else + error (_("RL78 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); value = 0; return TRUE; case 0x43: /* R_RL78_ABS16. */ - byte_put (start + reloc->r_offset, value, 2); + if (IN_RANGE (start, end, start + reloc->r_offset, 2)) + byte_put (start + reloc->r_offset, value, 2); + else + error (_("RL78 sym diff reloc contains invalid offset: 0x%lx\n"), + (long) reloc->r_offset); value = 0; return TRUE; @@ -11353,9 +12243,10 @@ target_specific_reloc_handling (Elf_Internal_Rela * reloc, reloc naming functions. */ static bfd_boolean -is_32bit_abs_reloc (unsigned int reloc_type) +is_32bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) { - switch (elf_header.e_machine) + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) { case EM_386: case EM_IAMCU: @@ -11367,7 +12258,10 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_960: return reloc_type == 2; /* R_960_32. */ case EM_AARCH64: - return reloc_type == 258; /* R_AARCH64_ABS32 */ + return (reloc_type == 258 + || reloc_type == 1); /* R_AARCH64_ABS32 || R_AARCH64_P32_ABS32 */ + case EM_ADAPTEVA_EPIPHANY: + return reloc_type == 3; case EM_ALPHA: return reloc_type == 1; /* R_ALPHA_REFLONG. */ case EM_ARC: @@ -11380,8 +12274,6 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_AVR_OLD: case EM_AVR: return reloc_type == 1; - case EM_ADAPTEVA_EPIPHANY: - return reloc_type == 3; case EM_BLACKFIN: return reloc_type == 0x12; /* R_byte4_data. */ case EM_CRIS: @@ -11410,8 +12302,10 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_H8_300H: return reloc_type == 1; /* R_H8_DIR32. */ case EM_IA_64: - return reloc_type == 0x65 /* R_IA64_SECREL32LSB. */ - || reloc_type == 0x25; /* R_IA64_DIR32LSB. */ + return (reloc_type == 0x64 /* R_IA64_SECREL32MSB. */ + || reloc_type == 0x65 /* R_IA64_SECREL32LSB. */ + || reloc_type == 0x24 /* R_IA64_DIR32MSB. */ + || reloc_type == 0x25 /* R_IA64_DIR32LSB. */); case EM_IP2K_OLD: case EM_IP2K: return reloc_type == 2; /* R_IP2K_32. */ @@ -11427,6 +12321,8 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_68HC11: case EM_68HC12: return reloc_type == 6; /* R_M68HC11_32. */ + case EM_S12Z: + return reloc_type == 6; /* R_S12Z_EXT32. */ case EM_MCORE: return reloc_type == 1; /* R_MCORE_ADDR32. */ case EM_CYGNUS_MEP: @@ -11461,7 +12357,8 @@ is_32bit_abs_reloc (unsigned int reloc_type) case EM_OR1K: return reloc_type == 1; /* R_OR1K_32. */ case EM_PARISC: - return (reloc_type == 1 /* R_PARISC_DIR32. */ + return (reloc_type == 1 /* R_PARISC_DIR32. */ + || reloc_type == 2 /* R_PARISC_DIR21L. */ || reloc_type == 41); /* R_PARISC_SECREL32. */ case EM_PJ: case EM_PJ_OLD: @@ -11470,6 +12367,10 @@ is_32bit_abs_reloc (unsigned int reloc_type) return reloc_type == 1; /* R_PPC64_ADDR32. */ case EM_PPC: return reloc_type == 1; /* R_PPC_ADDR32. */ + case EM_TI_PRU: + return reloc_type == 11; /* R_PRU_BFD_RELOC_32. */ + case EM_RISCV: + return reloc_type == 1; /* R_RISCV_32. */ case EM_RL78: return reloc_type == 1; /* R_RL78_DIR32. */ case EM_RX: @@ -11505,6 +12406,8 @@ is_32bit_abs_reloc (unsigned int reloc_type) return reloc_type == 1; /* R_VAX_32. */ case EM_VISIUM: return reloc_type == 3; /* R_VISIUM_32. */ + case EM_WEBASSEMBLY: + return reloc_type == 1; /* R_WASM32_32. */ case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -11524,10 +12427,10 @@ is_32bit_abs_reloc (unsigned int reloc_type) static unsigned int prev_warn = 0; /* Avoid repeating the same warning multiple times. */ - if (prev_warn != elf_header.e_machine) + if (prev_warn != filedata->file_header.e_machine) error (_("Missing knowledge of 32-bit reloc types used in DWARF sections of machine number %d\n"), - elf_header.e_machine); - prev_warn = elf_header.e_machine; + filedata->file_header.e_machine); + prev_warn = filedata->file_header.e_machine; return FALSE; } } @@ -11537,9 +12440,10 @@ is_32bit_abs_reloc (unsigned int reloc_type) a 32-bit pc-relative RELA relocation used in DWARF debug sections. */ static bfd_boolean -is_32bit_pcrel_reloc (unsigned int reloc_type) +is_32bit_pcrel_reloc (Filedata * filedata, unsigned int reloc_type) { - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) + /* Please keep this table alpha-sorted for ease of visual lookup. */ { case EM_386: case EM_IAMCU: @@ -11552,8 +12456,14 @@ is_32bit_pcrel_reloc (unsigned int reloc_type) return reloc_type == 6; case EM_ALPHA: return reloc_type == 10; /* R_ALPHA_SREL32. */ + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + return reloc_type == 49; /* R_ARC_32_PCREL. */ case EM_ARM: return reloc_type == 3; /* R_ARM_REL32 */ + case EM_AVR_OLD: + case EM_AVR: + return reloc_type == 36; /* R_AVR_32_PCREL. */ case EM_MICROBLAZE: return reloc_type == 2; /* R_MICROBLAZE_32_PCREL. */ case EM_OR1K: @@ -11602,24 +12512,28 @@ is_32bit_pcrel_reloc (unsigned int reloc_type) a 64-bit absolute RELA relocation used in DWARF debug sections. */ static bfd_boolean -is_64bit_abs_reloc (unsigned int reloc_type) +is_64bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) { - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_AARCH64: return reloc_type == 257; /* R_AARCH64_ABS64. */ case EM_ALPHA: return reloc_type == 2; /* R_ALPHA_REFQUAD. */ case EM_IA_64: - return reloc_type == 0x27; /* R_IA64_DIR64LSB. */ + return (reloc_type == 0x26 /* R_IA64_DIR64MSB. */ + || reloc_type == 0x27 /* R_IA64_DIR64LSB. */); case EM_PARISC: return reloc_type == 80; /* R_PARISC_DIR64. */ case EM_PPC64: return reloc_type == 38; /* R_PPC64_ADDR64. */ + case EM_RISCV: + return reloc_type == 2; /* R_RISCV_64. */ case EM_SPARC32PLUS: case EM_SPARCV9: case EM_SPARC: - return reloc_type == 54; /* R_SPARC_UA64. */ + return reloc_type == 32 /* R_SPARC_64. */ + || reloc_type == 54; /* R_SPARC_UA64. */ case EM_X86_64: case EM_L1OM: case EM_K1OM: @@ -11640,16 +12554,17 @@ is_64bit_abs_reloc (unsigned int reloc_type) a 64-bit pc-relative RELA relocation used in DWARF debug sections. */ static bfd_boolean -is_64bit_pcrel_reloc (unsigned int reloc_type) +is_64bit_pcrel_reloc (Filedata * filedata, unsigned int reloc_type) { - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_AARCH64: return reloc_type == 260; /* R_AARCH64_PREL64. */ case EM_ALPHA: return reloc_type == 11; /* R_ALPHA_SREL64. */ case EM_IA_64: - return reloc_type == 0x4f; /* R_IA64_PCREL64LSB. */ + return (reloc_type == 0x4e /* R_IA64_PCREL64MSB. */ + || reloc_type == 0x4f /* R_IA64_PCREL64LSB. */); case EM_PARISC: return reloc_type == 72; /* R_PARISC_PCREL64. */ case EM_PPC64: @@ -11676,13 +12591,15 @@ is_64bit_pcrel_reloc (unsigned int reloc_type) a 24-bit absolute RELA relocation used in DWARF debug sections. */ static bfd_boolean -is_24bit_abs_reloc (unsigned int reloc_type) +is_24bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) { - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { case EM_CYGNUS_MN10200: case EM_MN10200: return reloc_type == 4; /* R_MN10200_24. */ + case EM_FT32: + return reloc_type == 5; /* R_FT32_20. */ default: return FALSE; } @@ -11692,22 +12609,25 @@ is_24bit_abs_reloc (unsigned int reloc_type) a 16-bit absolute RELA relocation used in DWARF debug sections. */ static bfd_boolean -is_16bit_abs_reloc (unsigned int reloc_type) +is_16bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) { - switch (elf_header.e_machine) + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) { case EM_ARC: case EM_ARC_COMPACT: case EM_ARC_COMPACT2: return reloc_type == 2; /* R_ARC_16. */ + case EM_ADAPTEVA_EPIPHANY: + return reloc_type == 5; case EM_AVR_OLD: case EM_AVR: return reloc_type == 4; /* R_AVR_16. */ - case EM_ADAPTEVA_EPIPHANY: - return reloc_type == 5; case EM_CYGNUS_D10V: case EM_D10V: return reloc_type == 3; /* R_D10V_16. */ + case EM_FT32: + return reloc_type == 2; /* R_FT32_16. */ case EM_H8S: case EM_H8_300: case EM_H8_300H: @@ -11718,9 +12638,16 @@ is_16bit_abs_reloc (unsigned int reloc_type) case EM_M32C_OLD: case EM_M32C: return reloc_type == 1; /* R_M32C_16 */ + case EM_CYGNUS_MN10200: + case EM_MN10200: + return reloc_type == 2; /* R_MN10200_16. */ + case EM_CYGNUS_MN10300: + case EM_MN10300: + return reloc_type == 2; /* R_MN10300_16. */ case EM_MSP430: - if (uses_msp430x_relocs ()) + if (uses_msp430x_relocs (filedata)) return reloc_type == 2; /* R_MSP430_ABS16. */ + /* Fall through. */ case EM_MSP430_OLD: return reloc_type == 5; /* R_MSP430_16_BYTE. */ case EM_NDS32: @@ -11731,19 +12658,17 @@ is_16bit_abs_reloc (unsigned int reloc_type) return reloc_type == 9; /* R_NIOS_16. */ case EM_OR1K: return reloc_type == 2; /* R_OR1K_16. */ + case EM_RISCV: + return reloc_type == 55; /* R_RISCV_SET16. */ + case EM_TI_PRU: + return reloc_type == 8; /* R_PRU_BFD_RELOC_16. */ case EM_TI_C6000: return reloc_type == 2; /* R_C6000_ABS16. */ + case EM_VISIUM: + return reloc_type == 2; /* R_VISIUM_16. */ case EM_XC16X: case EM_C166: return reloc_type == 2; /* R_XC16C_ABS_16. */ - case EM_CYGNUS_MN10200: - case EM_MN10200: - return reloc_type == 2; /* R_MN10200_16. */ - case EM_CYGNUS_MN10300: - case EM_MN10300: - return reloc_type == 2; /* R_MN10300_16. */ - case EM_VISIUM: - return reloc_type == 2; /* R_VISIUM_16. */ case EM_XGATE: return reloc_type == 3; /* R_XGATE_16. */ default: @@ -11751,192 +12676,428 @@ is_16bit_abs_reloc (unsigned int reloc_type) } } -/* Returns TRUE iff RELOC_TYPE is a NONE relocation used for discarded - relocation entries (possibly formerly used for SHT_GROUP sections). */ +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 8-bit absolute RELA relocation used in DWARF debug sections. */ static bfd_boolean -is_none_reloc (unsigned int reloc_type) +is_8bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) { - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { - case EM_68K: /* R_68K_NONE. */ - case EM_386: /* R_386_NONE. */ - case EM_SPARC32PLUS: - case EM_SPARCV9: - case EM_SPARC: /* R_SPARC_NONE. */ - case EM_MIPS: /* R_MIPS_NONE. */ - case EM_PARISC: /* R_PARISC_NONE. */ - case EM_ALPHA: /* R_ALPHA_NONE. */ - case EM_ADAPTEVA_EPIPHANY: - case EM_PPC: /* R_PPC_NONE. */ - case EM_PPC64: /* R_PPC64_NONE. */ - case EM_ARC: /* R_ARC_NONE. */ - case EM_ARC_COMPACT: /* R_ARC_NONE. */ - case EM_ARC_COMPACT2: /* R_ARC_NONE. */ - case EM_ARM: /* R_ARM_NONE. */ - case EM_IA_64: /* R_IA64_NONE. */ - case EM_SH: /* R_SH_NONE. */ - case EM_S390_OLD: - case EM_S390: /* R_390_NONE. */ - case EM_CRIS: /* R_CRIS_NONE. */ - case EM_X86_64: /* R_X86_64_NONE. */ - case EM_L1OM: /* R_X86_64_NONE. */ - case EM_K1OM: /* R_X86_64_NONE. */ - case EM_MN10300: /* R_MN10300_NONE. */ - case EM_FT32: /* R_FT32_NONE. */ - case EM_MOXIE: /* R_MOXIE_NONE. */ - case EM_M32R: /* R_M32R_NONE. */ - case EM_TI_C6000:/* R_C6000_NONE. */ - case EM_TILEGX: /* R_TILEGX_NONE. */ - case EM_TILEPRO: /* R_TILEPRO_NONE. */ - case EM_XC16X: - case EM_C166: /* R_XC16X_NONE. */ - case EM_ALTERA_NIOS2: /* R_NIOS2_NONE. */ - case EM_NIOS32: /* R_NIOS_NONE. */ - case EM_OR1K: /* R_OR1K_NONE. */ - return reloc_type == 0; - case EM_AARCH64: - return reloc_type == 0 || reloc_type == 256; - case EM_NDS32: - return (reloc_type == 0 /* R_XTENSA_NONE. */ - || reloc_type == 204 /* R_NDS32_DIFF8. */ - || reloc_type == 205 /* R_NDS32_DIFF16. */ - || reloc_type == 206 /* R_NDS32_DIFF32. */ - || reloc_type == 207 /* R_NDS32_ULEB128. */); - case EM_XTENSA_OLD: - case EM_XTENSA: - return (reloc_type == 0 /* R_XTENSA_NONE. */ - || reloc_type == 17 /* R_XTENSA_DIFF8. */ - || reloc_type == 18 /* R_XTENSA_DIFF16. */ - || reloc_type == 19 /* R_XTENSA_DIFF32. */); - case EM_METAG: - return reloc_type == 3; /* R_METAG_NONE. */ + case EM_RISCV: + return reloc_type == 54; /* R_RISCV_SET8. */ + default: + return FALSE; } - return FALSE; } -/* Returns TRUE if there is a relocation against - section NAME at OFFSET bytes. */ +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 6-bit absolute RELA relocation used in DWARF debug sections. */ -bfd_boolean -reloc_at (struct dwarf_section * dsec, dwarf_vma offset) +static bfd_boolean +is_6bit_abs_reloc (Filedata * filedata, unsigned int reloc_type) { - Elf_Internal_Rela * relocs; - Elf_Internal_Rela * rp; + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 53; /* R_RISCV_SET6. */ + default: + return FALSE; + } +} - if (dsec == NULL || dsec->reloc_info == NULL) - return FALSE; +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 32-bit inplace add RELA relocation used in DWARF debug sections. */ - relocs = (Elf_Internal_Rela *) dsec->reloc_info; +static bfd_boolean +is_32bit_inplace_add_reloc (Filedata * filedata, unsigned int reloc_type) +{ + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 35; /* R_RISCV_ADD32. */ + default: + return FALSE; + } +} - for (rp = relocs; rp < relocs + dsec->num_relocs; ++rp) - if (rp->r_offset == offset) - return TRUE; +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 32-bit inplace sub RELA relocation used in DWARF debug sections. */ - return FALSE; +static bfd_boolean +is_32bit_inplace_sub_reloc (Filedata * filedata, unsigned int reloc_type) +{ + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 39; /* R_RISCV_SUB32. */ + default: + return FALSE; + } } -/* Apply relocations to a section. - Note: So far support has been added only for those relocations - which can be found in debug sections. - If RELOCS_RETURN is non-NULL then returns in it a pointer to the - loaded relocs. It is then the caller's responsibility to free them. - FIXME: Add support for more relocations ? */ +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 64-bit inplace add RELA relocation used in DWARF debug sections. */ -static void -apply_relocations (void * file, - const Elf_Internal_Shdr * section, - unsigned char * start, - bfd_size_type size, - void ** relocs_return, - unsigned long * num_relocs_return) +static bfd_boolean +is_64bit_inplace_add_reloc (Filedata * filedata, unsigned int reloc_type) { - Elf_Internal_Shdr * relsec; - unsigned char * end = start + size; - - if (relocs_return != NULL) + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) { - * (Elf_Internal_Rela **) relocs_return = NULL; - * num_relocs_return = 0; + case EM_RISCV: + return reloc_type == 36; /* R_RISCV_ADD64. */ + default: + return FALSE; } +} - if (elf_header.e_type != ET_REL) - return; +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 64-bit inplace sub RELA relocation used in DWARF debug sections. */ - /* Find the reloc section associated with the section. */ - for (relsec = section_headers; - relsec < section_headers + elf_header.e_shnum; - ++relsec) +static bfd_boolean +is_64bit_inplace_sub_reloc (Filedata * filedata, unsigned int reloc_type) +{ + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) { - bfd_boolean is_rela; - unsigned long num_relocs; - Elf_Internal_Rela * relocs; - Elf_Internal_Rela * rp; - Elf_Internal_Shdr * symsec; - Elf_Internal_Sym * symtab; - unsigned long num_syms; - Elf_Internal_Sym * sym; + case EM_RISCV: + return reloc_type == 40; /* R_RISCV_SUB64. */ + default: + return FALSE; + } +} - if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL) - || relsec->sh_info >= elf_header.e_shnum - || section_headers + relsec->sh_info != section - || relsec->sh_size == 0 - || relsec->sh_link >= elf_header.e_shnum) - continue; +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 16-bit inplace add RELA relocation used in DWARF debug sections. */ - is_rela = relsec->sh_type == SHT_RELA; +static bfd_boolean +is_16bit_inplace_add_reloc (Filedata * filedata, unsigned int reloc_type) +{ + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 34; /* R_RISCV_ADD16. */ + default: + return FALSE; + } +} - if (is_rela) - { - if (!slurp_rela_relocs ((FILE *) file, relsec->sh_offset, - relsec->sh_size, & relocs, & num_relocs)) - return; - } - else - { - if (!slurp_rel_relocs ((FILE *) file, relsec->sh_offset, - relsec->sh_size, & relocs, & num_relocs)) - return; - } +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 16-bit inplace sub RELA relocation used in DWARF debug sections. */ - /* SH uses RELA but uses in place value instead of the addend field. */ - if (elf_header.e_machine == EM_SH) +static bfd_boolean +is_16bit_inplace_sub_reloc (Filedata * filedata, unsigned int reloc_type) +{ + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 38; /* R_RISCV_SUB16. */ + default: + return FALSE; + } +} + +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 8-bit inplace add RELA relocation used in DWARF debug sections. */ + +static bfd_boolean +is_8bit_inplace_add_reloc (Filedata * filedata, unsigned int reloc_type) +{ + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 33; /* R_RISCV_ADD8. */ + default: + return FALSE; + } +} + +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 8-bit inplace sub RELA relocation used in DWARF debug sections. */ + +static bfd_boolean +is_8bit_inplace_sub_reloc (Filedata * filedata, unsigned int reloc_type) +{ + /* Please keep this table alpha-sorted for ease of visual lookup. */ + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 37; /* R_RISCV_SUB8. */ + default: + return FALSE; + } +} + +/* Like is_32bit_abs_reloc except that it returns TRUE iff RELOC_TYPE is + a 6-bit inplace sub RELA relocation used in DWARF debug sections. */ + +static bfd_boolean +is_6bit_inplace_sub_reloc (Filedata * filedata, unsigned int reloc_type) +{ + switch (filedata->file_header.e_machine) + { + case EM_RISCV: + return reloc_type == 52; /* R_RISCV_SUB6. */ + default: + return FALSE; + } +} + +/* Returns TRUE iff RELOC_TYPE is a NONE relocation used for discarded + relocation entries (possibly formerly used for SHT_GROUP sections). */ + +static bfd_boolean +is_none_reloc (Filedata * filedata, unsigned int reloc_type) +{ + switch (filedata->file_header.e_machine) + { + case EM_386: /* R_386_NONE. */ + case EM_68K: /* R_68K_NONE. */ + case EM_ADAPTEVA_EPIPHANY: + case EM_ALPHA: /* R_ALPHA_NONE. */ + case EM_ALTERA_NIOS2: /* R_NIOS2_NONE. */ + case EM_ARC: /* R_ARC_NONE. */ + case EM_ARC_COMPACT2: /* R_ARC_NONE. */ + case EM_ARC_COMPACT: /* R_ARC_NONE. */ + case EM_ARM: /* R_ARM_NONE. */ + case EM_C166: /* R_XC16X_NONE. */ + case EM_CRIS: /* R_CRIS_NONE. */ + case EM_FT32: /* R_FT32_NONE. */ + case EM_IA_64: /* R_IA64_NONE. */ + case EM_K1OM: /* R_X86_64_NONE. */ + case EM_L1OM: /* R_X86_64_NONE. */ + case EM_M32R: /* R_M32R_NONE. */ + case EM_MIPS: /* R_MIPS_NONE. */ + case EM_MN10300: /* R_MN10300_NONE. */ + case EM_MOXIE: /* R_MOXIE_NONE. */ + case EM_NIOS32: /* R_NIOS_NONE. */ + case EM_OR1K: /* R_OR1K_NONE. */ + case EM_PARISC: /* R_PARISC_NONE. */ + case EM_PPC64: /* R_PPC64_NONE. */ + case EM_PPC: /* R_PPC_NONE. */ + case EM_RISCV: /* R_RISCV_NONE. */ + case EM_S390: /* R_390_NONE. */ + case EM_S390_OLD: + case EM_SH: /* R_SH_NONE. */ + case EM_SPARC32PLUS: + case EM_SPARC: /* R_SPARC_NONE. */ + case EM_SPARCV9: + case EM_TILEGX: /* R_TILEGX_NONE. */ + case EM_TILEPRO: /* R_TILEPRO_NONE. */ + case EM_TI_C6000:/* R_C6000_NONE. */ + case EM_X86_64: /* R_X86_64_NONE. */ + case EM_XC16X: + case EM_WEBASSEMBLY: /* R_WASM32_NONE. */ + return reloc_type == 0; + + case EM_AARCH64: + return reloc_type == 0 || reloc_type == 256; + case EM_AVR_OLD: + case EM_AVR: + return (reloc_type == 0 /* R_AVR_NONE. */ + || reloc_type == 30 /* R_AVR_DIFF8. */ + || reloc_type == 31 /* R_AVR_DIFF16. */ + || reloc_type == 32 /* R_AVR_DIFF32. */); + case EM_METAG: + return reloc_type == 3; /* R_METAG_NONE. */ + case EM_NDS32: + return (reloc_type == 0 /* R_XTENSA_NONE. */ + || reloc_type == 204 /* R_NDS32_DIFF8. */ + || reloc_type == 205 /* R_NDS32_DIFF16. */ + || reloc_type == 206 /* R_NDS32_DIFF32. */ + || reloc_type == 207 /* R_NDS32_ULEB128. */); + case EM_TI_PRU: + return (reloc_type == 0 /* R_PRU_NONE. */ + || reloc_type == 65 /* R_PRU_DIFF8. */ + || reloc_type == 66 /* R_PRU_DIFF16. */ + || reloc_type == 67 /* R_PRU_DIFF32. */); + case EM_XTENSA_OLD: + case EM_XTENSA: + return (reloc_type == 0 /* R_XTENSA_NONE. */ + || reloc_type == 17 /* R_XTENSA_DIFF8. */ + || reloc_type == 18 /* R_XTENSA_DIFF16. */ + || reloc_type == 19 /* R_XTENSA_DIFF32. */); + } + return FALSE; +} + +/* Returns TRUE if there is a relocation against + section NAME at OFFSET bytes. */ + +bfd_boolean +reloc_at (struct dwarf_section * dsec, dwarf_vma offset) +{ + Elf_Internal_Rela * relocs; + Elf_Internal_Rela * rp; + + if (dsec == NULL || dsec->reloc_info == NULL) + return FALSE; + + relocs = (Elf_Internal_Rela *) dsec->reloc_info; + + for (rp = relocs; rp < relocs + dsec->num_relocs; ++rp) + if (rp->r_offset == offset) + return TRUE; + + return FALSE; +} + +/* Apply relocations to a section. + Returns TRUE upon success, FALSE otherwise. + If RELOCS_RETURN is non-NULL then it is set to point to the loaded relocs. + It is then the caller's responsibility to free them. NUM_RELOCS_RETURN + will be set to the number of relocs loaded. + + Note: So far support has been added only for those relocations + which can be found in debug sections. FIXME: Add support for + more relocations ? */ + +static bfd_boolean +apply_relocations (Filedata * filedata, + const Elf_Internal_Shdr * section, + unsigned char * start, + bfd_size_type size, + void ** relocs_return, + unsigned long * num_relocs_return) +{ + Elf_Internal_Shdr * relsec; + unsigned char * end = start + size; + bfd_boolean res = TRUE; + + if (relocs_return != NULL) + { + * (Elf_Internal_Rela **) relocs_return = NULL; + * num_relocs_return = 0; + } + + if (filedata->file_header.e_type != ET_REL) + /* No relocs to apply. */ + return TRUE; + + /* Find the reloc section associated with the section. */ + for (relsec = filedata->section_headers; + relsec < filedata->section_headers + filedata->file_header.e_shnum; + ++relsec) + { + bfd_boolean is_rela; + unsigned long num_relocs; + Elf_Internal_Rela * relocs; + Elf_Internal_Rela * rp; + Elf_Internal_Shdr * symsec; + Elf_Internal_Sym * symtab; + unsigned long num_syms; + Elf_Internal_Sym * sym; + + if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL) + || relsec->sh_info >= filedata->file_header.e_shnum + || filedata->section_headers + relsec->sh_info != section + || relsec->sh_size == 0 + || relsec->sh_link >= filedata->file_header.e_shnum) + continue; + + is_rela = relsec->sh_type == SHT_RELA; + + if (is_rela) + { + if (!slurp_rela_relocs (filedata, relsec->sh_offset, + relsec->sh_size, & relocs, & num_relocs)) + return FALSE; + } + else + { + if (!slurp_rel_relocs (filedata, relsec->sh_offset, + relsec->sh_size, & relocs, & num_relocs)) + return FALSE; + } + + /* SH uses RELA but uses in place value instead of the addend field. */ + if (filedata->file_header.e_machine == EM_SH) is_rela = FALSE; - symsec = section_headers + relsec->sh_link; - symtab = GET_ELF_SYMBOLS ((FILE *) file, symsec, & num_syms); + symsec = filedata->section_headers + relsec->sh_link; + if (symsec->sh_type != SHT_SYMTAB + && symsec->sh_type != SHT_DYNSYM) + return FALSE; + symtab = GET_ELF_SYMBOLS (filedata, symsec, & num_syms); for (rp = relocs; rp < relocs + num_relocs; ++rp) { bfd_vma addend; unsigned int reloc_type; unsigned int reloc_size; + bfd_boolean reloc_inplace = FALSE; + bfd_boolean reloc_subtract = FALSE; unsigned char * rloc; unsigned long sym_index; - reloc_type = get_reloc_type (rp->r_info); + reloc_type = get_reloc_type (filedata, rp->r_info); - if (target_specific_reloc_handling (rp, start, symtab)) + if (target_specific_reloc_handling (filedata, rp, start, end, symtab, num_syms)) continue; - else if (is_none_reloc (reloc_type)) + else if (is_none_reloc (filedata, reloc_type)) continue; - else if (is_32bit_abs_reloc (reloc_type) - || is_32bit_pcrel_reloc (reloc_type)) + else if (is_32bit_abs_reloc (filedata, reloc_type) + || is_32bit_pcrel_reloc (filedata, reloc_type)) reloc_size = 4; - else if (is_64bit_abs_reloc (reloc_type) - || is_64bit_pcrel_reloc (reloc_type)) + else if (is_64bit_abs_reloc (filedata, reloc_type) + || is_64bit_pcrel_reloc (filedata, reloc_type)) reloc_size = 8; - else if (is_24bit_abs_reloc (reloc_type)) + else if (is_24bit_abs_reloc (filedata, reloc_type)) reloc_size = 3; - else if (is_16bit_abs_reloc (reloc_type)) + else if (is_16bit_abs_reloc (filedata, reloc_type)) reloc_size = 2; + else if (is_8bit_abs_reloc (filedata, reloc_type) + || is_6bit_abs_reloc (filedata, reloc_type)) + reloc_size = 1; + else if ((reloc_subtract = is_32bit_inplace_sub_reloc (filedata, + reloc_type)) + || is_32bit_inplace_add_reloc (filedata, reloc_type)) + { + reloc_size = 4; + reloc_inplace = TRUE; + } + else if ((reloc_subtract = is_64bit_inplace_sub_reloc (filedata, + reloc_type)) + || is_64bit_inplace_add_reloc (filedata, reloc_type)) + { + reloc_size = 8; + reloc_inplace = TRUE; + } + else if ((reloc_subtract = is_16bit_inplace_sub_reloc (filedata, + reloc_type)) + || is_16bit_inplace_add_reloc (filedata, reloc_type)) + { + reloc_size = 2; + reloc_inplace = TRUE; + } + else if ((reloc_subtract = is_8bit_inplace_sub_reloc (filedata, + reloc_type)) + || is_8bit_inplace_add_reloc (filedata, reloc_type)) + { + reloc_size = 1; + reloc_inplace = TRUE; + } + else if ((reloc_subtract = is_6bit_inplace_sub_reloc (filedata, + reloc_type))) + { + reloc_size = 1; + reloc_inplace = TRUE; + } else { static unsigned int prev_reloc = 0; + if (reloc_type != prev_reloc) warn (_("unable to apply unsupported reloc type %d to section %s\n"), - reloc_type, printable_section_name (section)); + reloc_type, printable_section_name (filedata, section)); prev_reloc = reloc_type; + res = FALSE; continue; } @@ -11945,7 +13106,8 @@ apply_relocations (void * file, { warn (_("skipping invalid relocation offset 0x%lx in section %s\n"), (unsigned long) rp->r_offset, - printable_section_name (section)); + printable_section_name (filedata, section)); + res = FALSE; continue; } @@ -11953,7 +13115,8 @@ apply_relocations (void * file, if (sym_index >= num_syms) { warn (_("skipping invalid relocation symbol index 0x%lx in section %s\n"), - sym_index, printable_section_name (section)); + sym_index, printable_section_name (filedata, section)); + res = FALSE; continue; } sym = symtab + sym_index; @@ -11972,12 +13135,14 @@ apply_relocations (void * file, referencing a global array. For an example of this see the _clz.o binary in libgcc.a. */ if (sym != symtab + && ELF_ST_TYPE (sym->st_info) != STT_COMMON && ELF_ST_TYPE (sym->st_info) > STT_SECTION) { - warn (_("skipping unexpected symbol type %s in %ld'th relocation in section %s\n"), - get_symbol_type (ELF_ST_TYPE (sym->st_info)), - (long int)(rp - relocs), - printable_section_name (relsec)); + warn (_("skipping unexpected symbol type %s in section %s relocation %ld\n"), + get_symbol_type (filedata, ELF_ST_TYPE (sym->st_info)), + printable_section_name (filedata, relsec), + (long int)(rp - relocs)); + res = FALSE; continue; } @@ -11987,30 +13152,51 @@ apply_relocations (void * file, /* R_XTENSA_32, R_PJ_DATA_DIR32 and R_D30V_32_NORMAL are partial_inplace. */ if (!is_rela - || (elf_header.e_machine == EM_XTENSA + || (filedata->file_header.e_machine == EM_XTENSA && reloc_type == 1) - || ((elf_header.e_machine == EM_PJ - || elf_header.e_machine == EM_PJ_OLD) + || ((filedata->file_header.e_machine == EM_PJ + || filedata->file_header.e_machine == EM_PJ_OLD) && reloc_type == 1) - || ((elf_header.e_machine == EM_D30V - || elf_header.e_machine == EM_CYGNUS_D30V) - && reloc_type == 12)) - addend += byte_get (rloc, reloc_size); + || ((filedata->file_header.e_machine == EM_D30V + || filedata->file_header.e_machine == EM_CYGNUS_D30V) + && reloc_type == 12) + || reloc_inplace) + { + if (is_6bit_inplace_sub_reloc (filedata, reloc_type)) + addend += byte_get (rloc, reloc_size) & 0x3f; + else + addend += byte_get (rloc, reloc_size); + } - if (is_32bit_pcrel_reloc (reloc_type) - || is_64bit_pcrel_reloc (reloc_type)) + if (is_32bit_pcrel_reloc (filedata, reloc_type) + || is_64bit_pcrel_reloc (filedata, reloc_type)) { /* On HPPA, all pc-relative relocations are biased by 8. */ - if (elf_header.e_machine == EM_PARISC) + if (filedata->file_header.e_machine == EM_PARISC) addend -= 8; byte_put (rloc, (addend + sym->st_value) - rp->r_offset, reloc_size); } + else if (is_6bit_abs_reloc (filedata, reloc_type) + || is_6bit_inplace_sub_reloc (filedata, reloc_type)) + { + if (reloc_subtract) + addend -= sym->st_value; + else + addend += sym->st_value; + addend = (addend & 0x3f) | (byte_get (rloc, reloc_size) & 0xc0); + byte_put (rloc, addend, reloc_size); + } + else if (reloc_subtract) + byte_put (rloc, addend - sym->st_value, reloc_size); else byte_put (rloc, addend + sym->st_value, reloc_size); } free (symtab); + /* Let the target specific reloc processing code know that + we have finished with these relocs. */ + target_specific_reloc_handling (filedata, NULL, NULL, NULL, NULL, 0); if (relocs_return) { @@ -12022,17 +13208,19 @@ apply_relocations (void * file, break; } + + return res; } #ifdef SUPPORT_DISASSEMBLY -static int -disassemble_section (Elf_Internal_Shdr * section, FILE * file) +static bfd_boolean +disassemble_section (Elf_Internal_Shdr * section, Filedata * filedata) { - printf (_("\nAssembly dump of section %s\n"), printable_section_name (section)); + printf (_("\nAssembly dump of section %s\n"), printable_section_name (filedata, section)); /* FIXME: XXX -- to be done --- XXX */ - return 1; + return TRUE; } #endif @@ -12040,29 +13228,27 @@ disassemble_section (Elf_Internal_Shdr * section, FILE * file) to a malloc'ed buffer or NULL if something went wrong. */ static char * -get_section_contents (Elf_Internal_Shdr * section, FILE * file) +get_section_contents (Elf_Internal_Shdr * section, Filedata * filedata) { - bfd_size_type num_bytes; - - num_bytes = section->sh_size; + bfd_size_type num_bytes = section->sh_size; if (num_bytes == 0 || section->sh_type == SHT_NOBITS) { - printf (_("\nSection '%s' has no data to dump.\n"), - printable_section_name (section)); + printf (_("Section '%s' has no data to dump.\n"), + printable_section_name (filedata, section)); return NULL; } - return (char *) get_data (NULL, file, section->sh_offset, 1, num_bytes, + return (char *) get_data (NULL, filedata, section->sh_offset, 1, num_bytes, _("section contents")); } /* Uncompresses a section that was compressed using zlib, in place. */ static bfd_boolean -uncompress_section_contents (unsigned char **buffer, - dwarf_size_type uncompressed_size, - dwarf_size_type *size) +uncompress_section_contents (unsigned char ** buffer, + dwarf_size_type uncompressed_size, + dwarf_size_type * size) { dwarf_size_type compressed_size = *size; unsigned char * compressed_buffer = *buffer; @@ -12111,8 +13297,8 @@ uncompress_section_contents (unsigned char **buffer, return FALSE; } -static void -dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) +static bfd_boolean +dump_section_as_strings (Elf_Internal_Shdr * section, Filedata * filedata) { Elf_Internal_Shdr * relsec; bfd_size_type num_bytes; @@ -12122,13 +13308,14 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) unsigned char * start; bfd_boolean some_strings_shown; - real_start = start = (unsigned char *) get_section_contents (section, - file); + real_start = start = (unsigned char *) get_section_contents (section, filedata); if (start == NULL) - return; + /* PR 21820: Do not fail if the section was empty. */ + return (section->sh_size == 0 || section->sh_type == SHT_NOBITS) ? TRUE : FALSE; + num_bytes = section->sh_size; - printf (_("\nString dump of section '%s':\n"), printable_section_name (section)); + printf (_("\nString dump of section '%s':\n"), printable_section_name (filedata, section)); if (decompress_dumps) { @@ -12139,19 +13326,20 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) { Elf_Internal_Chdr chdr; unsigned int compression_header_size - = get_compression_header (& chdr, (unsigned char *) start); + = get_compression_header (& chdr, (unsigned char *) start, + num_bytes); if (chdr.ch_type != ELFCOMPRESS_ZLIB) { warn (_("section '%s' has unsupported compress type: %d\n"), - printable_section_name (section), chdr.ch_type); - return; + printable_section_name (filedata, section), chdr.ch_type); + return FALSE; } else if (chdr.ch_addralign != section->sh_addralign) { warn (_("compressed section '%s' is corrupted\n"), - printable_section_name (section)); - return; + printable_section_name (filedata, section)); + return FALSE; } uncompressed_size = chdr.ch_size; start += compression_header_size; @@ -12174,10 +13362,20 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) new_size -= 12; } - if (uncompressed_size - && uncompress_section_contents (& start, - uncompressed_size, & new_size)) - num_bytes = new_size; + if (uncompressed_size) + { + if (uncompress_section_contents (& start, + uncompressed_size, & new_size)) + num_bytes = new_size; + else + { + error (_("Unable to decompress section %s\n"), + printable_section_name (filedata, section)); + return FALSE; + } + } + else + start = real_start; } /* If the section being dumped has relocations against it the user might @@ -12185,15 +13383,15 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) case and issue a warning message in order to avoid confusion. FIXME: Maybe we ought to have an option that dumps a section with relocs applied ? */ - for (relsec = section_headers; - relsec < section_headers + elf_header.e_shnum; + for (relsec = filedata->section_headers; + relsec < filedata->section_headers + filedata->file_header.e_shnum; ++relsec) { if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL) - || relsec->sh_info >= elf_header.e_shnum - || section_headers + relsec->sh_info != section + || relsec->sh_info >= filedata->file_header.e_shnum + || filedata->section_headers + relsec->sh_info != section || relsec->sh_size == 0 - || relsec->sh_link >= elf_header.e_shnum) + || relsec->sh_link >= filedata->file_header.e_shnum) continue; printf (_(" Note: This section has relocations against it, but these have NOT been applied to this dump.\n")); @@ -12242,12 +13440,13 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) free (real_start); putchar ('\n'); + return TRUE; } -static void -dump_section_as_bytes (Elf_Internal_Shdr * section, - FILE * file, - bfd_boolean relocate) +static bfd_boolean +dump_section_as_bytes (Elf_Internal_Shdr * section, + Filedata * filedata, + bfd_boolean relocate) { Elf_Internal_Shdr * relsec; bfd_size_type bytes; @@ -12257,12 +13456,14 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, unsigned char * real_start; unsigned char * start; - real_start = start = (unsigned char *) get_section_contents (section, file); + real_start = start = (unsigned char *) get_section_contents (section, filedata); if (start == NULL) - return; + /* PR 21820: Do not fail if the section was empty. */ + return (section->sh_size == 0 || section->sh_type == SHT_NOBITS) ? TRUE : FALSE; + section_size = section->sh_size; - printf (_("\nHex dump of section '%s':\n"), printable_section_name (section)); + printf (_("\nHex dump of section '%s':\n"), printable_section_name (filedata, section)); if (decompress_dumps) { @@ -12273,19 +13474,19 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, { Elf_Internal_Chdr chdr; unsigned int compression_header_size - = get_compression_header (& chdr, start); + = get_compression_header (& chdr, start, section_size); if (chdr.ch_type != ELFCOMPRESS_ZLIB) { warn (_("section '%s' has unsupported compress type: %d\n"), - printable_section_name (section), chdr.ch_type); - return; + printable_section_name (filedata, section), chdr.ch_type); + return FALSE; } else if (chdr.ch_addralign != section->sh_addralign) { warn (_("compressed section '%s' is corrupted\n"), - printable_section_name (section)); - return; + printable_section_name (filedata, section)); + return FALSE; } uncompressed_size = chdr.ch_size; start += compression_header_size; @@ -12308,15 +13509,29 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, new_size -= 12; } - if (uncompressed_size - && uncompress_section_contents (& start, uncompressed_size, - & new_size)) - section_size = new_size; + if (uncompressed_size) + { + if (uncompress_section_contents (& start, uncompressed_size, + & new_size)) + { + section_size = new_size; + } + else + { + error (_("Unable to decompress section %s\n"), + printable_section_name (filedata, section)); + /* FIXME: Print the section anyway ? */ + return FALSE; + } + } + else + start = real_start; } if (relocate) { - apply_relocations (file, section, start, section_size, NULL, NULL); + if (! apply_relocations (filedata, section, start, section_size, NULL, NULL)) + return FALSE; } else { @@ -12325,15 +13540,15 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, case and issue a warning message in order to avoid confusion. FIXME: Maybe we ought to have an option that dumps a section with relocs applied ? */ - for (relsec = section_headers; - relsec < section_headers + elf_header.e_shnum; + for (relsec = filedata->section_headers; + relsec < filedata->section_headers + filedata->file_header.e_shnum; ++relsec) { if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL) - || relsec->sh_info >= elf_header.e_shnum - || section_headers + relsec->sh_info != section + || relsec->sh_info >= filedata->file_header.e_shnum + || filedata->section_headers + relsec->sh_info != section || relsec->sh_size == 0 - || relsec->sh_link >= elf_header.e_shnum) + || relsec->sh_link >= filedata->file_header.e_shnum) continue; printf (_(" NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n")); @@ -12385,23 +13600,31 @@ dump_section_as_bytes (Elf_Internal_Shdr * section, free (real_start); putchar ('\n'); + return TRUE; } -static int -load_specific_debug_section (enum dwarf_section_display_enum debug, - const Elf_Internal_Shdr * sec, void * file) +static bfd_boolean +load_specific_debug_section (enum dwarf_section_display_enum debug, + const Elf_Internal_Shdr * sec, + void * data) { struct dwarf_section * section = &debug_displays [debug].section; char buf [64]; - - /* If it is already loaded, do nothing. */ + Filedata * filedata = (Filedata *) data; + if (section->start != NULL) - return 1; + { + /* If it is already loaded, do nothing. */ + if (streq (section->filename, filedata->file_name)) + return TRUE; + free (section->start); + } snprintf (buf, sizeof (buf), _("%s section data"), section->name); section->address = sec->sh_addr; section->user_data = NULL; - section->start = (unsigned char *) get_data (NULL, (FILE *) file, + section->filename = filedata->file_name; + section->start = (unsigned char *) get_data (NULL, filedata, sec->sh_offset, 1, sec->sh_size, buf); if (section->start == NULL) @@ -12415,19 +13638,30 @@ load_specific_debug_section (enum dwarf_section_display_enum debug, if ((sec->sh_flags & SHF_COMPRESSED) != 0) { Elf_Internal_Chdr chdr; - unsigned int compression_header_size - = get_compression_header (&chdr, start); + unsigned int compression_header_size; + + if (size < (is_32bit_elf + ? sizeof (Elf32_External_Chdr) + : sizeof (Elf64_External_Chdr))) + { + warn (_("compressed section %s is too small to contain a compression header"), + section->name); + return FALSE; + } + + compression_header_size = get_compression_header (&chdr, start, size); + if (chdr.ch_type != ELFCOMPRESS_ZLIB) { warn (_("section '%s' has unsupported compress type: %d\n"), section->name, chdr.ch_type); - return 0; + return FALSE; } else if (chdr.ch_addralign != sec->sh_addralign) { warn (_("compressed section '%s' is corrupted\n"), section->name); - return 0; + return FALSE; } uncompressed_size = chdr.ch_size; start += compression_header_size; @@ -12450,55 +13684,92 @@ load_specific_debug_section (enum dwarf_section_display_enum debug, size -= 12; } - if (uncompressed_size - && uncompress_section_contents (&start, uncompressed_size, - &size)) + if (uncompressed_size) { - /* Free the compressed buffer, update the section buffer - and the section size if uncompress is successful. */ - free (section->start); - section->start = start; + if (uncompress_section_contents (&start, uncompressed_size, + &size)) + { + /* Free the compressed buffer, update the section buffer + and the section size if uncompress is successful. */ + free (section->start); + section->start = start; + } + else + { + error (_("Unable to decompress section %s\n"), + printable_section_name (filedata, sec)); + return FALSE; + } } + section->size = size; } if (section->start == NULL) - return 0; + return FALSE; if (debug_displays [debug].relocate) - apply_relocations ((FILE *) file, sec, section->start, section->size, - & section->reloc_info, & section->num_relocs); + { + if (! apply_relocations (filedata, sec, section->start, section->size, + & section->reloc_info, & section->num_relocs)) + return FALSE; + } else { section->reloc_info = NULL; section->num_relocs = 0; } - return 1; + return TRUE; } /* If this is not NULL, load_debug_section will only look for sections within the list of sections given here. */ -unsigned int *section_subset = NULL; +static unsigned int * section_subset = NULL; -int -load_debug_section (enum dwarf_section_display_enum debug, void * file) +bfd_boolean +load_debug_section (enum dwarf_section_display_enum debug, void * data) { struct dwarf_section * section = &debug_displays [debug].section; Elf_Internal_Shdr * sec; + Filedata * filedata = (Filedata *) data; + + /* Without section headers we cannot find any sections. */ + if (filedata->section_headers == NULL) + return FALSE; + + if (filedata->string_table == NULL + && filedata->file_header.e_shstrndx != SHN_UNDEF + && filedata->file_header.e_shstrndx < filedata->file_header.e_shnum) + { + Elf_Internal_Shdr * strs; + + /* Read in the string table, so that we have section names to scan. */ + strs = filedata->section_headers + filedata->file_header.e_shstrndx; + + if (strs != NULL && strs->sh_size != 0) + { + filedata->string_table + = (char *) get_data (NULL, filedata, strs->sh_offset, + 1, strs->sh_size, _("string table")); + + filedata->string_table_length + = filedata->string_table != NULL ? strs->sh_size : 0; + } + } /* Locate the debug section. */ - sec = find_section_in_set (section->uncompressed_name, section_subset); + sec = find_section_in_set (filedata, section->uncompressed_name, section_subset); if (sec != NULL) section->name = section->uncompressed_name; else { - sec = find_section_in_set (section->compressed_name, section_subset); + sec = find_section_in_set (filedata, section->compressed_name, section_subset); if (sec != NULL) section->name = section->compressed_name; } if (sec == NULL) - return 0; + return FALSE; /* If we're loading from a subset of sections, and we've loaded a section matching this name before, it's likely that it's a @@ -12506,7 +13777,7 @@ load_debug_section (enum dwarf_section_display_enum debug, void * file) if (section_subset != NULL) free_debug_section (debug); - return load_specific_debug_section (debug, sec, (FILE *) file); + return load_specific_debug_section (debug, sec, data); } void @@ -12523,20 +13794,20 @@ free_debug_section (enum dwarf_section_display_enum debug) section->size = 0; } -static int -display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file) +static bfd_boolean +display_debug_section (int shndx, Elf_Internal_Shdr * section, Filedata * filedata) { char * name = SECTION_NAME (section); - const char * print_name = printable_section_name (section); + const char * print_name = printable_section_name (filedata, section); bfd_size_type length; - int result = 1; + bfd_boolean result = TRUE; int i; length = section->sh_size; if (length == 0) { printf (_("\nSection '%s' has no debugging data.\n"), print_name); - return 0; + return TRUE; } if (section->sh_type == SHT_NOBITS) { @@ -12546,7 +13817,7 @@ display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file) stripped with the --only-keep-debug command line option. */ printf (_("section '%s' has the NOBITS type - its contents are unreliable.\n"), print_name); - return 0; + return FALSE; } if (const_strneq (name, ".gnu.linkonce.wi.")) @@ -12554,44 +13825,48 @@ display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file) /* See if we know how to display the contents of this section. */ for (i = 0; i < max; i++) - if (streq (debug_displays[i].section.uncompressed_name, name) - || (i == line && const_strneq (name, ".debug_line.")) - || streq (debug_displays[i].section.compressed_name, name)) - { - struct dwarf_section * sec = &debug_displays [i].section; - int secondary = (section != find_section (name)); + { + enum dwarf_section_display_enum id = (enum dwarf_section_display_enum) i; + struct dwarf_section_display * display = debug_displays + i; + struct dwarf_section * sec = & display->section; - if (secondary) - free_debug_section ((enum dwarf_section_display_enum) i); + if (streq (sec->uncompressed_name, name) + || (id == line && const_strneq (name, ".debug_line.")) + || streq (sec->compressed_name, name)) + { + bfd_boolean secondary = (section != find_section (filedata, name)); - if (i == line && const_strneq (name, ".debug_line.")) - sec->name = name; - else if (streq (sec->uncompressed_name, name)) - sec->name = sec->uncompressed_name; - else - sec->name = sec->compressed_name; - if (load_specific_debug_section ((enum dwarf_section_display_enum) i, - section, file)) - { - /* If this debug section is part of a CU/TU set in a .dwp file, - restrict load_debug_section to the sections in that set. */ - section_subset = find_cu_tu_set (file, shndx); + if (secondary) + free_debug_section (id); - result &= debug_displays[i].display (sec, file); + if (i == line && const_strneq (name, ".debug_line.")) + sec->name = name; + else if (streq (sec->uncompressed_name, name)) + sec->name = sec->uncompressed_name; + else + sec->name = sec->compressed_name; - section_subset = NULL; + if (load_specific_debug_section (id, section, filedata)) + { + /* If this debug section is part of a CU/TU set in a .dwp file, + restrict load_debug_section to the sections in that set. */ + section_subset = find_cu_tu_set (filedata, shndx); - if (secondary || (i != info && i != abbrev)) - free_debug_section ((enum dwarf_section_display_enum) i); - } + result &= display->display (sec, filedata); - break; - } + section_subset = NULL; + + if (secondary || (id != info && id != abbrev)) + free_debug_section (id); + } + break; + } + } if (i == max) { printf (_("Unrecognized debug section: %s\n"), print_name); - result = 0; + result = FALSE; } return result; @@ -12601,20 +13876,20 @@ display_debug_section (int shndx, Elf_Internal_Shdr * section, FILE * file) based on section name. */ static void -initialise_dumps_byname (void) +initialise_dumps_byname (Filedata * filedata) { struct dump_list_entry * cur; for (cur = dump_sects_byname; cur; cur = cur->next) { unsigned int i; - int any; + bfd_boolean any = FALSE; - for (i = 0, any = 0; i < elf_header.e_shnum; i++) - if (streq (SECTION_NAME (section_headers + i), cur->name)) + for (i = 0; i < filedata->file_header.e_shnum; i++) + if (streq (SECTION_NAME (filedata->section_headers + i), cur->name)) { - request_dump_bynumber (i, cur->type); - any = 1; + request_dump_bynumber (filedata, i, cur->type); + any = TRUE; } if (!any) @@ -12623,43 +13898,69 @@ initialise_dumps_byname (void) } } -static void -process_section_contents (FILE * file) +static bfd_boolean +process_section_contents (Filedata * filedata) { Elf_Internal_Shdr * section; unsigned int i; + bfd_boolean res = TRUE; if (! do_dump) - return; + return TRUE; - initialise_dumps_byname (); + initialise_dumps_byname (filedata); - for (i = 0, section = section_headers; - i < elf_header.e_shnum && i < num_dump_sects; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum && i < filedata->num_dump_sects; i++, section++) { + dump_type dump = filedata->dump_sects[i]; + #ifdef SUPPORT_DISASSEMBLY - if (dump_sects[i] & DISASS_DUMP) - disassemble_section (section, file); + if (dump & DISASS_DUMP) + { + if (! disassemble_section (section, filedata)) + res = FALSE; + } #endif - if (dump_sects[i] & HEX_DUMP) - dump_section_as_bytes (section, file, FALSE); + if (dump & HEX_DUMP) + { + if (! dump_section_as_bytes (section, filedata, FALSE)) + res = FALSE; + } - if (dump_sects[i] & RELOC_DUMP) - dump_section_as_bytes (section, file, TRUE); + if (dump & RELOC_DUMP) + { + if (! dump_section_as_bytes (section, filedata, TRUE)) + res = FALSE; + } - if (dump_sects[i] & STRING_DUMP) - dump_section_as_strings (section, file); + if (dump & STRING_DUMP) + { + if (! dump_section_as_strings (section, filedata)) + res = FALSE; + } - if (dump_sects[i] & DEBUG_DUMP) - display_debug_section (i, section, file); + if (dump & DEBUG_DUMP) + { + if (! display_debug_section (i, section, filedata)) + res = FALSE; + } } /* Check to see if the user requested a dump of a section that does not exist. */ - while (i++ < num_dump_sects) - if (dump_sects[i]) - warn (_("Section %d was not dumped because it does not exist!\n"), i); + while (i < filedata->num_dump_sects) + { + if (filedata->dump_sects[i]) + { + warn (_("Section %d was not dumped because it does not exist!\n"), i); + res = FALSE; + } + i++; + } + + return res; } static void @@ -12667,15 +13968,16 @@ process_mips_fpe_exception (int mask) { if (mask) { - int first = 1; + bfd_boolean first = TRUE; + if (mask & OEX_FPU_INEX) - fputs ("INEX", stdout), first = 0; + fputs ("INEX", stdout), first = FALSE; if (mask & OEX_FPU_UFLO) - printf ("%sUFLO", first ? "" : "|"), first = 0; + printf ("%sUFLO", first ? "" : "|"), first = FALSE; if (mask & OEX_FPU_OFLO) - printf ("%sOFLO", first ? "" : "|"), first = 0; + printf ("%sOFLO", first ? "" : "|"), first = FALSE; if (mask & OEX_FPU_DIV0) - printf ("%sDIV0", first ? "" : "|"), first = 0; + printf ("%sDIV0", first ? "" : "|"), first = FALSE; if (mask & OEX_FPU_INVAL) printf ("%sINVAL", first ? "" : "|"); } @@ -12698,7 +14000,7 @@ process_mips_fpe_exception (int mask) Reads at or beyond END will not be made. */ static unsigned char * -display_tag_value (int tag, +display_tag_value (signed int tag, unsigned char * p, const unsigned char * const end) { @@ -12742,6 +14044,181 @@ display_tag_value (int tag, return p; } +/* ARC ABI attributes section. */ + +static unsigned char * +display_arc_attribute (unsigned char * p, + const unsigned char * const end) +{ + unsigned int tag; + unsigned int len; + unsigned int val; + + tag = read_uleb128 (p, &len, end); + p += len; + + switch (tag) + { + case Tag_ARC_PCS_config: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_PCS_config: "); + switch (val) + { + case 0: + printf (_("Absent/Non standard\n")); + break; + case 1: + printf (_("Bare metal/mwdt\n")); + break; + case 2: + printf (_("Bare metal/newlib\n")); + break; + case 3: + printf (_("Linux/uclibc\n")); + break; + case 4: + printf (_("Linux/glibc\n")); + break; + default: + printf (_("Unknown\n")); + break; + } + break; + + case Tag_ARC_CPU_base: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_CPU_base: "); + switch (val) + { + default: + case TAG_CPU_NONE: + printf (_("Absent\n")); + break; + case TAG_CPU_ARC6xx: + printf ("ARC6xx\n"); + break; + case TAG_CPU_ARC7xx: + printf ("ARC7xx\n"); + break; + case TAG_CPU_ARCEM: + printf ("ARCEM\n"); + break; + case TAG_CPU_ARCHS: + printf ("ARCHS\n"); + break; + } + break; + + case Tag_ARC_CPU_variation: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_CPU_variation: "); + switch (val) + { + default: + if (val > 0 && val < 16) + printf ("Core%d\n", val); + else + printf ("Unknown\n"); + break; + + case 0: + printf (_("Absent\n")); + break; + } + break; + + case Tag_ARC_CPU_name: + printf (" Tag_ARC_CPU_name: "); + p = display_tag_value (-1, p, end); + break; + + case Tag_ARC_ABI_rf16: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_rf16: %s\n", val ? _("yes") : _("no")); + break; + + case Tag_ARC_ABI_osver: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_osver: v%d\n", val); + break; + + case Tag_ARC_ABI_pic: + case Tag_ARC_ABI_sda: + val = read_uleb128 (p, &len, end); + p += len; + printf (tag == Tag_ARC_ABI_sda ? " Tag_ARC_ABI_sda: " + : " Tag_ARC_ABI_pic: "); + switch (val) + { + case 0: + printf (_("Absent\n")); + break; + case 1: + printf ("MWDT\n"); + break; + case 2: + printf ("GNU\n"); + break; + default: + printf (_("Unknown\n")); + break; + } + break; + + case Tag_ARC_ABI_tls: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_tls: %s\n", val ? "r25": "none"); + break; + + case Tag_ARC_ABI_enumsize: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_enumsize: %s\n", val ? _("default") : + _("smallest")); + break; + + case Tag_ARC_ABI_exceptions: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_exceptions: %s\n", val ? _("OPTFP") + : _("default")); + break; + + case Tag_ARC_ABI_double_size: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ABI_double_size: %d\n", val); + break; + + case Tag_ARC_ISA_config: + printf (" Tag_ARC_ISA_config: "); + p = display_tag_value (-1, p, end); + break; + + case Tag_ARC_ISA_apex: + printf (" Tag_ARC_ISA_apex: "); + p = display_tag_value (-1, p, end); + break; + + case Tag_ARC_ISA_mpy_option: + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_ARC_ISA_mpy_option: %d\n", val); + break; + + default: + return display_tag_value (tag & 1, p, end); + } + + return p; +} + /* ARM EABI attributes section. */ typedef struct { @@ -12754,7 +14231,7 @@ typedef struct static const char * arm_attr_tag_CPU_arch[] = {"Pre-v4", "v4", "v4T", "v5T", "v5TE", "v5TEJ", "v6", "v6KZ", "v6T2", - "v6K", "v7", "v6-M", "v6S-M", "v7E-M", "v8", "", "v8-M.baseline", + "v6K", "v7", "v6-M", "v6S-M", "v7E-M", "v8", "v8-R", "v8-M.baseline", "v8-M.mainline"}; static const char * arm_attr_tag_ARM_ISA_use[] = {"No", "Yes"}; static const char * arm_attr_tag_THUMB_ISA_use[] = @@ -12764,7 +14241,8 @@ static const char * arm_attr_tag_FP_arch[] = "FP for ARMv8", "FPv5/FP-D16 for ARMv8"}; static const char * arm_attr_tag_WMMX_arch[] = {"No", "WMMXv1", "WMMXv2"}; static const char * arm_attr_tag_Advanced_SIMD_arch[] = - {"No", "NEONv1", "NEONv1 with Fused-MAC", "NEON for ARMv8"}; + {"No", "NEONv1", "NEONv1 with Fused-MAC", "NEON for ARMv8", + "NEON for ARMv8.1"}; static const char * arm_attr_tag_PCS_config[] = {"None", "Bare platform", "Linux application", "Linux DSO", "PalmOS 2004", "PalmOS (reserved)", "SymbianOS 2004", "SymbianOS (reserved)"}; @@ -12804,6 +14282,8 @@ static const char * arm_attr_tag_FP_HP_extension[] = {"Not Allowed", "Allowed"}; static const char * arm_attr_tag_ABI_FP_16bit_format[] = {"None", "IEEE 754", "Alternative Format"}; +static const char * arm_attr_tag_DSP_extension[] = + {"Follow architecture", "Allowed"}; static const char * arm_attr_tag_MPextension_use[] = {"Not Allowed", "Allowed"}; static const char * arm_attr_tag_DIV_use[] = @@ -12854,6 +14334,7 @@ static arm_attr_public_tag arm_attr_public_tags[] = LOOKUP(38, ABI_FP_16bit_format), LOOKUP(42, MPextension_use), LOOKUP(44, DIV_use), + LOOKUP(46, DSP_extension), {64, "nodefaults", 0, NULL}, {65, "also_compatible_with", 0, NULL}, LOOKUP(66, T2EE_use), @@ -13021,12 +14502,12 @@ display_arm_attribute (unsigned char * p, static unsigned char * display_gnu_attribute (unsigned char * p, - unsigned char * (* display_proc_gnu_attribute) (unsigned char *, int, const unsigned char * const), + unsigned char * (* display_proc_gnu_attribute) (unsigned char *, unsigned int, const unsigned char * const), const unsigned char * const end) { int tag; unsigned int len; - int val; + unsigned int val; tag = read_uleb128 (p, &len, end); p += len; @@ -13071,51 +14552,81 @@ display_gnu_attribute (unsigned char * p, static unsigned char * display_power_gnu_attribute (unsigned char * p, - int tag, + unsigned int tag, const unsigned char * const end) { unsigned int len; - int val; + unsigned int val; if (tag == Tag_GNU_Power_ABI_FP) { val = read_uleb128 (p, &len, end); p += len; printf (" Tag_GNU_Power_ABI_FP: "); + if (len == 0) + { + printf (_("\n")); + return p; + } - switch (val) + if (val > 15) + printf ("(%#x), ", val); + + switch (val & 3) { case 0: - printf (_("Hard or soft float\n")); + printf (_("unspecified hard/soft float, ")); break; case 1: - printf (_("Hard float\n")); + printf (_("hard float, ")); break; case 2: - printf (_("Soft float\n")); + printf (_("soft float, ")); break; case 3: - printf (_("Single-precision hard float\n")); + printf (_("single-precision hard float, ")); break; - default: - printf ("??? (%d)\n", val); + } + + switch (val & 0xC) + { + case 0: + printf (_("unspecified long double\n")); + break; + case 4: + printf (_("128-bit IBM long double\n")); + break; + case 8: + printf (_("64-bit long double\n")); + break; + case 12: + printf (_("128-bit IEEE long double\n")); break; } return p; - } + } if (tag == Tag_GNU_Power_ABI_Vector) { val = read_uleb128 (p, &len, end); p += len; printf (" Tag_GNU_Power_ABI_Vector: "); - switch (val) + if (len == 0) + { + printf (_("\n")); + return p; + } + + if (val > 3) + printf ("(%#x), ", val); + + switch (val & 3) { case 0: - printf (_("Any\n")); + printf (_("unspecified\n")); break; case 1: - printf (_("Generic\n")); + printf (_("generic\n")); break; case 2: printf ("AltiVec\n"); @@ -13123,39 +14634,39 @@ display_power_gnu_attribute (unsigned char * p, case 3: printf ("SPE\n"); break; - default: - printf ("??? (%d)\n", val); - break; } return p; - } + } if (tag == Tag_GNU_Power_ABI_Struct_Return) { - if (p == end) + val = read_uleb128 (p, &len, end); + p += len; + printf (" Tag_GNU_Power_ABI_Struct_Return: "); + if (len == 0) { - warn (_("corrupt Tag_GNU_Power_ABI_Struct_Return\n")); + printf (_("\n")); return p; } - val = read_uleb128 (p, &len, end); - p += len; - printf (" Tag_GNU_Power_ABI_Struct_Return: "); - switch (val) - { - case 0: - printf (_("Any\n")); - break; - case 1: - printf ("r3/r4\n"); - break; - case 2: - printf (_("Memory\n")); - break; - default: - printf ("??? (%d)\n", val); - break; - } + if (val > 2) + printf ("(%#x), ", val); + + switch (val & 3) + { + case 0: + printf (_("unspecified\n")); + break; + case 1: + printf ("r3/r4\n"); + break; + case 2: + printf (_("memory\n")); + break; + case 3: + printf ("???\n"); + break; + } return p; } @@ -13164,7 +14675,7 @@ display_power_gnu_attribute (unsigned char * p, static unsigned char * display_s390_gnu_attribute (unsigned char * p, - int tag, + unsigned int tag, const unsigned char * const end) { unsigned int len; @@ -13198,44 +14709,44 @@ display_s390_gnu_attribute (unsigned char * p, } static void -display_sparc_hwcaps (int mask) +display_sparc_hwcaps (unsigned int mask) { if (mask) { - int first = 1; + bfd_boolean first = TRUE; if (mask & ELF_SPARC_HWCAP_MUL32) - fputs ("mul32", stdout), first = 0; + fputs ("mul32", stdout), first = FALSE; if (mask & ELF_SPARC_HWCAP_DIV32) - printf ("%sdiv32", first ? "" : "|"), first = 0; + printf ("%sdiv32", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_FSMULD) - printf ("%sfsmuld", first ? "" : "|"), first = 0; + printf ("%sfsmuld", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_V8PLUS) - printf ("%sv8plus", first ? "" : "|"), first = 0; + printf ("%sv8plus", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_POPC) - printf ("%spopc", first ? "" : "|"), first = 0; + printf ("%spopc", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_VIS) - printf ("%svis", first ? "" : "|"), first = 0; + printf ("%svis", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_VIS2) - printf ("%svis2", first ? "" : "|"), first = 0; + printf ("%svis2", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_ASI_BLK_INIT) - printf ("%sASIBlkInit", first ? "" : "|"), first = 0; + printf ("%sASIBlkInit", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_FMAF) - printf ("%sfmaf", first ? "" : "|"), first = 0; + printf ("%sfmaf", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_VIS3) - printf ("%svis3", first ? "" : "|"), first = 0; + printf ("%svis3", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_HPC) - printf ("%shpc", first ? "" : "|"), first = 0; + printf ("%shpc", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_RANDOM) - printf ("%srandom", first ? "" : "|"), first = 0; + printf ("%srandom", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_TRANS) - printf ("%strans", first ? "" : "|"), first = 0; + printf ("%strans", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_FJFMAU) - printf ("%sfjfmau", first ? "" : "|"), first = 0; + printf ("%sfjfmau", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_IMA) - printf ("%sima", first ? "" : "|"), first = 0; + printf ("%sima", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP_ASI_CACHE_SPARING) - printf ("%scspare", first ? "" : "|"), first = 0; + printf ("%scspare", first ? "" : "|"), first = FALSE; } else fputc ('0', stdout); @@ -13243,34 +14754,34 @@ display_sparc_hwcaps (int mask) } static void -display_sparc_hwcaps2 (int mask) +display_sparc_hwcaps2 (unsigned int mask) { if (mask) { - int first = 1; + bfd_boolean first = TRUE; if (mask & ELF_SPARC_HWCAP2_FJATHPLUS) - fputs ("fjathplus", stdout), first = 0; + fputs ("fjathplus", stdout), first = FALSE; if (mask & ELF_SPARC_HWCAP2_VIS3B) - printf ("%svis3b", first ? "" : "|"), first = 0; + printf ("%svis3b", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_ADP) - printf ("%sadp", first ? "" : "|"), first = 0; + printf ("%sadp", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_SPARC5) - printf ("%ssparc5", first ? "" : "|"), first = 0; + printf ("%ssparc5", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_MWAIT) - printf ("%smwait", first ? "" : "|"), first = 0; + printf ("%smwait", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_XMPMUL) - printf ("%sxmpmul", first ? "" : "|"), first = 0; + printf ("%sxmpmul", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_XMONT) - printf ("%sxmont2", first ? "" : "|"), first = 0; + printf ("%sxmont2", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_NSEC) - printf ("%snsec", first ? "" : "|"), first = 0; + printf ("%snsec", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_FJATHHPC) - printf ("%sfjathhpc", first ? "" : "|"), first = 0; + printf ("%sfjathhpc", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_FJDES) - printf ("%sfjdes", first ? "" : "|"), first = 0; + printf ("%sfjdes", first ? "" : "|"), first = FALSE; if (mask & ELF_SPARC_HWCAP2_FJAES) - printf ("%sfjaes", first ? "" : "|"), first = 0; + printf ("%sfjaes", first ? "" : "|"), first = FALSE; } else fputc ('0', stdout); @@ -13279,7 +14790,7 @@ display_sparc_hwcaps2 (int mask) static unsigned char * display_sparc_gnu_attribute (unsigned char * p, - int tag, + unsigned int tag, const unsigned char * const end) { unsigned int len; @@ -13306,7 +14817,7 @@ display_sparc_gnu_attribute (unsigned char * p, } static void -print_mips_fp_abi_value (int val) +print_mips_fp_abi_value (unsigned int val) { switch (val) { @@ -13345,13 +14856,13 @@ print_mips_fp_abi_value (int val) static unsigned char * display_mips_gnu_attribute (unsigned char * p, - int tag, + unsigned int tag, const unsigned char * const end) { if (tag == Tag_GNU_MIPS_ABI_FP) { unsigned int len; - int val; + unsigned int val; val = read_uleb128 (p, &len, end); p += len; @@ -13365,7 +14876,7 @@ display_mips_gnu_attribute (unsigned char * p, if (tag == Tag_GNU_MIPS_ABI_MSA) { unsigned int len; - int val; + unsigned int val; val = read_uleb128 (p, &len, end); p += len; @@ -13393,7 +14904,7 @@ static unsigned char * display_tic6x_attribute (unsigned char * p, const unsigned char * const end) { - int tag; + unsigned int tag; unsigned int len; int val; @@ -13638,7 +15149,7 @@ display_tic6x_attribute (unsigned char * p, } static void -display_raw_attribute (unsigned char * p, unsigned char * end) +display_raw_attribute (unsigned char * p, unsigned char const * const end) { unsigned long addr = 0; size_t bytes = end - p; @@ -13687,8 +15198,8 @@ display_msp430x_attribute (unsigned char * p, const unsigned char * const end) { unsigned int len; - int val; - int tag; + unsigned int val; + unsigned int tag; tag = read_uleb128 (p, & len, end); p += len; @@ -13768,19 +15279,20 @@ display_msp430x_attribute (unsigned char * p, return p; } -static int -process_attributes (FILE * file, +static bfd_boolean +process_attributes (Filedata * filedata, const char * public_name, unsigned int proc_type, unsigned char * (* display_pub_attribute) (unsigned char *, const unsigned char * const), - unsigned char * (* display_proc_gnu_attribute) (unsigned char *, int, const unsigned char * const)) + unsigned char * (* display_proc_gnu_attribute) (unsigned char *, unsigned int, const unsigned char * const)) { Elf_Internal_Shdr * sect; unsigned i; + bfd_boolean res = TRUE; /* Find the section header so that we get the size. */ - for (i = 0, sect = section_headers; - i < elf_header.e_shnum; + for (i = 0, sect = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, sect++) { unsigned char * contents; @@ -13789,13 +15301,23 @@ process_attributes (FILE * file, if (sect->sh_type != proc_type && sect->sh_type != SHT_GNU_ATTRIBUTES) continue; - contents = (unsigned char *) get_data (NULL, file, sect->sh_offset, 1, + contents = (unsigned char *) get_data (NULL, filedata, sect->sh_offset, 1, sect->sh_size, _("attributes")); if (contents == NULL) - continue; + { + res = FALSE; + continue; + } p = contents; - if (*p == 'A') + /* The first character is the version of the attributes. + Currently only version 1, (aka 'A') is recognised here. */ + if (*p != 'A') + { + printf (_("Unknown attributes version '%c'(%d) - expecting 'A'\n"), *p, *p); + res = FALSE; + } + else { bfd_vma section_len; @@ -13812,6 +15334,7 @@ process_attributes (FILE * file, if (section_len <= 4) { error (_("Tag section ends prematurely\n")); + res = FALSE; break; } attr_len = byte_get (p, 4); @@ -13822,11 +15345,13 @@ process_attributes (FILE * file, error (_("Bad attribute length (%u > %u)\n"), (unsigned) attr_len, (unsigned) section_len); attr_len = section_len; + res = FALSE; } /* PR 17531: file: 001-101425-0.004 */ else if (attr_len < 5) { error (_("Attribute length of %u is too small\n"), (unsigned) attr_len); + res = FALSE; break; } @@ -13837,6 +15362,7 @@ process_attributes (FILE * file, if (namelen == 0 || namelen >= attr_len) { error (_("Corrupt attribute section name\n")); + res = FALSE; break; } @@ -13868,6 +15394,7 @@ process_attributes (FILE * file, if (attr_len < 6) { error (_("Unused bytes at end of section\n")); + res = FALSE; section_len = 0; break; } @@ -13878,6 +15405,7 @@ process_attributes (FILE * file, { error (_("Bad subsection length (%u > %u)\n"), (unsigned) size, (unsigned) attr_len); + res = FALSE; size = attr_len; } /* PR binutils/17531: Safe handling of corrupt files. */ @@ -13885,6 +15413,7 @@ process_attributes (FILE * file, { error (_("Bad subsection length (%u < 6)\n"), (unsigned) size); + res = FALSE; section_len = 0; break; } @@ -13904,6 +15433,7 @@ process_attributes (FILE * file, goto do_numlist; case 3: printf (_("Symbol Attributes:")); + /* Fall through. */ do_numlist: for (;;) { @@ -13927,7 +15457,7 @@ process_attributes (FILE * file, { while (p < end) p = display_pub_attribute (p, end); - assert (p <= end); + assert (p == end); } else if (gnu_section && display_proc_gnu_attribute != NULL) { @@ -13935,7 +15465,7 @@ process_attributes (FILE * file, p = display_gnu_attribute (p, display_proc_gnu_attribute, end); - assert (p <= end); + assert (p == end); } else if (p < end) { @@ -13948,54 +15478,11 @@ process_attributes (FILE * file, } } } - else - printf (_("Unknown format '%c' (%d)\n"), *p, *p); free (contents); } - return 1; -} -static int -process_arm_specific (FILE * file) -{ - return process_attributes (file, "aeabi", SHT_ARM_ATTRIBUTES, - display_arm_attribute, NULL); -} - -static int -process_power_specific (FILE * file) -{ - return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, - display_power_gnu_attribute); -} - -static int -process_s390_specific (FILE * file) -{ - return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, - display_s390_gnu_attribute); -} - -static int -process_sparc_specific (FILE * file) -{ - return process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, - display_sparc_gnu_attribute); -} - -static int -process_tic6x_specific (FILE * file) -{ - return process_attributes (file, "c6xabi", SHT_C6000_ATTRIBUTES, - display_tic6x_attribute, NULL); -} - -static int -process_msp430x_specific (FILE * file) -{ - return process_attributes (file, "mspabi", SHT_MSP430_ATTRIBUTES, - display_msp430x_attribute, NULL); + return res; } /* DATA points to the contents of a MIPS GOT that starts at VMA PLTGOT. @@ -14066,6 +15553,8 @@ print_mips_ases (unsigned int mask) fputs ("\n\tDSP ASE", stdout); if (mask & AFL_ASE_DSPR2) fputs ("\n\tDSP R2 ASE", stdout); + if (mask & AFL_ASE_DSPR3) + fputs ("\n\tDSP R3 ASE", stdout); if (mask & AFL_ASE_EVA) fputs ("\n\tEnhanced VA Scheme", stdout); if (mask & AFL_ASE_MCU) @@ -14088,6 +15577,14 @@ print_mips_ases (unsigned int mask) fputs ("\n\tMICROMIPS ASE", stdout); if (mask & AFL_ASE_XPA) fputs ("\n\tXPA ASE", stdout); + if (mask & AFL_ASE_MIPS16E2) + fputs ("\n\tMIPS16e2 ASE", stdout); + if (mask & AFL_ASE_CRC) + fputs ("\n\tCRC ASE", stdout); + if (mask & AFL_ASE_GINV) + fputs ("\n\tGINV ASE", stdout); + if (mask & AFL_ASE_LOONGSON_MMI) + fputs ("\n\tLoongson MMI ASE", stdout); if (mask == 0) fprintf (stdout, "\n\t%s", _("None")); else if ((mask & ~AFL_ASE_MASK) != 0) @@ -14159,12 +15656,15 @@ print_mips_isa_ext (unsigned int isa_ext) case AFL_EXT_LOONGSON_2F: fputs ("ST Microelectronics Loongson 2F", stdout); break; + case AFL_EXT_INTERAPTIV_MR2: + fputs ("Imagination interAptiv MR2", stdout); + break; default: fprintf (stdout, "%s (%d)", _("Unknown"), isa_ext); } } -static int +static signed int get_mips_reg_size (int reg_size) { return (reg_size == AFL_REG_NONE) ? 0 @@ -14174,8 +15674,8 @@ get_mips_reg_size (int reg_size) : -1; } -static int -process_mips_specific (FILE * file) +static bfd_boolean +process_mips_specific (Filedata * filedata) { Elf_Internal_Dyn * entry; Elf_Internal_Shdr *sect = NULL; @@ -14192,11 +15692,13 @@ process_mips_specific (FILE * file) bfd_vma local_gotno = 0; bfd_vma gotsym = 0; bfd_vma symtabno = 0; + bfd_boolean res = TRUE; - process_attributes (file, NULL, SHT_GNU_ATTRIBUTES, NULL, - display_mips_gnu_attribute); + if (! process_attributes (filedata, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_mips_gnu_attribute)) + res = FALSE; - sect = find_section (".MIPS.abiflags"); + sect = find_section (filedata, ".MIPS.abiflags"); if (sect != NULL) { @@ -14204,10 +15706,13 @@ process_mips_specific (FILE * file) Elf_Internal_ABIFlags_v0 abiflags_in; if (sizeof (Elf_External_ABIFlags_v0) != sect->sh_size) - fputs ("\nCorrupt ABI Flags section.\n", stdout); + { + error (_("Corrupt MIPS ABI Flags section.\n")); + res = FALSE; + } else { - abiflags_ext = get_data (NULL, file, sect->sh_offset, 1, + abiflags_ext = get_data (NULL, filedata, sect->sh_offset, 1, sect->sh_size, _("MIPS ABI Flags section")); if (abiflags_ext) { @@ -14249,10 +15754,95 @@ process_mips_specific (FILE * file) /* We have a lot of special sections. Thanks SGI! */ if (dynamic_section == NULL) - /* No information available. */ - return 0; + { + /* No dynamic information available. See if there is static GOT. */ + sect = find_section (filedata, ".got"); + if (sect != NULL) + { + unsigned char *data_end; + unsigned char *data; + bfd_vma ent, end; + int addr_size; + + pltgot = sect->sh_addr; + + ent = pltgot; + addr_size = (is_32bit_elf ? 4 : 8); + end = pltgot + sect->sh_size; + + data = (unsigned char *) get_data (NULL, filedata, sect->sh_offset, + end - pltgot, 1, + _("Global Offset Table data")); + /* PR 12855: Null data is handled gracefully throughout. */ + data_end = data + (end - pltgot); + + printf (_("\nStatic GOT:\n")); + printf (_(" Canonical gp value: ")); + print_vma (ent + 0x7ff0, LONG_HEX); + printf ("\n\n"); + + /* In a dynamic binary GOT[0] is reserved for the dynamic + loader to store the lazy resolver pointer, however in + a static binary it may well have been omitted and GOT + reduced to a table of addresses. + PR 21344: Check for the entry being fully available + before fetching it. */ + if (data + && data + ent - pltgot + addr_size <= data_end + && byte_get (data + ent - pltgot, addr_size) == 0) + { + printf (_(" Reserved entries:\n")); + printf (_(" %*s %10s %*s\n"), + addr_size * 2, _("Address"), _("Access"), + addr_size * 2, _("Value")); + ent = print_mips_got_entry (data, pltgot, ent, data_end); + printf ("\n"); + if (ent == (bfd_vma) -1) + goto sgot_print_fail; + + /* Check for the MSB of GOT[1] being set, identifying a + GNU object. This entry will be used by some runtime + loaders, to store the module pointer. Otherwise this + is an ordinary local entry. + PR 21344: Check for the entry being fully available + before fetching it. */ + if (data + && data + ent - pltgot + addr_size <= data_end + && (byte_get (data + ent - pltgot, addr_size) + >> (addr_size * 8 - 1)) != 0) + { + ent = print_mips_got_entry (data, pltgot, ent, data_end); + printf ("\n"); + if (ent == (bfd_vma) -1) + goto sgot_print_fail; + } + printf ("\n"); + } - for (entry = dynamic_section; + if (data != NULL && ent < end) + { + printf (_(" Local entries:\n")); + printf (" %*s %10s %*s\n", + addr_size * 2, _("Address"), _("Access"), + addr_size * 2, _("Value")); + while (ent < end) + { + ent = print_mips_got_entry (data, pltgot, ent, data_end); + printf ("\n"); + if (ent == (bfd_vma) -1) + goto sgot_print_fail; + } + printf ("\n"); + } + + sgot_print_fail: + if (data) + free (data); + } + return res; + } + + for (entry = dynamic_section; /* PR 17531 file: 012-50589-0.004. */ entry < dynamic_section + dynamic_nent && entry->d_tag != DT_NULL; ++entry) @@ -14260,18 +15850,18 @@ process_mips_specific (FILE * file) { case DT_MIPS_LIBLIST: liblist_offset - = offset_from_vma (file, entry->d_un.d_val, + = offset_from_vma (filedata, entry->d_un.d_val, liblistno * sizeof (Elf32_External_Lib)); break; case DT_MIPS_LIBLISTNO: liblistno = entry->d_un.d_val; break; case DT_MIPS_OPTIONS: - options_offset = offset_from_vma (file, entry->d_un.d_val, 0); + options_offset = offset_from_vma (filedata, entry->d_un.d_val, 0); break; case DT_MIPS_CONFLICT: conflicts_offset - = offset_from_vma (file, entry->d_un.d_val, + = offset_from_vma (filedata, entry->d_un.d_val, conflictsno * sizeof (Elf32_External_Conflict)); break; case DT_MIPS_CONFLICTNO: @@ -14310,13 +15900,15 @@ process_mips_specific (FILE * file) Elf32_External_Lib * elib; size_t cnt; - elib = (Elf32_External_Lib *) get_data (NULL, file, liblist_offset, + elib = (Elf32_External_Lib *) get_data (NULL, filedata, liblist_offset, liblistno, sizeof (Elf32_External_Lib), _("liblist section data")); if (elib) { - printf (_("\nSection '.liblist' contains %lu entries:\n"), + printf (ngettext ("\nSection '.liblist' contains %lu entry:\n", + "\nSection '.liblist' contains %lu entries:\n", + (unsigned long) liblistno), (unsigned long) liblistno); fputs (_(" Library Time Stamp Checksum Version Flags\n"), stdout); @@ -14325,7 +15917,7 @@ process_mips_specific (FILE * file) { Elf32_Lib liblist; time_t atime; - char timebuf[20]; + char timebuf[128]; struct tm * tmp; liblist.l_name = BYTE_GET (elib[cnt].l_name); @@ -14384,6 +15976,8 @@ process_mips_specific (FILE * file) free (elib); } + else + res = FALSE; } if (options_offset != 0) @@ -14393,18 +15987,18 @@ process_mips_specific (FILE * file) Elf_Internal_Options * option; size_t offset; int cnt; - sect = section_headers; + sect = filedata->section_headers; /* Find the section header so that we get the size. */ - sect = find_section_by_type (SHT_MIPS_OPTIONS); + sect = find_section_by_type (filedata, SHT_MIPS_OPTIONS); /* PR 17533 file: 012-277276-0.004. */ if (sect == NULL) { error (_("No MIPS_OPTIONS header found\n")); - return 0; + return FALSE; } - eopt = (Elf_External_Options *) get_data (NULL, file, options_offset, 1, + eopt = (Elf_External_Options *) get_data (NULL, filedata, options_offset, 1, sect->sh_size, _("options")); if (eopt) { @@ -14412,8 +16006,8 @@ process_mips_specific (FILE * file) cmalloc ((sect->sh_size / sizeof (eopt)), sizeof (* iopt)); if (iopt == NULL) { - error (_("Out of memory allocatinf space for MIPS options\n")); - return 0; + error (_("Out of memory allocating space for MIPS options\n")); + return FALSE; } offset = cnt = 0; @@ -14435,7 +16029,7 @@ process_mips_specific (FILE * file) || offset + option->size > sect->sh_size) { error (_("Invalid size (%u) for MIPS option\n"), option->size); - return 0; + return FALSE; } offset += option->size; @@ -14443,8 +16037,10 @@ process_mips_specific (FILE * file) ++cnt; } - printf (_("\nSection '%s' contains %d entries:\n"), - printable_section_name (sect), cnt); + printf (ngettext ("\nSection '%s' contains %d entry:\n", + "\nSection '%s' contains %d entries:\n", + cnt), + printable_section_name (filedata, sect), cnt); option = iopt; offset = 0; @@ -14461,7 +16057,7 @@ process_mips_specific (FILE * file) break; case ODK_REGINFO: printf (" REGINFO "); - if (elf_header.e_machine == EM_MIPS) + if (filedata->file_header.e_machine == EM_MIPS) { /* 32bit form. */ Elf32_External_RegInfo * ereg; @@ -14601,6 +16197,8 @@ process_mips_specific (FILE * file) free (eopt); } + else + res = FALSE; } if (conflicts_offset != 0 && conflictsno != 0) @@ -14611,14 +16209,23 @@ process_mips_specific (FILE * file) if (dynamic_symbols == NULL) { error (_("conflict list found without a dynamic symbol table\n")); - return 0; + return FALSE; + } + + /* PR 21345 - print a slightly more helpful error message + if we are sure that the cmalloc will fail. */ + if (conflictsno * sizeof (* iconf) > filedata->file_size) + { + error (_("Overlarge number of conflicts detected: %lx\n"), + (long) conflictsno); + return FALSE; } iconf = (Elf32_Conflict *) cmalloc (conflictsno, sizeof (* iconf)); if (iconf == NULL) { error (_("Out of memory allocating space for dynamic conflicts\n")); - return 0; + return FALSE; } if (is_32bit_elf) @@ -14626,10 +16233,10 @@ process_mips_specific (FILE * file) Elf32_External_Conflict * econf32; econf32 = (Elf32_External_Conflict *) - get_data (NULL, file, conflicts_offset, conflictsno, + get_data (NULL, filedata, conflicts_offset, conflictsno, sizeof (* econf32), _("conflict")); if (!econf32) - return 0; + return FALSE; for (cnt = 0; cnt < conflictsno; ++cnt) iconf[cnt] = BYTE_GET (econf32[cnt]); @@ -14641,10 +16248,10 @@ process_mips_specific (FILE * file) Elf64_External_Conflict * econf64; econf64 = (Elf64_External_Conflict *) - get_data (NULL, file, conflicts_offset, conflictsno, + get_data (NULL, filedata, conflicts_offset, conflictsno, sizeof (* econf64), _("conflict")); if (!econf64) - return 0; + return FALSE; for (cnt = 0; cnt < conflictsno; ++cnt) iconf[cnt] = BYTE_GET (econf64[cnt]); @@ -14652,7 +16259,9 @@ process_mips_specific (FILE * file) free (econf64); } - printf (_("\nSection '.conflict' contains %lu entries:\n"), + printf (ngettext ("\nSection '.conflict' contains %lu entry:\n", + "\nSection '.conflict' contains %lu entries:\n", + (unsigned long) conflictsno), (unsigned long) conflictsno); puts (_(" Num: Index Value Name")); @@ -14697,7 +16306,7 @@ process_mips_specific (FILE * file) { error (_("The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n"), (unsigned long) gotsym, (unsigned long) symtabno); - return 0; + return FALSE; } global_end = local_end + (symtabno - gotsym) * addr_size; @@ -14705,15 +16314,14 @@ process_mips_specific (FILE * file) if (global_end < local_end) { error (_("Too many GOT symbols: %lu\n"), (unsigned long) symtabno); - return 0; + return FALSE; } - offset = offset_from_vma (file, pltgot, global_end - pltgot); - data = (unsigned char *) get_data (NULL, file, offset, + offset = offset_from_vma (filedata, pltgot, global_end - pltgot); + data = (unsigned char *) get_data (NULL, filedata, offset, global_end - pltgot, 1, _("Global Offset Table data")); - if (data == NULL) - return 0; + /* PR 12855: Null data is handled gracefully throughout. */ data_end = data + (global_end - pltgot); printf (_("\nPrimary GOT:\n")); @@ -14729,7 +16337,14 @@ process_mips_specific (FILE * file) printf (_(" Lazy resolver\n")); if (ent == (bfd_vma) -1) goto got_print_fail; + + /* Check for the MSB of GOT[1] being set, denoting a GNU object. + This entry will be used by some runtime loaders, to store the + module pointer. Otherwise this is an ordinary local entry. + PR 21344: Check for the entry being fully available before + fetching it. */ if (data + && data + ent - pltgot + addr_size <= data_end && (byte_get (data + ent - pltgot, addr_size) >> (addr_size * 8 - 1)) != 0) { @@ -14740,7 +16355,7 @@ process_mips_specific (FILE * file) } printf ("\n"); - if (ent < local_end) + if (data != NULL && ent < local_end) { printf (_(" Local entries:\n")); printf (" %*s %10s %*s\n", @@ -14756,7 +16371,7 @@ process_mips_specific (FILE * file) printf ("\n"); } - if (gotsym < symtabno) + if (data != NULL && gotsym < symtabno) { int sym_width; @@ -14785,8 +16400,8 @@ process_mips_specific (FILE * file) print_vma (psym->st_value, LONG_HEX); printf (" %-7s %3s ", - get_symbol_type (ELF_ST_TYPE (psym->st_info)), - get_symbol_index_type (psym->st_shndx)); + get_symbol_type (filedata, ELF_ST_TYPE (psym->st_info)), + get_symbol_index_type (filedata, psym->st_shndx)); if (VALID_DYNAMIC_NAME (psym->st_name)) print_symbol (sym_width, GET_DYNAMIC_NAME (psym->st_name)); @@ -14818,27 +16433,27 @@ process_mips_specific (FILE * file) int addr_size, sym_width; Elf_Internal_Rela * rels; - rel_offset = offset_from_vma (file, jmprel, pltrelsz); + rel_offset = offset_from_vma (filedata, jmprel, pltrelsz); if (pltrel == DT_RELA) { - if (!slurp_rela_relocs (file, rel_offset, pltrelsz, &rels, &count)) - return 0; + if (!slurp_rela_relocs (filedata, rel_offset, pltrelsz, &rels, &count)) + return FALSE; } else { - if (!slurp_rel_relocs (file, rel_offset, pltrelsz, &rels, &count)) - return 0; + if (!slurp_rel_relocs (filedata, rel_offset, pltrelsz, &rels, &count)) + return FALSE; } ent = mips_pltgot; addr_size = (is_32bit_elf ? 4 : 8); end = mips_pltgot + (2 + count) * addr_size; - offset = offset_from_vma (file, mips_pltgot, end - mips_pltgot); - data = (unsigned char *) get_data (NULL, file, offset, end - mips_pltgot, + offset = offset_from_vma (filedata, mips_pltgot, end - mips_pltgot); + data = (unsigned char *) get_data (NULL, filedata, offset, end - mips_pltgot, 1, _("Procedure Linkage Table data")); if (data == NULL) - return 0; + return FALSE; printf ("\nPLT GOT:\n\n"); printf (_(" Reserved entries:\n")); @@ -14871,8 +16486,8 @@ process_mips_specific (FILE * file) print_vma (psym->st_value, LONG_HEX); printf (" %-7s %3s ", - get_symbol_type (ELF_ST_TYPE (psym->st_info)), - get_symbol_index_type (psym->st_shndx)); + get_symbol_type (filedata, ELF_ST_TYPE (psym->st_info)), + get_symbol_index_type (filedata, psym->st_shndx)); if (VALID_DYNAMIC_NAME (psym->st_name)) print_symbol (sym_width, GET_DYNAMIC_NAME (psym->st_name)); else @@ -14887,23 +16502,26 @@ process_mips_specific (FILE * file) free (rels); } - return 1; + return res; } -static int -process_nds32_specific (FILE * file) +static bfd_boolean +process_nds32_specific (Filedata * filedata) { Elf_Internal_Shdr *sect = NULL; - sect = find_section (".nds32_e_flags"); + sect = find_section (filedata, ".nds32_e_flags"); if (sect != NULL) { unsigned int *flag; printf ("\nNDS32 elf flags section:\n"); - flag = get_data (NULL, file, sect->sh_offset, 1, + flag = get_data (NULL, filedata, sect->sh_offset, 1, sect->sh_size, _("NDS32 elf flags section")); + if (! flag) + return FALSE; + switch ((*flag) & 0x3) { case 0: @@ -14924,8 +16542,8 @@ process_nds32_specific (FILE * file) return TRUE; } -static int -process_gnu_liblist (FILE * file) +static bfd_boolean +process_gnu_liblist (Filedata * filedata) { Elf_Internal_Shdr * section; Elf_Internal_Shdr * string_sec; @@ -14933,30 +16551,35 @@ process_gnu_liblist (FILE * file) char * strtab; size_t strtab_size; size_t cnt; + unsigned long num_liblist; unsigned i; + bfd_boolean res = TRUE; if (! do_arch) - return 0; + return TRUE; - for (i = 0, section = section_headers; - i < elf_header.e_shnum; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum; i++, section++) { switch (section->sh_type) { case SHT_GNU_LIBLIST: - if (section->sh_link >= elf_header.e_shnum) + if (section->sh_link >= filedata->file_header.e_shnum) break; elib = (Elf32_External_Lib *) - get_data (NULL, file, section->sh_offset, 1, section->sh_size, + get_data (NULL, filedata, section->sh_offset, 1, section->sh_size, _("liblist section data")); if (elib == NULL) - break; - string_sec = section_headers + section->sh_link; + { + res = FALSE; + break; + } - strtab = (char *) get_data (NULL, file, string_sec->sh_offset, 1, + string_sec = filedata->section_headers + section->sh_link; + strtab = (char *) get_data (NULL, filedata, string_sec->sh_offset, 1, string_sec->sh_size, _("liblist string table")); if (strtab == NULL @@ -14964,13 +16587,17 @@ process_gnu_liblist (FILE * file) { free (elib); free (strtab); + res = FALSE; break; } strtab_size = string_sec->sh_size; - printf (_("\nLibrary list section '%s' contains %lu entries:\n"), - printable_section_name (section), - (unsigned long) (section->sh_size / sizeof (Elf32_External_Lib))); + num_liblist = section->sh_size / sizeof (Elf32_External_Lib); + printf (ngettext ("\nLibrary list section '%s' contains %lu entries:\n", + "\nLibrary list section '%s' contains %lu entries:\n", + num_liblist), + printable_section_name (filedata, section), + num_liblist); puts (_(" Library Time Stamp Checksum Version Flags")); @@ -14979,7 +16606,7 @@ process_gnu_liblist (FILE * file) { Elf32_Lib liblist; time_t atime; - char timebuf[20]; + char timebuf[128]; struct tm * tmp; liblist.l_name = BYTE_GET (elib[cnt].l_name); @@ -15010,15 +16637,15 @@ process_gnu_liblist (FILE * file) } } - return 1; + return res; } static const char * -get_note_type (unsigned e_type) +get_note_type (Filedata * filedata, unsigned e_type) { static char buff[64]; - if (elf_header.e_type == ET_CORE) + if (filedata->file_header.e_type == ET_CORE) switch (e_type) { case NT_AUXV: @@ -15037,6 +16664,32 @@ get_note_type (unsigned e_type) return _("NT_PPC_VMX (ppc Altivec registers)"); case NT_PPC_VSX: return _("NT_PPC_VSX (ppc VSX registers)"); + case NT_PPC_TAR: + return _("NT_PPC_TAR (ppc TAR register)"); + case NT_PPC_PPR: + return _("NT_PPC_PPR (ppc PPR register)"); + case NT_PPC_DSCR: + return _("NT_PPC_DSCR (ppc DSCR register)"); + case NT_PPC_EBB: + return _("NT_PPC_EBB (ppc EBB registers)"); + case NT_PPC_PMU: + return _("NT_PPC_PMU (ppc PMU registers)"); + case NT_PPC_TM_CGPR: + return _("NT_PPC_TM_CGPR (ppc checkpointed GPR registers)"); + case NT_PPC_TM_CFPR: + return _("NT_PPC_TM_CFPR (ppc checkpointed floating point registers)"); + case NT_PPC_TM_CVMX: + return _("NT_PPC_TM_CVMX (ppc checkpointed Altivec registers)"); + case NT_PPC_TM_CVSX: + return _("NT_PPC_TM_CVSX (ppc checkpointed VSX registers)"); + case NT_PPC_TM_SPR: + return _("NT_PPC_TM_SPR (ppc TM special purpose registers)"); + case NT_PPC_TM_CTAR: + return _("NT_PPC_TM_CTAR (ppc checkpointed TAR register)"); + case NT_PPC_TM_CPPR: + return _("NT_PPC_TM_CPPR (ppc checkpointed PPR register)"); + case NT_PPC_TM_CDSCR: + return _("NT_PPC_TM_CDSCR (ppc checkpointed DSCR register)"); case NT_386_TLS: return _("NT_386_TLS (x86 TLS information)"); case NT_386_IOPERM: @@ -15065,6 +16718,10 @@ get_note_type (unsigned e_type) return _("NT_S390_VXRS_LOW (s390 vector registers 0-15 upper half)"); case NT_S390_VXRS_HIGH: return _("NT_S390_VXRS_HIGH (s390 vector registers 16-31)"); + case NT_S390_GS_CB: + return _("NT_S390_GS_CB (s390 guarded-storage registers)"); + case NT_S390_GS_BC: + return _("NT_S390_GS_BC (s390 guarded-storage broadcast control)"); case NT_ARM_VFP: return _("NT_ARM_VFP (arm VFP registers)"); case NT_ARM_TLS: @@ -15099,6 +16756,10 @@ get_note_type (unsigned e_type) return _("NT_VERSION (version)"); case NT_ARCH: return _("NT_ARCH (architecture)"); + case NT_GNU_BUILD_ATTRIBUTE_OPEN: + return _("OPEN"); + case NT_GNU_BUILD_ATTRIBUTE_FUNC: + return _("func"); default: break; } @@ -15107,7 +16768,7 @@ get_note_type (unsigned e_type) return buff; } -static int +static bfd_boolean print_core_note (Elf_Internal_Note *pnote) { unsigned int addr_size = is_32bit_elf ? 4 : 8; @@ -15115,21 +16776,25 @@ print_core_note (Elf_Internal_Note *pnote) unsigned char *descdata, *filenames, *descend; if (pnote->type != NT_FILE) - return 1; + { + if (do_wide) + printf ("\n"); + return TRUE; + } #ifndef BFD64 if (!is_32bit_elf) { printf (_(" Cannot decode 64-bit note in 32-bit build\n")); /* Still "successful". */ - return 1; + return TRUE; } #endif if (pnote->descsz < 2 * addr_size) { - printf (_(" Malformed note - too short for header\n")); - return 0; + error (_(" Malformed note - too short for header\n")); + return FALSE; } descdata = (unsigned char *) pnote->descdata; @@ -15137,8 +16802,8 @@ print_core_note (Elf_Internal_Note *pnote) if (descdata[pnote->descsz - 1] != '\0') { - printf (_(" Malformed note - does not end with \\0\n")); - return 0; + error (_(" Malformed note - does not end with \\0\n")); + return FALSE; } count = byte_get (descdata, addr_size); @@ -15147,10 +16812,11 @@ print_core_note (Elf_Internal_Note *pnote) page_size = byte_get (descdata, addr_size); descdata += addr_size; - if (pnote->descsz < 2 * addr_size + count * 3 * addr_size) + if (count > ((bfd_vma) -1 - 2 * addr_size) / (3 * addr_size) + || pnote->descsz < 2 * addr_size + count * 3 * addr_size) { - printf (_(" Malformed note - too short for supplied file count\n")); - return 0; + error (_(" Malformed note - too short for supplied file count\n")); + return FALSE; } printf (_(" Page size: ")); @@ -15168,8 +16834,8 @@ print_core_note (Elf_Internal_Note *pnote) if (filenames == descend) { - printf (_(" Malformed note - filenames end too early\n")); - return 0; + error (_(" Malformed note - filenames end too early\n")); + return FALSE; } start = byte_get (descdata, addr_size); @@ -15190,14 +16856,13 @@ print_core_note (Elf_Internal_Note *pnote) filenames += 1 + strlen ((char *) filenames); } - return 1; + return TRUE; } static const char * get_gnu_elf_note_type (unsigned e_type) { - static char buff[64]; - + /* NB/ Keep this switch statement in sync with print_gnu_note (). */ switch (e_type) { case NT_GNU_ABI_TAG: @@ -15208,17 +16873,225 @@ get_gnu_elf_note_type (unsigned e_type) return _("NT_GNU_BUILD_ID (unique build ID bitstring)"); case NT_GNU_GOLD_VERSION: return _("NT_GNU_GOLD_VERSION (gold version)"); + case NT_GNU_PROPERTY_TYPE_0: + return _("NT_GNU_PROPERTY_TYPE_0"); + case NT_GNU_BUILD_ATTRIBUTE_OPEN: + return _("NT_GNU_BUILD_ATTRIBUTE_OPEN"); + case NT_GNU_BUILD_ATTRIBUTE_FUNC: + return _("NT_GNU_BUILD_ATTRIBUTE_FUNC"); default: - break; + { + static char buff[64]; + + snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type); + return buff; + } } +} - snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type); - return buff; +static void +decode_x86_isa (unsigned int bitmask) +{ + while (bitmask) + { + unsigned int bit = bitmask & (- bitmask); + + bitmask &= ~ bit; + switch (bit) + { + case GNU_PROPERTY_X86_ISA_1_486: printf ("i486"); break; + case GNU_PROPERTY_X86_ISA_1_586: printf ("586"); break; + case GNU_PROPERTY_X86_ISA_1_686: printf ("686"); break; + case GNU_PROPERTY_X86_ISA_1_SSE: printf ("SSE"); break; + case GNU_PROPERTY_X86_ISA_1_SSE2: printf ("SSE2"); break; + case GNU_PROPERTY_X86_ISA_1_SSE3: printf ("SSE3"); break; + case GNU_PROPERTY_X86_ISA_1_SSSE3: printf ("SSSE3"); break; + case GNU_PROPERTY_X86_ISA_1_SSE4_1: printf ("SSE4_1"); break; + case GNU_PROPERTY_X86_ISA_1_SSE4_2: printf ("SSE4_2"); break; + case GNU_PROPERTY_X86_ISA_1_AVX: printf ("AVX"); break; + case GNU_PROPERTY_X86_ISA_1_AVX2: printf ("AVX2"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512F: printf ("AVX512F"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512CD: printf ("AVX512CD"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512ER: printf ("AVX512ER"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512PF: printf ("AVX512PF"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512VL: printf ("AVX512VL"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512DQ: printf ("AVX512DQ"); break; + case GNU_PROPERTY_X86_ISA_1_AVX512BW: printf ("AVX512BW"); break; + default: printf (_(""), bit); break; + } + if (bitmask) + printf (", "); + } } -static int -print_gnu_note (Elf_Internal_Note *pnote) +static void +decode_x86_feature (unsigned int type, unsigned int bitmask) { + while (bitmask) + { + unsigned int bit = bitmask & (- bitmask); + + bitmask &= ~ bit; + switch (bit) + { + case GNU_PROPERTY_X86_FEATURE_1_IBT: + switch (type) + { + case GNU_PROPERTY_X86_FEATURE_1_AND: + printf ("IBT"); + break; + default: + /* This should never happen. */ + abort (); + } + break; + case GNU_PROPERTY_X86_FEATURE_1_SHSTK: + switch (type) + { + case GNU_PROPERTY_X86_FEATURE_1_AND: + printf ("SHSTK"); + break; + default: + /* This should never happen. */ + abort (); + } + break; + default: + printf (_(""), bit); + break; + } + if (bitmask) + printf (", "); + } +} + +static void +print_gnu_property_note (Filedata * filedata, Elf_Internal_Note * pnote) +{ + unsigned char * ptr = (unsigned char *) pnote->descdata; + unsigned char * ptr_end = ptr + pnote->descsz; + unsigned int size = is_32bit_elf ? 4 : 8; + + printf (_(" Properties: ")); + + if (pnote->descsz < 8 || (pnote->descsz % size) != 0) + { + printf (_("\n"), pnote->descsz); + return; + } + + while (ptr < ptr_end) + { + unsigned int j; + unsigned int type; + unsigned int datasz; + + if ((size_t) (ptr_end - ptr) < 8) + { + printf (_("\n"), pnote->descsz); + break; + } + + type = byte_get (ptr, 4); + datasz = byte_get (ptr + 4, 4); + + ptr += 8; + + if (datasz > (size_t) (ptr_end - ptr)) + { + printf (_("\n"), + type, datasz); + break; + } + + if (type >= GNU_PROPERTY_LOPROC && type <= GNU_PROPERTY_HIPROC) + { + if (filedata->file_header.e_machine == EM_X86_64 + || filedata->file_header.e_machine == EM_IAMCU + || filedata->file_header.e_machine == EM_386) + { + switch (type) + { + case GNU_PROPERTY_X86_ISA_1_USED: + printf ("x86 ISA used: "); + if (datasz != 4) + printf (_(" "), datasz); + else + decode_x86_isa (byte_get (ptr, 4)); + goto next; + + case GNU_PROPERTY_X86_ISA_1_NEEDED: + printf ("x86 ISA needed: "); + if (datasz != 4) + printf (_(" "), datasz); + else + decode_x86_isa (byte_get (ptr, 4)); + goto next; + + case GNU_PROPERTY_X86_FEATURE_1_AND: + printf ("x86 feature: "); + if (datasz != 4) + printf (_(" "), datasz); + else + decode_x86_feature (type, byte_get (ptr, 4)); + goto next; + + default: + break; + } + } + } + else + { + switch (type) + { + case GNU_PROPERTY_STACK_SIZE: + printf (_("stack size: ")); + if (datasz != size) + printf (_(" "), datasz); + else + printf ("%#lx", (unsigned long) byte_get (ptr, size)); + goto next; + + case GNU_PROPERTY_NO_COPY_ON_PROTECTED: + printf ("no copy on protected "); + if (datasz) + printf (_(" "), datasz); + goto next; + + default: + break; + } + } + + if (type < GNU_PROPERTY_LOPROC) + printf (_(""); + +next: + ptr += ((datasz + (size - 1)) & ~ (size - 1)); + if (ptr == ptr_end) + break; + + if (do_wide) + printf (", "); + else + printf ("\n\t"); + } + + printf ("\n"); +} + +static bfd_boolean +print_gnu_note (Filedata * filedata, Elf_Internal_Note *pnote) +{ + /* NB/ Keep this switch statement in sync with get_gnu_elf_note_type (). */ switch (pnote->type) { case NT_GNU_BUILD_ID: @@ -15292,9 +17165,49 @@ print_gnu_note (Elf_Internal_Note *pnote) printf ("\n"); } break; + + case NT_GNU_HWCAP: + { + unsigned long num_entries, mask; + + /* Hardware capabilities information. Word 0 is the number of entries. + Word 1 is a bitmask of enabled entries. The rest of the descriptor + is a series of entries, where each entry is a single byte followed + by a nul terminated string. The byte gives the bit number to test + if enabled in the bitmask. */ + printf (_(" Hardware Capabilities: ")); + if (pnote->descsz < 8) + { + error (_("\n")); + return FALSE; + } + num_entries = byte_get ((unsigned char *) pnote->descdata, 4); + mask = byte_get ((unsigned char *) pnote->descdata + 4, 4); + printf (_("num entries: %ld, enabled mask: %lx\n"), num_entries, mask); + /* FIXME: Add code to display the entries... */ + } + break; + + case NT_GNU_PROPERTY_TYPE_0: + print_gnu_property_note (filedata, pnote); + break; + + default: + /* Handle unrecognised types. An error message should have already been + created by get_gnu_elf_note_type(), so all that we need to do is to + display the data. */ + { + unsigned long i; + + printf (_(" Description data: ")); + for (i = 0; i < pnote->descsz; ++i) + printf ("%02x ", pnote->descdata[i] & 0xff); + printf ("\n"); + } + break; } - return 1; + return TRUE; } static const char * @@ -15316,19 +17229,20 @@ get_v850_elf_note_type (enum v850_notes n_type) } } -static int +static bfd_boolean print_v850_note (Elf_Internal_Note * pnote) { unsigned int val; if (pnote->descsz != 4) - return 0; + return FALSE; + val = byte_get ((unsigned char *) pnote->descdata, pnote->descsz); if (val == 0) { printf (_("not set\n")); - return 1; + return TRUE; } switch (pnote->type) @@ -15336,24 +17250,24 @@ print_v850_note (Elf_Internal_Note * pnote) case V850_NOTE_ALIGNMENT: switch (val) { - case EF_RH850_DATA_ALIGN4: printf (_("4-byte\n")); return 1; - case EF_RH850_DATA_ALIGN8: printf (_("8-byte\n")); return 1; + case EF_RH850_DATA_ALIGN4: printf (_("4-byte\n")); return TRUE; + case EF_RH850_DATA_ALIGN8: printf (_("8-byte\n")); return TRUE; } break; case V850_NOTE_DATA_SIZE: switch (val) { - case EF_RH850_DOUBLE32: printf (_("4-bytes\n")); return 1; - case EF_RH850_DOUBLE64: printf (_("8-bytes\n")); return 1; + case EF_RH850_DOUBLE32: printf (_("4-bytes\n")); return TRUE; + case EF_RH850_DOUBLE64: printf (_("8-bytes\n")); return TRUE; } break; case V850_NOTE_FPU_INFO: switch (val) { - case EF_RH850_FPU20: printf (_("FPU-2.0\n")); return 1; - case EF_RH850_FPU30: printf (_("FPU-3.0\n")); return 1; + case EF_RH850_FPU20: printf (_("FPU-2.0\n")); return TRUE; + case EF_RH850_FPU30: printf (_("FPU-3.0\n")); return TRUE; } break; @@ -15363,7 +17277,7 @@ print_v850_note (Elf_Internal_Note * pnote) if (val == EF_RH850_SIMD) { printf (_("yes\n")); - return 1; + return TRUE; } break; @@ -15373,10 +17287,10 @@ print_v850_note (Elf_Internal_Note * pnote) } printf (_("unknown value: %x\n"), val); - return 0; + return FALSE; } -static int +static bfd_boolean process_netbsd_elf_note (Elf_Internal_Note * pnote) { unsigned int version; @@ -15389,37 +17303,63 @@ process_netbsd_elf_note (Elf_Internal_Note * pnote) printf (" NetBSD\t\t0x%08lx\tIDENT %u (%u.%u%s%c)\n", pnote->descsz, version, version / 100000000, (version / 1000000) % 100, (version / 10000) % 100 > 26 ? "Z" : "", - 'A' + (version / 10000) % 26); + 'A' + (version / 10000) % 26); else printf (" NetBSD\t\t0x%08lx\tIDENT %u (%u.%u.%u)\n", pnote->descsz, version, version / 100000000, (version / 1000000) % 100, - (version / 100) % 100); - return 1; + (version / 100) % 100); + return TRUE; case NT_NETBSD_MARCH: printf (" NetBSD\t0x%08lx\tMARCH <%s>\n", pnote->descsz, pnote->descdata); - return 1; + return TRUE; default: - break; + printf (" NetBSD\t0x%08lx\tUnknown note type: (0x%08lx)\n", pnote->descsz, + pnote->type); + return FALSE; } +} - printf (" NetBSD\t0x%08lx\tUnknown note type: (0x%08lx)\n", pnote->descsz, - pnote->type); - return 1; +static const char * +get_freebsd_elfcore_note_type (Filedata * filedata, unsigned e_type) +{ + switch (e_type) + { + case NT_FREEBSD_THRMISC: + return _("NT_THRMISC (thrmisc structure)"); + case NT_FREEBSD_PROCSTAT_PROC: + return _("NT_PROCSTAT_PROC (proc data)"); + case NT_FREEBSD_PROCSTAT_FILES: + return _("NT_PROCSTAT_FILES (files data)"); + case NT_FREEBSD_PROCSTAT_VMMAP: + return _("NT_PROCSTAT_VMMAP (vmmap data)"); + case NT_FREEBSD_PROCSTAT_GROUPS: + return _("NT_PROCSTAT_GROUPS (groups data)"); + case NT_FREEBSD_PROCSTAT_UMASK: + return _("NT_PROCSTAT_UMASK (umask data)"); + case NT_FREEBSD_PROCSTAT_RLIMIT: + return _("NT_PROCSTAT_RLIMIT (rlimit data)"); + case NT_FREEBSD_PROCSTAT_OSREL: + return _("NT_PROCSTAT_OSREL (osreldate data)"); + case NT_FREEBSD_PROCSTAT_PSSTRINGS: + return _("NT_PROCSTAT_PSSTRINGS (ps_strings data)"); + case NT_FREEBSD_PROCSTAT_AUXV: + return _("NT_PROCSTAT_AUXV (auxv data)"); + case NT_FREEBSD_PTLWPINFO: + return _("NT_PTLWPINFO (ptrace_lwpinfo structure)"); + } + return get_note_type (filedata, e_type); } static const char * -get_netbsd_elfcore_note_type (unsigned e_type) +get_netbsd_elfcore_note_type (Filedata * filedata, unsigned e_type) { static char buff[64]; if (e_type == NT_NETBSDCORE_PROCINFO) - { - /* NetBSD core "procinfo" structure. */ - return _("NetBSD procinfo structure"); - } + return _("NetBSD procinfo structure"); /* As of Jan 2002 there are no other machine-independent notes defined for NetBSD core files. If the note type is less @@ -15432,7 +17372,7 @@ get_netbsd_elfcore_note_type (unsigned e_type) return buff; } - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { /* On the Alpha, SPARC (32-bit and 64-bit), PT_GETREGS == mach+0 and PT_GETFPREGS == mach+2. */ @@ -15490,7 +17430,7 @@ get_stapsdt_note_type (unsigned e_type) return buff; } -static int +static bfd_boolean print_stapsdt_note (Elf_Internal_Note *pnote) { int addr_size = is_32bit_elf ? 4 : 8; @@ -15568,7 +17508,7 @@ get_ia64_vms_note_type (unsigned e_type) } } -static int +static bfd_boolean print_ia64_vms_note (Elf_Internal_Note * pnote) { switch (pnote->type) @@ -15620,23 +17560,523 @@ print_ia64_vms_note (Elf_Internal_Note * pnote) (unsigned) byte_get ((unsigned char *)pnote->descdata + 24, 4)); printf (_(" Image id : %s\n"), pnote->descdata + 32); break; -#endif - case NT_VMS_IMGNAM: - printf (_(" Image name: %s\n"), pnote->descdata); +#endif + case NT_VMS_IMGNAM: + printf (_(" Image name: %s\n"), pnote->descdata); + break; + case NT_VMS_GSTNAM: + printf (_(" Global symbol table name: %s\n"), pnote->descdata); + break; + case NT_VMS_IMGID: + printf (_(" Image id: %s\n"), pnote->descdata); + break; + case NT_VMS_LINKID: + printf (_(" Linker id: %s\n"), pnote->descdata); + break; + default: + return FALSE; + } + return TRUE; +} + +/* Find the symbol associated with a build attribute that is attached + to address OFFSET. If PNAME is non-NULL then store the name of + the symbol (if found) in the provided pointer, Returns NULL if a + symbol could not be found. */ + +static Elf_Internal_Sym * +get_symbol_for_build_attribute (Filedata * filedata, + unsigned long offset, + bfd_boolean is_open_attr, + const char ** pname) +{ + static Filedata * saved_filedata = NULL; + static char * strtab; + static unsigned long strtablen; + static Elf_Internal_Sym * symtab; + static unsigned long nsyms; + Elf_Internal_Sym * saved_sym = NULL; + Elf_Internal_Sym * sym; + + if (filedata->section_headers != NULL + && (saved_filedata == NULL || filedata != saved_filedata)) + { + Elf_Internal_Shdr * symsec; + + /* Load the symbol and string sections. */ + for (symsec = filedata->section_headers; + symsec < filedata->section_headers + filedata->file_header.e_shnum; + symsec ++) + { + if (symsec->sh_type == SHT_SYMTAB) + { + symtab = GET_ELF_SYMBOLS (filedata, symsec, & nsyms); + + if (symsec->sh_link < filedata->file_header.e_shnum) + { + Elf_Internal_Shdr * strtab_sec = filedata->section_headers + symsec->sh_link; + + strtab = (char *) get_data (NULL, filedata, strtab_sec->sh_offset, + 1, strtab_sec->sh_size, + _("string table")); + strtablen = strtab != NULL ? strtab_sec->sh_size : 0; + } + } + } + saved_filedata = filedata; + } + + if (symtab == NULL || strtab == NULL) + return NULL; + + /* Find a symbol whose value matches offset. */ + for (sym = symtab; sym < symtab + nsyms; sym ++) + if (sym->st_value == offset) + { + if (sym->st_name >= strtablen) + /* Huh ? This should not happen. */ + continue; + + if (strtab[sym->st_name] == 0) + continue; + + /* The AArch64 and ARM architectures define mapping symbols + (eg $d, $x, $t) which we want to ignore. */ + if (strtab[sym->st_name] == '$' + && strtab[sym->st_name + 1] != 0 + && strtab[sym->st_name + 2] == 0) + continue; + + if (is_open_attr) + { + /* For OPEN attributes we prefer GLOBAL over LOCAL symbols + and FILE or OBJECT symbols over NOTYPE symbols. We skip + FUNC symbols entirely. */ + switch (ELF_ST_TYPE (sym->st_info)) + { + case STT_OBJECT: + case STT_FILE: + saved_sym = sym; + if (sym->st_size) + { + /* If the symbol has a size associated + with it then we can stop searching. */ + sym = symtab + nsyms; + } + continue; + + case STT_FUNC: + /* Ignore function symbols. */ + continue; + + default: + break; + } + + switch (ELF_ST_BIND (sym->st_info)) + { + case STB_GLOBAL: + if (saved_sym == NULL + || ELF_ST_TYPE (saved_sym->st_info) != STT_OBJECT) + saved_sym = sym; + break; + + case STB_LOCAL: + if (saved_sym == NULL) + saved_sym = sym; + break; + + default: + break; + } + } + else + { + if (ELF_ST_TYPE (sym->st_info) != STT_FUNC) + continue; + + saved_sym = sym; + break; + } + } + + if (saved_sym && pname) + * pname = strtab + saved_sym->st_name; + + return saved_sym; +} + +/* Returns true iff addr1 and addr2 are in the same section. */ + +static bfd_boolean +same_section (Filedata * filedata, unsigned long addr1, unsigned long addr2) +{ + Elf_Internal_Shdr * a1; + Elf_Internal_Shdr * a2; + + a1 = find_section_by_address (filedata, addr1); + a2 = find_section_by_address (filedata, addr2); + + return a1 == a2 && a1 != NULL; +} + +static bfd_boolean +print_gnu_build_attribute_description (Elf_Internal_Note * pnote, + Filedata * filedata) +{ + static unsigned long global_offset = 0; + static unsigned long global_end = 0; + static unsigned long func_offset = 0; + static unsigned long func_end = 0; + + Elf_Internal_Sym * sym; + const char * name; + unsigned long start; + unsigned long end; + bfd_boolean is_open_attr = pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN; + + switch (pnote->descsz) + { + case 0: + /* A zero-length description means that the range of + the previous note of the same type should be used. */ + if (is_open_attr) + { + if (global_end > global_offset) + printf (_(" Applies to region from %#lx to %#lx\n"), + global_offset, global_end); + else + printf (_(" Applies to region from %#lx\n"), global_offset); + } + else + { + if (func_end > func_offset) + printf (_(" Applies to region from %#lx to %#lx\n"), func_offset, func_end); + else + printf (_(" Applies to region from %#lx\n"), func_offset); + } + return TRUE; + + case 4: + start = byte_get ((unsigned char *) pnote->descdata, 4); + end = 0; + break; + + case 8: + if (is_32bit_elf) + { + /* FIXME: We should check that version 3+ notes are being used here... */ + start = byte_get ((unsigned char *) pnote->descdata, 4); + end = byte_get ((unsigned char *) pnote->descdata + 4, 4); + } + else + { + start = byte_get ((unsigned char *) pnote->descdata, 8); + end = 0; + } + break; + + case 16: + start = byte_get ((unsigned char *) pnote->descdata, 8); + end = byte_get ((unsigned char *) pnote->descdata + 8, 8); + break; + + default: + error (_(" \n"), pnote->descsz); + printf (_(" ")); + return FALSE; + } + + name = NULL; + sym = get_symbol_for_build_attribute (filedata, start, is_open_attr, & name); + /* As of version 5 of the annobin plugin, filename symbols are biased by 2 + in order to avoid them being confused with the start address of the + first function in the file... */ + if (sym == NULL && is_open_attr) + sym = get_symbol_for_build_attribute (filedata, start + 2, is_open_attr, + & name); + + if (end == 0 && sym != NULL && sym->st_size > 0) + end = start + sym->st_size; + + if (is_open_attr) + { + /* FIXME: Need to properly allow for section alignment. + 16 is just the alignment used on x86_64. */ + if (global_end > 0 + && start > BFD_ALIGN (global_end, 16) + /* Build notes are not guaranteed to be organised in order of + increasing address, but we should find the all of the notes + for one section in the same place. */ + && same_section (filedata, start, global_end)) + warn (_("Gap in build notes detected from %#lx to %#lx\n"), + global_end + 1, start - 1); + + printf (_(" Applies to region from %#lx"), start); + global_offset = start; + + if (end) + { + printf (_(" to %#lx"), end); + global_end = end; + } + } + else + { + printf (_(" Applies to region from %#lx"), start); + func_offset = start; + + if (end) + { + printf (_(" to %#lx"), end); + func_end = end; + } + } + + if (sym && name) + printf (_(" (%s)"), name); + + printf ("\n"); + return TRUE; +} + +static bfd_boolean +print_gnu_build_attribute_name (Elf_Internal_Note * pnote) +{ + static const char string_expected [2] = { GNU_BUILD_ATTRIBUTE_TYPE_STRING, 0 }; + static const char number_expected [2] = { GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC, 0 }; + static const char bool_expected [3] = { GNU_BUILD_ATTRIBUTE_TYPE_BOOL_TRUE, GNU_BUILD_ATTRIBUTE_TYPE_BOOL_FALSE, 0 }; + char name_type; + char name_attribute; + const char * expected_types; + const char * name = pnote->namedata; + const char * text; + signed int left; + + if (name == NULL || pnote->namesz < 2) + { + error (_("corrupt name field in GNU build attribute note: size = %ld\n"), pnote->namesz); + print_symbol (-20, _(" ")); + return FALSE; + } + + if (do_wide) + left = 28; + else + left = 20; + + /* Version 2 of the spec adds a "GA" prefix to the name field. */ + if (name[0] == 'G' && name[1] == 'A') + { + if (pnote->namesz < 4) + { + error (_("corrupt name field in GNU build attribute note: size = %ld\n"), pnote->namesz); + print_symbol (-20, _(" ")); + return FALSE; + } + + printf ("GA"); + name += 2; + left -= 2; + } + + switch ((name_type = * name)) + { + case GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC: + case GNU_BUILD_ATTRIBUTE_TYPE_STRING: + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_TRUE: + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_FALSE: + printf ("%c", * name); + left --; + break; + default: + error (_("unrecognised attribute type in name field: %d\n"), name_type); + print_symbol (-20, _("")); + return FALSE; + } + + ++ name; + text = NULL; + + switch ((name_attribute = * name)) + { + case GNU_BUILD_ATTRIBUTE_VERSION: + text = _(""); + expected_types = string_expected; + ++ name; + break; + case GNU_BUILD_ATTRIBUTE_STACK_PROT: + text = _(""); + expected_types = "!+*"; + ++ name; break; - case NT_VMS_GSTNAM: - printf (_(" Global symbol table name: %s\n"), pnote->descdata); + case GNU_BUILD_ATTRIBUTE_RELRO: + text = _(""); + expected_types = bool_expected; + ++ name; break; - case NT_VMS_IMGID: - printf (_(" Image id: %s\n"), pnote->descdata); + case GNU_BUILD_ATTRIBUTE_STACK_SIZE: + text = _(""); + expected_types = number_expected; + ++ name; break; - case NT_VMS_LINKID: - printf (_(" Linker id: %s\n"), pnote->descdata); + case GNU_BUILD_ATTRIBUTE_TOOL: + text = _(""); + expected_types = string_expected; + ++ name; + break; + case GNU_BUILD_ATTRIBUTE_ABI: + text = _(""); + expected_types = "$*"; + ++ name; + break; + case GNU_BUILD_ATTRIBUTE_PIC: + text = _(""); + expected_types = number_expected; + ++ name; + break; + case GNU_BUILD_ATTRIBUTE_SHORT_ENUM: + text = _(""); + expected_types = bool_expected; + ++ name; break; default: + if (ISPRINT (* name)) + { + int len = strnlen (name, pnote->namesz - (name - pnote->namedata)) + 1; + + if (len > left && ! do_wide) + len = left; + printf ("%.*s:", len, name); + left -= len; + name += len; + } + else + { + static char tmpbuf [128]; + + error (_("unrecognised byte in name field: %d\n"), * name); + sprintf (tmpbuf, _(""), * name); + text = tmpbuf; + name ++; + } + expected_types = "*$!+"; + break; + } + + if (text) + left -= printf ("%s", text); + + if (strchr (expected_types, name_type) == NULL) + warn (_("attribute does not have an expected type (%c)\n"), name_type); + + if ((unsigned long)(name - pnote->namedata) > pnote->namesz) + { + error (_("corrupt name field: namesz: %lu but parsing gets to %ld\n"), + (unsigned long) pnote->namesz, + (long) (name - pnote->namedata)); + return FALSE; + } + + if (left < 1 && ! do_wide) + return TRUE; + + switch (name_type) + { + case GNU_BUILD_ATTRIBUTE_TYPE_NUMERIC: + { + unsigned int bytes; + unsigned long long val = 0; + unsigned int shift = 0; + char * decoded = NULL; + + bytes = pnote->namesz - (name - pnote->namedata); + if (bytes > 0) + /* The -1 is because the name field is always 0 terminated, and we + want to be able to ensure that the shift in the while loop below + will not overflow. */ + -- bytes; + + if (bytes > sizeof (val)) + { + error (_("corrupt numeric name field: too many bytes in the value: %x\n"), + bytes); + bytes = sizeof (val); + } + /* We do not bother to warn if bytes == 0 as this can + happen with some early versions of the gcc plugin. */ + + while (bytes --) + { + unsigned long byte = (* name ++) & 0xff; + + val |= byte << shift; + shift += 8; + } + + switch (name_attribute) + { + case GNU_BUILD_ATTRIBUTE_PIC: + switch (val) + { + case 0: decoded = "static"; break; + case 1: decoded = "pic"; break; + case 2: decoded = "PIC"; break; + case 3: decoded = "pie"; break; + case 4: decoded = "PIE"; break; + default: break; + } + break; + case GNU_BUILD_ATTRIBUTE_STACK_PROT: + switch (val) + { + /* Based upon the SPCT_FLAG_xxx enum values in gcc/cfgexpand.c. */ + case 0: decoded = "off"; break; + case 1: decoded = "on"; break; + case 2: decoded = "all"; break; + case 3: decoded = "strong"; break; + case 4: decoded = "explicit"; break; + default: break; + } + break; + default: + break; + } + + if (decoded != NULL) + { + print_symbol (-left, decoded); + left = 0; + } + else if (val == 0) + { + printf ("0x0"); + left -= 3; + } + else + { + if (do_wide) + left -= printf ("0x%llx", val); + else + left -= printf ("0x%-.*llx", left, val); + } + } + break; + case GNU_BUILD_ATTRIBUTE_TYPE_STRING: + left -= print_symbol (- left, name); + break; + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_TRUE: + left -= print_symbol (- left, "true"); + break; + case GNU_BUILD_ATTRIBUTE_TYPE_BOOL_FALSE: + left -= print_symbol (- left, "false"); break; } - return 1; + + if (do_wide && left > 0) + printf ("%-*s", left, " "); + + return TRUE; } /* Note that by the ELF standard, the name field is already null byte @@ -15644,8 +18084,10 @@ print_ia64_vms_note (Elf_Internal_Note * pnote) I.E. the value of namesz for the name "FSF" is 4. If the value of namesz is zero, there is no name present. */ -static int -process_note (Elf_Internal_Note * pnote) + +static bfd_boolean +process_note (Elf_Internal_Note * pnote, + Filedata * filedata) { const char * name = pnote->namesz ? pnote->namedata : "(NONE)"; const char * nt; @@ -15653,15 +18095,19 @@ process_note (Elf_Internal_Note * pnote) if (pnote->namesz == 0) /* If there is no note name, then use the default set of note type strings. */ - nt = get_note_type (pnote->type); + nt = get_note_type (filedata, pnote->type); else if (const_strneq (pnote->namedata, "GNU")) /* GNU-specific object file notes. */ nt = get_gnu_elf_note_type (pnote->type); + else if (const_strneq (pnote->namedata, "FreeBSD")) + /* FreeBSD-specific core file notes. */ + nt = get_freebsd_elfcore_note_type (filedata, pnote->type); + else if (const_strneq (pnote->namedata, "NetBSD-CORE")) /* NetBSD-specific core file notes. */ - nt = get_netbsd_elfcore_note_type (pnote->type); + nt = get_netbsd_elfcore_note_type (filedata, pnote->type); else if (const_strneq (pnote->namedata, "NetBSD")) /* NetBSD-specific core file notes. */ @@ -15684,43 +18130,109 @@ process_note (Elf_Internal_Note * pnote) else /* Don't recognize this note name; just use the default set of note type strings. */ - nt = get_note_type (pnote->type); + nt = get_note_type (filedata, pnote->type); + + printf (" "); + + if (((const_strneq (pnote->namedata, "GA") + && strchr ("*$!+", pnote->namedata[2]) != NULL) + || strchr ("*$!+", pnote->namedata[0]) != NULL) + && (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN + || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC)) + print_gnu_build_attribute_name (pnote); + else + print_symbol (-20, name); - printf (" %-20s 0x%08lx\t%s\n", name, pnote->descsz, nt); + if (do_wide) + printf (" 0x%08lx\t%s\t", pnote->descsz, nt); + else + printf (" 0x%08lx\t%s\n", pnote->descsz, nt); if (const_strneq (pnote->namedata, "IPF/VMS")) return print_ia64_vms_note (pnote); else if (const_strneq (pnote->namedata, "GNU")) - return print_gnu_note (pnote); + return print_gnu_note (filedata, pnote); else if (const_strneq (pnote->namedata, "stapsdt")) return print_stapsdt_note (pnote); else if (const_strneq (pnote->namedata, "CORE")) return print_core_note (pnote); - else - return 1; -} + else if (((const_strneq (pnote->namedata, "GA") + && strchr ("*$!+", pnote->namedata[2]) != NULL) + || strchr ("*$!+", pnote->namedata[0]) != NULL) + && (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN + || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC)) + return print_gnu_build_attribute_description (pnote, filedata); + + if (pnote->descsz) + { + unsigned long i; + printf (_(" description data: ")); + for (i = 0; i < pnote->descsz; i++) + printf ("%02x ", pnote->descdata[i]); + if (!do_wide) + printf ("\n"); + } + + if (do_wide) + printf ("\n"); -static int -process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) + return TRUE; +} + +static bfd_boolean +process_notes_at (Filedata * filedata, + Elf_Internal_Shdr * section, + bfd_vma offset, + bfd_vma length, + bfd_vma align) { Elf_External_Note * pnotes; Elf_External_Note * external; - char * end; - int res = 1; + char * end; + bfd_boolean res = TRUE; if (length <= 0) - return 0; + return FALSE; + + if (section) + { + pnotes = (Elf_External_Note *) get_section_contents (section, filedata); + if (pnotes) + { + if (! apply_relocations (filedata, section, (unsigned char *) pnotes, length, NULL, NULL)) + return FALSE; + } + } + else + pnotes = (Elf_External_Note *) get_data (NULL, filedata, offset, 1, length, + _("notes")); - pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length, - _("notes")); if (pnotes == NULL) - return 0; + return FALSE; external = pnotes; - printf (_("\nDisplaying notes found at file offset 0x%08lx with length 0x%08lx:\n"), - (unsigned long) offset, (unsigned long) length); + if (section) + printf (_("\nDisplaying notes found in: %s\n"), printable_section_name (filedata, section)); + else + printf (_("\nDisplaying notes found at file offset 0x%08lx with length 0x%08lx:\n"), + (unsigned long) offset, (unsigned long) length); + + /* NB: Some note sections may have alignment value of 0 or 1. gABI + specifies that notes should be aligned to 4 bytes in 32-bit + objects and to 8 bytes in 64-bit objects. As a Linux extension, + we also support 4 byte alignment in 64-bit objects. If section + alignment is less than 4, we treate alignment as 4 bytes. */ + if (align < 4) + align = 4; + else if (align != 4 && align != 8) + { + warn (_("Corrupt note: alignment %ld, expecting 4 or 8\n"), + (long) align); + return FALSE; + } + printf (_(" %-20s %10s\tDescription\n"), _("Owner"), _("Data size")); end = (char *) pnotes + length; @@ -15728,36 +18240,36 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) { Elf_Internal_Note inote; size_t min_notesz; - char *next; + char * next; char * temp = NULL; size_t data_remaining = end - (char *) external; - if (!is_ia64_vms ()) + if (!is_ia64_vms (filedata)) { /* PR binutils/15191 Make sure that there is enough data to read. */ min_notesz = offsetof (Elf_External_Note, name); if (data_remaining < min_notesz) { - warn (_("Corrupt note: only %d bytes remain, not enough for a full note\n"), - (int) data_remaining); + warn (ngettext ("Corrupt note: only %ld byte remains, " + "not enough for a full note\n", + "Corrupt note: only %ld bytes remain, " + "not enough for a full note\n", + data_remaining), + (long) data_remaining); break; } + data_remaining -= min_notesz; + inote.type = BYTE_GET (external->type); inote.namesz = BYTE_GET (external->namesz); inote.namedata = external->name; inote.descsz = BYTE_GET (external->descsz); - inote.descdata = inote.namedata + align_power (inote.namesz, 2); - /* PR 17531: file: 3443835e. */ - if (inote.descdata < (char *) pnotes || inote.descdata > end) - { - warn (_("Corrupt note: name size is too big: %lx\n"), inote.namesz); - inote.descdata = inote.namedata; - inote.namesz = 0; - } - + inote.descdata = ((char *) external + + ELF_NOTE_DESC_OFFSET (inote.namesz, align)); inote.descpos = offset + (inote.descdata - (char *) pnotes); - next = inote.descdata + align_power (inote.descsz, 2); + next = ((char *) external + + ELF_NOTE_NEXT_OFFSET (inote.namesz, inote.descsz, align)); } else { @@ -15768,10 +18280,15 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) min_notesz = offsetof (Elf64_External_VMS_Note, name); if (data_remaining < min_notesz) { - warn (_("Corrupt note: only %d bytes remain, not enough for a full note\n"), - (int) data_remaining); + warn (ngettext ("Corrupt note: only %ld byte remains, " + "not enough for a full note\n", + "Corrupt note: only %ld bytes remain, " + "not enough for a full note\n", + data_remaining), + (long) data_remaining); break; } + data_remaining -= min_notesz; vms_external = (Elf64_External_VMS_Note *) external; inote.type = BYTE_GET (vms_external->type); @@ -15783,17 +18300,18 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) next = inote.descdata + align_power (inote.descsz, 3); } - if (inote.descdata < (char *) external + min_notesz - || next < (char *) external + min_notesz - /* PR binutils/17531: file: id:000000,sig:11,src:006986,op:havoc,rep:4. */ - || inote.namedata + inote.namesz < inote.namedata - || inote.descdata + inote.descsz < inote.descdata - || data_remaining < (size_t)(next - (char *) external)) + /* PR 17531: file: 3443835e. */ + /* PR 17531: file: id:000000,sig:11,src:006986,op:havoc,rep:4. */ + if ((size_t) (inote.descdata - inote.namedata) < inote.namesz + || (size_t) (inote.descdata - inote.namedata) > data_remaining + || (size_t) (next - inote.descdata) < inote.descsz + || ((size_t) (next - inote.descdata) + > data_remaining - (size_t) (inote.descdata - inote.namedata))) { warn (_("note with invalid namesz and/or descsz found at offset 0x%lx\n"), (unsigned long) ((char *) external - (char *) pnotes)); - warn (_(" type: 0x%lx, namesize: 0x%08lx, descsize: 0x%08lx\n"), - inote.type, inote.namesz, inote.descsz); + warn (_(" type: 0x%lx, namesize: 0x%08lx, descsize: 0x%08lx, alignment: %u\n"), + inote.type, inote.namesz, inote.descsz, (int) align); break; } @@ -15805,22 +18323,24 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) namesz. */ if (inote.namedata[inote.namesz - 1] != '\0') { - temp = (char *) malloc (inote.namesz + 1); - if (temp == NULL) + if ((size_t) (inote.descdata - inote.namedata) == inote.namesz) { - error (_("Out of memory allocating space for inote name\n")); - res = 0; - break; - } - - strncpy (temp, inote.namedata, inote.namesz); - temp[inote.namesz] = 0; + temp = (char *) malloc (inote.namesz + 1); + if (temp == NULL) + { + error (_("Out of memory allocating space for inote name\n")); + res = FALSE; + break; + } - /* warn (_("'%s' NOTE name not properly null terminated\n"), temp); */ - inote.namedata = temp; + memcpy (temp, inote.namedata, inote.namesz); + inote.namedata = temp; + } + inote.namedata[inote.namesz] = 0; } - res &= process_note (& inote); + if (! process_note (& inote, filedata)) + res = FALSE; if (temp != NULL) { @@ -15834,44 +18354,46 @@ process_corefile_note_segment (FILE * file, bfd_vma offset, bfd_vma length) return res; } -static int -process_corefile_note_segments (FILE * file) +static bfd_boolean +process_corefile_note_segments (Filedata * filedata) { Elf_Internal_Phdr * segment; unsigned int i; - int res = 1; + bfd_boolean res = TRUE; - if (! get_program_headers (file)) - return 0; + if (! get_program_headers (filedata)) + return TRUE; - for (i = 0, segment = program_headers; - i < elf_header.e_phnum; + for (i = 0, segment = filedata->program_headers; + i < filedata->file_header.e_phnum; i++, segment++) { if (segment->p_type == PT_NOTE) - res &= process_corefile_note_segment (file, - (bfd_vma) segment->p_offset, - (bfd_vma) segment->p_filesz); + if (! process_notes_at (filedata, NULL, + (bfd_vma) segment->p_offset, + (bfd_vma) segment->p_filesz, + (bfd_vma) segment->p_align)) + res = FALSE; } return res; } -static int -process_v850_notes (FILE * file, bfd_vma offset, bfd_vma length) +static bfd_boolean +process_v850_notes (Filedata * filedata, bfd_vma offset, bfd_vma length) { Elf_External_Note * pnotes; Elf_External_Note * external; char * end; - int res = 1; + bfd_boolean res = TRUE; if (length <= 0) - return 0; + return FALSE; - pnotes = (Elf_External_Note *) get_data (NULL, file, offset, 1, length, + pnotes = (Elf_External_Note *) get_data (NULL, filedata, offset, 1, length, _("v850 notes")); if (pnotes == NULL) - return 0; + return FALSE; external = pnotes; end = (char*) pnotes + length; @@ -15927,7 +18449,7 @@ process_v850_notes (FILE * file, bfd_vma offset, bfd_vma length) if (! print_v850_note (& inote)) { - res = 0; + res = FALSE; printf ("\n", inote.namesz, inote.descsz); } @@ -15938,115 +18460,160 @@ process_v850_notes (FILE * file, bfd_vma offset, bfd_vma length) return res; } -static int -process_note_sections (FILE * file) +static bfd_boolean +process_note_sections (Filedata * filedata) { Elf_Internal_Shdr * section; unsigned long i; - int n = 0; - int res = 1; + unsigned int n = 0; + bfd_boolean res = TRUE; - for (i = 0, section = section_headers; - i < elf_header.e_shnum && section != NULL; + for (i = 0, section = filedata->section_headers; + i < filedata->file_header.e_shnum && section != NULL; i++, section++) { if (section->sh_type == SHT_NOTE) { - res &= process_corefile_note_segment (file, - (bfd_vma) section->sh_offset, - (bfd_vma) section->sh_size); + if (! process_notes_at (filedata, section, + (bfd_vma) section->sh_offset, + (bfd_vma) section->sh_size, + (bfd_vma) section->sh_addralign)) + res = FALSE; n++; } - if (( elf_header.e_machine == EM_V800 - || elf_header.e_machine == EM_V850 - || elf_header.e_machine == EM_CYGNUS_V850) + if (( filedata->file_header.e_machine == EM_V800 + || filedata->file_header.e_machine == EM_V850 + || filedata->file_header.e_machine == EM_CYGNUS_V850) && section->sh_type == SHT_RENESAS_INFO) { - res &= process_v850_notes (file, - (bfd_vma) section->sh_offset, - (bfd_vma) section->sh_size); + if (! process_v850_notes (filedata, + (bfd_vma) section->sh_offset, + (bfd_vma) section->sh_size)) + res = FALSE; n++; } } if (n == 0) /* Try processing NOTE segments instead. */ - return process_corefile_note_segments (file); + return process_corefile_note_segments (filedata); return res; } -static int -process_notes (FILE * file) +static bfd_boolean +process_notes (Filedata * filedata) { /* If we have not been asked to display the notes then do nothing. */ if (! do_notes) - return 1; + return TRUE; - if (elf_header.e_type != ET_CORE) - return process_note_sections (file); + if (filedata->file_header.e_type != ET_CORE) + return process_note_sections (filedata); /* No program headers means no NOTE segment. */ - if (elf_header.e_phnum > 0) - return process_corefile_note_segments (file); + if (filedata->file_header.e_phnum > 0) + return process_corefile_note_segments (filedata); printf (_("No note segments present in the core file.\n")); - return 1; + return TRUE; +} + +static unsigned char * +display_public_gnu_attributes (unsigned char * start, + const unsigned char * const end) +{ + printf (_(" Unknown GNU attribute: %s\n"), start); + + start += strnlen ((char *) start, end - start); + display_raw_attribute (start, end); + + return (unsigned char *) end; +} + +static unsigned char * +display_generic_attribute (unsigned char * start, + unsigned int tag, + const unsigned char * const end) +{ + if (tag == 0) + return (unsigned char *) end; + + return display_tag_value (tag, start, end); } -static int -process_arch_specific (FILE * file) +static bfd_boolean +process_arch_specific (Filedata * filedata) { if (! do_arch) - return 1; + return TRUE; - switch (elf_header.e_machine) + switch (filedata->file_header.e_machine) { + case EM_ARC: + case EM_ARC_COMPACT: + case EM_ARC_COMPACT2: + return process_attributes (filedata, "ARC", SHT_ARC_ATTRIBUTES, + display_arc_attribute, + display_generic_attribute); case EM_ARM: - return process_arm_specific (file); + return process_attributes (filedata, "aeabi", SHT_ARM_ATTRIBUTES, + display_arm_attribute, + display_generic_attribute); + case EM_MIPS: case EM_MIPS_RS3_LE: - return process_mips_specific (file); - break; + return process_mips_specific (filedata); + + case EM_MSP430: + return process_attributes (filedata, "mspabi", SHT_MSP430_ATTRIBUTES, + display_msp430x_attribute, + display_generic_attribute); + case EM_NDS32: - return process_nds32_specific (file); - break; + return process_nds32_specific (filedata); + case EM_PPC: - return process_power_specific (file); - break; + case EM_PPC64: + return process_attributes (filedata, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_power_gnu_attribute); + case EM_S390: case EM_S390_OLD: - return process_s390_specific (file); - break; + return process_attributes (filedata, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_s390_gnu_attribute); + case EM_SPARC: case EM_SPARC32PLUS: case EM_SPARCV9: - return process_sparc_specific (file); - break; + return process_attributes (filedata, NULL, SHT_GNU_ATTRIBUTES, NULL, + display_sparc_gnu_attribute); + case EM_TI_C6000: - return process_tic6x_specific (file); - break; - case EM_MSP430: - return process_msp430x_specific (file); + return process_attributes (filedata, "c6xabi", SHT_C6000_ATTRIBUTES, + display_tic6x_attribute, + display_generic_attribute); + default: - break; + return process_attributes (filedata, "gnu", SHT_GNU_ATTRIBUTES, + display_public_gnu_attributes, + display_generic_attribute); } - return 1; } -static int -get_file_header (FILE * file) +static bfd_boolean +get_file_header (Filedata * filedata) { /* Read in the identity array. */ - if (fread (elf_header.e_ident, EI_NIDENT, 1, file) != 1) - return 0; + if (fread (filedata->file_header.e_ident, EI_NIDENT, 1, filedata->handle) != 1) + return FALSE; /* Determine how to read the rest of the header. */ - switch (elf_header.e_ident[EI_DATA]) + switch (filedata->file_header.e_ident[EI_DATA]) { - default: /* fall through */ - case ELFDATANONE: /* fall through */ + default: + case ELFDATANONE: case ELFDATA2LSB: byte_get = byte_get_little_endian; byte_put = byte_put_little_endian; @@ -16058,29 +18625,29 @@ get_file_header (FILE * file) } /* For now we only support 32 bit and 64 bit ELF files. */ - is_32bit_elf = (elf_header.e_ident[EI_CLASS] != ELFCLASS64); + is_32bit_elf = (filedata->file_header.e_ident[EI_CLASS] != ELFCLASS64); /* Read in the rest of the header. */ if (is_32bit_elf) { Elf32_External_Ehdr ehdr32; - if (fread (ehdr32.e_type, sizeof (ehdr32) - EI_NIDENT, 1, file) != 1) - return 0; - - elf_header.e_type = BYTE_GET (ehdr32.e_type); - elf_header.e_machine = BYTE_GET (ehdr32.e_machine); - elf_header.e_version = BYTE_GET (ehdr32.e_version); - elf_header.e_entry = BYTE_GET (ehdr32.e_entry); - elf_header.e_phoff = BYTE_GET (ehdr32.e_phoff); - elf_header.e_shoff = BYTE_GET (ehdr32.e_shoff); - elf_header.e_flags = BYTE_GET (ehdr32.e_flags); - elf_header.e_ehsize = BYTE_GET (ehdr32.e_ehsize); - elf_header.e_phentsize = BYTE_GET (ehdr32.e_phentsize); - elf_header.e_phnum = BYTE_GET (ehdr32.e_phnum); - elf_header.e_shentsize = BYTE_GET (ehdr32.e_shentsize); - elf_header.e_shnum = BYTE_GET (ehdr32.e_shnum); - elf_header.e_shstrndx = BYTE_GET (ehdr32.e_shstrndx); + if (fread (ehdr32.e_type, sizeof (ehdr32) - EI_NIDENT, 1, filedata->handle) != 1) + return FALSE; + + filedata->file_header.e_type = BYTE_GET (ehdr32.e_type); + filedata->file_header.e_machine = BYTE_GET (ehdr32.e_machine); + filedata->file_header.e_version = BYTE_GET (ehdr32.e_version); + filedata->file_header.e_entry = BYTE_GET (ehdr32.e_entry); + filedata->file_header.e_phoff = BYTE_GET (ehdr32.e_phoff); + filedata->file_header.e_shoff = BYTE_GET (ehdr32.e_shoff); + filedata->file_header.e_flags = BYTE_GET (ehdr32.e_flags); + filedata->file_header.e_ehsize = BYTE_GET (ehdr32.e_ehsize); + filedata->file_header.e_phentsize = BYTE_GET (ehdr32.e_phentsize); + filedata->file_header.e_phnum = BYTE_GET (ehdr32.e_phnum); + filedata->file_header.e_shentsize = BYTE_GET (ehdr32.e_shentsize); + filedata->file_header.e_shnum = BYTE_GET (ehdr32.e_shnum); + filedata->file_header.e_shstrndx = BYTE_GET (ehdr32.e_shstrndx); } else { @@ -16094,53 +18661,129 @@ get_file_header (FILE * file) { error (_("This instance of readelf has been built without support for a\n\ 64 bit data type and so it cannot read 64 bit ELF files.\n")); - return 0; + return FALSE; } - if (fread (ehdr64.e_type, sizeof (ehdr64) - EI_NIDENT, 1, file) != 1) - return 0; + if (fread (ehdr64.e_type, sizeof (ehdr64) - EI_NIDENT, 1, filedata->handle) != 1) + return FALSE; - elf_header.e_type = BYTE_GET (ehdr64.e_type); - elf_header.e_machine = BYTE_GET (ehdr64.e_machine); - elf_header.e_version = BYTE_GET (ehdr64.e_version); - elf_header.e_entry = BYTE_GET (ehdr64.e_entry); - elf_header.e_phoff = BYTE_GET (ehdr64.e_phoff); - elf_header.e_shoff = BYTE_GET (ehdr64.e_shoff); - elf_header.e_flags = BYTE_GET (ehdr64.e_flags); - elf_header.e_ehsize = BYTE_GET (ehdr64.e_ehsize); - elf_header.e_phentsize = BYTE_GET (ehdr64.e_phentsize); - elf_header.e_phnum = BYTE_GET (ehdr64.e_phnum); - elf_header.e_shentsize = BYTE_GET (ehdr64.e_shentsize); - elf_header.e_shnum = BYTE_GET (ehdr64.e_shnum); - elf_header.e_shstrndx = BYTE_GET (ehdr64.e_shstrndx); + filedata->file_header.e_type = BYTE_GET (ehdr64.e_type); + filedata->file_header.e_machine = BYTE_GET (ehdr64.e_machine); + filedata->file_header.e_version = BYTE_GET (ehdr64.e_version); + filedata->file_header.e_entry = BYTE_GET (ehdr64.e_entry); + filedata->file_header.e_phoff = BYTE_GET (ehdr64.e_phoff); + filedata->file_header.e_shoff = BYTE_GET (ehdr64.e_shoff); + filedata->file_header.e_flags = BYTE_GET (ehdr64.e_flags); + filedata->file_header.e_ehsize = BYTE_GET (ehdr64.e_ehsize); + filedata->file_header.e_phentsize = BYTE_GET (ehdr64.e_phentsize); + filedata->file_header.e_phnum = BYTE_GET (ehdr64.e_phnum); + filedata->file_header.e_shentsize = BYTE_GET (ehdr64.e_shentsize); + filedata->file_header.e_shnum = BYTE_GET (ehdr64.e_shnum); + filedata->file_header.e_shstrndx = BYTE_GET (ehdr64.e_shstrndx); } - if (elf_header.e_shoff) + if (filedata->file_header.e_shoff) { /* There may be some extensions in the first section header. Don't bomb if we can't read it. */ if (is_32bit_elf) - get_32bit_section_headers (file, TRUE); + get_32bit_section_headers (filedata, TRUE); + else + get_64bit_section_headers (filedata, TRUE); + } + + return TRUE; +} + +static void +close_file (Filedata * filedata) +{ + if (filedata) + { + if (filedata->handle) + fclose (filedata->handle); + free (filedata); + } +} + +void +close_debug_file (void * data) +{ + close_file ((Filedata *) data); +} + +static Filedata * +open_file (const char * pathname) +{ + struct stat statbuf; + Filedata * filedata = NULL; + + if (stat (pathname, & statbuf) < 0 + || ! S_ISREG (statbuf.st_mode)) + goto fail; + + filedata = calloc (1, sizeof * filedata); + if (filedata == NULL) + goto fail; + + filedata->handle = fopen (pathname, "rb"); + if (filedata->handle == NULL) + goto fail; + + filedata->file_size = (bfd_size_type) statbuf.st_size; + filedata->file_name = pathname; + + if (! get_file_header (filedata)) + goto fail; + + if (filedata->file_header.e_shoff) + { + bfd_boolean res; + + /* Read the section headers again, this time for real. */ + if (is_32bit_elf) + res = get_32bit_section_headers (filedata, FALSE); else - get_64bit_section_headers (file, TRUE); + res = get_64bit_section_headers (filedata, FALSE); + + if (!res) + goto fail; } - return 1; + return filedata; + + fail: + if (filedata) + { + if (filedata->handle) + fclose (filedata->handle); + free (filedata); + } + return NULL; +} + +void * +open_debug_file (const char * pathname) +{ + return open_file (pathname); } /* Process one ELF object file according to the command line options. This file may actually be stored in an archive. The file is - positioned at the start of the ELF object. */ + positioned at the start of the ELF object. Returns TRUE if no + problems were encountered, FALSE otherwise. */ -static int -process_object (char * file_name, FILE * file) +static bfd_boolean +process_object (Filedata * filedata) { + Filedata * separates; unsigned int i; + bfd_boolean res = TRUE; - if (! get_file_header (file)) + if (! get_file_header (filedata)) { - error (_("%s: Failed to read file header\n"), file_name); - return 1; + error (_("%s: Failed to read file header\n"), filedata->file_name); + return FALSE; } /* Initialise per file variables. */ @@ -16153,84 +18796,96 @@ process_object (char * file_name, FILE * file) /* Process the file. */ if (show_name) - printf (_("\nFile: %s\n"), file_name); + printf (_("\nFile: %s\n"), filedata->file_name); /* Initialise the dump_sects array from the cmdline_dump_sects array. Note we do this even if cmdline_dump_sects is empty because we must make sure that the dump_sets array is zeroed out before each object file is processed. */ - if (num_dump_sects > num_cmdline_dump_sects) - memset (dump_sects, 0, num_dump_sects * sizeof (* dump_sects)); + if (filedata->num_dump_sects > cmdline.num_dump_sects) + memset (filedata->dump_sects, 0, filedata->num_dump_sects * sizeof (* filedata->dump_sects)); - if (num_cmdline_dump_sects > 0) + if (cmdline.num_dump_sects > 0) { - if (num_dump_sects == 0) + if (filedata->num_dump_sects == 0) /* A sneaky way of allocating the dump_sects array. */ - request_dump_bynumber (num_cmdline_dump_sects, 0); + request_dump_bynumber (filedata, cmdline.num_dump_sects, 0); - assert (num_dump_sects >= num_cmdline_dump_sects); - memcpy (dump_sects, cmdline_dump_sects, - num_cmdline_dump_sects * sizeof (* dump_sects)); + assert (filedata->num_dump_sects >= cmdline.num_dump_sects); + memcpy (filedata->dump_sects, cmdline.dump_sects, + cmdline.num_dump_sects * sizeof (* filedata->dump_sects)); } - if (! process_file_header ()) - return 1; + if (! process_file_header (filedata)) + return FALSE; - if (! process_section_headers (file)) + if (! process_section_headers (filedata)) { - /* Without loaded section headers we cannot process lots of - things. */ - do_unwind = do_version = do_dump = do_arch = 0; + /* Without loaded section headers we cannot process lots of things. */ + do_unwind = do_version = do_dump = do_arch = FALSE; if (! do_using_dynamic) - do_syms = do_dyn_syms = do_reloc = 0; - } - - if (! process_section_groups (file)) - { - /* Without loaded section groups we cannot process unwind. */ - do_unwind = 0; + do_syms = do_dyn_syms = do_reloc = FALSE; } - if (process_program_headers (file)) - process_dynamic_section (file); + if (! process_section_groups (filedata)) + /* Without loaded section groups we cannot process unwind. */ + do_unwind = FALSE; - process_relocs (file); - - process_unwind (file); + if (process_program_headers (filedata)) + process_dynamic_section (filedata); + else + res = FALSE; - process_symbol_table (file); + if (! process_relocs (filedata)) + res = FALSE; - process_syminfo (file); + if (! process_unwind (filedata)) + res = FALSE; - process_version_sections (file); + if (! process_symbol_table (filedata)) + res = FALSE; - process_section_contents (file); + if (! process_syminfo (filedata)) + res = FALSE; - process_notes (file); + if (! process_version_sections (filedata)) + res = FALSE; - process_gnu_liblist (file); + if (filedata->file_header.e_shstrndx != SHN_UNDEF) + separates = load_separate_debug_file (filedata, filedata->file_name); + else + separates = NULL; - process_arch_specific (file); + if (! process_section_contents (filedata)) + res = FALSE; - if (program_headers) + if (separates) { - free (program_headers); - program_headers = NULL; + if (! process_section_headers (separates)) + res = FALSE; + else if (! process_section_contents (separates)) + res = FALSE; } - if (section_headers) - { - free (section_headers); - section_headers = NULL; - } + if (! process_notes (filedata)) + res = FALSE; - if (string_table) - { - free (string_table); - string_table = NULL; - string_table_length = 0; - } + if (! process_gnu_liblist (filedata)) + res = FALSE; + + if (! process_arch_specific (filedata)) + res = FALSE; + + free (filedata->program_headers); + filedata->program_headers = NULL; + + free (filedata->section_headers); + filedata->section_headers = NULL; + + free (filedata->string_table); + filedata->string_table = NULL; + filedata->string_table_length = 0; if (dynamic_strings) { @@ -16284,21 +18939,22 @@ process_object (char * file_name, FILE * file) free_debug_memory (); - return 0; + return res; } /* Process an ELF archive. - On entry the file is positioned just after the ARMAG string. */ + On entry the file is positioned just after the ARMAG string. + Returns TRUE upon success, FALSE otherwise. */ -static int -process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) +static bfd_boolean +process_archive (Filedata * filedata, bfd_boolean is_thin_archive) { struct archive_info arch; struct archive_info nested_arch; size_t got; - int ret; + bfd_boolean ret = TRUE; - show_name = 1; + show_name = TRUE; /* The ARCH structure is used to hold information about this archive. */ arch.file_name = NULL; @@ -16316,24 +18972,26 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) nested_arch.sym_table = NULL; nested_arch.longnames = NULL; - if (setup_archive (&arch, file_name, file, is_thin_archive, do_archive_index) != 0) + if (setup_archive (&arch, filedata->file_name, filedata->handle, + is_thin_archive, do_archive_index) != 0) { - ret = 1; + ret = FALSE; goto out; } if (do_archive_index) { if (arch.sym_table == NULL) - error (_("%s: unable to dump the index as none was found\n"), file_name); + error (_("%s: unable to dump the index as none was found\n"), filedata->file_name); else { unsigned long i, l; unsigned long current_pos; printf (_("Index of archive %s: (%lu entries, 0x%lx bytes in the symbol table)\n"), - file_name, (unsigned long) arch.index_num, arch.sym_size); - current_pos = ftell (file); + filedata->file_name, (unsigned long) arch.index_num, arch.sym_size); + + current_pos = ftell (filedata->handle); for (i = l = 0; i < arch.index_num; i++) { @@ -16360,7 +19018,8 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (l >= arch.sym_size) { error (_("%s: end of the symbol table reached before the end of the index\n"), - file_name); + filedata->file_name); + ret = FALSE; break; } /* PR 17531: file: 0b6630b2. */ @@ -16368,19 +19027,29 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) l += strnlen (arch.sym_table + l, arch.sym_size - l) + 1; } - if (arch.uses_64bit_indicies) + if (arch.uses_64bit_indices) l = (l + 7) & ~ 7; else l += l & 1; if (l < arch.sym_size) - error (_("%s: %ld bytes remain in the symbol table, but without corresponding entries in the index table\n"), - file_name, arch.sym_size - l); + { + error (ngettext ("%s: %ld byte remains in the symbol table, " + "but without corresponding entries in " + "the index table\n", + "%s: %ld bytes remain in the symbol table, " + "but without corresponding entries in " + "the index table\n", + arch.sym_size - l), + filedata->file_name, arch.sym_size - l); + ret = FALSE; + } - if (fseek (file, current_pos, SEEK_SET) != 0) + if (fseek (filedata->handle, current_pos, SEEK_SET) != 0) { - error (_("%s: failed to seek back to start of object files in the archive\n"), file_name); - ret = 1; + error (_("%s: failed to seek back to start of object files in the archive\n"), + filedata->file_name); + ret = FALSE; goto out; } } @@ -16390,13 +19059,11 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) && !do_histogram && !do_debugging && !do_arch && !do_notes && !do_section_groups && !do_dyn_syms) { - ret = 0; /* Archive index only. */ + ret = TRUE; /* Archive index only. */ goto out; } } - ret = 0; - while (1) { char * name; @@ -16404,24 +19071,24 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) char * qualified_name; /* Read the next archive header. */ - if (fseek (file, arch.next_arhdr_offset, SEEK_SET) != 0) + if (fseek (filedata->handle, arch.next_arhdr_offset, SEEK_SET) != 0) { - error (_("%s: failed to seek to next archive header\n"), file_name); - return 1; + error (_("%s: failed to seek to next archive header\n"), filedata->file_name); + return FALSE; } - got = fread (&arch.arhdr, 1, sizeof arch.arhdr, file); + got = fread (&arch.arhdr, 1, sizeof arch.arhdr, filedata->handle); if (got != sizeof arch.arhdr) { if (got == 0) break; - error (_("%s: failed to read archive header\n"), file_name); - ret = 1; + error (_("%s: failed to read archive header\n"), filedata->file_name); + ret = FALSE; break; } if (memcmp (arch.arhdr.ar_fmag, ARFMAG, 2) != 0) { error (_("%s: did not find a valid archive header\n"), arch.file_name); - ret = 1; + ret = FALSE; break; } @@ -16434,8 +19101,8 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) name = get_archive_member_name (&arch, &nested_arch); if (name == NULL) { - error (_("%s: bad archive file name\n"), file_name); - ret = 1; + error (_("%s: bad archive file name\n"), filedata->file_name); + ret = FALSE; break; } namelen = strlen (name); @@ -16443,46 +19110,54 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) qualified_name = make_qualified_name (&arch, &nested_arch, name); if (qualified_name == NULL) { - error (_("%s: bad archive file name\n"), file_name); - ret = 1; + error (_("%s: bad archive file name\n"), filedata->file_name); + ret = FALSE; break; } if (is_thin_archive && arch.nested_member_origin == 0) { /* This is a proxy for an external member of a thin archive. */ - FILE * member_file; - char * member_file_name = adjust_relative_path (file_name, name, namelen); + Filedata * member_filedata; + char * member_file_name = adjust_relative_path + (filedata->file_name, name, namelen); + if (member_file_name == NULL) { - ret = 1; + ret = FALSE; break; } - member_file = fopen (member_file_name, "rb"); - if (member_file == NULL) + member_filedata = open_file (member_file_name); + if (member_filedata == NULL) { error (_("Input file '%s' is not readable.\n"), member_file_name); free (member_file_name); - ret = 1; + ret = FALSE; break; } archive_file_offset = arch.nested_member_origin; + member_filedata->file_name = qualified_name; - ret |= process_object (qualified_name, member_file); + if (! process_object (member_filedata)) + ret = FALSE; - fclose (member_file); + close_file (member_filedata); free (member_file_name); } else if (is_thin_archive) { + Filedata thin_filedata; + + memset (&thin_filedata, 0, sizeof (thin_filedata)); + /* PR 15140: Allow for corrupt thin archives. */ if (nested_arch.file == NULL) { error (_("%s: contains corrupt thin archive: %s\n"), - file_name, name); - ret = 1; + filedata->file_name, name); + ret = FALSE; break; } @@ -16494,25 +19169,31 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) if (fseek (nested_arch.file, archive_file_offset, SEEK_SET) != 0) { error (_("%s: failed to seek to archive member.\n"), nested_arch.file_name); - ret = 1; + ret = FALSE; break; } - ret |= process_object (qualified_name, nested_arch.file); + thin_filedata.handle = nested_arch.file; + thin_filedata.file_name = qualified_name; + + if (! process_object (& thin_filedata)) + ret = FALSE; } else { archive_file_offset = arch.next_arhdr_offset; arch.next_arhdr_offset += archive_file_size; - ret |= process_object (qualified_name, file); + filedata->file_name = qualified_name; + if (! process_object (filedata)) + ret = FALSE; } - if (dump_sects != NULL) + if (filedata->dump_sects != NULL) { - free (dump_sects); - dump_sects = NULL; - num_dump_sects = 0; + free (filedata->dump_sects); + filedata->dump_sects = NULL; + filedata->num_dump_sects = 0; } free (qualified_name); @@ -16527,13 +19208,13 @@ process_archive (char * file_name, FILE * file, bfd_boolean is_thin_archive) return ret; } -static int +static bfd_boolean process_file (char * file_name) { - FILE * file; + Filedata * filedata = NULL; struct stat statbuf; char armag[SARMAG]; - int ret; + bfd_boolean ret = TRUE; if (stat (file_name, &statbuf) < 0) { @@ -16542,49 +19223,67 @@ process_file (char * file_name) else error (_("Could not locate '%s'. System error message: %s\n"), file_name, strerror (errno)); - return 1; + return FALSE; } if (! S_ISREG (statbuf.st_mode)) { error (_("'%s' is not an ordinary file\n"), file_name); - return 1; + return FALSE; + } + + filedata = calloc (1, sizeof * filedata); + if (filedata == NULL) + { + error (_("Out of memory allocating file data structure\n")); + return FALSE; } - file = fopen (file_name, "rb"); - if (file == NULL) + filedata->file_name = file_name; + filedata->handle = fopen (file_name, "rb"); + if (filedata->handle == NULL) { error (_("Input file '%s' is not readable.\n"), file_name); - return 1; + free (filedata); + return FALSE; } - if (fread (armag, SARMAG, 1, file) != 1) + if (fread (armag, SARMAG, 1, filedata->handle) != 1) { error (_("%s: Failed to read file's magic number\n"), file_name); - fclose (file); - return 1; + fclose (filedata->handle); + free (filedata); + return FALSE; } - current_file_size = (bfd_size_type) statbuf.st_size; + filedata->file_size = (bfd_size_type) statbuf.st_size; if (memcmp (armag, ARMAG, SARMAG) == 0) - ret = process_archive (file_name, file, FALSE); + { + if (! process_archive (filedata, FALSE)) + ret = FALSE; + } else if (memcmp (armag, ARMAGT, SARMAG) == 0) - ret = process_archive (file_name, file, TRUE); + { + if ( ! process_archive (filedata, TRUE)) + ret = FALSE; + } else { if (do_archive_index) error (_("File %s is not an archive so its index cannot be displayed.\n"), file_name); - rewind (file); + rewind (filedata->handle); archive_file_size = archive_file_offset = 0; - ret = process_object (file_name, file); + + if (! process_object (filedata)) + ret = FALSE; } - fclose (file); + fclose (filedata->handle); + free (filedata); - current_file_size = 0; return ret; } @@ -16600,6 +19299,7 @@ print_address (unsigned int addr, FILE * outfile) } /* Needed by the i386 disassembler. */ + void db_task_printsym (unsigned int addr) { @@ -16623,39 +19323,24 @@ main (int argc, char ** argv) expandargv (&argc, &argv); - parse_args (argc, argv); - - if (num_dump_sects > 0) - { - /* Make a copy of the dump_sects array. */ - cmdline_dump_sects = (dump_type *) - malloc (num_dump_sects * sizeof (* dump_sects)); - if (cmdline_dump_sects == NULL) - error (_("Out of memory allocating dump request table.\n")); - else - { - memcpy (cmdline_dump_sects, dump_sects, - num_dump_sects * sizeof (* dump_sects)); - num_cmdline_dump_sects = num_dump_sects; - } - } + cmdline.file_name = ""; + parse_args (& cmdline, argc, argv); if (optind < (argc - 1)) - show_name = 1; + show_name = TRUE; else if (optind >= argc) { warn (_("Nothing to do.\n")); usage (stderr); } - err = 0; + err = FALSE; while (optind < argc) - err |= process_file (argv[optind++]); + if (! process_file (argv[optind++])) + err = TRUE; - if (dump_sects != NULL) - free (dump_sects); - if (cmdline_dump_sects != NULL) - free (cmdline_dump_sects); + if (cmdline.dump_sects != NULL) + free (cmdline.dump_sects); - return err; + return err ? EXIT_FAILURE : EXIT_SUCCESS; }