Remove use of bfd_uint64_t and similar

Requiring C99 means that uses of bfd_uint64_t can be replaced with
uint64_t, and similarly for bfd_int64_t, BFD_HOST_U_64_BIT, and
BFD_HOST_64_BIT.  This patch does that, removes #ifdef BFD_HOST_*
and tidies a few places that print 64-bit values.
This commit is contained in:
Alan Modra
2022-05-27 12:37:21 +09:30
parent aa9b5dbc0f
commit 0e3c1eebb2
45 changed files with 295 additions and 473 deletions

View File

@@ -283,15 +283,6 @@ bfd_mach_o_print_flags (const bfd_mach_o_xlat_name *table,
printf ("-");
}
/* Print a bfd_uint64_t, using a platform independent style. */
static void
printf_uint64 (bfd_uint64_t v)
{
printf ("0x%08lx%08lx",
(unsigned long)((v >> 16) >> 16), (unsigned long)(v & 0xffffffffUL));
}
static const char *
bfd_mach_o_get_name_or_null (const bfd_mach_o_xlat_name *table,
unsigned long val)
@@ -1729,26 +1720,20 @@ dump_load_command (bfd *abfd, bfd_mach_o_load_command *cmd,
}
case BFD_MACH_O_LC_MAIN:
{
bfd_mach_o_main_command *entry = &cmd->command.main;
printf (" entry offset: ");
printf_uint64 (entry->entryoff);
printf ("\n"
" stack size: ");
printf_uint64 (entry->stacksize);
printf ("\n");
break;
bfd_mach_o_main_command *entry = &cmd->command.main;
printf (" entry offset: %#016" PRIx64 "\n"
" stack size: %#016" PRIx64 "\n",
entry->entryoff, entry->stacksize);
break;
}
case BFD_MACH_O_LC_NOTE:
{
bfd_mach_o_note_command *note = &cmd->command.note;
printf (" data owner: %.16s\n", note->data_owner);
printf (" offset: ");
printf_uint64 (note->offset);
printf ("\n"
" size: ");
printf_uint64 (note->size);
printf ("\n");
break;
bfd_mach_o_note_command *note = &cmd->command.note;
printf (" data owner: %.16s\n"
" offset: %#016" PRIx64 "\n"
" size: %#016" PRIx64 "\n",
note->data_owner, note->offset, note->size);
break;
}
case BFD_MACH_O_LC_BUILD_VERSION:
dump_build_version (abfd, cmd);
@@ -2013,14 +1998,11 @@ dump_obj_compact_unwind (bfd *abfd,
{
e = (struct mach_o_compact_unwind_64 *) p;
putchar (' ');
printf_uint64 (bfd_get_64 (abfd, e->start));
printf (" %08lx", (unsigned long)bfd_get_32 (abfd, e->length));
putchar (' ');
printf_uint64 (bfd_get_64 (abfd, e->personality));
putchar (' ');
printf_uint64 (bfd_get_64 (abfd, e->lsda));
putchar ('\n');
printf (" %#016" PRIx64 " %#08x %#016" PRIx64 " %#016" PRIx64 "\n",
(uint64_t) bfd_get_64 (abfd, e->start),
(unsigned int) bfd_get_32 (abfd, e->length),
(uint64_t) bfd_get_64 (abfd, e->personality),
(uint64_t) bfd_get_64 (abfd, e->lsda));
printf (" encoding: ");
dump_unwind_encoding (mdata, bfd_get_32 (abfd, e->encoding));