diff options
author | Alan Modra <amodra@gmail.com> | 2022-08-01 11:33:46 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2022-08-01 13:52:18 +0930 |
commit | f493c2174ef99a43c0a5d89179122f857955d738 (patch) | |
tree | 62cc84715e6a801434dce9cd6cb7760e94110d74 /binutils/od-macho.c | |
parent | 48ca1b26b99c8fd5bc21f5c69b6b666d9b6b9726 (diff) | |
download | gdb-f493c2174ef99a43c0a5d89179122f857955d738.zip gdb-f493c2174ef99a43c0a5d89179122f857955d738.tar.gz gdb-f493c2174ef99a43c0a5d89179122f857955d738.tar.bz2 |
Get rid of fprintf_vma and sprintf_vma
These two macros print either a 16 digit hex number or an 8 digit
hex number. Unfortunately they depend on both target and host, which
means that the output for 32-bit targets may be either 8 or 16 hex
digits.
Replace them in most cases with code that prints a bfd_vma using
PRIx64. In some cases, deliberately lose the leading zeros.
This change some output, notably in base/offset fields of m68k
disassembly which I think looks better that way, and in error
messages. I've kept leading zeros in symbol dumps (objdump -t)
and in PE header dumps.
bfd/
* bfd-in.h (fprintf_vma, sprintf_vma, printf_vma): Delete.
* bfd-in2.h: Regenerate.
* bfd.c (bfd_sprintf_vma): Don't use sprintf_vma.
(bfd_fprintf_vma): Don't use fprintf_vma.
* coff-rs6000.c (xcoff_reloc_type_tls): Don't use sprintf_vma.
Instead use PRIx64 to print bfd_vma values.
(xcoff_ppc_relocate_section): Likewise.
* cofflink.c (_bfd_coff_write_global_sym): Likewise.
* mmo.c (mmo_write_symbols_and_terminator): Likewise.
* srec.c (srec_write_symbols): Likewise.
* elf32-xtensa.c (print_r_reloc): Similarly for fprintf_vma.
* pei-x86_64.c (pex64_dump_xdata): Likewise.
(pex64_bfd_print_pdata_section): Likewise.
* som.c (som_print_symbol): Likewise.
* ecoff.c (_bfd_ecoff_print_symbol): Use bfd_fprintf_vma.
opcodes/
* dis-buf.c (perror_memory, generic_print_address): Don't use
sprintf_vma. Instead use PRIx64 to print bfd_vma values.
* i386-dis.c (print_operand_value, print_displacement): Likewise.
* m68k-dis.c (print_base, print_indexed): Likewise.
* ns32k-dis.c (print_insn_arg): Likewise.
* ia64-gen.c (_opcode_int64_low, _opcode_int64_high): Delete.
(opcode_fprintf_vma): Delete.
(print_main_table): Use PRIx64 to print opcode.
binutils/
* od-macho.c: Replace all uses of printf_vma with bfd_printf_vma.
* objcopy.c (copy_object): Don't use sprintf_vma. Instead use
PRIx64 to print bfd_vma values.
(copy_main): Likewise.
* readelf.c (CHECK_ENTSIZE_VALUES): Likewise.
(dynamic_section_mips_val): Likewise.
(print_vma): Don't use printf_vma. Instead use PRIx64 to print
bfd_vma values.
(dump_ia64_vms_dynamic_fixups): Likewise.
(process_version_sections): Likewise.
* rddbg.c (stab_context): Likewise.
gas/
* config/tc-i386.c (offset_in_range): Don't use sprintf_vma.
Instead use PRIx64 to print bfd_vma values.
(md_assemble): Likewise.
* config/tc-mips.c (load_register, macro): Likewise.
* messages.c (as_internal_value_out_of_range): Likewise.
* read.c (emit_expr_with_reloc): Likewise.
* config/tc-ia64.c (note_register_values): Don't use fprintf_vma.
Instead use PRIx64 to print bfd_vma values.
(print_dependency): Likewise.
* listing.c (list_symbol_table): Use bfd_sprintf_vma.
* symbols.c (print_symbol_value_1): Use %p to print pointers.
(print_binary): Likewise.
(print_expr_1): Use PRIx64 to print bfd_vma values.
* write.c (print_fixup): Use %p to print pointers. Don't use
fprintf_vma.
* testsuite/gas/all/overflow.l: Update expected output.
* testsuite/gas/m68k/mcf-mov3q.d: Likewise.
* testsuite/gas/m68k/operands.d: Likewise.
* testsuite/gas/s12z/truncated.d: Likewise.
ld/
* deffilep.y (def_file_print): Don't use fprintf_vma. Instead
use PRIx64 to print bfd_vma values.
* emultempl/armelf.em (gld${EMULATION_NAME}_finish): Don't use
sprintf_vma. Instead use PRIx64 to print bfd_vma values.
* emultempl/pe.em (gld${EMULATION_NAME}_finish): Likewise.
* ldlang.c (lang_map): Use %V to print region origin.
(lang_one_common): Don't use sprintf_vma.
* ldmisc.c (vfinfo): Don't use fprintf_vma or sprintf_vma.
* pe-dll.c (pe_dll_generate_def_file): Likewise.
gdb/
* remote.c (remote_target::trace_set_readonly_regions): Replace
uses of sprintf_vma with bfd_sprintf_vma.
Diffstat (limited to 'binutils/od-macho.c')
-rw-r--r-- | binutils/od-macho.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/binutils/od-macho.c b/binutils/od-macho.c index e91c87d..710dfc3 100644 --- a/binutils/od-macho.c +++ b/binutils/od-macho.c @@ -357,9 +357,9 @@ dump_section_map (bfd *abfd) seg = &cmd->command.segment; printf ("[Segment %-16s ", seg->segname); - printf_vma (seg->vmaddr); + bfd_printf_vma (abfd, seg->vmaddr); putchar ('-'); - printf_vma (seg->vmaddr + seg->vmsize - 1); + bfd_printf_vma (abfd, seg->vmaddr + seg->vmsize - 1); putchar (' '); disp_segment_prot (seg->initprot); printf ("]\n"); @@ -368,29 +368,29 @@ dump_section_map (bfd *abfd) { printf ("%02u: %-16s %-16s ", ++sec_nbr, sec->segname, sec->sectname); - printf_vma (sec->addr); + bfd_printf_vma (abfd, sec->addr); putchar (' '); - printf_vma (sec->size); + bfd_printf_vma (abfd, sec->size); printf (" %08lx\n", sec->flags); } } } static void -dump_section_header (bfd *abfd ATTRIBUTE_UNUSED, bfd_mach_o_section *sec) +dump_section_header (bfd *abfd, bfd_mach_o_section *sec) { printf (" Section: %-16s %-16s (bfdname: %s)\n", sec->sectname, sec->segname, sec->bfdsection->name); printf (" addr: "); - printf_vma (sec->addr); + bfd_printf_vma (abfd, sec->addr); printf (" size: "); - printf_vma (sec->size); + bfd_printf_vma (abfd, sec->size); printf (" offset: "); - printf_vma (sec->offset); + bfd_printf_vma (abfd, sec->offset); printf ("\n"); printf (" align: %ld", sec->align); printf (" nreloc: %lu reloff: ", sec->nreloc); - printf_vma (sec->reloff); + bfd_printf_vma (abfd, sec->reloff); printf ("\n"); printf (" flags: %08lx (type: %s", sec->flags, bfd_mach_o_get_name (bfd_mach_o_section_type_name, @@ -425,7 +425,7 @@ dump_section_header (bfd *abfd ATTRIBUTE_UNUSED, bfd_mach_o_section *sec) } static void -dump_segment (bfd *abfd ATTRIBUTE_UNUSED, bfd_mach_o_load_command *cmd) +dump_segment (bfd *abfd, bfd_mach_o_load_command *cmd) { bfd_mach_o_segment_command *seg = &cmd->command.segment; bfd_mach_o_section *sec; @@ -439,16 +439,16 @@ dump_segment (bfd *abfd ATTRIBUTE_UNUSED, bfd_mach_o_load_command *cmd) disp_segment_prot (seg->maxprot); printf ("\n"); printf (" vmaddr: "); - printf_vma (seg->vmaddr); + bfd_printf_vma (abfd, seg->vmaddr); printf (" vmsize: "); - printf_vma (seg->vmsize); + bfd_printf_vma (abfd, seg->vmsize); printf ("\n"); printf (" fileoff: "); - printf_vma (seg->fileoff); + bfd_printf_vma (abfd, seg->fileoff); printf (" filesize: "); - printf_vma ((bfd_vma)seg->filesize); + bfd_printf_vma (abfd, (bfd_vma) seg->filesize); printf (" endoff: "); - printf_vma ((bfd_vma)(seg->fileoff + seg->filesize)); + bfd_printf_vma (abfd, (bfd_vma) (seg->fileoff + seg->filesize)); printf ("\n"); for (sec = seg->sect_head; sec != NULL; sec = sec->next) dump_section_header (abfd, sec); @@ -540,7 +540,7 @@ dump_dysymtab (bfd *abfd, bfd_mach_o_load_command *cmd, bool verbose) printf (" term: idx: %8u num: %u\n", module->iterm, module->nterm); printf (" objc_module_info: addr: "); - printf_vma (module->objc_module_info_addr); + bfd_printf_vma (abfd, module->objc_module_info_addr); printf (" size: %lu\n", module->objc_module_info_size); } @@ -608,7 +608,7 @@ dump_dysymtab (bfd *abfd, bfd_mach_o_load_command *cmd, bool verbose) unsigned int isym = dysymtab->indirect_syms[j]; printf (" "); - printf_vma (addr); + bfd_printf_vma (abfd, addr); printf (" %5u: 0x%08x", j, isym); if (isym & BFD_MACH_O_INDIRECT_SYMBOL_LOCAL) printf (" LOCAL"); |