/* objdump.c -- dump information about an object file.
- Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
-This file is part of BFD, the Binary File Diddler.
+This file is part of GNU Binutils.
-BFD is free software; you can redistribute it and/or modify
+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, or (at your option)
any later version.
-BFD is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with BFD; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/*
- * Until there is other documentation, refer to the manual page dump(1) in
- * the system 5 program's reference manual
- */
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "bfd.h"
#include "sysdep.h"
#include "getopt.h"
+#include "bucomm.h"
#include <stdio.h>
#include <ctype.h>
+#include "dis-asm.h"
+#include "libiberty.h"
-#define ELF_STAB_DISPLAY /* This code works, but uses internal
- bfd and elf stuff. Flip this define
- off if you need to just use generic
- BFD interfaces. */
-
-#ifdef ELF_STAB_DISPLAY
/* Internal headers for the ELF .stab-dump code - sorry. */
#define BYTES_IN_WORD 32
#include "aout/aout64.h"
-#include "elf/internal.h"
-extern Elf_Internal_Shdr *bfd_elf_find_section();
-#endif /* ELF_STAB_DISPLAY */
-char *xmalloc ();
+#ifndef FPRINTF_ALREADY_DECLARED
+extern int fprintf PARAMS ((FILE *, CONST char *, ...));
+#endif
char *default_target = NULL; /* default at runtime */
-char *program_name = NULL;
+extern char *program_version;
+int show_version = 0; /* show the version number */
int dump_section_contents; /* -s */
int dump_section_headers; /* -h */
boolean dump_file_header; /* -f */
int dump_symtab; /* -t */
+int dump_dynamic_symtab; /* -T */
int dump_reloc_info; /* -r */
+int dump_dynamic_reloc_info; /* -R */
int dump_ar_hdrs; /* -a */
int with_line_numbers; /* -l */
-int dump_stab_section_info; /* -stabs */
+int dump_stab_section_info; /* --stabs */
boolean disassemble; /* -d */
-boolean info; /* -i */
-char *only;
-
-PROTO (void, display_file, (char *filename, char *target));
-PROTO (void, dump_data, (bfd * abfd));
-PROTO (void, dump_relocs, (bfd * abfd));
-PROTO (void, dump_symbols, (bfd * abfd));
-PROTO (void, print_arelt_descr, (FILE *, bfd * abfd, boolean verbose));
-\f
+boolean disassemble_all; /* -D */
+boolean formats_info; /* -i */
+char *only; /* -j secname */
+
+/* Extra info to pass to the disassembler address printing function. */
+struct objdump_disasm_info {
+ bfd *abfd;
+ asection *sec;
+ boolean require_sec;
+};
+/* Architecture to disassemble for, or default if NULL. */
+char *machine = (char *) NULL;
+/* The symbol table. */
+asymbol **syms;
+/* Number of symbols in `syms'. */
+long symcount = 0;
+/* The dynamic symbol table. */
+asymbol **dynsyms;
+/* Number of symbols in `dynsyms'. */
+long dynsymcount = 0;
-char *machine = (char *) NULL;
-asymbol **syms;
-asymbol **syms2;
+/* Forward declarations. */
+
+static void
+display_file PARAMS ((char *filename, char *target));
+
+static void
+dump_data PARAMS ((bfd *abfd));
+
+static void
+dump_relocs PARAMS ((bfd *abfd));
+static void
+dump_dynamic_relocs PARAMS ((bfd * abfd));
+
+static void
+dump_reloc_set PARAMS ((bfd *, arelent **, long));
-unsigned int storage;
+static void
+dump_symbols PARAMS ((bfd *abfd, boolean dynamic));
-unsigned int symcount = 0;
+static void
+display_bfd PARAMS ((bfd *abfd));
+static void
+objdump_print_address PARAMS ((bfd_vma, struct disassemble_info *));
+\f
void
-usage ()
+usage (stream, status)
+ FILE *stream;
+ int status;
{
- fprintf (stderr,
- "usage: %s [-ahifdrtxsl] [-m machine] [-j section_name] obj ...\n",
+ fprintf (stream, "\
+Usage: %s [-ahifdDrRtTxsl] [-b bfdname] [-m machine] [-j section-name]\n\
+ [--archive-headers] [--target=bfdname] [--disassemble]\n\
+ [--disassemble-all] [--file-headers] [--section-headers] [--headers]\n\
+ [--info] [--section=section-name] [--line-numbers]\n\
+ [--architecture=machine] [--reloc] [--full-contents] [--stabs]\n\
+ [--syms] [--all-headers] [--dynamic-syms] [--dynamic-reloc]\n\
+ [--version] [--help] objfile...\n\
+at least one option besides -l (--line-numbers) must be given\n",
program_name);
- exit (1);
+ exit (status);
}
static struct option long_options[]=
{
- {"syms", no_argument, &dump_symtab, 1},
- {"reloc", no_argument, &dump_reloc_info, 1},
- {"header", no_argument, &dump_section_headers, 1},
-#ifdef ELF_STAB_DISPLAY
+ {"all-headers", no_argument, NULL, 'x'},
+ {"architecture", required_argument, NULL, 'm'},
+ {"archive-headers", no_argument, NULL, 'a'},
+ {"disassemble", no_argument, NULL, 'd'},
+ {"disassemble-all", no_argument, NULL, 'D'},
+ {"dynamic-reloc", no_argument, NULL, 'R'},
+ {"dynamic-syms", no_argument, NULL, 'T'},
+ {"file-headers", no_argument, NULL, 'f'},
+ {"full-contents", no_argument, NULL, 's'},
+ {"headers", no_argument, NULL, 'h'},
+ {"help", no_argument, NULL, 'H'},
+ {"info", no_argument, NULL, 'i'},
+ {"line-numbers", no_argument, NULL, 'l'},
+ {"reloc", no_argument, NULL, 'r'},
+ {"section", required_argument, NULL, 'j'},
+ {"section-headers", no_argument, NULL, 'h'},
{"stabs", no_argument, &dump_stab_section_info, 1},
-#endif
- {0, no_argument, 0, 0}};
-
-
+ {"syms", no_argument, NULL, 't'},
+ {"target", required_argument, NULL, 'b'},
+ {"version", no_argument, &show_version, 1},
+ {0, no_argument, 0, 0}
+};
+\f
static void
-dump_headers (abfd)
+dump_section_header (abfd, section, ignored)
bfd *abfd;
+ asection *section;
+ PTR ignored;
{
- asection *section;
-
- for (section = abfd->sections;
- section != (asection *) NULL;
- section = section->next)
- {
- char *comma = "";
+ char *comma = "";
#define PF(x,y) \
- if (section->flags & x) { printf("%s%s",comma,y); comma = ", "; }
-
-
- printf ("SECTION %d [%s]\t: size %08x",
- section->index,
- section->name,
- (unsigned) bfd_get_section_size_before_reloc (section));
- printf (" vma ");
- printf_vma (section->vma);
- printf (" align 2**%u\n ",
- section->alignment_power);
- PF (SEC_ALLOC, "ALLOC");
- PF (SEC_CONSTRUCTOR, "CONSTRUCTOR");
- PF (SEC_CONSTRUCTOR_TEXT, "CONSTRUCTOR TEXT");
- PF (SEC_CONSTRUCTOR_DATA, "CONSTRUCTOR DATA");
- PF (SEC_CONSTRUCTOR_BSS, "CONSTRUCTOR BSS");
- PF (SEC_LOAD, "LOAD");
- PF (SEC_RELOC, "RELOC");
- PF (SEC_BALIGN, "BALIGN");
- PF (SEC_READONLY, "READONLY");
- PF (SEC_CODE, "CODE");
- PF (SEC_DATA, "DATA");
- PF (SEC_ROM, "ROM");
- printf ("\n");
+ if (section->flags & x) { printf("%s%s",comma,y); comma = ", "; }
+
+
+ printf ("SECTION %d [%s]\t: size %08x",
+ section->index,
+ section->name,
+ (unsigned) bfd_get_section_size_before_reloc (section));
+ printf (" vma ");
+ printf_vma (section->vma);
+ printf (" align 2**%u\n ",
+ section->alignment_power);
+ PF (SEC_ALLOC, "ALLOC");
+ PF (SEC_CONSTRUCTOR, "CONSTRUCTOR");
+ PF (SEC_CONSTRUCTOR_TEXT, "CONSTRUCTOR TEXT");
+ PF (SEC_CONSTRUCTOR_DATA, "CONSTRUCTOR DATA");
+ PF (SEC_CONSTRUCTOR_BSS, "CONSTRUCTOR BSS");
+ PF (SEC_LOAD, "LOAD");
+ PF (SEC_RELOC, "RELOC");
+#ifdef SEC_BALIGN
+ PF (SEC_BALIGN, "BALIGN");
+#endif
+ PF (SEC_READONLY, "READONLY");
+ PF (SEC_CODE, "CODE");
+ PF (SEC_DATA, "DATA");
+ PF (SEC_ROM, "ROM");
+ PF (SEC_DEBUGGING, "DEBUGGING");
+ PF (SEC_NEVER_LOAD, "NEVER_LOAD");
+ printf ("\n");
#undef PF
- }
}
+static void
+dump_headers (abfd)
+ bfd *abfd;
+{
+ bfd_map_over_sections (abfd, dump_section_header, (PTR) NULL);
+}
+\f
static asymbol **
-DEFUN (slurp_symtab, (abfd),
- bfd * abfd)
+slurp_symtab (abfd)
+ bfd *abfd;
{
asymbol **sy = (asymbol **) NULL;
+ long storage;
if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
{
- (void) printf ("No symbols in \"%s\".\n", bfd_get_filename (abfd));
- return (NULL);
+ printf ("No symbols in \"%s\".\n", bfd_get_filename (abfd));
+ return NULL;
}
- storage = get_symtab_upper_bound (abfd);
+ storage = bfd_get_symtab_upper_bound (abfd);
+ if (storage < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+
if (storage)
{
- sy = (asymbol **) malloc (storage);
- if (sy == NULL)
- {
- fprintf (stderr, "%s: out of memory.\n", program_name);
- exit (1);
- }
+ sy = (asymbol **) xmalloc (storage);
}
symcount = bfd_canonicalize_symtab (abfd, sy);
+ if (symcount < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+ if (symcount == 0)
+ fprintf (stderr, "%s: %s: No symbols\n",
+ program_name, bfd_get_filename (abfd));
return sy;
}
-/* Sort symbols into value order */
-static int
-comp (ap, bp)
- asymbol **ap;
- asymbol **bp;
+/* Read in the dynamic symbols. */
+
+static asymbol **
+slurp_dynamic_symtab (abfd)
+ bfd *abfd;
{
- asymbol *a = *ap;
- asymbol *b = *bp;
- int diff;
+ asymbol **sy = (asymbol **) NULL;
+ long storage;
- if (a->name == (char *) NULL || (a->flags & (BSF_DEBUGGING)))
- a->the_bfd = 0;
- if (b->name == (char *) NULL || (b->flags & (BSF_DEBUGGING)))
- b->the_bfd = 0;
+ storage = bfd_get_dynamic_symtab_upper_bound (abfd);
+ if (storage < 0)
+ {
+ if (!(bfd_get_file_flags (abfd) & DYNAMIC))
+ {
+ fprintf (stderr, "%s: %s: not a dynamic object\n",
+ program_name, bfd_get_filename (abfd));
+ return NULL;
+ }
- diff = a->the_bfd - b->the_bfd;
- if (diff)
+ bfd_fatal (bfd_get_filename (abfd));
+ }
+
+ if (storage)
{
- return -diff;
+ sy = (asymbol **) xmalloc (storage);
}
- diff = a->value - b->value;
- if (diff)
+ dynsymcount = bfd_canonicalize_dynamic_symtab (abfd, sy);
+ if (dynsymcount < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+ if (dynsymcount == 0)
+ fprintf (stderr, "%s: %s: No dynamic symbols\n",
+ program_name, bfd_get_filename (abfd));
+ return sy;
+}
+
+/* Filter out (in place) symbols that are useless for disassembly.
+ COUNT is the number of elements in SYMBOLS.
+ Return the number of useful symbols. */
+
+long
+remove_useless_symbols (symbols, count)
+ asymbol **symbols;
+ long count;
+{
+ register asymbol **in_ptr = symbols, **out_ptr = symbols;
+
+ while (--count >= 0)
{
- return diff;
+ asymbol *sym = *in_ptr++;
+
+ if (sym->name == NULL || sym->name[0] == '\0')
+ continue;
+ if (sym->flags & (BSF_DEBUGGING))
+ continue;
+ if (bfd_is_und_section (sym->section)
+ || bfd_is_com_section (sym->section))
+ continue;
+
+ *out_ptr++ = sym;
}
- return a->section - b->section;
+ return out_ptr - symbols;
}
-/* Print the supplied address symbolically if possible */
-void
-print_address (vma, stream)
+/* Sort symbols into value order. */
+
+static int
+compare_symbols (ap, bp)
+ const PTR ap;
+ const PTR bp;
+{
+ const asymbol *a = *(const asymbol **)ap;
+ const asymbol *b = *(const asymbol **)bp;
+
+ if (a->value > b->value)
+ return 1;
+ else if (a->value < b->value)
+ return -1;
+
+ if (a->section > b->section)
+ return 1;
+ else if (a->section < b->section)
+ return -1;
+ return 0;
+}
+
+/* Sort relocs into address order. */
+
+static int
+compare_relocs (ap, bp)
+ const PTR ap;
+ const PTR bp;
+{
+ const arelent *a = *(const arelent **)ap;
+ const arelent *b = *(const arelent **)bp;
+
+ if (a->address > b->address)
+ return 1;
+ else if (a->address < b->address)
+ return -1;
+
+ return compare_symbols ((const PTR) a->sym_ptr_ptr,
+ (const PTR) b->sym_ptr_ptr);
+}
+
+/* Print VMA symbolically to INFO if possible. */
+
+static void
+objdump_print_address (vma, info)
bfd_vma vma;
- FILE *stream;
+ struct disassemble_info *info;
{
- /* Perform a binary search looking for the closest symbol to
- the required value */
+ /* @@ For relocateable files, should filter out symbols belonging to
+ the wrong section. Unfortunately, not enough information is supplied
+ to this routine to determine the correct section in all cases. */
+ /* @@ Would it speed things up to cache the last two symbols returned,
+ and maybe their address ranges? For many processors, only one memory
+ operand can be present at a time, so the 2-entry cache wouldn't be
+ constantly churned by code doing heavy memory accesses. */
- unsigned int min = 0;
- unsigned int max = symcount;
+ /* Indices in `syms'. */
+ long min = 0;
+ long max = symcount;
+ long thisplace;
- unsigned int thisplace = 1;
- unsigned int oldthisplace;
+ bfd_signed_vma vardiff;
- int vardiff;
+ fprintf_vma (info->stream, vma);
- if (symcount == 0)
- {
- fprintf_vma (stream, vma);
- }
- else
+ if (symcount < 1)
+ return;
+
+ /* Perform a binary search looking for the closest symbol to the
+ required value. We are searching the range (min, max]. */
+ while (min + 1 < max)
{
- while (true)
+ asymbol *sym;
+
+ thisplace = (max + min) / 2;
+ sym = syms[thisplace];
+
+ vardiff = sym->value - vma;
+
+ if (vardiff > 0)
+ max = thisplace;
+ else if (vardiff < 0)
+ min = thisplace;
+ else
{
- oldthisplace = thisplace;
- thisplace = (max + min) / 2;
- if (thisplace == oldthisplace)
- break;
- vardiff = syms[thisplace]->value - vma;
+ min = thisplace;
+ break;
+ }
+ }
- if (vardiff)
- {
- if (vardiff > 0)
- {
- max = thisplace;
- }
- else
- {
- min = thisplace;
- }
- }
- else
+ /* The symbol we want is now in min, the low end of the range we
+ were searching. */
+ thisplace = min;
+
+ {
+ /* If this symbol isn't global, search for one with the same value
+ that is. */
+ bfd_vma val = syms[thisplace]->value;
+ long i;
+ if (syms[thisplace]->flags & (BSF_LOCAL|BSF_DEBUGGING))
+ for (i = thisplace - 1; i >= 0; i--)
+ {
+ if (syms[i]->value == val
+ && (!(syms[i]->flags & (BSF_LOCAL|BSF_DEBUGGING))
+ || ((syms[thisplace]->flags & BSF_DEBUGGING)
+ && !(syms[i]->flags & BSF_DEBUGGING))))
{
- /* Totally awesome! the exact right symbol */
- CONST char *match_name = syms[thisplace]->name;
- int sym_len = strlen (match_name);
-
- /* Avoid "filename.o" as a match */
- if (sym_len > 2
- && match_name[sym_len - 2] == '.'
- && match_name[sym_len - 1] == 'o'
- && thisplace + 1 < symcount
- && syms[thisplace + 1]->value == vma)
- match_name = syms[thisplace + 1]->name;
- /* Totally awesome! the exact right symbol */
- fprintf_vma (stream, vma);
- fprintf (stream, " (%s+)0000", syms[thisplace]->name);
- return;
+ thisplace = i;
+ break;
}
}
- /* We've run out of places to look, print the symbol before this one
- see if this or the symbol before describes this location the best */
-
- if (thisplace != 0)
+ if (syms[thisplace]->flags & (BSF_LOCAL|BSF_DEBUGGING))
+ for (i = thisplace + 1; i < symcount; i++)
{
- if (syms[thisplace - 1]->value - vma >
- syms[thisplace]->value - vma)
+ if (syms[i]->value == val
+ && (!(syms[i]->flags & (BSF_LOCAL|BSF_DEBUGGING))
+ || ((syms[thisplace]->flags & BSF_DEBUGGING)
+ && !(syms[i]->flags & BSF_DEBUGGING))))
{
- /* Previous symbol is in correct section and is closer */
- thisplace--;
+ thisplace = i;
+ break;
}
}
+ }
+ {
+ /* If the file is relocateable, and the symbol could be from this
+ section, prefer a symbol from this section over symbols from
+ others, even if the other symbol's value might be closer.
+
+ Note that this may be wrong for some symbol references if the
+ sections have overlapping memory ranges, but in that case there's
+ no way to tell what's desired without looking at the relocation
+ table. */
+ struct objdump_disasm_info *aux;
+ long i;
+
+ aux = (struct objdump_disasm_info *) info->application_data;
+ if (syms[thisplace]->section != aux->sec
+ && (aux->require_sec
+ || ((aux->abfd->flags & HAS_RELOC) != 0
+ && vma >= bfd_get_section_vma (aux->abfd, aux->sec)
+ && vma < (bfd_get_section_vma (aux->abfd, aux->sec)
+ + bfd_get_section_size_before_reloc (aux->sec)))))
+ {
+ for (i = thisplace + 1; i < symcount; i++)
+ {
+ if (syms[i]->value != syms[thisplace]->value)
+ break;
+ }
+ --i;
+ for (; i >= 0; i--)
+ {
+ if (syms[i]->section == aux->sec)
+ {
+ thisplace = i;
+ break;
+ }
+ }
- fprintf_vma (stream, vma);
- if (syms[thisplace]->value > vma)
- {
- fprintf (stream, " (%s-)", syms[thisplace]->name);
- fprintf (stream, "%04x", syms[thisplace]->value - vma);
- }
- else
- {
- fprintf (stream, " (%s+)", syms[thisplace]->name);
- fprintf (stream, "%04x", vma - syms[thisplace]->value);
- }
+ if (syms[thisplace]->section != aux->sec)
+ {
+ /* We didn't find a good symbol with a smaller value.
+ Look for one with a larger value. */
+ for (i = thisplace + 1; i < symcount; i++)
+ {
+ if (syms[i]->section == aux->sec)
+ {
+ thisplace = i;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ fprintf (info->stream, " <%s", syms[thisplace]->name);
+ if (syms[thisplace]->value > vma)
+ {
+ char buf[30], *p = buf;
+ sprintf_vma (buf, syms[thisplace]->value - vma);
+ while (*p == '0')
+ p++;
+ fprintf (info->stream, "-%s", p);
}
+ else if (vma > syms[thisplace]->value)
+ {
+ char buf[30], *p = buf;
+ sprintf_vma (buf, vma - syms[thisplace]->value);
+ while (*p == '0')
+ p++;
+ fprintf (info->stream, "+%s", p);
+ }
+ fprintf (info->stream, ">");
}
void
disassemble_data (abfd)
bfd *abfd;
{
- bfd_byte *data = NULL;
- bfd_arch_info_type *info;
- bfd_size_type datasize = 0;
- bfd_size_type i;
- unsigned int (*print) ()= 0;
- unsigned int print_insn_m68k ();
- unsigned int print_insn_a29k ();
- unsigned int print_insn_i960 ();
- unsigned int print_insn_sparc ();
- unsigned int print_insn_i386 ();
- unsigned int print_insn_h8300 ();
- enum bfd_architecture a;
+ long i;
+ unsigned int (*print) () = 0; /* Old style */
+ disassembler_ftype disassemble_fn = 0; /* New style */
+ struct disassemble_info disasm_info;
+ struct objdump_disasm_info aux;
+
+ int prevline = 0;
+ char *prev_function = NULL;
asection *section;
- /* Replace symbol section relative values with abs values */
boolean done_dot = false;
+ /* If we are dumping relocation information, read the relocs for
+ each section we are going to disassemble. We must do this before
+ we sort the symbols. */
+ if (dump_reloc_info)
+ {
+ for (section = abfd->sections;
+ section != (asection *) NULL;
+ section = section->next)
+ {
+ long relsize;
+ arelent **relpp;
+
+ if ((section->flags & SEC_LOAD) == 0
+ || (! disassemble_all
+ && only == NULL
+ && (section->flags & SEC_CODE) == 0))
+ continue;
+ if (only != (char *) NULL && strcmp (only, section->name) != 0)
+ continue;
+ if ((section->flags & SEC_RELOC) == 0)
+ continue;
+
+ /* We store the reloc information in the reloc_count and
+ orelocation fields. */
+
+ relsize = bfd_get_reloc_upper_bound (abfd, section);
+ if (relsize < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ if (relsize == 0)
+ section->reloc_count = 0;
+ else
+ {
+ long relcount;
+
+ relpp = (arelent **) xmalloc (relsize);
+ relcount = bfd_canonicalize_reloc (abfd, section, relpp, syms);
+ if (relcount < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+ section->reloc_count = relcount;
+ section->orelocation = relpp;
+ }
+ }
+ }
+
+ /* Replace symbol section relative values with abs values. */
for (i = 0; i < symcount; i++)
{
syms[i]->value += syms[i]->section->vma;
}
- /* We keep a copy of the symbols in the original order */
- syms2 = slurp_symtab (abfd);
+ symcount = remove_useless_symbols (syms, symcount);
/* Sort the symbols into section and symbol order */
- (void) qsort (syms, symcount, sizeof (asymbol *), comp);
-
- /* Find the first useless symbol */
- {
- unsigned int i;
-
- for (i = 0; i < symcount; i++)
- {
- if (syms[i]->the_bfd == 0)
- {
- symcount = i;
- break;
- }
- }
- }
+ qsort (syms, symcount, sizeof (asymbol *), compare_symbols);
+ INIT_DISASSEMBLE_INFO(disasm_info, stdout);
+ disasm_info.application_data = (PTR) &aux;
+ aux.abfd = abfd;
+ disasm_info.print_address_func = objdump_print_address;
if (machine != (char *) NULL)
{
- info = bfd_scan_arch (machine);
- if (info == 0)
+ bfd_arch_info_type *info = bfd_scan_arch (machine);
+ if (info == NULL)
{
fprintf (stderr, "%s: Can't use supplied machine %s\n",
program_name,
abfd->arch_info = info;
}
- /* See if we can disassemble using bfd */
+ /* See if we can disassemble using bfd. */
if (abfd->arch_info->disassemble)
{
}
else
{
- a = bfd_get_arch (abfd);
- switch (a)
+ disassemble_fn = disassembler (abfd);
+ if (!disassemble_fn)
{
- case bfd_arch_sparc:
- print = print_insn_sparc;
- break;
- case bfd_arch_i386:
- print = print_insn_i386;
- break;
- case bfd_arch_m68k:
- print = print_insn_m68k;
- break;
- case bfd_arch_a29k:
- print = print_insn_a29k;
- break;
- case bfd_arch_i960:
- print = print_insn_i960;
- break;
- default:
fprintf (stderr, "%s: Can't disassemble for architecture %s\n",
program_name,
bfd_printable_arch_mach (bfd_get_arch (abfd), 0));
exit (1);
}
-
}
for (section = abfd->sections;
section != (asection *) NULL;
section = section->next)
{
+ bfd_byte *data = NULL;
+ bfd_size_type datasize = 0;
+ arelent **relpp = NULL;
+ arelent **relppend = NULL;
+
+ if ((section->flags & SEC_LOAD) == 0
+ || (! disassemble_all
+ && only == NULL
+ && (section->flags & SEC_CODE) == 0))
+ continue;
+ if (only != (char *) NULL && strcmp (only, section->name) != 0)
+ continue;
- if ((section->flags & SEC_LOAD)
- && (only == (char *) NULL || strcmp (only, section->name) == 0))
+ if (dump_reloc_info
+ && (section->flags & SEC_RELOC) != 0)
{
- printf ("Disassembly of section %s:\n", section->name);
+ /* Sort the relocs by address. */
+ qsort (section->orelocation, section->reloc_count,
+ sizeof (arelent *), compare_relocs);
+ relpp = section->orelocation;
+ relppend = relpp + section->reloc_count;
+ }
- if (bfd_get_section_size_before_reloc (section) == 0)
- continue;
+ printf ("Disassembly of section %s:\n", section->name);
- data = (bfd_byte *) malloc (bfd_get_section_size_before_reloc (section));
+ datasize = bfd_get_section_size_before_reloc (section);
+ if (datasize == 0)
+ continue;
- if (data == (bfd_byte *) NULL)
- {
- fprintf (stderr, "%s: memory exhausted.\n", program_name);
- exit (1);
- }
- datasize = bfd_get_section_size_before_reloc (section);
+ data = (bfd_byte *) xmalloc ((size_t) datasize);
- bfd_get_section_contents (abfd, section, data, 0, bfd_get_section_size_before_reloc (section));
+ bfd_get_section_contents (abfd, section, data, 0, datasize);
- i = 0;
- while (i < bfd_get_section_size_before_reloc (section))
+ aux.sec = section;
+ disasm_info.buffer = data;
+ disasm_info.buffer_vma = section->vma;
+ disasm_info.buffer_length = datasize;
+ i = 0;
+ while (i < disasm_info.buffer_length)
+ {
+ int bytes;
+
+ if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 0 &&
+ data[i + 3] == 0)
{
- if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 0 &&
- data[i + 3] == 0)
+ if (done_dot == false)
{
- if (done_dot == false)
- {
- printf ("...\n");
- done_dot = true;
- }
- i += 4;
+ printf ("...\n");
+ done_dot = true;
}
- else
+ bytes = 4;
+ }
+ else
+ {
+ done_dot = false;
+ if (with_line_numbers)
{
- done_dot = false;
- if (with_line_numbers)
- {
- static prevline;
- CONST char *filename;
- CONST char *functionname;
- unsigned int line;
+ CONST char *filename;
+ CONST char *functionname;
+ unsigned int line;
- bfd_find_nearest_line (abfd,
+ if (bfd_find_nearest_line (abfd,
section,
syms,
section->vma + i,
&filename,
&functionname,
- &line);
-
- if (filename && functionname && line && line != prevline)
+ &line))
+ {
+ if (functionname
+ && *functionname != '\0'
+ && (prev_function == NULL
+ || strcmp (functionname, prev_function) != 0))
+ {
+ printf ("%s():\n", functionname);
+ if (prev_function != NULL)
+ free (prev_function);
+ prev_function = xmalloc (strlen (functionname) + 1);
+ strcpy (prev_function, functionname);
+ }
+ if (!filename)
+ filename = "???";
+ if (line && line != prevline)
{
printf ("%s:%u\n", filename, line);
prevline = line;
}
}
- print_address (section->vma + i, stdout);
- printf (" ");
+ }
+ aux.require_sec = true;
+ objdump_print_address (section->vma + i, &disasm_info);
+ aux.require_sec = false;
+ putchar (' ');
- i += print (section->vma + i,
- data + i,
- stdout);
- putchar ('\n');
+ if (disassemble_fn)
+ {
+ /* New style */
+ bytes = (*disassemble_fn) (section->vma + i, &disasm_info);
+ if (bytes < 0)
+ break;
+ }
+ else
+ {
+ /* Old style */
+ bytes = print (section->vma + i, data + i, stdout);
+ }
+ putchar ('\n');
+ }
+
+ if (dump_reloc_info
+ && (section->flags & SEC_RELOC) != 0)
+ {
+ while (relpp < relppend
+ && ((*relpp)->address >= i
+ && (*relpp)->address < i + bytes))
+ {
+ arelent *q;
+ const char *sym_name;
+
+ q = *relpp;
+
+ printf ("\t\tRELOC: ");
+
+ printf_vma (section->vma + q->address);
+
+ printf (" %s ", q->howto->name);
+
+ if (q->sym_ptr_ptr != NULL
+ && *q->sym_ptr_ptr != NULL)
+ {
+ sym_name = bfd_asymbol_name (*q->sym_ptr_ptr);
+ if (sym_name == NULL || *sym_name == '\0')
+ {
+ asection *sym_sec;
+
+ sym_sec = bfd_get_section (*q->sym_ptr_ptr);
+ sym_name = bfd_get_section_name (abfd, sym_sec);
+ if (sym_name == NULL || *sym_name == '\0')
+ sym_name = "*unknown*";
+ }
+ }
+
+ printf ("%s", sym_name);
+
+ if (q->addend)
+ {
+ printf ("+0x");
+ printf_vma (q->addend);
+ }
+
+ printf ("\n");
+
+ ++relpp;
}
}
- free (data);
+
+ i += bytes;
}
+ free (data);
}
}
\f
-#ifdef ELF_STAB_DISPLAY
/* Define a table of stab values and print-strings. We wish the initializer
could be a direct-mapped table, but instead we build one the first
time we need it. */
-#define STAB_STRING_LENGTH 6
-
-char stab_name[256][STAB_STRING_LENGTH];
+char **stab_name;
struct stab_print {
int value;
- char string[STAB_STRING_LENGTH];
+ char *string;
};
struct stab_print stab_print[] = {
#define __define_stab(NAME, CODE, STRING) {CODE, STRING},
#include "aout/stab.def"
#undef __define_stab
- {0, 0}
+ {0, ""}
};
-/* This is a kludge for dumping the stabs section from an ELF file that
+void dump_section_stabs PARAMS ((bfd *abfd, char *stabsect_name,
+ char *strsect_name));
+
+/* Dump the stabs sections from an object file that has a section that
uses Sun stabs encoding. It has to use some hooks into BFD because
string table sections are not normally visible to BFD callers. */
void
-dump_elf_stabs (abfd)
+dump_stabs (abfd)
bfd *abfd;
{
- Elf_Internal_Shdr *stab_hdr, *stabstr_hdr;
- char *strtab;
- struct internal_nlist *stabs, *stabs_end;
- int i, j;
-
- /* Initialize stab name array if first time. */
- if (stab_name[0][0] == 0)
+ /* Allocate and initialize stab name array if first time. */
+ if (stab_name == NULL)
{
- /* Fill in numeric values for all possible strings. */
+ int i;
+
+ stab_name = (char **) xmalloc (256 * sizeof(char *));
+ /* Clear the array. */
for (i = 0; i < 256; i++)
- {
- sprintf (stab_name[i], "%d", i);
- }
- for (i = 0; stab_print[i].string[0]; i++)
- strcpy (stab_name[stab_print[i].value], stab_print[i].string);
+ stab_name[i] = NULL;
+ /* Fill in the defined stabs. */
+ for (i = 0; *stab_print[i].string; i++)
+ stab_name[stab_print[i].value] = stab_print[i].string;
}
- if (0 != strncmp ("elf", abfd->xvec->name, 3))
- {
- fprintf (stderr, "%s: %s is not in ELF format.\n", program_name,
- abfd->filename);
- return;
- }
+ dump_section_stabs (abfd, ".stab", ".stabstr");
+ dump_section_stabs (abfd, ".stab.excl", ".stab.exclstr");
+ dump_section_stabs (abfd, ".stab.index", ".stab.indexstr");
+ dump_section_stabs (abfd, "$GDB_SYMBOLS$", "$GDB_STRINGS$");
+}
+
+static struct internal_nlist *stabs;
+static bfd_size_type stab_size;
- stab_hdr = bfd_elf_find_section (abfd, ".stab");
- if (0 == stab_hdr)
+static char *strtab;
+static bfd_size_type stabstr_size;
+
+/* Read ABFD's stabs section STABSECT_NAME into `stabs'
+ and string table section STRSECT_NAME into `strtab'.
+ If the section exists and was read, allocate the space and return true.
+ Otherwise return false. */
+
+boolean
+read_section_stabs (abfd, stabsect_name, strsect_name)
+ bfd *abfd;
+ char *stabsect_name;
+ char *strsect_name;
+{
+ asection *stabsect, *stabstrsect;
+
+ stabsect = bfd_get_section_by_name (abfd, stabsect_name);
+ if (0 == stabsect)
{
- fprintf (stderr, "%s: %s has no .stab section.\n", program_name,
- abfd->filename);
- return;
+ printf ("No %s section present\n\n", stabsect_name);
+ return false;
}
- stabstr_hdr = bfd_elf_find_section (abfd, ".stabstr");
- if (0 == stabstr_hdr)
+ stabstrsect = bfd_get_section_by_name (abfd, strsect_name);
+ if (0 == stabstrsect)
{
- fprintf (stderr, "%s: %s has no .stabstr section.\n", program_name,
- abfd->filename);
- return;
+ fprintf (stderr, "%s: %s has no %s section\n", program_name,
+ bfd_get_filename (abfd), strsect_name);
+ return false;
}
+
+ stab_size = bfd_section_size (abfd, stabsect);
+ stabstr_size = bfd_section_size (abfd, stabstrsect);
- stabs = (struct internal_nlist *) xmalloc (stab_hdr ->sh_size);
- strtab = (char *) xmalloc (stabstr_hdr->sh_size);
- stabs_end = (struct internal_nlist *) (stab_hdr->sh_size + (char *)stabs);
+ stabs = (struct internal_nlist *) xmalloc (stab_size);
+ strtab = (char *) xmalloc (stabstr_size);
- if (bfd_seek (abfd, stab_hdr->sh_offset, L_SET) < 0 ||
- stab_hdr->sh_size != bfd_read ((PTR)stabs, stab_hdr->sh_size, 1, abfd))
+ if (! bfd_get_section_contents (abfd, stabsect, (PTR) stabs, 0, stab_size))
{
- fprintf (stderr, "%s: reading .stab section of %s failed.\n",
- program_name,
- abfd->filename);
- return;
+ fprintf (stderr, "%s: Reading %s section of %s failed: %s\n",
+ program_name, stabsect_name, bfd_get_filename (abfd),
+ bfd_errmsg (bfd_get_error ()));
+ free (stabs);
+ free (strtab);
+ return false;
}
- if (bfd_seek (abfd, stabstr_hdr->sh_offset, L_SET) < 0 ||
- stabstr_hdr->sh_size != bfd_read ((PTR)strtab, stabstr_hdr->sh_size,
- 1, abfd))
+ if (! bfd_get_section_contents (abfd, stabstrsect, (PTR) strtab, 0,
+ stabstr_size))
{
- fprintf (stderr, "%s: reading .stabstr section of %s failed.\n",
- program_name,
- abfd->filename);
- return;
+ fprintf (stderr, "%s: Reading %s section of %s failed: %s\n",
+ program_name, strsect_name, bfd_get_filename (abfd),
+ bfd_errmsg (bfd_get_error ()));
+ free (stabs);
+ free (strtab);
+ return false;
}
+ return true;
+}
+
#define SWAP_SYMBOL(symp, abfd) \
- { \
+{ \
(symp)->n_strx = bfd_h_get_32(abfd, \
- (unsigned char *)&(symp)->n_strx); \
+ (unsigned char *)&(symp)->n_strx); \
(symp)->n_desc = bfd_h_get_16 (abfd, \
- (unsigned char *)&(symp)->n_desc); \
+ (unsigned char *)&(symp)->n_desc); \
(symp)->n_value = bfd_h_get_32 (abfd, \
- (unsigned char *)&(symp)->n_value); \
- }
+ (unsigned char *)&(symp)->n_value); \
+}
+
+/* Print ABFD's stabs section STABSECT_NAME (in `stabs'),
+ using string table section STRSECT_NAME (in `strtab'). */
+
+void
+print_section_stabs (abfd, stabsect_name, strsect_name)
+ bfd *abfd;
+ char *stabsect_name;
+ char *strsect_name;
+{
+ int i;
+ unsigned file_string_table_offset = 0, next_file_string_table_offset = 0;
+ struct internal_nlist *stabp = stabs,
+ *stabs_end = (struct internal_nlist *) (stab_size + (char *) stabs);
- printf ("Contents of .stab section:\n\n");
+ printf ("Contents of %s section:\n\n", stabsect_name);
printf ("Symnum n_type n_othr n_desc n_value n_strx String\n");
- /* We start the index at -1 because there is a dummy symbol on
- the front of Sun's stabs-in-elf sections. */
- for (i = -1; stabs < stabs_end; stabs++, i++)
+ /* Loop through all symbols and print them.
+
+ We start the index at -1 because there is a dummy symbol on
+ the front of stabs-in-{coff,elf} sections that supplies sizes. */
+
+ for (i = -1; stabp < stabs_end; stabp++, i++)
{
- SWAP_SYMBOL (stabs, abfd);
- printf ("\n%-6d %-6s %-6d %-6d %08x %-6d", i,
- stab_name [stabs->n_type],
- stabs->n_other, stabs->n_desc, stabs->n_value,
- stabs->n_strx);
- if (stabs->n_strx < stabstr_hdr->sh_size)
- printf (" %s", &strtab[stabs->n_strx]);
+ SWAP_SYMBOL (stabp, abfd);
+ printf ("\n%-6d ", i);
+ /* Either print the stab name, or, if unnamed, print its number
+ again (makes consistent formatting for tools like awk). */
+ if (stab_name[stabp->n_type])
+ printf ("%-6s", stab_name[stabp->n_type]);
+ else if (stabp->n_type == N_UNDF)
+ printf ("HdrSym");
+ else
+ printf ("%-6d", stabp->n_type);
+ printf (" %-6d %-6d ", stabp->n_other, stabp->n_desc);
+ printf_vma (stabp->n_value);
+ printf (" %-6lu", stabp->n_strx);
+
+ /* Symbols with type == 0 (N_UNDF) specify the length of the
+ string table associated with this file. We use that info
+ to know how to relocate the *next* file's string table indices. */
+
+ if (stabp->n_type == N_UNDF)
+ {
+ file_string_table_offset = next_file_string_table_offset;
+ next_file_string_table_offset += stabp->n_value;
+ }
+ else
+ {
+ /* Using the (possibly updated) string table offset, print the
+ string (if any) associated with this symbol. */
+
+ if ((stabp->n_strx + file_string_table_offset) < stabstr_size)
+ printf (" %s", &strtab[stabp->n_strx + file_string_table_offset]);
+ else
+ printf (" *");
+ }
}
printf ("\n\n");
}
-#endif /* ELF_STAB_DISPLAY */
-\f
+
void
+dump_section_stabs (abfd, stabsect_name, strsect_name)
+ bfd *abfd;
+ char *stabsect_name;
+ char *strsect_name;
+{
+ if (read_section_stabs (abfd, stabsect_name, strsect_name))
+ {
+ print_section_stabs (abfd, stabsect_name, strsect_name);
+ free (stabs);
+ free (strtab);
+ }
+}
+\f
+static void
+dump_bfd_header (abfd)
+ bfd *abfd;
+{
+ char *comma = "";
+
+ printf ("architecture: %s, ",
+ bfd_printable_arch_mach (bfd_get_arch (abfd),
+ bfd_get_mach (abfd)));
+ printf ("flags 0x%08x:\n", abfd->flags);
+
+#define PF(x, y) if (abfd->flags & x) {printf("%s%s", comma, y); comma=", ";}
+ PF (HAS_RELOC, "HAS_RELOC");
+ PF (EXEC_P, "EXEC_P");
+ PF (HAS_LINENO, "HAS_LINENO");
+ PF (HAS_DEBUG, "HAS_DEBUG");
+ PF (HAS_SYMS, "HAS_SYMS");
+ PF (HAS_LOCALS, "HAS_LOCALS");
+ PF (DYNAMIC, "DYNAMIC");
+ PF (WP_TEXT, "WP_TEXT");
+ PF (D_PAGED, "D_PAGED");
+ PF (BFD_IS_RELAXABLE, "BFD_IS_RELAXABLE");
+ printf ("\nstart address 0x");
+ printf_vma (abfd->start_address);
+}
+
+static void
display_bfd (abfd)
bfd *abfd;
{
+ char **matching;
- if (!bfd_check_format (abfd, bfd_object))
+ if (!bfd_check_format_matches (abfd, bfd_object, &matching))
{
- fprintf (stderr, "%s: %s not an object file\n", program_name,
- abfd->filename);
+ bfd_nonfatal (bfd_get_filename (abfd));
+ if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+ {
+ list_matching_formats (matching);
+ free (matching);
+ }
return;
}
- printf ("\n%s: file format %s\n", abfd->filename, abfd->xvec->name);
+
+ printf ("\n%s: file format %s\n", bfd_get_filename (abfd),
+ abfd->xvec->name);
if (dump_ar_hdrs)
print_arelt_descr (stdout, abfd, true);
-
if (dump_file_header)
- {
- char *comma = "";
-
- printf ("architecture: %s, ",
- bfd_printable_arch_mach (bfd_get_arch (abfd),
- bfd_get_mach (abfd)));
- printf ("flags 0x%08x:\n", abfd->flags);
-
-#define PF(x, y) if (abfd->flags & x) {printf("%s%s", comma, y); comma=", ";}
- PF (HAS_RELOC, "HAS_RELOC");
- PF (EXEC_P, "EXEC_P");
- PF (HAS_LINENO, "HAS_LINENO");
- PF (HAS_DEBUG, "HAS_DEBUG");
- PF (HAS_SYMS, "HAS_SYMS");
- PF (HAS_LOCALS, "HAS_LOCALS");
- PF (DYNAMIC, "DYNAMIC");
- PF (WP_TEXT, "WP_TEXT");
- PF (D_PAGED, "D_PAGED");
- printf ("\nstart address 0x");
- printf_vma (abfd->start_address);
- }
- printf ("\n");
-
+ dump_bfd_header (abfd);
+ putchar ('\n');
if (dump_section_headers)
dump_headers (abfd);
if (dump_symtab || dump_reloc_info || disassemble)
{
syms = slurp_symtab (abfd);
}
+ if (dump_dynamic_symtab || dump_dynamic_reloc_info)
+ {
+ dynsyms = slurp_dynamic_symtab (abfd);
+ }
if (dump_symtab)
- dump_symbols (abfd);
-#ifdef ELF_STAB_DISPLAY
+ dump_symbols (abfd, false);
+ if (dump_dynamic_symtab)
+ dump_symbols (abfd, true);
if (dump_stab_section_info)
- dump_elf_stabs (abfd);
-#endif
- if (dump_reloc_info)
+ dump_stabs (abfd);
+ if (dump_reloc_info && ! disassemble)
dump_relocs (abfd);
+ if (dump_dynamic_reloc_info)
+ dump_dynamic_relocs (abfd);
if (dump_section_contents)
dump_data (abfd);
+ /* Note that disassemble_data re-orders the syms table, but that is
+ safe - as long as it is done last! */
if (disassemble)
disassemble_data (abfd);
}
-void
+static void
display_file (filename, target)
char *filename;
char *target;
file = bfd_openr (filename, target);
if (file == NULL)
{
- bfd_perror (filename);
+ bfd_nonfatal (filename);
return;
}
if (bfd_check_format (file, bfd_archive) == true)
{
+ bfd *last_arfile = NULL;
+
printf ("In archive %s:\n", bfd_get_filename (file));
for (;;)
{
- bfd_error = no_error;
+ bfd_set_error (bfd_error_no_error);
arfile = bfd_openr_next_archived_file (file, arfile);
if (arfile == NULL)
{
- if (bfd_error != no_more_archived_files)
- bfd_perror (bfd_get_filename (file));
- return;
+ if (bfd_get_error () != bfd_error_no_more_archived_files)
+ {
+ bfd_nonfatal (bfd_get_filename (file));
+ }
+ break;
}
display_bfd (arfile);
- /* Don't close the archive elements; we need them for next_archive */
+
+ if (last_arfile != NULL)
+ bfd_close (last_arfile);
+ last_arfile = arfile;
}
+
+ if (last_arfile != NULL)
+ bfd_close (last_arfile);
}
else
display_bfd (file);
\f
/* Actually display the various requested regions */
-void
+static void
dump_data (abfd)
bfd *abfd;
{
{
printf ("Contents of section %s:\n", section->name);
- if (bfd_get_section_size_before_reloc (section) == 0)
+ if (bfd_section_size (abfd, section) == 0)
continue;
- data = (bfd_byte *) malloc (bfd_get_section_size_before_reloc (section));
- if (data == (bfd_byte *) NULL)
- {
- fprintf (stderr, "%s: memory exhausted.\n", program_name);
- exit (1);
- }
- datasize = bfd_get_section_size_before_reloc (section);
+ data = (bfd_byte *) xmalloc ((size_t) bfd_section_size (abfd, section));
+ datasize = bfd_section_size (abfd, section);
- bfd_get_section_contents (abfd, section, (PTR) data, 0, bfd_get_section_size_before_reloc (section));
+ bfd_get_section_contents (abfd, section, (PTR) data, 0, bfd_section_size (abfd, section));
- for (i = 0; i < bfd_get_section_size_before_reloc (section); i += onaline)
+ for (i = 0; i < bfd_section_size (abfd, section); i += onaline)
{
bfd_size_type j;
printf (" %04lx ", (unsigned long int) (i + section->vma));
for (j = i; j < i + onaline; j++)
{
- if (j < bfd_get_section_size_before_reloc (section))
+ if (j < bfd_section_size (abfd, section))
printf ("%02x", (unsigned) (data[j]));
else
printf (" ");
printf (" ");
for (j = i; j < i + onaline; j++)
{
- if (j >= bfd_get_section_size_before_reloc (section))
+ if (j >= bfd_section_size (abfd, section))
printf (" ");
else
printf ("%c", isprint (data[j]) ? data[j] : '.');
}
putchar ('\n');
}
+ free (data);
}
}
- free (data);
}
}
/* Should perhaps share code and display with nm? */
-void
-dump_symbols (abfd)
+static void
+dump_symbols (abfd, dynamic)
bfd *abfd;
+ boolean dynamic;
{
+ asymbol **current;
+ long max;
+ long count;
- unsigned int count;
- asymbol **current = syms;
-
- printf ("SYMBOL TABLE:\n");
-
- for (count = 0; count < symcount; count++)
+ if (dynamic)
+ {
+ current = dynsyms;
+ max = dynsymcount;
+ if (max == 0)
+ return;
+ printf ("DYNAMIC SYMBOL TABLE:\n");
+ }
+ else
{
+ current = syms;
+ max = symcount;
+ if (max == 0)
+ return;
+ printf ("SYMBOL TABLE:\n");
+ }
- if (*current && (*current)->the_bfd)
+ for (count = 0; count < max; count++)
+ {
+ if (*current)
{
- bfd_print_symbol ((*current)->the_bfd,
- stdout,
- *current, bfd_print_symbol_all);
-
- printf ("\n");
-
+ bfd *cur_bfd = bfd_asymbol_bfd(*current);
+ if (cur_bfd)
+ {
+ bfd_print_symbol (cur_bfd,
+ stdout,
+ *current, bfd_print_symbol_all);
+ printf ("\n");
+ }
}
current++;
}
printf ("\n");
}
-void
+static void
dump_relocs (abfd)
bfd *abfd;
{
arelent **relpp;
- unsigned int relcount;
+ long relcount;
asection *a;
for (a = abfd->sections; a != (asection *) NULL; a = a->next)
{
- if (a == &bfd_abs_section)
+ long relsize;
+
+ if (bfd_is_abs_section (a))
continue;
- if (a == &bfd_und_section)
+ if (bfd_is_und_section (a))
continue;
- if (a == &bfd_com_section)
+ if (bfd_is_com_section (a))
+ continue;
+
+ if (only)
+ {
+ if (strcmp (only, a->name))
+ continue;
+ }
+ else if ((a->flags & SEC_RELOC) == 0)
continue;
printf ("RELOCATION RECORDS FOR [%s]:", a->name);
- if (bfd_get_reloc_upper_bound (abfd, a) == 0)
+ relsize = bfd_get_reloc_upper_bound (abfd, a);
+ if (relsize < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ if (relsize == 0)
{
printf (" (none)\n\n");
}
else
{
- arelent **p;
-
- relpp = (arelent **) xmalloc (bfd_get_reloc_upper_bound (abfd, a));
+ relpp = (arelent **) xmalloc (relsize);
+ /* Note that this must be done *before* we sort the syms table. */
relcount = bfd_canonicalize_reloc (abfd, a, relpp, syms);
- if (relcount == 0)
+ if (relcount < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+ else if (relcount == 0)
{
printf (" (none)\n\n");
}
else
{
printf ("\n");
- printf ("OFFSET TYPE VALUE \n");
+ dump_reloc_set (abfd, relpp, relcount);
+ printf ("\n\n");
+ }
+ free (relpp);
+ }
+ }
+}
- for (p = relpp; relcount && *p != (arelent *) NULL; p++,
- relcount--)
- {
- arelent *q = *p;
- CONST char *sym_name;
+static void
+dump_dynamic_relocs (abfd)
+ bfd *abfd;
+{
+ long relsize;
+ arelent **relpp;
+ long relcount;
- /* CONST char *section_name = q->section == (asection *)NULL ? "*abs" :*/
- /* q->section->name;*/
- CONST char *section_name = (*(q->sym_ptr_ptr))->section->name;
+ printf ("DYNAMIC RELOCATION RECORDS");
- if (q->sym_ptr_ptr && *q->sym_ptr_ptr)
- {
- sym_name = (*(q->sym_ptr_ptr))->name;
- }
- else
- {
- sym_name = 0;
- }
- if (sym_name)
- {
- printf_vma (q->address);
- printf (" %-8s %s",
- q->howto->name,
- sym_name);
- }
- else
- {
- printf_vma (q->address);
- printf (" %-8s [%s]",
- q->howto->name,
- section_name);
- }
- if (q->addend)
- {
- printf ("+0x");
- printf_vma (q->addend);
- }
- printf ("\n");
- }
- printf ("\n\n");
- free (relpp);
- }
+ relsize = bfd_get_dynamic_reloc_upper_bound (abfd);
+ if (relsize < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+
+ if (relsize == 0)
+ {
+ printf (" (none)\n\n");
+ }
+ else
+ {
+ relpp = (arelent **) xmalloc (relsize);
+ relcount = bfd_canonicalize_dynamic_reloc (abfd, relpp, dynsyms);
+ if (relcount < 0)
+ bfd_fatal (bfd_get_filename (abfd));
+ else if (relcount == 0)
+ {
+ printf (" (none)\n\n");
}
+ else
+ {
+ printf ("\n");
+ dump_reloc_set (abfd, relpp, relcount);
+ printf ("\n\n");
+ }
+ free (relpp);
+ }
+}
+
+static void
+dump_reloc_set (abfd, relpp, relcount)
+ bfd *abfd;
+ arelent **relpp;
+ long relcount;
+{
+ arelent **p;
+ /* Get column headers lined up reasonably. */
+ {
+ static int width;
+ if (width == 0)
+ {
+ char buf[30];
+ sprintf_vma (buf, (bfd_vma) -1);
+ width = strlen (buf) - 7;
+ }
+ printf ("OFFSET %*s TYPE %*s VALUE \n", width, "", 12, "");
+ }
+
+ for (p = relpp; relcount && *p != (arelent *) NULL; p++, relcount--)
+ {
+ arelent *q = *p;
+ CONST char *sym_name;
+ CONST char *section_name;
+
+ if (q->sym_ptr_ptr && *q->sym_ptr_ptr)
+ {
+ sym_name = (*(q->sym_ptr_ptr))->name;
+ section_name = (*(q->sym_ptr_ptr))->section->name;
+ }
+ else
+ {
+ sym_name = NULL;
+ section_name = NULL;
+ }
+ if (sym_name)
+ {
+ printf_vma (q->address);
+ printf (" %-16s %s",
+ q->howto->name,
+ sym_name);
+ }
+ else
+ {
+ if (section_name == (CONST char *) NULL)
+ section_name = "*unknown*";
+ printf_vma (q->address);
+ printf (" %-16s [%s]",
+ q->howto->name,
+ section_name);
+ }
+ if (q->addend)
+ {
+ printf ("+0x");
+ printf_vma (q->addend);
+ }
+ printf ("\n");
}
}
+\f
+/* The length of the longest architecture name + 1. */
+#define LONGEST_ARCH sizeof("rs6000:6000")
+
+/* List the targets that BFD is configured to support, each followed
+ by its endianness and the architectures it supports. */
-#ifdef unix
-#define _DUMMY_NAME_ "/dev/null"
-#else
-#define _DUMMY_NAME_ "##dummy"
-#endif
static void
-DEFUN (display_info_table, (first, last),
- int first AND int last)
+display_target_list ()
{
- unsigned int i, j;
- extern bfd_target *target_vector[];
+ extern char *tmpnam ();
+ extern bfd_target *bfd_target_vector[];
+ char *dummy_name;
+ int t;
- printf ("\n%12s", " ");
- for (i = first; i++ < last && target_vector[i];)
- printf ("%s ", target_vector[i]->name);
- printf ("\n");
+ dummy_name = tmpnam ((char *) NULL);
+ for (t = 0; bfd_target_vector[t]; t++)
+ {
+ bfd_target *p = bfd_target_vector[t];
+ bfd *abfd = bfd_openw (dummy_name, p->name);
+ int a;
+
+ printf ("%s\n (header %s, data %s)\n", p->name,
+ p->header_byteorder_big_p ? "big endian" : "little endian",
+ p->byteorder_big_p ? "big endian" : "little endian");
- for (j = (int) bfd_arch_obscure + 1; (int) j < (int) bfd_arch_last; j++)
- if (strcmp (bfd_printable_arch_mach (j, 0), "UNKNOWN!") != 0)
+ if (abfd == NULL)
+ {
+ bfd_nonfatal (dummy_name);
+ continue;
+ }
+
+ if (! bfd_set_format (abfd, bfd_object))
+ {
+ if (bfd_get_error () != bfd_error_invalid_operation)
+ bfd_nonfatal (p->name);
+ continue;
+ }
+
+ for (a = (int) bfd_arch_obscure + 1; a < (int) bfd_arch_last; a++)
+ if (bfd_set_arch_mach (abfd, (enum bfd_architecture) a, 0))
+ printf (" %s\n",
+ bfd_printable_arch_mach ((enum bfd_architecture) a, 0));
+ }
+ unlink (dummy_name);
+}
+
+/* Print a table showing which architectures are supported for entries
+ FIRST through LAST-1 of bfd_target_vector (targets across,
+ architectures down). */
+
+static void
+display_info_table (first, last)
+ int first;
+ int last;
+{
+ extern bfd_target *bfd_target_vector[];
+ extern char *tmpnam ();
+ int t, a;
+ char *dummy_name;
+
+ /* Print heading of target names. */
+ printf ("\n%*s", (int) LONGEST_ARCH, " ");
+ for (t = first; t < last && bfd_target_vector[t]; t++)
+ printf ("%s ", bfd_target_vector[t]->name);
+ putchar ('\n');
+
+ dummy_name = tmpnam ((char *) NULL);
+ for (a = (int) bfd_arch_obscure + 1; a < (int) bfd_arch_last; a++)
+ if (strcmp (bfd_printable_arch_mach (a, 0), "UNKNOWN!") != 0)
{
- printf ("%11s ", bfd_printable_arch_mach (j, 0));
- for (i = first; i++ < last && target_vector[i];)
+ printf ("%*s ", (int) LONGEST_ARCH - 1,
+ bfd_printable_arch_mach (a, 0));
+ for (t = first; t < last && bfd_target_vector[t]; t++)
{
- bfd_target *p = target_vector[i];
- bfd *abfd = bfd_openw (_DUMMY_NAME_, p->name);
- int l = strlen (p->name);
- int ok = bfd_set_arch_mach (abfd, j, 0);
+ bfd_target *p = bfd_target_vector[t];
+ boolean ok = true;
+ bfd *abfd = bfd_openw (dummy_name, p->name);
+
+ if (abfd == NULL)
+ {
+ bfd_nonfatal (p->name);
+ ok = false;
+ }
+
+ if (ok)
+ {
+ if (! bfd_set_format (abfd, bfd_object))
+ {
+ if (bfd_get_error () != bfd_error_invalid_operation)
+ bfd_nonfatal (p->name);
+ ok = false;
+ }
+ }
+
+ if (ok)
+ {
+ if (! bfd_set_arch_mach (abfd, a, 0))
+ ok = false;
+ }
if (ok)
printf ("%s ", p->name);
else
{
+ int l = strlen (p->name);
while (l--)
- printf ("%c", ok ? '*' : '-');
- printf (" ");
+ putchar ('-');
+ putchar (' ');
}
}
- printf ("\n");
+ putchar ('\n');
}
+ unlink (dummy_name);
}
+/* Print tables of all the target-architecture combinations that
+ BFD has been configured to support. */
+
static void
-DEFUN_VOID (display_info)
+display_target_tables ()
{
+ int t, columns;
+ extern bfd_target *bfd_target_vector[];
char *colum;
- unsigned int i, j, columns;
- extern bfd_target *target_vector[];
extern char *getenv ();
- printf ("BFD header file version %s\n", BFD_VERSION);
- for (i = 0; target_vector[i]; i++)
- {
- bfd_target *p = target_vector[i];
- bfd *abfd = bfd_openw (_DUMMY_NAME_, p->name);
-
- printf ("%s\n (header %s, data %s)\n", p->name,
- p->header_byteorder_big_p ? "big endian" : "little endian",
- p->byteorder_big_p ? "big endian" : "little endian");
- for (j = (int) bfd_arch_obscure + 1; j < (int) bfd_arch_last; j++)
- if (bfd_set_arch_mach (abfd, (enum bfd_architecture) j, 0))
- printf (" %s\n",
- bfd_printable_arch_mach ((enum bfd_architecture) j, 0));
- }
columns = 0;
- if (colum = getenv ("COLUMNS"))
+ colum = getenv ("COLUMNS");
+ if (colum != NULL)
columns = atoi (colum);
- if (!columns)
+ if (columns == 0)
columns = 80;
- for (i = 0; target_vector[i];)
+
+ t = 0;
+ while (bfd_target_vector[t] != NULL)
{
- int old;
- old = i;
- for (j = 12; target_vector[i] && j < columns; i++)
- j += strlen (target_vector[i]->name) + 1;
- i--;
- if (old == i)
- break;
- display_info_table (old, i);
+ int oldt = t, wid;
+
+ wid = LONGEST_ARCH + strlen (bfd_target_vector[t]->name) + 1;
+ ++t;
+ while (wid < columns && bfd_target_vector[t] != NULL)
+ {
+ int newwid;
+
+ newwid = wid + strlen (bfd_target_vector[t]->name) + 1;
+ if (newwid >= columns)
+ break;
+ wid = newwid;
+ ++t;
+ }
+ display_info_table (oldt, t);
}
}
-/** main and like trivia */
+static void
+display_info ()
+{
+ printf ("BFD header file version %s\n", BFD_VERSION);
+ display_target_list ();
+ display_target_tables ();
+}
+
int
main (argc, argv)
int argc;
char **argv;
{
int c;
- extern int optind;
- extern char *optarg;
char *target = default_target;
boolean seenflag = false;
- int ind = 0;
- bfd_init ();
program_name = *argv;
+ xmalloc_set_program_name (program_name);
+
+ bfd_init ();
- while ((c = getopt_long (argc, argv, "ib:m:dlfahrtxsj:", long_options, &ind))
+ while ((c = getopt_long (argc, argv, "ib:m:VdDlfahrRtTxsj:", long_options,
+ (int *) 0))
!= EOF)
{
seenflag = true;
switch (c)
{
+ case 0:
+ break; /* we've been given a long option */
case 'm':
machine = optarg;
break;
dump_file_header = true;
break;
case 'i':
- info = true;
+ formats_info = true;
break;
case 'x':
dump_symtab = 1;
dump_ar_hdrs = 1;
dump_section_headers = 1;
break;
- case 0:
- break; /* we've been given a long option */
case 't':
dump_symtab = 1;
break;
+ case 'T':
+ dump_dynamic_symtab = 1;
+ break;
case 'd':
disassemble = true;
break;
+ case 'D':
+ disassemble = disassemble_all = true;
+ break;
case 's':
dump_section_contents = 1;
break;
case 'r':
dump_reloc_info = 1;
break;
+ case 'R':
+ dump_dynamic_reloc_info = 1;
+ break;
case 'a':
dump_ar_hdrs = 1;
break;
case 'h':
dump_section_headers = 1;
break;
+ case 'H':
+ usage (stdout, 0);
+ case 'V':
+ show_version = 1;
+ break;
default:
- usage ();
+ usage (stderr, 1);
}
}
+ if (show_version)
+ {
+ printf ("GNU %s version %s\n", program_name, program_version);
+ exit (0);
+ }
+
if (seenflag == false)
- usage ();
+ usage (stderr, 1);
- if (info)
+ if (formats_info)
{
display_info ();
}
projects / binutils.git / blobdiff