X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fsyms.c;h=da1c90d52ebeb7badb5722d58ed2f1ddfd081b1d;hb=6665660a411ead049daa85cac5c629d637e22044;hp=d0ffcc727e3e674cd8c430084c3602a01ec2efa1;hpb=1049f94e8e1a9eae86a694d2dca94a6194f763b1;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/syms.c b/bfd/syms.c index d0ffcc727e..da1c90d52e 100644 --- a/bfd/syms.c +++ b/bfd/syms.c @@ -1,14 +1,12 @@ /* Generic symbol-table support for the BFD library. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. + Copyright (C) 1990-2019 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -18,7 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ /* SECTION @@ -64,29 +63,29 @@ SUBSECTION allocating storage, and the actual reading process. This is an excerpt from an application which reads the symbol table: -| long storage_needed; -| asymbol **symbol_table; -| long number_of_symbols; -| long i; +| long storage_needed; +| asymbol **symbol_table; +| long number_of_symbols; +| long i; | -| storage_needed = bfd_get_symtab_upper_bound (abfd); +| storage_needed = bfd_get_symtab_upper_bound (abfd); | | if (storage_needed < 0) | FAIL | -| if (storage_needed == 0) -| return; -| -| symbol_table = (asymbol **) xmalloc (storage_needed); -| ... -| number_of_symbols = -| bfd_canonicalize_symtab (abfd, symbol_table); +| if (storage_needed == 0) +| return; +| +| symbol_table = xmalloc (storage_needed); +| ... +| number_of_symbols = +| bfd_canonicalize_symtab (abfd, symbol_table); | | if (number_of_symbols < 0) | FAIL | -| for (i = 0; i < number_of_symbols; i++) -| process_symbol (symbol_table[i]); +| for (i = 0; i < number_of_symbols; i++) +| process_symbol (symbol_table[i]); All storage for the symbols themselves is in an objalloc connected to the BFD; it is freed when the BFD is closed. @@ -106,36 +105,37 @@ SUBSECTION which has been created using <>. Here is an example showing the creation of a symbol table with only one element: -| #include "bfd.h" -| int main (void) -| { -| bfd *abfd; -| asymbol *ptrs[2]; -| asymbol *new; +| #include "sysdep.h" +| #include "bfd.h" +| int main (void) +| { +| bfd *abfd; +| asymbol *ptrs[2]; +| asymbol *new; | -| abfd = bfd_openw ("foo","a.out-sunos-big"); -| bfd_set_format (abfd, bfd_object); -| new = bfd_make_empty_symbol (abfd); -| new->name = "dummy_symbol"; -| new->section = bfd_make_section_old_way (abfd, ".text"); -| new->flags = BSF_GLOBAL; -| new->value = 0x12345; +| abfd = bfd_openw ("foo","a.out-sunos-big"); +| bfd_set_format (abfd, bfd_object); +| new = bfd_make_empty_symbol (abfd); +| new->name = "dummy_symbol"; +| new->section = bfd_make_section_old_way (abfd, ".text"); +| new->flags = BSF_GLOBAL; +| new->value = 0x12345; | -| ptrs[0] = new; -| ptrs[1] = (asymbol *)0; +| ptrs[0] = new; +| ptrs[1] = 0; | -| bfd_set_symtab (abfd, ptrs, 1); -| bfd_close (abfd); -| return 0; -| } +| bfd_set_symtab (abfd, ptrs, 1); +| bfd_close (abfd); +| return 0; +| } | -| ./makesym -| nm foo -| 00012345 A dummy_symbol +| ./makesym +| nm foo +| 00012345 A dummy_symbol - Many formats cannot represent arbitary symbol information; for - instance, the <> object format does not allow an - arbitary number of sections. A symbol pointing to a section + Many formats cannot represent arbitrary symbol information; for + instance, the <> object format does not allow an + arbitrary number of sections. A symbol pointing to a section which is not one of <<.text>>, <<.data>> or <<.bss>> cannot be described. @@ -181,7 +181,7 @@ SUBSECTION CODE_FRAGMENT . -.typedef struct symbol_cache_entry +.typedef struct bfd_symbol .{ . {* A pointer to the BFD which owns the symbol. This information . is necessary so that a back end can work out what additional @@ -204,101 +204,120 @@ CODE_FRAGMENT . symvalue value; . . {* Attributes of a symbol. *} -.#define BSF_NO_FLAGS 0x00 +.#define BSF_NO_FLAGS 0 . . {* The symbol has local scope; <> in <>. The value . is the offset into the section of the data. *} -.#define BSF_LOCAL 0x01 +.#define BSF_LOCAL (1 << 0) . . {* The symbol has global scope; initialized data in <>. The . value is the offset into the section of the data. *} -.#define BSF_GLOBAL 0x02 +.#define BSF_GLOBAL (1 << 1) . . {* The symbol has global scope and is exported. The value is . the offset into the section of the data. *} -.#define BSF_EXPORT BSF_GLOBAL {* No real difference. *} +.#define BSF_EXPORT BSF_GLOBAL {* No real difference. *} . . {* A normal C symbol would be one of: -. <>, <>, <> or -. <>. *} +. <>, <> or <>. *} . -. {* The symbol is a debugging record. The value has an arbitary +. {* The symbol is a debugging record. The value has an arbitrary . meaning, unless BSF_DEBUGGING_RELOC is also set. *} -.#define BSF_DEBUGGING 0x08 +.#define BSF_DEBUGGING (1 << 2) . . {* The symbol denotes a function entry point. Used in ELF, . perhaps others someday. *} -.#define BSF_FUNCTION 0x10 +.#define BSF_FUNCTION (1 << 3) . . {* Used by the linker. *} -.#define BSF_KEEP 0x20 -.#define BSF_KEEP_G 0x40 +.#define BSF_KEEP (1 << 5) +. +. {* An ELF common symbol. *} +.#define BSF_ELF_COMMON (1 << 6) . . {* A weak global symbol, overridable without warnings by . a regular global symbol of the same name. *} -.#define BSF_WEAK 0x80 +.#define BSF_WEAK (1 << 7) . . {* This symbol was created to point to a section, e.g. ELF's . STT_SECTION symbols. *} -.#define BSF_SECTION_SYM 0x100 +.#define BSF_SECTION_SYM (1 << 8) . . {* The symbol used to be a common symbol, but now it is . allocated. *} -.#define BSF_OLD_COMMON 0x200 -. -. {* The default value for common data. *} -.#define BFD_FORT_COMM_DEFAULT_VALUE 0 +.#define BSF_OLD_COMMON (1 << 9) . . {* In some files the type of a symbol sometimes alters its . location in an output file - ie in coff a <> symbol . which is also <> symbol appears where it was . declared and not at the end of a section. This bit is set . by the target BFD part to convey this information. *} -.#define BSF_NOT_AT_END 0x400 +.#define BSF_NOT_AT_END (1 << 10) . . {* Signal that the symbol is the label of constructor section. *} -.#define BSF_CONSTRUCTOR 0x800 +.#define BSF_CONSTRUCTOR (1 << 11) . . {* Signal that the symbol is a warning symbol. The name is a . warning. The name of the next symbol is the one to warn about; . if a reference is made to a symbol with the same name as the next . symbol, a warning is issued by the linker. *} -.#define BSF_WARNING 0x1000 +.#define BSF_WARNING (1 << 12) . . {* Signal that the symbol is indirect. This symbol is an indirect . pointer to the symbol with the same name as the next symbol. *} -.#define BSF_INDIRECT 0x2000 +.#define BSF_INDIRECT (1 << 13) . . {* BSF_FILE marks symbols that contain a file name. This is used . for ELF STT_FILE symbols. *} -.#define BSF_FILE 0x4000 +.#define BSF_FILE (1 << 14) . . {* Symbol is from dynamic linking information. *} -.#define BSF_DYNAMIC 0x8000 +.#define BSF_DYNAMIC (1 << 15) . . {* The symbol denotes a data object. Used in ELF, and perhaps . others someday. *} -.#define BSF_OBJECT 0x10000 +.#define BSF_OBJECT (1 << 16) . . {* This symbol is a debugging symbol. The value is the offset . into the section of the data. BSF_DEBUGGING should be set . as well. *} -.#define BSF_DEBUGGING_RELOC 0x20000 +.#define BSF_DEBUGGING_RELOC (1 << 17) . . {* This symbol is thread local. Used in ELF. *} -.#define BSF_THREAD_LOCAL 0x40000 +.#define BSF_THREAD_LOCAL (1 << 18) +. +. {* This symbol represents a complex relocation expression, +. with the expression tree serialized in the symbol name. *} +.#define BSF_RELC (1 << 19) +. +. {* This symbol represents a signed complex relocation expression, +. with the expression tree serialized in the symbol name. *} +.#define BSF_SRELC (1 << 20) +. +. {* This symbol was created by bfd_get_synthetic_symtab. *} +.#define BSF_SYNTHETIC (1 << 21) +. +. {* This symbol is an indirect code object. Unrelated to BSF_INDIRECT. +. The dynamic linker will compute the value of this symbol by +. calling the function that it points to. BSF_FUNCTION must +. also be also set. *} +.#define BSF_GNU_INDIRECT_FUNCTION (1 << 22) +. {* This symbol is a globally unique data object. The dynamic linker +. will make sure that in the entire process there is just one symbol +. with this name and type in use. BSF_OBJECT must also be set. *} +.#define BSF_GNU_UNIQUE (1 << 23) . . flagword flags; . . {* A pointer to the section to which this symbol is . relative. This will always be non NULL, there are special . sections for undefined and absolute symbols. *} -. struct sec *section; +. struct bfd_section *section; . . {* Back end special data. *} . union . { -. PTR p; +. void *p; . bfd_vma i; . } . udata; @@ -307,17 +326,13 @@ CODE_FRAGMENT . */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "safe-ctype.h" #include "bfdlink.h" #include "aout/stab_gnu.h" -static char coff_section_type PARAMS ((const char *)); -static char decode_section_type PARAMS ((const struct sec *)); -static int cmpindexentry PARAMS ((const PTR, const PTR)); - /* DOCDD INODE @@ -337,7 +352,7 @@ DESCRIPTION the BFD, then return 0. If an error occurs, return -1. .#define bfd_get_symtab_upper_bound(abfd) \ -. BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd)) +. BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd)) . */ @@ -346,7 +361,7 @@ FUNCTION bfd_is_local_label SYNOPSIS - bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym); + bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym); DESCRIPTION Return TRUE if the given symbol @var{sym} in the BFD @var{abfd} is @@ -354,14 +369,12 @@ DESCRIPTION */ bfd_boolean -bfd_is_local_label (abfd, sym) - bfd *abfd; - asymbol *sym; +bfd_is_local_label (bfd *abfd, asymbol *sym) { /* The BSF_SECTION_SYM check is needed for IA-64, where every label that starts with '.' is local. This would accidentally catch section names if we didn't reject them here. */ - if ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_SECTION_SYM)) != 0) + if ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_FILE | BSF_SECTION_SYM)) != 0) return FALSE; if (sym->name == NULL) return FALSE; @@ -373,7 +386,7 @@ FUNCTION bfd_is_local_label_name SYNOPSIS - bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name); + bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name); DESCRIPTION Return TRUE if a symbol with the name @var{name} in the BFD @@ -382,7 +395,24 @@ DESCRIPTION local label. .#define bfd_is_local_label_name(abfd, name) \ -. BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name)) +. BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name)) +. +*/ + +/* +FUNCTION + bfd_is_target_special_symbol + +SYNOPSIS + bfd_boolean bfd_is_target_special_symbol (bfd *abfd, asymbol *sym); + +DESCRIPTION + Return TRUE iff a symbol @var{sym} in the BFD @var{abfd} is something + special to the particular target represented by the BFD. Such symbols + should normally not be mentioned to the user. + +.#define bfd_is_target_special_symbol(abfd, sym) \ +. BFD_SEND (abfd, _bfd_is_target_special_symbol, (abfd, sym)) . */ @@ -398,8 +428,7 @@ DESCRIPTION including the NULL. .#define bfd_canonicalize_symtab(abfd, location) \ -. BFD_SEND (abfd, _bfd_canonicalize_symtab,\ -. (abfd, location)) +. BFD_SEND (abfd, _bfd_canonicalize_symtab, (abfd, location)) . */ @@ -408,7 +437,8 @@ FUNCTION bfd_set_symtab SYNOPSIS - bfd_boolean bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count); + bfd_boolean bfd_set_symtab + (bfd *abfd, asymbol **location, unsigned int count); DESCRIPTION Arrange that when the output BFD @var{abfd} is closed, @@ -417,12 +447,9 @@ DESCRIPTION */ bfd_boolean -bfd_set_symtab (abfd, location, symcount) - bfd *abfd; - asymbol **location; - unsigned int symcount; +bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int symcount) { - if ((abfd->format != bfd_object) || (bfd_read_p (abfd))) + if (abfd->format != bfd_object || bfd_read_p (abfd)) { bfd_set_error (bfd_error_invalid_operation); return FALSE; @@ -438,25 +465,21 @@ FUNCTION bfd_print_symbol_vandf SYNOPSIS - void bfd_print_symbol_vandf (bfd *abfd, PTR file, asymbol *symbol); + void bfd_print_symbol_vandf (bfd *abfd, void *file, asymbol *symbol); DESCRIPTION Print the value and flags of the @var{symbol} supplied to the stream @var{file}. */ void -bfd_print_symbol_vandf (abfd, arg, symbol) - bfd *abfd; - PTR arg; - asymbol *symbol; +bfd_print_symbol_vandf (bfd *abfd, void *arg, asymbol *symbol) { FILE *file = (FILE *) arg; flagword type = symbol->flags; - if (symbol->section != (asection *) NULL) - bfd_fprintf_vma (abfd, file, - symbol->value + symbol->section->vma); + if (symbol->section != NULL) + bfd_fprintf_vma (abfd, file, symbol->value + symbol->section->vma); else bfd_fprintf_vma (abfd, file, symbol->value); @@ -466,11 +489,12 @@ bfd_print_symbol_vandf (abfd, arg, symbol) fprintf (file, " %c%c%c%c%c%c%c", ((type & BSF_LOCAL) ? (type & BSF_GLOBAL) ? '!' : 'l' - : (type & BSF_GLOBAL) ? 'g' : ' '), + : (type & BSF_GLOBAL) ? 'g' + : (type & BSF_GNU_UNIQUE) ? 'u' : ' '), (type & BSF_WEAK) ? 'w' : ' ', (type & BSF_CONSTRUCTOR) ? 'C' : ' ', (type & BSF_WARNING) ? 'W' : ' ', - (type & BSF_INDIRECT) ? 'I' : ' ', + (type & BSF_INDIRECT) ? 'I' : (type & BSF_GNU_INDIRECT_FUNCTION) ? 'i' : ' ', (type & BSF_DEBUGGING) ? 'd' : (type & BSF_DYNAMIC) ? 'D' : ' ', ((type & BSF_FUNCTION) ? 'F' @@ -493,7 +517,7 @@ DESCRIPTION information, and will cause problems later on. .#define bfd_make_empty_symbol(abfd) \ -. BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd)) +. BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd)) . */ @@ -502,7 +526,7 @@ FUNCTION _bfd_generic_make_empty_symbol SYNOPSIS - asymbol * _bfd_generic_make_empty_symbol (bfd *); + asymbol *_bfd_generic_make_empty_symbol (bfd *); DESCRIPTION Create a new <> structure for the BFD @var{abfd} @@ -512,14 +536,13 @@ DESCRIPTION */ asymbol * -_bfd_generic_make_empty_symbol (abfd) - bfd *abfd; +_bfd_generic_make_empty_symbol (bfd *abfd) { bfd_size_type amt = sizeof (asymbol); - asymbol *new = (asymbol *) bfd_zalloc (abfd, amt); - if (new) - new->the_bfd = abfd; - return new; + asymbol *new_symbol = (asymbol *) bfd_zalloc (abfd, amt); + if (new_symbol) + new_symbol->the_bfd = abfd; + return new_symbol; } /* @@ -532,7 +555,7 @@ DESCRIPTION yet to be worked out. .#define bfd_make_debug_symbol(abfd,ptr,size) \ -. BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size)) +. BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size)) . */ @@ -551,13 +574,13 @@ static const struct section_to_type stt[] = {"code", 't'}, /* MRI .text */ {".data", 'd'}, {"*DEBUG*", 'N'}, - {".debug", 'N'}, /* MSVC's .debug (non-standard debug syms) */ - {".drectve", 'i'}, /* MSVC's .drective section */ - {".edata", 'e'}, /* MSVC's .edata (export) section */ + {".debug", 'N'}, /* MSVC's .debug (non-standard debug syms) */ + {".drectve", 'i'}, /* MSVC's .drective section */ + {".edata", 'e'}, /* MSVC's .edata (export) section */ {".fini", 't'}, /* ELF fini section */ - {".idata", 'i'}, /* MSVC's .idata (import) section */ + {".idata", 'i'}, /* MSVC's .idata (import) section */ {".init", 't'}, /* ELF init section */ - {".pdata", 'p'}, /* MSVC's .pdata (stack unwind) section */ + {".pdata", 'p'}, /* MSVC's .pdata (stack unwind) section */ {".rdata", 'r'}, /* Read only data. */ {".rodata", 'r'}, /* Read only data. */ {".sbss", 's'}, /* Small BSS (uninitialized data). */ @@ -572,18 +595,22 @@ static const struct section_to_type stt[] = /* Return the single-character symbol type corresponding to section S, or '?' for an unknown COFF section. - Check for any leading string which matches, so .text5 returns - 't' as well as .text */ + Check for leading strings which match, followed by a number, '.', + or '$' so .text5 matches the .text entry, but .init_array doesn't + match the .init entry. */ static char -coff_section_type (s) - const char *s; +coff_section_type (const char *s) { const struct section_to_type *t; for (t = &stt[0]; t->section; t++) - if (!strncmp (s, t->section, strlen (t->section))) - return t->type; + { + size_t len = strlen (t->section); + if (strncmp (s, t->section, len) == 0 + && memchr (".$0123456789", s[len], 13) != 0) + return t->type; + } return '?'; } @@ -596,8 +623,7 @@ coff_section_type (s) we could perhaps obsolete coff_section_type. */ static char -decode_section_type (section) - const struct sec *section; +decode_section_type (const struct bfd_section *section) { if (section->flags & SEC_CODE) return 't'; @@ -619,8 +645,7 @@ decode_section_type (section) } if (section->flags & SEC_DEBUGGING) return 'N'; - if ((section->flags & SEC_HAS_CONTENTS) && - (section->flags & SEC_READONLY)) + if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_READONLY)) return 'n'; return '?'; @@ -638,12 +663,11 @@ SYNOPSIS int bfd_decode_symclass (asymbol *symbol); */ int -bfd_decode_symclass (symbol) - asymbol *symbol; +bfd_decode_symclass (asymbol *symbol) { char c; - if (bfd_is_com_section (symbol->section)) + if (symbol->section && bfd_is_com_section (symbol->section)) return 'C'; if (bfd_is_und_section (symbol->section)) { @@ -661,6 +685,8 @@ bfd_decode_symclass (symbol) } if (bfd_is_ind_section (symbol->section)) return 'I'; + if (symbol->flags & BSF_GNU_INDIRECT_FUNCTION) + return 'i'; if (symbol->flags & BSF_WEAK) { /* If weak, determine if it's specifically an object @@ -670,6 +696,8 @@ bfd_decode_symclass (symbol) else return 'W'; } + if (symbol->flags & BSF_GNU_UNIQUE) + return 'u'; if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL))) return '?'; @@ -677,9 +705,9 @@ bfd_decode_symclass (symbol) c = 'a'; else if (symbol->section) { - c = coff_section_type (symbol->section->name); + c = decode_section_type (symbol->section); if (c == '?') - c = decode_section_type (symbol->section); + c = coff_section_type (symbol->section->name); } else return '?'; @@ -711,8 +739,7 @@ SYNOPSIS */ bfd_boolean -bfd_is_undefined_symclass (symclass) - int symclass; +bfd_is_undefined_symclass (int symclass) { return symclass == 'U' || symclass == 'w' || symclass == 'v'; } @@ -731,9 +758,7 @@ SYNOPSIS */ void -bfd_symbol_info (symbol, ret) - asymbol *symbol; - symbol_info *ret; +bfd_symbol_info (asymbol *symbol, symbol_info *ret) { ret->type = bfd_decode_symclass (symbol); @@ -750,7 +775,8 @@ FUNCTION bfd_copy_private_symbol_data SYNOPSIS - bfd_boolean bfd_copy_private_symbol_data (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym); + bfd_boolean bfd_copy_private_symbol_data + (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym); DESCRIPTION Copy private symbol information from @var{isym} in the BFD @@ -762,8 +788,8 @@ DESCRIPTION Not enough memory exists to create private data for @var{osec}. .#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \ -. BFD_SEND (obfd, _bfd_copy_private_symbol_data, \ -. (ibfd, isymbol, obfd, osymbol)) +. BFD_SEND (obfd, _bfd_copy_private_symbol_data, \ +. (ibfd, isymbol, obfd, osymbol)) . */ @@ -772,11 +798,10 @@ DESCRIPTION version. It just uses BFD asymbol structures as mini symbols. */ long -_bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep) - bfd *abfd; - bfd_boolean dynamic; - PTR *minisymsp; - unsigned int *sizep; +_bfd_generic_read_minisymbols (bfd *abfd, + bfd_boolean dynamic, + void **minisymsp, + unsigned int *sizep) { long storage; asymbol **syms = NULL; @@ -791,7 +816,7 @@ _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep) if (storage == 0) return 0; - syms = (asymbol **) bfd_malloc ((bfd_size_type) storage); + syms = (asymbol **) bfd_malloc (storage); if (syms == NULL) goto error_return; @@ -802,8 +827,16 @@ _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep) if (symcount < 0) goto error_return; - *minisymsp = (PTR) syms; - *sizep = sizeof (asymbol *); + if (symcount == 0) + /* We return 0 above when storage is 0. Exit in the same state + here, so as to not complicate callers with having to deal with + freeing memory for zero symcount. */ + free (syms); + else + { + *minisymsp = syms; + *sizep = sizeof (asymbol *); + } return symcount; error_return: @@ -818,11 +851,10 @@ _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep) we just return the asymbol the minisymbol points to. */ asymbol * -_bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_boolean dynamic ATTRIBUTE_UNUSED; - const PTR minisym; - asymbol *sym ATTRIBUTE_UNUSED; +_bfd_generic_minisymbol_to_symbol (bfd *abfd ATTRIBUTE_UNUSED, + bfd_boolean dynamic ATTRIBUTE_UNUSED, + const void *minisym, + asymbol *sym ATTRIBUTE_UNUSED) { return *(asymbol **) minisym; } @@ -857,9 +889,7 @@ struct indexentry /* Compare two indexentry structures. This is called via qsort. */ static int -cmpindexentry (a, b) - const PTR a; - const PTR b; +cmpindexentry (const void *a, const void *b) { const struct indexentry *contestantA = (const struct indexentry *) a; const struct indexentry *contestantB = (const struct indexentry *) b; @@ -903,27 +933,24 @@ struct stab_find_info }; bfd_boolean -_bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, - pfilename, pfnname, pline, pinfo) - bfd *abfd; - asymbol **symbols; - asection *section; - bfd_vma offset; - bfd_boolean *pfound; - const char **pfilename; - const char **pfnname; - unsigned int *pline; - PTR *pinfo; +_bfd_stab_section_find_nearest_line (bfd *abfd, + asymbol **symbols, + asection *section, + bfd_vma offset, + bfd_boolean *pfound, + const char **pfilename, + const char **pfnname, + unsigned int *pline, + void **pinfo) { struct stab_find_info *info; bfd_size_type stabsize, strsize; bfd_byte *stab, *str; - bfd_byte *last_stab = NULL; + bfd_byte *nul_fun, *nul_str; bfd_size_type stroff; struct indexentry *indexentry; char *file_name; char *directory_name; - int saw_fun; bfd_boolean saw_line, saw_func; *pfound = FALSE; @@ -960,15 +987,18 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, return TRUE; } - stabsize = info->stabsec->_raw_size; - strsize = info->strsec->_raw_size; + stabsize = (info->stabsec->rawsize + ? info->stabsec->rawsize + : info->stabsec->size); + strsize = (info->strsec->rawsize + ? info->strsec->rawsize + : info->strsec->size); } else { long reloc_size, reloc_count; arelent **reloc_vector; int i; - char *name; char *function_name; bfd_size_type amt = sizeof *info; @@ -985,14 +1015,26 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, if (info->stabsec == NULL || info->strsec == NULL) { - /* No stabs debugging information. Set *pinfo so that we - can return quickly in the info != NULL case above. */ - *pinfo = (PTR) info; - return TRUE; + /* Try SOM section names. */ + info->stabsec = bfd_get_section_by_name (abfd, "$GDB_SYMBOLS$"); + info->strsec = bfd_get_section_by_name (abfd, "$GDB_STRINGS$"); + + if (info->stabsec == NULL || info->strsec == NULL) + { + /* No stabs debugging information. Set *pinfo so that we + can return quickly in the info != NULL case above. */ + *pinfo = info; + return TRUE; + } } - stabsize = info->stabsec->_raw_size; - strsize = info->strsec->_raw_size; + stabsize = (info->stabsec->rawsize + ? info->stabsec->rawsize + : info->stabsec->size); + stabsize = (stabsize / STABSIZE) * STABSIZE; + strsize = (info->strsec->rawsize + ? info->strsec->rawsize + : info->strsec->size); info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize); info->strs = (bfd_byte *) bfd_alloc (abfd, strsize); @@ -1000,11 +1042,15 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, return FALSE; if (! bfd_get_section_contents (abfd, info->stabsec, info->stabs, - (bfd_vma) 0, stabsize) + 0, stabsize) || ! bfd_get_section_contents (abfd, info->strsec, info->strs, - (bfd_vma) 0, strsize)) + 0, strsize)) return FALSE; + /* Stab strings ought to be nul terminated. Ensure the last one + is, to prevent running off the end of the buffer. */ + info->strs[strsize - 1] = 0; + /* If this is a relocatable object file, we have to relocate the entries in .stab. This should always be simple 32 bit relocations against symbols defined in this object file, so @@ -1012,7 +1058,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec); if (reloc_size < 0) return FALSE; - reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size); + reloc_vector = (arelent **) bfd_malloc (reloc_size); if (reloc_vector == NULL && reloc_size != 0) return FALSE; reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector, @@ -1034,26 +1080,33 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, asymbol *sym; r = *pr; + /* Ignore R_*_NONE relocs. */ + if (r->howto->dst_mask == 0) + continue; + if (r->howto->rightshift != 0 || r->howto->size != 2 || r->howto->bitsize != 32 || r->howto->pc_relative || r->howto->bitpos != 0 - || r->howto->dst_mask != 0xffffffff) + || r->howto->dst_mask != 0xffffffff + || r->address * bfd_octets_per_byte (abfd) + 4 > stabsize) { - (*_bfd_error_handler) - (_("Unsupported .stab relocation")); + _bfd_error_handler + (_("unsupported .stab relocation")); bfd_set_error (bfd_error_invalid_operation); if (reloc_vector != NULL) free (reloc_vector); return FALSE; } - val = bfd_get_32 (abfd, info->stabs + r->address); + val = bfd_get_32 (abfd, info->stabs + + r->address * bfd_octets_per_byte (abfd)); val &= r->howto->src_mask; sym = *r->sym_ptr_ptr; val += sym->value + sym->section->vma + r->addend; - bfd_put_32 (abfd, (bfd_vma) val, info->stabs + r->address); + bfd_put_32 (abfd, (bfd_vma) val, info->stabs + + r->address * bfd_octets_per_byte (abfd)); } } @@ -1067,36 +1120,37 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, table. */ info->indextablesize = 0; - saw_fun = 1; + nul_fun = NULL; for (stab = info->stabs; stab < info->stabs + stabsize; stab += STABSIZE) { if (stab[TYPEOFF] == (bfd_byte) N_SO) { - /* N_SO with null name indicates EOF */ - if (bfd_get_32 (abfd, stab + STRDXOFF) == 0) - continue; - /* if we did not see a function def, leave space for one. */ - if (saw_fun == 0) + if (nul_fun != NULL) ++info->indextablesize; - saw_fun = 0; - - /* two N_SO's in a row is a filename and directory. Skip */ - if (stab + STABSIZE < info->stabs + stabsize - && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO) + /* N_SO with null name indicates EOF */ + if (bfd_get_32 (abfd, stab + STRDXOFF) == 0) + nul_fun = NULL; + else { - stab += STABSIZE; + nul_fun = stab; + + /* two N_SO's in a row is a filename and directory. Skip */ + if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize + && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO) + stab += STABSIZE; } } - else if (stab[TYPEOFF] == (bfd_byte) N_FUN) + else if (stab[TYPEOFF] == (bfd_byte) N_FUN + && bfd_get_32 (abfd, stab + STRDXOFF) != 0) { - saw_fun = 1; + nul_fun = NULL; ++info->indextablesize; } } - if (saw_fun == 0) + if (nul_fun != NULL) ++info->indextablesize; if (info->indextablesize == 0) @@ -1111,9 +1165,10 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, file_name = NULL; directory_name = NULL; - saw_fun = 1; + nul_fun = NULL; + stroff = 0; - for (i = 0, stroff = 0, stab = info->stabs, str = info->strs; + for (i = 0, stab = info->stabs, nul_str = str = info->strs; i < info->indextablesize && stab < info->stabs + stabsize; stab += STABSIZE) { @@ -1131,38 +1186,37 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, /* The main file name. */ /* The following code creates a new indextable entry with - a NULL function name if there were no N_FUNs in a file. - Note that a N_SO without a file name is an EOF and - there could be 2 N_SO following it with the new filename - and directory. */ - if (saw_fun == 0) + a NULL function name if there were no N_FUNs in a file. + Note that a N_SO without a file name is an EOF and + there could be 2 N_SO following it with the new filename + and directory. */ + if (nul_fun != NULL) { - info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF); - info->indextable[i].stab = last_stab; - info->indextable[i].str = str; + info->indextable[i].val = bfd_get_32 (abfd, nul_fun + VALOFF); + info->indextable[i].stab = nul_fun; + info->indextable[i].str = nul_str; info->indextable[i].directory_name = directory_name; info->indextable[i].file_name = file_name; info->indextable[i].function_name = NULL; ++i; } - saw_fun = 0; + directory_name = NULL; file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); - if (*file_name == '\0') + if (file_name == (char *) str) { - directory_name = NULL; file_name = NULL; - saw_fun = 1; + nul_fun = NULL; } else { - last_stab = stab; - if (stab + STABSIZE >= info->stabs + stabsize - || *(stab + STABSIZE + TYPEOFF) != (bfd_byte) N_SO) - { - directory_name = NULL; - } - else + nul_fun = stab; + nul_str = str; + if (file_name >= (char *) info->strs + strsize + || file_name < (char *) str) + file_name = NULL; + if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize + && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO) { /* Two consecutive N_SOs are a directory and a file name. */ @@ -1170,6 +1224,9 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, directory_name = file_name; file_name = ((char *) str + bfd_get_32 (abfd, stab + STRDXOFF)); + if (file_name >= (char *) info->strs + strsize + || file_name < (char *) str) + file_name = NULL; } } break; @@ -1177,21 +1234,23 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, case N_SOL: /* The name of an include file. */ file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); + /* PR 17512: file: 0c680a1f. */ + /* PR 17512: file: 5da8aec4. */ + if (file_name >= (char *) info->strs + strsize + || file_name < (char *) str) + file_name = NULL; break; case N_FUN: /* A function name. */ - saw_fun = 1; - name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); - - if (*name == '\0') - name = NULL; - - function_name = name; - - if (name == NULL) + function_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); + if (function_name == (char *) str) continue; + if (function_name >= (char *) info->strs + strsize + || function_name < (char *) str) + function_name = NULL; + nul_fun = NULL; info->indextable[i].val = bfd_get_32 (abfd, stab + VALOFF); info->indextable[i].stab = stab; info->indextable[i].str = str; @@ -1203,11 +1262,11 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, } } - if (saw_fun == 0) + if (nul_fun != NULL) { - info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF); - info->indextable[i].stab = last_stab; - info->indextable[i].str = str; + info->indextable[i].val = bfd_get_32 (abfd, nul_fun + VALOFF); + info->indextable[i].stab = nul_fun; + info->indextable[i].str = nul_str; info->indextable[i].directory_name = directory_name; info->indextable[i].file_name = file_name; info->indextable[i].function_name = NULL; @@ -1226,7 +1285,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, qsort (info->indextable, (size_t) i, sizeof (struct indexentry), cmpindexentry); - *pinfo = (PTR) info; + *pinfo = info; } /* We are passed a section relative offset. The offsets in the @@ -1248,8 +1307,8 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, long low, high; long mid = -1; - /* Cache non-existant or invalid. Do binary search on - indextable. */ + /* Cache non-existent or invalid. Do binary search on + indextable. */ indexentry = NULL; low = 0; @@ -1297,6 +1356,9 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, if (val <= offset) { file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF); + if (file_name >= (char *) info->strs + strsize + || file_name < (char *) str) + file_name = NULL; *pline = 0; } break; @@ -1352,15 +1414,16 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, dirlen = strlen (directory_name); if (info->filename == NULL - || strncmp (info->filename, directory_name, dirlen) != 0 - || strcmp (info->filename + dirlen, file_name) != 0) + || filename_ncmp (info->filename, directory_name, dirlen) != 0 + || filename_cmp (info->filename + dirlen, file_name) != 0) { size_t len; - if (info->filename != NULL) - free (info->filename); + /* Don't free info->filename here. objdump and other + apps keep a copy of a previously returned file name + pointer. */ len = strlen (file_name) + 1; - info->filename = (char *) bfd_malloc ((bfd_size_type) dirlen + len); + info->filename = (char *) bfd_alloc (abfd, dirlen + len); if (info->filename == NULL) return FALSE; memcpy (info->filename, directory_name, dirlen); @@ -1375,8 +1438,8 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, char *s; /* This will typically be something like main:F(0,1), so we want - to clobber the colon. It's OK to change the name, since the - string is in our own local storage anyhow. */ + to clobber the colon. It's OK to change the name, since the + string is in our own local storage anyhow. */ s = strchr (indexentry->function_name, ':'); if (s != NULL) *s = '\0'; @@ -1386,3 +1449,117 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound, return TRUE; } + +long +_bfd_nosymbols_canonicalize_symtab (bfd *abfd ATTRIBUTE_UNUSED, + asymbol **location ATTRIBUTE_UNUSED) +{ + return 0; +} + +void +_bfd_nosymbols_print_symbol (bfd *abfd ATTRIBUTE_UNUSED, + void *afile ATTRIBUTE_UNUSED, + asymbol *symbol ATTRIBUTE_UNUSED, + bfd_print_symbol_type how ATTRIBUTE_UNUSED) +{ +} + +void +_bfd_nosymbols_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED, + asymbol *sym ATTRIBUTE_UNUSED, + symbol_info *ret ATTRIBUTE_UNUSED) +{ +} + +const char * +_bfd_nosymbols_get_symbol_version_string (bfd *abfd, + asymbol *symbol ATTRIBUTE_UNUSED, + bfd_boolean *hidden ATTRIBUTE_UNUSED) +{ + return (const char *) _bfd_ptr_bfd_null_error (abfd); +} + +bfd_boolean +_bfd_nosymbols_bfd_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, + const char *name ATTRIBUTE_UNUSED) +{ + return FALSE; +} + +alent * +_bfd_nosymbols_get_lineno (bfd *abfd, asymbol *sym ATTRIBUTE_UNUSED) +{ + return (alent *) _bfd_ptr_bfd_null_error (abfd); +} + +bfd_boolean +_bfd_nosymbols_find_nearest_line + (bfd *abfd, + asymbol **symbols ATTRIBUTE_UNUSED, + asection *section ATTRIBUTE_UNUSED, + bfd_vma offset ATTRIBUTE_UNUSED, + const char **filename_ptr ATTRIBUTE_UNUSED, + const char **functionname_ptr ATTRIBUTE_UNUSED, + unsigned int *line_ptr ATTRIBUTE_UNUSED, + unsigned int *discriminator_ptr ATTRIBUTE_UNUSED) +{ + return _bfd_bool_bfd_false_error (abfd); +} + +bfd_boolean +_bfd_nosymbols_find_line (bfd *abfd, + asymbol **symbols ATTRIBUTE_UNUSED, + asymbol *symbol ATTRIBUTE_UNUSED, + const char **filename_ptr ATTRIBUTE_UNUSED, + unsigned int *line_ptr ATTRIBUTE_UNUSED) +{ + return _bfd_bool_bfd_false_error (abfd); +} + +bfd_boolean +_bfd_nosymbols_find_inliner_info + (bfd *abfd, + const char **filename_ptr ATTRIBUTE_UNUSED, + const char **functionname_ptr ATTRIBUTE_UNUSED, + unsigned int *line_ptr ATTRIBUTE_UNUSED) +{ + return _bfd_bool_bfd_false_error (abfd); +} + +asymbol * +_bfd_nosymbols_bfd_make_debug_symbol (bfd *abfd, + void *ptr ATTRIBUTE_UNUSED, + unsigned long sz ATTRIBUTE_UNUSED) +{ + return (asymbol *) _bfd_ptr_bfd_null_error (abfd); +} + +long +_bfd_nosymbols_read_minisymbols (bfd *abfd, + bfd_boolean dynamic ATTRIBUTE_UNUSED, + void **minisymsp ATTRIBUTE_UNUSED, + unsigned int *sizep ATTRIBUTE_UNUSED) +{ + return _bfd_long_bfd_n1_error (abfd); +} + +asymbol * +_bfd_nosymbols_minisymbol_to_symbol (bfd *abfd, + bfd_boolean dynamic ATTRIBUTE_UNUSED, + const void *minisym ATTRIBUTE_UNUSED, + asymbol *sym ATTRIBUTE_UNUSED) +{ + return (asymbol *) _bfd_ptr_bfd_null_error (abfd); +} + +long +_bfd_nodynamic_get_synthetic_symtab (bfd *abfd, + long symcount ATTRIBUTE_UNUSED, + asymbol **syms ATTRIBUTE_UNUSED, + long dynsymcount ATTRIBUTE_UNUSED, + asymbol **dynsyms ATTRIBUTE_UNUSED, + asymbol **ret ATTRIBUTE_UNUSED) +{ + return _bfd_long_bfd_n1_error (abfd); +}