X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Fsyms.c;h=7daf741b7b61e27db12e04226599979226cc1f21;hb=f1cee837665a932d3d747597d8512cd0d3650478;hp=9a2754ebe69e674c4c958b95f2251e1dc2dcf727;hpb=fd3619828e94a24a92cddec42cbc0ab33352eeb4;p=binutils-gdb.git diff --git a/bfd/syms.c b/bfd/syms.c index 9a2754ebe69..7daf741b7b6 100644 --- a/bfd/syms.c +++ b/bfd/syms.c @@ -1,5 +1,5 @@ /* Generic symbol-table support for the BFD library. - Copyright (C) 1990-2019 Free Software Foundation, Inc. + Copyright (C) 1990-2021 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -307,6 +307,9 @@ CODE_FRAGMENT . with this name and type in use. BSF_OBJECT must also be set. *} .#define BSF_GNU_UNIQUE (1 << 23) . +. {* This section symbol should be included in the symbol table. *} +.#define BSF_SECTION_SYM_USED (1 << 24) +. . flagword flags; . . {* A pointer to the section to which this symbol is @@ -361,23 +364,23 @@ FUNCTION bfd_is_local_label SYNOPSIS - bfd_boolean bfd_is_local_label (bfd *abfd, asymbol *sym); + bool bfd_is_local_label (bfd *abfd, asymbol *sym); DESCRIPTION Return TRUE if the given symbol @var{sym} in the BFD @var{abfd} is a compiler generated local label, else return FALSE. */ -bfd_boolean +bool 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_FILE | BSF_SECTION_SYM)) != 0) - return FALSE; + return false; if (sym->name == NULL) - return FALSE; + return false; return bfd_is_local_label_name (abfd, sym->name); } @@ -386,7 +389,7 @@ FUNCTION bfd_is_local_label_name SYNOPSIS - bfd_boolean bfd_is_local_label_name (bfd *abfd, const char *name); + bool bfd_is_local_label_name (bfd *abfd, const char *name); DESCRIPTION Return TRUE if a symbol with the name @var{name} in the BFD @@ -404,7 +407,7 @@ FUNCTION bfd_is_target_special_symbol SYNOPSIS - bfd_boolean bfd_is_target_special_symbol (bfd *abfd, asymbol *sym); + bool bfd_is_target_special_symbol (bfd *abfd, asymbol *sym); DESCRIPTION Return TRUE iff a symbol @var{sym} in the BFD @var{abfd} is something @@ -437,7 +440,7 @@ FUNCTION bfd_set_symtab SYNOPSIS - bfd_boolean bfd_set_symtab + bool bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count); DESCRIPTION @@ -446,18 +449,18 @@ DESCRIPTION will be written. */ -bfd_boolean +bool bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int symcount) { if (abfd->format != bfd_object || bfd_read_p (abfd)) { bfd_set_error (bfd_error_invalid_operation); - return FALSE; + return false; } abfd->outsymbols = location; abfd->symcount = symcount; - return TRUE; + return true; } /* @@ -538,7 +541,7 @@ DESCRIPTION asymbol * _bfd_generic_make_empty_symbol (bfd *abfd) { - bfd_size_type amt = sizeof (asymbol); + size_t amt = sizeof (asymbol); asymbol *new_symbol = (asymbol *) bfd_zalloc (abfd, amt); if (new_symbol) new_symbol->the_bfd = abfd; @@ -565,30 +568,15 @@ struct section_to_type char type; }; -/* Map section names to POSIX/BSD single-character symbol types. +/* Map special section names to POSIX/BSD single-character symbol types. This table is probably incomplete. It is sorted for convenience of adding entries. Since it is so short, a linear search is used. */ static const struct section_to_type stt[] = { - {".bss", 'b'}, - {"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 */ - {".fini", 't'}, /* ELF fini section */ {".idata", 'i'}, /* MSVC's .idata (import) section */ - {".init", 't'}, /* ELF init 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). */ - {".scommon", 'c'}, /* Small common. */ - {".sdata", 'g'}, /* Small initialized data. */ - {".text", 't'}, - {"vars", 'd'}, /* MRI .data */ - {"zerovars", 'b'}, /* MRI .bss */ {0, 0} }; @@ -596,8 +584,7 @@ static const struct section_to_type stt[] = section S, or '?' for an unknown COFF section. 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. */ + or '$' so .idata5 matches the .idata entry. */ static char coff_section_type (const char *s) @@ -619,7 +606,7 @@ coff_section_type (const char *s) SECTION, or '?' for an unknown section. This uses section flags to identify sections. - FIXME These types are unhandled: c, i, e, p. If we handled these also, + FIXME These types are unhandled: e, i, p. If we handled these also, we could perhaps obsolete coff_section_type. */ static char @@ -667,8 +654,17 @@ bfd_decode_symclass (asymbol *symbol) { char c; + /* Paranoia... */ + if (symbol == NULL || symbol->section == NULL) + return '?'; + if (symbol->section && bfd_is_com_section (symbol->section)) - return 'C'; + { + if (symbol->section->flags & SEC_SMALL_DATA) + return 'c'; + else + return 'C'; + } if (bfd_is_und_section (symbol->section)) { if (symbol->flags & BSF_WEAK) @@ -705,9 +701,9 @@ bfd_decode_symclass (asymbol *symbol) c = 'a'; else if (symbol->section) { - c = decode_section_type (symbol->section); + c = coff_section_type (symbol->section->name); if (c == '?') - c = coff_section_type (symbol->section->name); + c = decode_section_type (symbol->section); } else return '?'; @@ -735,10 +731,10 @@ DESCRIPTION Returns zero otherwise. SYNOPSIS - bfd_boolean bfd_is_undefined_symclass (int symclass); + bool bfd_is_undefined_symclass (int symclass); */ -bfd_boolean +bool bfd_is_undefined_symclass (int symclass) { return symclass == 'U' || symclass == 'w' || symclass == 'v'; @@ -775,7 +771,7 @@ FUNCTION bfd_copy_private_symbol_data SYNOPSIS - bfd_boolean bfd_copy_private_symbol_data + bool bfd_copy_private_symbol_data (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym); DESCRIPTION @@ -799,7 +795,7 @@ DESCRIPTION long _bfd_generic_read_minisymbols (bfd *abfd, - bfd_boolean dynamic, + bool dynamic, void **minisymsp, unsigned int *sizep) { @@ -841,8 +837,7 @@ _bfd_generic_read_minisymbols (bfd *abfd, error_return: bfd_set_error (bfd_error_no_symbols); - if (syms != NULL) - free (syms); + free (syms); return -1; } @@ -852,7 +847,7 @@ _bfd_generic_read_minisymbols (bfd *abfd, asymbol * _bfd_generic_minisymbol_to_symbol (bfd *abfd ATTRIBUTE_UNUSED, - bfd_boolean dynamic ATTRIBUTE_UNUSED, + bool dynamic ATTRIBUTE_UNUSED, const void *minisym, asymbol *sym ATTRIBUTE_UNUSED) { @@ -884,6 +879,7 @@ struct indexentry char *directory_name; char *file_name; char *function_name; + int idx; }; /* Compare two indexentry structures. This is called via qsort. */ @@ -896,10 +892,9 @@ cmpindexentry (const void *a, const void *b) if (contestantA->val < contestantB->val) return -1; - else if (contestantA->val > contestantB->val) + if (contestantA->val > contestantB->val) return 1; - else - return 0; + return contestantA->idx - contestantB->idx; } /* A pointer to this structure is stored in *pinfo. */ @@ -932,12 +927,12 @@ struct stab_find_info char *filename; }; -bfd_boolean +bool _bfd_stab_section_find_nearest_line (bfd *abfd, asymbol **symbols, asection *section, bfd_vma offset, - bfd_boolean *pfound, + bool *pfound, const char **pfilename, const char **pfnname, unsigned int *pline, @@ -951,9 +946,9 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, struct indexentry *indexentry; char *file_name; char *directory_name; - bfd_boolean saw_line, saw_func; + bool saw_line, saw_func; - *pfound = FALSE; + *pfound = false; *pfilename = bfd_get_filename (abfd); *pfnname = NULL; *pline = 0; @@ -984,7 +979,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, if (info->stabsec == NULL || info->strsec == NULL) { /* No stabs debugging information. */ - return TRUE; + return true; } stabsize = (info->stabsec->rawsize @@ -1004,7 +999,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, info = (struct stab_find_info *) bfd_zalloc (abfd, amt); if (info == NULL) - return FALSE; + return false; /* FIXME: When using the linker --split-by-file or --split-by-reloc options, it is possible for the .stab and @@ -1024,7 +1019,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, /* No stabs debugging information. Set *pinfo so that we can return quickly in the info != NULL case above. */ *pinfo = info; - return TRUE; + return true; } } @@ -1039,13 +1034,13 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize); info->strs = (bfd_byte *) bfd_alloc (abfd, strsize); if (info->stabs == NULL || info->strs == NULL) - return FALSE; + return false; if (! bfd_get_section_contents (abfd, info->stabsec, info->stabs, 0, stabsize) || ! bfd_get_section_contents (abfd, info->strsec, info->strs, 0, strsize)) - return FALSE; + return false; /* Stab strings ought to be nul terminated. Ensure the last one is, to prevent running off the end of the buffer. */ @@ -1057,17 +1052,16 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, this should be no big deal. */ reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec); if (reloc_size < 0) - return FALSE; + return false; reloc_vector = (arelent **) bfd_malloc (reloc_size); if (reloc_vector == NULL && reloc_size != 0) - return FALSE; + return false; reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector, symbols); if (reloc_count < 0) { - if (reloc_vector != NULL) - free (reloc_vector); - return FALSE; + free (reloc_vector); + return false; } if (reloc_count > 0) { @@ -1078,40 +1072,38 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, arelent *r; unsigned long val; asymbol *sym; + bfd_size_type octets; r = *pr; /* Ignore R_*_NONE relocs. */ if (r->howto->dst_mask == 0) continue; + octets = r->address * bfd_octets_per_byte (abfd, NULL); 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->address * bfd_octets_per_byte (abfd) + 4 > stabsize) + || octets + 4 > stabsize) { _bfd_error_handler (_("unsupported .stab relocation")); bfd_set_error (bfd_error_invalid_operation); - if (reloc_vector != NULL) - free (reloc_vector); - return FALSE; + free (reloc_vector); + return false; } - val = bfd_get_32 (abfd, info->stabs - + r->address * bfd_octets_per_byte (abfd)); + val = bfd_get_32 (abfd, info->stabs + octets); 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_octets_per_byte (abfd)); + bfd_put_32 (abfd, (bfd_vma) val, info->stabs + octets); } } - if (reloc_vector != NULL) - free (reloc_vector); + free (reloc_vector); /* First time through this function, build a table matching function VM addresses to stabs, then sort based on starting @@ -1154,14 +1146,14 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, ++info->indextablesize; if (info->indextablesize == 0) - return TRUE; + return true; ++info->indextablesize; amt = info->indextablesize; amt *= sizeof (struct indexentry); info->indextable = (struct indexentry *) bfd_alloc (abfd, amt); if (info->indextable == NULL) - return FALSE; + return false; file_name = NULL; directory_name = NULL; @@ -1198,6 +1190,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, info->indextable[i].directory_name = directory_name; info->indextable[i].file_name = file_name; info->indextable[i].function_name = NULL; + info->indextable[i].idx = i; ++i; } @@ -1257,6 +1250,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, info->indextable[i].directory_name = directory_name; info->indextable[i].file_name = file_name; info->indextable[i].function_name = function_name; + info->indextable[i].idx = i; ++i; break; } @@ -1270,6 +1264,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, info->indextable[i].directory_name = directory_name; info->indextable[i].file_name = file_name; info->indextable[i].function_name = NULL; + info->indextable[i].idx = i; ++i; } @@ -1279,6 +1274,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, info->indextable[i].directory_name = NULL; info->indextable[i].file_name = NULL; info->indextable[i].function_name = NULL; + info->indextable[i].idx = i; ++i; info->indextablesize = i; @@ -1330,7 +1326,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, } if (indexentry == NULL) - return TRUE; + return true; stab = indexentry->stab + STABSIZE; file_name = indexentry->file_name; @@ -1339,14 +1335,14 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, directory_name = indexentry->directory_name; str = indexentry->str; - saw_line = FALSE; - saw_func = FALSE; + saw_line = false; + saw_func = false; for (; stab < (indexentry+1)->stab; stab += STABSIZE) { - bfd_boolean done; + bool done; bfd_vma val; - done = FALSE; + done = false; switch (stab[TYPEOFF]) { @@ -1387,15 +1383,15 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, #endif } if (val > offset) - done = TRUE; - saw_line = TRUE; + done = true; + saw_line = true; break; case N_FUN: case N_SO: if (saw_func || saw_line) - done = TRUE; - saw_func = TRUE; + done = true; + saw_func = true; break; } @@ -1403,7 +1399,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, break; } - *pfound = TRUE; + *pfound = true; if (file_name == NULL || IS_ABSOLUTE_PATH (file_name) || directory_name == NULL) @@ -1425,7 +1421,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, len = strlen (file_name) + 1; info->filename = (char *) bfd_alloc (abfd, dirlen + len); if (info->filename == NULL) - return FALSE; + return false; memcpy (info->filename, directory_name, dirlen); memcpy (info->filename + dirlen, file_name, len); } @@ -1447,7 +1443,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd, *pfnname = indexentry->function_name; } - return TRUE; + return true; } long @@ -1475,16 +1471,17 @@ _bfd_nosymbols_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED, const char * _bfd_nosymbols_get_symbol_version_string (bfd *abfd, asymbol *symbol ATTRIBUTE_UNUSED, - bfd_boolean *hidden ATTRIBUTE_UNUSED) + bool base_p ATTRIBUTE_UNUSED, + bool *hidden ATTRIBUTE_UNUSED) { return (const char *) _bfd_ptr_bfd_null_error (abfd); } -bfd_boolean +bool _bfd_nosymbols_bfd_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name ATTRIBUTE_UNUSED) { - return FALSE; + return false; } alent * @@ -1493,7 +1490,7 @@ _bfd_nosymbols_get_lineno (bfd *abfd, asymbol *sym ATTRIBUTE_UNUSED) return (alent *) _bfd_ptr_bfd_null_error (abfd); } -bfd_boolean +bool _bfd_nosymbols_find_nearest_line (bfd *abfd, asymbol **symbols ATTRIBUTE_UNUSED, @@ -1507,7 +1504,7 @@ _bfd_nosymbols_find_nearest_line return _bfd_bool_bfd_false_error (abfd); } -bfd_boolean +bool _bfd_nosymbols_find_line (bfd *abfd, asymbol **symbols ATTRIBUTE_UNUSED, asymbol *symbol ATTRIBUTE_UNUSED, @@ -1517,7 +1514,7 @@ _bfd_nosymbols_find_line (bfd *abfd, return _bfd_bool_bfd_false_error (abfd); } -bfd_boolean +bool _bfd_nosymbols_find_inliner_info (bfd *abfd, const char **filename_ptr ATTRIBUTE_UNUSED, @@ -1537,7 +1534,7 @@ _bfd_nosymbols_bfd_make_debug_symbol (bfd *abfd, long _bfd_nosymbols_read_minisymbols (bfd *abfd, - bfd_boolean dynamic ATTRIBUTE_UNUSED, + bool dynamic ATTRIBUTE_UNUSED, void **minisymsp ATTRIBUTE_UNUSED, unsigned int *sizep ATTRIBUTE_UNUSED) { @@ -1546,7 +1543,7 @@ _bfd_nosymbols_read_minisymbols (bfd *abfd, asymbol * _bfd_nosymbols_minisymbol_to_symbol (bfd *abfd, - bfd_boolean dynamic ATTRIBUTE_UNUSED, + bool dynamic ATTRIBUTE_UNUSED, const void *minisym ATTRIBUTE_UNUSED, asymbol *sym ATTRIBUTE_UNUSED) {