From d8180c76ad59975d1ae5b0129cf39e09d2590d5e Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 10 Aug 2001 16:43:18 +0000 Subject: [PATCH] 2001-08-10 H.J. Lu * nm.c (print_value): Add one arg, bfd *. (print_value): Replace fprintf_vma with bfd_fprintf_vma. (print_symbol_info_bsd): Also pass `abfd' to print_value (). (print_symbol_info_sysv): Likewise. (print_symbol_info_posix): Likewise. * objdump.c (dump_section_header): Replace printf_vma with bfd_printf_vma. (print_section_stabs): Likewise. (dump_bfd_header): Likewise. (objdump_print_value): Replace sprintf_vma with bfd_sprintf_vma. (disassemble_bytes): Likewise. (dump_reloc_set): Likewise. --- binutils/ChangeLog | 17 +++++++++++++++++ binutils/nm.c | 13 +++++++------ binutils/objdump.c | 30 +++++++++++++++++------------- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 23196f6ab71..917c9f6c458 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,20 @@ +2001-08-10 H.J. Lu + + * nm.c (print_value): Add one arg, bfd *. + (print_value): Replace fprintf_vma with bfd_fprintf_vma. + (print_symbol_info_bsd): Also pass `abfd' to print_value (). + (print_symbol_info_sysv): Likewise. + (print_symbol_info_posix): Likewise. + + * objdump.c (dump_section_header): Replace printf_vma with + bfd_printf_vma. + (print_section_stabs): Likewise. + (dump_bfd_header): Likewise. + (objdump_print_value): Replace sprintf_vma with + bfd_sprintf_vma. + (disassemble_bytes): Likewise. + (dump_reloc_set): Likewise. + 2001-08-10 Andreas Jaeger * configure.in: Add -Wstrict-prototypes and -Wmissing-prototypes diff --git a/binutils/nm.c b/binutils/nm.c index 79283751a18..3c5ca54f3f5 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -152,7 +152,7 @@ print_symbol_filename_posix PARAMS ((bfd * archive_bfd, bfd * abfd)); static void -print_value PARAMS ((bfd_vma)); +print_value PARAMS ((bfd *, bfd_vma)); static void print_symbol_info_bsd PARAMS ((symbol_info * info, bfd * abfd)); @@ -1437,7 +1437,8 @@ print_symbol_filename_posix (archive_bfd, abfd) /* Print a symbol value. */ static void -print_value (val) +print_value (abfd, val) + bfd *abfd; bfd_vma val; { #if ! defined (BFD64) || BFD_HOST_64BIT_LONG @@ -1445,7 +1446,7 @@ print_value (val) #else /* We have a 64 bit value to print, but the host is only 32 bit. */ if (print_radix == 16) - fprintf_vma (stdout, val); + bfd_fprintf_vma (abfd, stdout, val); else { char buf[30]; @@ -1480,7 +1481,7 @@ print_symbol_info_bsd (info, abfd) printf (" "); } else - print_value (info->value); + print_value (abfd, info->value); printf (" %c", info->type); if (info->type == '-') { @@ -1503,7 +1504,7 @@ print_symbol_info_sysv (info, abfd) if (bfd_is_undefined_symclass (info->type)) printf (" "); /* Value */ else - print_value (info->value); + print_value (abfd, info->value); printf ("| %c |", info->type); /* Class */ if (info->type == '-') { @@ -1526,7 +1527,7 @@ print_symbol_info_posix (info, abfd) if (bfd_is_undefined_symclass (info->type)) printf (" "); else - print_value (info->value); + print_value (abfd, info->value); /* POSIX.2 wants the symbol size printed here, when applicable; BFD currently doesn't provide it, so we take the easy way out by considering it to never be applicable. */ diff --git a/binutils/objdump.c b/binutils/objdump.c index 8a82795df73..be29232ada7 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -284,9 +284,9 @@ dump_section_header (abfd, section, ignored) printf ("%3d %-13s %08lx ", section->index, bfd_get_section_name (abfd, section), (unsigned long) bfd_section_size (abfd, section) / opb); - printf_vma (bfd_get_section_vma (abfd, section)); + bfd_printf_vma (abfd, bfd_get_section_vma (abfd, section)); printf (" "); - printf_vma (section->lma); + bfd_printf_vma (abfd, section->lma); printf (" %08lx 2**%u", section->filepos, bfd_get_section_alignment (abfd, section)); if (! wide_output) @@ -608,8 +608,10 @@ objdump_print_value (vma, info, skip_zeroes) { char buf[30]; char *p; + struct objdump_disasm_info *aux + = (struct objdump_disasm_info *) info->application_data; - sprintf_vma (buf, vma); + bfd_sprintf_vma (aux->abfd, buf, vma); if (! skip_zeroes) p = buf; else @@ -1219,8 +1221,10 @@ disassemble_bytes (info, disassemble_fn, insns, data, char buf[30]; char *s; - sprintf_vma (buf, section->vma + - bfd_section_size (section->owner, section) / opb); + bfd_sprintf_vma + (aux->abfd, buf, + (section->vma + + bfd_section_size (section->owner, section) / opb)); s = buf; while (s[0] == '0' && s[1] == '0' && s[2] == '0' && s[3] == '0' && s[4] == '0') @@ -1282,7 +1286,7 @@ disassemble_bytes (info, disassemble_fn, insns, data, { char *s; - sprintf_vma (buf, section->vma + addr_offset); + bfd_sprintf_vma (aux->abfd, buf, section->vma + addr_offset); for (s = buf + skip_addr_chars; *s == '0'; s++) *s = ' '; if (*s == '\0') @@ -1419,7 +1423,7 @@ disassemble_bytes (info, disassemble_fn, insns, data, putchar ('\n'); j = addr_offset * opb + pb; - sprintf_vma (buf, section->vma + j / opb); + bfd_sprintf_vma (aux->abfd, buf, section->vma + j / opb); for (s = buf + skip_addr_chars; *s == '0'; s++) *s = ' '; if (*s == '\0') @@ -1946,7 +1950,7 @@ print_section_stabs (abfd, stabsect_name, strsect_name) else printf ("%-6d", type); printf (" %-6d %-6d ", other, desc); - printf_vma (value); + bfd_printf_vma (abfd, value); printf (" %-6lu", strx); /* Symbols with type == 0 (N_UNDF) specify the length of the @@ -2030,7 +2034,7 @@ dump_bfd_header (abfd) PF (D_PAGED, "D_PAGED"); PF (BFD_IS_RELAXABLE, "BFD_IS_RELAXABLE"); printf (_("\nstart address 0x")); - printf_vma (abfd->start_address); + bfd_printf_vma (abfd, abfd->start_address); printf ("\n"); } @@ -2479,7 +2483,7 @@ dump_reloc_set (abfd, sec, relpp, relcount) if (width == 0) { char buf[30]; - sprintf_vma (buf, (bfd_vma) -1); + bfd_sprintf_vma (abfd, buf, (bfd_vma) -1); width = strlen (buf) - 7; } printf ("OFFSET %*s TYPE %*s VALUE \n", width, "", 12, ""); @@ -2547,7 +2551,7 @@ dump_reloc_set (abfd, sec, relpp, relcount) } if (sym_name) { - printf_vma (q->address); + bfd_printf_vma (abfd, q->address); if (q->howto->name) printf (" %-16s ", q->howto->name); else @@ -2559,7 +2563,7 @@ dump_reloc_set (abfd, sec, relpp, relcount) { if (section_name == (CONST char *) NULL) section_name = "*unknown*"; - printf_vma (q->address); + bfd_printf_vma (abfd, q->address); printf (" %-16s [%s]", q->howto->name, section_name); @@ -2567,7 +2571,7 @@ dump_reloc_set (abfd, sec, relpp, relcount) if (q->addend) { printf ("+0x"); - printf_vma (q->addend); + bfd_printf_vma (abfd, q->addend); } printf ("\n"); } -- 2.30.2