OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* objdump.c (objdump_print_value): New static function.

Browse Source 
(objdump_print_address): Use it.  If we need the right section for
	the symbol, and we can't find it, print an offset from the section
	rather than using a symbol from some other section.
PR 8251.
This commit is contained in:
Ian Lance Taylor 1995-10-30 19:34:02 +00:00
parent 7efb4b4c8e
commit c5ba27591a
2 changed files with 76 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binutils/ChangeLog
View File

@ -1,3 +1,10 @@
Mon Oct 30 14:24:18 1995 Ian Lance Taylor <ian@cygnus.com>
* objdump.c (objdump_print_value): New static function.
(objdump_print_address): Use it. If we need the right section for
the symbol, and we can't find it, print an offset from the section
rather than using a symbol from some other section.
Thu Oct 26 10:23:14 1995 steve chamberlain <sac@slash.cygnus.com>
* dlltool.c (no_idata4, no_idata5): New.

84
binutils/objdump.c
View File

@ -111,6 +111,9 @@ dump_symbols PARAMS ((bfd *abfd, boolean dynamic));
static void
display_bfd PARAMS ((bfd *abfd));
static void
objdump_print_value PARAMS ((bfd_vma, FILE *));
static void
objdump_print_address PARAMS ((bfd_vma, struct disassemble_info *));
@ -232,6 +235,7 @@ slurp_symtab (abfd)
if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
{
printf ("No symbols in \"%s\".\n", bfd_get_filename (abfd));
symcount = 0;
return NULL;
}
@ -268,6 +272,7 @@ slurp_dynamic_symtab (abfd)
{
fprintf (stderr, "%s: %s: not a dynamic object\n",
program_name, bfd_get_filename (abfd));
dynsymcount = 0;
return NULL;
}
@ -403,6 +408,22 @@ compare_relocs (ap, bp)
return 0;
}
/* Print VMA to STREAM with no leading zeroes. */
static void
objdump_print_value (vma, stream)
bfd_vma vma;
FILE *stream;
{
char buf[30];
char *p;
sprintf_vma (buf, vma);
for (p = buf; *p == '0'; ++p)
;
fprintf (stream, "%s", p);
}
/* Print VMA symbolically to INFO if possible. */
static void
@ -504,7 +525,7 @@ objdump_print_address (vma, info)
|| ((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)))))
+ bfd_section_size (aux->abfd, aux->sec)))))
{
for (i = thisplace + 1; i < sorted_symcount; i++)
{
@ -539,25 +560,47 @@ objdump_print_address (vma, info)
}
}
}
if (sorted_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_section_size (aux->abfd, aux->sec)))))
{
bfd_vma secaddr;
fprintf (info->stream, " <%s",
bfd_get_section_name (aux->abfd, aux->sec));
secaddr = bfd_get_section_vma (aux->abfd, aux->sec);
if (vma < secaddr)
{
fprintf (info->stream, "-");
objdump_print_value (secaddr - vma, info->stream);
}
else if (vma > secaddr)
{
fprintf (info->stream, "+");
objdump_print_value (vma - secaddr, info->stream);
}
fprintf (info->stream, ">");
return;
}
}
}
fprintf (info->stream, " <%s", sorted_syms[thisplace]->name);
if (bfd_asymbol_value (sorted_syms[thisplace]) > vma)
{
char buf[30], *p = buf;
sprintf_vma (buf, bfd_asymbol_value (sorted_syms[thisplace]) - vma);
while (*p == '0')
p++;
fprintf (info->stream, "-%s", p);
fprintf (info->stream, "-");
objdump_print_value (bfd_asymbol_value (sorted_syms[thisplace]) - vma,
info->stream);
}
else if (vma > bfd_asymbol_value (sorted_syms[thisplace]))
{
char buf[30], *p = buf;
sprintf_vma (buf, vma - bfd_asymbol_value (sorted_syms[thisplace]));
while (*p == '0')
p++;
fprintf (info->stream, "+%s", p);
fprintf (info->stream, "+");
objdump_print_value (vma - bfd_asymbol_value (sorted_syms[thisplace]),
info->stream);
}
fprintf (info->stream, ">");
}
@ -980,6 +1023,7 @@ disassemble_data (abfd)
if (relbuf != NULL)
free (relbuf);
}
free (sorted_syms);
}
@ -1276,6 +1320,16 @@ display_bfd (abfd)
dump_data (abfd);
if (disassemble)
disassemble_data (abfd);
if (syms)
{
free (syms);
syms = NULL;
}
if (dynsyms)
{
free (dynsyms);
dynsyms = NULL;
}
}
static void
@ -1479,12 +1533,12 @@ dump_relocs (abfd)
else if ((a->flags & SEC_RELOC) == 0)
continue;
printf ("RELOCATION RECORDS FOR [%s]:", a->name);
relsize = bfd_get_reloc_upper_bound (abfd, a);
if (relsize < 0)
bfd_fatal (bfd_get_filename (abfd));
printf ("RELOCATION RECORDS FOR [%s]:", a->name);
if (relsize == 0)
{
printf (" (none)\n\n");
@ -1518,12 +1572,12 @@ dump_dynamic_relocs (abfd)
arelent **relpp;
long relcount;
printf ("DYNAMIC RELOCATION RECORDS");
relsize = bfd_get_dynamic_reloc_upper_bound (abfd);
if (relsize < 0)
bfd_fatal (bfd_get_filename (abfd));
printf ("DYNAMIC RELOCATION RECORDS");
if (relsize == 0)
{
printf (" (none)\n\n");