/* nm.c -- Describe symbol table of a rel file.
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002
+ 2001, 2002, 2003
Free Software Foundation, Inc.
This file is part of GNU Binutils.
#include "bfd.h"
#include "progress.h"
#include "bucomm.h"
+#include "budemang.h"
#include "getopt.h"
#include "aout/stab_gnu.h"
#include "aout/ranlib.h"
#include "demangle.h"
#include "libiberty.h"
#include "elf-bfd.h"
+#include "elf/common.h"
/* When sorting by size, we use this structure to hold the size and a
pointer to the minisymbol. */
asymbol **syms;
};
-struct extended_symbol_info
+struct extended_symbol_info
{
symbol_info *sinfo;
bfd_vma ssize;
+ elf_symbol_type *elfinfo;
/* FIXME: We should add more fields for Type, Line, Section. */
};
#define SYM_NAME(sym) (sym->sinfo->name)
#define SYM_STAB_NAME(sym) (sym->sinfo->stab_name)
#define SYM_STAB_DESC(sym) (sym->sinfo->stab_desc)
#define SYM_STAB_OTHER(sym) (sym->sinfo->stab_other)
-#define SYM_SIZE(sym) (sym->ssize)
-
-static void usage PARAMS ((FILE *, int));
-static void set_print_radix PARAMS ((char *));
-static void set_output_format PARAMS ((char *));
-static void display_archive PARAMS ((bfd *));
-static boolean display_file PARAMS ((char *));
-static void display_rel_file PARAMS ((bfd *, bfd *));
-static long filter_symbols PARAMS ((bfd *, boolean, PTR, long, unsigned int));
-static long sort_symbols_by_size PARAMS ((bfd *, boolean, PTR, long, unsigned int, struct size_sym **));
-static void print_symbols PARAMS ((bfd *, boolean, PTR, long, unsigned int, bfd *));
-static void print_size_symbols PARAMS ((bfd *, boolean, struct size_sym *, long, bfd *));
-static void print_symname PARAMS ((const char *, const char *, bfd *));
-static void print_symbol PARAMS ((bfd *, asymbol *, bfd_vma ssize, bfd *));
-static void print_symdef_entry PARAMS ((bfd *));
+#define SYM_SIZE(sym) \
+ (sym->elfinfo ? sym->elfinfo->internal_elf_sym.st_size: sym->ssize)
+
+static void usage
+ PARAMS ((FILE *, int));
+static void set_print_radix
+ PARAMS ((char *));
+static void set_output_format
+ PARAMS ((char *));
+static void display_archive
+ PARAMS ((bfd *));
+static bfd_boolean display_file
+ PARAMS ((char *));
+static void display_rel_file
+ PARAMS ((bfd *, bfd *));
+static long filter_symbols
+ PARAMS ((bfd *, bfd_boolean, PTR, long, unsigned int));
+static long sort_symbols_by_size
+ PARAMS ((bfd *, bfd_boolean, PTR, long, unsigned int, struct size_sym **));
+static void print_symbols
+ PARAMS ((bfd *, bfd_boolean, PTR, long, unsigned int, bfd *));
+static void print_size_symbols
+ PARAMS ((bfd *, bfd_boolean, struct size_sym *, long, bfd *));
+static void print_symname
+ PARAMS ((const char *, const char *, bfd *));
+static void print_symbol
+ PARAMS ((bfd *, asymbol *, bfd_vma ssize, bfd *));
+static void print_symdef_entry
+ PARAMS ((bfd *));
/* The sorting functions. */
-static int numeric_forward PARAMS ((const PTR, const PTR));
-static int numeric_reverse PARAMS ((const PTR, const PTR));
-static int non_numeric_forward PARAMS ((const PTR, const PTR));
-static int non_numeric_reverse PARAMS ((const PTR, const PTR));
-static int size_forward1 PARAMS ((const PTR, const PTR));
-static int size_forward2 PARAMS ((const PTR, const PTR));
+static int numeric_forward
+ PARAMS ((const PTR, const PTR));
+static int numeric_reverse
+ PARAMS ((const PTR, const PTR));
+static int non_numeric_forward
+ PARAMS ((const PTR, const PTR));
+static int non_numeric_reverse
+ PARAMS ((const PTR, const PTR));
+static int size_forward1
+ PARAMS ((const PTR, const PTR));
+static int size_forward2
+ PARAMS ((const PTR, const PTR));
/* The output formatting functions. */
-static void print_object_filename_bsd PARAMS ((char *));
-static void print_object_filename_sysv PARAMS ((char *));
-static void print_object_filename_posix PARAMS ((char *));
-static void print_archive_filename_bsd PARAMS ((char *));
-static void print_archive_filename_sysv PARAMS ((char *));
-static void print_archive_filename_posix PARAMS ((char *));
-static void print_archive_member_bsd PARAMS ((char *, const char *));
-static void print_archive_member_sysv PARAMS ((char *, const char *));
-static void print_archive_member_posix PARAMS ((char *, const char *));
-static void print_symbol_filename_bsd PARAMS ((bfd *, bfd *));
-static void print_symbol_filename_sysv PARAMS ((bfd *, bfd *));
-static void print_symbol_filename_posix PARAMS ((bfd *, bfd *));
-static void print_value PARAMS ((bfd *, bfd_vma));
-static void print_symbol_info_bsd PARAMS ((struct extended_symbol_info *, bfd *));
-static void print_symbol_info_sysv PARAMS ((struct extended_symbol_info *, bfd *));
-static void print_symbol_info_posix PARAMS ((struct extended_symbol_info *, bfd *));
-static void get_relocs PARAMS ((bfd *, asection *, PTR));
+static void print_object_filename_bsd
+ PARAMS ((char *));
+static void print_object_filename_sysv
+ PARAMS ((char *));
+static void print_object_filename_posix
+ PARAMS ((char *));
+static void print_archive_filename_bsd
+ PARAMS ((char *));
+static void print_archive_filename_sysv
+ PARAMS ((char *));
+static void print_archive_filename_posix
+ PARAMS ((char *));
+static void print_archive_member_bsd
+ PARAMS ((char *, const char *));
+static void print_archive_member_sysv
+ PARAMS ((char *, const char *));
+static void print_archive_member_posix
+ PARAMS ((char *, const char *));
+static void print_symbol_filename_bsd
+ PARAMS ((bfd *, bfd *));
+static void print_symbol_filename_sysv
+ PARAMS ((bfd *, bfd *));
+static void print_symbol_filename_posix
+ PARAMS ((bfd *, bfd *));
+static void print_value
+ PARAMS ((bfd *, bfd_vma));
+static void print_symbol_info_bsd
+ PARAMS ((struct extended_symbol_info *, bfd *));
+static void print_symbol_info_sysv
+ PARAMS ((struct extended_symbol_info *, bfd *));
+static void print_symbol_info_posix
+ PARAMS ((struct extended_symbol_info *, bfd *));
+static void get_relocs
+ PARAMS ((bfd *, asection *, PTR));
+static const char * get_symbol_type
+ PARAMS ((unsigned int));
/* Support for different output formats. */
struct output_fns
static int no_sort = 0; /* Don't sort; print syms in order found. */
static int print_debug_syms = 0;/* Print debugger-only symbols too. */
static int print_armap = 0; /* Describe __.SYMDEF data in archive files. */
+static int print_size = 0; /* Print size of defined symbols. */
static int reverse_sort = 0; /* Sort in downward(alpha or numeric) order. */
static int sort_numerically = 0;/* Sort in numeric rather than alpha order. */
static int sort_by_size = 0; /* Sort by size of symbol. */
{"portability", no_argument, 0, 'P'},
{"print-armap", no_argument, &print_armap, 1},
{"print-file-name", no_argument, 0, 'o'},
+ {"print-size", no_argument, 0, 'S'},
{"radix", required_argument, 0, 't'},
{"reverse-sort", no_argument, &reverse_sort, 1},
{"size-sort", no_argument, &sort_by_size, 1},
-B Same as --format=bsd\n\
-C, --demangle[=STYLE] Decode low-level symbol names into user-level names\n\
The STYLE, if specified, can be `auto' (the default),\n\
- `gnu', 'lucid', 'arm', 'hp', 'edg' or 'gnu-new-abi'\n\
+ `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\
+ or `gnat'\n\
--no-demangle Do not demangle low-level symbol names\n\
-D, --dynamic Display dynamic symbols instead of normal symbols\n\
--defined-only Display only defined symbols\n\
-p, --no-sort Do not sort the symbols\n\
-P, --portability Same as --format=posix\n\
-r, --reverse-sort Reverse the sense of the sort\n\
+ -S, --print-size Print size of defined symbols\n\
-s, --print-armap Include index for symbols from archive members\n\
--size-sort Sort symbols by size\n\
-t, --radix=RADIX Use RADIX for printing symbol values\n\
#endif
#if defined (HAVE_SETLOCALE)
setlocale (LC_CTYPE, "");
+ setlocale (LC_COLLATE, "");
#endif
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
bfd_init ();
set_default_bfd_target ();
- while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrst:uvVvX:",
+ while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uvVvX:",
long_options, (int *) 0)) != EOF)
{
switch (c)
case 's':
print_armap = 1;
break;
+ case 'S':
+ print_size = 1;
+ break;
case 't':
set_print_radix (optarg);
break;
if (show_version)
print_version ("nm");
+ if (sort_by_size && undefined_only)
+ {
+ non_fatal (_("Using the --size-sort and --undefined-only options together"));
+ non_fatal (_("will produce no output, since undefined symbols have no size."));
+ return 0;
+ }
+
/* OK, all options now parsed. If no filename specified, do a.out. */
if (optind == argc)
return !display_file ("a.out");
return retval;
}
\f
+static const char *
+get_symbol_type (type)
+ unsigned int type;
+{
+ static char buff [32];
+
+ switch (type)
+ {
+ case STT_NOTYPE: return "NOTYPE";
+ case STT_OBJECT: return "OBJECT";
+ case STT_FUNC: return "FUNC";
+ case STT_SECTION: return "SECTION";
+ 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, _("<processor specific>: %d"), type);
+ else if (type >= STT_LOOS && type <= STT_HIOS)
+ sprintf (buff, _("<OS specific>: %d"), type);
+ else
+ sprintf (buff, _("<unknown>: %d"), type);
+ return buff;
+ }
+}
+
static void
display_archive (file)
bfd *file;
if (bfd_check_format_matches (arfile, bfd_object, &matching))
{
+ char buf[30];
+
+ bfd_sprintf_vma (arfile, buf, (bfd_vma) -1);
+ print_width = strlen (buf);
(*format->print_archive_member) (bfd_get_filename (file),
bfd_get_filename (arfile));
display_rel_file (arfile, file);
}
}
-static boolean
+static bfd_boolean
display_file (filename)
char *filename;
{
- boolean retval = true;
+ bfd_boolean retval = TRUE;
bfd *file;
char **matching;
if (file == NULL)
{
bfd_nonfatal (filename);
- return false;
+ return FALSE;
}
if (bfd_check_format (file, bfd_archive))
}
else if (bfd_check_format_matches (file, bfd_object, &matching))
{
+ char buf[30];
+
+ bfd_sprintf_vma (file, buf, (bfd_vma) -1);
+ print_width = strlen (buf);
(*format->print_object_filename) (filename);
display_rel_file (file, NULL);
}
list_matching_formats (matching);
free (matching);
}
- retval = false;
+ retval = FALSE;
}
- if (bfd_close (file) == false)
+ if (!bfd_close (file))
bfd_fatal (filename);
lineno_cache_bfd = NULL;
/* These globals are used to pass information into the sorting
routines. */
static bfd *sort_bfd;
-static boolean sort_dynamic;
+static bfd_boolean sort_dynamic;
static asymbol *sort_x;
static asymbol *sort_y;
xn = bfd_asymbol_name (x);
yn = bfd_asymbol_name (y);
- return ((xn == NULL) ? ((yn == NULL) ? 0 : -1) :
- ((yn == NULL) ? 1 : strcmp (xn, yn)));
+ if (yn == NULL)
+ return xn != NULL;
+ if (xn == NULL)
+ return -1;
+
+#ifdef HAVE_STRCOLL
+ /* Solaris 2.5 has a bug in strcoll.
+ strcoll returns invalid values when confronted with empty strings. */
+ if (*yn == '\0')
+ return *xn != '\0';
+ if (*xn == '\0')
+ return -1;
+
+ return strcoll (xn, yn);
+#else
+ return strcmp (xn, yn);
+#endif
}
static int
static long
sort_symbols_by_size (abfd, dynamic, minisyms, symcount, size, symsizesp)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
PTR minisyms;
long symcount;
unsigned int size;
sec = bfd_get_section (sym);
- if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+ if (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))
sz = sym->value;
PTR minisyms;
unsigned int size;
struct size_sym *symsizes;
- char buf[30];
if (! dynamic)
{
return;
}
- bfd_sprintf_vma (abfd, buf, (bfd_vma) -1);
- print_width = strlen (buf);
-
/* Discard the symbols we don't want to print.
It's OK to do this in place; we'll free the storage anyway
(after printing). */
static long
filter_symbols (abfd, dynamic, minisyms, symcount, size)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
PTR minisyms;
long symcount;
unsigned int size;
{
if (do_demangle && *name)
{
- char *res;
-
- /* In this mode, give a user-level view of the symbol name
- even if it's not mangled; strip off any leading
- underscore. */
- if (bfd_get_symbol_leading_char (abfd) == name[0])
- name++;
+ char *res = demangle (abfd, name);
- res = cplus_demangle (name, DMGL_ANSI | DMGL_PARAMS);
- if (res)
- {
- printf (format, res);
- free (res);
- return;
- }
+ printf (format, res);
+ free (res);
+ return;
}
printf (format, name);
static void
print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
PTR minisyms;
long symcount;
unsigned int size;
for (; from < fromend; from += size)
{
asymbol *sym;
- bfd_vma ssize;
sym = bfd_minisymbol_to_symbol (abfd, dynamic, from, store);
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
- if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
- ssize = ((elf_symbol_type *) sym)->internal_elf_sym.st_size;
- else
- ssize = 0;
-
- print_symbol (abfd, sym, ssize, archive_bfd);
+ print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd);
}
}
static void
print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
struct size_sym *symsizes;
long symcount;
bfd *archive_bfd;
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
- /* Set the symbol value so that we actually display the symbol size. */
- sym->value = from->size - bfd_section_vma (abfd, bfd_get_section (sym));
-
/* For elf we have already computed the correct symbol size. */
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
ssize = from->size;
bfd_vma ssize;
bfd *archive_bfd;
{
+ symbol_info syminfo;
+ struct extended_symbol_info info;
+
PROGRESS (1);
(*format->print_symbol_filename) (archive_bfd, abfd);
- if (undefined_only)
- {
- if (bfd_is_und_section (bfd_get_section (sym)))
- print_symname ("%s", bfd_asymbol_name (sym), 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;
else
- {
- symbol_info syminfo;
- struct extended_symbol_info info;
-
- bfd_get_symbol_info (abfd, sym, &syminfo);
- info.sinfo = &syminfo;
- info.ssize = ssize;
- (*format->print_symbol_info) (&info, abfd);
- }
+ info.elfinfo = NULL;
+ (*format->print_symbol_info) (&info, abfd);
if (line_numbers)
{
printf (_("\n\nUndefined symbols from %s:\n\n"), filename);
else
printf (_("\n\nSymbols from %s:\n\n"), filename);
- printf (_("\
-Name Value Class Type Size Line Section\n\n"));
+ if (print_width == 8)
+ printf (_("\
+Name Value Class Type Size Line Section\n\n"));
+ else
+ printf (_("\
+Name Value Class Type Size Line Section\n\n"));
}
static void
printf (_("\n\nUndefined symbols from %s[%s]:\n\n"), archive, filename);
else
printf (_("\n\nSymbols from %s[%s]:\n\n"), archive, filename);
- printf (_("\
-Name Value Class Type Size Line Section\n\n"));
+ if (print_width == 8)
+ printf (_("\
+Name Value Class Type Size Line Section\n\n"));
+ else
+ printf (_("\
+Name Value Class Type Size Line Section\n\n"));
}
static void
}
else
{
- print_value (abfd, SYM_VALUE (info));
+ /* Normally we print the value of the symbol. If we are printing the
+ size or sorting by size then we print its size, execpt for the
+ (weird) special case where both flags are defined, in which case we
+ print both values. This conforms to documented behaviour. */
+ if (sort_by_size && !print_size)
+ print_value (abfd, SYM_SIZE (info));
+ else
+ print_value (abfd, SYM_VALUE (info));
- if (SYM_SIZE (info))
+ if (print_size && SYM_SIZE (info))
{
- printf(" ");
+ printf (" ");
print_value (abfd, SYM_SIZE (info));
}
}
print_symname ("%-20s|", SYM_NAME (info), abfd);
if (bfd_is_undefined_symclass (SYM_TYPE (info)))
- printf (" ");
+ {
+ if (print_width == 8)
+ printf (" ");
+ else
+ printf (" ");
+ }
else
print_value (abfd, SYM_VALUE (info));
if (SYM_TYPE (info) == '-')
{
/* A stab. */
- printf ("%18s| ", SYM_STAB_NAME (info)); /* (C) Type */
- printf (desc_format, SYM_STAB_DESC (info)); /* Size */
- printf ("| |"); /* Line, Section */
+ printf ("%18s| ", SYM_STAB_NAME (info)); /* (C) Type. */
+ printf (desc_format, SYM_STAB_DESC (info)); /* Size. */
+ printf ("| |"); /* Line, Section. */
}
else
- {
+ {
/* Type, Size, Line, Section */
- printf (" |");
+ if (info->elfinfo)
+ printf ("%18s|",
+ get_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info)));
+ else
+ printf (" |");
if (SYM_SIZE (info))
print_value (abfd, SYM_SIZE (info));
else
- printf(" ");
+ {
+ if (print_width == 8)
+ printf (" ");
+ else
+ printf (" ");
+ }
- printf("| |");
+ if (info->elfinfo)
+ printf("| |%s", info->elfinfo->symbol.section->name);
+ else
+ printf("| |");
}
}
{
symindex idx = BFD_NO_MORE_SYMBOLS;
carsym *thesym;
- boolean everprinted = false;
+ bfd_boolean everprinted = FALSE;
for (idx = bfd_get_next_mapent (abfd, idx, &thesym);
idx != BFD_NO_MORE_SYMBOLS;
if (!everprinted)
{
printf (_("\nArchive index:\n"));
- everprinted = true;
+ everprinted = TRUE;
}
elt = bfd_get_elt_at_index (abfd, idx);
if (elt == NULL)
projects / binutils-gdb.git / blobdiff