Skip to content

Commit bad5e0d

Browse files
CopilotCopilot
authored
Fix ildasm output on Linux by replacing I64 format specifiers with PRIx64 (#121687)
1 parent 783ffda commit bad5e0d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

‎src/coreclr/ildasm/dasm.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5457,9 +5457,9 @@ void DumpMetadataHeader(const char *szName, IMAGE_DATA_DIRECTORY *pDir, void* GU
54575457
printLine(GUICookie,szStr);
54585458
sprintf_s(szString,SZSTRING_SIZE,"// 0x%02x Rid", pMDSH->Rid);
54595459
printLine(GUICookie,szStr);
5460-
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016I64x MaskValid", (ULONGLONG)GET_UNALIGNED_VAL64(&(pMDSH->MaskValid)));
5460+
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016" PRIx64 " MaskValid", (uint64_t)GET_UNALIGNED_VAL64(&(pMDSH->MaskValid)));
54615461
printLine(GUICookie,szStr);
5462-
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016I64x Sorted", (ULONGLONG)GET_UNALIGNED_VAL64(&(pMDSH->Sorted)));
5462+
sprintf_s(szString,SZSTRING_SIZE,"// 0x%016" PRIx64 " Sorted", (uint64_t)GET_UNALIGNED_VAL64(&(pMDSH->Sorted)));
54635463
printLine(GUICookie,szStr);
54645464
}
54655465
}
@@ -5677,7 +5677,7 @@ void DumpHeader(IMAGE_COR20_HEADER *CORHeader, void* GUICookie)
56775677
dwEntryPointSize = 12;
56785678
sprintf_s(szString,SZSTRING_SIZE,"// Base of code: 0x%08x", VAL32(pOptHeader->BaseOfCode));
56795679
printLine(GUICookie,szStr);
5680-
sprintf_s(szString,SZSTRING_SIZE,"// Image base: 0x%016I64x", VAL64(pOptHeader->ImageBase));
5680+
sprintf_s(szString,SZSTRING_SIZE,"// Image base: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->ImageBase));
56815681
printLine(GUICookie,szStr);
56825682
sprintf_s(szString,SZSTRING_SIZE,"// Section alignment: 0x%08x", VAL32(pOptHeader->SectionAlignment));
56835683
printLine(GUICookie,szStr);
@@ -5705,13 +5705,13 @@ void DumpHeader(IMAGE_COR20_HEADER *CORHeader, void* GUICookie)
57055705
printLine(GUICookie,szStr);
57065706
sprintf_s(szString,SZSTRING_SIZE,"// DLL characteristics: 0x%04x", VAL16(pOptHeader->DllCharacteristics));
57075707
printLine(GUICookie,szStr);
5708-
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack reserve: 0x%016I64x", VAL64(pOptHeader->SizeOfStackReserve));
5708+
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack reserve: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfStackReserve));
57095709
printLine(GUICookie,szStr);
5710-
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack commit: 0x%016I64x", VAL64(pOptHeader->SizeOfStackCommit));
5710+
sprintf_s(szString,SZSTRING_SIZE,"// Size of stack commit: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfStackCommit));
57115711
printLine(GUICookie,szStr);
5712-
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap reserve: 0x%016I64x", VAL64(pOptHeader->SizeOfHeapReserve));
5712+
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap reserve: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfHeapReserve));
57135713
printLine(GUICookie,szStr);
5714-
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap commit: 0x%016I64x", VAL64(pOptHeader->SizeOfHeapCommit));
5714+
sprintf_s(szString,SZSTRING_SIZE,"// Size of heap commit: 0x%016" PRIx64, (uint64_t)VAL64(pOptHeader->SizeOfHeapCommit));
57155715
printLine(GUICookie,szStr);
57165716
sprintf_s(szString,SZSTRING_SIZE,"// Loader flags: 0x%08x", VAL32(pOptHeader->LoaderFlags));
57175717
printLine(GUICookie,szStr);
@@ -6599,12 +6599,12 @@ void DumpVtable(void* GUICookie)
65996599
pNTHeader64 = g_pPELoader->ntHeaders64();
66006600
pOptHeader64 = &pNTHeader64->OptionalHeader;
66016601

6602-
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016I64x", g_szAsmCodeIndent,KEYWORD(".imagebase"),VAL64(pOptHeader64->ImageBase));
6602+
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016" PRIx64, g_szAsmCodeIndent,KEYWORD(".imagebase"),(uint64_t)VAL64(pOptHeader64->ImageBase));
66036603
printLine(GUICookie,szString);
66046604
j = VAL16(pOptHeader64->Subsystem);
66056605
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%08x", g_szAsmCodeIndent,KEYWORD(".file alignment"),VAL32(pOptHeader64->FileAlignment));
66066606
printLine(GUICookie,szString);
6607-
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016I64x", g_szAsmCodeIndent,KEYWORD(".stackreserve"),VAL64(pOptHeader64->SizeOfStackReserve));
6607+
sprintf_s(szString,SZSTRING_SIZE,"%s%s 0x%016" PRIx64, g_szAsmCodeIndent,KEYWORD(".stackreserve"),(uint64_t)VAL64(pOptHeader64->SizeOfStackReserve));
66086608
printLine(GUICookie,szString);
66096609
}
66106610
szptr = &szString[0];
@@ -6719,7 +6719,7 @@ void DumpVtable(void* GUICookie)
67196719
}
67206720
else
67216721
{
6722-
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," %016I64X", VAL64(*(uint64_t *)pSlot));
6722+
szptr+=sprintf_s(szptr,SZSTRING_REMAINING_SIZE(szptr)," %016" PRIX64, (uint64_t)VAL64(*(uint64_t *)pSlot));
67236723
pSlot += sizeof(uint64_t);
67246724
}
67256725
if (g_prVTableRef == NULL)

‎src/coreclr/tools/metainfo/mdinfo.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3948,10 +3948,10 @@ void MDInfo::DumpRaw(int iDump, bool bunused)
39483948
const MD *pMd;
39493949
pMd = (const MD *)pbMd;
39503950

3951-
VWriteLine("Metadata header: %d.%d, heaps: 0x%02x, rid: 0x%02x, valid: 0x%016I64x, sorted: 0x%016I64x",
3951+
VWriteLine("Metadata header: %d.%d, heaps: 0x%02x, rid: 0x%02x, valid: 0x%016" PRIx64 ", sorted: 0x%016" PRIx64,
39523952
pMd->m_major, pMd->m_minor, pMd->m_heaps, pMd->m_rid,
3953-
(ULONGLONG)GET_UNALIGNED_VAL64(&(pMd->m_maskvalid)),
3954-
(ULONGLONG)GET_UNALIGNED_VAL64(&(pMd->m_sorted)));
3953+
(uint64_t)GET_UNALIGNED_VAL64(&(pMd->m_maskvalid)),
3954+
(uint64_t)GET_UNALIGNED_VAL64(&(pMd->m_sorted)));
39553955

39563956
if (m_DumpFilter & dumpMoreHex)
39573957
{

0 commit comments

Comments
 (0)