X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Fnm.c;h=256f7e220a1abd18cf56122c899f4af40afdccef;hb=d557977487bc21e8ed19603527949a8541c44832;hp=ecd147e040042421ed51ca7ca940ba318f341706;hpb=b794fc1d1c3a3dfb65b74a36fe96c474fee65000;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/nm.c b/binutils/nm.c index ecd147e040..256f7e220a 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -1,5 +1,5 @@ /* nm.c -- Describe symbol table of a rel file. - Copyright (C) 1991-2014 Free Software Foundation, Inc. + Copyright (C) 1991-2019 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -28,7 +28,15 @@ #include "libiberty.h" #include "elf-bfd.h" #include "elf/common.h" +#define DO_NOT_DEFINE_AOUTHDR +#define DO_NOT_DEFINE_FILHDR +#define DO_NOT_DEFINE_LINENO +#define DO_NOT_DEFINE_SCNHDR +#include "coff/external.h" +#include "coff/internal.h" +#include "libcoff.h" #include "bucomm.h" +#include "plugin-api.h" #include "plugin.h" /* When sorting by size, we use this structure to hold the size and a @@ -56,6 +64,7 @@ struct extended_symbol_info symbol_info *sinfo; bfd_vma ssize; elf_symbol_type *elfinfo; + coff_symbol_type *coffinfo; /* FIXME: We should add more fields for Type, Line, Section. */ }; #define SYM_NAME(sym) (sym->sinfo->name) @@ -148,10 +157,12 @@ static int sort_by_size = 0; /* Sort by size of symbol. */ static int undefined_only = 0; /* Print undefined symbols only. */ static int dynamic = 0; /* Print dynamic symbols. */ static int show_version = 0; /* Show the version number. */ -static int show_stats = 0; /* Show statistics. */ static int show_synthetic = 0; /* Display synthesized symbols too. */ static int line_numbers = 0; /* Print line numbers for symbols. */ static int allow_special_symbols = 0; /* Allow special symbols. */ +static int with_symbol_versions = 0; /* Include symbol version information in the output. */ + +static int demangle_flags = DMGL_ANSI | DMGL_PARAMS; /* When to print the names of files. Not mutually exclusive in SYSV format. */ static int filename_per_file = 0; /* Once per file, on its own line. */ @@ -185,9 +196,14 @@ static const char *plugin_target = NULL; static bfd *lineno_cache_bfd; static bfd *lineno_cache_rel_bfd; -#define OPTION_TARGET 200 -#define OPTION_PLUGIN (OPTION_TARGET + 1) -#define OPTION_SIZE_SORT (OPTION_PLUGIN + 1) +enum long_option_values +{ + OPTION_TARGET = 200, + OPTION_PLUGIN, + OPTION_SIZE_SORT, + OPTION_RECURSE_LIMIT, + OPTION_NO_RECURSE_LIMIT +}; static struct option long_options[] = { @@ -200,6 +216,8 @@ static struct option long_options[] = {"line-numbers", no_argument, 0, 'l'}, {"no-cplus", no_argument, &do_demangle, 0}, /* Linux compatibility. */ {"no-demangle", no_argument, &do_demangle, 0}, + {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT}, + {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT}, {"no-sort", no_argument, 0, 'p'}, {"numeric-sort", no_argument, 0, 'n'}, {"plugin", required_argument, 0, OPTION_PLUGIN}, @@ -208,21 +226,23 @@ static struct option long_options[] = {"print-file-name", no_argument, 0, 'o'}, {"print-size", no_argument, 0, 'S'}, {"radix", required_argument, 0, 't'}, + {"recurse-limit", no_argument, NULL, OPTION_RECURSE_LIMIT}, + {"recursion-limit", no_argument, NULL, OPTION_RECURSE_LIMIT}, {"reverse-sort", no_argument, &reverse_sort, 1}, {"size-sort", no_argument, 0, OPTION_SIZE_SORT}, {"special-syms", no_argument, &allow_special_symbols, 1}, - {"stats", no_argument, &show_stats, 1}, {"synthetic", no_argument, &show_synthetic, 1}, {"target", required_argument, 0, OPTION_TARGET}, {"defined-only", no_argument, &defined_only, 1}, {"undefined-only", no_argument, &undefined_only, 1}, {"version", no_argument, &show_version, 1}, + {"with-symbol-versions", no_argument, &with_symbol_versions, 1}, {0, no_argument, 0, 0} }; /* Some error-reporting functions. */ -static void +ATTRIBUTE_NORETURN static void usage (FILE *stream, int status) { fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name); @@ -236,6 +256,8 @@ usage (FILE *stream, int status) `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\ or `gnat'\n\ --no-demangle Do not demangle low-level symbol names\n\ + --recurse-limit Enable a demangling recursion limit. This is the default.\n\ + --no-recurse-limit Disable a demangling recursion limit.\n\ -D, --dynamic Display dynamic symbols instead of normal symbols\n\ --defined-only Display only defined symbols\n\ -e (ignored)\n\ @@ -262,6 +284,7 @@ usage (FILE *stream, int status) -t, --radix=RADIX Use RADIX for printing symbol values\n\ --target=BFDNAME Specify the target object format as BFDNAME\n\ -u, --undefined-only Display only undefined symbols\n\ + --with-symbol-versions Display version strings after symbol names\n\ -X 32_64 (ignored)\n\ @FILE Read options from FILE\n\ -h, --help Display this information\n\ @@ -331,9 +354,10 @@ set_output_format (char *f) } static const char * -get_symbol_type (unsigned int type) +get_elf_symbol_type (unsigned int type) { - static char buff [32]; + static char *bufp; + int n; switch (type) { @@ -344,15 +368,48 @@ get_symbol_type (unsigned int type) case STT_FILE: return "FILE"; case STT_COMMON: return "COMMON"; case STT_TLS: return "TLS"; - default: - if (type >= STT_LOPROC && type <= STT_HIPROC) - sprintf (buff, _(": %d"), type); - else if (type >= STT_LOOS && type <= STT_HIOS) - sprintf (buff, _(": %d"), type); - else - sprintf (buff, _(": %d"), type); - return buff; } + + free (bufp); + if (type >= STT_LOPROC && type <= STT_HIPROC) + n = asprintf (&bufp, _(": %d"), type); + else if (type >= STT_LOOS && type <= STT_HIOS) + n = asprintf (&bufp, _(": %d"), type); + else + n = asprintf (&bufp, _(": %d"), type); + if (n < 0) + fatal ("%s", xstrerror (errno)); + return bufp; +} + +static const char * +get_coff_symbol_type (const struct internal_syment *sym) +{ + static char *bufp; + int n; + + switch (sym->n_sclass) + { + case C_BLOCK: return "Block"; + case C_FILE: return "File"; + case C_LINE: return "Line"; + } + + if (!sym->n_type) + return "None"; + + switch (DTYPE(sym->n_type)) + { + case DT_FCN: return "Function"; + case DT_PTR: return "Pointer"; + case DT_ARY: return "Array"; + } + + free (bufp); + n = asprintf (&bufp, _(": %d/%d"), sym->n_sclass, sym->n_type); + if (n < 0) + fatal ("%s", xstrerror (errno)); + return bufp; } /* Print symbol name NAME, read from ABFD, with printf format FORM, @@ -363,7 +420,7 @@ print_symname (const char *form, const char *name, bfd *abfd) { if (do_demangle && *name) { - char *res = bfd_demangle (abfd, name, DMGL_ANSI | DMGL_PARAMS); + char *res = bfd_demangle (abfd, name, demangle_flags); if (res != NULL) { @@ -434,7 +491,9 @@ filter_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, if (sym == NULL) bfd_fatal (bfd_get_filename (abfd)); - if (strcmp (sym->name, "__gnu_lto_slim") == 0) + if (sym->name[0] == '_' + && sym->name[1] == '_' + && strcmp (sym->name + (sym->name[2] == '_'), "__gnu_lto_slim") == 0) non_fatal (_("%s: plugin needed to handle lto object"), bfd_get_filename (abfd)); @@ -639,7 +698,8 @@ size_forward1 (const void *P_x, const void *P_y) #define file_symbol(s, sn, snl) \ (((s)->flags & BSF_FILE) != 0 \ - || ((sn)[(snl) - 2] == '.' \ + || ((snl) > 2 \ + && (sn)[(snl) - 2] == '.' \ && ((sn)[(snl) - 1] == 'o' \ || (sn)[(snl) - 1] == 'a'))) @@ -731,9 +791,14 @@ sort_symbols_by_size (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, sec = bfd_get_section (sym); - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) + /* Synthetic symbols don't have a full type set of data available, thus + we can't rely on that information for the symbol size. Ditto for + bfd/section.c:global_syms like *ABS*. */ + if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0 + && bfd_get_flavour (abfd) == bfd_target_elf_flavour) sz = ((elf_symbol_type *) sym)->internal_elf_sym.st_size; - else if (bfd_is_com_section (sec)) + else if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0 + && bfd_is_com_section (sec)) sz = sym->value; else { @@ -806,7 +871,10 @@ get_relocs (bfd *abfd, asection *sec, void *dataarg) /* Print a single symbol. */ static void -print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd) +print_symbol (bfd * abfd, + asymbol * sym, + bfd_vma ssize, + bfd * archive_bfd) { symbol_info syminfo; struct extended_symbol_info info; @@ -816,14 +884,39 @@ print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd) format->print_symbol_filename (archive_bfd, abfd); bfd_get_symbol_info (abfd, sym, &syminfo); + info.sinfo = &syminfo; info.ssize = ssize; - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) - info.elfinfo = (elf_symbol_type *) sym; + /* Synthetic symbols do not have a full symbol type set of data available. + Nor do bfd/section.c:global_syms like *ABS*. */ + if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) != 0) + { + info.elfinfo = NULL; + info.coffinfo = NULL; + } else - info.elfinfo = NULL; + { + info.elfinfo = elf_symbol_from (abfd, sym); + info.coffinfo = coff_symbol_from (sym); + } + format->print_symbol_info (&info, abfd); + if (with_symbol_versions) + { + const char * version_string = NULL; + bfd_boolean hidden = FALSE; + + if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0) + version_string = bfd_get_symbol_version_string (abfd, sym, &hidden); + + if (bfd_is_und_section (bfd_get_section (sym))) + hidden = TRUE; + + if (version_string && *version_string != '\0') + printf (hidden ? "@%s" : "@@%s", version_string); + } + if (line_numbers) { static asymbol **syms; @@ -941,12 +1034,15 @@ print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd) /* Print the symbols when sorting by size. */ static void -print_size_symbols (bfd *abfd, bfd_boolean is_dynamic, - struct size_sym *symsizes, long symcount, - bfd *archive_bfd) +print_size_symbols (bfd * abfd, + bfd_boolean is_dynamic, + struct size_sym * symsizes, + long symcount, + bfd * archive_bfd) { asymbol *store; - struct size_sym *from, *fromend; + struct size_sym *from; + struct size_sym *fromend; store = bfd_make_empty_symbol (abfd); if (store == NULL) @@ -954,6 +1050,7 @@ print_size_symbols (bfd *abfd, bfd_boolean is_dynamic, from = symsizes; fromend = from + symcount; + for (; from < fromend; from++) { asymbol *sym; @@ -967,15 +1064,25 @@ print_size_symbols (bfd *abfd, bfd_boolean is_dynamic, } -/* Print the symbols. If ARCHIVE_BFD is non-NULL, it is the archive - containing ABFD. */ +/* Print the symbols of ABFD that are held in MINISYMS. + + If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD. + + SYMCOUNT is the number of symbols in MINISYMS. + + SIZE is the size of a symbol in MINISYMS. */ static void -print_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, long symcount, - unsigned int size, bfd *archive_bfd) +print_symbols (bfd * abfd, + bfd_boolean is_dynamic, + void * minisyms, + long symcount, + unsigned int size, + bfd * archive_bfd) { asymbol *store; - bfd_byte *from, *fromend; + bfd_byte *from; + bfd_byte *fromend; store = bfd_make_empty_symbol (abfd); if (store == NULL) @@ -983,6 +1090,7 @@ print_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, long symcount, from = (bfd_byte *) minisyms; fromend = from + symcount * size; + for (; from < fromend; from += size) { asymbol *sym; @@ -1004,6 +1112,7 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) void *minisyms; unsigned int size; struct size_sym *symsizes; + asymbol *synthsyms = NULL; if (! dynamic) { @@ -1034,12 +1143,11 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) if (show_synthetic && size == sizeof (asymbol *)) { - asymbol *synthsyms; - long synth_count; asymbol **static_syms = NULL; asymbol **dyn_syms = NULL; long static_count = 0; long dyn_count = 0; + long synth_count; if (dynamic) { @@ -1061,22 +1169,20 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) bfd_fatal (bfd_get_filename (abfd)); } } + synth_count = bfd_get_synthetic_symtab (abfd, static_count, static_syms, dyn_count, dyn_syms, &synthsyms); if (synth_count > 0) { asymbol **symp; - void *new_mini; long i; - new_mini = xmalloc ((symcount + synth_count + 1) * sizeof (*symp)); - symp = (asymbol **) new_mini; - memcpy (symp, minisyms, symcount * sizeof (*symp)); - symp += symcount; + minisyms = xrealloc (minisyms, + (symcount + synth_count + 1) * sizeof (*symp)); + symp = (asymbol **) minisyms + symcount; for (i = 0; i < synth_count; i++) *symp++ = synthsyms + i; *symp = 0; - minisyms = new_mini; symcount += synth_count; } } @@ -1110,6 +1216,8 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) else print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd); + if (synthsyms) + free (synthsyms); free (minisyms); free (symsizes); } @@ -1181,6 +1289,8 @@ display_archive (bfd *file) bfd_close (last_arfile); lineno_cache_bfd = NULL; lineno_cache_rel_bfd = NULL; + if (arfile == last_arfile) + return; } last_arfile = arfile; } @@ -1434,7 +1544,6 @@ print_symbol_info_bsd (struct extended_symbol_info *info, bfd *abfd) print_value (abfd, SYM_SIZE (info)); else print_value (abfd, SYM_VALUE (info)); - if (print_size && SYM_SIZE (info)) { printf (" "); @@ -1485,7 +1594,10 @@ print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd) /* Type, Size, Line, Section */ if (info->elfinfo) printf ("%18s|", - get_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info))); + get_elf_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info))); + else if (info->coffinfo) + printf ("%18s|", + get_coff_symbol_type (&info->coffinfo->native->u.syment)); else printf (" |"); @@ -1501,6 +1613,8 @@ print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd) if (info->elfinfo) printf("| |%s", info->elfinfo->symbol.section->name); + else if (info->coffinfo) + printf("| |%s", info->coffinfo->symbol.section->name); else printf("| |"); } @@ -1541,6 +1655,7 @@ main (int argc, char **argv) program_name = *argv; xmalloc_set_program_name (program_name); + bfd_set_error_program_name (program_name); #if BFD_SUPPORTS_PLUGINS bfd_plugin_set_program_name (program_name); #endif @@ -1549,7 +1664,8 @@ main (int argc, char **argv) expandargv (&argc, &argv); - bfd_init (); + if (bfd_init () != BFD_INIT_MAGIC) + fatal (_("fatal error: libbfd ABI mismatch")); set_default_bfd_target (); while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uvVvX:", @@ -1581,6 +1697,12 @@ main (int argc, char **argv) cplus_demangle_set_style (style); } break; + case OPTION_RECURSE_LIMIT: + demangle_flags &= ~ DMGL_NO_RECURSE_LIMIT; + break; + case OPTION_NO_RECURSE_LIMIT: + demangle_flags |= DMGL_NO_RECURSE_LIMIT; + break; case 'D': dynamic = 1; break; @@ -1697,15 +1819,6 @@ main (int argc, char **argv) END_PROGRESS (program_name); -#ifdef HAVE_SBRK - if (show_stats) - { - char *lim = (char *) sbrk (0); - - non_fatal (_("data size %ld"), (long) (lim - (char *) &environ)); - } -#endif - exit (retval); return retval; }