/* objdump.c -- dump information about an object file.
- Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993 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"
-#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 */
-extern char *xmalloc ();
+#ifndef FPRINTF_ALREADY_DECLARED
extern int fprintf PARAMS ((FILE *, CONST char *, ...));
+#endif
char *default_target = NULL; /* default at runtime */
-extern *program_version;
-char *program_name = NULL;
+extern char *program_version;
int show_version = 0; /* show the version number */
int dump_section_contents; /* -s */
int dump_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;
+boolean formats_info; /* -i */
+char *only; /* -j secname */
+
+struct objdump_disasm_info {
+ bfd *abfd;
+ asection *sec;
+};
char *machine = (char *) NULL;
asymbol **syms;
-asymbol **syms2;
unsigned int storage;
dump_symbols PARAMS ((bfd *abfd));
\f
void
-usage ()
+usage (stream, status)
+ FILE *stream;
+ int status;
{
- fprintf (stderr, "\
+ fprintf (stream, "\
Usage: %s [-ahifdrtxsl] [-m machine] [-j section_name] [-b bfdname]\n\
- [--syms] [--reloc] [--header] [--version] objfile...\n", program_name);
- exit (1);
+ [--syms] [--reloc] [--header] [--stabs] [--version] [--help] objfile...\n\
+ at least one option besides -l must be given\n",
+ program_name);
+ exit (status);
}
static struct option long_options[]=
{"reloc", no_argument, &dump_reloc_info, 1},
{"header", no_argument, &dump_section_headers, 1},
{"version", no_argument, &show_version, 1},
-#ifdef ELF_STAB_DISPLAY
+ {"help", no_argument, 0, 'H'},
{"stabs", no_argument, &dump_stab_section_info, 1},
-#endif
{0, no_argument, 0, 0}
};
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");
printf ("\n");
#undef PF
}
return sy;
}
+/* Filter out (in place) symbols that are useless for dis-assemble.
+ Return count of useful symbols. */
+
+int remove_useless_symbols (syms, count)
+ asymbol **syms;
+ int count;
+{
+ register asymbol **in_ptr = syms;
+ register asymbol **out_ptr = syms;
+
+ while ( --count >= 0 )
+ {
+ asymbol *sym = *in_ptr++;
+
+ if (sym->name == NULL || sym->name[0] == '\0')
+ continue;
+ if (sym->flags & (BSF_DEBUGGING))
+ continue;
+ if (sym->section == &bfd_und_section
+ || bfd_is_com_section (sym->section))
+ continue;
+
+ *out_ptr++ = sym;
+ }
+ return out_ptr - syms;
+}
+
+
/* Sort symbols into value order */
static int
comp (ap, bp)
{
asymbol *a = *(asymbol **)ap;
asymbol *b = *(asymbol **)bp;
- int diff;
- bfd *a_bfd, *b_bfd;
- if (a->name == (char *) NULL || (a->flags & (BSF_DEBUGGING)))
- a_bfd = 0;
- else
- a_bfd = bfd_asymbol_bfd(a);
- if (b->name == (char *) NULL || (b->flags & (BSF_DEBUGGING)))
- b_bfd = 0;
- else
- b_bfd = bfd_asymbol_bfd(b);
+ if (a->value > b->value)
+ return 1;
+ else if (a->value < b->value)
+ return -1;
- diff = a_bfd - b_bfd;
- if (diff)
- {
- return -diff;
- }
- diff = a->value - b->value;
- if (diff)
- {
- return diff;
- }
- return a->section - b->section;
+ if (a->section > b->section)
+ return 1;
+ else if (a->section < b->section)
+ return -1;
+ return 0;
}
/* Print the supplied address symbolically if possible */
struct disassemble_info *info;
{
/* Perform a binary search looking for the closest symbol to
- the required value */
+ 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;
int vardiff;
- if (symcount == 0)
- {
- fprintf_vma (info->stream, vma);
- }
- else
+ fprintf_vma (info->stream, vma);
+
+ if (symcount > 0)
{
while (true)
{
+ asymbol *sym; asection *sym_sec;
oldthisplace = thisplace;
thisplace = (max + min) / 2;
if (thisplace == oldthisplace)
break;
- vardiff = syms[thisplace]->value - vma;
-
- if (vardiff
- /* Check that the value isn't merely a coincidence.
- (if not checked, we might print some undefined symbol
- for the address 0 rather than "main", for example. */
- || !(syms[thisplace]->flags & (BSF_GLOBAL|BSF_LOCAL)))
- {
- if (vardiff > 0)
- {
- max = thisplace;
- }
- else
- {
- min = thisplace;
- }
- }
+ sym = syms[thisplace];
+ vardiff = sym->value - vma;
+ sym_sec = sym->section;
+
+ if (vardiff > 0)
+ max = thisplace;
+ else if (vardiff < 0)
+ min = thisplace;
else
- {
- /* 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 (info->stream, vma);
- fprintf (info->stream, " (%s+)0000", syms[thisplace]->name);
- return;
- }
+ goto found;
}
/* 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 */
}
}
- fprintf_vma (info->stream, vma);
+ found:
+ {
+ bfd_vma val = syms[thisplace]->value;
+ int 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))))
+ {
+ thisplace = i;
+ break;
+ }
+ }
+ if (syms[thisplace]->flags & (BSF_LOCAL|BSF_DEBUGGING))
+ for (i = thisplace + 1; i < symcount; i++)
+ {
+ if (syms[i]->value == val
+ && (!(syms[i]->flags & (BSF_LOCAL|BSF_DEBUGGING))
+ || ((syms[thisplace]->flags & BSF_DEBUGGING)
+ && !(syms[i]->flags & BSF_DEBUGGING))))
+ {
+ 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;
+ int i;
+
+ aux = (struct objdump_disasm_info *) info->application_data;
+ if (aux->abfd->flags & HAS_RELOC
+ && 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))
+ && syms[thisplace]->section != aux->sec)
+ {
+ for (i = thisplace + 1; i < symcount; i++)
+ if (syms[i]->value != syms[thisplace]->value)
+ break;
+ while (--i >= 0)
+ if (syms[i]->section == aux->sec)
+ {
+ thisplace = i;
+ break;
+ }
+ }
+ }
+ fprintf (info->stream, " <%s", syms[thisplace]->name);
if (syms[thisplace]->value > vma)
{
- fprintf (info->stream, " (%s-)", syms[thisplace]->name);
- fprintf (info->stream, "%04x", 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
+ else if (vma > syms[thisplace]->value)
{
- fprintf (info->stream, " (%s+)", syms[thisplace]->name);
- fprintf (info->stream, "%04x", 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, ">");
}
}
+#ifdef ARCH_all
+#define ARCH_a29k
+#define ARCH_alpha
+#define ARCH_h8300
+#define ARCH_h8500
+#define ARCH_hppa
+#define ARCH_i386
+#define ARCH_i960
+#define ARCH_m68k
+#define ARCH_m88k
+#define ARCH_mips
+#define ARCH_sh
+#define ARCH_sparc
+#define ARCH_z8k
+#endif
+
void
disassemble_data (abfd)
bfd *abfd;
bfd_size_type i;
unsigned int (*print) ()= 0; /* Old style */
disassembler_ftype disassemble = 0; /* New style */
- unsigned int print_insn_h8300 ();
enum bfd_architecture a;
struct disassemble_info disasm_info;
+ struct objdump_disasm_info aux;
int prevline;
CONST char *prev_function = "";
boolean done_dot = false;
INIT_DISASSEMBLE_INFO(disasm_info, stdout);
+ disasm_info.application_data = (PTR) &aux;
+ aux.abfd = abfd;
disasm_info.print_address_func = objdump_print_address;
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]->name == (char *) NULL
- || (syms[i]->flags & BSF_DEBUGGING) != 0)
- {
- symcount = i;
- break;
- }
- }
- }
-
-
if (machine != (char *) NULL)
{
info = bfd_scan_arch (machine);
a = bfd_get_arch (abfd);
switch (a)
{
- case bfd_arch_sparc:
- disassemble = print_insn_sparc;
+ /* If you add a case to this table, also add it to the
+ ARCH_all definition right above this function. */
+#ifdef ARCH_a29k
+ case bfd_arch_a29k:
+ /* As far as I know we only handle big-endian 29k objects. */
+ disassemble = print_insn_big_a29k;
break;
- case bfd_arch_z8k:
- if (bfd_get_mach(abfd) == bfd_mach_z8001)
- disassemble = print_insn_z8001;
- else
- disassemble = print_insn_z8002;
+#endif
+#ifdef ARCH_alpha
+ case bfd_arch_alpha:
+ disassemble = print_insn_alpha;
break;
- case bfd_arch_i386:
- disassemble = print_insn_i386;
+#endif
+#ifdef ARCH_h8300
+ case bfd_arch_h8300:
+ if (bfd_get_mach(abfd) == bfd_mach_h8300h)
+ disassemble = print_insn_h8300h;
+ else
+ disassemble = print_insn_h8300;
break;
+#endif
+#ifdef ARCH_h8500
case bfd_arch_h8500:
disassemble = print_insn_h8500;
break;
- case bfd_arch_sh:
- disassemble = print_insn_sh;
+#endif
+#ifdef ARCH_hppa
+ case bfd_arch_hppa:
+ disassemble = print_insn_hppa;
break;
- case bfd_arch_alpha:
- disassemble = print_insn_alpha;
+#endif
+#ifdef ARCH_i386
+ case bfd_arch_i386:
+ disassemble = print_insn_i386;
+ break;
+#endif
+#ifdef ARCH_i960
+ case bfd_arch_i960:
+ disassemble = print_insn_i960;
break;
+#endif
+#ifdef ARCH_m68k
case bfd_arch_m68k:
disassemble = print_insn_m68k;
break;
- case bfd_arch_a29k:
- /* As far as I know we only handle big-endian 29k objects. */
- disassemble = print_insn_big_a29k;
- break;
- case bfd_arch_i960:
- disassemble = print_insn_i960;
+#endif
+#ifdef ARCH_m88k
+ case bfd_arch_m88k:
+ disassemble = print_insn_m88k;
break;
+#endif
+#ifdef ARCH_mips
case bfd_arch_mips:
if (abfd->xvec->byteorder_big_p)
disassemble = print_insn_big_mips;
else
disassemble = print_insn_little_mips;
break;
+#endif
+#ifdef ARCH_sh
+ case bfd_arch_sh:
+ disassemble = print_insn_sh;
+ break;
+#endif
+#ifdef ARCH_sparc
+ case bfd_arch_sparc:
+ disassemble = print_insn_sparc;
+ break;
+#endif
+#ifdef ARCH_z8k
+ case bfd_arch_z8k:
+ if (bfd_get_mach(abfd) == bfd_mach_z8001)
+ disassemble = print_insn_z8001;
+ else
+ disassemble = print_insn_z8002;
+ break;
+#endif
default:
fprintf (stderr, "%s: Can't disassemble for architecture %s\n",
program_name,
section != (asection *) NULL;
section = section->next)
{
+ aux.sec = section;
if ((section->flags & SEC_LOAD)
&& (only == (char *) NULL || strcmp (only, section->name) == 0))
if (bfd_get_section_size_before_reloc (section) == 0)
continue;
- data = (bfd_byte *) malloc (bfd_get_section_size_before_reloc (section));
+ data = (bfd_byte *) malloc ((size_t) bfd_get_section_size_before_reloc (section));
if (data == (bfd_byte *) NULL)
{
}
}
\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
{0, 0}
};
-void dump_elf_stabs_1 ();
+void dump_stabs_1 ();
-/* This is a kludge for dumping the stabs section from an ELF file that
+/* This dumps the stabs section from object files that have 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;
{
int i;
strcpy (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_elf_stabs_1 (abfd, ".stab", ".stabstr");
- dump_elf_stabs_1 (abfd, ".stab.excl", ".stab.exclstr");
- dump_elf_stabs_1 (abfd, ".stab.index", ".stab.indexstr");
+ dump_stabs_1 (abfd, ".stab", ".stabstr");
+ dump_stabs_1 (abfd, ".stab.excl", ".stab.exclstr");
+ dump_stabs_1 (abfd, ".stab.index", ".stab.indexstr");
}
void
-dump_elf_stabs_1 (abfd, name1, name2)
+dump_stabs_1 (abfd, name1, name2)
bfd *abfd;
char *name1; /* Section name of .stab */
char *name2; /* Section name of its string section */
{
Elf_Internal_Shdr *stab_hdr, *stabstr_hdr;
+ asection *stabsect, *stabstrsect;
char *strtab;
struct internal_nlist *stabs, *stabs_end;
int i;
+ int stab_size, stabstr_size;
unsigned file_string_table_offset, next_file_string_table_offset;
+ int is_elf = (0 == strncmp ("elf", abfd->xvec->name, 3));
- stab_hdr = bfd_elf_find_section (abfd, name1);
- if (0 == stab_hdr)
+ if (is_elf)
{
- printf ("Contents of %s section: none.\n\n", name1);
+ stab_hdr = bfd_elf_find_section (abfd, name1);
+ }
+ else
+ {
+ stabsect = bfd_get_section_by_name (abfd, name1);
+ }
+
+ if (is_elf ? (0 == stab_hdr) : (0 == stabsect))
+ {
+ printf ("No %s section present.\n\n", name1);
return;
}
- stabstr_hdr = bfd_elf_find_section (abfd, name2);
- if (0 == stabstr_hdr)
+ if (is_elf)
+ {
+ stabstr_hdr = bfd_elf_find_section (abfd, name2);
+ }
+ else
+ {
+ stabstrsect = bfd_get_section_by_name (abfd, name2);
+ }
+
+ if (is_elf ? (0 == stabstr_hdr) : (0 == stabstrsect))
{
fprintf (stderr, "%s: %s has no %s section.\n", program_name,
abfd->filename, name2);
return;
}
+
+ stab_size = (is_elf ? stab_hdr ->sh_size : bfd_section_size (abfd, stabsect));
+ stabstr_size = (is_elf ? stabstr_hdr->sh_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);
+ stabs_end = (struct internal_nlist *) (stab_size + (char *) stabs);
- if (bfd_seek (abfd, stab_hdr->sh_offset, SEEK_SET) < 0 ||
- stab_hdr->sh_size != bfd_read ((PTR)stabs, stab_hdr->sh_size, 1, abfd))
+ if (is_elf)
{
- fprintf (stderr, "%s: reading %s section of %s failed.\n",
- program_name, name1,
- abfd->filename);
- return;
+ if (bfd_seek (abfd, stab_hdr->sh_offset, SEEK_SET) < 0 ||
+ stab_size != bfd_read ((PTR) stabs, stab_size, 1, abfd))
+ {
+ fprintf (stderr, "%s: reading %s section of %s failed.\n",
+ program_name, name1,
+ abfd->filename);
+ return;
+ }
+ }
+ else
+ {
+ bfd_get_section_contents (abfd, stabsect, (PTR) stabs, 0, stab_size);
}
- if (bfd_seek (abfd, stabstr_hdr->sh_offset, SEEK_SET) < 0 ||
- stabstr_hdr->sh_size != bfd_read ((PTR)strtab, stabstr_hdr->sh_size,
- 1, abfd))
+ if (is_elf)
{
- fprintf (stderr, "%s: reading %s section of %s failed.\n",
- program_name, name2,
- abfd->filename);
- return;
+ if (bfd_seek (abfd, stabstr_hdr->sh_offset, SEEK_SET) < 0 ||
+ stabstr_size != bfd_read ((PTR) strtab, stabstr_size, 1, abfd))
+ {
+ fprintf (stderr, "%s: reading %s section of %s failed.\n",
+ program_name, name2,
+ abfd->filename);
+ return;
+ }
+ }
+ else
+ {
+ bfd_get_section_contents (abfd, stabstrsect, (PTR) strtab, 0, stabstr_size);
}
#define SWAP_SYMBOL(symp, abfd) \
/* Loop through all symbols and print them.
We start the index at -1 because there is a dummy symbol on
- the front of Sun's stabs-in-elf sections. */
+ the front of stabs-in-{coff,elf} sections that supplies sizes. */
for (i = -1; stabs < stabs_end; stabs++, i++)
{
file_string_table_offset = next_file_string_table_offset;
next_file_string_table_offset += stabs->n_value;
}
-
- /* Now, using the possibly updated string table offset, print the
- string (if any) associated with this symbol. */
-
- if ((stabs->n_strx + file_string_table_offset) < stabstr_hdr->sh_size)
- printf (" %s", &strtab[stabs->n_strx + file_string_table_offset]);
else
- printf (" *");
+ {
+ /* Now, using the possibly updated string table offset, print the
+ string (if any) associated with this symbol. */
+
+ if ((stabs->n_strx + file_string_table_offset) < stabstr_size)
+ printf (" %s", &strtab[stabs->n_strx + file_string_table_offset]);
+ else
+ printf (" *");
+ }
}
printf ("\n\n");
}
-#endif /* ELF_STAB_DISPLAY */
display_bfd (abfd)
bfd *abfd;
if (!bfd_check_format (abfd, bfd_object))
{
- fprintf (stderr, "%s: %s not an object file\n", program_name,
- abfd->filename);
+ fprintf (stderr, "%s:%s: %s\n", program_name, abfd->filename,
+ bfd_errmsg (bfd_error));
return;
}
printf ("\n%s: file format %s\n", abfd->filename, abfd->xvec->name);
}
if (dump_symtab)
dump_symbols (abfd);
-#ifdef ELF_STAB_DISPLAY
if (dump_stab_section_info)
- dump_elf_stabs (abfd);
-#endif
+ dump_stabs (abfd);
if (dump_reloc_info)
dump_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);
}
{
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));
+ data = (bfd_byte *) malloc ((size_t) bfd_section_size (abfd, section));
if (data == (bfd_byte *) NULL)
{
fprintf (stderr, "%s: memory exhausted.\n", program_name);
exit (1);
}
- datasize = bfd_get_section_size_before_reloc (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] : '.');
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)
arelent **p;
relpp = (arelent **) xmalloc (bfd_get_reloc_upper_bound (abfd, a));
+ /* Note that this must be done *before* we sort the syms table. */
relcount = bfd_canonicalize_reloc (abfd, a, relpp, syms);
if (relcount == 0)
{
else
{
printf ("\n");
- printf ("OFFSET TYPE VALUE \n");
+ /* 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 = q->section == (asection *)NULL ? "*abs" :*/
- /* q->section->name;*/
CONST char *section_name = (*(q->sym_ptr_ptr))->section->name;
if (q->sym_ptr_ptr && *q->sym_ptr_ptr)
if (sym_name)
{
printf_vma (q->address);
- printf (" %-8s %s",
+ printf (" %-16s %s",
q->howto->name,
sym_name);
}
else
{
printf_vma (q->address);
- printf (" %-8s [%s]",
+ printf (" %-16s [%s]",
q->howto->name,
section_name);
}
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 '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 ("%s version %s\n", program_name, program_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