https://github.com/DavidSpickett updated https://github.com/llvm/llvm-project/pull/221224
>From b3e40077708820fd95dbd0772295997c16b0f188 Mon Sep 17 00:00:00 2001 From: David Spickett <[email protected]> Date: Thu, 3 Sep 2026 14:43:38 +0000 Subject: [PATCH] [llvm][llvm-readobj] Print COFF RawDataSize as hex To match VirtualSize, and Microsoft's dumpbin which prints both as hex: SECTION HEADER #1 .text name 440B4 virtual size 1000 virtual address (0000000140001000 to 00000001400450B3) 44200 size of raw data llvm-readobj before this change: VirtualSize: 0x3478 VirtualAddress: 0x74000 RawDataSize: 3584 And after: VirtualSize: 0x3478 VirtualAddress: 0x74000 RawDataSize: 0xe00 --- lld/test/COFF/arm64ec-export-thunks.test | 2 +- lld/test/COFF/arm64ec-import.test | 2 +- lld/test/COFF/baserel.test | 2 +- lld/test/COFF/code-merge.s | 8 ++++---- lld/test/COFF/common-replacement.s | 2 +- lld/test/COFF/merge-data-bss.test | 2 +- lld/test/COFF/nodbgdirmerge.test | 2 +- lld/test/COFF/secrel-common.s | 2 +- .../Shell/SymbolFile/NativePDB/globals-bss.cpp | 2 +- llvm/test/MC/AArch64/seh-large-func-multi-epilog.s | 4 ++-- llvm/test/MC/AArch64/seh-large-func.s | 4 ++-- llvm/test/MC/AArch64/seh.s | 2 +- .../test/MC/AArch64/win-import-call-optimization.s | 2 +- llvm/test/MC/ARM/seh.s | 2 +- llvm/test/MC/COFF/addrsig.s | 2 +- llvm/test/MC/COFF/align-nops.s | 4 ++-- llvm/test/MC/COFF/basic-coff-64.s | 8 ++++---- llvm/test/MC/COFF/basic-coff.s | 4 ++-- llvm/test/MC/COFF/bss.s | 2 +- llvm/test/MC/COFF/cgprofile.s | 2 +- llvm/test/MC/COFF/module-asm.ll | 2 +- llvm/test/MC/COFF/section.s | 10 +++++----- llvm/test/MC/COFF/seh-align1.s | 4 ++-- llvm/test/MC/COFF/seh-align2.s | 4 ++-- llvm/test/MC/COFF/seh-align3.s | 4 ++-- llvm/test/MC/COFF/seh-section.s | 6 +++--- llvm/test/MC/COFF/seh.s | 2 +- llvm/test/MC/COFF/symbol-fragment-offset-64.s | 4 ++-- llvm/test/MC/COFF/symbol-fragment-offset.s | 4 ++-- llvm/test/MC/X86/win-import-call-optimization.s | 2 +- llvm/test/tools/llvm-ar/arm64x-split.yaml | 6 +++--- .../tools/llvm-objcopy/COFF/add-gnu-debuglink.test | 4 ++-- .../COFF/add-section-and-set-flags.test | 4 ++-- llvm/test/tools/llvm-objcopy/COFF/empty-sections.s | 4 ++-- .../llvm-objcopy/COFF/only-keep-debug-rdata.test | 12 ++++++------ .../tools/llvm-objcopy/COFF/only-keep-debug.test | 14 +++++++------- .../tools/llvm-objcopy/COFF/update-section.test | 8 ++++---- .../tools/llvm-offload-wrapper/coff-opt-ref.ll | 4 ++-- .../tools/llvm-readobj/COFF/arm64x-hybridobj.yaml | 6 +++--- llvm/test/tools/llvm-readobj/COFF/bigobj.test | 6 +++--- .../test/tools/llvm-readobj/COFF/sections-ext.test | 2 +- llvm/test/tools/llvm-readobj/COFF/sections.test | 4 ++-- llvm/test/tools/yaml2obj/COFF/xrelocs.yaml | 2 +- llvm/tools/llvm-readobj/COFFDumper.cpp | 2 +- 44 files changed, 90 insertions(+), 90 deletions(-) diff --git a/lld/test/COFF/arm64ec-export-thunks.test b/lld/test/COFF/arm64ec-export-thunks.test index f84d21d27e9a6..3a9932e168751 100644 --- a/lld/test/COFF/arm64ec-export-thunks.test +++ b/lld/test/COFF/arm64ec-export-thunks.test @@ -72,7 +72,7 @@ RUN: llvm-readobj --sections exports.dll | FileCheck --check-prefix=A64XRM %s A64XRM: Name: .a64xrm (2E 61 36 34 78 72 6D 00) A64XRM-NEXT: VirtualSize: 0x18 A64XRM-NEXT: VirtualAddress: 0x6000 -A64XRM-NEXT: RawDataSize: 512 +A64XRM-NEXT: RawDataSize: 0x200 A64XRM-NEXT: PointerToRawData: A64XRM-NEXT: PointerToRelocations: 0x0 A64XRM-NEXT: PointerToLineNumbers: 0x0 diff --git a/lld/test/COFF/arm64ec-import.test b/lld/test/COFF/arm64ec-import.test index bb2b772081d59..b820c0a6ef03e 100644 --- a/lld/test/COFF/arm64ec-import.test +++ b/lld/test/COFF/arm64ec-import.test @@ -171,7 +171,7 @@ RUN: llvm-readobj --headers out-size.dll | FileCheck --check-prefix=RDATA-HEADER RDATA-HEADER: Name: .rdata (2E 72 64 61 74 61 00 00) RDATA-HEADER-NEXT: VirtualSize: 0x2030 RDATA-HEADER-NEXT: VirtualAddress: 0x3000 -RDATA-HEADER-NEXT: RawDataSize: 8240 +RDATA-HEADER-NEXT: RawDataSize: 0x2030 #--- test.s .section .test, "r" diff --git a/lld/test/COFF/baserel.test b/lld/test/COFF/baserel.test index 4cf2e36ac107d..33a6d071c0e4f 100644 --- a/lld/test/COFF/baserel.test +++ b/lld/test/COFF/baserel.test @@ -60,7 +60,7 @@ # BASEREL-HEADER: Name: .reloc (2E 72 65 6C 6F 63 00 00) # BASEREL-HEADER-NEXT: VirtualSize: 0x20 # BASEREL-HEADER-NEXT: VirtualAddress: 0x5000 -# BASEREL-HEADER-NEXT: RawDataSize: 512 +# BASEREL-HEADER-NEXT: RawDataSize: 0x200 # BASEREL-HEADER-NEXT: PointerToRawData: 0xC00 # BASEREL-HEADER-NEXT: PointerToRelocations: 0x0 # BASEREL-HEADER-NEXT: PointerToLineNumbers: 0x0 diff --git a/lld/test/COFF/code-merge.s b/lld/test/COFF/code-merge.s index 31ccd081145b0..eb603d3cf8657 100644 --- a/lld/test/COFF/code-merge.s +++ b/lld/test/COFF/code-merge.s @@ -12,7 +12,7 @@ # CHECK-NEXT: Name: .testbss (2E 74 65 73 74 62 73 73) # CHECK-NEXT: VirtualSize: 0x18 # CHECK-NEXT: VirtualAddress: 0x1000 -# CHECK-NEXT: RawDataSize: 512 +# CHECK-NEXT: RawDataSize: 0x200 # CHECK-NEXT: PointerToRawData: 0x400 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -29,7 +29,7 @@ # CHECK-NEXT: Name: .testd (2E 74 65 73 74 64 00 00) # CHECK-NEXT: VirtualSize: 0x18 # CHECK-NEXT: VirtualAddress: 0x2000 -# CHECK-NEXT: RawDataSize: 512 +# CHECK-NEXT: RawDataSize: 0x200 # CHECK-NEXT: PointerToRawData: 0x600 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -45,7 +45,7 @@ # CHECK-NEXT: Name: .testx3 (2E 74 65 73 74 78 33 00) # CHECK-NEXT: VirtualSize: 0x12 # CHECK-NEXT: VirtualAddress: 0x3000 -# CHECK-NEXT: RawDataSize: 512 +# CHECK-NEXT: RawDataSize: 0x200 # CHECK-NEXT: PointerToRawData: 0x800 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -62,7 +62,7 @@ # CHECK-NEXT: Name: .testx4 (2E 74 65 73 74 78 34 00) # CHECK-NEXT: VirtualSize: 0x14 # CHECK-NEXT: VirtualAddress: 0x4000 -# CHECK-NEXT: RawDataSize: 512 +# CHECK-NEXT: RawDataSize: 0x200 # CHECK-NEXT: PointerToRawData: 0xA00 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/lld/test/COFF/common-replacement.s b/lld/test/COFF/common-replacement.s index 3928b26874f60..f6d5e16c0af2d 100644 --- a/lld/test/COFF/common-replacement.s +++ b/lld/test/COFF/common-replacement.s @@ -15,7 +15,7 @@ # SECTIONS: Name: .data (2E 64 61 74 61 00 00 00) # SECTIONS-NEXT: VirtualSize: 0x8 # SECTIONS-NEXT: VirtualAddress: 0x3000 -# SECTIONS-NEXT: RawDataSize: 512 +# SECTIONS-NEXT: RawDataSize: 0x200 .text diff --git a/lld/test/COFF/merge-data-bss.test b/lld/test/COFF/merge-data-bss.test index a821f8d6e9048..1a6aab5302c0e 100644 --- a/lld/test/COFF/merge-data-bss.test +++ b/lld/test/COFF/merge-data-bss.test @@ -6,7 +6,7 @@ # CHECK: Name: .data # CHECK-NEXT: VirtualSize: 0x2018 # CHECK-NEXT: VirtualAddress: 0x3000 -# CHECK-NEXT: RawDataSize: 512 +# CHECK-NEXT: RawDataSize: 0x200 # CHECK-NOT: Name: .other --- !COFF diff --git a/lld/test/COFF/nodbgdirmerge.test b/lld/test/COFF/nodbgdirmerge.test index 1ad697402a6a2..c158904ca1257 100644 --- a/lld/test/COFF/nodbgdirmerge.test +++ b/lld/test/COFF/nodbgdirmerge.test @@ -13,7 +13,7 @@ CHECKNOTMERGED: Number: 3 CHECKNOTMERGED-NEXT: Name: .cvinfo CHECKNOTMERGED-NEXT: VirtualSize: 0x3D CHECKNOTMERGED-NEXT: VirtualAddress: 0x3000 -CHECKNOTMERGED-NEXT: RawDataSize: 512 +CHECKNOTMERGED-NEXT: RawDataSize: 0x200 CHECKNOTMERGED-NEXT: PointerToRawData: 0x800 CHECKNOTMERGED-NEXT: PointerToRelocations: 0 CHECKNOTMERGED-NEXT: PointerToLineNumbers: 0 diff --git a/lld/test/COFF/secrel-common.s b/lld/test/COFF/secrel-common.s index 6155634b32aa2..37b917350196d 100644 --- a/lld/test/COFF/secrel-common.s +++ b/lld/test/COFF/secrel-common.s @@ -25,7 +25,7 @@ # CHECK: Number: 3 # CHECK: Name: .data (2E 64 61 74 61 00 00 00) # CHECK: VirtualSize: 0x204 -# CHECK: RawDataSize: 512 +# CHECK: RawDataSize: 0x200 # CHECK: } # CHECK-NOT: Section # CHECK: ] diff --git a/lldb/test/Shell/SymbolFile/NativePDB/globals-bss.cpp b/lldb/test/Shell/SymbolFile/NativePDB/globals-bss.cpp index 7f508ecb31b4d..e9a2d4842a211 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/globals-bss.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/globals-bss.cpp @@ -19,7 +19,7 @@ int main(int argc, char **argv) { // BSS: Name: .data // BSS-NEXT: VirtualSize: 0x4 // BSS-NEXT: VirtualAddress: -// BSS-NEXT: RawDataSize: 0 +// BSS-NEXT: RawDataSize: 0x0 // BSS-NEXT: PointerToRawData: 0x0 // BSS-NEXT: PointerToRelocations: 0x0 // BSS-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/AArch64/seh-large-func-multi-epilog.s b/llvm/test/MC/AArch64/seh-large-func-multi-epilog.s index 8c6864fe9e196..49410c8ee8d23 100644 --- a/llvm/test/MC/AArch64/seh-large-func-multi-epilog.s +++ b/llvm/test/MC/AArch64/seh-large-func-multi-epilog.s @@ -11,7 +11,7 @@ // CHECK-NEXT: Name: .xdata (2E 78 64 61 74 61 00 00) // CHECK-NEXT: VirtualSize: 0x0 // CHECK-NEXT: VirtualAddress: 0x0 -// CHECK-NEXT: RawDataSize: 80 +// CHECK-NEXT: RawDataSize: 0x50 // CHECK-NEXT: PointerToRawData: 0x1251AC // CHECK-NEXT: PointerToRelocations: 0x0 // CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -28,7 +28,7 @@ // CHECK-NEXT: Name: .pdata (2E 70 64 61 74 61 00 00) // CHECK-NEXT: VirtualSize: 0x0 // CHECK-NEXT: VirtualAddress: 0x0 -// CHECK-NEXT: RawDataSize: 16 +// CHECK-NEXT: RawDataSize: 0x10 // CHECK-NEXT: PointerToRawData: 0x1251FC // CHECK-NEXT: PointerToRelocations: 0x12520C // CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/AArch64/seh-large-func.s b/llvm/test/MC/AArch64/seh-large-func.s index a3205388c2551..1f34cdf2d58b7 100644 --- a/llvm/test/MC/AArch64/seh-large-func.s +++ b/llvm/test/MC/AArch64/seh-large-func.s @@ -8,7 +8,7 @@ // CHECK-NEXT: Name: .xdata (2E 78 64 61 74 61 00 00) // CHECK-NEXT: VirtualSize: 0x0 // CHECK-NEXT: VirtualAddress: 0x0 -// CHECK-NEXT: RawDataSize: 52 +// CHECK-NEXT: RawDataSize: 0x34 // CHECK-NEXT: PointerToRawData: 0x3D0A20 // CHECK-NEXT: PointerToRelocations: 0x0 // CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -25,7 +25,7 @@ // CHECK-NEXT: Name: .pdata (2E 70 64 61 74 61 00 00) // CHECK-NEXT: VirtualSize: 0x0 // CHECK-NEXT: VirtualAddress: 0x0 -// CHECK-NEXT: RawDataSize: 40 +// CHECK-NEXT: RawDataSize: 0x28 // CHECK-NEXT: PointerToRawData: 0x3D0A54 // CHECK-NEXT: PointerToRelocations: 0x3D0A7C // CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/AArch64/seh.s b/llvm/test/MC/AArch64/seh.s index 95411391710b4..d4be7dd3db202 100644 --- a/llvm/test/MC/AArch64/seh.s +++ b/llvm/test/MC/AArch64/seh.s @@ -21,7 +21,7 @@ // CHECK-NEXT: } // CHECK: Section { // CHECK: Name: .xdata -// CHECK: RawDataSize: 108 +// CHECK: RawDataSize: 0x6C // CHECK: RelocationCount: 1 // CHECK: Characteristics [ // CHECK-NEXT: ALIGN_4BYTES diff --git a/llvm/test/MC/AArch64/win-import-call-optimization.s b/llvm/test/MC/AArch64/win-import-call-optimization.s index f26e17b9b62cc..437532bfe78e7 100644 --- a/llvm/test/MC/AArch64/win-import-call-optimization.s +++ b/llvm/test/MC/AArch64/win-import-call-optimization.s @@ -34,7 +34,7 @@ tail_call: // CHECK-LABEL: Name: .impcall (2E 69 6D 70 63 61 6C 6C) // CHECK-NEXT: VirtualSize: 0x0 // CHECK-NEXT: VirtualAddress: 0x0 -// CHECK-NEXT: RawDataSize: 52 +// CHECK-NEXT: RawDataSize: 0x34 // CHECK-NEXT: PointerToRawData: 0x150 // CHECK-NEXT: PointerToRelocations: 0x0 // CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/ARM/seh.s b/llvm/test/MC/ARM/seh.s index 6cc4cf8ac076a..0ee49c715eb58 100644 --- a/llvm/test/MC/ARM/seh.s +++ b/llvm/test/MC/ARM/seh.s @@ -22,7 +22,7 @@ // CHECK-NEXT: } // CHECK: Section { // CHECK: Name: .xdata -// CHECK: RawDataSize: 100 +// CHECK: RawDataSize: 0x64 // CHECK: RelocationCount: 1 // CHECK: Characteristics [ // CHECK-NEXT: ALIGN_4BYTES diff --git a/llvm/test/MC/COFF/addrsig.s b/llvm/test/MC/COFF/addrsig.s index a181bb06508be..a9b59efac07fe 100644 --- a/llvm/test/MC/COFF/addrsig.s +++ b/llvm/test/MC/COFF/addrsig.s @@ -3,7 +3,7 @@ // CHECK: Name: .llvm_addrsig // CHECK-NEXT: VirtualSize: 0x0 // CHECK-NEXT: VirtualAddress: 0x0 -// CHECK-NEXT: RawDataSize: 6 +// CHECK-NEXT: RawDataSize: 0x6 // CHECK-NEXT: PointerToRawData: // CHECK-NEXT: PointerToRelocations: 0x0 // CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/COFF/align-nops.s b/llvm/test/MC/COFF/align-nops.s index 7264d70938cea..540496e5fd4b7 100644 --- a/llvm/test/MC/COFF/align-nops.s +++ b/llvm/test/MC/COFF/align-nops.s @@ -18,7 +18,7 @@ f0: //CHECK: Name: .text //CHECK-NEXT: VirtualSize //CHECK-NEXT: VirtualAddress -//CHECK-NEXT: RawDataSize: 16 +//CHECK-NEXT: RawDataSize: 0x10 //CHECK-NEXT: PointerToRawData //CHECK-NEXT: PointerToRelocations //CHECK-NEXT: PointerToLineNumbers @@ -37,7 +37,7 @@ f0: //CHECK: Name: .data //CHECK-NEXT: VirtualSize: //CHECK-NEXT: VirtualAddress: -//CHECK-NEXT: RawDataSize: 16 +//CHECK-NEXT: RawDataSize: 0x10 //CHECK-NEXT: PointerToRawData: //CHECK-NEXT: PointerToRelocations: //CHECK-NEXT: PointerToLineNumbers: diff --git a/llvm/test/MC/COFF/basic-coff-64.s b/llvm/test/MC/COFF/basic-coff-64.s index 085dfafe4224f..73086ae0cfb59 100644 --- a/llvm/test/MC/COFF/basic-coff-64.s +++ b/llvm/test/MC/COFF/basic-coff-64.s @@ -39,7 +39,7 @@ _main: # @main // CHECK: Name: .text // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: [[TextSize:[0-9]+]] +// CHECK: RawDataSize: 0x[[#%X,TextSize:]] // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x{{[0-9A-F]+}} // CHECK: PointerToLineNumbers: 0x0 @@ -61,7 +61,7 @@ _main: # @main // CHECK: Name: .data // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: [[DataSize:[0-9]+]] +// CHECK: RawDataSize: 0x[[#%X,DataSize:]] // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x0 // CHECK: PointerToLineNumbers: 0x0 @@ -90,7 +90,7 @@ _main: # @main // CHECK: StorageClass: Static // CHECK: AuxSymbolCount: 1 // CHECK: AuxSectionDef { -// CHECK: Length: [[TextSize]] +// CHECK: Length: [[#%u,TextSize]] // CHECK: RelocationCount: 2 // CHECK: LineNumberCount: 0 // CHECK: Checksum: 0x8E1B6D20 @@ -107,7 +107,7 @@ _main: # @main // CHECK: StorageClass: Static // CHECK: AuxSymbolCount: 1 // CHECK: AuxSectionDef { -// CHECK: Length: [[DataSize]] +// CHECK: Length: [[#%u,DataSize]] // CHECK: RelocationCount: 0 // CHECK: LineNumberCount: 0 // CHECK: Checksum: 0x2B95CA92 diff --git a/llvm/test/MC/COFF/basic-coff.s b/llvm/test/MC/COFF/basic-coff.s index 23d74f852db0b..1553ed8244d4e 100644 --- a/llvm/test/MC/COFF/basic-coff.s +++ b/llvm/test/MC/COFF/basic-coff.s @@ -39,7 +39,7 @@ L_.str: # @.str // CHECK: Name: .text // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: {{[0-9]+}} +// CHECK: RawDataSize: 0x{{[0-9A-F]+}} // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x{{[0-9A-F]+}} // CHECK: PointerToLineNumbers: 0x0 @@ -61,7 +61,7 @@ L_.str: # @.str // CHECK: Name: .data // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: {{[0-9]+}} +// CHECK: RawDataSize: 0x{{[0-9A-F]+}} // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x0 // CHECK: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/COFF/bss.s b/llvm/test/MC/COFF/bss.s index ea61144f8a848..7efa5669db602 100644 --- a/llvm/test/MC/COFF/bss.s +++ b/llvm/test/MC/COFF/bss.s @@ -12,4 +12,4 @@ _g0: // CHECK: Name: .bss // CHECK-NEXT: VirtualSize: 0 // CHECK-NEXT: VirtualAddress: 0 -// CHECK-NEXT: RawDataSize: 4 +// CHECK-NEXT: RawDataSize: 0x4 diff --git a/llvm/test/MC/COFF/cgprofile.s b/llvm/test/MC/COFF/cgprofile.s index c2f95038b370e..22fda5e560296 100644 --- a/llvm/test/MC/COFF/cgprofile.s +++ b/llvm/test/MC/COFF/cgprofile.s @@ -18,7 +18,7 @@ late3: # CHECK: Name: .llvm.call-graph-profile # CHECK-NEXT: VirtualSize: # CHECK-NEXT: VirtualAddress: -# CHECK-NEXT: RawDataSize: 48 +# CHECK-NEXT: RawDataSize: 0x30 # CHECK-NEXT: PointerToRawData: # CHECK-NEXT: PointerToRelocations: # CHECK-NEXT: PointerToLineNumbers: diff --git a/llvm/test/MC/COFF/module-asm.ll b/llvm/test/MC/COFF/module-asm.ll index 3033b1b482479..20c6cc966d936 100644 --- a/llvm/test/MC/COFF/module-asm.ll +++ b/llvm/test/MC/COFF/module-asm.ll @@ -11,7 +11,7 @@ module asm " ret" ; CHECK: Name: .text ; CHECK-NEXT: VirtualSize: 0 ; CHECK-NEXT: VirtualAddress: 0 -; CHECK-NEXT: RawDataSize: {{[0-9]+}} +; CHECK-NEXT: RawDataSize: 0x{{[0-9A-F]+}} ; CHECK-NEXT: PointerToRawData: 0x{{[0-9A-F]+}} ; CHECK-NEXT: PointerToRelocations: 0x{{[0-9A-F]+}} ; CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/COFF/section.s b/llvm/test/MC/COFF/section.s index 0ee4cd461aad0..d49edd7f8f569 100644 --- a/llvm/test/MC/COFF/section.s +++ b/llvm/test/MC/COFF/section.s @@ -221,12 +221,12 @@ // CHECK: Section { // CHECK-NEXT: Number: // CHECK-NEXT: Name: data1 -// CHECK: RawDataSize: 16 +// CHECK: RawDataSize: 0x10 // CHECK: Section { // CHECK-NEXT: Number: // CHECK-NEXT: Name: data2 -// CHECK: RawDataSize: 8 +// CHECK: RawDataSize: 0x8 .section .data3,"dw"; .quad 1 @@ -247,7 +247,7 @@ // CHECK: Section { // CHECK-NEXT: Number: // CHECK-NEXT: Name: .data3 -// CHECK: RawDataSize: 16 +// CHECK: RawDataSize: 0x10 // CHECK: Characteristics [ // CHECK-NEXT: IMAGE_SCN_ALIGN_1BYTES // CHECK-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA @@ -258,7 +258,7 @@ // CHECK: Section { // CHECK-NEXT: Number: // CHECK-NEXT: Name: .data4 -// CHECK: RawDataSize: 16 +// CHECK: RawDataSize: 0x10 // CHECK: Characteristics [ // CHECK-NEXT: IMAGE_SCN_ALIGN_1BYTES // CHECK-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA @@ -269,7 +269,7 @@ // CHECK: Section { // CHECK-NEXT: Number: // CHECK-NEXT: Name: .data5 -// CHECK: RawDataSize: 8 +// CHECK: RawDataSize: 0x8 // CHECK: Characteristics [ // CHECK-NEXT: IMAGE_SCN_ALIGN_1BYTES // CHECK-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA diff --git a/llvm/test/MC/COFF/seh-align1.s b/llvm/test/MC/COFF/seh-align1.s index 083b9a182dee5..90b408897fc56 100644 --- a/llvm/test/MC/COFF/seh-align1.s +++ b/llvm/test/MC/COFF/seh-align1.s @@ -5,7 +5,7 @@ // CHECK: Sections [ // CHECK: Section { // CHECK: Name: .xdata -// CHECK: RawDataSize: 8 +// CHECK: RawDataSize: 0x8 // CHECK: RelocationCount: 0 // CHECK: Characteristics [ // CHECK-NEXT: ALIGN_4BYTES @@ -20,7 +20,7 @@ // CHECK-NEXT: } // CHECK: Section { // CHECK: Name: .pdata -// CHECK: RawDataSize: 12 +// CHECK: RawDataSize: 0xC // CHECK: RelocationCount: 3 // CHECK: Characteristics [ // CHECK-NEXT: IMAGE_SCN_ALIGN_4BYTES diff --git a/llvm/test/MC/COFF/seh-align2.s b/llvm/test/MC/COFF/seh-align2.s index cf46cf6b00841..bd9d59464708e 100644 --- a/llvm/test/MC/COFF/seh-align2.s +++ b/llvm/test/MC/COFF/seh-align2.s @@ -5,7 +5,7 @@ // CHECK: Sections [ // CHECK: Section { // CHECK: Name: .xdata -// CHECK: RawDataSize: 16 +// CHECK: RawDataSize: 0x10 // CHECK: RelocationCount: 1 // CHECK: Characteristics [ // CHECK-NEXT: ALIGN_4BYTES @@ -21,7 +21,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Section { // CHECK: Name: .pdata -// CHECK: RawDataSize: 12 +// CHECK: RawDataSize: 0xC // CHECK: RelocationCount: 3 // CHECK: Characteristics [ // CHECK-NEXT: IMAGE_SCN_ALIGN_4BYTES diff --git a/llvm/test/MC/COFF/seh-align3.s b/llvm/test/MC/COFF/seh-align3.s index 9967e254b7eaf..051667420d418 100644 --- a/llvm/test/MC/COFF/seh-align3.s +++ b/llvm/test/MC/COFF/seh-align3.s @@ -5,7 +5,7 @@ // CHECK: Sections [ // CHECK: Section { // CHECK: Name: .xdata -// CHECK: RawDataSize: 16 +// CHECK: RawDataSize: 0x10 // CHECK: RelocationCount: 1 // CHECK: Characteristics [ // CHECK-NEXT: ALIGN_4BYTES @@ -21,7 +21,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Section { // CHECK: Name: .pdata -// CHECK: RawDataSize: 12 +// CHECK: RawDataSize: 0xC // CHECK: RelocationCount: 3 // CHECK: Characteristics [ // CHECK-NEXT: IMAGE_SCN_ALIGN_4BYTES diff --git a/llvm/test/MC/COFF/seh-section.s b/llvm/test/MC/COFF/seh-section.s index 17c609a29ea79..a35a0be65add7 100644 --- a/llvm/test/MC/COFF/seh-section.s +++ b/llvm/test/MC/COFF/seh-section.s @@ -5,7 +5,7 @@ // CHECK: Name: .xdata // CHECK-NEXT: VirtualSize // CHECK-NEXT: VirtualAddress -// CHECK-NEXT: RawDataSize: 8 +// CHECK-NEXT: RawDataSize: 0x8 // CHECK-NEXT: PointerToRawData // CHECK-NEXT: PointerToRelocations // CHECK-NEXT: PointerToLineNumbers @@ -23,7 +23,7 @@ // CHECK: Name: .xdata // CHECK-NEXT: VirtualSize // CHECK-NEXT: VirtualAddress -// CHECK-NEXT: RawDataSize: 8 +// CHECK-NEXT: RawDataSize: 0x8 // CHECK-NEXT: PointerToRawData // CHECK-NEXT: PointerToRelocations // CHECK-NEXT: PointerToLineNumbers @@ -41,7 +41,7 @@ // CHECK: Name: .xdata // CHECK-NEXT: VirtualSize // CHECK-NEXT: VirtualAddress -// CHECK-NEXT: RawDataSize: 8 +// CHECK-NEXT: RawDataSize: 0x8 // CHECK-NEXT: PointerToRawData // CHECK-NEXT: PointerToRelocations // CHECK-NEXT: PointerToLineNumbers diff --git a/llvm/test/MC/COFF/seh.s b/llvm/test/MC/COFF/seh.s index 2bbcb1f245ab7..f3dd77877e14b 100644 --- a/llvm/test/MC/COFF/seh.s +++ b/llvm/test/MC/COFF/seh.s @@ -15,7 +15,7 @@ // CHECK-NEXT: } // CHECK: Section { // CHECK: Name: .xdata -// CHECK: RawDataSize: 80 +// CHECK: RawDataSize: 0x50 // CHECK: RelocationCount: 7 // CHECK: Characteristics [ // CHECK-NEXT: ALIGN_4BYTES diff --git a/llvm/test/MC/COFF/symbol-fragment-offset-64.s b/llvm/test/MC/COFF/symbol-fragment-offset-64.s index 634113b40f979..7d4ede23afeec 100644 --- a/llvm/test/MC/COFF/symbol-fragment-offset-64.s +++ b/llvm/test/MC/COFF/symbol-fragment-offset-64.s @@ -50,7 +50,7 @@ _main: # @main // CHECK: Name: .text // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: {{[0-9]+}} +// CHECK: RawDataSize: 0x{{[0-9A-F]+}} // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x{{[0-9A-F]+}} // CHECK: PointerToLineNumbers: 0x0 @@ -81,7 +81,7 @@ _main: # @main // CHECK: Name: .data // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: {{[0-9]+}} +// CHECK: RawDataSize: 0x{{[0-9A-F]+}} // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x0 // CHECK: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/COFF/symbol-fragment-offset.s b/llvm/test/MC/COFF/symbol-fragment-offset.s index cfca876bb7b7b..afa0bd7f06d39 100644 --- a/llvm/test/MC/COFF/symbol-fragment-offset.s +++ b/llvm/test/MC/COFF/symbol-fragment-offset.s @@ -50,7 +50,7 @@ L_.str2: // CHECK: Name: .text // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: {{[0-9]+}} +// CHECK: RawDataSize: 0x{{[0-9A-F]+}} // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x{{[0-9A-F]+}} // CHECK: PointerToLineNumbers: 0x0 @@ -81,7 +81,7 @@ L_.str2: // CHECK: Name: .data // CHECK: VirtualSize: 0 // CHECK: VirtualAddress: 0 -// CHECK: RawDataSize: {{[0-9]+}} +// CHECK: RawDataSize: 0x{{[0-9A-F]+}} // CHECK: PointerToRawData: 0x{{[0-9A-F]+}} // CHECK: PointerToRelocations: 0x0 // CHECK: PointerToLineNumbers: 0x0 diff --git a/llvm/test/MC/X86/win-import-call-optimization.s b/llvm/test/MC/X86/win-import-call-optimization.s index 4f839a2bc6011..eb7949fa5b97c 100644 --- a/llvm/test/MC/X86/win-import-call-optimization.s +++ b/llvm/test/MC/X86/win-import-call-optimization.s @@ -37,7 +37,7 @@ tail_call: // CHECK-LABEL: Name: .retplne (2E 72 65 74 70 6C 6E 65) // CHECK-NEXT: VirtualSize: 0x0 // CHECK-NEXT: VirtualAddress: 0x0 -// CHECK-NEXT: RawDataSize: 44 +// CHECK-NEXT: RawDataSize: 0x2C // CHECK-NEXT: PointerToRawData: // CHECK-NEXT: PointerToRelocations: // CHECK-NEXT: PointerToLineNumbers: diff --git a/llvm/test/tools/llvm-ar/arm64x-split.yaml b/llvm/test/tools/llvm-ar/arm64x-split.yaml index 607d6f3d9954f..1c70e6cf46384 100644 --- a/llvm/test/tools/llvm-ar/arm64x-split.yaml +++ b/llvm/test/tools/llvm-ar/arm64x-split.yaml @@ -16,7 +16,7 @@ # CHECK-NEXT: Name: .obj.arm64ec (2F 34 00 00 00 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 0 +# CHECK-NEXT: RawDataSize: 0x0 # CHECK-NEXT: PointerToRawData: 0x0 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -34,7 +34,7 @@ # CHECK-NEXT: Name: .data (2E 64 61 74 61 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 4 +# CHECK-NEXT: RawDataSize: 0x4 # CHECK-NEXT: PointerToRawData: 0x66 # CHECK-NEXT: PointerToRelocations: 0x6A # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -95,7 +95,7 @@ # CHECK-NEXT: Name: .data (2E 64 61 74 61 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 4 +# CHECK-NEXT: RawDataSize: 0x4 # CHECK-NEXT: PointerToRawData: 0x3C # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test b/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test index b8d80d95b2f7e..1a67bf725e50c 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test +++ b/llvm/test/tools/llvm-objcopy/COFF/add-gnu-debuglink.test @@ -15,13 +15,13 @@ SECTIONS: Number: 4 SECTIONS-NEXT: Name: .pdata SECTIONS-NEXT: VirtualSize: 0x18 SECTIONS-NEXT: VirtualAddress: 0x4000 -SECTIONS-NEXT: RawDataSize: 512 +SECTIONS-NEXT: RawDataSize: 0x200 SECTIONS: Section { SECTIONS-NEXT: Number: 5 SECTIONS-NEXT: Name: .gnu_debuglink SECTIONS-NEXT: VirtualSize: 0x2C SECTIONS-NEXT: VirtualAddress: 0x5000 -SECTIONS-NEXT: RawDataSize: 512 +SECTIONS-NEXT: RawDataSize: 0x200 SECTIONS-NEXT: PointerToRawData: SECTIONS-NEXT: PointerToRelocations: SECTIONS-NEXT: PointerToLineNumbers: diff --git a/llvm/test/tools/llvm-objcopy/COFF/add-section-and-set-flags.test b/llvm/test/tools/llvm-objcopy/COFF/add-section-and-set-flags.test index b5fdcb8f6624f..05fc735ee3e45 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/add-section-and-set-flags.test +++ b/llvm/test/tools/llvm-objcopy/COFF/add-section-and-set-flags.test @@ -9,7 +9,7 @@ # CHECK: Name: .test.section1 # CHECK-NEXT: VirtualSize: 0x9 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 9 +# CHECK-NEXT: RawDataSize: 0x9 # CHECK: Characteristics [ # CHECK-NEXT: IMAGE_SCN_CNT_CODE # CHECK-NEXT: IMAGE_SCN_MEM_EXECUTE @@ -20,7 +20,7 @@ # CHECK: Name: .test.section2 # CHECK-NEXT: VirtualSize: 0x9 # CHECK-NEXT: VirtualAddress: 0x9 -# CHECK-NEXT: RawDataSize: 9 +# CHECK-NEXT: RawDataSize: 0x9 # CHECK: Characteristics [ # CHECK-NEXT: IMAGE_SCN_CNT_INITIALIZED_DATA # CHECK-NEXT: IMAGE_SCN_MEM_READ diff --git a/llvm/test/tools/llvm-objcopy/COFF/empty-sections.s b/llvm/test/tools/llvm-objcopy/COFF/empty-sections.s index 00e1a7d75b4bc..4804384efd978 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/empty-sections.s +++ b/llvm/test/tools/llvm-objcopy/COFF/empty-sections.s @@ -25,13 +25,13 @@ # INPUT: Name: .data # INPUT-NEXT: VirtualSize: 0x0 # INPUT-NEXT: VirtualAddress: 0x0 -# INPUT-NEXT: RawDataSize: 0 +# INPUT-NEXT: RawDataSize: 0x0 # INPUT-NEXT: PointerToRawData: 0x8D # OUTPUT: Name: .data # OUTPUT-NEXT: VirtualSize: 0x0 # OUTPUT-NEXT: VirtualAddress: 0x0 -# OUTPUT-NEXT: RawDataSize: 0 +# OUTPUT-NEXT: RawDataSize: 0x0 # OUTPUT-NEXT: PointerToRawData: 0x0{{$}} .text diff --git a/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug-rdata.test b/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug-rdata.test index affd4b65009f4..5f37a03aa36a9 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug-rdata.test +++ b/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug-rdata.test @@ -12,34 +12,34 @@ CHECK-NEXT: Number: 1 CHECK-NEXT: Name: .text (2E 74 65 78 74 00 00 00) CHECK-NEXT: VirtualSize: 0x12 CHECK-NEXT: VirtualAddress: 0x1000 -CHECK-NEXT: RawDataSize: 0 +CHECK-NEXT: RawDataSize: 0x0 CHECK: Section { CHECK-NEXT: Number: 2 CHECK-NEXT: Name: .rdata (2E 72 64 61 74 61 00 00) CHECK-NEXT: VirtualSize: 0x6D CHECK-NEXT: VirtualAddress: 0x2000 -CHECK-NEXT: RawDataSize: 512 +CHECK-NEXT: RawDataSize: 0x200 CHECK: Section { CHECK-NEXT: Number: 3 CHECK-NEXT: Name: .debug_abbrev (2F 34 00 00 00 00 00 00) CHECK-NEXT: VirtualSize: 0x4E CHECK-NEXT: VirtualAddress: 0x3000 -CHECK-NEXT: RawDataSize: 512 +CHECK-NEXT: RawDataSize: 0x200 CHECK: Section { CHECK-NEXT: Number: 4 CHECK-NEXT: Name: .debug_info (2F 32 39 00 00 00 00 00) CHECK-NEXT: VirtualSize: 0x74 CHECK-NEXT: VirtualAddress: 0x4000 -CHECK-NEXT: RawDataSize: 512 +CHECK-NEXT: RawDataSize: 0x200 CHECK: Section { CHECK-NEXT: Number: 5 CHECK-NEXT: Name: .debug_line (2F 34 31 00 00 00 00 00) CHECK-NEXT: VirtualSize: 0x3C CHECK-NEXT: VirtualAddress: 0x5000 -CHECK-NEXT: RawDataSize: 512 +CHECK-NEXT: RawDataSize: 0x200 CHECK: Section { CHECK-NEXT: Number: 6 CHECK-NEXT: Name: .debug_str (2F 31 38 00 00 00 00 00) CHECK-NEXT: VirtualSize: 0xD9 CHECK-NEXT: VirtualAddress: 0x6000 -CHECK-NEXT: RawDataSize: 512 +CHECK-NEXT: RawDataSize: 0x200 diff --git a/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug.test b/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug.test index 3ba5f4eb0cd07..e54fe06096eee 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug.test +++ b/llvm/test/tools/llvm-objcopy/COFF/only-keep-debug.test @@ -17,43 +17,43 @@ SECTIONS-NEXT: Number: 1 SECTIONS-NEXT: Name: .text SECTIONS-NEXT: VirtualSize: 0x4 SECTIONS-NEXT: VirtualAddress: -SECTIONS-NEXT: RawDataSize: 0 +SECTIONS-NEXT: RawDataSize: 0x0 SECTIONS: Section { SECTIONS-NEXT: Number: 2 SECTIONS-NEXT: Name: .rdata SECTIONS-NEXT: VirtualSize: 0x4 SECTIONS-NEXT: VirtualAddress: -SECTIONS-NEXT: RawDataSize: 0 +SECTIONS-NEXT: RawDataSize: 0x0 SECTIONS: Section { SECTIONS-NEXT: Number: 3 SECTIONS-NEXT: Name: .buildid SECTIONS-NEXT: VirtualSize: 0x4 SECTIONS-NEXT: VirtualAddress: -SECTIONS-NEXT: RawDataSize: 512 +SECTIONS-NEXT: RawDataSize: 0x200 SECTIONS: Section { SECTIONS-NEXT: Number: 4 SECTIONS-NEXT: Name: .reloc SECTIONS-NEXT: VirtualSize: 0x4 SECTIONS-NEXT: VirtualAddress: -SECTIONS-NEXT: RawDataSize: 0 +SECTIONS-NEXT: RawDataSize: 0x0 SECTIONS: Section { SECTIONS-NEXT: Number: 5 SECTIONS-NEXT: Name: .debug_discardable SECTIONS-NEXT: VirtualSize: 0x4 SECTIONS-NEXT: VirtualAddress: -SECTIONS-NEXT: RawDataSize: 512 +SECTIONS-NEXT: RawDataSize: 0x200 SECTIONS: Section { SECTIONS-NEXT: Number: 6 SECTIONS-NEXT: Name: .debug_undiscardable SECTIONS-NEXT: VirtualSize: 0x4 SECTIONS-NEXT: VirtualAddress: -SECTIONS-NEXT: RawDataSize: 512 +SECTIONS-NEXT: RawDataSize: 0x200 SECTIONS: Section { SECTIONS-NEXT: Number: 7 SECTIONS-NEXT: Name: .unflagged SECTIONS-NEXT: VirtualSize: 0x4 SECTIONS-NEXT: VirtualAddress: -SECTIONS-NEXT: RawDataSize: 512 +SECTIONS-NEXT: RawDataSize: 0x200 SYMBOLS: SYMBOL TABLE: SYMBOLS-NEXT: main diff --git a/llvm/test/tools/llvm-objcopy/COFF/update-section.test b/llvm/test/tools/llvm-objcopy/COFF/update-section.test index 6ea742d8819ee..2eeaf651c551a 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/update-section.test +++ b/llvm/test/tools/llvm-objcopy/COFF/update-section.test @@ -9,7 +9,7 @@ # CHECK-NEXT: Number: 1 # CHECK-NEXT: Name: .text # CHECK-NOT: } -# CHECK: RawDataSize: 4 +# CHECK: RawDataSize: 0x4 # CHECK: Hex dump of section '.text': # CHECK-NEXT: 0x00000000 41414142 AAAB @@ -18,7 +18,7 @@ # SMALLER-NEXT: Number: 1 # SMALLER-NEXT: Name: .text # SMALLER-NOT: } -# SMALLER: RawDataSize: 3 +# SMALLER: RawDataSize: 0x3 # SMALLER: Hex dump of section '.text': # SMALLER-NEXT: 0x00000000 414141 AAA @@ -28,12 +28,12 @@ # MULTIPLE-NEXT: Number: 1 # MULTIPLE-NEXT: Name: .text # MULTIPLE-NOT: } -# MULTIPLE: RawDataSize: 4 +# MULTIPLE: RawDataSize: 0x4 # MULTIPLE: Section { # MULTIPLE-NEXT: Number: 2 # MULTIPLE-NEXT: Name: .other # MULTIPLE-NOT: } -# MULTIPLE: RawDataSize: 4 +# MULTIPLE: RawDataSize: 0x4 # MULTIPLE: Hex dump of section '.text': # MULTIPLE-NEXT: 0x00000000 41414142 AAAB # MULTIPLE: Hex dump of section '.other': diff --git a/llvm/test/tools/llvm-offload-wrapper/coff-opt-ref.ll b/llvm/test/tools/llvm-offload-wrapper/coff-opt-ref.ll index 4f1413ce452a5..2295b47d39d75 100644 --- a/llvm/test/tools/llvm-offload-wrapper/coff-opt-ref.ll +++ b/llvm/test/tools/llvm-offload-wrapper/coff-opt-ref.ll @@ -17,10 +17,10 @@ ; CHECK: icmp ne ptr getelementptr inbounds ([1 x %struct.__tgt_offload_entry], ptr @__start_llvm_offload_entries, i32 0, i32 1), @__stop_llvm_offload_entries ; OBJ: Name: llvm_offload_entries{{[$]}}OA -; OBJ: RawDataSize: 56 +; OBJ: RawDataSize: 0x38 ; OBJ: IMAGE_SCN_ALIGN_8BYTES ; OBJ: Name: llvm_offload_entries{{[$]}}OZ -; OBJ: RawDataSize: 56 +; OBJ: RawDataSize: 0x38 ; OBJ: IMAGE_SCN_ALIGN_8BYTES ; MAP: {{[0-9A-Fa-f]+}}:00000000 00000038H llvm_offload_entries{{[$]}}OA DATA diff --git a/llvm/test/tools/llvm-readobj/COFF/arm64x-hybridobj.yaml b/llvm/test/tools/llvm-readobj/COFF/arm64x-hybridobj.yaml index f37ded5fea3e7..850a40f7779e7 100644 --- a/llvm/test/tools/llvm-readobj/COFF/arm64x-hybridobj.yaml +++ b/llvm/test/tools/llvm-readobj/COFF/arm64x-hybridobj.yaml @@ -12,7 +12,7 @@ # CHECK-NEXT: Name: .data (2E 64 61 74 61 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 4 +# CHECK-NEXT: RawDataSize: 0x4 # CHECK-NEXT: PointerToRawData: 0x64 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -30,7 +30,7 @@ # CHECK-NEXT: Name: .obj.arm64ec (2F 34 00 00 00 00 00 00) # CHECK-NEXT: VirtualSize: 0x7A # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 122 +# CHECK-NEXT: RawDataSize: 0x7A # CHECK-NEXT: PointerToRawData: 0x68 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -53,7 +53,7 @@ # CHECK-NEXT: Name: .data (2E 64 61 74 61 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 4 +# CHECK-NEXT: RawDataSize: 0x4 # CHECK-NEXT: PointerToRawData: 0x3C # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/tools/llvm-readobj/COFF/bigobj.test b/llvm/test/tools/llvm-readobj/COFF/bigobj.test index 36d1baa4a639c..ec87d41a888ca 100644 --- a/llvm/test/tools/llvm-readobj/COFF/bigobj.test +++ b/llvm/test/tools/llvm-readobj/COFF/bigobj.test @@ -21,7 +21,7 @@ CHECK-NEXT: Number: 1 CHECK-NEXT: Name: .text (2E 74 65 78 74 00 00 00) CHECK-NEXT: VirtualSize: 0x0 CHECK-NEXT: VirtualAddress: 0x0 -CHECK-NEXT: RawDataSize: 0 +CHECK-NEXT: RawDataSize: 0x0 CHECK-NEXT: PointerToRawData: 0x0 CHECK-NEXT: PointerToRelocations: 0x0 CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -39,7 +39,7 @@ CHECK-NEXT: Number: 2 CHECK-NEXT: Name: .data (2E 64 61 74 61 00 00 00) CHECK-NEXT: VirtualSize: 0x0 CHECK-NEXT: VirtualAddress: 0x0 -CHECK-NEXT: RawDataSize: 0 +CHECK-NEXT: RawDataSize: 0x0 CHECK-NEXT: PointerToRawData: 0x0 CHECK-NEXT: PointerToRelocations: 0x0 CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -57,7 +57,7 @@ CHECK-NEXT: Number: 3 CHECK-NEXT: Name: .bss (2E 62 73 73 00 00 00 00) CHECK-NEXT: VirtualSize: 0x0 CHECK-NEXT: VirtualAddress: 0x0 -CHECK-NEXT: RawDataSize: 0 +CHECK-NEXT: RawDataSize: 0x0 CHECK-NEXT: PointerToRawData: 0x0 CHECK-NEXT: PointerToRelocations: 0x0 CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/tools/llvm-readobj/COFF/sections-ext.test b/llvm/test/tools/llvm-readobj/COFF/sections-ext.test index b07347a2b4720..8d0464d55dc57 100644 --- a/llvm/test/tools/llvm-readobj/COFF/sections-ext.test +++ b/llvm/test/tools/llvm-readobj/COFF/sections-ext.test @@ -11,7 +11,7 @@ # CHECK-NEXT: Name: .text (2E 74 65 78 74 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 22 +# CHECK-NEXT: RawDataSize: 0x16 # CHECK-NEXT: PointerToRawData: 0x64 # CHECK-NEXT: PointerToRelocations: 0x7A # CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/tools/llvm-readobj/COFF/sections.test b/llvm/test/tools/llvm-readobj/COFF/sections.test index 826cc60c8be1c..d558e2320c1d7 100644 --- a/llvm/test/tools/llvm-readobj/COFF/sections.test +++ b/llvm/test/tools/llvm-readobj/COFF/sections.test @@ -8,7 +8,7 @@ # CHECK-NEXT: Name: .text (2E 74 65 78 74 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 22 +# CHECK-NEXT: RawDataSize: 0x16 # CHECK-NEXT: PointerToRawData: 0x64 # CHECK-NEXT: PointerToRelocations: 0x7A # CHECK-NEXT: PointerToLineNumbers: 0x0 @@ -26,7 +26,7 @@ # CHECK-NEXT: Name: .data (2E 64 61 74 61 00 00 00) # CHECK-NEXT: VirtualSize: 0x0 # CHECK-NEXT: VirtualAddress: 0x0 -# CHECK-NEXT: RawDataSize: 13 +# CHECK-NEXT: RawDataSize: 0xD # CHECK-NEXT: PointerToRawData: 0x98 # CHECK-NEXT: PointerToRelocations: 0x0 # CHECK-NEXT: PointerToLineNumbers: 0x0 diff --git a/llvm/test/tools/yaml2obj/COFF/xrelocs.yaml b/llvm/test/tools/yaml2obj/COFF/xrelocs.yaml index cecef3b0fdad9..f49faaf3eb36c 100644 --- a/llvm/test/tools/yaml2obj/COFF/xrelocs.yaml +++ b/llvm/test/tools/yaml2obj/COFF/xrelocs.yaml @@ -8,7 +8,7 @@ # CHECK-OBJ-NEXT: Section { # CHECK-OBJ-NEXT: Number: 1 # CHECK-OBJ-NEXT: Name: .data -# CHECK-OBJ: RawDataSize: 16 +# CHECK-OBJ: RawDataSize: 0x10 # CHECK-OBJ: RelocationCount: 65535 # CHECK-OBJ: Characteristics [ # CHECK-OBJ-NEXT: IMAGE_SCN_ALIGN_16BYTES diff --git a/llvm/tools/llvm-readobj/COFFDumper.cpp b/llvm/tools/llvm-readobj/COFFDumper.cpp index ff2d3e61b612d..b68b1f8e51682 100644 --- a/llvm/tools/llvm-readobj/COFFDumper.cpp +++ b/llvm/tools/llvm-readobj/COFFDumper.cpp @@ -1608,7 +1608,7 @@ void COFFDumper::printSectionHeaders() { W.printBinary("Name", Name, Section->Name); W.printHex("VirtualSize", Section->VirtualSize); W.printHex("VirtualAddress", Section->VirtualAddress); - W.printNumber("RawDataSize", Section->SizeOfRawData); + W.printHex("RawDataSize", Section->SizeOfRawData); W.printHex("PointerToRawData", Section->PointerToRawData); W.printHex("PointerToRelocations", Section->PointerToRelocations); W.printHex("PointerToLineNumbers", Section->PointerToLinenumbers); _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
