Changeset 58719 in vbox
- Timestamp:
- Nov 17, 2015 9:49:41 AM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 104148
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/ValidationKit/bootsectors/bs3kit/VBoxBs3ObjConverter.cpp
r58673 r58719 39 39 #include <iprt/formats/elf-amd64.h> 40 40 #include <iprt/formats/pecoff.h> 41 42 43 /********************************************************************************************************************************* 44 * Defined Constants And Macros * 45 *********************************************************************************************************************************/ 46 #if ARCH_BITS == 64 && !defined(RT_OS_WINDOWS) 47 # define ELF_FMT_X64 "lx" 48 # define ELF_FMT_D64 "ld" 49 #else 50 # define ELF_FMT_X64 "llx" 51 # define ELF_FMT_D64 "lld" 52 #endif 41 53 42 54 … … 242 254 { 243 255 if (g_cVerbose) 244 printf("shdr[%u]: name=%#x '%s' type=%#x flags=%# llx addr=%#llx off=%#llx size=%#llx\n"245 " link=%u info=%#x align=%# llx entsize=%#llx\n",256 printf("shdr[%u]: name=%#x '%s' type=%#x flags=%#" ELF_FMT_X64 " addr=%#" ELF_FMT_X64 " off=%#" ELF_FMT_X64 " size=%#" ELF_FMT_X64 "\n" 257 " link=%u info=%#x align=%#" ELF_FMT_X64 " entsize=%#" ELF_FMT_X64 "\n", 246 258 i, paShdrs[i].sh_name, &pszStrTab[paShdrs[i].sh_name], paShdrs[i].sh_type, paShdrs[i].sh_flags, 247 259 paShdrs[i].sh_addr, paShdrs[i].sh_offset, paShdrs[i].sh_size, … … 254 266 uint32_t const cRelocs = paShdrs[i].sh_size / sizeof(Elf64_Rela); 255 267 if (cRelocs * sizeof(Elf64_Rela) != paShdrs[i].sh_size) 256 return error(pszFile, "Uneven relocation entry count in #%u (%s): sh_size=%# llx\n", (unsigned)sizeof(Elf64_Rela),268 return error(pszFile, "Uneven relocation entry count in #%u (%s): sh_size=%#" ELF_FMT_X64 "\n", (unsigned)sizeof(Elf64_Rela), 257 269 paShdrs[i].sh_entsize, i, &pszStrTab[paShdrs[i].sh_name], paShdrs[i].sh_size); 258 270 if ( paShdrs[i].sh_offset > cbFile 259 271 || paShdrs[i].sh_size >= cbFile 260 272 || paShdrs[i].sh_offset + paShdrs[i].sh_size > cbFile) 261 return error(pszFile, "The content of section #%u '%s' is outside the file (%# llx LB %#llx, cbFile=%#lx)\n",273 return error(pszFile, "The content of section #%u '%s' is outside the file (%#" ELF_FMT_X64 " LB %#" ELF_FMT_X64 ", cbFile=%#lx)\n", 262 274 i, &pszStrTab[paShdrs[i].sh_name], paShdrs[i].sh_offset, paShdrs[i].sh_size, (unsigned long)cbFile); 263 275 Elf64_Rela *paRels = (Elf64_Rela *)&pbFile[paShdrs[i].sh_offset]; … … 266 278 uint8_t const bType = ELF64_R_TYPE(paRels[j].r_info); 267 279 if (g_cVerbose > 1) 268 printf("%#018 llx %#018llx %s %+lld\n", paRels[j].r_offset, paRels[j].r_info,280 printf("%#018" ELF_FMT_X64 " %#018" ELF_FMT_X64 " %s %+" ELF_FMT_D64 "\n", paRels[j].r_offset, paRels[j].r_info, 269 281 bType < RT_ELEMENTS(g_apszElfAmd64RelTypes) ? g_apszElfAmd64RelTypes[bType] : "unknown", paRels[j].r_addend); 270 282 … … 382 394 case IMAGE_REL_AMD64_ADDR64: 383 395 if (uLoc.pu64) 384 off += printf(" %#018 llx", *uLoc.pu64);396 off += printf(" %#018" ELF_FMT_X64 "", *uLoc.pu64); 385 397 break; 386 398 case IMAGE_REL_AMD64_ADDR32:
Note:
See TracChangeset
for help on using the changeset viewer.