[llvm] 65fd17c - [lib/Support/YAMLTraits] - Don't print leading zeroes when dumping Hex8/Hex16/Hex32 types.
Georgii Rymar via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 18 00:39:27 PST 2020
Author: Georgii Rymar
Date: 2020-11-18T11:31:00+03:00
New Revision: 65fd17c241e22e1671e81efdb683687369c2feb3
URL: https://github.com/llvm/llvm-project/commit/65fd17c241e22e1671e81efdb683687369c2feb3
DIFF: https://github.com/llvm/llvm-project/commit/65fd17c241e22e1671e81efdb683687369c2feb3.diff
LOG: [lib/Support/YAMLTraits] - Don't print leading zeroes when dumping Hex8/Hex16/Hex32 types.
When we produce an YAML output, we also print leading zeroes currently.
An output might look like this:
```
- Name: .dynsym
Type: SHT_DYNSYM
Address: 0x0000000000001000
EntSize: 0x0000000000000018
```
There are probably no reason to print leading zeroes.
It just makes harder to read values. This patch stops printing them.
The output becomes like:
```
- Name: .dynsym
Type: SHT_DYNSYM
Address: 0x1000
EntSize: 0x18
```
This affects obj2yaml mostly, but also dsymutil and llvm-xray tools output.
Differential revision: https://reviews.llvm.org/D90930
Added:
Modified:
llvm/lib/Support/YAMLTraits.cpp
llvm/test/CodeGen/WebAssembly/function-pointer64.ll
llvm/test/MC/WebAssembly/assembler-binary.ll
llvm/test/MC/WebAssembly/comdat.ll
llvm/test/MC/WebAssembly/data-section.s
llvm/test/MC/WebAssembly/event-section.ll
llvm/test/MC/WebAssembly/external-data.ll
llvm/test/MC/WebAssembly/external-func-address.ll
llvm/test/MC/WebAssembly/global-ctor-dtor.ll
llvm/test/MC/WebAssembly/libcall.ll
llvm/test/MC/WebAssembly/reloc-pic.s
llvm/test/MC/WebAssembly/tables.s
llvm/test/MC/WebAssembly/tls.s
llvm/test/MC/WebAssembly/type-index.s
llvm/test/MC/WebAssembly/unnamed-data.ll
llvm/test/MC/WebAssembly/wasm64.s
llvm/test/MC/WebAssembly/weak-alias.s
llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
llvm/test/Object/Mips/elf-mips64-rel.yaml
llvm/test/Object/obj2yaml.test
llvm/test/ObjectYAML/MachO/BigEndian.yaml
llvm/test/ObjectYAML/MachO/DWARF-BigEndian.yaml
llvm/test/ObjectYAML/MachO/DWARF-LittleEndian.yaml
llvm/test/ObjectYAML/MachO/DWARF-debug_abbrev.yaml
llvm/test/ObjectYAML/MachO/DWARF-debug_aranges.yaml
llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
llvm/test/ObjectYAML/MachO/DWARF-debug_str.yaml
llvm/test/ObjectYAML/MachO/DWARF-pubsections.yaml
llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
llvm/test/ObjectYAML/MachO/DWARF5-abbrevValues.yaml
llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
llvm/test/ObjectYAML/MachO/LittleEndian.yaml
llvm/test/ObjectYAML/MachO/bind_opcode.yaml
llvm/test/ObjectYAML/MachO/bogus_load_command.yaml
llvm/test/ObjectYAML/MachO/export_trie.yaml
llvm/test/ObjectYAML/MachO/fat_macho_i386_x86_64.yaml
llvm/test/ObjectYAML/MachO/lazy_bind_opcode.yaml
llvm/test/ObjectYAML/MachO/lc-ident.yaml
llvm/test/ObjectYAML/MachO/mach_header.yaml
llvm/test/ObjectYAML/MachO/mach_header_64.yaml
llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml
llvm/test/ObjectYAML/MachO/rebase_opcode.yaml
llvm/test/ObjectYAML/MachO/relocations_arm64.yaml
llvm/test/ObjectYAML/MachO/relocations_armv7.yaml
llvm/test/ObjectYAML/MachO/relocations_empty.yaml
llvm/test/ObjectYAML/MachO/relocations_ppc_big_endian.yaml
llvm/test/ObjectYAML/MachO/relocations_x86_64.yaml
llvm/test/ObjectYAML/MachO/sections.yaml
llvm/test/ObjectYAML/MachO/symtab.yaml
llvm/test/ObjectYAML/MachO/virtual_section.yaml
llvm/test/ObjectYAML/MachO/weak_bind_opcode.yaml
llvm/test/ObjectYAML/wasm/code_section.yaml
llvm/test/ObjectYAML/wasm/custom_section.yaml
llvm/test/ObjectYAML/wasm/data_section.yaml
llvm/test/ObjectYAML/wasm/dylink_section.yaml
llvm/test/ObjectYAML/wasm/elem_section.yaml
llvm/test/ObjectYAML/wasm/event_section.yaml
llvm/test/ObjectYAML/wasm/export_section.yaml
llvm/test/ObjectYAML/wasm/function_section.yaml
llvm/test/ObjectYAML/wasm/global_section.yaml
llvm/test/ObjectYAML/wasm/header.yaml
llvm/test/ObjectYAML/wasm/import_memory_shared.yaml
llvm/test/ObjectYAML/wasm/import_section.yaml
llvm/test/ObjectYAML/wasm/memory_section.yaml
llvm/test/ObjectYAML/wasm/start_section.yaml
llvm/test/ObjectYAML/wasm/table_section.yaml
llvm/test/ObjectYAML/wasm/type_section.yaml
llvm/test/ObjectYAML/wasm/weak_symbols.yaml
llvm/test/tools/dsymutil/ARM/extern-alias.test
llvm/test/tools/dsymutil/X86/common-sym-multi.test
llvm/test/tools/dsymutil/debug-map-parsing.test
llvm/test/tools/dsymutil/yaml-object-address-rewrite.test
llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test
llvm/test/tools/llvm-xray/ARM/extract-instrmap.test
llvm/test/tools/llvm-xray/X86/extract-instrmap-macho.ll
llvm/test/tools/llvm-xray/X86/extract-instrmap-pie.ll
llvm/test/tools/llvm-xray/X86/extract-instrmap-symbolize.ll
llvm/test/tools/llvm-xray/X86/extract-instrmap.ll
llvm/test/tools/obj2yaml/Archives/regular.yaml
llvm/test/tools/obj2yaml/ELF/DWARF/debug-addr.yaml
llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml
llvm/test/tools/obj2yaml/ELF/DWARF/debug-ranges.yaml
llvm/test/tools/obj2yaml/ELF/DWARF/debug-str.yaml
llvm/test/tools/obj2yaml/ELF/arm-exidx-section.yaml
llvm/test/tools/obj2yaml/ELF/bb-addr-map.yaml
llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml
llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml
llvm/test/tools/obj2yaml/ELF/dynamic-section-arch-tags.yaml
llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml
llvm/test/tools/obj2yaml/ELF/entsize.yaml
llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml
llvm/test/tools/obj2yaml/ELF/hash-section.yaml
llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml
llvm/test/tools/obj2yaml/ELF/mips-abi-flags.yaml
llvm/test/tools/obj2yaml/ELF/no-symbol-reloc.yaml
llvm/test/tools/obj2yaml/ELF/note-section.yaml
llvm/test/tools/obj2yaml/ELF/null-section.yaml
llvm/test/tools/obj2yaml/ELF/program-headers.yaml
llvm/test/tools/obj2yaml/ELF/relocation-type.yaml
llvm/test/tools/obj2yaml/ELF/relr-section.yaml
llvm/test/tools/obj2yaml/ELF/section-type.yaml
llvm/test/tools/obj2yaml/ELF/sections-info.yaml
llvm/test/tools/obj2yaml/ELF/shinfo.yaml
llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml
llvm/test/tools/obj2yaml/ELF/special-symbol-indices.yaml
llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml
llvm/test/tools/obj2yaml/ELF/symbol-type.yaml
llvm/test/tools/obj2yaml/ELF/verdef-section.yaml
llvm/test/tools/obj2yaml/ELF/verneed-section.yaml
llvm/test/tools/obj2yaml/ELF/versym-section.yaml
llvm/test/tools/obj2yaml/MachO/debug-aranges.yaml
llvm/test/tools/obj2yaml/MachO/unrecognized-debug-section.yaml
llvm/test/tools/obj2yaml/Minidump/basic.yaml
llvm/test/tools/obj2yaml/XCOFF/aix.yaml
llvm/test/tools/yaml2obj/ELF/abiversion.yaml
Removed:
################################################################################
diff --git a/llvm/lib/Support/YAMLTraits.cpp b/llvm/lib/Support/YAMLTraits.cpp
index df5e2cee7a0a..1b5c79f6b592 100644
--- a/llvm/lib/Support/YAMLTraits.cpp
+++ b/llvm/lib/Support/YAMLTraits.cpp
@@ -1046,8 +1046,7 @@ StringRef ScalarTraits<float>::input(StringRef Scalar, void *, float &Val) {
}
void ScalarTraits<Hex8>::output(const Hex8 &Val, void *, raw_ostream &Out) {
- uint8_t Num = Val;
- Out << format("0x%02X", Num);
+ Out << format("0x%" PRIX8, (uint8_t)Val);
}
StringRef ScalarTraits<Hex8>::input(StringRef Scalar, void *, Hex8 &Val) {
@@ -1061,8 +1060,7 @@ StringRef ScalarTraits<Hex8>::input(StringRef Scalar, void *, Hex8 &Val) {
}
void ScalarTraits<Hex16>::output(const Hex16 &Val, void *, raw_ostream &Out) {
- uint16_t Num = Val;
- Out << format("0x%04X", Num);
+ Out << format("0x%" PRIX16, (uint16_t)Val);
}
StringRef ScalarTraits<Hex16>::input(StringRef Scalar, void *, Hex16 &Val) {
@@ -1076,8 +1074,7 @@ StringRef ScalarTraits<Hex16>::input(StringRef Scalar, void *, Hex16 &Val) {
}
void ScalarTraits<Hex32>::output(const Hex32 &Val, void *, raw_ostream &Out) {
- uint32_t Num = Val;
- Out << format("0x%08X", Num);
+ Out << format("0x%" PRIX32, (uint32_t)Val);
}
StringRef ScalarTraits<Hex32>::input(StringRef Scalar, void *, Hex32 &Val) {
@@ -1091,8 +1088,7 @@ StringRef ScalarTraits<Hex32>::input(StringRef Scalar, void *, Hex32 &Val) {
}
void ScalarTraits<Hex64>::output(const Hex64 &Val, void *, raw_ostream &Out) {
- uint64_t Num = Val;
- Out << format("0x%016llX", Num);
+ Out << format("0x%" PRIX64, (uint64_t)Val);
}
StringRef ScalarTraits<Hex64>::input(StringRef Scalar, void *, Hex64 &Val) {
diff --git a/llvm/test/CodeGen/WebAssembly/function-pointer64.ll b/llvm/test/CodeGen/WebAssembly/function-pointer64.ll
index 0bea3930de0a..6b279cfb6ec0 100644
--- a/llvm/test/CodeGen/WebAssembly/function-pointer64.ll
+++ b/llvm/test/CodeGen/WebAssembly/function-pointer64.ll
@@ -45,14 +45,14 @@ entry:
; YAML: Memory:
; YAML-NEXT: Flags: [ IS_64 ]
-; YAML-NEXT: Initial: 0x00000001
+; YAML-NEXT: Initial: 0x1
; YAML: - Type: CODE
; YAML: - Type: R_WASM_TABLE_INDEX_SLEB64
; YAML-NEXT: Index: 0
-; YAML-NEXT: Offset: 0x00000016
+; YAML-NEXT: Offset: 0x16
; YAML: - Type: DATA
; YAML: - Type: R_WASM_TABLE_INDEX_I64
; YAML-NEXT: Index: 0
-; YAML-NEXT: Offset: 0x00000006
+; YAML-NEXT: Offset: 0x6
diff --git a/llvm/test/MC/WebAssembly/assembler-binary.ll b/llvm/test/MC/WebAssembly/assembler-binary.ll
index ed7b5f2cc875..4d57ed3f212c 100644
--- a/llvm/test/MC/WebAssembly/assembler-binary.ll
+++ b/llvm/test/MC/WebAssembly/assembler-binary.ll
@@ -33,7 +33,7 @@ entry:
; CHECK: --- !WASM
; CHECK-NEXT: FileHeader:
-; CHECK-NEXT: Version: 0x00000001
+; CHECK-NEXT: Version: 0x1
; CHECK-NEXT: Sections:
; CHECK-NEXT: - Type: TYPE
; CHECK-NEXT: Signatures:
@@ -50,7 +50,7 @@ entry:
; CHECK-NEXT: Field: __linear_memory
; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Memory:
-; CHECK-NEXT: Initial: 0x00000000
+; CHECK-NEXT: Initial: 0x0
; CHECK-NEXT: - Module: env
; CHECK-NEXT: Field: __indirect_function_table
; CHECK-NEXT: Kind: TABLE
@@ -58,7 +58,7 @@ entry:
; CHECK-NEXT: Index: 0
; CHECK-NEXT: ElemType: FUNCREF
; CHECK-NEXT: Limits:
-; CHECK-NEXT: Initial: 0x00000000
+; CHECK-NEXT: Initial: 0x0
; CHECK-NEXT: - Module: env
; CHECK-NEXT: Field: bar
; CHECK-NEXT: Kind: FUNCTION
@@ -69,7 +69,7 @@ entry:
; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
; CHECK-NEXT: Index: 1
-; CHECK-NEXT: Offset: 0x00000004
+; CHECK-NEXT: Offset: 0x4
; CHECK-NEXT: Functions:
; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Locals: []
diff --git a/llvm/test/MC/WebAssembly/comdat.ll b/llvm/test/MC/WebAssembly/comdat.ll
index fd87b5ce797a..0e7ac4af3a61 100644
--- a/llvm/test/MC/WebAssembly/comdat.ll
+++ b/llvm/test/MC/WebAssembly/comdat.ll
@@ -37,7 +37,7 @@ define linkonce_odr i32 @sharedFn() #1 comdat($sharedComdat) {
; CHECK-NEXT: Field: __linear_memory
; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Memory:
-; CHECK-NEXT: Initial: 0x00000001
+; CHECK-NEXT: Initial: 0x1
; CHECK-NEXT: - Module: env
; CHECK-NEXT: Field: __indirect_function_table
; CHECK-NEXT: Kind: TABLE
@@ -45,7 +45,7 @@ define linkonce_odr i32 @sharedFn() #1 comdat($sharedComdat) {
; CHECK-NEXT: Index: 0
; CHECK-NEXT: ElemType: FUNCREF
; CHECK-NEXT: Limits:
-; CHECK-NEXT: Initial: 0x00000000
+; CHECK-NEXT: Initial: 0x0
; CHECK-NEXT: - Module: env
; CHECK-NEXT: Field: funcImport
; CHECK-NEXT: Kind: FUNCTION
@@ -58,7 +58,7 @@ define linkonce_odr i32 @sharedFn() #1 comdat($sharedComdat) {
; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
; CHECK-NEXT: Index: 1
-; CHECK-NEXT: Offset: 0x00000004
+; CHECK-NEXT: Offset: 0x4
; CHECK-NEXT: Functions:
; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Locals:
diff --git a/llvm/test/MC/WebAssembly/data-section.s b/llvm/test/MC/WebAssembly/data-section.s
index e2dab163bea0..31154cf3164d 100644
--- a/llvm/test/MC/WebAssembly/data-section.s
+++ b/llvm/test/MC/WebAssembly/data-section.s
@@ -30,7 +30,7 @@ test0:
# BIN: --- !WASM
# BIN-NEXT: FileHeader:
-# BIN-NEXT: Version: 0x00000001
+# BIN-NEXT: Version: 0x1
# BIN-NEXT: Sections:
# BIN-NEXT: - Type: TYPE
# BIN-NEXT: Signatures:
@@ -44,7 +44,7 @@ test0:
# BIN-NEXT: Field: __linear_memory
# BIN-NEXT: Kind: MEMORY
# BIN-NEXT: Memory:
-# BIN-NEXT: Initial: 0x00000001
+# BIN-NEXT: Initial: 0x1
# BIN-NEXT: - Module: env
# BIN-NEXT: Field: __indirect_function_table
# BIN-NEXT: Kind: TABLE
@@ -52,7 +52,7 @@ test0:
# BIN-NEXT: Index: 0
# BIN-NEXT: ElemType: FUNCREF
# BIN-NEXT: Limits:
-# BIN-NEXT: Initial: 0x00000000
+# BIN-NEXT: Initial: 0x0
# BIN-NEXT: - Type: FUNCTION
# BIN-NEXT: FunctionTypes: [ 0 ]
# BIN-NEXT: - Type: DATACOUNT
@@ -61,7 +61,7 @@ test0:
# BIN-NEXT: Relocations:
# BIN-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB
# BIN-NEXT: Index: 1
-# BIN-NEXT: Offset: 0x00000004
+# BIN-NEXT: Offset: 0x4
# BIN-NEXT: Functions:
# BIN-NEXT: - Index: 0
# BIN-NEXT: Locals: []
diff --git a/llvm/test/MC/WebAssembly/event-section.ll b/llvm/test/MC/WebAssembly/event-section.ll
index 35928fbcfe94..e81f687d7100 100644
--- a/llvm/test/MC/WebAssembly/event-section.ll
+++ b/llvm/test/MC/WebAssembly/event-section.ll
@@ -38,10 +38,10 @@ define i32 @test_throw1(i8* %p) {
; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_EVENT_INDEX_LEB
; CHECK-NEXT: Index: 1
-; CHECK-NEXT: Offset: 0x00000006
+; CHECK-NEXT: Offset: 0x6
; CHECK-NEXT: - Type: R_WASM_EVENT_INDEX_LEB
; CHECK-NEXT: Index: 1
-; CHECK-NEXT: Offset: 0x00000011
+; CHECK-NEXT: Offset: 0x11
; CHECK: - Type: CUSTOM
; CHECK-NEXT: Name: linking
diff --git a/llvm/test/MC/WebAssembly/external-data.ll b/llvm/test/MC/WebAssembly/external-data.ll
index 3f2129b86ead..e643b196af70 100644
--- a/llvm/test/MC/WebAssembly/external-data.ll
+++ b/llvm/test/MC/WebAssembly/external-data.ll
@@ -14,7 +14,7 @@ target triple = "wasm32-unknown-unknown"
; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
; CHECK-NEXT: Index: 2
-; CHECK-NEXT: Offset: 0x00000013
+; CHECK-NEXT: Offset: 0x13
; CHECK-NEXT: Segments:
; CHECK-NEXT: - SectionOffset: 6
; CHECK-NEXT: InitFlags: 0
diff --git a/llvm/test/MC/WebAssembly/external-func-address.ll b/llvm/test/MC/WebAssembly/external-func-address.ll
index 9c16c02a4a0f..3c59eaa701af 100644
--- a/llvm/test/MC/WebAssembly/external-func-address.ll
+++ b/llvm/test/MC/WebAssembly/external-func-address.ll
@@ -22,7 +22,7 @@ define void @call(i32) {
; CHECK: --- !WASM
; CHECK-NEXT: FileHeader:
-; CHECK-NEXT: Version: 0x00000001
+; CHECK-NEXT: Version: 0x1
; CHECK-NEXT: Sections:
; CHECK-NEXT: - Type: TYPE
; CHECK-NEXT: Signatures:
@@ -63,4 +63,4 @@ define void @call(i32) {
; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_I32
; CHECK-NEXT: Index: 3
-; CHECK-NEXT: Offset: 0x00000006
+; CHECK-NEXT: Offset: 0x6
diff --git a/llvm/test/MC/WebAssembly/global-ctor-dtor.ll b/llvm/test/MC/WebAssembly/global-ctor-dtor.ll
index 750a1d8768a5..6cd7fe636fe2 100644
--- a/llvm/test/MC/WebAssembly/global-ctor-dtor.ll
+++ b/llvm/test/MC/WebAssembly/global-ctor-dtor.ll
@@ -25,7 +25,7 @@ declare void @func3()
; CHECK-NEXT: Field: __linear_memory
; CHECK-NEXT: Kind: MEMORY
; CHECK-NEXT: Memory:
-; CHECK-NEXT: Initial: 0x00000001
+; CHECK-NEXT: Initial: 0x1
; CHECK-NEXT: - Module: env
; CHECK-NEXT: Field: __indirect_function_table
; CHECK-NEXT: Kind: TABLE
@@ -33,7 +33,7 @@ declare void @func3()
; CHECK-NEXT: Index: 0
; CHECK-NEXT: ElemType: FUNCREF
; CHECK-NEXT: Limits:
-; CHECK-NEXT: Initial: 0x00000002
+; CHECK-NEXT: Initial: 0x2
; CHECK-NEXT: - Module: env
; CHECK-NEXT: Field: func3
; CHECK-NEXT: Kind: FUNCTION
@@ -68,28 +68,28 @@ declare void @func3()
; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
; CHECK-NEXT: Index: 1
-; CHECK-NEXT: Offset: 0x00000004
+; CHECK-NEXT: Offset: 0x4
; CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB
; CHECK-NEXT: Index: 0
-; CHECK-NEXT: Offset: 0x0000000F
+; CHECK-NEXT: Offset: 0xF
; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB
; CHECK-NEXT: Index: 3
-; CHECK-NEXT: Offset: 0x00000017
+; CHECK-NEXT: Offset: 0x17
; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
; CHECK-NEXT: Index: 4
-; CHECK-NEXT: Offset: 0x0000001D
+; CHECK-NEXT: Offset: 0x1D
; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
; CHECK-NEXT: Index: 6
-; CHECK-NEXT: Offset: 0x0000002C
+; CHECK-NEXT: Offset: 0x2C
; CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB
; CHECK-NEXT: Index: 5
-; CHECK-NEXT: Offset: 0x00000037
+; CHECK-NEXT: Offset: 0x37
; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB
; CHECK-NEXT: Index: 3
-; CHECK-NEXT: Offset: 0x0000003F
+; CHECK-NEXT: Offset: 0x3F
; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
; CHECK-NEXT: Index: 4
-; CHECK-NEXT: Offset: 0x00000045
+; CHECK-NEXT: Offset: 0x45
; CHECK-NEXT: Functions:
; CHECK-NEXT: - Index: 5
; CHECK-NEXT: Locals:
diff --git a/llvm/test/MC/WebAssembly/libcall.ll b/llvm/test/MC/WebAssembly/libcall.ll
index 9f8abba70c0e..c19e1a24c963 100644
--- a/llvm/test/MC/WebAssembly/libcall.ll
+++ b/llvm/test/MC/WebAssembly/libcall.ll
@@ -12,7 +12,7 @@ declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture r
; CHECK: --- !WASM
; CHECK-NEXT: FileHeader:
-; CHECK-NEXT: Version: 0x00000001
+; CHECK-NEXT: Version: 0x1
; CHECK-NEXT: Sections:
; CHECK-NEXT: - Type: TYPE
; CHECK-NEXT: Signatures:
diff --git a/llvm/test/MC/WebAssembly/reloc-pic.s b/llvm/test/MC/WebAssembly/reloc-pic.s
index e19ba0a681cd..b3cc618d96a3 100644
--- a/llvm/test/MC/WebAssembly/reloc-pic.s
+++ b/llvm/test/MC/WebAssembly/reloc-pic.s
@@ -47,7 +47,7 @@ hidden_func:
# CHECK: --- !WASM
# CHECK-NEXT: FileHeader:
-# CHECK-NEXT: Version: 0x00000001
+# CHECK-NEXT: Version: 0x1
# CHECK-NEXT: Sections:
# CHECK-NEXT: - Type: TYPE
# CHECK-NEXT: Signatures:
@@ -61,7 +61,7 @@ hidden_func:
# CHECK-NEXT: Field: __linear_memory
# CHECK-NEXT: Kind: MEMORY
# CHECK-NEXT: Memory:
-# CHECK-NEXT: Initial: 0x00000001
+# CHECK-NEXT: Initial: 0x1
# CHECK-NEXT: - Module: env
# CHECK-NEXT: Field: __indirect_function_table
# CHECK-NEXT: Kind: TABLE
@@ -69,7 +69,7 @@ hidden_func:
# CHECK-NEXT: Index: 0
# CHECK-NEXT: ElemType: FUNCREF
# CHECK-NEXT: Limits:
-# CHECK-NEXT: Initial: 0x00000001
+# CHECK-NEXT: Initial: 0x1
# CHECK-NEXT: - Module: env
# CHECK-NEXT: Field: default_func
# CHECK-NEXT: Kind: FUNCTION
@@ -98,22 +98,22 @@ hidden_func:
# CHECK-NEXT: Relocations:
# CHECK-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB
# CHECK-NEXT: Index: 1
-# CHECK-NEXT: Offset: 0x00000004
+# CHECK-NEXT: Offset: 0x4
# CHECK-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB
# CHECK-NEXT: Index: 3
-# CHECK-NEXT: Offset: 0x00000010
+# CHECK-NEXT: Offset: 0x10
# CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB
# CHECK-NEXT: Index: 5
-# CHECK-NEXT: Offset: 0x0000001C
+# CHECK-NEXT: Offset: 0x1C
# CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_REL_SLEB
# CHECK-NEXT: Index: 6
-# CHECK-NEXT: Offset: 0x00000022
+# CHECK-NEXT: Offset: 0x22
# CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB
# CHECK-NEXT: Index: 8
-# CHECK-NEXT: Offset: 0x0000002C
+# CHECK-NEXT: Offset: 0x2C
# CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_REL_SLEB
# CHECK-NEXT: Index: 9
-# CHECK-NEXT: Offset: 0x00000032
+# CHECK-NEXT: Offset: 0x32
# CHECK-NEXT: Functions:
# CHECK-NEXT: - Index: 1
# CHECK-NEXT: Locals: []
diff --git a/llvm/test/MC/WebAssembly/tables.s b/llvm/test/MC/WebAssembly/tables.s
index ea1eb4fc84a7..3bee36cda2ce 100644
--- a/llvm/test/MC/WebAssembly/tables.s
+++ b/llvm/test/MC/WebAssembly/tables.s
@@ -124,41 +124,41 @@ table_fill:
# BIN-NEXT: - Index: 1
# BIN-NEXT: ElemType: EXTERNREF
# BIN-NEXT: Limits:
-# BIN-NEXT: Initial: 0x00000000
+# BIN-NEXT: Initial: 0x0
# BIN-NEXT: - Index: 2
# BIN-NEXT: ElemType: FUNCREF
# BIN-NEXT: Limits:
-# BIN-NEXT: Initial: 0x00000000
+# BIN-NEXT: Initial: 0x0
# BIN: - Type: CODE
# BIN-NEXT: Relocations:
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x00000009
+# BIN-NEXT: Offset: 0x9
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x00000010
+# BIN-NEXT: Offset: 0x10
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 3
-# BIN-NEXT: Offset: 0x00000015
+# BIN-NEXT: Offset: 0x15
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 0
-# BIN-NEXT: Offset: 0x00000020
+# BIN-NEXT: Offset: 0x20
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 0
-# BIN-NEXT: Offset: 0x0000002D
+# BIN-NEXT: Offset: 0x2D
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 0
-# BIN-NEXT: Offset: 0x00000038
+# BIN-NEXT: Offset: 0x38
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 0
-# BIN-NEXT: Offset: 0x00000041
+# BIN-NEXT: Offset: 0x41
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x00000051
+# BIN-NEXT: Offset: 0x51
# BIN-NEXT: - Type: R_WASM_TABLE_NUMBER_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x0000005A
+# BIN-NEXT: Offset: 0x5A
# BIN-NEXT: Functions:
# BIN-NEXT: - Index: 0
# BIN-NEXT: Locals: []
diff --git a/llvm/test/MC/WebAssembly/tls.s b/llvm/test/MC/WebAssembly/tls.s
index 025c94c5894e..f1dba8299446 100644
--- a/llvm/test/MC/WebAssembly/tls.s
+++ b/llvm/test/MC/WebAssembly/tls.s
@@ -19,10 +19,10 @@ tls_store:
# CHECK-OBJ-NEXT: Relocations:
# CHECK-OBJ-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB
# CHECK-OBJ-NEXT: Index: 1
-# CHECK-OBJ-NEXT: Offset: 0x00000004
+# CHECK-OBJ-NEXT: Offset: 0x4
# CHECK-OBJ-NEXT: - Type: R_WASM_MEMORY_ADDR_TLS_SLEB
# CHECK-OBJ-NEXT: Index: 2
-# CHECK-OBJ-NEXT: Offset: 0x0000000A
+# CHECK-OBJ-NEXT: Offset: 0xA
# CHECK-OBJ: - Type: CUSTOM
# CHECK-OBJ-NEXT: Name: linking
diff --git a/llvm/test/MC/WebAssembly/type-index.s b/llvm/test/MC/WebAssembly/type-index.s
index 04e124bc180a..298e5e2f9de3 100644
--- a/llvm/test/MC/WebAssembly/type-index.s
+++ b/llvm/test/MC/WebAssembly/type-index.s
@@ -17,7 +17,7 @@ test0:
# BIN: --- !WASM
# BIN-NEXT: FileHeader:
-# BIN-NEXT: Version: 0x00000001
+# BIN-NEXT: Version: 0x1
# BIN-NEXT: Sections:
# BIN-NEXT: - Type: TYPE
# BIN-NEXT: Signatures:
@@ -37,7 +37,7 @@ test0:
# BIN-NEXT: Field: __linear_memory
# BIN-NEXT: Kind: MEMORY
# BIN-NEXT: Memory:
-# BIN-NEXT: Initial: 0x00000000
+# BIN-NEXT: Initial: 0x0
# BIN-NEXT: - Module: env
# BIN-NEXT: Field: __indirect_function_table
# BIN-NEXT: Kind: TABLE
@@ -45,14 +45,14 @@ test0:
# BIN-NEXT: Index: 0
# BIN-NEXT: ElemType: FUNCREF
# BIN-NEXT: Limits:
-# BIN-NEXT: Initial: 0x00000000
+# BIN-NEXT: Initial: 0x0
# BIN-NEXT: - Type: FUNCTION
# BIN-NEXT: FunctionTypes: [ 0 ]
# BIN-NEXT: - Type: CODE
# BIN-NEXT: Relocations:
# BIN-NEXT: - Type: R_WASM_TYPE_INDEX_LEB
# BIN-NEXT: Index: 1
-# BIN-NEXT: Offset: 0x00000004
+# BIN-NEXT: Offset: 0x4
# BIN-NEXT: Functions:
# BIN-NEXT: - Index: 0
# BIN-NEXT: Locals: []
diff --git a/llvm/test/MC/WebAssembly/unnamed-data.ll b/llvm/test/MC/WebAssembly/unnamed-data.ll
index 836e3e7b5c15..ca41de387cca 100644
--- a/llvm/test/MC/WebAssembly/unnamed-data.ll
+++ b/llvm/test/MC/WebAssembly/unnamed-data.ll
@@ -13,10 +13,10 @@ target triple = "wasm32-unknown-unknown"
; CHECK-NEXT: Relocations:
; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
; CHECK-NEXT: Index: 0
-; CHECK-NEXT: Offset: 0x0000001C
+; CHECK-NEXT: Offset: 0x1C
; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
; CHECK-NEXT: Index: 1
-; CHECK-NEXT: Offset: 0x00000025
+; CHECK-NEXT: Offset: 0x25
; CHECK-NEXT: Segments:
; CHECK-NEXT: - SectionOffset: 6
; CHECK-NEXT: InitFlags: 0
diff --git a/llvm/test/MC/WebAssembly/wasm64.s b/llvm/test/MC/WebAssembly/wasm64.s
index 487ca2b76e89..eda11a472825 100644
--- a/llvm/test/MC/WebAssembly/wasm64.s
+++ b/llvm/test/MC/WebAssembly/wasm64.s
@@ -133,7 +133,7 @@ test:
# BIN: --- !WASM
# BIN-NEXT: FileHeader:
-# BIN-NEXT: Version: 0x00000001
+# BIN-NEXT: Version: 0x1
# BIN-NEXT: Sections:
# BIN-NEXT: - Type: TYPE
# BIN-NEXT: Signatures:
@@ -148,7 +148,7 @@ test:
# BIN-NEXT: Kind: MEMORY
# BIN-NEXT: Memory:
# BIN-NEXT: Flags: [ IS_64 ]
-# BIN-NEXT: Initial: 0x00000001
+# BIN-NEXT: Initial: 0x1
# BIN-NEXT: - Module: env
# BIN-NEXT: Field: __indirect_function_table
# BIN-NEXT: Kind: TABLE
@@ -156,7 +156,7 @@ test:
# BIN-NEXT: Index: 0
# BIN-NEXT: ElemType: FUNCREF
# BIN-NEXT: Limits:
-# BIN-NEXT: Initial: 0x00000000
+# BIN-NEXT: Initial: 0x0
# BIN-NEXT: - Module: env
# BIN-NEXT: Field: myglob64
# BIN-NEXT: Kind: GLOBAL
@@ -175,25 +175,25 @@ test:
# BIN-NEXT: Relocations:
# BIN-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB64
# BIN-NEXT: Index: 1
-# BIN-NEXT: Offset: 0x00000013
+# BIN-NEXT: Offset: 0x13
# BIN-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x00000022
+# BIN-NEXT: Offset: 0x22
# BIN-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB64
# BIN-NEXT: Index: 1
-# BIN-NEXT: Offset: 0x0000002F
+# BIN-NEXT: Offset: 0x2F
# BIN-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB64
# BIN-NEXT: Index: 1
-# BIN-NEXT: Offset: 0x00000054
+# BIN-NEXT: Offset: 0x54
# BIN-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB
# BIN-NEXT: Index: 2
-# BIN-NEXT: Offset: 0x00000067
+# BIN-NEXT: Offset: 0x67
# BIN-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB64
# BIN-NEXT: Index: 1
-# BIN-NEXT: Offset: 0x00000078
+# BIN-NEXT: Offset: 0x78
# BIN-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB
# BIN-NEXT: Index: 3
-# BIN-NEXT: Offset: 0x00000083
+# BIN-NEXT: Offset: 0x83
# BIN-NEXT: Functions:
# BIN-NEXT: - Index: 0
# BIN-NEXT: Locals:
@@ -204,7 +204,7 @@ test:
# BIN-NEXT: Relocations:
# BIN-NEXT: - Type: R_WASM_MEMORY_ADDR_I64
# BIN-NEXT: Index: 1
-# BIN-NEXT: Offset: 0x00000016
+# BIN-NEXT: Offset: 0x16
# BIN-NEXT: Segments:
# BIN-NEXT: - SectionOffset: 6
# BIN-NEXT: InitFlags: 0
diff --git a/llvm/test/MC/WebAssembly/weak-alias.s b/llvm/test/MC/WebAssembly/weak-alias.s
index e16116201bf0..4590e0020382 100644
--- a/llvm/test/MC/WebAssembly/weak-alias.s
+++ b/llvm/test/MC/WebAssembly/weak-alias.s
@@ -87,7 +87,7 @@ alias_address:
# CHECK-NEXT: Field: __linear_memory
# CHECK-NEXT: Kind: MEMORY
# CHECK-NEXT: Memory:
-# CHECK-NEXT: Initial: 0x00000001
+# CHECK-NEXT: Initial: 0x1
# CHECK-NEXT: - Module: env
# CHECK-NEXT: Field: __indirect_function_table
# CHECK-NEXT: Kind: TABLE
@@ -95,7 +95,7 @@ alias_address:
# CHECK-NEXT: Index: 0
# CHECK-NEXT: ElemType: FUNCREF
# CHECK-NEXT: Limits:
-# CHECK-NEXT: Initial: 0x00000001
+# CHECK-NEXT: Initial: 0x1
# CHECK-NEXT: - Type: FUNCTION
# CHECK-NEXT: FunctionTypes: [ 0, 0, 0, 0, 0 ]
# CHECK-NEXT: - Type: ELEM
@@ -110,22 +110,22 @@ alias_address:
# CHECK-NEXT: Relocations:
# CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
# CHECK-NEXT: Index: 0
-# CHECK-NEXT: Offset: 0x00000009
+# CHECK-NEXT: Offset: 0x9
# CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB
# CHECK-NEXT: Index: 3
-# CHECK-NEXT: Offset: 0x00000012
+# CHECK-NEXT: Offset: 0x12
# CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB
# CHECK-NEXT: Index: 5
-# CHECK-NEXT: Offset: 0x0000001E
+# CHECK-NEXT: Offset: 0x1E
# CHECK-NEXT: - Type: R_WASM_TYPE_INDEX_LEB
# CHECK-NEXT: Index: 0
-# CHECK-NEXT: Offset: 0x00000024
+# CHECK-NEXT: Offset: 0x24
# CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB
# CHECK-NEXT: Index: 7
-# CHECK-NEXT: Offset: 0x00000031
+# CHECK-NEXT: Offset: 0x31
# CHECK-NEXT: - Type: R_WASM_TYPE_INDEX_LEB
# CHECK-NEXT: Index: 0
-# CHECK-NEXT: Offset: 0x00000037
+# CHECK-NEXT: Offset: 0x37
# CHECK-NEXT: Functions:
# CHECK-NEXT: - Index: 0
# CHECK-NEXT: Locals:
@@ -146,10 +146,10 @@ alias_address:
# CHECK-NEXT: Relocations:
# CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_I32
# CHECK-NEXT: Index: 0
-# CHECK-NEXT: Offset: 0x00000013
+# CHECK-NEXT: Offset: 0x13
# CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_I32
# CHECK-NEXT: Index: 3
-# CHECK-NEXT: Offset: 0x00000020
+# CHECK-NEXT: Offset: 0x20
# CHECK-NEXT: Segments:
# CHECK-NEXT: - SectionOffset: 6
# CHECK-NEXT: InitFlags: 0
diff --git a/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml b/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
index 17b638da0eb8..c40a900d1843 100644
--- a/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
+++ b/llvm/test/Object/AArch64/yaml2obj-elf-aarch64-rel.yaml
@@ -4,12 +4,12 @@
# CHECK: - Name: .rela.text
# CHECK-NEXT: Type: SHT_RELA
# CHECK-NEXT: Link: .symtab
-# CHECK-NEXT: AddressAlign: 0x0000000000000008
+# CHECK-NEXT: AddressAlign: 0x8
# CHECK-NEXT: Info: .text
-# CHECK-NEXT: Relocations:
+# CHECK-NEXT: Relocations:
# CHECK-NEXT: - Symbol: main
# CHECK-NEXT: Type: R_AARCH64_ABS64
-# CHECK-NEXT: - Offset: 0x0000000000000008
+# CHECK-NEXT: - Offset: 0x8
# CHECK-NEXT: Symbol: main
# CHECK-NEXT: Type: R_AARCH64_TLSGD_ADR_PREL21
diff --git a/llvm/test/Object/Mips/elf-mips64-rel.yaml b/llvm/test/Object/Mips/elf-mips64-rel.yaml
index 3ffdadafad5d..06201cc91420 100644
--- a/llvm/test/Object/Mips/elf-mips64-rel.yaml
+++ b/llvm/test/Object/Mips/elf-mips64-rel.yaml
@@ -14,28 +14,28 @@
# OBJ-NEXT: ]
# YAML: Relocations:
-# YAML-NEXT: - Offset: 0x0000000000000014
+# YAML-NEXT: - Offset: 0x14
# YAML-NEXT: Symbol: main
# YAML-NEXT: Type: R_MIPS_GPREL16
# YAML-NEXT: Type2: R_MIPS_SUB
# YAML-NEXT: Type3: R_MIPS_HI16
# YAML-NEXT: Addend: 4
-# YAML-NEXT: - Offset: 0x000000000000001C
+# YAML-NEXT: - Offset: 0x1C
# YAML-NEXT: Symbol: main
# YAML-NEXT: Type: R_MIPS_GPREL16
# YAML-NEXT: Type2: R_MIPS_SUB
# YAML-NEXT: Type3: R_MIPS_LO16
# YAML-NEXT: Addend: 8
-# YAML-NEXT: - Offset: 0x0000000000000020
+# YAML-NEXT: - Offset: 0x20
# YAML-NEXT: Symbol: .rodata
# YAML-NEXT: Type: R_MIPS_GOT_PAGE
-# YAML-NEXT: - Offset: 0x0000000000000024
+# YAML-NEXT: - Offset: 0x24
# YAML-NEXT: Symbol: .rodata
# YAML-NEXT: Type: R_MIPS_GOT_OFST
-# YAML-NEXT: - Offset: 0x0000000000000028
+# YAML-NEXT: - Offset: 0x28
# YAML-NEXT: Symbol: printf
# YAML-NEXT: Type: R_MIPS_CALL16
-# YAML-NEXT: - Offset: 0x0000000000000030
+# YAML-NEXT: - Offset: 0x30
# YAML-NEXT: Symbol: printf
# YAML-NEXT: Type: R_MIPS_GPREL16
# YAML-NEXT: Type2: R_MIPS_LO16
diff --git a/llvm/test/Object/obj2yaml.test b/llvm/test/Object/obj2yaml.test
index 5def9631277d..ea6194dee9a6 100644
--- a/llvm/test/Object/obj2yaml.test
+++ b/llvm/test/Object/obj2yaml.test
@@ -356,60 +356,60 @@
# ELF-MIPSEL-NEXT: - Name: .text
# ELF-MIPSEL-NEXT: Type: SHT_PROGBITS
# ELF-MIPSEL-NEXT: Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000004
+# ELF-MIPSEL-NEXT: AddressAlign: 0x4
# ELF-MIPSEL-NEXT: Content: 0000023C00004224E8FFBD271400BFAF1000B0AF218059000000018E000024240000198E09F8200321E000020000198E09F8200321E00002000002241000B08F1400BF8F0800E0031800BD27
# ELF-MIPSEL-NEXT: - Name: .rel.text
# ELF-MIPSEL-NEXT: Type: SHT_REL
# ELF-MIPSEL-NEXT: Link: .symtab
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000004
+# ELF-MIPSEL-NEXT: AddressAlign: 0x4
# ELF-MIPSEL-NEXT: Info: .text
# ELF-MIPSEL-NEXT: Relocations:
# ELF-MIPSEL-NEXT: - Symbol: _gp_disp
# ELF-MIPSEL-NEXT: Type: R_MIPS_HI16
-# ELF-MIPSEL-NEXT: - Offset: 0x0000000000000004
+# ELF-MIPSEL-NEXT: - Offset: 0x4
# ELF-MIPSEL-NEXT: Symbol: _gp_disp
# ELF-MIPSEL-NEXT: Type: R_MIPS_LO16
-# ELF-MIPSEL-NEXT: - Offset: 0x0000000000000018
+# ELF-MIPSEL-NEXT: - Offset: 0x18
# ELF-MIPSEL-NEXT: Symbol: '$.str'
# ELF-MIPSEL-NEXT: Type: R_MIPS_GOT16
-# ELF-MIPSEL-NEXT: - Offset: 0x000000000000001C
+# ELF-MIPSEL-NEXT: - Offset: 0x1C
# ELF-MIPSEL-NEXT: Symbol: '$.str'
# ELF-MIPSEL-NEXT: Type: R_MIPS_LO16
-# ELF-MIPSEL-NEXT: - Offset: 0x0000000000000020
+# ELF-MIPSEL-NEXT: - Offset: 0x20
# ELF-MIPSEL-NEXT: Symbol: puts
# ELF-MIPSEL-NEXT: Type: R_MIPS_CALL16
-# ELF-MIPSEL-NEXT: - Offset: 0x000000000000002C
+# ELF-MIPSEL-NEXT: - Offset: 0x2C
# ELF-MIPSEL-NEXT: Symbol: SomeOtherFunction
# ELF-MIPSEL-NEXT: Type: R_MIPS_CALL16
# ELF-MIPSEL-NEXT: - Name: .data
# ELF-MIPSEL-NEXT: Type: SHT_PROGBITS
# ELF-MIPSEL-NEXT: Flags: [ SHF_WRITE, SHF_ALLOC ]
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000004
+# ELF-MIPSEL-NEXT: AddressAlign: 0x4
# ELF-MIPSEL-NEXT: - Name: .bss
# ELF-MIPSEL-NEXT: Type: SHT_NOBITS
# ELF-MIPSEL-NEXT: Flags: [ SHF_WRITE, SHF_ALLOC ]
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000004
-# ELF-MIPSEL-NEXT: Size: 0x0000000000000004
+# ELF-MIPSEL-NEXT: AddressAlign: 0x4
+# ELF-MIPSEL-NEXT: Size: 0x4
# ELF-MIPSEL-NEXT: - Name: .mdebug.abi32
# ELF-MIPSEL-NEXT: Type: SHT_PROGBITS
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000001
+# ELF-MIPSEL-NEXT: AddressAlign: 0x1
# ELF-MIPSEL-NEXT: - Name: .rodata.str1.1
# ELF-MIPSEL-NEXT: Type: SHT_PROGBITS
# ELF-MIPSEL-NEXT: Flags: [ SHF_ALLOC, SHF_MERGE, SHF_STRINGS ]
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000001
-# ELF-MIPSEL-NEXT: EntSize: 0x0000000000000001
+# ELF-MIPSEL-NEXT: AddressAlign: 0x1
+# ELF-MIPSEL-NEXT: EntSize: 0x1
# ELF-MIPSEL-NEXT: Content: 48656C6C6F20576F726C640A00
# ELF-MIPSEL-NEXT: - Name: .reginfo
# ELF-MIPSEL-NEXT: Type: SHT_MIPS_REGINFO
# ELF-MIPSEL-NEXT: Flags: [ SHF_ALLOC ]
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000001
+# ELF-MIPSEL-NEXT: AddressAlign: 0x1
# ELF-MIPSEL-NEXT: Content: '000000000000000000000000000000000000000000000000'
# ELF-MIPSEL-NEXT: - Name: .MIPS.abiflags
# ELF-MIPSEL-NEXT: Type: SHT_MIPS_ABIFLAGS
# ELF-MIPSEL-NEXT: Flags: [ SHF_ALLOC ]
-# ELF-MIPSEL-NEXT: AddressAlign: 0x0000000000000008
+# ELF-MIPSEL-NEXT: AddressAlign: 0x8
# ELF-MIPSEL-NEXT: ISA: MIPS32
-# ELF-MIPSEL-NEXT: ISARevision: 0x01
+# ELF-MIPSEL-NEXT: ISARevision: 0x1
# ELF-MIPSEL-NEXT: FpABI: FP_DOUBLE
# ELF-MIPSEL-NEXT: GPRSize: REG_32
# ELF-MIPSEL-NEXT: CPR1Size: REG_32
@@ -421,7 +421,7 @@
# ELF-MIPSEL-NEXT: - Name: '$.str'
# ELF-MIPSEL-NEXT: Type: STT_OBJECT
# ELF-MIPSEL-NEXT: Section: .rodata.str1.1
-# ELF-MIPSEL-NEXT: Size: 0x000000000000000D
+# ELF-MIPSEL-NEXT: Size: 0xD
# ELF-MIPSEL-NEXT: - Name: .text
# ELF-MIPSEL-NEXT: Type: STT_SECTION
# ELF-MIPSEL-NEXT: Section: .text
@@ -447,12 +447,12 @@
# ELF-MIPSEL-NEXT: Type: STT_FUNC
# ELF-MIPSEL-NEXT: Section: .text
# ELF-MIPSEL-NEXT: Binding: STB_GLOBAL
-# ELF-MIPSEL-NEXT: Size: 0x000000000000004C
+# ELF-MIPSEL-NEXT: Size: 0x4C
# ELF-MIPSEL-NEXT: - Name: var
# ELF-MIPSEL-NEXT: Type: STT_OBJECT
# ELF-MIPSEL-NEXT: Section: .bss
# ELF-MIPSEL-NEXT: Binding: STB_GLOBAL
-# ELF-MIPSEL-NEXT: Size: 0x0000000000000004
+# ELF-MIPSEL-NEXT: Size: 0x4
# ELF-MIPSEL-NEXT: - Name: SomeOtherFunction
# ELF-MIPSEL-NEXT: Binding: STB_GLOBAL
# ELF-MIPSEL-NEXT: - Name: _gp_disp
@@ -472,16 +472,16 @@
# ELF-MIPS64EL-NEXT: - Name: .text
# ELF-MIPS64EL-NEXT: Type: SHT_PROGBITS
# ELF-MIPS64EL-NEXT: Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-# ELF-MIPS64EL-NEXT: AddressAlign: 0x0000000000000010
+# ELF-MIPS64EL-NEXT: AddressAlign: 0x10
# ELF-MIPS64EL-NEXT: - Name: .data
# ELF-MIPS64EL-NEXT: Type: SHT_PROGBITS
# ELF-MIPS64EL-NEXT: Flags: [ SHF_WRITE, SHF_ALLOC ]
-# ELF-MIPS64EL-NEXT: AddressAlign: 0x0000000000000010
+# ELF-MIPS64EL-NEXT: AddressAlign: 0x10
# ELF-MIPS64EL-NEXT: Content: '00000000000000000000000000000000'
# ELF-MIPS64EL-NEXT: - Name: .rela.data
# ELF-MIPS64EL-NEXT: Type: SHT_RELA
# ELF-MIPS64EL-NEXT: Link: .symtab
-# ELF-MIPS64EL-NEXT: AddressAlign: 0x0000000000000008
+# ELF-MIPS64EL-NEXT: AddressAlign: 0x8
# ELF-MIPS64EL-NEXT: Info: .data
# ELF-MIPS64EL-NEXT: Relocations:
# ELF-MIPS64EL-NEXT: - Symbol: zed
@@ -489,16 +489,16 @@
# ELF-MIPS64EL-NEXT: - Name: .bss
# ELF-MIPS64EL-NEXT: Type: SHT_NOBITS
# ELF-MIPS64EL-NEXT: Flags: [ SHF_WRITE, SHF_ALLOC ]
-# ELF-MIPS64EL-NEXT: AddressAlign: 0x0000000000000010
+# ELF-MIPS64EL-NEXT: AddressAlign: 0x10
# ELF-MIPS64EL-NEXT: - Name: .MIPS.options
# ELF-MIPS64EL-NEXT: Type: SHT_MIPS_OPTIONS
# ELF-MIPS64EL-NEXT: Flags: [ SHF_ALLOC, SHF_MIPS_NOSTRIP ]
-# ELF-MIPS64EL-NEXT: AddressAlign: 0x0000000000000008
-# ELF-MIPS64EL-NEXT: EntSize: 0x0000000000000001
+# ELF-MIPS64EL-NEXT: AddressAlign: 0x8
+# ELF-MIPS64EL-NEXT: EntSize: 0x1
# ELF-MIPS64EL-NEXT: Content: '01280000000000000000000000000000000000000000000000000000000000000000000000000000'
# ELF-MIPS64EL-NEXT: - Name: .pdr
# ELF-MIPS64EL-NEXT: Type: SHT_PROGBITS
-# ELF-MIPS64EL-NEXT: AddressAlign: 0x0000000000000004
+# ELF-MIPS64EL-NEXT: AddressAlign: 0x4
# ELF-MIPS64EL-NEXT: Symbols:
# ELF-MIPS64EL-NEXT: - Name: .text
# ELF-MIPS64EL-NEXT: Type: STT_SECTION
@@ -533,33 +533,33 @@
# ELF-X86-64-NEXT: - Name: .text
# ELF-X86-64-NEXT: Type: SHT_PROGBITS
# ELF-X86-64-NEXT: Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-# ELF-X86-64-NEXT: AddressAlign: 0x0000000000000010
+# ELF-X86-64-NEXT: AddressAlign: 0x10
# ELF-X86-64-NEXT: Content: 4883EC08C744240400000000BF00000000E80000000030C0E8000000008B4424044883C408C3
# ELF-X86-64-NEXT: - Name: .rodata.str1.1
# ELF-X86-64-NEXT: Type: SHT_PROGBITS
# ELF-X86-64-NEXT: Flags: [ SHF_ALLOC, SHF_MERGE, SHF_STRINGS ]
-# ELF-X86-64-NEXT: Address: 0x0000000000000026
-# ELF-X86-64-NEXT: AddressAlign: 0x0000000000000001
+# ELF-X86-64-NEXT: Address: 0x26
+# ELF-X86-64-NEXT: AddressAlign: 0x1
# ELF-X86-64-NEXT: Content: 48656C6C6F20576F726C642100
# ELF-X86-64-NEXT: - Name: .note.GNU-stack
# ELF-X86-64-NEXT: Type: SHT_PROGBITS
-# ELF-X86-64-NEXT: Address: 0x0000000000000033
-# ELF-X86-64-NEXT: AddressAlign: 0x0000000000000001
+# ELF-X86-64-NEXT: Address: 0x33
+# ELF-X86-64-NEXT: AddressAlign: 0x1
# ELF-X86-64-NEXT: - Name: .rela.text
# ELF-X86-64-NEXT: Type: SHT_RELA
-# ELF-X86-64-NEXT: Address: 0x0000000000000038
+# ELF-X86-64-NEXT: Address: 0x38
# ELF-X86-64-NEXT: Link: .symtab
-# ELF-X86-64-NEXT: AddressAlign: 0x0000000000000008
+# ELF-X86-64-NEXT: AddressAlign: 0x8
# ELF-X86-64-NEXT: Info: .text
# ELF-X86-64-NEXT: Relocations:
-# ELF-X86-64-NEXT: - Offset: 0x000000000000000D
+# ELF-X86-64-NEXT: - Offset: 0xD
# ELF-X86-64-NEXT: Symbol: .rodata.str1.1
# ELF-X86-64-NEXT: Type: R_X86_64_32S
-# ELF-X86-64-NEXT: - Offset: 0x0000000000000012
+# ELF-X86-64-NEXT: - Offset: 0x12
# ELF-X86-64-NEXT: Symbol: puts
# ELF-X86-64-NEXT: Type: R_X86_64_PC32
# ELF-X86-64-NEXT: Addend: -4
-# ELF-X86-64-NEXT: - Offset: 0x0000000000000019
+# ELF-X86-64-NEXT: - Offset: 0x19
# ELF-X86-64-NEXT: Symbol: SomeOtherFunction
# ELF-X86-64-NEXT: Type: R_X86_64_PC32
# ELF-X86-64-NEXT: Addend: -4
@@ -580,7 +580,7 @@
# ELF-X86-64-NEXT: Type: STT_FUNC
# ELF-X86-64-NEXT: Section: .text
# ELF-X86-64-NEXT: Binding: STB_GLOBAL
-# ELF-X86-64-NEXT: Size: 0x0000000000000026
+# ELF-X86-64-NEXT: Size: 0x26
# ELF-X86-64-NEXT: - Name: SomeOtherFunction
# ELF-X86-64-NEXT: Binding: STB_GLOBAL
# ELF-X86-64-NEXT: - Name: puts
@@ -597,34 +597,34 @@ Sections:
- Name: .text
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
- AddressAlign: 0x0000000000000010
+ AddressAlign: 0x10
Content: 4883EC08C744240400000000BF00000000E80000000030C0E8000000008B4424044883C408C3
- Name: .rodata.str1.1
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_MERGE, SHF_STRINGS ]
- Address: 0x0000000000000026
- AddressAlign: 0x0000000000000001
+ Address: 0x26
+ AddressAlign: 0x1
Content: 48656C6C6F20576F726C642100
- Name: .note.GNU-stack
Type: SHT_PROGBITS
- Address: 0x0000000000000033
- AddressAlign: 0x0000000000000001
+ Address: 0x33
+ AddressAlign: 0x1
- Name: .rela.text
Type: SHT_RELA
- Address: 0x0000000000000038
+ Address: 0x38
Link: .symtab
- AddressAlign: 0x0000000000000008
- EntSize: 0x0000000000000018
+ AddressAlign: 0x8
+ EntSize: 0x18
Info: .text
Relocations:
- - Offset: 0x000000000000000D
+ - Offset: 0xD
Symbol: .rodata.str1.1
Type: R_X86_64_32S
- - Offset: 0x0000000000000012
+ - Offset: 0x12
Symbol: puts
Type: R_X86_64_PC32
Addend: -4
- - Offset: 0x0000000000000019
+ - Offset: 0x19
Symbol: SomeOtherFunction
Type: R_X86_64_PC32
Addend: -4
@@ -645,7 +645,7 @@ Symbols:
Type: STT_FUNC
Section: .text
Binding: STB_GLOBAL
- Size: 0x0000000000000026
+ Size: 0x26
- Name: SomeOtherFunction
Binding: STB_GLOBAL
- Name: puts
@@ -664,24 +664,24 @@ Symbols:
# ELF-AVR-NEXT: Flags: [ PF_X, PF_R ]
# ELF-AVR-NEXT: FirstSec: .text
# ELF-AVR-NEXT: LastSec: .text
-# ELF-AVR-NEXT: Align: 0x0000000000000002
+# ELF-AVR-NEXT: Align: 0x2
# ELF-AVR-NEXT: - Type: PT_LOAD
# ELF-AVR-NEXT: Flags: [ PF_W, PF_R ]
# ELF-AVR-NEXT: FirstSec: .data
# ELF-AVR-NEXT: LastSec: .data
-# ELF-AVR-NEXT: VAddr: 0x0000000000800060
-# ELF-AVR-NEXT: PAddr: 0x0000000000000004
+# ELF-AVR-NEXT: VAddr: 0x800060
+# ELF-AVR-NEXT: PAddr: 0x4
# ELF-AVR-NEXT: Sections:
# ELF-AVR-NEXT: - Name: .text
# ELF-AVR-NEXT: Type: SHT_PROGBITS
# ELF-AVR-NEXT: Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
-# ELF-AVR-NEXT: AddressAlign: 0x0000000000000002
+# ELF-AVR-NEXT: AddressAlign: 0x2
# ELF-AVR-NEXT: Content: C20E0895
# ELF-AVR-NEXT: - Name: .data
# ELF-AVR-NEXT: Type: SHT_PROGBITS
# ELF-AVR-NEXT: Flags: [ SHF_WRITE, SHF_ALLOC ]
-# ELF-AVR-NEXT: Address: 0x0000000000800060
-# ELF-AVR-NEXT: AddressAlign: 0x0000000000000001
+# ELF-AVR-NEXT: Address: 0x800060
+# ELF-AVR-NEXT: AddressAlign: 0x1
# ELF-AVR-NEXT: Symbols:
# ELF-AVR-NEXT: - Name: .text
# ELF-AVR-NEXT: Type: STT_SECTION
@@ -689,7 +689,7 @@ Symbols:
# ELF-AVR-NEXT: - Name: .data
# ELF-AVR-NEXT: Type: STT_SECTION
# ELF-AVR-NEXT: Section: .data
-# ELF-AVR-NEXT: Value: 0x0000000000800060
+# ELF-AVR-NEXT: Value: 0x800060
# ELF-AVR-NEXT: - Name: a.o
# ELF-AVR-NEXT: Type: STT_FILE
# ELF-AVR-NEXT: Index: SHN_ABS
@@ -701,25 +701,25 @@ Symbols:
# ELF-AVR-NEXT: - Name: _etext
# ELF-AVR-NEXT: Section: .text
# ELF-AVR-NEXT: Binding: STB_GLOBAL
-# ELF-AVR-NEXT: Value: 0x0000000000000004
+# ELF-AVR-NEXT: Value: 0x4
# ELF-AVR-NEXT: - Name: __data_load_end
# ELF-AVR-NEXT: Index: SHN_ABS
# ELF-AVR-NEXT: Binding: STB_GLOBAL
-# ELF-AVR-NEXT: Value: 0x0000000000000004
+# ELF-AVR-NEXT: Value: 0x4
# ELF-AVR-NEXT: - Name: __trampolines_end
# ELF-AVR-NEXT: Section: .text
# ELF-AVR-NEXT: Binding: STB_GLOBAL
# ELF-AVR-NEXT: - Name: __data_load_start
# ELF-AVR-NEXT: Index: SHN_ABS
# ELF-AVR-NEXT: Binding: STB_GLOBAL
-# ELF-AVR-NEXT: Value: 0x0000000000000004
+# ELF-AVR-NEXT: Value: 0x4
# ELF-AVR-NEXT: - Name: __dtors_end
# ELF-AVR-NEXT: Section: .text
# ELF-AVR-NEXT: Binding: STB_GLOBAL
# ELF-AVR-NEXT: - Name: __eeprom_end
# ELF-AVR-NEXT: Section: .data
# ELF-AVR-NEXT: Binding: STB_GLOBAL
-# ELF-AVR-NEXT: Value: 0x0000000000810000
+# ELF-AVR-NEXT: Value: 0x810000
# ELF-AVR-NEXT: - Name: __ctors_start
# ELF-AVR-NEXT: Section: .text
# ELF-AVR-NEXT: Binding: STB_GLOBAL
@@ -732,17 +732,17 @@ Symbols:
# ELF-AVR-NEXT: - Name: _edata
# ELF-AVR-NEXT: Section: .data
# ELF-AVR-NEXT: Binding: STB_GLOBAL
-# ELF-AVR-NEXT: Value: 0x0000000000800060
+# ELF-AVR-NEXT: Value: 0x800060
# ELF-AVR-NEXT: - Name: _end
# ELF-AVR-NEXT: Section: .data
# ELF-AVR-NEXT: Binding: STB_GLOBAL
-# ELF-AVR-NEXT: Value: 0x0000000000800060
+# ELF-AVR-NEXT: Value: 0x800060
# RUN: obj2yaml %p/Inputs/trivial-object-test.wasm | FileCheck %s --check-prefix WASM
# WASM: --- !WASM
# WASM-NEXT: FileHeader:
-# WASM-NEXT: Version: 0x00000001
+# WASM-NEXT: Version: 0x1
# WASM: - Type: CUSTOM
# WASM-NEXT: Name: linking
# WASM-NEXT: Version: 2
diff --git a/llvm/test/ObjectYAML/MachO/BigEndian.yaml b/llvm/test/ObjectYAML/MachO/BigEndian.yaml
index 584cd47598be..56efc82f5729 100644
--- a/llvm/test/ObjectYAML/MachO/BigEndian.yaml
+++ b/llvm/test/ObjectYAML/MachO/BigEndian.yaml
@@ -91,9 +91,9 @@ LinkEditData:
#CHECK: FileHeader:
#CHECK: magic: 0xFEEDFACE
-#CHECK: cputype: 0x00000012
-#CHECK: cpusubtype: 0x00000000
-#CHECK: filetype: 0x00000001
+#CHECK: cputype: 0x12
+#CHECK: cpusubtype: 0x0
+#CHECK: filetype: 0x1
#CHECK: ncmds: 3
#CHECK: sizeofcmds: 368
-#CHECK: flags: 0x00002000
+#CHECK: flags: 0x2000
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-BigEndian.yaml b/llvm/test/ObjectYAML/MachO/DWARF-BigEndian.yaml
index e80c694224a5..886597a0129b 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-BigEndian.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-BigEndian.yaml
@@ -387,7 +387,7 @@ DWARF:
#CHECK: - N
#CHECK: - t
#CHECK: debug_abbrev:
-#CHECK: - Code: 0x0000000000000001
+#CHECK: - Code: 0x1
#CHECK: Tag: DW_TAG_compile_unit
#CHECK: Children: DW_CHILDREN_yes
#CHECK: Attributes:
@@ -405,7 +405,7 @@ DWARF:
#CHECK: Form: DW_FORM_addr
#CHECK: - Attribute: DW_AT_high_pc
#CHECK: Form: DW_FORM_data4
-#CHECK: - Code: 0x0000000000000002
+#CHECK: - Code: 0x2
#CHECK: Tag: DW_TAG_base_type
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -415,7 +415,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_byte_size
#CHECK: Form: DW_FORM_data1
-#CHECK: - Code: 0x0000000000000003
+#CHECK: - Code: 0x3
#CHECK: Tag: DW_TAG_typedef
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -427,7 +427,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_decl_line
#CHECK: Form: DW_FORM_data1
-#CHECK: - Code: 0x0000000000000004
+#CHECK: - Code: 0x4
#CHECK: Tag: DW_TAG_subprogram
#CHECK: Children: DW_CHILDREN_yes
#CHECK: Attributes:
@@ -449,7 +449,7 @@ DWARF:
#CHECK: Form: DW_FORM_ref4
#CHECK: - Attribute: DW_AT_external
#CHECK: Form: DW_FORM_flag_present
-#CHECK: - Code: 0x0000000000000005
+#CHECK: - Code: 0x5
#CHECK: Tag: DW_TAG_formal_parameter
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -463,7 +463,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_type
#CHECK: Form: DW_FORM_ref4
-#CHECK: - Code: 0x0000000000000006
+#CHECK: - Code: 0x6
#CHECK: Tag: DW_TAG_variable
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -477,7 +477,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_type
#CHECK: Form: DW_FORM_ref4
-#CHECK: - Code: 0x0000000000000007
+#CHECK: - Code: 0x7
#CHECK: Tag: DW_TAG_const_type
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-LittleEndian.yaml b/llvm/test/ObjectYAML/MachO/DWARF-LittleEndian.yaml
index d85c23d9b7a3..12bf9e70c982 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-LittleEndian.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-LittleEndian.yaml
@@ -376,7 +376,7 @@ DWARF:
#CHECK: - N
#CHECK: - t
#CHECK: debug_abbrev:
-#CHECK: - Code: 0x0000000000000001
+#CHECK: - Code: 0x1
#CHECK: Tag: DW_TAG_compile_unit
#CHECK: Children: DW_CHILDREN_yes
#CHECK: Attributes:
@@ -394,7 +394,7 @@ DWARF:
#CHECK: Form: DW_FORM_addr
#CHECK: - Attribute: DW_AT_high_pc
#CHECK: Form: DW_FORM_data4
-#CHECK: - Code: 0x0000000000000002
+#CHECK: - Code: 0x2
#CHECK: Tag: DW_TAG_base_type
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -404,7 +404,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_byte_size
#CHECK: Form: DW_FORM_data1
-#CHECK: - Code: 0x0000000000000003
+#CHECK: - Code: 0x3
#CHECK: Tag: DW_TAG_typedef
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -416,7 +416,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_decl_line
#CHECK: Form: DW_FORM_data1
-#CHECK: - Code: 0x0000000000000004
+#CHECK: - Code: 0x4
#CHECK: Tag: DW_TAG_subprogram
#CHECK: Children: DW_CHILDREN_yes
#CHECK: Attributes:
@@ -438,7 +438,7 @@ DWARF:
#CHECK: Form: DW_FORM_ref4
#CHECK: - Attribute: DW_AT_external
#CHECK: Form: DW_FORM_flag_present
-#CHECK: - Code: 0x0000000000000005
+#CHECK: - Code: 0x5
#CHECK: Tag: DW_TAG_formal_parameter
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -452,7 +452,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_type
#CHECK: Form: DW_FORM_ref4
-#CHECK: - Code: 0x0000000000000006
+#CHECK: - Code: 0x6
#CHECK: Tag: DW_TAG_variable
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -466,7 +466,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_type
#CHECK: Form: DW_FORM_ref4
-#CHECK: - Code: 0x0000000000000007
+#CHECK: - Code: 0x7
#CHECK: Tag: DW_TAG_const_type
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-debug_abbrev.yaml b/llvm/test/ObjectYAML/MachO/DWARF-debug_abbrev.yaml
index 91af7bdf143e..bbadd47b5e4d 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-debug_abbrev.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-debug_abbrev.yaml
@@ -353,7 +353,7 @@ DWARF:
#CHECK: DWARF:
#CHECK: debug_abbrev:
-#CHECK: - Code: 0x0000000000000001
+#CHECK: - Code: 0x1
#CHECK: Tag: DW_TAG_compile_unit
#CHECK: Children: DW_CHILDREN_yes
#CHECK: Attributes:
@@ -371,7 +371,7 @@ DWARF:
#CHECK: Form: DW_FORM_addr
#CHECK: - Attribute: DW_AT_high_pc
#CHECK: Form: DW_FORM_data4
-#CHECK: - Code: 0x0000000000000002
+#CHECK: - Code: 0x2
#CHECK: Tag: DW_TAG_subprogram
#CHECK: Children: DW_CHILDREN_yes
#CHECK: Attributes:
@@ -393,7 +393,7 @@ DWARF:
#CHECK: Form: DW_FORM_ref4
#CHECK: - Attribute: DW_AT_external
#CHECK: Form: DW_FORM_flag_present
-#CHECK: - Code: 0x0000000000000003
+#CHECK: - Code: 0x3
#CHECK: Tag: DW_TAG_formal_parameter
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -407,7 +407,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_type
#CHECK: Form: DW_FORM_ref4
-#CHECK: - Code: 0x0000000000000004
+#CHECK: - Code: 0x4
#CHECK: Tag: DW_TAG_base_type
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
@@ -417,7 +417,7 @@ DWARF:
#CHECK: Form: DW_FORM_data1
#CHECK: - Attribute: DW_AT_byte_size
#CHECK: Form: DW_FORM_data1
-#CHECK: - Code: 0x0000000000000005
+#CHECK: - Code: 0x5
#CHECK: Tag: DW_TAG_pointer_type
#CHECK: Children: DW_CHILDREN_no
#CHECK: Attributes:
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-debug_aranges.yaml b/llvm/test/ObjectYAML/MachO/DWARF-debug_aranges.yaml
index 762fcbfa2d22..f362b44c7e31 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-debug_aranges.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-debug_aranges.yaml
@@ -327,13 +327,13 @@ DWARF:
...
# CHECK: debug_aranges:
-# CHECK-NEXT: - Length: 0x000000000000002C
+# CHECK-NEXT: - Length: 0x2C
# CHECK-NEXT: Version: 2
-# CHECK-NEXT: CuOffset: 0x0000000000000000
-# CHECK-NEXT: AddressSize: 0x08
+# CHECK-NEXT: CuOffset: 0x0
+# CHECK-NEXT: AddressSize: 0x8
# CHECK-NEXT: Descriptors:
-# CHECK-NEXT: - Address: 0x0000000100000F50
-# CHECK-NEXT: Length: 0x0000000000000034
+# CHECK-NEXT: - Address: 0x100000F50
+# CHECK-NEXT: Length: 0x34
## b) Test that if the "debug_aranges" entry is empty, yaml2macho will only emit the
## section header.
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml b/llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
index 9dba0601f9d3..f3124e552641 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml
@@ -511,67 +511,67 @@ DWARF:
# DWARF32: DWARF:
# DWARF32: debug_info:
-# DWARF32-NEXT: - Length: 0x0000000000000075
+# DWARF32-NEXT: - Length: 0x75
# DWARF32-NEXT: Version: 4
# DWARF32-NEXT: AbbrevTableID: 0
# DWARF32-NEXT: AbbrOffset: 0
# DWARF32-NEXT: AddrSize: 8
# DWARF32-NEXT: Entries:
-# DWARF32-NEXT: - AbbrCode: 0x00000001
+# DWARF32-NEXT: - AbbrCode: 0x1
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x000000000000000C
-# DWARF32-NEXT: - Value: 0x0000000000000038
-# DWARF32-NEXT: - Value: 0x0000000000000000
-# DWARF32-NEXT: - Value: 0x0000000000000046
-# DWARF32-NEXT: - Value: 0x0000000100000F50
-# DWARF32-NEXT: - Value: 0x0000000000000034
-# DWARF32-NEXT: - AbbrCode: 0x00000002
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0xC
+# DWARF32-NEXT: - Value: 0x38
+# DWARF32-NEXT: - Value: 0x0
+# DWARF32-NEXT: - Value: 0x46
+# DWARF32-NEXT: - Value: 0x100000F50
+# DWARF32-NEXT: - Value: 0x34
+# DWARF32-NEXT: - AbbrCode: 0x2
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000100000F50
-# DWARF32-NEXT: - Value: 0x0000000000000034
-# DWARF32-NEXT: - Value: 0x0000000000000001
+# DWARF32-NEXT: - Value: 0x100000F50
+# DWARF32-NEXT: - Value: 0x34
+# DWARF32-NEXT: - Value: 0x1
# DWARF32-NEXT: BlockData: [ 0x56 ]
-# DWARF32-NEXT: - Value: 0x0000000000000076
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000003
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000060
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - AbbrCode: 0x00000003
+# DWARF32-NEXT: - Value: 0x76
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x3
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x60
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - AbbrCode: 0x3
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000002
+# DWARF32-NEXT: - Value: 0x2
# DWARF32-NEXT: BlockData: [ 0x91, 0x78 ]
-# DWARF32-NEXT: - Value: 0x000000000000007B
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000003
-# DWARF32-NEXT: - Value: 0x0000000000000060
-# DWARF32-NEXT: - AbbrCode: 0x00000003
+# DWARF32-NEXT: - Value: 0x7B
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x3
+# DWARF32-NEXT: - Value: 0x60
+# DWARF32-NEXT: - AbbrCode: 0x3
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000002
+# DWARF32-NEXT: - Value: 0x2
# DWARF32-NEXT: BlockData: [ 0x91, 0x70 ]
-# DWARF32-NEXT: - Value: 0x0000000000000080
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000003
-# DWARF32-NEXT: - Value: 0x0000000000000067
-# DWARF32-NEXT: - AbbrCode: 0x00000000
-# DWARF32-NEXT: - AbbrCode: 0x00000004
+# DWARF32-NEXT: - Value: 0x80
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x3
+# DWARF32-NEXT: - Value: 0x67
+# DWARF32-NEXT: - AbbrCode: 0x0
+# DWARF32-NEXT: - AbbrCode: 0x4
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000085
-# DWARF32-NEXT: - Value: 0x0000000000000005
-# DWARF32-NEXT: - Value: 0x0000000000000004
-# DWARF32-NEXT: - AbbrCode: 0x00000005
+# DWARF32-NEXT: - Value: 0x85
+# DWARF32-NEXT: - Value: 0x5
+# DWARF32-NEXT: - Value: 0x4
+# DWARF32-NEXT: - AbbrCode: 0x5
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x000000000000006C
-# DWARF32-NEXT: - AbbrCode: 0x00000005
+# DWARF32-NEXT: - Value: 0x6C
+# DWARF32-NEXT: - AbbrCode: 0x5
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000071
-# DWARF32-NEXT: - AbbrCode: 0x00000004
+# DWARF32-NEXT: - Value: 0x71
+# DWARF32-NEXT: - AbbrCode: 0x4
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000089
-# DWARF32-NEXT: - Value: 0x0000000000000006
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - AbbrCode: 0x00000000
+# DWARF32-NEXT: - Value: 0x89
+# DWARF32-NEXT: - Value: 0x6
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - AbbrCode: 0x0
## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
@@ -581,15 +581,15 @@ DWARF:
# RUN: obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML
# DWARF32-YAML: debug_info:
-# DWARF32-YAML-NEXT: - Length: 0x000000000000000C
+# DWARF32-YAML-NEXT: - Length: 0xC
# DWARF32-YAML-NEXT: Version: 4
# DWARF32-YAML-NEXT: AbbrevTableID: 0
# DWARF32-YAML-NEXT: AbbrOffset: 0
# DWARF32-YAML-NEXT: AddrSize: 8
# DWARF32-YAML-NEXT: Entries:
-# DWARF32-YAML-NEXT: - AbbrCode: 0x00000001
+# DWARF32-YAML-NEXT: - AbbrCode: 0x1
# DWARF32-YAML-NEXT: Values:
-# DWARF32-YAML-NEXT: - Value: 0x0000000000001234
+# DWARF32-YAML-NEXT: - Value: 0x1234
--- !mach-o
FileHeader:
@@ -665,15 +665,15 @@ DWARF:
# DWARF64-YAML: debug_info:
# DWARF64-YAML-NEXT: - Format: DWARF64
-# DWARF64-YAML-NEXT: Length: 0x000000000000000C
+# DWARF64-YAML-NEXT: Length: 0xC
# DWARF64-YAML-NEXT: Version: 4
# DWARF64-YAML-NEXT: AbbrevTableID: 0
# DWARF64-YAML-NEXT: AbbrOffset: 0
# DWARF64-YAML-NEXT: AddrSize: 8
# DWARF64-YAML-NEXT: Entries:
-# DWARF64-YAML-NEXT: - AbbrCode: 0x00000001
+# DWARF64-YAML-NEXT: - AbbrCode: 0x1
# DWARF64-YAML-NEXT: Values:
-# DWARF64-YAML-NEXT: - Value: 0x0000000000001234
+# DWARF64-YAML-NEXT: - Value: 0x1234
## c) Test that yaml2obj is able to generate compilation units according to the
## associated abbrev table that is referenced by the 'AbbrevTableID' and obj2yaml
@@ -685,7 +685,7 @@ DWARF:
# MULTI-TABLES-NEXT: debug_abbrev:
# MULTI-TABLES-NEXT: - ID: 0
# MULTI-TABLES-NEXT: Table:
-# MULTI-TABLES-NEXT: - Code: 0x0000000000000001
+# MULTI-TABLES-NEXT: - Code: 0x1
# MULTI-TABLES-NEXT: Tag: DW_TAG_compile_unit
# MULTI-TABLES-NEXT: Children: DW_CHILDREN_no
# MULTI-TABLES-NEXT: Attributes:
@@ -693,13 +693,13 @@ DWARF:
# MULTI-TABLES-NEXT: Form: DW_FORM_addr
# MULTI-TABLES-NEXT: - ID: 1
# MULTI-TABLES-NEXT: Table:
-# MULTI-TABLES-NEXT: - Code: 0x0000000000000001
+# MULTI-TABLES-NEXT: - Code: 0x1
# MULTI-TABLES-NEXT: Tag: DW_TAG_compile_unit
# MULTI-TABLES-NEXT: Children: DW_CHILDREN_no
# MULTI-TABLES-NEXT: Attributes:
# MULTI-TABLES-NEXT: - Attribute: DW_AT_low_pc
# MULTI-TABLES-NEXT: Form: DW_FORM_data4
-# MULTI-TABLES-NEXT: - Code: 0x0000000000000002
+# MULTI-TABLES-NEXT: - Code: 0x2
# MULTI-TABLES-NEXT: Tag: DW_TAG_compile_unit
# MULTI-TABLES-NEXT: Children: DW_CHILDREN_no
# MULTI-TABLES-NEXT: Attributes:
@@ -707,7 +707,7 @@ DWARF:
# MULTI-TABLES-NEXT: Form: DW_FORM_data4
# MULTI-TABLES-NEXT: - ID: 2
# MULTI-TABLES-NEXT: Table:
-# MULTI-TABLES-NEXT: - Code: 0x0000000000000001
+# MULTI-TABLES-NEXT: - Code: 0x1
# MULTI-TABLES-NEXT: Tag: DW_TAG_compile_unit
# MULTI-TABLES-NEXT: Children: DW_CHILDREN_no
# MULTI-TABLES-NEXT: Attributes:
@@ -715,42 +715,42 @@ DWARF:
# MULTI-TABLES-NEXT: Form: DW_FORM_udata
# MULTI-TABLES-NEXT: - ID: 3
# MULTI-TABLES-NEXT: debug_info:
-# MULTI-TABLES-NEXT: - Length: 0x000000000000000C
+# MULTI-TABLES-NEXT: - Length: 0xC
# MULTI-TABLES-NEXT: Version: 4
# MULTI-TABLES-NEXT: AbbrevTableID: 1
-# MULTI-TABLES-NEXT: AbbrOffset: 0x0000000000000008
+# MULTI-TABLES-NEXT: AbbrOffset: 0x8
# MULTI-TABLES-NEXT: AddrSize: 8
# MULTI-TABLES-NEXT: Entries:
-# MULTI-TABLES-NEXT: - AbbrCode: 0x00000001
+# MULTI-TABLES-NEXT: - AbbrCode: 0x1
# MULTI-TABLES-NEXT: Values:
-# MULTI-TABLES-NEXT: - Value: 0x0000000000001234
-# MULTI-TABLES-NEXT: - Length: 0x000000000000000C
+# MULTI-TABLES-NEXT: - Value: 0x1234
+# MULTI-TABLES-NEXT: - Length: 0xC
# MULTI-TABLES-NEXT: Version: 4
# MULTI-TABLES-NEXT: AbbrevTableID: 1
-# MULTI-TABLES-NEXT: AbbrOffset: 0x0000000000000008
+# MULTI-TABLES-NEXT: AbbrOffset: 0x8
# MULTI-TABLES-NEXT: AddrSize: 8
# MULTI-TABLES-NEXT: Entries:
-# MULTI-TABLES-NEXT: - AbbrCode: 0x00000001
+# MULTI-TABLES-NEXT: - AbbrCode: 0x1
# MULTI-TABLES-NEXT: Values:
-# MULTI-TABLES-NEXT: - Value: 0x0000000000004321
-# MULTI-TABLES-NEXT: - Length: 0x0000000000000010
+# MULTI-TABLES-NEXT: - Value: 0x4321
+# MULTI-TABLES-NEXT: - Length: 0x10
# MULTI-TABLES-NEXT: Version: 4
# MULTI-TABLES-NEXT: AbbrevTableID: 0
-# MULTI-TABLES-NEXT: AbbrOffset: 0x0000000000000000
+# MULTI-TABLES-NEXT: AbbrOffset: 0x0
# MULTI-TABLES-NEXT: AddrSize: 8
# MULTI-TABLES-NEXT: Entries:
-# MULTI-TABLES-NEXT: - AbbrCode: 0x00000001
+# MULTI-TABLES-NEXT: - AbbrCode: 0x1
# MULTI-TABLES-NEXT: Values:
-# MULTI-TABLES-NEXT: - Value: 0x0000000000005678
-# MULTI-TABLES-NEXT: - Length: 0x000000000000000B
+# MULTI-TABLES-NEXT: - Value: 0x5678
+# MULTI-TABLES-NEXT: - Length: 0xB
# MULTI-TABLES-NEXT: Version: 4
# MULTI-TABLES-NEXT: AbbrevTableID: 2
-# MULTI-TABLES-NEXT: AbbrOffset: 0x0000000000000017
+# MULTI-TABLES-NEXT: AbbrOffset: 0x17
# MULTI-TABLES-NEXT: AddrSize: 8
# MULTI-TABLES-NEXT: Entries:
-# MULTI-TABLES-NEXT: - AbbrCode: 0x00000001
+# MULTI-TABLES-NEXT: - AbbrCode: 0x1
# MULTI-TABLES-NEXT: Values:
-# MULTI-TABLES-NEXT: - Value: 0x0000000000008765
+# MULTI-TABLES-NEXT: - Value: 0x8765
# MULTI-TABLES-NEXT: ...
--- !mach-o
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml b/llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
index 5aea820145cf..90ccc36774f3 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-debug_ranges.yaml
@@ -41,22 +41,22 @@
# YAML: - sectname: __debug_ranges
# YAML-NEXT: segname: __DWARF
-# YAML-NEXT: addr: 0x000000000000007A
+# YAML-NEXT: addr: 0x7A
# YAML-NEXT: size: 80
-# YAML-NEXT: offset: 0x0000028A
+# YAML-NEXT: offset: 0x28A
# YAML: debug_ranges:
-# YAML-NEXT: - Offset: 0x00000000
-# YAML-NEXT: AddrSize: 0x08
+# YAML-NEXT: - Offset: 0x0
+# YAML-NEXT: AddrSize: 0x8
# YAML-NEXT: Entries:
-# YAML-NEXT: - LowOffset: 0x0000000000000000
-# YAML-NEXT: HighOffset: 0x0000000000000020
-# YAML-NEXT: - LowOffset: 0x0000000000000000
-# YAML-NEXT: HighOffset: 0x0000000000000030
+# YAML-NEXT: - LowOffset: 0x0
+# YAML-NEXT: HighOffset: 0x20
+# YAML-NEXT: - LowOffset: 0x0
+# YAML-NEXT: HighOffset: 0x30
# YAML-NEXT: - LowOffset: 0xFFFFFFFFFFFFFFFF
-# YAML-NEXT: HighOffset: 0x0000000000001000
-# YAML-NEXT: - LowOffset: 0x0000000000000000
-# YAML-NEXT: HighOffset: 0x0000000000001000
+# YAML-NEXT: HighOffset: 0x1000
+# YAML-NEXT: - LowOffset: 0x0
+# YAML-NEXT: HighOffset: 0x1000
--- !mach-o
FileHeader:
@@ -296,15 +296,15 @@ LoadCommands:
# FAILS: Sections:
# FAILS-NEXT: - sectname: __debug_ranges
# FAILS-NEXT: segname: __DWARF
-# FAILS-NEXT: addr: 0x0000000000000000
+# FAILS-NEXT: addr: 0x0
# FAILS-NEXT: size: 3
-# FAILS-NEXT: offset: 0x00000210
+# FAILS-NEXT: offset: 0x210
# FAILS-NEXT: align: 0
-# FAILS-NEXT: reloff: 0x00000000
+# FAILS-NEXT: reloff: 0x0
# FAILS-NEXT: nreloc: 0
-# FAILS-NEXT: flags: 0x00000000
-# FAILS-NEXT: reserved1: 0x00000000
-# FAILS-NEXT: reserved2: 0x00000000
-# FAILS-NEXT: reserved3: 0x00000000
+# FAILS-NEXT: flags: 0x0
+# FAILS-NEXT: reserved1: 0x0
+# FAILS-NEXT: reserved2: 0x0
+# FAILS-NEXT: reserved3: 0x0
# FAILS-NEXT: content: '010203'
# FAILS-NEXT: ...
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-debug_str.yaml b/llvm/test/ObjectYAML/MachO/DWARF-debug_str.yaml
index 9bb55ea35091..2bfee491993f 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-debug_str.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-debug_str.yaml
@@ -261,16 +261,16 @@ DWARF:
# EMPTY-CONTENT: Sections:
# EMPTY-CONTENT-NEXT: - sectname: __debug_str
# EMPTY-CONTENT-NEXT: segname: __DWARF
-# EMPTY-CONTENT-NEXT: addr: 0x0000000000000000
+# EMPTY-CONTENT-NEXT: addr: 0x0
# EMPTY-CONTENT-NEXT: size: 0
-# EMPTY-CONTENT-NEXT: offset: 0x00000210
+# EMPTY-CONTENT-NEXT: offset: 0x210
# EMPTY-CONTENT-NEXT: align: 0
-# EMPTY-CONTENT-NEXT: reloff: 0x00000000
+# EMPTY-CONTENT-NEXT: reloff: 0x0
# EMPTY-CONTENT-NEXT: nreloc: 0
-# EMPTY-CONTENT-NEXT: flags: 0x00000000
-# EMPTY-CONTENT-NEXT: reserved1: 0x00000000
-# EMPTY-CONTENT-NEXT: reserved2: 0x00000000
-# EMPTY-CONTENT-NEXT: reserved3: 0x00000000
+# EMPTY-CONTENT-NEXT: flags: 0x0
+# EMPTY-CONTENT-NEXT: reserved1: 0x0
+# EMPTY-CONTENT-NEXT: reserved2: 0x0
+# EMPTY-CONTENT-NEXT: reserved3: 0x0
# EMPTY-CONTENT-NEXT: DWARF:
# EMPTY-CONTENT-NEXT: debug_str: []
@@ -330,16 +330,16 @@ DWARF:
# NO-TERMINATOR: Sections:
# NO-TERMINATOR-NEXT: - sectname: __debug_str
# NO-TERMINATOR-NEXT: segname: __DWARF
-# NO-TERMINATOR-NEXT: addr: 0x0000000000000000
+# NO-TERMINATOR-NEXT: addr: 0x0
# NO-TERMINATOR-NEXT: size: 7
-# NO-TERMINATOR-NEXT: offset: 0x00000210
+# NO-TERMINATOR-NEXT: offset: 0x210
# NO-TERMINATOR-NEXT: align: 0
-# NO-TERMINATOR-NEXT: reloff: 0x00000000
+# NO-TERMINATOR-NEXT: reloff: 0x0
# NO-TERMINATOR-NEXT: nreloc: 0
-# NO-TERMINATOR-NEXT: flags: 0x00000000
-# NO-TERMINATOR-NEXT: reserved1: 0x00000000
-# NO-TERMINATOR-NEXT: reserved2: 0x00000000
-# NO-TERMINATOR-NEXT: reserved3: 0x00000000
+# NO-TERMINATOR-NEXT: flags: 0x0
+# NO-TERMINATOR-NEXT: reserved1: 0x0
+# NO-TERMINATOR-NEXT: reserved2: 0x0
+# NO-TERMINATOR-NEXT: reserved3: 0x0
# NO-TERMINATOR-NEXT: content: '61626300616263'
# NO-TERMINATOR-NEXT: ...
diff --git a/llvm/test/ObjectYAML/MachO/DWARF-pubsections.yaml b/llvm/test/ObjectYAML/MachO/DWARF-pubsections.yaml
index 9056af923b86..6638f2f74dd4 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF-pubsections.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF-pubsections.yaml
@@ -75,22 +75,22 @@ DWARF:
# CHECK: DWARF:
# CHECK: debug_pubnames:
-# CHECK-NEXT: Length: 0x0000000000000017
+# CHECK-NEXT: Length: 0x17
# CHECK-NEXT: Version: 2
# CHECK-NEXT: UnitOffset: 0
# CHECK-NEXT: UnitSize: 121
# CHECK-NEXT: Entries:
-# CHECK-NEXT: - DieOffset: 0x0000002A
+# CHECK-NEXT: - DieOffset: 0x2A
# CHECK-NEXT: Name: main
# CHECK-NEXT: debug_pubtypes:
-# CHECK-NEXT: Length: 0x000000000000001F
+# CHECK-NEXT: Length: 0x1F
# CHECK-NEXT: Version: 2
# CHECK-NEXT: UnitOffset: 0
# CHECK-NEXT: UnitSize: 121
# CHECK-NEXT: Entries:
-# CHECK-NEXT: - DieOffset: 0x00000060
+# CHECK-NEXT: - DieOffset: 0x60
# CHECK-NEXT: Name: int
-# CHECK-NEXT: - DieOffset: 0x00000071
+# CHECK-NEXT: - DieOffset: 0x71
# CHECK-NEXT: Name: char
# CHECK-NEXT: ...
@@ -104,28 +104,28 @@ DWARF:
# EMPTY: Sections:
# EMPTY-NEXT: - sectname: __debug_pubnames
# EMPTY-NEXT: segname: __DWARF
-# EMPTY-NEXT: addr: 0x0000000000000000
+# EMPTY-NEXT: addr: 0x0
# EMPTY-NEXT: size: 0
-# EMPTY-NEXT: offset: 0x00000000
+# EMPTY-NEXT: offset: 0x0
# EMPTY-NEXT: align: 0
-# EMPTY-NEXT: reloff: 0x00000000
+# EMPTY-NEXT: reloff: 0x0
# EMPTY-NEXT: nreloc: 0
-# EMPTY-NEXT: flags: 0x00000000
-# EMPTY-NEXT: reserved1: 0x00000000
-# EMPTY-NEXT: reserved2: 0x00000000
-# EMPTY-NEXT: reserved3: 0x00000000
+# EMPTY-NEXT: flags: 0x0
+# EMPTY-NEXT: reserved1: 0x0
+# EMPTY-NEXT: reserved2: 0x0
+# EMPTY-NEXT: reserved3: 0x0
# EMPTY-NEXT: - sectname: __debug_pubtypes
# EMPTY-NEXT: segname: __DWARF
-# EMPTY-NEXT: addr: 0x0000000000000000
+# EMPTY-NEXT: addr: 0x0
# EMPTY-NEXT: size: 0
-# EMPTY-NEXT: offset: 0x00000720
+# EMPTY-NEXT: offset: 0x720
# EMPTY-NEXT: align: 0
-# EMPTY-NEXT: reloff: 0x00000000
+# EMPTY-NEXT: reloff: 0x0
# EMPTY-NEXT: nreloc: 0
-# EMPTY-NEXT: flags: 0x00000000
-# EMPTY-NEXT: reserved1: 0x00000000
-# EMPTY-NEXT: reserved2: 0x00000000
-# EMPTY-NEXT: reserved3: 0x00000000
+# EMPTY-NEXT: flags: 0x0
+# EMPTY-NEXT: reserved1: 0x0
+# EMPTY-NEXT: reserved2: 0x0
+# EMPTY-NEXT: reserved3: 0x0
# EMPTY-NEXT: ...
--- !mach-o
@@ -183,12 +183,12 @@ DWARF:
# INVALID-LENGTH: DWARF:
# INVALID-LENGTH-NEXT: debug_pubnames:
-# INVALID-LENGTH-NEXT: Length: 0x00000000DEADBEEF
+# INVALID-LENGTH-NEXT: Length: 0xDEADBEEF
# INVALID-LENGTH-NEXT: Version: 2
# INVALID-LENGTH-NEXT: UnitOffset: 0
# INVALID-LENGTH-NEXT: UnitSize: 121
# INVALID-LENGTH-NEXT: Entries:
-# INVALID-LENGTH-NEXT: - DieOffset: 0x0000002A
+# INVALID-LENGTH-NEXT: - DieOffset: 0x2A
# INVALID-LENGTH-NEXT: Name: main
--- !mach-o
diff --git a/llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml b/llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
index c9d1f024135c..1e80c7651252 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF2-AddrSize8-FormValues.yaml
@@ -416,43 +416,43 @@ DWARF:
...
#CHECK: debug_info:
-#CHECK: - Length: 0x00000000000000A8
+#CHECK: - Length: 0xA8
#CHECK: Version: 2
#CHECK: AbbrOffset: 0
#CHECK: AddrSize: 8
#CHECK: Entries:
-#CHECK: - AbbrCode: 0x00000001
+#CHECK: - AbbrCode: 0x1
#CHECK: Values:
-#CHECK: - Value: 0x0123456789ABCDEF
-#CHECK: - Value: 0x000000000000000A
-#CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-#CHECK: 0x08, 0x09, 0x00 ]
-#CHECK: - Value: 0x000000000000000A
-#CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-#CHECK: 0x08, 0x09, 0x00 ]
-#CHECK: - Value: 0x000000000000000A
-#CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-#CHECK: 0x08, 0x09, 0x00 ]
-#CHECK: - Value: 0x000000000000000A
-#CHECK: BlockData: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-#CHECK: 0x08, 0x09, 0x00 ]
-#CHECK: - Value: 0x0000000000000001
-#CHECK: - Value: 0x0000000000002345
-#CHECK: - Value: 0x000000006789ABCD
-#CHECK: - Value: 0x0011223344556677
+#CHECK: - Value: 0x123456789ABCDEF
+#CHECK: - Value: 0xA
+#CHECK: BlockData: [ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8,
+#CHECK: 0x9, 0x0 ]
+#CHECK: - Value: 0xA
+#CHECK: BlockData: [ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8,
+#CHECK: 0x9, 0x0 ]
+#CHECK: - Value: 0xA
+#CHECK: BlockData: [ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8,
+#CHECK: 0x9, 0x0 ]
+#CHECK: - Value: 0xA
+#CHECK: BlockData: [ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8,
+#CHECK: 0x9, 0x0 ]
+#CHECK: - Value: 0x1
+#CHECK: - Value: 0x2345
+#CHECK: - Value: 0x6789ABCD
+#CHECK: - Value: 0x11223344556677
#CHECK: CStr: Hello
-#CHECK: - Value: 0x0000000000000000
-#CHECK: - Value: 0x0000000012345678
-#CHECK: - Value: 0x0000000000000001
-#CHECK: - Value: 0x0000000000002345
-#CHECK: - Value: 0x000000006789ABCD
-#CHECK: - Value: 0x0011223344556677
+#CHECK: - Value: 0x0
+#CHECK: - Value: 0x12345678
+#CHECK: - Value: 0x1
+#CHECK: - Value: 0x2345
+#CHECK: - Value: 0x6789ABCD
+#CHECK: - Value: 0x11223344556677
#CHECK: - Value: 0xAABBCCDDEEFF0011
#CHECK: - Value: 0xFFFFFFFFFFFFFFFE
-#CHECK: - Value: 0x0000000000000001
-#CHECK: - Value: 0x0000000000000000
-#CHECK: - Value: 0x0000000000000001
+#CHECK: - Value: 0x1
+#CHECK: - Value: 0x0
+#CHECK: - Value: 0x1
#CHECK: - Value: 0xFFFFFFFFFFFFFFFE
-#CHECK: - Value: 0x0000000000000001
-#CHECK: - Value: 0x0000000000000002
-#CHECK: - Value: 0x0123456789ABCDEF
+#CHECK: - Value: 0x1
+#CHECK: - Value: 0x2
+#CHECK: - Value: 0x123456789ABCDEF
diff --git a/llvm/test/ObjectYAML/MachO/DWARF5-abbrevValues.yaml b/llvm/test/ObjectYAML/MachO/DWARF5-abbrevValues.yaml
index e07d50a5349b..e6f2f5855b2e 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF5-abbrevValues.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF5-abbrevValues.yaml
@@ -287,10 +287,10 @@ DWARF:
#CHECK: DWARF:
#CHECK: debug_abbrev:
-#CHECK: - Code: 0x0000000000000001
+#CHECK: - Code: 0x1
#CHECK: Tag: DW_TAG_compile_unit
#CHECK: Children: DW_CHILDREN_yes
#CHECK: Attributes:
#CHECK: - Attribute: 0x2001
#CHECK: Form: DW_FORM_implicit_const
-#CHECK: Value: 0x0000000012345678
+#CHECK: Value: 0x12345678
diff --git a/llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml b/llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
index e0f82e862c8b..1900189b2724 100644
--- a/llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
+++ b/llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml
@@ -511,68 +511,68 @@ DWARF:
# DWARF32: DWARF:
# DWARF32: debug_info:
-# DWARF32-NEXT: - Length: 0x0000000000000076
+# DWARF32-NEXT: - Length: 0x76
# DWARF32-NEXT: Version: 5
# DWARF32-NEXT: UnitType: DW_UT_compile
# DWARF32-NEXT: AbbrevTableID: 0
# DWARF32-NEXT: AbbrOffset: 0
# DWARF32-NEXT: AddrSize: 8
# DWARF32-NEXT: Entries:
-# DWARF32-NEXT: - AbbrCode: 0x00000001
+# DWARF32-NEXT: - AbbrCode: 0x1
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x000000000000000C
-# DWARF32-NEXT: - Value: 0x0000000000000038
-# DWARF32-NEXT: - Value: 0x0000000000000000
-# DWARF32-NEXT: - Value: 0x0000000000000046
-# DWARF32-NEXT: - Value: 0x0000000100000F50
-# DWARF32-NEXT: - Value: 0x0000000000000034
-# DWARF32-NEXT: - AbbrCode: 0x00000002
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0xC
+# DWARF32-NEXT: - Value: 0x38
+# DWARF32-NEXT: - Value: 0x0
+# DWARF32-NEXT: - Value: 0x46
+# DWARF32-NEXT: - Value: 0x100000F50
+# DWARF32-NEXT: - Value: 0x34
+# DWARF32-NEXT: - AbbrCode: 0x2
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000100000F50
-# DWARF32-NEXT: - Value: 0x0000000000000034
-# DWARF32-NEXT: - Value: 0x0000000000000001
+# DWARF32-NEXT: - Value: 0x100000F50
+# DWARF32-NEXT: - Value: 0x34
+# DWARF32-NEXT: - Value: 0x1
# DWARF32-NEXT: BlockData: [ 0x56 ]
-# DWARF32-NEXT: - Value: 0x0000000000000076
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000003
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000060
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - AbbrCode: 0x00000003
+# DWARF32-NEXT: - Value: 0x76
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x3
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x60
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - AbbrCode: 0x3
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000002
+# DWARF32-NEXT: - Value: 0x2
# DWARF32-NEXT: BlockData: [ 0x91, 0x78 ]
-# DWARF32-NEXT: - Value: 0x000000000000007B
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000003
-# DWARF32-NEXT: - Value: 0x0000000000000060
-# DWARF32-NEXT: - AbbrCode: 0x00000003
+# DWARF32-NEXT: - Value: 0x7B
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x3
+# DWARF32-NEXT: - Value: 0x60
+# DWARF32-NEXT: - AbbrCode: 0x3
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000002
+# DWARF32-NEXT: - Value: 0x2
# DWARF32-NEXT: BlockData: [ 0x91, 0x70 ]
-# DWARF32-NEXT: - Value: 0x0000000000000080
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - Value: 0x0000000000000003
-# DWARF32-NEXT: - Value: 0x0000000000000067
-# DWARF32-NEXT: - AbbrCode: 0x00000000
-# DWARF32-NEXT: - AbbrCode: 0x00000004
+# DWARF32-NEXT: - Value: 0x80
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - Value: 0x3
+# DWARF32-NEXT: - Value: 0x67
+# DWARF32-NEXT: - AbbrCode: 0x0
+# DWARF32-NEXT: - AbbrCode: 0x4
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000085
-# DWARF32-NEXT: - Value: 0x0000000000000005
-# DWARF32-NEXT: - Value: 0x0000000000000004
-# DWARF32-NEXT: - AbbrCode: 0x00000005
+# DWARF32-NEXT: - Value: 0x85
+# DWARF32-NEXT: - Value: 0x5
+# DWARF32-NEXT: - Value: 0x4
+# DWARF32-NEXT: - AbbrCode: 0x5
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x000000000000006C
-# DWARF32-NEXT: - AbbrCode: 0x00000005
+# DWARF32-NEXT: - Value: 0x6C
+# DWARF32-NEXT: - AbbrCode: 0x5
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000071
-# DWARF32-NEXT: - AbbrCode: 0x00000004
+# DWARF32-NEXT: - Value: 0x71
+# DWARF32-NEXT: - AbbrCode: 0x4
# DWARF32-NEXT: Values:
-# DWARF32-NEXT: - Value: 0x0000000000000089
-# DWARF32-NEXT: - Value: 0x0000000000000006
-# DWARF32-NEXT: - Value: 0x0000000000000001
-# DWARF32-NEXT: - AbbrCode: 0x00000000
+# DWARF32-NEXT: - Value: 0x89
+# DWARF32-NEXT: - Value: 0x6
+# DWARF32-NEXT: - Value: 0x1
+# DWARF32-NEXT: - AbbrCode: 0x0
## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
@@ -582,16 +582,16 @@ DWARF:
# RUN: obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML
# DWARF32-YAML: debug_info:
-# DWARF32-YAML-NEXT: - Length: 0x000000000000000C
+# DWARF32-YAML-NEXT: - Length: 0xC
# DWARF32-YAML-NEXT: Version: 5
# DWARF32-YAML-NEXT: UnitType: DW_UT_compile
# DWARF32-YAML-NEXT: AbbrevTableID: 0
-# DWARF32-YAML-NEXT: AbbrOffset: 0x0000000000000000
+# DWARF32-YAML-NEXT: AbbrOffset: 0x0
# DWARF32-YAML-NEXT: AddrSize: 8
# DWARF32-YAML-NEXT: Entries:
-# DWARF32-YAML-NEXT: - AbbrCode: 0x00000001
+# DWARF32-YAML-NEXT: - AbbrCode: 0x1
# DWARF32-YAML-NEXT: Values:
-# DWARF32-YAML-NEXT: - Value: 0x0000000000001234
+# DWARF32-YAML-NEXT: - Value: 0x1234
--- !mach-o
FileHeader:
@@ -668,13 +668,13 @@ DWARF:
# DWARF64-YAML: debug_info:
# DWARF64-YAML-NEXT: - Format: DWARF64
-# DWARF64-YAML-NEXT: Length: 0x0000000000000014
+# DWARF64-YAML-NEXT: Length: 0x14
# DWARF64-YAML-NEXT: Version: 5
# DWARF64-YAML-NEXT: UnitType: DW_UT_compile
# DWARF64-YAML-NEXT: AbbrevTableID: 0
-# DWARF64-YAML-NEXT: AbbrOffset: 0x0000000000000000
+# DWARF64-YAML-NEXT: AbbrOffset: 0x0
# DWARF64-YAML-NEXT: AddrSize: 8
# DWARF64-YAML-NEXT: Entries:
-# DWARF64-YAML-NEXT: - AbbrCode: 0x00000001
+# DWARF64-YAML-NEXT: - AbbrCode: 0x1
# DWARF64-YAML-NEXT: Values:
-# DWARF64-YAML-NEXT: - Value: 0x0000000000001234
+# DWARF64-YAML-NEXT: - Value: 0x1234
diff --git a/llvm/test/ObjectYAML/MachO/LittleEndian.yaml b/llvm/test/ObjectYAML/MachO/LittleEndian.yaml
index 1d54e289ab9d..8fbf37e625d8 100644
--- a/llvm/test/ObjectYAML/MachO/LittleEndian.yaml
+++ b/llvm/test/ObjectYAML/MachO/LittleEndian.yaml
@@ -123,10 +123,10 @@ LinkEditData:
#CHECK: FileHeader:
#CHECK: magic: 0xFEEDFACF
-#CHECK: cputype: 0x01000007
-#CHECK: cpusubtype: 0x00000003
-#CHECK: filetype: 0x00000001
+#CHECK: cputype: 0x1000007
+#CHECK: cpusubtype: 0x3
+#CHECK: filetype: 0x1
#CHECK: ncmds: 4
#CHECK: sizeofcmds: 512
-#CHECK: flags: 0x00002000
-#CHECK: reserved: 0x00000000
+#CHECK: flags: 0x2000
+#CHECK: reserved: 0x0
diff --git a/llvm/test/ObjectYAML/MachO/bind_opcode.yaml b/llvm/test/ObjectYAML/MachO/bind_opcode.yaml
index 6cbf76073ed8..4073ca4f7f95 100644
--- a/llvm/test/ObjectYAML/MachO/bind_opcode.yaml
+++ b/llvm/test/ObjectYAML/MachO/bind_opcode.yaml
@@ -107,7 +107,7 @@ LinkEditData:
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000000 ]
+#CHECK: ULEBExtraData: [ 0x0 ]
#CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
diff --git a/llvm/test/ObjectYAML/MachO/bogus_load_command.yaml b/llvm/test/ObjectYAML/MachO/bogus_load_command.yaml
index 448e0cbe80ae..f9706dc61217 100644
--- a/llvm/test/ObjectYAML/MachO/bogus_load_command.yaml
+++ b/llvm/test/ObjectYAML/MachO/bogus_load_command.yaml
@@ -36,6 +36,6 @@ LoadCommands:
#CHECK: ZeroPadBytes:
#CHECK: - cmd: 0xDEADBEEF
#CHECK: cmdsize: 24
-#CHECK: PayloadBytes: [ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-#CHECK: 0x09, 0x0A, 0x0B, 0x0C, 0x00, 0x00, 0x00, 0x00 ]
+#CHECK: PayloadBytes: [ 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA,
+#CHECK: 0xB, 0xC, 0x0, 0x0, 0x0, 0x0 ]
#CHECK-NOT: LinkEditData:
diff --git a/llvm/test/ObjectYAML/MachO/export_trie.yaml b/llvm/test/ObjectYAML/MachO/export_trie.yaml
index 7d6513832a10..64537527cfe7 100644
--- a/llvm/test/ObjectYAML/MachO/export_trie.yaml
+++ b/llvm/test/ObjectYAML/MachO/export_trie.yaml
@@ -184,8 +184,8 @@ LinkEditData:
#CHECK: - TerminalSize: 2
#CHECK: NodeOffset: 33
#CHECK: Name: _mh_execute_header
-#CHECK: Address: 0x0000000000000000
+#CHECK: Address: 0x0
#CHECK: - TerminalSize: 3
#CHECK: NodeOffset: 37
#CHECK: Name: main
-#CHECK: Address: 0x0000000000001160
+#CHECK: Address: 0x1160
diff --git a/llvm/test/ObjectYAML/MachO/fat_macho_i386_x86_64.yaml b/llvm/test/ObjectYAML/MachO/fat_macho_i386_x86_64.yaml
index b9b2f2d629e2..50d45d6321a2 100644
--- a/llvm/test/ObjectYAML/MachO/fat_macho_i386_x86_64.yaml
+++ b/llvm/test/ObjectYAML/MachO/fat_macho_i386_x86_64.yaml
@@ -46,36 +46,36 @@ Slices:
#CHECK: magic: 0xCAFEBABE
#CHECK: nfat_arch: 2
#CHECK: FatArchs:
-#CHECK: - cputype: 0x00000007
-#CHECK: cpusubtype: 0x00000003
-#CHECK: offset: 0x0000000000001000
+#CHECK: - cputype: 0x7
+#CHECK: cpusubtype: 0x3
+#CHECK: offset: 0x1000
#CHECK: size: 15244
#CHECK: align: 12
-#CHECK: - cputype: 0x01000007
+#CHECK: - cputype: 0x1000007
#CHECK: cpusubtype: 0x80000003
-#CHECK: offset: 0x0000000000005000
+#CHECK: offset: 0x5000
#CHECK: size: 15380
#CHECK: align: 12
#CHECK: Slices:
#CHECK: - !mach-o
#CHECK: FileHeader:
#CHECK: magic: 0xFEEDFACE
-#CHECK: cputype: 0x00000007
-#CHECK: cpusubtype: 0x00000003
-#CHECK: filetype: 0x00000002
+#CHECK: cputype: 0x7
+#CHECK: cpusubtype: 0x3
+#CHECK: filetype: 0x2
#CHECK: ncmds: 0
#CHECK: sizeofcmds: 0
-#CHECK: flags: 0x01218085
+#CHECK: flags: 0x1218085
#CHECK: - !mach-o
#CHECK: FileHeader:
#CHECK: magic: 0xFEEDFACF
-#CHECK: cputype: 0x01000007
+#CHECK: cputype: 0x1000007
#CHECK: cpusubtype: 0x80000003
-#CHECK: filetype: 0x00000002
+#CHECK: filetype: 0x2
#CHECK: ncmds: 0
#CHECK: sizeofcmds: 0
-#CHECK: flags: 0x00218085
-#CHECK: reserved: 0x00000000
+#CHECK: flags: 0x218085
+#CHECK: reserved: 0x0
#CHECK: ...
## b) Test that yaml2obj emits an error message if the number of 'FatArchs' is less than
diff --git a/llvm/test/ObjectYAML/MachO/lazy_bind_opcode.yaml b/llvm/test/ObjectYAML/MachO/lazy_bind_opcode.yaml
index 0db0ea1f902e..432b747ac9c8 100644
--- a/llvm/test/ObjectYAML/MachO/lazy_bind_opcode.yaml
+++ b/llvm/test/ObjectYAML/MachO/lazy_bind_opcode.yaml
@@ -267,7 +267,7 @@ LinkEditData:
#CHECK: LazyBindOpcodes:
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000028 ]
+#CHECK: ULEBExtraData: [ 0x28 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -279,7 +279,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000030 ]
+#CHECK: ULEBExtraData: [ 0x30 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -291,7 +291,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000038 ]
+#CHECK: ULEBExtraData: [ 0x38 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -303,7 +303,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000040 ]
+#CHECK: ULEBExtraData: [ 0x40 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -315,7 +315,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000048 ]
+#CHECK: ULEBExtraData: [ 0x48 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -327,7 +327,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000050 ]
+#CHECK: ULEBExtraData: [ 0x50 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -339,7 +339,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000058 ]
+#CHECK: ULEBExtraData: [ 0x58 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -351,7 +351,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000060 ]
+#CHECK: ULEBExtraData: [ 0x60 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -363,7 +363,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000068 ]
+#CHECK: ULEBExtraData: [ 0x68 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -375,7 +375,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000070 ]
+#CHECK: ULEBExtraData: [ 0x70 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -387,7 +387,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000078 ]
+#CHECK: ULEBExtraData: [ 0x78 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -399,7 +399,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000080 ]
+#CHECK: ULEBExtraData: [ 0x80 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -411,7 +411,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000088 ]
+#CHECK: ULEBExtraData: [ 0x88 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 2
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -423,7 +423,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000090 ]
+#CHECK: ULEBExtraData: [ 0x90 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 2
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
@@ -435,7 +435,7 @@ LinkEditData:
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000098 ]
+#CHECK: ULEBExtraData: [ 0x98 ]
#CHECK: - Opcode: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM
#CHECK: Imm: 2
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
diff --git a/llvm/test/ObjectYAML/MachO/lc-ident.yaml b/llvm/test/ObjectYAML/MachO/lc-ident.yaml
index 0bafea99e4b8..7d9efc8e322b 100644
--- a/llvm/test/ObjectYAML/MachO/lc-ident.yaml
+++ b/llvm/test/ObjectYAML/MachO/lc-ident.yaml
@@ -19,4 +19,4 @@ LoadCommands:
# CHECK: LoadCommands:
# CHECK-NEXT: - cmd: LC_IDENT
# CHECK-NEXT: cmdsize: 16
-# CHECK-NEXT: PayloadBytes: [ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 ]
+# CHECK-NEXT: PayloadBytes: [ 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7 ]
diff --git a/llvm/test/ObjectYAML/MachO/mach_header.yaml b/llvm/test/ObjectYAML/MachO/mach_header.yaml
index f6cba123e72f..0c4453f7a313 100644
--- a/llvm/test/ObjectYAML/MachO/mach_header.yaml
+++ b/llvm/test/ObjectYAML/MachO/mach_header.yaml
@@ -14,11 +14,11 @@ FileHeader:
# CHECK: --- !mach-o
# CHECK: FileHeader:
# CHECK: magic: 0xFEEDFACE
-# CHECK: cputype: 0x00000007
+# CHECK: cputype: 0x7
# CHECK: cpusubtype: 0x80000003
-# CHECK: filetype: 0x00000002
+# CHECK: filetype: 0x2
# CHECK: ncmds: 0
# CHECK: sizeofcmds: 0
-# CHECK: flags: 0x00218085
+# CHECK: flags: 0x218085
# CHECK-NOT: reserved:
# CHECK: ...
diff --git a/llvm/test/ObjectYAML/MachO/mach_header_64.yaml b/llvm/test/ObjectYAML/MachO/mach_header_64.yaml
index 620e09878be3..de72440c2482 100644
--- a/llvm/test/ObjectYAML/MachO/mach_header_64.yaml
+++ b/llvm/test/ObjectYAML/MachO/mach_header_64.yaml
@@ -15,11 +15,11 @@ FileHeader:
# CHECK: --- !mach-o
# CHECK: FileHeader:
# CHECK: magic: 0xFEEDFACF
-# CHECK: cputype: 0x01000007
+# CHECK: cputype: 0x1000007
# CHECK: cpusubtype: 0x80000003
-# CHECK: filetype: 0x00000002
+# CHECK: filetype: 0x2
# CHECK: ncmds: 0
# CHECK: sizeofcmds: 0
-# CHECK: flags: 0x00218085
-# CHECK: reserved: 0x00000000
+# CHECK: flags: 0x218085
+# CHECK: reserved: 0x0
# CHECK: ...
diff --git a/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml b/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml
index 81db5deb785e..d318e331e618 100644
--- a/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml
+++ b/llvm/test/ObjectYAML/MachO/out_of_order_linkedit.yaml
@@ -214,10 +214,10 @@ LinkEditData:
#CHECK: Imm: 1
#CHECK: - Opcode: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ExtraData: [ 0x0000000000000028 ]
+#CHECK: ExtraData: [ 0x28 ]
#CHECK: - Opcode: REBASE_OPCODE_DO_REBASE_ULEB_TIMES
#CHECK: Imm: 0
-#CHECK: ExtraData: [ 0x000000000000000F ]
+#CHECK: ExtraData: [ 0xF ]
#CHECK: - Opcode: REBASE_OPCODE_DONE
#CHECK: Imm: 0
#CHECK: BindOpcodes:
@@ -232,7 +232,7 @@ LinkEditData:
#CHECK: Symbol: ''
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000000 ]
+#CHECK: ULEBExtraData: [ 0x0 ]
#CHECK: Symbol: ''
#CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0
diff --git a/llvm/test/ObjectYAML/MachO/rebase_opcode.yaml b/llvm/test/ObjectYAML/MachO/rebase_opcode.yaml
index 8e8ec979c3b7..36aee1c50e4d 100644
--- a/llvm/test/ObjectYAML/MachO/rebase_opcode.yaml
+++ b/llvm/test/ObjectYAML/MachO/rebase_opcode.yaml
@@ -82,9 +82,9 @@ LinkEditData:
#CHECK: Imm: 1
#CHECK: - Opcode: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ExtraData: [ 0x0000000000000028 ]
+#CHECK: ExtraData: [ 0x28 ]
#CHECK: - Opcode: REBASE_OPCODE_DO_REBASE_ULEB_TIMES
#CHECK: Imm: 0
-#CHECK: ExtraData: [ 0x000000000000000F ]
+#CHECK: ExtraData: [ 0xF ]
#CHECK: - Opcode: REBASE_OPCODE_DONE
#CHECK: Imm: 0
diff --git a/llvm/test/ObjectYAML/MachO/relocations_arm64.yaml b/llvm/test/ObjectYAML/MachO/relocations_arm64.yaml
index 208b26fa3246..9e8b355a7a81 100644
--- a/llvm/test/ObjectYAML/MachO/relocations_arm64.yaml
+++ b/llvm/test/ObjectYAML/MachO/relocations_arm64.yaml
@@ -32,19 +32,19 @@
# CHECK: Sections:
# CHECK-NEXT: - sectname: __text
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000000
+# CHECK-NEXT: addr: 0x0
# CHECK-NEXT: size: 48
-# CHECK-NEXT: offset: 0x000002C0
+# CHECK-NEXT: offset: 0x2C0
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x000003A0
+# CHECK-NEXT: reloff: 0x3A0
# CHECK-NEXT: nreloc: 4
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000018
+# CHECK-NEXT: - address: 0x18
# CHECK-NEXT: symbolnum: 9
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -52,7 +52,7 @@
# CHECK-NEXT: type: 4
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000014
+# CHECK-NEXT: - address: 0x14
# CHECK-NEXT: symbolnum: 9
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -60,7 +60,7 @@
# CHECK-NEXT: type: 3
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x0000000C
+# CHECK-NEXT: - address: 0xC
# CHECK-NEXT: symbolnum: 12
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -68,7 +68,7 @@
# CHECK-NEXT: type: 4
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000008
+# CHECK-NEXT: - address: 0x8
# CHECK-NEXT: symbolnum: 12
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -78,19 +78,19 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __StaticInit
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000030
+# CHECK-NEXT: addr: 0x30
# CHECK-NEXT: size: 56
-# CHECK-NEXT: offset: 0x000002F0
+# CHECK-NEXT: offset: 0x2F0
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x000003C0
+# CHECK-NEXT: reloff: 0x3C0
# CHECK-NEXT: nreloc: 7
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x0000002C
+# CHECK-NEXT: - address: 0x2C
# CHECK-NEXT: symbolnum: 2
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -98,7 +98,7 @@
# CHECK-NEXT: type: 2
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000018
+# CHECK-NEXT: - address: 0x18
# CHECK-NEXT: symbolnum: 9
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -106,7 +106,7 @@
# CHECK-NEXT: type: 4
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000014
+# CHECK-NEXT: - address: 0x14
# CHECK-NEXT: symbolnum: 9
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -114,7 +114,7 @@
# CHECK-NEXT: type: 3
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x0000000C
+# CHECK-NEXT: - address: 0xC
# CHECK-NEXT: symbolnum: 11
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -122,7 +122,7 @@
# CHECK-NEXT: type: 4
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000008
+# CHECK-NEXT: - address: 0x8
# CHECK-NEXT: symbolnum: 11
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -130,7 +130,7 @@
# CHECK-NEXT: type: 3
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000004
+# CHECK-NEXT: - address: 0x4
# CHECK-NEXT: symbolnum: 10
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -138,7 +138,7 @@
# CHECK-NEXT: type: 4
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 10
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -148,19 +148,19 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __data
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000068
+# CHECK-NEXT: addr: 0x68
# CHECK-NEXT: size: 16
-# CHECK-NEXT: offset: 0x00000328
+# CHECK-NEXT: offset: 0x328
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x000003F8
+# CHECK-NEXT: reloff: 0x3F8
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x0
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000008
+# CHECK-NEXT: - address: 0x8
# CHECK-NEXT: symbolnum: 10
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -170,31 +170,31 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __common
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x00000000000000E0
+# CHECK-NEXT: addr: 0xE0
# CHECK-NEXT: size: 8
-# CHECK-NEXT: offset: 0x00000000
+# CHECK-NEXT: offset: 0x0
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000001
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x1
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: - sectname: __mod_init_func
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000078
+# CHECK-NEXT: addr: 0x78
# CHECK-NEXT: size: 8
-# CHECK-NEXT: offset: 0x00000338
+# CHECK-NEXT: offset: 0x338
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x00000400
+# CHECK-NEXT: reloff: 0x400
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000009
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x9
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 3
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -204,19 +204,19 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __compact_unwind
# CHECK-NEXT: segname: __LD
-# CHECK-NEXT: addr: 0x0000000000000080
+# CHECK-NEXT: addr: 0x80
# CHECK-NEXT: size: 96
-# CHECK-NEXT: offset: 0x00000340
+# CHECK-NEXT: offset: 0x340
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x00000408
+# CHECK-NEXT: reloff: 0x408
# CHECK-NEXT: nreloc: 3
-# CHECK-NEXT: flags: 0x02000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x2000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000040
+# CHECK-NEXT: - address: 0x40
# CHECK-NEXT: symbolnum: 2
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -224,7 +224,7 @@
# CHECK-NEXT: type: 0
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000020
+# CHECK-NEXT: - address: 0x20
# CHECK-NEXT: symbolnum: 1
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -232,7 +232,7 @@
# CHECK-NEXT: type: 0
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 2
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
diff --git a/llvm/test/ObjectYAML/MachO/relocations_armv7.yaml b/llvm/test/ObjectYAML/MachO/relocations_armv7.yaml
index f1c2842e7cd5..6aaa8e9699e6 100644
--- a/llvm/test/ObjectYAML/MachO/relocations_armv7.yaml
+++ b/llvm/test/ObjectYAML/MachO/relocations_armv7.yaml
@@ -37,19 +37,19 @@
# CHECK: Sections:
# CHECK-NEXT: - sectname: __text
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000000
+# CHECK-NEXT: addr: 0x0
# CHECK-NEXT: size: 36
-# CHECK-NEXT: offset: 0x00000220
+# CHECK-NEXT: offset: 0x220
# CHECK-NEXT: align: 1
-# CHECK-NEXT: reloff: 0x00000284
+# CHECK-NEXT: reloff: 0x284
# CHECK-NEXT: nreloc: 8
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000016
+# CHECK-NEXT: - address: 0x16
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -57,7 +57,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 100
-# CHECK-NEXT: - address: 0x00000046
+# CHECK-NEXT: - address: 0x46
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -65,7 +65,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 26
-# CHECK-NEXT: - address: 0x00000012
+# CHECK-NEXT: - address: 0x12
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -73,7 +73,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 100
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -81,7 +81,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 26
-# CHECK-NEXT: - address: 0x0000000A
+# CHECK-NEXT: - address: 0xA
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -89,7 +89,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 92
-# CHECK-NEXT: - address: 0x0000004A
+# CHECK-NEXT: - address: 0x4A
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -97,7 +97,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 14
-# CHECK-NEXT: - address: 0x00000006
+# CHECK-NEXT: - address: 0x6
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -105,7 +105,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 92
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -115,19 +115,19 @@
# CHECK-NEXT: value: 14
# CHECK-NEXT: - sectname: __StaticInit
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000024
+# CHECK-NEXT: addr: 0x24
# CHECK-NEXT: size: 46
-# CHECK-NEXT: offset: 0x00000244
+# CHECK-NEXT: offset: 0x244
# CHECK-NEXT: align: 1
-# CHECK-NEXT: reloff: 0x000002C4
+# CHECK-NEXT: reloff: 0x2C4
# CHECK-NEXT: nreloc: 13
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000028
+# CHECK-NEXT: - address: 0x28
# CHECK-NEXT: symbolnum: 2
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -135,7 +135,7 @@
# CHECK-NEXT: type: 6
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x0000001A
+# CHECK-NEXT: - address: 0x1A
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -143,7 +143,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 100
-# CHECK-NEXT: - address: 0x0000001E
+# CHECK-NEXT: - address: 0x1E
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -151,7 +151,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 66
-# CHECK-NEXT: - address: 0x00000016
+# CHECK-NEXT: - address: 0x16
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -159,7 +159,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 100
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -167,7 +167,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 66
-# CHECK-NEXT: - address: 0x0000000E
+# CHECK-NEXT: - address: 0xE
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -175,7 +175,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 84
-# CHECK-NEXT: - address: 0x0000001A
+# CHECK-NEXT: - address: 0x1A
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -183,7 +183,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 54
-# CHECK-NEXT: - address: 0x0000000A
+# CHECK-NEXT: - address: 0xA
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -191,7 +191,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 84
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -199,7 +199,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 54
-# CHECK-NEXT: - address: 0x00000004
+# CHECK-NEXT: - address: 0x4
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -207,7 +207,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 88
-# CHECK-NEXT: - address: 0x00000028
+# CHECK-NEXT: - address: 0x28
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -215,7 +215,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 44
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -223,7 +223,7 @@
# CHECK-NEXT: type: 9
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 88
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -233,19 +233,19 @@
# CHECK-NEXT: value: 44
# CHECK-NEXT: - sectname: __data
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000054
+# CHECK-NEXT: addr: 0x54
# CHECK-NEXT: size: 12
-# CHECK-NEXT: offset: 0x00000274
+# CHECK-NEXT: offset: 0x274
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x0000032C
+# CHECK-NEXT: reloff: 0x32C
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x0
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000008
+# CHECK-NEXT: - address: 0x8
# CHECK-NEXT: symbolnum: 3
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -255,31 +255,31 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __common
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000064
+# CHECK-NEXT: addr: 0x64
# CHECK-NEXT: size: 4
-# CHECK-NEXT: offset: 0x00000000
+# CHECK-NEXT: offset: 0x0
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000001
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x1
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: - sectname: __mod_init_func
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000060
+# CHECK-NEXT: addr: 0x60
# CHECK-NEXT: size: 4
-# CHECK-NEXT: offset: 0x00000280
+# CHECK-NEXT: offset: 0x280
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x00000334
+# CHECK-NEXT: reloff: 0x334
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000009
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x9
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: '48000000'
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 2
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
diff --git a/llvm/test/ObjectYAML/MachO/relocations_empty.yaml b/llvm/test/ObjectYAML/MachO/relocations_empty.yaml
index 8a6a031da479..6d13ae15548d 100644
--- a/llvm/test/ObjectYAML/MachO/relocations_empty.yaml
+++ b/llvm/test/ObjectYAML/MachO/relocations_empty.yaml
@@ -8,16 +8,16 @@
# CHECK: Sections:
# CHECK-NEXT: - sectname: __text
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000000
+# CHECK-NEXT: addr: 0x0
# CHECK-NEXT: size: 0
-# CHECK-NEXT: offset: 0x000000C8
+# CHECK-NEXT: offset: 0xC8
# CHECK-NEXT: align: 0
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
# CHECK-NEXT: flags: 0x80000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: ''
# CHECK-NOT: relocations:
diff --git a/llvm/test/ObjectYAML/MachO/relocations_ppc_big_endian.yaml b/llvm/test/ObjectYAML/MachO/relocations_ppc_big_endian.yaml
index bfeed67a59e2..40a60888bc57 100644
--- a/llvm/test/ObjectYAML/MachO/relocations_ppc_big_endian.yaml
+++ b/llvm/test/ObjectYAML/MachO/relocations_ppc_big_endian.yaml
@@ -43,19 +43,19 @@
# CHECK: Sections:
# CHECK-NEXT: - sectname: __text
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000000
+# CHECK-NEXT: addr: 0x0
# CHECK-NEXT: size: 76
-# CHECK-NEXT: offset: 0x000002EC
+# CHECK-NEXT: offset: 0x2EC
# CHECK-NEXT: align: 4
-# CHECK-NEXT: reloff: 0x00000430
+# CHECK-NEXT: reloff: 0x430
# CHECK-NEXT: nreloc: 8
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000030
+# CHECK-NEXT: - address: 0x30
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -63,7 +63,7 @@
# CHECK-NEXT: type: 11
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 324
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -71,7 +71,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 24
-# CHECK-NEXT: - address: 0x0000002C
+# CHECK-NEXT: - address: 0x2C
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -79,7 +79,7 @@
# CHECK-NEXT: type: 12
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 324
-# CHECK-NEXT: - address: 0x0000012C
+# CHECK-NEXT: - address: 0x12C
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -87,7 +87,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 24
-# CHECK-NEXT: - address: 0x00000028
+# CHECK-NEXT: - address: 0x28
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -95,7 +95,7 @@
# CHECK-NEXT: type: 11
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 212
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -103,7 +103,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 24
-# CHECK-NEXT: - address: 0x00000024
+# CHECK-NEXT: - address: 0x24
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -111,7 +111,7 @@
# CHECK-NEXT: type: 12
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 212
-# CHECK-NEXT: - address: 0x000000BC
+# CHECK-NEXT: - address: 0xBC
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -121,45 +121,45 @@
# CHECK-NEXT: value: 24
# CHECK-NEXT: - sectname: __textcoal_nt
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x000000000000004C
+# CHECK-NEXT: addr: 0x4C
# CHECK-NEXT: size: 0
-# CHECK-NEXT: offset: 0x00000338
+# CHECK-NEXT: offset: 0x338
# CHECK-NEXT: align: 0
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
# CHECK-NEXT: flags: 0x8000000B
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: ''
# CHECK-NEXT: - sectname: __picsymbolstub1
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x000000000000004C
+# CHECK-NEXT: addr: 0x4C
# CHECK-NEXT: size: 0
-# CHECK-NEXT: offset: 0x00000338
+# CHECK-NEXT: offset: 0x338
# CHECK-NEXT: align: 0
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
# CHECK-NEXT: flags: 0x80000008
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000020
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x20
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: ''
# CHECK-NEXT: - sectname: __StaticInit
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000050
+# CHECK-NEXT: addr: 0x50
# CHECK-NEXT: size: 124
-# CHECK-NEXT: offset: 0x0000033C
+# CHECK-NEXT: offset: 0x33C
# CHECK-NEXT: align: 4
-# CHECK-NEXT: reloff: 0x00000470
+# CHECK-NEXT: reloff: 0x470
# CHECK-NEXT: nreloc: 13
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000064
+# CHECK-NEXT: - address: 0x64
# CHECK-NEXT: symbolnum: 4
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -167,7 +167,7 @@
# CHECK-NEXT: type: 3
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000034
+# CHECK-NEXT: - address: 0x34
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -175,7 +175,7 @@
# CHECK-NEXT: type: 11
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 324
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -183,7 +183,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 104
-# CHECK-NEXT: - address: 0x00000030
+# CHECK-NEXT: - address: 0x30
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -191,7 +191,7 @@
# CHECK-NEXT: type: 12
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 324
-# CHECK-NEXT: - address: 0x000000DC
+# CHECK-NEXT: - address: 0xDC
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -199,7 +199,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 104
-# CHECK-NEXT: - address: 0x00000028
+# CHECK-NEXT: - address: 0x28
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -207,7 +207,7 @@
# CHECK-NEXT: type: 11
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 208
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -215,7 +215,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 104
-# CHECK-NEXT: - address: 0x00000024
+# CHECK-NEXT: - address: 0x24
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -223,7 +223,7 @@
# CHECK-NEXT: type: 12
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 208
-# CHECK-NEXT: - address: 0x00000068
+# CHECK-NEXT: - address: 0x68
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -231,7 +231,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 104
-# CHECK-NEXT: - address: 0x00000020
+# CHECK-NEXT: - address: 0x20
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -239,7 +239,7 @@
# CHECK-NEXT: type: 11
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 204
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -247,7 +247,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 104
-# CHECK-NEXT: - address: 0x0000001C
+# CHECK-NEXT: - address: 0x1C
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -255,7 +255,7 @@
# CHECK-NEXT: type: 12
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 204
-# CHECK-NEXT: - address: 0x00000064
+# CHECK-NEXT: - address: 0x64
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -265,19 +265,19 @@
# CHECK-NEXT: value: 104
# CHECK-NEXT: - sectname: __data
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x00000000000000CC
+# CHECK-NEXT: addr: 0xCC
# CHECK-NEXT: size: 12
-# CHECK-NEXT: offset: 0x000003B8
+# CHECK-NEXT: offset: 0x3B8
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x000004D8
+# CHECK-NEXT: reloff: 0x4D8
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x0
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000008
+# CHECK-NEXT: - address: 0x8
# CHECK-NEXT: symbolnum: 5
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -287,31 +287,31 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __common
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000144
+# CHECK-NEXT: addr: 0x144
# CHECK-NEXT: size: 4
-# CHECK-NEXT: offset: 0x00000000
+# CHECK-NEXT: offset: 0x0
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000001
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x1
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: - sectname: __mod_init_func
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x00000000000000D8
+# CHECK-NEXT: addr: 0xD8
# CHECK-NEXT: size: 4
-# CHECK-NEXT: offset: 0x000003C4
+# CHECK-NEXT: offset: 0x3C4
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x000004E0
+# CHECK-NEXT: reloff: 0x4E0
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000009
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x9
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: 000000A0
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 4
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -321,19 +321,19 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __eh_frame
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x00000000000000DC
+# CHECK-NEXT: addr: 0xDC
# CHECK-NEXT: size: 104
-# CHECK-NEXT: offset: 0x000003C8
+# CHECK-NEXT: offset: 0x3C8
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x000004E8
+# CHECK-NEXT: reloff: 0x4E8
# CHECK-NEXT: nreloc: 3
# CHECK-NEXT: flags: 0x6800000B
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000054
+# CHECK-NEXT: - address: 0x54
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -341,7 +341,7 @@
# CHECK-NEXT: type: 0
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 160
-# CHECK-NEXT: - address: 0x00000038
+# CHECK-NEXT: - address: 0x38
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
@@ -349,7 +349,7 @@
# CHECK-NEXT: type: 0
# CHECK-NEXT: scattered: true
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x0000001C
+# CHECK-NEXT: - address: 0x1C
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 2
diff --git a/llvm/test/ObjectYAML/MachO/relocations_x86_64.yaml b/llvm/test/ObjectYAML/MachO/relocations_x86_64.yaml
index 9c5ba88d70d5..a1ddd3001308 100644
--- a/llvm/test/ObjectYAML/MachO/relocations_x86_64.yaml
+++ b/llvm/test/ObjectYAML/MachO/relocations_x86_64.yaml
@@ -27,19 +27,19 @@
# CHECK: Sections:
# CHECK-NEXT: - sectname: __text
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000000
+# CHECK-NEXT: addr: 0x0
# CHECK-NEXT: size: 27
-# CHECK-NEXT: offset: 0x00000310
+# CHECK-NEXT: offset: 0x310
# CHECK-NEXT: align: 4
-# CHECK-NEXT: reloff: 0x00000468
+# CHECK-NEXT: reloff: 0x468
# CHECK-NEXT: nreloc: 2
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000015
+# CHECK-NEXT: - address: 0x15
# CHECK-NEXT: symbolnum: 3
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -47,7 +47,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x0000000E
+# CHECK-NEXT: - address: 0xE
# CHECK-NEXT: symbolnum: 6
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -57,19 +57,19 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __StaticInit
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000020
+# CHECK-NEXT: addr: 0x20
# CHECK-NEXT: size: 43
-# CHECK-NEXT: offset: 0x00000330
+# CHECK-NEXT: offset: 0x330
# CHECK-NEXT: align: 4
-# CHECK-NEXT: reloff: 0x00000478
+# CHECK-NEXT: reloff: 0x478
# CHECK-NEXT: nreloc: 4
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000025
+# CHECK-NEXT: - address: 0x25
# CHECK-NEXT: symbolnum: 0
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -77,7 +77,7 @@
# CHECK-NEXT: type: 2
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000018
+# CHECK-NEXT: - address: 0x18
# CHECK-NEXT: symbolnum: 3
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -85,7 +85,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x0000000E
+# CHECK-NEXT: - address: 0xE
# CHECK-NEXT: symbolnum: 4
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -93,7 +93,7 @@
# CHECK-NEXT: type: 1
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000007
+# CHECK-NEXT: - address: 0x7
# CHECK-NEXT: symbolnum: 5
# CHECK-NEXT: pcrel: true
# CHECK-NEXT: length: 2
@@ -103,19 +103,19 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __data
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000050
+# CHECK-NEXT: addr: 0x50
# CHECK-NEXT: size: 16
-# CHECK-NEXT: offset: 0x00000360
+# CHECK-NEXT: offset: 0x360
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x00000498
+# CHECK-NEXT: reloff: 0x498
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x0
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: '01000000020000000000000000000000'
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000008
+# CHECK-NEXT: - address: 0x8
# CHECK-NEXT: symbolnum: 4
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -125,31 +125,31 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __common
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000158
+# CHECK-NEXT: addr: 0x158
# CHECK-NEXT: size: 8
-# CHECK-NEXT: offset: 0x00000000
+# CHECK-NEXT: offset: 0x0
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000001
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x1
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: - sectname: __mod_init_func
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000060
+# CHECK-NEXT: addr: 0x60
# CHECK-NEXT: size: 8
-# CHECK-NEXT: offset: 0x00000370
+# CHECK-NEXT: offset: 0x370
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x000004A0
+# CHECK-NEXT: reloff: 0x4A0
# CHECK-NEXT: nreloc: 1
-# CHECK-NEXT: flags: 0x00000009
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x9
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 1
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -159,19 +159,19 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __compact_unwind
# CHECK-NEXT: segname: __LD
-# CHECK-NEXT: addr: 0x0000000000000068
+# CHECK-NEXT: addr: 0x68
# CHECK-NEXT: size: 96
-# CHECK-NEXT: offset: 0x00000378
+# CHECK-NEXT: offset: 0x378
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x000004A8
+# CHECK-NEXT: reloff: 0x4A8
# CHECK-NEXT: nreloc: 3
-# CHECK-NEXT: flags: 0x02000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x2000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content:
# CHECK-NEXT: relocations:
-# CHECK-NEXT: - address: 0x00000040
+# CHECK-NEXT: - address: 0x40
# CHECK-NEXT: symbolnum: 2
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -179,7 +179,7 @@
# CHECK-NEXT: type: 0
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000020
+# CHECK-NEXT: - address: 0x20
# CHECK-NEXT: symbolnum: 1
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -187,7 +187,7 @@
# CHECK-NEXT: type: 0
# CHECK-NEXT: scattered: false
# CHECK-NEXT: value: 0
-# CHECK-NEXT: - address: 0x00000000
+# CHECK-NEXT: - address: 0x0
# CHECK-NEXT: symbolnum: 2
# CHECK-NEXT: pcrel: false
# CHECK-NEXT: length: 3
@@ -197,16 +197,16 @@
# CHECK-NEXT: value: 0
# CHECK-NEXT: - sectname: __eh_frame
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x00000000000000C8
+# CHECK-NEXT: addr: 0xC8
# CHECK-NEXT: size: 144
-# CHECK-NEXT: offset: 0x000003D8
+# CHECK-NEXT: offset: 0x3D8
# CHECK-NEXT: align: 3
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
# CHECK-NEXT: flags: 0x6800000B
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
--- !mach-o
FileHeader:
diff --git a/llvm/test/ObjectYAML/MachO/sections.yaml b/llvm/test/ObjectYAML/MachO/sections.yaml
index f8c5370ecc37..76d6205f7e48 100644
--- a/llvm/test/ObjectYAML/MachO/sections.yaml
+++ b/llvm/test/ObjectYAML/MachO/sections.yaml
@@ -256,16 +256,16 @@ LoadCommands:
#CHECK: Sections:
#CHECK: - sectname: __text
#CHECK: segname: __TEXT
-#CHECK: addr: 0x0000000100001160
+#CHECK: addr: 0x100001160
#CHECK: size: 3099
-#CHECK: offset: 0x00001160
+#CHECK: offset: 0x1160
#CHECK: align: 4
-#CHECK: reloff: 0x00000000
+#CHECK: reloff: 0x0
#CHECK: nreloc: 0
#CHECK: flags: 0x80000400
-#CHECK: reserved1: 0x00000000
-#CHECK: reserved2: 0x00000000
-#CHECK: reserved3: 0x00000000
+#CHECK: reserved1: 0x0
+#CHECK: reserved2: 0x0
+#CHECK: reserved3: 0x0
#CHECK: - sectname: __stubs
#CHECK: segname: __TEXT
#CHECK: - sectname: __stub_helper
diff --git a/llvm/test/ObjectYAML/MachO/symtab.yaml b/llvm/test/ObjectYAML/MachO/symtab.yaml
index 3992285a52f4..5ba75a15e497 100644
--- a/llvm/test/ObjectYAML/MachO/symtab.yaml
+++ b/llvm/test/ObjectYAML/MachO/symtab.yaml
@@ -363,117 +363,117 @@ LinkEditData:
#CHECK: n_desc: 128
#CHECK: n_value: 4294974832
#CHECK: - n_strx: 420
-#CHECK: n_type: 0x0E
+#CHECK: n_type: 0xE
#CHECK: n_sect: 4
#CHECK: n_desc: 0
#CHECK: n_value: 4294975104
#CHECK: - n_strx: 438
-#CHECK: n_type: 0x0E
+#CHECK: n_type: 0xE
#CHECK: n_sect: 4
#CHECK: n_desc: 0
#CHECK: n_value: 4294975280
#CHECK: - n_strx: 456
-#CHECK: n_type: 0x0F
+#CHECK: n_type: 0xF
#CHECK: n_sect: 1
#CHECK: n_desc: 16
#CHECK: n_value: 4294967296
#CHECK: - n_strx: 476
-#CHECK: n_type: 0x0F
+#CHECK: n_type: 0xF
#CHECK: n_sect: 1
#CHECK: n_desc: 0
#CHECK: n_value: 4294971744
#CHECK: - n_strx: 482
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 512
#CHECK: n_value: 0
#CHECK: - n_strx: 498
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 537
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 567
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 642
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 711
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 774
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 834
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 851
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 875
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 897
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 954
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 982
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 999
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 1018
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 1035
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 256
#CHECK: n_value: 0
#CHECK: - n_strx: 1057
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 512
#CHECK: n_value: 0
#CHECK: - n_strx: 1065
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 512
#CHECK: n_value: 0
#CHECK: - n_strx: 1073
-#CHECK: n_type: 0x01
+#CHECK: n_type: 0x1
#CHECK: n_sect: 0
#CHECK: n_desc: 512
#CHECK: n_value: 0
diff --git a/llvm/test/ObjectYAML/MachO/virtual_section.yaml b/llvm/test/ObjectYAML/MachO/virtual_section.yaml
index 73c7b6baa924..67ede1f2671a 100644
--- a/llvm/test/ObjectYAML/MachO/virtual_section.yaml
+++ b/llvm/test/ObjectYAML/MachO/virtual_section.yaml
@@ -165,64 +165,64 @@ LinkEditData:
# CHECK: - sectname: __text
# CHECK-NEXT: segname: __TEXT
-# CHECK-NEXT: addr: 0x0000000000000000
+# CHECK-NEXT: addr: 0x0
# CHECK-NEXT: size: 72
-# CHECK-NEXT: offset: 0x000002B0
+# CHECK-NEXT: offset: 0x2B0
# CHECK-NEXT: align: 4
-# CHECK-NEXT: reloff: 0x00000350
+# CHECK-NEXT: reloff: 0x350
# CHECK-NEXT: nreloc: 0
# CHECK-NEXT: flags: 0x80000400
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: {{(DEADBEEF|EFBEADDE){18}$}}
# CHECK-NEXT: - sectname: __data
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x0000000000000048
+# CHECK-NEXT: addr: 0x48
# CHECK-NEXT: size: 4
-# CHECK-NEXT: offset: 0x000002F8
+# CHECK-NEXT: offset: 0x2F8
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000000
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x0
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: {{(DEADBEEF|EFBEADDE)$}}
# CHECK-NEXT: - sectname: __bss
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x00000000000000A0
+# CHECK-NEXT: addr: 0xA0
# CHECK-NEXT: size: 8
-# CHECK-NEXT: offset: 0x00000000
+# CHECK-NEXT: offset: 0x0
# CHECK-NEXT: align: 2
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000001
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x1
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: - sectname: __thread_bss
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x00000000000000A8
+# CHECK-NEXT: addr: 0xA8
# CHECK-NEXT: size: 7
-# CHECK-NEXT: offset: 0x00000000
+# CHECK-NEXT: offset: 0x0
# CHECK-NEXT: align: 0
-# CHECK-NEXT: reloff: 0x00000000
+# CHECK-NEXT: reloff: 0x0
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000012
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x12
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: - sectname: __thread_vars
# CHECK-NEXT: segname: __DATA
-# CHECK-NEXT: addr: 0x000000000000004C
+# CHECK-NEXT: addr: 0x4C
# CHECK-NEXT: size: 12
-# CHECK-NEXT: offset: 0x000002FC
+# CHECK-NEXT: offset: 0x2FC
# CHECK-NEXT: align: 0
-# CHECK-NEXT: reloff: 0x00000388
+# CHECK-NEXT: reloff: 0x388
# CHECK-NEXT: nreloc: 0
-# CHECK-NEXT: flags: 0x00000013
-# CHECK-NEXT: reserved1: 0x00000000
-# CHECK-NEXT: reserved2: 0x00000000
-# CHECK-NEXT: reserved3: 0x00000000
+# CHECK-NEXT: flags: 0x13
+# CHECK-NEXT: reserved1: 0x0
+# CHECK-NEXT: reserved2: 0x0
+# CHECK-NEXT: reserved3: 0x0
# CHECK-NEXT: content: {{.*}}
diff --git a/llvm/test/ObjectYAML/MachO/weak_bind_opcode.yaml b/llvm/test/ObjectYAML/MachO/weak_bind_opcode.yaml
index bda4386665ba..f3a0239a77a1 100644
--- a/llvm/test/ObjectYAML/MachO/weak_bind_opcode.yaml
+++ b/llvm/test/ObjectYAML/MachO/weak_bind_opcode.yaml
@@ -107,7 +107,7 @@ LinkEditData:
#CHECK: Imm: 1
#CHECK: - Opcode: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB
#CHECK: Imm: 2
-#CHECK: ULEBExtraData: [ 0x0000000000000000 ]
+#CHECK: ULEBExtraData: [ 0x0 ]
#CHECK: - Opcode: BIND_OPCODE_DO_BIND
#CHECK: Imm: 0
#CHECK: - Opcode: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM
diff --git a/llvm/test/ObjectYAML/wasm/code_section.yaml b/llvm/test/ObjectYAML/wasm/code_section.yaml
index dad75e081ea7..666dfe7e40ea 100644
--- a/llvm/test/ObjectYAML/wasm/code_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/code_section.yaml
@@ -55,7 +55,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: TYPE
# CHECK: Signatures:
@@ -73,10 +73,10 @@ Sections:
# CHECK: Relocations:
# CHECK: - Type: R_WASM_TABLE_INDEX_SLEB
# CHECK: Index: 0
-# CHECK: Offset: 0x00000006
+# CHECK: Offset: 0x6
# CHECK: - Type: R_WASM_FUNCTION_INDEX_LEB
# CHECK: Index: 1
-# CHECK: Offset: 0x00000025
+# CHECK: Offset: 0x25
# CHECK: Functions:
# CHECK: - Index: 0
# CHECK: Locals:
diff --git a/llvm/test/ObjectYAML/wasm/custom_section.yaml b/llvm/test/ObjectYAML/wasm/custom_section.yaml
index 37cdddbff789..934400cfe408 100644
--- a/llvm/test/ObjectYAML/wasm/custom_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/custom_section.yaml
@@ -9,7 +9,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: CUSTOM
# CHECK: Name: foo
diff --git a/llvm/test/ObjectYAML/wasm/data_section.yaml b/llvm/test/ObjectYAML/wasm/data_section.yaml
index fce4be163209..957687e2465f 100644
--- a/llvm/test/ObjectYAML/wasm/data_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/data_section.yaml
@@ -44,17 +44,17 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: DATA
# CHECK-NEXT: Relocations:
# CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
# CHECK-NEXT: Index: 0
-# CHECK-NEXT: Offset: 0x00000006
+# CHECK-NEXT: Offset: 0x6
# CHECK-NEXT: Addend: 8
# CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32
# CHECK-NEXT: Index: 0
-# CHECK-NEXT: Offset: 0x00000006
+# CHECK-NEXT: Offset: 0x6
# CHECK-NEXT: Addend: -6
# CHECK-NEXT: Segments:
# CHECK-NEXT: - SectionOffset: 6
diff --git a/llvm/test/ObjectYAML/wasm/dylink_section.yaml b/llvm/test/ObjectYAML/wasm/dylink_section.yaml
index 9cc3f7d0a4ed..76bb72798be3 100644
--- a/llvm/test/ObjectYAML/wasm/dylink_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/dylink_section.yaml
@@ -14,7 +14,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: CUSTOM
# CHECK: Name: dylink
diff --git a/llvm/test/ObjectYAML/wasm/elem_section.yaml b/llvm/test/ObjectYAML/wasm/elem_section.yaml
index f3f81ba01754..e60db7ddc129 100644
--- a/llvm/test/ObjectYAML/wasm/elem_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/elem_section.yaml
@@ -26,7 +26,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: ELEM
# CHECK: Segments:
diff --git a/llvm/test/ObjectYAML/wasm/event_section.yaml b/llvm/test/ObjectYAML/wasm/event_section.yaml
index 5c64cc815529..ddeabd602645 100644
--- a/llvm/test/ObjectYAML/wasm/event_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/event_section.yaml
@@ -49,7 +49,7 @@ Sections:
# CHECK: --- !WASM
# CHECK-NEXT: FileHeader:
-# CHECK-NEXT: Version: 0x00000001
+# CHECK-NEXT: Version: 0x1
# CHECK-NEXT: Sections:
# CHECK-NEXT: - Type: TYPE
# CHECK-NEXT: Signatures:
@@ -73,7 +73,7 @@ Sections:
# CHECK-NEXT: Relocations:
# CHECK-NEXT: - Type: R_WASM_EVENT_INDEX_LEB
# CHECK-NEXT: Index: 1
-# CHECK-NEXT: Offset: 0x00000006
+# CHECK-NEXT: Offset: 0x6
# CHECK-NEXT: Functions:
# CHECK-NEXT: - Index: 0
# CHECK-NEXT: Locals:
diff --git a/llvm/test/ObjectYAML/wasm/export_section.yaml b/llvm/test/ObjectYAML/wasm/export_section.yaml
index 4b3487cec5a5..fea410a48857 100644
--- a/llvm/test/ObjectYAML/wasm/export_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/export_section.yaml
@@ -49,7 +49,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: EXPORT
# CHECK: Exports:
diff --git a/llvm/test/ObjectYAML/wasm/function_section.yaml b/llvm/test/ObjectYAML/wasm/function_section.yaml
index 8bfe4fa7f58a..4a57c4d2e7c6 100644
--- a/llvm/test/ObjectYAML/wasm/function_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/function_section.yaml
@@ -25,7 +25,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: FUNCTION
# CHECK: FunctionTypes: [ 1, 0 ]
diff --git a/llvm/test/ObjectYAML/wasm/global_section.yaml b/llvm/test/ObjectYAML/wasm/global_section.yaml
index 73e50b57f5dc..e330b072a726 100644
--- a/llvm/test/ObjectYAML/wasm/global_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/global_section.yaml
@@ -14,7 +14,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: GLOBAL
# CHECK: Globals:
diff --git a/llvm/test/ObjectYAML/wasm/header.yaml b/llvm/test/ObjectYAML/wasm/header.yaml
index c4be4c8a4aaf..a182d3e797ce 100644
--- a/llvm/test/ObjectYAML/wasm/header.yaml
+++ b/llvm/test/ObjectYAML/wasm/header.yaml
@@ -5,5 +5,5 @@ FileHeader:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: ...
diff --git a/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml b/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml
index b6ca9fa44f96..087ce8435087 100644
--- a/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml
+++ b/llvm/test/ObjectYAML/wasm/import_memory_shared.yaml
@@ -23,7 +23,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: IMPORT
# CHECK: Imports:
@@ -32,6 +32,6 @@ Sections:
# CHECK: Kind: MEMORY
# CHECK: Memory:
# CHECK: Flags: [ HAS_MAX, IS_SHARED ]
-# CHECK: Initial: 0x00000010
-# CHECK: Maximum: 0x00000011
+# CHECK: Initial: 0x10
+# CHECK: Maximum: 0x11
# CHECK: ...
diff --git a/llvm/test/ObjectYAML/wasm/import_section.yaml b/llvm/test/ObjectYAML/wasm/import_section.yaml
index 58dae6da5f33..bc71e5f2ab20 100644
--- a/llvm/test/ObjectYAML/wasm/import_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/import_section.yaml
@@ -41,7 +41,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: IMPORT
# CHECK: Imports:
@@ -59,8 +59,8 @@ Sections:
# CHECK: Kind: MEMORY
# CHECK: Memory:
# CHECK: Flags: [ HAS_MAX ]
-# CHECK: Initial: 0x00000010
-# CHECK: Maximum: 0x00000011
+# CHECK: Initial: 0x10
+# CHECK: Maximum: 0x11
# CHECK: - Module: foo
# CHECK: Field: imported_table
# CHECK: Kind: TABLE
@@ -68,6 +68,6 @@ Sections:
# CHECK: ElemType: FUNCREF
# CHECK: Limits:
# CHECK: Flags: [ HAS_MAX ]
-# CHECK: Initial: 0x00000020
-# CHECK: Maximum: 0x00000022
+# CHECK: Initial: 0x20
+# CHECK: Maximum: 0x22
# CHECK: ...
diff --git a/llvm/test/ObjectYAML/wasm/memory_section.yaml b/llvm/test/ObjectYAML/wasm/memory_section.yaml
index 9ab05241dd85..22ca72419af8 100644
--- a/llvm/test/ObjectYAML/wasm/memory_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/memory_section.yaml
@@ -12,12 +12,12 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: MEMORY
# CHECK: Memories:
# CHECK: - Flags: [ HAS_MAX ]
-# CHECK: Initial: 0x00000002
-# CHECK: Maximum: 0x000000FF
-# CHECK: - Initial: 0x00000003
+# CHECK: Initial: 0x2
+# CHECK: Maximum: 0xFF
+# CHECK: - Initial: 0x3
# CHECK: ...
diff --git a/llvm/test/ObjectYAML/wasm/start_section.yaml b/llvm/test/ObjectYAML/wasm/start_section.yaml
index 754adea5a18b..69a5240ef1fd 100644
--- a/llvm/test/ObjectYAML/wasm/start_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/start_section.yaml
@@ -27,7 +27,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: START
# CHECK: StartFunction: 1
diff --git a/llvm/test/ObjectYAML/wasm/table_section.yaml b/llvm/test/ObjectYAML/wasm/table_section.yaml
index 3ce425bbbea3..18cff6de4166 100644
--- a/llvm/test/ObjectYAML/wasm/table_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/table_section.yaml
@@ -14,7 +14,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: TABLE
# CHECK: Tables:
@@ -22,6 +22,6 @@ Sections:
# CHECK: ElemType: FUNCREF
# CHECK: Limits:
# CHECK: Flags: [ HAS_MAX ]
-# CHECK: Initial: 0x00000010
-# CHECK: Maximum: 0x00000011
+# CHECK: Initial: 0x10
+# CHECK: Maximum: 0x11
# CHECK: ...
diff --git a/llvm/test/ObjectYAML/wasm/type_section.yaml b/llvm/test/ObjectYAML/wasm/type_section.yaml
index beb3a16e766a..271e2133cd70 100644
--- a/llvm/test/ObjectYAML/wasm/type_section.yaml
+++ b/llvm/test/ObjectYAML/wasm/type_section.yaml
@@ -20,7 +20,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: TYPE
# CHECK: Signatures:
diff --git a/llvm/test/ObjectYAML/wasm/weak_symbols.yaml b/llvm/test/ObjectYAML/wasm/weak_symbols.yaml
index 82bc70c244f4..ed39a7d190f4 100644
--- a/llvm/test/ObjectYAML/wasm/weak_symbols.yaml
+++ b/llvm/test/ObjectYAML/wasm/weak_symbols.yaml
@@ -52,7 +52,7 @@ Sections:
...
# CHECK: --- !WASM
# CHECK: FileHeader:
-# CHECK: Version: 0x00000001
+# CHECK: Version: 0x1
# CHECK: Sections:
# CHECK: - Type: EXPORT
# CHECK: Exports:
diff --git a/llvm/test/tools/dsymutil/ARM/extern-alias.test b/llvm/test/tools/dsymutil/ARM/extern-alias.test
index 42b31c4d98d2..91297ac6ef54 100644
--- a/llvm/test/tools/dsymutil/ARM/extern-alias.test
+++ b/llvm/test/tools/dsymutil/ARM/extern-alias.test
@@ -38,5 +38,5 @@ $ xcrun --sdk iphoneos clang private_extern.o main.o -target arm64-apple-ios14.0
RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/private_extern/private_extern.out -o %t.dSYM --verbose 2>&1 | FileCheck %s
RUN: dsymutil -oso-prepend-path %p/../Inputs %p/../Inputs/private/tmp/extern/extern.out -o %t.dSYM --verbose 2>&1 | FileCheck %s
CHECK-NOT: could not find object file symbol for symbol _baz
-CHECK: { sym: _foo, objAddr: 0x0000000000000000, binAddr: 0x0000000100007F58, size: 0x00000020 }
-CHECK: { sym: _baz, objAddr: 0x0000000000000000, binAddr: 0x0000000100007F58, size: 0x00000000 }
+CHECK: { sym: _foo, objAddr: 0x0, binAddr: 0x100007F58, size: 0x20 }
+CHECK: { sym: _baz, objAddr: 0x0, binAddr: 0x100007F58, size: 0x0 }
diff --git a/llvm/test/tools/dsymutil/X86/common-sym-multi.test b/llvm/test/tools/dsymutil/X86/common-sym-multi.test
index 1f33b37283b4..ff970a53bfec 100644
--- a/llvm/test/tools/dsymutil/X86/common-sym-multi.test
+++ b/llvm/test/tools/dsymutil/X86/common-sym-multi.test
@@ -33,7 +33,7 @@ CHECK: DW_AT_location{{.*}}DW_OP_addr 0x100001000)
DEBUGMAP: filename:{{.*}}common1.o
DEBUGMAP: symbols:
-DEBUGMAP: sym: _i, binAddr: 0x0000000100001000, size: 0x00000000
+DEBUGMAP: sym: _i, binAddr: 0x100001000, size: 0x0
DEBUGMAP: filename:{{.*}}common2.o
DEBUGMAP: symbols:
-DEBUGMAP: sym: _i, binAddr: 0x0000000100001000, size: 0x00000000
+DEBUGMAP: sym: _i, binAddr: 0x100001000, size: 0x0
diff --git a/llvm/test/tools/dsymutil/debug-map-parsing.test b/llvm/test/tools/dsymutil/debug-map-parsing.test
index 68701ff32076..fb4226093da1 100644
--- a/llvm/test/tools/dsymutil/debug-map-parsing.test
+++ b/llvm/test/tools/dsymutil/debug-map-parsing.test
@@ -12,16 +12,16 @@ CHECK: ---
CHECK: triple: 'x86_64-apple-darwin'
CHECK: binary-path:{{.*}}/Inputs/basic.macho.x86_64
CHECK: filename:{{.*}}/Inputs/basic1.macho.x86_64.o
-CHECK-DAG: sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000EA0, size: 0x00000024
+CHECK-DAG: sym: _main, objAddr: 0x0, binAddr: 0x100000EA0, size: 0x24
CHECK: filename{{.*}}/Inputs/basic2.macho.x86_64.o
-CHECK-DAG: sym: _baz, objAddr: 0x0000000000000310, binAddr: 0x0000000100001000, size: 0x00000000
-CHECK-DAG: sym: _foo, objAddr: 0x0000000000000020, binAddr: 0x0000000100000ED0, size: 0x00000050
-CHECK-DAG: sym: _inc, objAddr: 0x0000000000000070, binAddr: 0x0000000100000F20, size: 0x00000017
-CHECK-DAG: sym: _private_int, objAddr: 0x0000000000000560, binAddr: 0x0000000100001008, size: 0x00000000
+CHECK-DAG: sym: _baz, objAddr: 0x310, binAddr: 0x100001000, size: 0x0
+CHECK-DAG: sym: _foo, objAddr: 0x20, binAddr: 0x100000ED0, size: 0x50
+CHECK-DAG: sym: _inc, objAddr: 0x70, binAddr: 0x100000F20, size: 0x17
+CHECK-DAG: sym: _private_int, objAddr: 0x560, binAddr: 0x100001008, size: 0x0
CHECK: filename{{.*}}/Inputs/basic3.macho.x86_64.o
-CHECK-DAG: sym: _bar, objAddr: 0x0000000000000020, binAddr: 0x0000000100000F40, size: 0x00000050
-CHECK-DAG: sym: _inc, objAddr: 0x0000000000000070, binAddr: 0x0000000100000F90, size: 0x00000019
-CHECK-DAG: sym: _val, binAddr: 0x0000000100001004, size: 0x00000000
+CHECK-DAG: sym: _bar, objAddr: 0x20, binAddr: 0x100000F40, size: 0x50
+CHECK-DAG: sym: _inc, objAddr: 0x70, binAddr: 0x100000F90, size: 0x19
+CHECK-DAG: sym: _val, binAddr: 0x100001004, size: 0x0
CHECK: ...
@@ -32,12 +32,12 @@ CHECK-LTO: ---
CHECK-LTO: triple: 'x86_64-apple-darwin'
CHECK-LTO: binary-path:{{.*}}/Inputs/basic-lto.macho.x86_64
CHECK-LTO: /Inputs/basic-lto.macho.x86_64.o
-CHECK-LTO-DAG: sym: _bar, objAddr: 0x0000000000000050, binAddr: 0x0000000100000F90, size: 0x00000024
-CHECK-LTO-DAG: sym: _baz, objAddr: 0x0000000000000658, binAddr: 0x0000000100001000, size: 0x00000000
-CHECK-LTO-DAG: sym: _foo, objAddr: 0x0000000000000010, binAddr: 0x0000000100000F50, size: 0x00000040
-CHECK-LTO-DAG: sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000F40, size: 0x00000010
-CHECK-LTO-DAG: sym: _private_int, objAddr: 0x00000000000008E8, binAddr: 0x0000000100001008, size: 0x00000000
-CHECK-LTO-DAG: sym: _val, objAddr: 0x00000000000008EC, binAddr: 0x0000000100001004, size: 0x00000000
+CHECK-LTO-DAG: sym: _bar, objAddr: 0x50, binAddr: 0x100000F90, size: 0x24
+CHECK-LTO-DAG: sym: _baz, objAddr: 0x658, binAddr: 0x100001000, size: 0x0
+CHECK-LTO-DAG: sym: _foo, objAddr: 0x10, binAddr: 0x100000F50, size: 0x40
+CHECK-LTO-DAG: sym: _main, objAddr: 0x0, binAddr: 0x100000F40, size: 0x10
+CHECK-LTO-DAG: sym: _private_int, objAddr: 0x8E8, binAddr: 0x100001008, size: 0x0
+CHECK-LTO-DAG: sym: _val, objAddr: 0x8EC, binAddr: 0x100001004, size: 0x0
CHECK-LTO: ...
Check thet we correctly handle debug maps with archive members (including only
@@ -56,16 +56,16 @@ CHECK-ARCHIVE: ---
CHECK-ARCHIVE: triple: 'x86_64-apple-darwin'
CHECK-ARCHIVE: binary-path:{{.*}}/Inputs/basic-archive.macho.x86_64
CHECK-ARCHIVE: /Inputs/basic1.macho.x86_64.o
-CHECK-ARCHIVE-DAG: sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000EA0, size: 0x00000024
+CHECK-ARCHIVE-DAG: sym: _main, objAddr: 0x0, binAddr: 0x100000EA0, size: 0x24
CHECK-ARCHIVE: /Inputs/./libbasic.a(basic2.macho.x86_64.o)
-CHECK-ARCHIVE-DAG: sym: _baz, objAddr: 0x0000000000000310, binAddr: 0x0000000100001000, size: 0x00000000
-CHECK-ARCHIVE-DAG: sym: _foo, objAddr: 0x0000000000000020, binAddr: 0x0000000100000ED0, size: 0x00000050
-CHECK-ARCHIVE-DAG: sym: _inc, objAddr: 0x0000000000000070, binAddr: 0x0000000100000F20, size: 0x00000017
-CHECK-ARCHIVE-DAG: sym: _private_int, objAddr: 0x0000000000000560, binAddr: 0x0000000100001004, size: 0x00000000
+CHECK-ARCHIVE-DAG: sym: _baz, objAddr: 0x310, binAddr: 0x100001000, size: 0x0
+CHECK-ARCHIVE-DAG: sym: _foo, objAddr: 0x20, binAddr: 0x100000ED0, size: 0x50
+CHECK-ARCHIVE-DAG: sym: _inc, objAddr: 0x70, binAddr: 0x100000F20, size: 0x17
+CHECK-ARCHIVE-DAG: sym: _private_int, objAddr: 0x560, binAddr: 0x100001004, size: 0x0
CHECK-ARCHIVE: /Inputs/./libbasic.a(basic3.macho.x86_64.o)
-CHECK-ARCHIVE-DAG: sym: _bar, objAddr: 0x0000000000000020, binAddr: 0x0000000100000F40, size: 0x00000050
-CHECK-ARCHIVE-DAG: sym: _inc, objAddr: 0x0000000000000070, binAddr: 0x0000000100000F90, size: 0x00000019
-CHECK-ARCHIVE-DAG: sym: _val, binAddr: 0x0000000100001008, size: 0x00000000
+CHECK-ARCHIVE-DAG: sym: _bar, objAddr: 0x20, binAddr: 0x100000F40, size: 0x50
+CHECK-ARCHIVE-DAG: sym: _inc, objAddr: 0x70, binAddr: 0x100000F90, size: 0x19
+CHECK-ARCHIVE-DAG: sym: _val, binAddr: 0x100001008, size: 0x0
CHECK-ARCHIVE: ...
Check that we warn about missing object files (this presumes that the files aren't
diff --git a/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test b/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test
index a14217d3947a..09b5ccf1e6d5 100644
--- a/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test
+++ b/llvm/test/tools/dsymutil/yaml-object-address-rewrite.test
@@ -11,21 +11,21 @@
# CHECK-NEXT: filename:{{.*}}/Inputs/basic1.macho.x86_64.o
# CHECK-NEXT: timestamp: 0
# CHECK-NEXT: symbols:
-# CHECK-NEXT: sym: _main, objAddr: 0x0000000000000000, binAddr: 0x0000000100000EA0, size: 0x00000024
+# CHECK-NEXT: sym: _main, objAddr: 0x0, binAddr: 0x100000EA0, size: 0x24
# CHECK-NEXT: filename:{{.*}}/Inputs/./libbasic.a(basic2.macho.x86_64.o)'
# CHECK-NEXT: timestamp: 0
# CHECK-NEXT: symbols:
-# CHECK-DAG: sym: _foo, objAddr: 0x0000000000000020, binAddr: 0x0000000100000ED0, size: 0x00000050
-# CHECK-DAG: sym: _private_int, objAddr: 0x0000000000000560, binAddr: 0x0000000100001004, size: 0x00000000
-# CHECK-DAG: sym: _inc, objAddr: 0x0000000000000070, binAddr: 0x0000000100000F20, size: 0x00000017
-# CHECK-DAG: sym: _baz, objAddr: 0x0000000000000310, binAddr: 0x0000000100001000, size: 0x00000000
+# CHECK-DAG: sym: _foo, objAddr: 0x20, binAddr: 0x100000ED0, size: 0x50
+# CHECK-DAG: sym: _private_int, objAddr: 0x560, binAddr: 0x100001004, size: 0x0
+# CHECK-DAG: sym: _inc, objAddr: 0x70, binAddr: 0x100000F20, size: 0x17
+# CHECK-DAG: sym: _baz, objAddr: 0x310, binAddr: 0x100001000, size: 0x0
# CHECK-NOT: { sym:
# CHECK-NEXT: filename:{{.*}}/Inputs/./libbasic.a(basic3.macho.x86_64.o)'
# CHECK-NEXT: timestamp: 0
# CHECK-NEXT: symbols:
-# CHECK-DAG: sym: _val, binAddr: 0x0000000100001008, size: 0x00000000
-# CHECK-DAG: sym: _bar, objAddr: 0x0000000000000020, binAddr: 0x0000000100000F40, size: 0x00000050
-# CHECK-DAG: sym: _inc, objAddr: 0x0000000000000070, binAddr: 0x0000000100000F90, size: 0x00000019
+# CHECK-DAG: sym: _val, binAddr: 0x100001008, size: 0x0
+# CHECK-DAG: sym: _bar, objAddr: 0x20, binAddr: 0x100000F40, size: 0x50
+# CHECK-DAG: sym: _inc, objAddr: 0x70, binAddr: 0x100000F90, size: 0x19
# CHECK-NOT: { sym:
# CHECK-NEXT: ...
---
diff --git a/llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test b/llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test
index 3f796ae9d740..c8905c30545a 100644
--- a/llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test
+++ b/llvm/test/tools/llvm-xray/AArch64/extract-instrmap.test
@@ -5,21 +5,21 @@
# RUN: llvm-xray extract %t.so -s | FileCheck %s
# CHECK: ---
-# CHECK-NEXT: - { id: 1, address: 0x0000000000000420, function: 0x0000000000000420, kind: function-enter, always-instrument: true, function-name: 'foo()' }
-# CHECK-NEXT: - { id: 1, address: 0x0000000000000440, function: 0x0000000000000420, kind: function-exit, always-instrument: true, function-name: 'foo()' }
-# CHECK-NEXT: - { id: 2, address: 0x0000000000000464, function: 0x0000000000000464, kind: function-enter, always-instrument: true, function-name: 'bar()' }
-# CHECK-NEXT: - { id: 2, address: 0x0000000000000484, function: 0x0000000000000464, kind: function-exit, always-instrument: true, function-name: 'bar()' }
-# CHECK-NEXT: - { id: 3, address: 0x00000000000004A8, function: 0x00000000000004A8, kind: function-enter, always-instrument: true, function-name: 'jar()' }
-# CHECK-NEXT: - { id: 3, address: 0x00000000000004C8, function: 0x00000000000004A8, kind: function-exit, always-instrument: true, function-name: 'jar()' }
+# CHECK-NEXT: - { id: 1, address: 0x420, function: 0x420, kind: function-enter, always-instrument: true, function-name: 'foo()' }
+# CHECK-NEXT: - { id: 1, address: 0x440, function: 0x420, kind: function-exit, always-instrument: true, function-name: 'foo()' }
+# CHECK-NEXT: - { id: 2, address: 0x464, function: 0x464, kind: function-enter, always-instrument: true, function-name: 'bar()' }
+# CHECK-NEXT: - { id: 2, address: 0x484, function: 0x464, kind: function-exit, always-instrument: true, function-name: 'bar()' }
+# CHECK-NEXT: - { id: 3, address: 0x4A8, function: 0x4A8, kind: function-enter, always-instrument: true, function-name: 'jar()' }
+# CHECK-NEXT: - { id: 3, address: 0x4C8, function: 0x4A8, kind: function-exit, always-instrument: true, function-name: 'jar()' }
# CHECK-NEXT: ...
# RUN: llvm-xray extract -s --no-demangle %t.so | FileCheck --check-prefix=MANGLED %s
# MANGLED: ---
-# MANGLED-NEXT: - { id: 1, address: 0x0000000000000420, function: 0x0000000000000420, kind: function-enter, always-instrument: true, function-name: _Z3foov }
-# MANGLED-NEXT: - { id: 1, address: 0x0000000000000440, function: 0x0000000000000420, kind: function-exit, always-instrument: true, function-name: _Z3foov }
-# MANGLED-NEXT: - { id: 2, address: 0x0000000000000464, function: 0x0000000000000464, kind: function-enter, always-instrument: true, function-name: _Z3barv }
-# MANGLED-NEXT: - { id: 2, address: 0x0000000000000484, function: 0x0000000000000464, kind: function-exit, always-instrument: true, function-name: _Z3barv }
-# MANGLED-NEXT: - { id: 3, address: 0x00000000000004A8, function: 0x00000000000004A8, kind: function-enter, always-instrument: true, function-name: _Z3jarv }
-# MANGLED-NEXT: - { id: 3, address: 0x00000000000004C8, function: 0x00000000000004A8, kind: function-exit, always-instrument: true, function-name: _Z3jarv }
+# MANGLED-NEXT: - { id: 1, address: 0x420, function: 0x420, kind: function-enter, always-instrument: true, function-name: _Z3foov }
+# MANGLED-NEXT: - { id: 1, address: 0x440, function: 0x420, kind: function-exit, always-instrument: true, function-name: _Z3foov }
+# MANGLED-NEXT: - { id: 2, address: 0x464, function: 0x464, kind: function-enter, always-instrument: true, function-name: _Z3barv }
+# MANGLED-NEXT: - { id: 2, address: 0x484, function: 0x464, kind: function-exit, always-instrument: true, function-name: _Z3barv }
+# MANGLED-NEXT: - { id: 3, address: 0x4A8, function: 0x4A8, kind: function-enter, always-instrument: true, function-name: _Z3jarv }
+# MANGLED-NEXT: - { id: 3, address: 0x4C8, function: 0x4A8, kind: function-exit, always-instrument: true, function-name: _Z3jarv }
# MANGLED-NEXT: ...
diff --git a/llvm/test/tools/llvm-xray/ARM/extract-instrmap.test b/llvm/test/tools/llvm-xray/ARM/extract-instrmap.test
index 51694df32b73..334c3e610428 100644
--- a/llvm/test/tools/llvm-xray/ARM/extract-instrmap.test
+++ b/llvm/test/tools/llvm-xray/ARM/extract-instrmap.test
@@ -129,21 +129,21 @@ DynamicSymbols:
# RUN: llvm-xray extract %t.so -s | FileCheck %s
# CHECK: ---
-# CHECK-NEXT: - { id: 1, address: 0x00000000000012B0, function: 0x00000000000012B0, kind: function-enter, always-instrument: true, function-name: 'foo()' }
-# CHECK-NEXT: - { id: 1, address: 0x00000000000012CC, function: 0x00000000000012B0, kind: function-exit, always-instrument: true, function-name: 'foo()' }
-# CHECK-NEXT: - { id: 2, address: 0x00000000000012EC, function: 0x00000000000012EC, kind: function-enter, always-instrument: true, function-name: 'bar()' }
-# CHECK-NEXT: - { id: 2, address: 0x0000000000001308, function: 0x00000000000012EC, kind: function-exit, always-instrument: true, function-name: 'bar()' }
-# CHECK-NEXT: - { id: 3, address: 0x0000000000001328, function: 0x0000000000001328, kind: function-enter, always-instrument: true, function-name: 'jar()' }
-# CHECK-NEXT: - { id: 3, address: 0x0000000000001344, function: 0x0000000000001328, kind: function-exit, always-instrument: true, function-name: 'jar()' }
+# CHECK-NEXT: - { id: 1, address: 0x12B0, function: 0x12B0, kind: function-enter, always-instrument: true, function-name: 'foo()' }
+# CHECK-NEXT: - { id: 1, address: 0x12CC, function: 0x12B0, kind: function-exit, always-instrument: true, function-name: 'foo()' }
+# CHECK-NEXT: - { id: 2, address: 0x12EC, function: 0x12EC, kind: function-enter, always-instrument: true, function-name: 'bar()' }
+# CHECK-NEXT: - { id: 2, address: 0x1308, function: 0x12EC, kind: function-exit, always-instrument: true, function-name: 'bar()' }
+# CHECK-NEXT: - { id: 3, address: 0x1328, function: 0x1328, kind: function-enter, always-instrument: true, function-name: 'jar()' }
+# CHECK-NEXT: - { id: 3, address: 0x1344, function: 0x1328, kind: function-exit, always-instrument: true, function-name: 'jar()' }
# CHECK-NEXT: ...
# RUN: llvm-xray extract -s --no-demangle %t.so | FileCheck --check-prefix=MANGLED %s
# MANGLED: ---
-# MANGLED-NEXT: - { id: 1, address: 0x00000000000012B0, function: 0x00000000000012B0, kind: function-enter, always-instrument: true, function-name: _Z3foov }
-# MANGLED-NEXT: - { id: 1, address: 0x00000000000012CC, function: 0x00000000000012B0, kind: function-exit, always-instrument: true, function-name: _Z3foov }
-# MANGLED-NEXT: - { id: 2, address: 0x00000000000012EC, function: 0x00000000000012EC, kind: function-enter, always-instrument: true, function-name: _Z3barv }
-# MANGLED-NEXT: - { id: 2, address: 0x0000000000001308, function: 0x00000000000012EC, kind: function-exit, always-instrument: true, function-name: _Z3barv }
-# MANGLED-NEXT: - { id: 3, address: 0x0000000000001328, function: 0x0000000000001328, kind: function-enter, always-instrument: true, function-name: _Z3jarv }
-# MANGLED-NEXT: - { id: 3, address: 0x0000000000001344, function: 0x0000000000001328, kind: function-exit, always-instrument: true, function-name: _Z3jarv }
+# MANGLED-NEXT: - { id: 1, address: 0x12B0, function: 0x12B0, kind: function-enter, always-instrument: true, function-name: _Z3foov }
+# MANGLED-NEXT: - { id: 1, address: 0x12CC, function: 0x12B0, kind: function-exit, always-instrument: true, function-name: _Z3foov }
+# MANGLED-NEXT: - { id: 2, address: 0x12EC, function: 0x12EC, kind: function-enter, always-instrument: true, function-name: _Z3barv }
+# MANGLED-NEXT: - { id: 2, address: 0x1308, function: 0x12EC, kind: function-exit, always-instrument: true, function-name: _Z3barv }
+# MANGLED-NEXT: - { id: 3, address: 0x1328, function: 0x1328, kind: function-enter, always-instrument: true, function-name: _Z3jarv }
+# MANGLED-NEXT: - { id: 3, address: 0x1344, function: 0x1328, kind: function-exit, always-instrument: true, function-name: _Z3jarv }
# MANGLED-NEXT: ...
diff --git a/llvm/test/tools/llvm-xray/X86/extract-instrmap-macho.ll b/llvm/test/tools/llvm-xray/X86/extract-instrmap-macho.ll
index a42307945f23..08ce08fcefb5 100644
--- a/llvm/test/tools/llvm-xray/X86/extract-instrmap-macho.ll
+++ b/llvm/test/tools/llvm-xray/X86/extract-instrmap-macho.ll
@@ -4,6 +4,6 @@
; RUN: llvm-xray extract %S/Inputs/instr-map-mach.o -s | FileCheck %s
; CHECK: ---
-; CHECK-NEXT: - { id: 1, address: 0x0000000000000000, function: 0x0000000000000000, kind: function-enter, always-instrument: true, function-name: 'task(void*)' }
-; CHECK-NEXT: - { id: 1, address: 0x0000000000000162, function: 0x0000000000000000, kind: function-exit, always-instrument: true, function-name: 'task(void*)' }
+; CHECK-NEXT: - { id: 1, address: 0x0, function: 0x0, kind: function-enter, always-instrument: true, function-name: 'task(void*)' }
+; CHECK-NEXT: - { id: 1, address: 0x162, function: 0x0, kind: function-exit, always-instrument: true, function-name: 'task(void*)' }
; CHECK-NEXT: ...
diff --git a/llvm/test/tools/llvm-xray/X86/extract-instrmap-pie.ll b/llvm/test/tools/llvm-xray/X86/extract-instrmap-pie.ll
index 987aaf980105..1bff8e252aa1 100644
--- a/llvm/test/tools/llvm-xray/X86/extract-instrmap-pie.ll
+++ b/llvm/test/tools/llvm-xray/X86/extract-instrmap-pie.ll
@@ -4,8 +4,8 @@
; RUN: llvm-xray extract %S/Inputs/elf64-pie.bin -s | FileCheck %s
; CHECK: ---
-; CHECK-NEXT: - { id: 1, address: 0x00000000000299C0, function: 0x00000000000299C0, kind: function-enter, always-instrument: true, function-name: {{.*foo.*}} }
-; CHECK-NEXT: - { id: 1, address: 0x00000000000299D0, function: 0x00000000000299C0, kind: function-exit, always-instrument: true, function-name: {{.*foo.*}} }
-; CHECK-NEXT: - { id: 2, address: 0x00000000000299E0, function: 0x00000000000299E0, kind: function-enter, always-instrument: true, function-name: {{.*bar.*}} }
-; CHECK-NEXT: - { id: 2, address: 0x00000000000299F6, function: 0x00000000000299E0, kind: function-exit, always-instrument: true, function-name: {{.*bar.*}} }
+; CHECK-NEXT: - { id: 1, address: 0x299C0, function: 0x299C0, kind: function-enter, always-instrument: true, function-name: {{.*foo.*}} }
+; CHECK-NEXT: - { id: 1, address: 0x299D0, function: 0x299C0, kind: function-exit, always-instrument: true, function-name: {{.*foo.*}} }
+; CHECK-NEXT: - { id: 2, address: 0x299E0, function: 0x299E0, kind: function-enter, always-instrument: true, function-name: {{.*bar.*}} }
+; CHECK-NEXT: - { id: 2, address: 0x299F6, function: 0x299E0, kind: function-exit, always-instrument: true, function-name: {{.*bar.*}} }
; CHECK-NEXT: ...
diff --git a/llvm/test/tools/llvm-xray/X86/extract-instrmap-symbolize.ll b/llvm/test/tools/llvm-xray/X86/extract-instrmap-symbolize.ll
index 86358ca5c13f..d9932aa8191f 100644
--- a/llvm/test/tools/llvm-xray/X86/extract-instrmap-symbolize.ll
+++ b/llvm/test/tools/llvm-xray/X86/extract-instrmap-symbolize.ll
@@ -3,8 +3,8 @@
; RUN: llvm-xray extract %S/Inputs/elf64-example.bin -s | FileCheck %s
; CHECK: ---
-; CHECK-NEXT: - { id: 1, address: 0x000000000041C900, function: 0x000000000041C900, kind: function-enter, always-instrument: true, function-name: {{.*foo.*}} }
-; CHECK-NEXT: - { id: 1, address: 0x000000000041C912, function: 0x000000000041C900, kind: function-exit, always-instrument: true, function-name: {{.*foo.*}} }
-; CHECK-NEXT: - { id: 2, address: 0x000000000041C930, function: 0x000000000041C930, kind: function-enter, always-instrument: true, function-name: {{.*bar.*}} }
-; CHECK-NEXT: - { id: 2, address: 0x000000000041C946, function: 0x000000000041C930, kind: function-exit, always-instrument: true, function-name: {{.*bar.*}} }
+; CHECK-NEXT: - { id: 1, address: 0x41C900, function: 0x41C900, kind: function-enter, always-instrument: true, function-name: {{.*foo.*}} }
+; CHECK-NEXT: - { id: 1, address: 0x41C912, function: 0x41C900, kind: function-exit, always-instrument: true, function-name: {{.*foo.*}} }
+; CHECK-NEXT: - { id: 2, address: 0x41C930, function: 0x41C930, kind: function-enter, always-instrument: true, function-name: {{.*bar.*}} }
+; CHECK-NEXT: - { id: 2, address: 0x41C946, function: 0x41C930, kind: function-exit, always-instrument: true, function-name: {{.*bar.*}} }
; CHECK-NEXT: ...
diff --git a/llvm/test/tools/llvm-xray/X86/extract-instrmap.ll b/llvm/test/tools/llvm-xray/X86/extract-instrmap.ll
index c036944bd382..435c82c8b9d6 100644
--- a/llvm/test/tools/llvm-xray/X86/extract-instrmap.ll
+++ b/llvm/test/tools/llvm-xray/X86/extract-instrmap.ll
@@ -4,8 +4,8 @@
; RUN: llvm-xray extract %S/Inputs/elf64-example.bin | FileCheck %s
; CHECK: ---
-; CHECK-NEXT: - { id: 1, address: 0x000000000041C900, function: 0x000000000041C900, kind: function-enter, always-instrument: true{{.*}} }
-; CHECK-NEXT: - { id: 1, address: 0x000000000041C912, function: 0x000000000041C900, kind: function-exit, always-instrument: true{{.*}} }
-; CHECK-NEXT: - { id: 2, address: 0x000000000041C930, function: 0x000000000041C930, kind: function-enter, always-instrument: true{{.*}} }
-; CHECK-NEXT: - { id: 2, address: 0x000000000041C946, function: 0x000000000041C930, kind: function-exit, always-instrument: true{{.*}} }
+; CHECK-NEXT: - { id: 1, address: 0x41C900, function: 0x41C900, kind: function-enter, always-instrument: true{{.*}} }
+; CHECK-NEXT: - { id: 1, address: 0x41C912, function: 0x41C900, kind: function-exit, always-instrument: true{{.*}} }
+; CHECK-NEXT: - { id: 2, address: 0x41C930, function: 0x41C930, kind: function-enter, always-instrument: true{{.*}} }
+; CHECK-NEXT: - { id: 2, address: 0x41C946, function: 0x41C930, kind: function-exit, always-instrument: true{{.*}} }
; CHECK-NEXT: ...
diff --git a/llvm/test/tools/obj2yaml/Archives/regular.yaml b/llvm/test/tools/obj2yaml/Archives/regular.yaml
index d62267c24a85..923d99dec812 100644
--- a/llvm/test/tools/obj2yaml/Archives/regular.yaml
+++ b/llvm/test/tools/obj2yaml/Archives/regular.yaml
@@ -36,7 +36,7 @@ Members: []
# MULTIPLE-NEXT: AccessMode: '987'
# MULTIPLE-NEXT: Size: '7'
# MULTIPLE-NEXT: Content: 2063636363200A
-# MULTIPLE-NEXT: PaddingByte: 0x0A
+# MULTIPLE-NEXT: PaddingByte: 0xA
# MULTIPLE-NEXT: - LastModified: ''
# MULTIPLE-NEXT: UID: ''
# MULTIPLE-NEXT: GID: ''
@@ -156,5 +156,5 @@ Members:
# PADDING-BYTE-NEXT: Members:
# PADDING-BYTE-NEXT: - Size: '1'
# PADDING-BYTE-NEXT: Content: '61'
-# PADDING-BYTE-NEXT: PaddingByte: 0x0A
+# PADDING-BYTE-NEXT: PaddingByte: 0xA
# PADDING-BYTE-NEXT: ...
diff --git a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-addr.yaml b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-addr.yaml
index 2bdb1bf74006..556473fc6956 100644
--- a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-addr.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-addr.yaml
@@ -6,70 +6,58 @@
# RUN: yaml2obj --docnum=1 %s -DADDRESS=0xFFFFFFFFFFFFFFFF \
# RUN: -DADDRSIZE=4 | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections: \
-# RUN: -DLENGTH1=0x0000000000000014 \
-# RUN: -DADDRSIZE1=0x08 \
-# RUN: -DADDR=0xFFFFFFFFFFFFFFFF \
-# RUN: -DLENGTH2=0x000000000000000C \
-# RUN: -DADDRSIZE2=0x04
+# RUN: -DLENGTH1=0x14 -DADDRSIZE1=0x8 -DADDR=0xFFFFFFFFFFFFFFFF \
+# RUN: -DLENGTH2=0xC -DADDRSIZE2=0x4
## Dumping address tables from a big endian 64-bit object file.
# RUN: yaml2obj --docnum=1 %s -DENDIAN=MSB -DADDRESS=0xFFFFFFFFFFFFFFFF \
# RUN: -DADDRSIZE=4 | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections: \
-# RUN: -DLENGTH1=0x0000000000000014 \
-# RUN: -DADDRSIZE1=0x08 \
-# RUN: -DADDR=0xFFFFFFFFFFFFFFFF \
-# RUN: -DLENGTH2=0x000000000000000C \
-# RUN: -DADDRSIZE2=0x04
+# RUN: -DLENGTH1=0x14 -DADDRSIZE1=0x8 -DADDR=0xFFFFFFFFFFFFFFFF \
+# RUN: -DLENGTH2=0xC -DADDRSIZE2=0x4
## Dumping address tables from a little endian 32-bit object file.
# RUN: yaml2obj --docnum=1 %s -DBITS=32 -DADDRESS=0xFFFFFFFF \
# RUN: -DADDRSIZE=8 | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections: \
-# RUN: -DLENGTH1=0x000000000000000C \
-# RUN: -DADDRSIZE1=0x04 \
-# RUN: -DADDR=0x00000000FFFFFFFF \
-# RUN: -DLENGTH2=0x0000000000000014 \
-# RUN: -DADDRSIZE2=0x08
+# RUN: -DLENGTH1=0xC -DADDRSIZE1=0x4 -DADDR=0xFFFFFFFF \
+# RUN: -DLENGTH2=0x14 -DADDRSIZE2=0x8
## Dumping address tables from a big endian 32-bit object file.
# RUN: yaml2obj --docnum=1 %s -DBITS=32 -DENDIAN=MSB -DADDRESS=0xFFFFFFFF \
# RUN: -DADDRSIZE=8 | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections: \
-# RUN: -DLENGTH1=0x000000000000000C \
-# RUN: -DADDRSIZE1=0x04 \
-# RUN: -DADDR=0x00000000FFFFFFFF \
-# RUN: -DLENGTH2=0x0000000000000014 \
-# RUN: -DADDRSIZE2=0x08
+# RUN: -DLENGTH1=0xC -DADDRSIZE1=0x4 -DADDR=0xFFFFFFFF \
+# RUN: -DLENGTH2=0x14 -DADDRSIZE2=0x8
# BASIC: DWARF:
# BASIC-NEXT: debug_addr:
# BASIC-NEXT: - Length: [[LENGTH1]]
-# BASIC-NEXT: Version: 0x0005
+# BASIC-NEXT: Version: 0x5
# BASIC-NEXT: AddressSize: [[ADDRSIZE1]]
# BASIC-NEXT: Entries:
-# BASIC-NEXT: - Address: 0x0000000000001234
-# BASIC-NEXT: - Address: 0x0000000000005678
+# BASIC-NEXT: - Address: 0x1234
+# BASIC-NEXT: - Address: 0x5678
# BASIC-NEXT: - Format: DWARF64
# BASIC-NEXT: Length: [[LENGTH1]]
-# BASIC-NEXT: Version: 0x0005
+# BASIC-NEXT: Version: 0x5
# BASIC-NEXT: AddressSize: [[ADDRSIZE1]]
# BASIC-NEXT: Entries:
-# BASIC-NEXT: - Address: 0x0000000000001234
+# BASIC-NEXT: - Address: 0x1234
# BASIC-NEXT: - Address: [[ADDR]]
# BASIC-NEXT: - Length: [[LENGTH2]]
-# BASIC-NEXT: Version: 0x0005
+# BASIC-NEXT: Version: 0x5
# BASIC-NEXT: AddressSize: [[ADDRSIZE2]]
# BASIC-NEXT: Entries:
-# BASIC-NEXT: - Address: 0x0000000000001234
-# BASIC-NEXT: - Address: 0x0000000000005678
+# BASIC-NEXT: - Address: 0x1234
+# BASIC-NEXT: - Address: 0x5678
# BASIC-NEXT: - Format: DWARF64
# BASIC-NEXT: Length: [[LENGTH2]]
-# BASIC-NEXT: Version: 0x0005
+# BASIC-NEXT: Version: 0x5
# BASIC-NEXT: AddressSize: [[ADDRSIZE2]]
# BASIC-NEXT: Entries:
-# BASIC-NEXT: - Address: 0x0000000000001234
-# BASIC-NEXT: - Address: 0x0000000000005678
+# BASIC-NEXT: - Address: 0x1234
+# BASIC-NEXT: - Address: 0x5678
# BASIC-NEXT: ...
--- !ELF
@@ -140,20 +128,20 @@ DWARF:
# COMMON-NEXT: Type: [[TYPE]]
# FLAGS-NEXT: Flags: [ SHF_ALLOC ]
# LINK-NEXT: Link: .sec
-# ADDR-NEXT: Address: 0x0000000000002020
-# ADDRALIGN-NEXT: AddressAlign: 0x0000000000000003
-# ENTSIZE-NEXT: EntSize: 0x0000000000000003
-# INFO-NEXT: Info: 0x0000000000000003
+# ADDR-NEXT: Address: 0x2020
+# ADDRALIGN-NEXT: AddressAlign: 0x3
+# ENTSIZE-NEXT: EntSize: 0x3
+# INFO-NEXT: Info: 0x3
# COMMON-NEXT: - Name: .sec
# COMMON-NEXT: Type: SHT_PROGBITS
# COMMON-NEXT: DWARF:
# COMMON-NEXT: debug_addr:
-# COMMON-NEXT: - Length: 0x0000000000000014
-# COMMON-NEXT: Version: 0x0005
-# COMMON-NEXT: AddressSize: 0x08
+# COMMON-NEXT: - Length: 0x14
+# COMMON-NEXT: Version: 0x5
+# COMMON-NEXT: AddressSize: 0x8
# COMMON-NEXT: Entries:
-# COMMON-NEXT: - Address: 0x0000000000001234
-# COMMON-NEXT: - Address: 0x0000000000005678
+# COMMON-NEXT: - Address: 0x1234
+# COMMON-NEXT: - Address: 0x5678
# COMMON-NEXT: ...
--- !ELF
@@ -189,7 +177,7 @@ DWARF:
# RAW: Sections:
# RAW-NEXT: - Name: .debug_addr
# RAW-NEXT: Type: SHT_PROGBITS
-# RAW-NEXT: AddressAlign: 0x0000000000000001
+# RAW-NEXT: AddressAlign: 0x1
# RAW-NEXT: Content: AABBCC
# RAW-NEXT: ...
diff --git a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml
index 5f296bb4e5ee..63a0e8bb9b90 100644
--- a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml
@@ -5,45 +5,45 @@
# RUN: yaml2obj --docnum=1 -DBITS=32 -DENDIAN=LSB %s | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections \
-# RUN: -DLENGTH1=24 -DLENGTH2=24 -DADDRSIZE=0x04 \
-# RUN: -DVARADDR=0x0000000000001234 -DVARLEN=0x0000000000005678
+# RUN: -DLENGTH1=24 -DLENGTH2=24 -DADDRSIZE=0x4 \
+# RUN: -DVARADDR=0x1234 -DVARLEN=0x5678
# RUN: yaml2obj --docnum=1 -DBITS=32 -DENDIAN=MSB %s | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections \
-# RUN: -DLENGTH1=24 -DLENGTH2=24 -DADDRSIZE=0x04 \
-# RUN: -DVARADDR=0x0000000000001234 -DVARLEN=0x0000000000005678
+# RUN: -DLENGTH1=24 -DLENGTH2=24 -DADDRSIZE=0x4 \
+# RUN: -DVARADDR=0x1234 -DVARLEN=0x5678
# RUN: yaml2obj --docnum=1 -DBITS=64 -DENDIAN=LSB %s | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections \
-# RUN: -DLENGTH1=3C -DLENGTH2=44 -DADDRSIZE=0x08 \
-# RUN: -DVARADDR=0x0000000000001234 -DVARLEN=0x0000000000005678
+# RUN: -DLENGTH1=3C -DLENGTH2=44 -DADDRSIZE=0x8 \
+# RUN: -DVARADDR=0x1234 -DVARLEN=0x5678
# RUN: yaml2obj --docnum=1 -DBITS=64 -DENDIAN=MSB %s | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections \
-# RUN: -DLENGTH1=3C -DLENGTH2=44 -DADDRSIZE=0x08 \
-# RUN: -DVARADDR=0x0000000000001234 -DVARLEN=0x0000000000005678
+# RUN: -DLENGTH1=3C -DLENGTH2=44 -DADDRSIZE=0x8 \
+# RUN: -DVARADDR=0x1234 -DVARLEN=0x5678
# BASIC: DWARF:
# BASIC-NEXT: debug_aranges:
-# BASIC-NEXT: - Length: 0x00000000000000[[LENGTH1]]
+# BASIC-NEXT: - Length: 0x[[LENGTH1]]
# BASIC-NEXT: Version: 2
-# BASIC-NEXT: CuOffset: 0x0000000000001234
+# BASIC-NEXT: CuOffset: 0x1234
# BASIC-NEXT: AddressSize: [[ADDRSIZE]]
# BASIC-NEXT: Descriptors:
-# BASIC-NEXT: - Address: 0x0000000000001234
-# BASIC-NEXT: Length: 0x0000000000005678
-# BASIC-NEXT: - Address: 0x0000000000001234
-# BASIC-NEXT: Length: 0x0000000000005678
+# BASIC-NEXT: - Address: 0x1234
+# BASIC-NEXT: Length: 0x5678
+# BASIC-NEXT: - Address: 0x1234
+# BASIC-NEXT: Length: 0x5678
# BASIC-NEXT: - Format: DWARF64
-# BASIC-NEXT: Length: 0x00000000000000[[LENGTH2]]
+# BASIC-NEXT: Length: 0x[[LENGTH2]]
# BASIC-NEXT: Version: 2
# BASIC-NEXT: CuOffset: 0x1234567890ABCDEF
# BASIC-NEXT: AddressSize: [[ADDRSIZE]]
# BASIC-NEXT: Descriptors:
# BASIC-NEXT: - Address: [[VARADDR]]
# BASIC-NEXT: Length: [[VARLEN]]
-# BASIC-NEXT: - Address: 0x0000000000001234
-# BASIC-NEXT: Length: 0x0000000000005678
+# BASIC-NEXT: - Address: 0x1234
+# BASIC-NEXT: Length: 0x5678
# BASIC-NEXT: ...
--- !ELF
@@ -83,17 +83,17 @@ DWARF:
# SHDR-NEXT: Type: SHT_[[TYPE]]
# FLAGS-NEXT: Flags: [ SHF_ALLOC ]
# LINK-NEXT: Link: .sec
-# ENTSIZE-NEXT: EntSize: 0x0000000000000003
-# INFO-NEXT: Info: 0x0000000000000003
-# ADDRALIGN-NEXT: AddressAlign: 0x0000000000000003
-# ADDRESS-NEXT: Address: 0x0000000000002020
+# ENTSIZE-NEXT: EntSize: 0x3
+# INFO-NEXT: Info: 0x3
+# ADDRALIGN-NEXT: AddressAlign: 0x3
+# ADDRESS-NEXT: Address: 0x2020
# ARANGE: DWARF:
# ARANGE-NEXT: debug_aranges:
-# ARANGE-NEXT: - Length: 0x000000000000001C
+# ARANGE-NEXT: - Length: 0x1C
# ARANGE-NEXT: Version: 2
-# ARANGE-NEXT: CuOffset: 0x0000000000001234
-# ARANGE-NEXT: AddressSize: 0x08
+# ARANGE-NEXT: CuOffset: 0x1234
+# ARANGE-NEXT: AddressSize: 0x8
# ARANGE-NEXT: ...
--- !ELF
@@ -121,13 +121,13 @@ DWARF:
## object file's address size.
# RUN: yaml2obj --docnum=3 %s | obj2yaml | \
-# RUN: FileCheck %s -DLENGTH=0x000000000000001C -DADDRSIZE=0x04 -DADDRLEN=0x0000000012345678 --check-prefix=ADDRSIZE
+# RUN: FileCheck %s -DLENGTH=0x1C -DADDRSIZE=0x4 -DADDRLEN=0x12345678 --check-prefix=ADDRSIZE
# ADDRSIZE: DWARF:
# ADDRSIZE-NEXT: debug_aranges:
# ADDRSIZE-NEXT: - Length: [[LENGTH]]
# ADDRSIZE-NEXT: Version: 2
-# ADDRSIZE-NEXT: CuOffset: 0x0000000000001234
+# ADDRSIZE-NEXT: CuOffset: 0x1234
# ADDRSIZE-NEXT: AddressSize: [[ADDRSIZE]]
# ADDRSIZE-NEXT: Descriptors:
# ADDRSIZE-NEXT: - Address: [[ADDRLEN]]
@@ -143,14 +143,14 @@ DWARF:
debug_aranges:
- Version: 2
CuOffset: 0x1234
- AddressSize: [[ADDRSIZE=0x04]]
+ AddressSize: [[ADDRSIZE=0x4]]
Descriptors:
- Address: [[ADDRLEN=0x12345678]]
Length: [[ADDRLEN=0x12345678]]
-# RUN: yaml2obj --docnum=3 -DBITS=32 -DADDRSIZE=0x08 -DADDRLEN=0x1234567890abcdef %s | \
+# RUN: yaml2obj --docnum=3 -DBITS=32 -DADDRSIZE=0x8 -DADDRLEN=0x1234567890abcdef %s | \
# RUN: obj2yaml | \
-# RUN: FileCheck %s -DLENGTH=0x000000000000002C -DADDRSIZE=0x08 -DADDRLEN=0x1234567890ABCDEF --check-prefix=ADDRSIZE
+# RUN: FileCheck %s -DLENGTH=0x2C -DADDRSIZE=0x8 -DADDRLEN=0x1234567890ABCDEF --check-prefix=ADDRSIZE
## d) Test dumping a .debug_aranges section whose length field doesn't match the actual length.
## This makes the DWARF parser fail to parse it and we will dump it as a raw content section.
@@ -160,7 +160,7 @@ DWARF:
# RAW-CONTENT: Sections:
# RAW-CONTENT-NEXT: - Name: .debug_aranges
# RAW-CONTENT-NEXT: Type: SHT_PROGBITS
-# RAW-CONTENT-NEXT: AddressAlign: 0x0000000000000001
+# RAW-CONTENT-NEXT: AddressAlign: 0x1
# RAW-CONTENT-NEXT: Content: '3412000002003412000008000000000000000000000000000000000000000000'
# RAW-CONTENT-NEXT: ...
@@ -196,5 +196,4 @@ DWARF:
# RUN: yaml2obj --docnum=1 %s -DADDR=0 -DLENGTH=0 -DBITS=64 -DENDIAN=LSB | obj2yaml | \
# RUN: FileCheck %s --check-prefix=BASIC --implicit-check-not=Sections \
-# RUN: -DLENGTH1=3C -DLENGTH2=44 -DADDRSIZE=0x08 \
-# RUN: -DVARADDR=0x0000000000000000 -DVARLEN=0x0000000000000000
+# RUN: -DLENGTH1=3C -DLENGTH2=44 -DADDRSIZE=0x8 -DVARADDR=0x0 -DVARLEN=0x0
diff --git a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-ranges.yaml b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-ranges.yaml
index c4a4c4111154..d9741b6f204f 100644
--- a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-ranges.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-ranges.yaml
@@ -7,80 +7,73 @@
## the address_size of debug_info is 4.
# RUN: yaml2obj --docnum=1 %s -DBITS=32 -DLOWOFFSET=0xFFFFFFFF \
# RUN: -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x04 \
-# RUN: -DOFFSET=0x0000000000000018 -DLOWOFFSET=0x00000000FFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x4 \
+# RUN: -DOFFSET=0x18 -DLOWOFFSET=0xFFFFFFFF -DHIGHOFFSET=0x10
## Dump the .debug_ranges section from a 32-bit big endian object file where the
## address_size of debug_info is 4.
# RUN: yaml2obj --docnum=1 %s -DBITS=32 -DENDIAN=MSB -DLOWOFFSET=0xFFFFFFFF \
# RUN: -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x04 \
-# RUN: -DOFFSET=0x0000000000000018 -DLOWOFFSET=0x00000000FFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x4 \
+# RUN: -DOFFSET=0x18 -DLOWOFFSET=0xFFFFFFFF -DHIGHOFFSET=0x10
## Dump the .debug_ranges section from a 32-bit little endian object file where
## the address_size of debug_info is 8.
# RUN: yaml2obj --docnum=1 %s -DBITS=32 -DADDRSIZE1=8 \
# RUN: -DADDRSIZE2=8 -DADDRSIZE3=8 -DADDRSIZE4=8 \
# RUN: -DLOWOFFSET=0xFFFFFFFFFFFFFFFF -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x08 \
-# RUN: -DOFFSET=0x0000000000000030 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x8 \
+# RUN: -DOFFSET=0x30 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
+# RUN: -DHIGHOFFSET=0x10
## Dump the .debug_ranges section from a 32-bit big endian object file where the
## address_size of debug_info is 8.
# RUN: yaml2obj --docnum=1 %s -DBITS=32 -DENDIAN=MSB -DADDRSIZE1=8 \
# RUN: -DADDRSIZE2=8 -DADDRSIZE3=8 -DADDRSIZE4=8 \
# RUN: -DLOWOFFSET=0xFFFFFFFFFFFFFFFF -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x08 \
-# RUN: -DOFFSET=0x0000000000000030 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x8 \
+# RUN: -DOFFSET=0x30 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF -DHIGHOFFSET=0x10
## Dump the .debug_ranges section from a 64-bit little endian object file where
## the address_size of debug_info is 8.
# RUN: yaml2obj --docnum=1 %s -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
# RUN: -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x08 \
-# RUN: -DOFFSET=0x0000000000000030 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x8 \
+# RUN: -DOFFSET=0x30 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF -DHIGHOFFSET=0x10
## Dump the .debug_ranges section from a 64-bit big endian object file where the
## address_size of debug_info is 8.
# RUN: yaml2obj --docnum=1 %s -DENDIAN=MSB -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
# RUN: -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x08 \
-# RUN: -DOFFSET=0x0000000000000030 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x8 \
+# RUN: -DOFFSET=0x30 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF -DHIGHOFFSET=0x10
## Dump the .debug_ranges section from a 64-bit little endian object file where
## the address_size of debug_info is 4.
# RUN: yaml2obj --docnum=1 %s -DADDRSIZE1=4 -DADDRSIZE2=4 -DADDRSIZE3=4 \
# RUN: -DADDRSIZE4=4 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
# RUN: -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x04 \
-# RUN: -DOFFSET=0x0000000000000018 -DLOWOFFSET=0x00000000FFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x4 \
+# RUN: -DOFFSET=0x18 -DLOWOFFSET=0xFFFFFFFF -DHIGHOFFSET=0x10
## Dump the .debug_ranges section from a 64-bit big endian object file where the
## address_size of debug_info is 4.
# RUN: yaml2obj --docnum=1 %s -DADDRSIZE1=4 -DADDRSIZE2=4 -DADDRSIZE3=4 \
# RUN: -DADDRSIZE4=4 -DLOWOFFSET=0xFFFFFFFFFFFFFFFF \
# RUN: -DHIGHOFFSET=0x10 | obj2yaml | \
-# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x04 \
-# RUN: -DOFFSET=0x0000000000000018 -DLOWOFFSET=0x00000000FFFFFFFF \
-# RUN: -DHIGHOFFSET=0x0000000000000010
+# RUN: FileCheck %s --check-prefix=BASIC -DADDRSIZE=0x4 \
+# RUN: -DOFFSET=0x18 -DLOWOFFSET=0xFFFFFFFF -DHIGHOFFSET=0x10
# BASIC-NOT: debug_ranges
# BASIC: debug_ranges:
-# BASIC-NEXT: - Offset: 0x0000000000000000
+# BASIC-NEXT: - Offset: 0x0
# BASIC-NEXT: AddrSize: [[ADDRSIZE]]
# BASIC-NEXT: Entries:
-# BASIC-NEXT: - LowOffset: 0x0000000000000010
-# BASIC-NEXT: HighOffset: 0x0000000000000020
-# BASIC-NEXT: - LowOffset: 0x0000000000000030
-# BASIC-NEXT: HighOffset: 0x0000000000000040
+# BASIC-NEXT: - LowOffset: 0x10
+# BASIC-NEXT: HighOffset: 0x20
+# BASIC-NEXT: - LowOffset: 0x30
+# BASIC-NEXT: HighOffset: 0x40
# BASIC-NEXT: - Offset: [[OFFSET]]
# BASIC-NEXT: AddrSize: [[ADDRSIZE]]
# BASIC-NEXT: Entries:
@@ -122,7 +115,7 @@ DWARF:
# RAW: - Name: .debug_ranges
# RAW-NEXT: Type: SHT_PROGBITS
-# RAW-NEXT: AddressAlign: 0x0000000000000001
+# RAW-NEXT: AddressAlign: 0x1
# RAW-NEXT: Content: '1000000000000000
## ^--------------- LowOffset
# RAW-SAME: {{^}}2000000000000000
@@ -195,17 +188,17 @@ DWARF:
# COMMON-NEXT: Type: SHT_[[TYPE]]
# FLAGS-NEXT: Flags: [ SHF_ALLOC ]
# LINK-NEXT: Link: .sec
-# ENTSIZE-NEXT: EntSize: 0x0000000000000003
-# INFO-NEXT: Info: 0x0000000000000003
-# ADDRALIGN-NEXT: AddressAlign: 0x0000000000000003
-# ADDRESS-NEXT: Address: 0x0000000000002020
+# ENTSIZE-NEXT: EntSize: 0x3
+# INFO-NEXT: Info: 0x3
+# ADDRALIGN-NEXT: AddressAlign: 0x3
+# ADDRESS-NEXT: Address: 0x2020
# COMMON: debug_ranges:
-# COMMON-NEXT: - Offset: 0x0000000000000000
-# COMMON-NEXT: AddrSize: 0x08
+# COMMON-NEXT: - Offset: 0x0
+# COMMON-NEXT: AddrSize: 0x8
# COMMON-NEXT: Entries:
-# COMMON-NEXT: - LowOffset: 0x0000000000000010
-# COMMON-NEXT: HighOffset: 0x0000000000000020
+# COMMON-NEXT: - LowOffset: 0x10
+# COMMON-NEXT: HighOffset: 0x20
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-str.yaml b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-str.yaml
index dbe022effab8..4d8a05d8d2e7 100644
--- a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-str.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-str.yaml
@@ -73,10 +73,10 @@ DWARF:
# COMMON-NEXT: Type: SHT_[[TYPE]]
# COMMON-NEXT: Flags: [[FLAGS]]
# LINK-NEXT: Link: .sec
-# ADDRESS-NEXT: Address: 0x[[#%.16x,ADDRESS]]
-# COMMON-NEXT: AddressAlign: 0x[[#%.16x,ADDRALIGN]]
-# ENTSIZE-NEXT: EntSize: 0x[[#%.16x,ENTSIZE]]
-# INFO-NEXT: Info: 0x[[#%.16x,INFO]]
+# ADDRESS-NEXT: Address: 0x[[#%x,ADDRESS]]
+# COMMON-NEXT: AddressAlign: 0x[[#%x,ADDRALIGN]]
+# ENTSIZE-NEXT: EntSize: 0x[[#%x,ENTSIZE]]
+# INFO-NEXT: Info: 0x[[#%x,INFO]]
# BASIC: DWARF:
# BASIC-NEXT: debug_str:
# BASIC-NEXT: - a
diff --git a/llvm/test/tools/obj2yaml/ELF/arm-exidx-section.yaml b/llvm/test/tools/obj2yaml/ELF/arm-exidx-section.yaml
index a68b9a553c6a..3ccb4ab8d66f 100644
--- a/llvm/test/tools/obj2yaml/ELF/arm-exidx-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/arm-exidx-section.yaml
@@ -13,7 +13,7 @@
# LE-NEXT: Type: SHT_ARM_EXIDX
# LE-NEXT: Entries:
# LE-NEXT: - Offset: 0xDDCCBBAA
-# LE-NEXT: Value: 0x01000000
+# LE-NEXT: Value: 0x1000000
# LE-NEXT: - Offset: 0x9988FFEE
# LE-NEXT: Value: EXIDX_CANTUNWIND
# LE-NEXT: ...
@@ -24,7 +24,7 @@
# BE-NEXT: - Offset: 0xAABBCCDD
# BE-NEXT: Value: EXIDX_CANTUNWIND
# BE-NEXT: - Offset: 0xEEFF8899
-# BE-NEXT: Value: 0x01000000
+# BE-NEXT: Value: 0x1000000
# BE-NEXT: ...
--- !ELF
diff --git a/llvm/test/tools/obj2yaml/ELF/bb-addr-map.yaml b/llvm/test/tools/obj2yaml/ELF/bb-addr-map.yaml
index 30e2a4f21b18..739a8f77cabe 100644
--- a/llvm/test/tools/obj2yaml/ELF/bb-addr-map.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/bb-addr-map.yaml
@@ -16,20 +16,20 @@
# VALID-NEXT: Entries:
## The 'Address' field is omitted when it's zero.
# VALID-NEXT: BBEntries:
-# VALID-NEXT: - AddressOffset: 0x00000001
-# VALID-NEXT: Size: 0x00000002
-# VALID-NEXT: Metadata: 0x00000003
-# VALID-NEXT: - AddressOffset: 0x00000004
-# VALID-NEXT: Size: 0x00000005
-# VALID-NEXT: Metadata: 0x00000006
-# VALID-NEXT: - AddressOffset: 0x00000007
-# VALID-NEXT: Size: 0x00000008
-# VALID-NEXT: Metadata: 0x00000009
-# VALID-NEXT: - Address: 0x0000000000000020
+# VALID-NEXT: - AddressOffset: 0x1
+# VALID-NEXT: Size: 0x2
+# VALID-NEXT: Metadata: 0x3
+# VALID-NEXT: - AddressOffset: 0x4
+# VALID-NEXT: Size: 0x5
+# VALID-NEXT: Metadata: 0x6
+# VALID-NEXT: - AddressOffset: 0x7
+# VALID-NEXT: Size: 0x8
+# VALID-NEXT: Metadata: 0x9
+# VALID-NEXT: - Address: 0x20
# VALID-NEXT: BBEntries:
-# VALID-NEXT: - AddressOffset: 0x0000000A
-# VALID-NEXT: Size: 0x0000000B
-# VALID-NEXT: Metadata: 0x0000000C
+# VALID-NEXT: - AddressOffset: 0xA
+# VALID-NEXT: Size: 0xB
+# VALID-NEXT: Metadata: 0xC
--- !ELF
FileHeader:
@@ -40,22 +40,22 @@ Sections:
- Name: .llvm_bb_addr_map
Type: SHT_LLVM_BB_ADDR_MAP
Entries:
- - Address: 0x0000000000000000
+ - Address: 0x0
BBEntries:
- - AddressOffset: 0x00000001
- Size: 0x00000002
- Metadata: 0x00000003
- - AddressOffset: 0x00000004
- Size: 0x00000005
- Metadata: 0x00000006
- - AddressOffset: 0x00000007
- Size: 0x00000008
- Metadata: 0x00000009
- - Address: 0x0000000000000020
+ - AddressOffset: 0x1
+ Size: 0x2
+ Metadata: 0x3
+ - AddressOffset: 0x4
+ Size: 0x5
+ Metadata: 0x6
+ - AddressOffset: 0x7
+ Size: 0x8
+ Metadata: 0x9
+ - Address: 0x20
BBEntries:
- - AddressOffset: 0x0000000A
- Size: 0x0000000B
- Metadata: 0x0000000C
+ - AddressOffset: 0xA
+ Size: 0xB
+ Metadata: 0xC
## Check that obj2yaml uses the "Content" tag to describe an .llvm_bb_addr_map section
## when it can't extract the entries. For instance, when truncated data is given as
@@ -125,13 +125,13 @@ Sections:
# MULTI-NEXT: Entries:
## The 'Address' field is omitted when it's zero.
# MULTI-NEXT: - BBEntries:
-# MULTI-NEXT: - AddressOffset: 0x00000001
-# MULTI-NEXT: Size: 0x00000002
-# MULTI-NEXT: Metadata: 0x00000003
+# MULTI-NEXT: - AddressOffset: 0x1
+# MULTI-NEXT: Size: 0x2
+# MULTI-NEXT: Metadata: 0x3
# MULTI-NEXT: - Name: '.llvm_bb_addr_map (1)'
# MULTI-NEXT: Type: SHT_LLVM_BB_ADDR_MAP
# MULTI-NEXT: Entries:
-# MULTI-NEXT: - Address: 0x0000000000000020
+# MULTI-NEXT: - Address: 0x20
# MULTI-NEXT: BBEntries: []
--- !ELF
@@ -144,12 +144,12 @@ Sections:
Type: SHT_LLVM_BB_ADDR_MAP
Entries:
## Check that obj2yaml does not emit the Address field when it's zero.
- - Address: 0x0000000000000000
+ - Address: 0x0
BBEntries:
- - AddressOffset: 0x00000001
- Size: 0x00000002
- Metadata: 0x00000003
+ - AddressOffset: 0x1
+ Size: 0x2
+ Metadata: 0x3
- Name: '.llvm_bb_addr_map (1)'
Type: SHT_LLVM_BB_ADDR_MAP
Entries:
- - Address: 0x0000000000000020
+ - Address: 0x20
diff --git a/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml b/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml
index 2e3fcd98065b..939e6c913175 100644
--- a/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml
@@ -15,7 +15,7 @@
# BASIC-NEXT: - Name: .llvm.call-graph-profile
# BASIC-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# BASIC-NEXT: Link: .symtab
-# BASIC-NEXT: EntSize: 0x0000000000000010
+# BASIC-NEXT: EntSize: 0x10
# BASIC-NEXT: Entries:
# BASIC-NEXT: - From: foo
# BASIC-NEXT: To: bar
@@ -58,11 +58,11 @@ Symbols:
# INVALID-NEXT: - Name: .empty
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: - Name: .multiple.16.valid
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Entries:
# INVALID-NEXT: - From: foo
# INVALID-NEXT: To: bar
@@ -70,39 +70,39 @@ Symbols:
# INVALID-NEXT: - Name: .non.multiple.16
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Content: '0000000100000002000000000000000300'
# INVALID-NEXT: - Name: .multiple.16.invalid
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Content: 00112233445566778899AABBCCDDEEFF
# INVALID-NEXT: - Name: .unknown.symbol.1
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Content: 000000FF000000020000000000000003
# INVALID-NEXT: - Name: .unknown.symbol.2
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Content: 00000001000000FF0000000000000003
# INVALID-NEXT: - Name: .link.to.symtable
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Entries:
# INVALID-NEXT: - From: foo
# INVALID-NEXT: To: bar
# INVALID-NEXT: Weight: 0
# INVALID-NEXT: - Name: .link.to.non.symtable.1
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Content: '00000001000000020000000000000000'
# INVALID-NEXT: - Name: .link.to.non.symtable.2
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .empty
-# INVALID-NEXT: EntSize: 0x0000000000000010
+# INVALID-NEXT: EntSize: 0x10
# INVALID-NEXT: Content: '00000001000000020000000000000000'
# INVALID-NEXT: - Name: .zero.entry.size
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
@@ -114,7 +114,7 @@ Symbols:
# INVALID-NEXT: - Name: .invalid.entry.size
# INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE
# INVALID-NEXT: Link: .symtab
-# INVALID-NEXT: EntSize: 0x0000000000000001
+# INVALID-NEXT: EntSize: 0x1
# INVALID-NEXT: Entries:
# INVALID-NEXT: - From: foo
# INVALID-NEXT: To: bar
diff --git a/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml b/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml
index 9e6b8fca67ac..97724f72fcd1 100644
--- a/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml
@@ -84,7 +84,7 @@ Symbols:
# CASE2: Relocations:
# CASE2-NEXT: - Symbol: 'foo (1)'
# CASE2-NEXT: Type: R_X86_64_PC32
-# CASE2-NEXT: - Offset: 0x0000000000000004
+# CASE2-NEXT: - Offset: 0x4
# CASE2-NEXT: Symbol: foo
# CASE2-NEXT: Type: R_X86_64_PC32
# CASE2-NEXT: Symbols:
diff --git a/llvm/test/tools/obj2yaml/ELF/dynamic-section-arch-tags.yaml b/llvm/test/tools/obj2yaml/ELF/dynamic-section-arch-tags.yaml
index 2c2d5841764f..cf08db8be6e8 100644
--- a/llvm/test/tools/obj2yaml/ELF/dynamic-section-arch-tags.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/dynamic-section-arch-tags.yaml
@@ -6,97 +6,97 @@
# RUN: obj2yaml %t1 | FileCheck %s --check-prefix=MIPS
# MIPS: - Tag: DT_MIPS_RLD_VERSION
-# MIPS-NEXT: Value: 0x0000000000000001
+# MIPS-NEXT: Value: 0x1
# MIPS-NEXT: - Tag: DT_MIPS_TIME_STAMP
-# MIPS-NEXT: Value: 0x0000000000000002
+# MIPS-NEXT: Value: 0x2
# MIPS-NEXT: - Tag: DT_MIPS_ICHECKSUM
-# MIPS-NEXT: Value: 0x0000000000000003
+# MIPS-NEXT: Value: 0x3
# MIPS-NEXT: - Tag: DT_MIPS_IVERSION
-# MIPS-NEXT: Value: 0x0000000000000004
+# MIPS-NEXT: Value: 0x4
# MIPS-NEXT: - Tag: DT_MIPS_FLAGS
-# MIPS-NEXT: Value: 0x0000000000000005
+# MIPS-NEXT: Value: 0x5
# MIPS-NEXT: - Tag: DT_MIPS_BASE_ADDRESS
-# MIPS-NEXT: Value: 0x0000000000000006
+# MIPS-NEXT: Value: 0x6
# MIPS-NEXT: - Tag: DT_MIPS_MSYM
-# MIPS-NEXT: Value: 0x0000000000000007
+# MIPS-NEXT: Value: 0x7
# MIPS-NEXT: - Tag: DT_MIPS_CONFLICT
-# MIPS-NEXT: Value: 0x0000000000000008
+# MIPS-NEXT: Value: 0x8
# MIPS-NEXT: - Tag: DT_MIPS_LIBLIST
-# MIPS-NEXT: Value: 0x0000000000000009
+# MIPS-NEXT: Value: 0x9
# MIPS-NEXT: - Tag: DT_MIPS_LOCAL_GOTNO
-# MIPS-NEXT: Value: 0x000000000000000A
+# MIPS-NEXT: Value: 0xA
# MIPS-NEXT: - Tag: DT_MIPS_CONFLICTNO
-# MIPS-NEXT: Value: 0x000000000000000B
+# MIPS-NEXT: Value: 0xB
# MIPS-NEXT: - Tag: DT_MIPS_LIBLISTNO
-# MIPS-NEXT: Value: 0x000000000000000C
+# MIPS-NEXT: Value: 0xC
# MIPS-NEXT: - Tag: DT_MIPS_SYMTABNO
-# MIPS-NEXT: Value: 0x000000000000000D
+# MIPS-NEXT: Value: 0xD
# MIPS-NEXT: - Tag: DT_MIPS_UNREFEXTNO
-# MIPS-NEXT: Value: 0x000000000000000E
+# MIPS-NEXT: Value: 0xE
# MIPS-NEXT: - Tag: DT_MIPS_GOTSYM
-# MIPS-NEXT: Value: 0x000000000000000F
+# MIPS-NEXT: Value: 0xF
# MIPS-NEXT: - Tag: DT_MIPS_HIPAGENO
-# MIPS-NEXT: Value: 0x0000000000000010
+# MIPS-NEXT: Value: 0x10
# MIPS-NEXT: - Tag: DT_MIPS_RLD_MAP
-# MIPS-NEXT: Value: 0x0000000000000011
+# MIPS-NEXT: Value: 0x11
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_CLASS
-# MIPS-NEXT: Value: 0x0000000000000012
+# MIPS-NEXT: Value: 0x12
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_CLASS_NO
-# MIPS-NEXT: Value: 0x0000000000000013
+# MIPS-NEXT: Value: 0x13
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_INSTANCE
-# MIPS-NEXT: Value: 0x0000000000000014
+# MIPS-NEXT: Value: 0x14
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_INSTANCE_NO
-# MIPS-NEXT: Value: 0x0000000000000015
+# MIPS-NEXT: Value: 0x15
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_RELOC
-# MIPS-NEXT: Value: 0x0000000000000016
+# MIPS-NEXT: Value: 0x16
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_RELOC_NO
-# MIPS-NEXT: Value: 0x0000000000000017
+# MIPS-NEXT: Value: 0x17
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_SYM
-# MIPS-NEXT: Value: 0x0000000000000018
+# MIPS-NEXT: Value: 0x18
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_SYM_NO
-# MIPS-NEXT: Value: 0x0000000000000019
+# MIPS-NEXT: Value: 0x19
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_CLASSSYM
-# MIPS-NEXT: Value: 0x000000000000001A
+# MIPS-NEXT: Value: 0x1A
# MIPS-NEXT: - Tag: DT_MIPS_DELTA_CLASSSYM_NO
-# MIPS-NEXT: Value: 0x000000000000001B
+# MIPS-NEXT: Value: 0x1B
# MIPS-NEXT: - Tag: DT_MIPS_CXX_FLAGS
-# MIPS-NEXT: Value: 0x000000000000001C
+# MIPS-NEXT: Value: 0x1C
# MIPS-NEXT: - Tag: DT_MIPS_PIXIE_INIT
-# MIPS-NEXT: Value: 0x000000000000001D
+# MIPS-NEXT: Value: 0x1D
# MIPS-NEXT: - Tag: DT_MIPS_SYMBOL_LIB
-# MIPS-NEXT: Value: 0x000000000000001E
+# MIPS-NEXT: Value: 0x1E
# MIPS-NEXT: - Tag: DT_MIPS_LOCALPAGE_GOTIDX
-# MIPS-NEXT: Value: 0x000000000000001F
+# MIPS-NEXT: Value: 0x1F
# MIPS-NEXT: - Tag: DT_MIPS_LOCAL_GOTIDX
-# MIPS-NEXT: Value: 0x0000000000000020
+# MIPS-NEXT: Value: 0x20
# MIPS-NEXT: - Tag: DT_MIPS_HIDDEN_GOTIDX
-# MIPS-NEXT: Value: 0x0000000000000021
+# MIPS-NEXT: Value: 0x21
# MIPS-NEXT: - Tag: DT_MIPS_PROTECTED_GOTIDX
-# MIPS-NEXT: Value: 0x0000000000000022
+# MIPS-NEXT: Value: 0x22
# MIPS-NEXT: - Tag: DT_MIPS_OPTIONS
-# MIPS-NEXT: Value: 0x0000000000000023
+# MIPS-NEXT: Value: 0x23
# MIPS-NEXT: - Tag: DT_MIPS_INTERFACE
-# MIPS-NEXT: Value: 0x0000000000000024
+# MIPS-NEXT: Value: 0x24
# MIPS-NEXT: - Tag: DT_MIPS_DYNSTR_ALIGN
-# MIPS-NEXT: Value: 0x0000000000000025
+# MIPS-NEXT: Value: 0x25
# MIPS-NEXT: - Tag: DT_MIPS_INTERFACE_SIZE
-# MIPS-NEXT: Value: 0x0000000000000026
+# MIPS-NEXT: Value: 0x26
# MIPS-NEXT: - Tag: DT_MIPS_RLD_TEXT_RESOLVE_ADDR
-# MIPS-NEXT: Value: 0x0000000000000027
+# MIPS-NEXT: Value: 0x27
# MIPS-NEXT: - Tag: DT_MIPS_PERF_SUFFIX
-# MIPS-NEXT: Value: 0x0000000000000028
+# MIPS-NEXT: Value: 0x28
# MIPS-NEXT: - Tag: DT_MIPS_COMPACT_SIZE
-# MIPS-NEXT: Value: 0x0000000000000029
+# MIPS-NEXT: Value: 0x29
# MIPS-NEXT: - Tag: DT_MIPS_GP_VALUE
-# MIPS-NEXT: Value: 0x000000000000002A
+# MIPS-NEXT: Value: 0x2A
# MIPS-NEXT: - Tag: DT_MIPS_AUX_DYNAMIC
-# MIPS-NEXT: Value: 0x000000000000002B
+# MIPS-NEXT: Value: 0x2B
# MIPS-NEXT: - Tag: DT_MIPS_PLTGOT
-# MIPS-NEXT: Value: 0x000000000000002C
+# MIPS-NEXT: Value: 0x2C
# MIPS-NEXT: - Tag: DT_MIPS_RWPLT
-# MIPS-NEXT: Value: 0x000000000000002D
+# MIPS-NEXT: Value: 0x2D
# MIPS-NEXT: - Tag: DT_MIPS_RLD_MAP_REL
-# MIPS-NEXT: Value: 0x000000000000002E
+# MIPS-NEXT: Value: 0x2E
--- !ELF
FileHeader:
@@ -206,11 +206,11 @@ Sections:
# RUN: obj2yaml %t2 | FileCheck %s --check-prefix=HEXAGON
# HEXAGON: - Tag: DT_HEXAGON_SYMSZ
-# HEXAGON-NEXT: Value: 0x0000000000000001
+# HEXAGON-NEXT: Value: 0x1
# HEXAGON-NEXT: - Tag: DT_HEXAGON_VER
-# HEXAGON-NEXT: Value: 0x0000000000000002
+# HEXAGON-NEXT: Value: 0x2
# HEXAGON-NEXT: - Tag: DT_HEXAGON_PLT
-# HEXAGON-NEXT: Value: 0x0000000000000003
+# HEXAGON-NEXT: Value: 0x3
--- !ELF
FileHeader:
@@ -223,20 +223,20 @@ Sections:
Type: SHT_DYNAMIC
Entries:
- Tag: DT_HEXAGON_SYMSZ
- Value: 0x0000000000000001
+ Value: 0x1
- Tag: DT_HEXAGON_VER
- Value: 0x0000000000000002
+ Value: 0x2
- Tag: DT_HEXAGON_PLT
- Value: 0x0000000000000003
+ Value: 0x3
## Check we can handle PPC specific tags.
# RUN: yaml2obj --docnum=3 %s -o %t3
# RUN: obj2yaml %t3 | FileCheck %s --check-prefix=EM_PPC
# EM_PPC: - Tag: DT_PPC_GOT
-# EM_PPC-NEXT: Value: 0x0000000000020000
+# EM_PPC-NEXT: Value: 0x20000
# EM_PPC-NEXT: - Tag: DT_PPC_OPT
-# EM_PPC-NEXT: Value: 0x0000000000000001
+# EM_PPC-NEXT: Value: 0x1
--- !ELF
FileHeader:
@@ -258,7 +258,7 @@ Sections:
# RUN: obj2yaml %t4 | FileCheck %s --check-prefix=EM_PPC64
# EM_PPC64: - Tag: DT_PPC64_GLINK
-# EM_PPC64-NEXT: Value: 0x0000000000000001
+# EM_PPC64-NEXT: Value: 0x1
--- !ELF
FileHeader:
@@ -278,9 +278,9 @@ Sections:
# RUN: obj2yaml %t2 | FileCheck %s --check-prefix=AARCH64
# AARCH64: - Tag: DT_AARCH64_BTI_PLT
-# AARCH64-NEXT: Value: 0x0000000000000000
+# AARCH64-NEXT: Value: 0x0
# AARCH64-NEXT: - Tag: DT_AARCH64_PAC_PLT
-# AARCH64-NEXT: Value: 0x0000000000000000
+# AARCH64-NEXT: Value: 0x0
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml b/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml
index e0cfe99b5591..0e2823891aec 100644
--- a/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml
@@ -8,121 +8,121 @@
# CHECK: Sections:
# CHECK-NEXT: - Name: .dynamic
# CHECK-NEXT: Type: SHT_DYNAMIC
-# CHECK-NEXT: Address: 0x0000000000001000
-# CHECK-NEXT: AddressAlign: 0x0000000000002000
+# CHECK-NEXT: Address: 0x1000
+# CHECK-NEXT: AddressAlign: 0x2000
# CHECK-NEXT: Entries:
# CHECK-NEXT: - Tag: DT_NULL
-# CHECK-NEXT: Value: 0x0000000000000000
+# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: - Tag: DT_NEEDED
-# CHECK-NEXT: Value: 0x0000000000000001
+# CHECK-NEXT: Value: 0x1
# CHECK-NEXT: - Tag: DT_PLTRELSZ
-# CHECK-NEXT: Value: 0x0000000000000002
+# CHECK-NEXT: Value: 0x2
# CHECK-NEXT: - Tag: DT_PLTGOT
-# CHECK-NEXT: Value: 0x0000000000000003
+# CHECK-NEXT: Value: 0x3
# CHECK-NEXT: - Tag: DT_HASH
-# CHECK-NEXT: Value: 0x0000000000000004
+# CHECK-NEXT: Value: 0x4
# CHECK-NEXT: - Tag: DT_STRTAB
-# CHECK-NEXT: Value: 0x0000000000000005
+# CHECK-NEXT: Value: 0x5
# CHECK-NEXT: - Tag: DT_SYMTAB
-# CHECK-NEXT: Value: 0x0000000000000006
+# CHECK-NEXT: Value: 0x6
# CHECK-NEXT: - Tag: DT_RELA
-# CHECK-NEXT: Value: 0x0000000000000007
+# CHECK-NEXT: Value: 0x7
# CHECK-NEXT: - Tag: DT_RELASZ
-# CHECK-NEXT: Value: 0x0000000000000008
+# CHECK-NEXT: Value: 0x8
# CHECK-NEXT: - Tag: DT_RELAENT
-# CHECK-NEXT: Value: 0x0000000000000009
+# CHECK-NEXT: Value: 0x9
# CHECK-NEXT: - Tag: DT_STRSZ
-# CHECK-NEXT: Value: 0x000000000000000A
+# CHECK-NEXT: Value: 0xA
# CHECK-NEXT: - Tag: DT_SYMENT
-# CHECK-NEXT: Value: 0x000000000000000B
+# CHECK-NEXT: Value: 0xB
# CHECK-NEXT: - Tag: DT_INIT
-# CHECK-NEXT: Value: 0x000000000000000C
+# CHECK-NEXT: Value: 0xC
# CHECK-NEXT: - Tag: DT_FINI
-# CHECK-NEXT: Value: 0x000000000000000D
+# CHECK-NEXT: Value: 0xD
# CHECK-NEXT: - Tag: DT_SONAME
-# CHECK-NEXT: Value: 0x000000000000000E
+# CHECK-NEXT: Value: 0xE
# CHECK-NEXT: - Tag: DT_RPATH
-# CHECK-NEXT: Value: 0x000000000000000F
+# CHECK-NEXT: Value: 0xF
# CHECK-NEXT: - Tag: DT_SYMBOLIC
-# CHECK-NEXT: Value: 0x0000000000000010
+# CHECK-NEXT: Value: 0x10
# CHECK-NEXT: - Tag: DT_REL
-# CHECK-NEXT: Value: 0x0000000000000011
+# CHECK-NEXT: Value: 0x11
# CHECK-NEXT: - Tag: DT_RELSZ
-# CHECK-NEXT: Value: 0x0000000000000012
+# CHECK-NEXT: Value: 0x12
# CHECK-NEXT: - Tag: DT_RELENT
-# CHECK-NEXT: Value: 0x0000000000000013
+# CHECK-NEXT: Value: 0x13
# CHECK-NEXT: - Tag: DT_PLTREL
-# CHECK-NEXT: Value: 0x0000000000000014
+# CHECK-NEXT: Value: 0x14
# CHECK-NEXT: - Tag: DT_DEBUG
-# CHECK-NEXT: Value: 0x0000000000000015
+# CHECK-NEXT: Value: 0x15
# CHECK-NEXT: - Tag: DT_TEXTREL
-# CHECK-NEXT: Value: 0x0000000000000016
+# CHECK-NEXT: Value: 0x16
# CHECK-NEXT: - Tag: DT_JMPREL
-# CHECK-NEXT: Value: 0x0000000000000017
+# CHECK-NEXT: Value: 0x17
# CHECK-NEXT: - Tag: DT_BIND_NOW
-# CHECK-NEXT: Value: 0x0000000000000018
+# CHECK-NEXT: Value: 0x18
# CHECK-NEXT: - Tag: DT_INIT_ARRAY
-# CHECK-NEXT: Value: 0x0000000000000019
+# CHECK-NEXT: Value: 0x19
# CHECK-NEXT: - Tag: DT_FINI_ARRAY
-# CHECK-NEXT: Value: 0x000000000000001A
+# CHECK-NEXT: Value: 0x1A
# CHECK-NEXT: - Tag: DT_INIT_ARRAYSZ
-# CHECK-NEXT: Value: 0x000000000000001B
+# CHECK-NEXT: Value: 0x1B
# CHECK-NEXT: - Tag: DT_FINI_ARRAYSZ
-# CHECK-NEXT: Value: 0x000000000000001C
+# CHECK-NEXT: Value: 0x1C
# CHECK-NEXT: - Tag: DT_RUNPATH
-# CHECK-NEXT: Value: 0x000000000000001D
+# CHECK-NEXT: Value: 0x1D
# CHECK-NEXT: - Tag: DT_FLAGS
-# CHECK-NEXT: Value: 0x000000000000001E
+# CHECK-NEXT: Value: 0x1E
# CHECK-NEXT: - Tag: DT_PREINIT_ARRAY
-# CHECK-NEXT: Value: 0x000000000000001F
+# CHECK-NEXT: Value: 0x1F
# CHECK-NEXT: - Tag: DT_PREINIT_ARRAYSZ
-# CHECK-NEXT: Value: 0x0000000000000020
+# CHECK-NEXT: Value: 0x20
# CHECK-NEXT: - Tag: DT_SYMTAB_SHNDX
-# CHECK-NEXT: Value: 0x0000000000000021
+# CHECK-NEXT: Value: 0x21
# CHECK-NEXT: - Tag: DT_RELRSZ
-# CHECK-NEXT: Value: 0x0000000000000022
+# CHECK-NEXT: Value: 0x22
# CHECK-NEXT: - Tag: DT_RELR
-# CHECK-NEXT: Value: 0x0000000000000023
+# CHECK-NEXT: Value: 0x23
# CHECK-NEXT: - Tag: DT_RELRENT
-# CHECK-NEXT: Value: 0x0000000000000024
+# CHECK-NEXT: Value: 0x24
# CHECK-NEXT: - Tag: DT_ANDROID_REL
-# CHECK-NEXT: Value: 0x0000000000000025
+# CHECK-NEXT: Value: 0x25
# CHECK-NEXT: - Tag: DT_ANDROID_RELSZ
-# CHECK-NEXT: Value: 0x0000000000000026
+# CHECK-NEXT: Value: 0x26
# CHECK-NEXT: - Tag: DT_ANDROID_RELA
-# CHECK-NEXT: Value: 0x0000000000000027
+# CHECK-NEXT: Value: 0x27
# CHECK-NEXT: - Tag: DT_ANDROID_RELASZ
-# CHECK-NEXT: Value: 0x0000000000000028
+# CHECK-NEXT: Value: 0x28
# CHECK-NEXT: - Tag: DT_ANDROID_RELR
-# CHECK-NEXT: Value: 0x0000000000000029
+# CHECK-NEXT: Value: 0x29
# CHECK-NEXT: - Tag: DT_ANDROID_RELRSZ
-# CHECK-NEXT: Value: 0x000000000000002A
+# CHECK-NEXT: Value: 0x2A
# CHECK-NEXT: - Tag: DT_ANDROID_RELRENT
-# CHECK-NEXT: Value: 0x000000000000002B
+# CHECK-NEXT: Value: 0x2B
# CHECK-NEXT: - Tag: DT_GNU_HASH
-# CHECK-NEXT: Value: 0x000000000000002C
+# CHECK-NEXT: Value: 0x2C
# CHECK-NEXT: - Tag: DT_TLSDESC_PLT
-# CHECK-NEXT: Value: 0x000000000000002D
+# CHECK-NEXT: Value: 0x2D
# CHECK-NEXT: - Tag: DT_TLSDESC_GOT
-# CHECK-NEXT: Value: 0x000000000000002E
+# CHECK-NEXT: Value: 0x2E
# CHECK-NEXT: - Tag: DT_RELACOUNT
-# CHECK-NEXT: Value: 0x000000000000002F
+# CHECK-NEXT: Value: 0x2F
# CHECK-NEXT: - Tag: DT_RELCOUNT
-# CHECK-NEXT: Value: 0x0000000000000030
+# CHECK-NEXT: Value: 0x30
# CHECK-NEXT: - Tag: DT_FLAGS_1
-# CHECK-NEXT: Value: 0x0000000000000031
+# CHECK-NEXT: Value: 0x31
# CHECK-NEXT: - Tag: DT_VERSYM
-# CHECK-NEXT: Value: 0x0000000000000032
+# CHECK-NEXT: Value: 0x32
# CHECK-NEXT: - Tag: DT_VERDEF
-# CHECK-NEXT: Value: 0x0000000000000033
+# CHECK-NEXT: Value: 0x33
# CHECK-NEXT: - Tag: DT_VERDEFNUM
-# CHECK-NEXT: Value: 0x0000000000000034
+# CHECK-NEXT: Value: 0x34
# CHECK-NEXT: - Tag: DT_VERNEED
-# CHECK-NEXT: Value: 0x0000000000000035
+# CHECK-NEXT: Value: 0x35
# CHECK-NEXT: - Tag: DT_VERNEEDNUM
-# CHECK-NEXT: Value: 0x0000000000000036
+# CHECK-NEXT: Value: 0x36
# CHECK-NEXT: - Tag: DT_USED
-# CHECK-NEXT: Value: 0x0000000000000001
+# CHECK-NEXT: Value: 0x1
!ELF
FileHeader:
diff --git a/llvm/test/tools/obj2yaml/ELF/entsize.yaml b/llvm/test/tools/obj2yaml/ELF/entsize.yaml
index fab37a566f85..e177f1048b88 100644
--- a/llvm/test/tools/obj2yaml/ELF/entsize.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/entsize.yaml
@@ -6,7 +6,7 @@
# CHECK: - Name: .rodata.cst4
# CHECK-NEXT: Type: SHT_PROGBITS
# CHECK-NEXT: Flags: [ SHF_ALLOC, SHF_MERGE ]
-# CHECK-NEXT: EntSize: 0x0000000000000004
+# CHECK-NEXT: EntSize: 0x4
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml b/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml
index 6828412bb148..7dd0a7c870ea 100644
--- a/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml
@@ -10,11 +10,11 @@
# FIELDS-NEXT: Type: SHT_GNU_HASH
# FIELDS-NEXT: Flags: [ SHF_ALLOC ]
# FIELDS-NEXT: Header:
-# FIELDS-NEXT: SymNdx: 0x00000001
-# FIELDS-NEXT: Shift2: 0x00000002
-# FIELDS-NEXT: BloomFilter: [ 0x0000000000000003, 0x0000000000000004 ]
-# FIELDS-NEXT: HashBuckets: [ 0x00000005, 0x00000006, 0x00000007 ]
-# FIELDS-NEXT: HashValues: [ 0x00000008, 0x00000009, 0x0000000A, 0x0000000B ]
+# FIELDS-NEXT: SymNdx: 0x1
+# FIELDS-NEXT: Shift2: 0x2
+# FIELDS-NEXT: BloomFilter: [ 0x3, 0x4 ]
+# FIELDS-NEXT: HashBuckets: [ 0x5, 0x6, 0x7 ]
+# FIELDS-NEXT: HashValues: [ 0x8, 0x9, 0xA, 0xB ]
--- !ELF
FileHeader:
@@ -44,10 +44,10 @@ Sections:
# INVALID-NEXT: - Name: .gnu.hash.empty
# INVALID-NEXT: Type: SHT_GNU_HASH
# INVALID-NEXT: Flags: [ SHF_ALLOC ]
-# INVALID-NEXT: Address: 0x000000000000000F
+# INVALID-NEXT: Address: 0xF
# INVALID-NEXT: Header:
-# INVALID-NEXT: SymNdx: 0x00000000
-# INVALID-NEXT: Shift2: 0x00000000
+# INVALID-NEXT: SymNdx: 0x0
+# INVALID-NEXT: Shift2: 0x0
# INVALID-NEXT: BloomFilter: [ ]
# INVALID-NEXT: HashBuckets: [ ]
# INVALID-NEXT: HashValues: [ ]
@@ -60,11 +60,11 @@ Sections:
# INVALID-NEXT: - Name: .gnu.hash.hashvalues.ok
# INVALID-NEXT: Type: SHT_GNU_HASH
# INVALID-NEXT: Header:
-# INVALID-NEXT: SymNdx: 0x00000000
-# INVALID-NEXT: Shift2: 0x00000000
+# INVALID-NEXT: SymNdx: 0x0
+# INVALID-NEXT: Shift2: 0x0
# INVALID-NEXT: BloomFilter: [ ]
# INVALID-NEXT: HashBuckets: [ ]
-# INVALID-NEXT: HashValues: [ 0x00000000 ]
+# INVALID-NEXT: HashValues: [ 0x0 ]
# INVALID-NEXT: - Name: .gnu.hash.hashvalues.fail
# INVALID-NEXT: Type: SHT_GNU_HASH
# INVALID-NEXT: Content: '000000000000000000000000000000000000000000'
diff --git a/llvm/test/tools/obj2yaml/ELF/hash-section.yaml b/llvm/test/tools/obj2yaml/ELF/hash-section.yaml
index 7e0a0288a5f1..389b4bbb6972 100644
--- a/llvm/test/tools/obj2yaml/ELF/hash-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/hash-section.yaml
@@ -83,14 +83,14 @@ Sections:
# ENT-SIZE: - Name: .hash.entsize.0
# ENT-SIZE-NEXT: Type: SHT_HASH
-# ENT-SIZE-NEXT: EntSize: 0x0000000000000000
+# ENT-SIZE-NEXT: EntSize: 0x0
# ENT-SIZE-NEXT: Content: ''
# ENT-SIZE-NEXT: - Name: .hash.entsize.4.default
# ENT-SIZE-NEXT: Type: SHT_HASH
# ENT-SIZE-NEXT: Content: ''
# ENT-SIZE-NEXT: - Name: .hash.entsize.255
# ENT-SIZE-NEXT: Type: SHT_HASH
-# ENT-SIZE-NEXT: EntSize: 0x00000000000000FF
+# ENT-SIZE-NEXT: EntSize: 0xFF
# ENT-SIZE-NEXT: Content: ''
--- !ELF
diff --git a/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml b/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml
index e400d00eb541..1a6d822f4f1a 100644
--- a/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml
@@ -43,15 +43,15 @@
# OUTPUT-NEXT: - Name: .dynsym
# OUTPUT-NEXT: Type: SHT_DYNSYM
# OUTPUT-NEXT: Flags: [ SHF_ALLOC ]
-# OUTPUT-NEXT: Address: 0x0000000000001000
+# OUTPUT-NEXT: Address: 0x1000
# OUTPUT-NEXT: Link: .dynstr
-# OUTPUT-NEXT: EntSize: 0x0000000000000018
+# OUTPUT-NEXT: EntSize: 0x18
# OUTPUT-NEXT: - Name: .foo.2
# OUTPUT-NEXT: Type: SHT_PROGBITS
# OUTPUT-NEXT: - Name: .dynstr
# OUTPUT-NEXT: Type: SHT_STRTAB
# OUTPUT-NEXT: Flags: [ SHF_ALLOC ]
-# OUTPUT-NEXT: Address: 0x0000000000002000
+# OUTPUT-NEXT: Address: 0x2000
# OUTPUT-NEXT: - Name: .foo.3
# OUTPUT-NEXT: Type: SHT_PROGBITS
# OUTPUT-NEXT: - Name: .foo.4
@@ -136,21 +136,21 @@ DynamicSymbols:
# OUTPUT2-NEXT: - Name: .symtab
# OUTPUT2-NEXT: Type: SHT_SYMTAB
# OUTPUT2-NEXT: Flags: [ SHF_ALLOC ]
-# OUTPUT2-NEXT: Address: 0x0000000000003000
+# OUTPUT2-NEXT: Address: 0x3000
# OUTPUT2-NEXT: Link: .strtab
-# OUTPUT2-NEXT: EntSize: 0x0000000000000018
+# OUTPUT2-NEXT: EntSize: 0x18
# OUTPUT2-NEXT: - Name: .foo.4
# OUTPUT2-NEXT: Type: SHT_PROGBITS
# OUTPUT2-NEXT: - Name: .strtab
# OUTPUT2-NEXT: Type: SHT_STRTAB
# OUTPUT2-NEXT: Flags: [ SHF_ALLOC ]
-# OUTPUT2-NEXT: Address: 0x0000000000004000
+# OUTPUT2-NEXT: Address: 0x4000
# OUTPUT2-NEXT: - Name: .foo.5
# OUTPUT2-NEXT: Type: SHT_PROGBITS
# OUTPUT2-NEXT: - Name: .shstrtab
# OUTPUT2-NEXT: Type: SHT_STRTAB
# OUTPUT2-NEXT: Flags: [ SHF_ALLOC ]
-# OUTPUT2-NEXT: Address: 0x0000000000005000
+# OUTPUT2-NEXT: Address: 0x5000
# OUTPUT2-NEXT: - Name: .foo.6
# OUTPUT2-NEXT: Type: SHT_PROGBITS
# OUTPUT2-NEXT: Symbols:
diff --git a/llvm/test/tools/obj2yaml/ELF/mips-abi-flags.yaml b/llvm/test/tools/obj2yaml/ELF/mips-abi-flags.yaml
index 02fcff52fb38..7361359350bf 100644
--- a/llvm/test/tools/obj2yaml/ELF/mips-abi-flags.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/mips-abi-flags.yaml
@@ -6,10 +6,10 @@
# CHECK: Sections:
# CHECK-NEXT: - Name: .MIPS.abiflags
# CHECK-NEXT: Type: SHT_MIPS_ABIFLAGS
-# CHECK-NEXT: AddressAlign: 0x0000000000000008
-# CHECK-NEXT: EntSize: 0x0000000000000018
+# CHECK-NEXT: AddressAlign: 0x8
+# CHECK-NEXT: EntSize: 0x18
# CHECK-NEXT: ISA: MIPS64
-# CHECK-NEXT: ISARevision: 0x05
+# CHECK-NEXT: ISARevision: 0x5
# CHECK-NEXT: ISAExtension: EXT_OCTEON3
# CHECK-NEXT: ASEs: [ DSP, DSPR2, VIRT ]
# CHECK-NEXT: FpABI: FP_DOUBLE
@@ -52,7 +52,7 @@ Sections:
# MIPS: - Name: .MIPS.abiflags
# MIPS-NEXT: Type: SHT_MIPS_ABIFLAGS
-# MIPS-NEXT: ISA: 0x00000000
+# MIPS-NEXT: ISA: 0x0
# MIPS-NEXT: ...
# NOT-MIPS: - Name: .MIPS.abiflags
diff --git a/llvm/test/tools/obj2yaml/ELF/no-symbol-reloc.yaml b/llvm/test/tools/obj2yaml/ELF/no-symbol-reloc.yaml
index 8940f6a9e8b7..cee843503bc5 100644
--- a/llvm/test/tools/obj2yaml/ELF/no-symbol-reloc.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/no-symbol-reloc.yaml
@@ -19,7 +19,7 @@
# CHECK-NEXT: Info: .text
# CHECK-NEXT: Relocations:
# CHECK-NEXT: - Type: R_X86_64_NONE
-# CHECK-NEXT: - Offset: 0x0000000000000004
+# CHECK-NEXT: - Offset: 0x4
# CHECK-NEXT: Type: R_X86_64_NONE
# CHECK-NEXT: ...
diff --git a/llvm/test/tools/obj2yaml/ELF/note-section.yaml b/llvm/test/tools/obj2yaml/ELF/note-section.yaml
index aab22ff12192..5a80ce34cc0e 100644
--- a/llvm/test/tools/obj2yaml/ELF/note-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/note-section.yaml
@@ -10,7 +10,7 @@
# VALID-NEXT: Notes:
# VALID-NEXT: - Name: ''
# VALID-NEXT: Desc: ''
-# VALID-NEXT: Type: 0x00
+# VALID-NEXT: Type: 0x0
# VALID-NEXT: - Name: .note.bar
# VALID-NEXT: Type: SHT_NOTE
# VALID-NEXT: Notes:
diff --git a/llvm/test/tools/obj2yaml/ELF/null-section.yaml b/llvm/test/tools/obj2yaml/ELF/null-section.yaml
index abba576fb4c7..9a755f4151ff 100644
--- a/llvm/test/tools/obj2yaml/ELF/null-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/null-section.yaml
@@ -12,12 +12,12 @@
# FIRST-SEC-NEXT: Sections:
# FIRST-SEC-NEXT: - Type: SHT_NULL
# FIRST-SEC-NEXT: Flags: [ SHF_ALLOC ]
-# FIRST-SEC-NEXT: Address: 0x0000000000000006
+# FIRST-SEC-NEXT: Address: 0x6
# FIRST-SEC-NEXT: Link: .foo
-# FIRST-SEC-NEXT: AddressAlign: 0x0000000000000003
-# FIRST-SEC-NEXT: EntSize: 0x0000000000000005
-# FIRST-SEC-NEXT: Size: 0x0000000000000004
-# FIRST-SEC-NEXT: Info: 0x0000000000000002
+# FIRST-SEC-NEXT: AddressAlign: 0x3
+# FIRST-SEC-NEXT: EntSize: 0x5
+# FIRST-SEC-NEXT: Size: 0x4
+# FIRST-SEC-NEXT: Info: 0x2
# FIRST-SEC-NEXT: - Name: .foo
# FIRST-SEC-NEXT: Type: SHT_PROGBITS
# FIRST-SEC-NEXT: ...
@@ -55,12 +55,12 @@ Sections:
# SECOND-SEC-NEXT: Type: SHT_PROGBITS
# SECOND-SEC-NEXT: - Type: SHT_NULL
# SECOND-SEC-NEXT: Flags: [ SHF_ALLOC ]
-# SECOND-SEC-NEXT: Address: 0x0000000000000006
+# SECOND-SEC-NEXT: Address: 0x6
# SECOND-SEC-NEXT: Link: .foo
-# SECOND-SEC-NEXT: AddressAlign: 0x0000000000000003
-# SECOND-SEC-NEXT: EntSize: 0x0000000000000005
+# SECOND-SEC-NEXT: AddressAlign: 0x3
+# SECOND-SEC-NEXT: EntSize: 0x5
# SECOND-SEC-NEXT: Content: '00000000'
-# SECOND-SEC-NEXT: Info: 0x0000000000000002
+# SECOND-SEC-NEXT: Info: 0x2
# SECOND-SEC-NEXT: ...
--- !ELF
diff --git a/llvm/test/tools/obj2yaml/ELF/program-headers.yaml b/llvm/test/tools/obj2yaml/ELF/program-headers.yaml
index 6a7841a045e3..d3907bc7431c 100644
--- a/llvm/test/tools/obj2yaml/ELF/program-headers.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/program-headers.yaml
@@ -41,49 +41,49 @@
# YAML-NEXT: Flags: [ PF_R ]
# YAML-NEXT: FirstSec: .hash
# YAML-NEXT: LastSec: .dynstr
-# YAML-NEXT: Align: 0x0000000000001000
+# YAML-NEXT: Align: 0x1000
# YAML-NEXT: - Type: PT_LOAD
# YAML-NEXT: Flags: [ PF_X, PF_R ]
# YAML-NEXT: FirstSec: .foo
# YAML-NEXT: LastSec: .zed
-# YAML-NEXT: VAddr: 0x0000000000001000
-# YAML-NEXT: Align: 0x0000000000001000
+# YAML-NEXT: VAddr: 0x1000
+# YAML-NEXT: Align: 0x1000
# YAML-NEXT: - Type: PT_LOAD
# YAML-NEXT: Flags: [ PF_R ]
# YAML-NEXT: FirstSec: '.foo (1)'
# YAML-NEXT: LastSec: .baz
-# YAML-NEXT: VAddr: 0x0000000000002000
-# YAML-NEXT: Align: 0x0000000000001000
+# YAML-NEXT: VAddr: 0x2000
+# YAML-NEXT: Align: 0x1000
# YAML-NEXT: - Type: PT_LOAD
# YAML-NEXT: Flags: [ PF_W, PF_R ]
# YAML-NEXT: FirstSec: .dynamic
# YAML-NEXT: LastSec: .dynamic.tail
-# YAML-NEXT: VAddr: 0x0000000000003EF0
-# YAML-NEXT: Align: 0x0000000000001000
+# YAML-NEXT: VAddr: 0x3EF0
+# YAML-NEXT: Align: 0x1000
# YAML-NEXT: - Type: PT_DYNAMIC
# YAML-NEXT: Flags: [ PF_W, PF_R ]
# YAML-NEXT: FirstSec: .dynamic
# YAML-NEXT: LastSec: .dynamic
-# YAML-NEXT: VAddr: 0x0000000000003EF0
-# YAML-NEXT: Align: 0x0000000000000008
+# YAML-NEXT: VAddr: 0x3EF0
+# YAML-NEXT: Align: 0x8
# YAML-NEXT: - Type: PT_GNU_RELRO
# YAML-NEXT: Flags: [ PF_R ]
# YAML-NEXT: FirstSec: .dynamic
# YAML-NEXT: LastSec: .dynamic
-# YAML-NEXT: VAddr: 0x0000000000003EF0
+# YAML-NEXT: VAddr: 0x3EF0
# YAML-NEXT: - Type: PT_LOAD
# YAML-NEXT: Flags: [ PF_R ]
-# YAML-NEXT: VAddr: 0x0000000000004000
+# YAML-NEXT: VAddr: 0x4000
# YAML-NEXT: - Type: PT_LOAD
# YAML-NEXT: Flags: [ PF_R ]
# YAML-NEXT: FirstSec: .gnu.hash
# YAML-NEXT: LastSec: .gnu.hash
-# YAML-NEXT: VAddr: 0x00000000000001A0
+# YAML-NEXT: VAddr: 0x1A0
# YAML-NEXT: - Type: PT_LOAD
# YAML-NEXT: Flags: [ PF_R ]
# YAML-NEXT: FirstSec: .gnu.hash
# YAML-NEXT: LastSec: .gnu.hash
-# YAML-NEXT: VAddr: 0x00000000000001A0
+# YAML-NEXT: VAddr: 0x1A0
# YAML-NEXT: Sections:
--- !ELF
@@ -231,23 +231,23 @@ DynamicSymbols: []
# EMPTY-NEXT: Flags: [ PF_W, PF_R ]
# EMPTY-NEXT: FirstSec: .empty.tls.start
# EMPTY-NEXT: LastSec: .empty.tls.end
-# EMPTY-NEXT: VAddr: 0x0000000000001000
-# EMPTY-NEXT: Align: 0x0000000000001000
+# EMPTY-NEXT: VAddr: 0x1000
+# EMPTY-NEXT: Align: 0x1000
# EMPTY-NEXT: - Type: PT_TLS
# EMPTY-NEXT: Flags: [ PF_W, PF_R ]
# EMPTY-NEXT: FirstSec: .empty.tls.start
# EMPTY-NEXT: LastSec: .empty.tls.start
-# EMPTY-NEXT: VAddr: 0x0000000000001000
+# EMPTY-NEXT: VAddr: 0x1000
# EMPTY-NEXT: - Type: PT_TLS
# EMPTY-NEXT: Flags: [ PF_W, PF_R ]
# EMPTY-NEXT: FirstSec: .empty.tls.middle
# EMPTY-NEXT: LastSec: .empty.tls.middle
-# EMPTY-NEXT: VAddr: 0x0000000000001100
+# EMPTY-NEXT: VAddr: 0x1100
# EMPTY-NEXT: - Type: PT_TLS
# EMPTY-NEXT: Flags: [ PF_W, PF_R ]
# EMPTY-NEXT: FirstSec: .empty.tls.end
# EMPTY-NEXT: LastSec: .empty.tls.end
-# EMPTY-NEXT: VAddr: 0x0000000000001200
+# EMPTY-NEXT: VAddr: 0x1200
# EMPTY-NEXT: Sections:
--- !ELF
@@ -320,8 +320,8 @@ Sections:
# MISALIGNED-YAML-NEXT: Flags: [ PF_R ]
# MISALIGNED-YAML-NEXT: FirstSec: .foo
# MISALIGNED-YAML-NEXT: LastSec: .foo
-# MISALIGNED-YAML-NEXT: VAddr: 0x0000000000001000
-# MISALIGNED-YAML-NEXT: Align: 0x0000000000001000
+# MISALIGNED-YAML-NEXT: VAddr: 0x1000
+# MISALIGNED-YAML-NEXT: Align: 0x1000
# MISALIGNED-YAML-NEXT: Sections:
--- !ELF
@@ -434,7 +434,7 @@ Sections:
# NOBITS-NEXT: Flags: [ PF_W, PF_R ]
# NOBITS-NEXT: FirstSec: .foo.bss
# NOBITS-NEXT: LastSec: .bar.bss
-# NOBITS-NEXT: VAddr: 0x0000000200000000
+# NOBITS-NEXT: VAddr: 0x200000000
# NOBITS-NEXT: Sections:
--- !ELF
@@ -580,7 +580,7 @@ Sections:
# ZERO-SIZE-NEXT: Flags: [ PF_W, PF_R ]
# ZERO-SIZE-NEXT: FirstSec: .empty.bar1
# ZERO-SIZE-NEXT: LastSec: .empty.bar2
-# ZERO-SIZE-NEXT: VAddr: 0x0000000000002000
+# ZERO-SIZE-NEXT: VAddr: 0x2000
# ZERO-SIZE-NEXT: Sections:
--- !ELF
@@ -629,7 +629,7 @@ Sections:
# BROKEN-VA-NEXT: Flags: [ PF_W, PF_R ]
# BROKEN-VA-NEXT: FirstSec: .empty_middle
# BROKEN-VA-NEXT: LastSec: .empty_middle
-# BROKEN-VA-NEXT: VAddr: 0x0000000000001000
+# BROKEN-VA-NEXT: VAddr: 0x1000
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/obj2yaml/ELF/relocation-type.yaml b/llvm/test/tools/obj2yaml/ELF/relocation-type.yaml
index d069abe68eda..22e859465a67 100644
--- a/llvm/test/tools/obj2yaml/ELF/relocation-type.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/relocation-type.yaml
@@ -2,7 +2,7 @@
## Show that obj2yaml is able to dump relocation types when `e_machine` kind is unknown.
# RUN: yaml2obj %s -o %t1 -DMACHINE=0x1234
-# RUN: obj2yaml %t1 | FileCheck %s -DMACHINE=0x1234 -DFIRST=0x00000000 -DSECOND=0x00000001
+# RUN: obj2yaml %t1 | FileCheck %s -DMACHINE=0x1234 -DFIRST=0x0 -DSECOND=0x1
# CHECK: --- !ELF
# CHECK-NEXT: FileHeader:
@@ -14,14 +14,14 @@
# CHECK-NEXT: - Name: .rela.text
# CHECK-NEXT: Type: SHT_RELA
# CHECK-NEXT: Relocations:
-# CHECK-NEXT: - Offset: 0x0000000000000009
+# CHECK-NEXT: - Offset: 0x9
# CHECK-NEXT: Type: [[FIRST]]
-# CHECK-NEXT: - Offset: 0x0000000000000008
+# CHECK-NEXT: - Offset: 0x8
# CHECK-NEXT: Type: [[SECOND]]
-# CHECK-NEXT: - Offset: 0x0000000000000007
-# CHECK-NEXT: Type: 0x0000007F
-# CHECK-NEXT: - Offset: 0x0000000000000006
-# CHECK-NEXT: Type: 0x000000FF
+# CHECK-NEXT: - Offset: 0x7
+# CHECK-NEXT: Type: 0x7F
+# CHECK-NEXT: - Offset: 0x6
+# CHECK-NEXT: Type: 0xFF
# CHECK-NEXT: ...
## Show how obj2yaml dumps relocation types when `e_machine` kind is known.
diff --git a/llvm/test/tools/obj2yaml/ELF/relr-section.yaml b/llvm/test/tools/obj2yaml/ELF/relr-section.yaml
index 79b335d23e9f..6bc51ca09b3e 100644
--- a/llvm/test/tools/obj2yaml/ELF/relr-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/relr-section.yaml
@@ -21,7 +21,7 @@
# ELF32LE: Sections:
# ELF32LE-NEXT: - Name: .relr.dyn
# ELF32LE-NEXT: Type: SHT_RELR
-# ELF32LE-NEXT: Entries: [ 0x0000000044332211, 0x0000000088776655 ]
+# ELF32LE-NEXT: Entries: [ 0x44332211, 0x88776655 ]
# ELF64BE: Sections:
# ELF64BE-NEXT: - Name: .relr.dyn
@@ -31,7 +31,7 @@
# ELF32BE: Sections:
# ELF32BE-NEXT: - Name: .relr.dyn
# ELF32BE-NEXT: Type: SHT_RELR
-# ELF32BE-NEXT: Entries: [ 0x0000000011223344, 0x0000000055667788 ]
+# ELF32BE-NEXT: Entries: [ 0x11223344, 0x55667788 ]
--- !ELF
FileHeader:
@@ -70,7 +70,7 @@ Sections:
# ENTSIZE: - Name: .relr.dyn
# ENTSIZE-NEXT: Type: SHT_RELR
-# ENTSIZE-NEXT: EntSize: 0x00000000000000FE
+# ENTSIZE-NEXT: EntSize: 0xFE
# ENTSIZE-NEXT: Content: '1122334455667788'
# ENTSIZE-NEXT: ...
diff --git a/llvm/test/tools/obj2yaml/ELF/section-type.yaml b/llvm/test/tools/obj2yaml/ELF/section-type.yaml
index ca054ebcd62b..81bdfc250441 100644
--- a/llvm/test/tools/obj2yaml/ELF/section-type.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/section-type.yaml
@@ -5,7 +5,7 @@
# CHECK-NEXT: - Name: known_type
# CHECK-NEXT: Type: SHT_PROGBITS
# CHECK: - Name: unknown_type
-# CHECK-NEXT: Type: 0x0000ABCD
+# CHECK-NEXT: Type: 0xABCD
# CHECK: - Name: machine_specific
# CHECK-NEXT: Type: SHT_X86_64_UNWIND
# CHECK: - Name: unknown_machine_specific
diff --git a/llvm/test/tools/obj2yaml/ELF/sections-info.yaml b/llvm/test/tools/obj2yaml/ELF/sections-info.yaml
index 92e3ac69423c..b56175260f53 100644
--- a/llvm/test/tools/obj2yaml/ELF/sections-info.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/sections-info.yaml
@@ -9,7 +9,7 @@
# CHECK-NEXT: Type: SHT_PROGBITS
# CHECK-NEXT: - Name: .bar
# CHECK-NEXT: Type: SHT_PROGBITS
-# CHECK-NEXT: Info: 0x0000000000000001
+# CHECK-NEXT: Info: 0x1
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/obj2yaml/ELF/shinfo.yaml b/llvm/test/tools/obj2yaml/ELF/shinfo.yaml
index c218733e1cd5..3c14f9eea0df 100644
--- a/llvm/test/tools/obj2yaml/ELF/shinfo.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/shinfo.yaml
@@ -5,7 +5,7 @@
# CHECK: - Name: .test
# CHECK-NEXT: Type: SHT_PROGBITS
-# CHECK-NEXT: Info: 0x000000000000002A
+# CHECK-NEXT: Info: 0x2A
--- !ELF
FileHeader:
diff --git a/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml b/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml
index 2940e54cb435..2b337538acba 100644
--- a/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml
@@ -16,7 +16,7 @@
# CASE1-NEXT: - Name: .symtab_shndx
# CASE1-NEXT: Type: SHT_SYMTAB_SHNDX
# CASE1-NEXT: Link: .symtab
-# CASE1-NEXT: EntSize: 0x0000000000000004
+# CASE1-NEXT: EntSize: 0x4
# CASE1-NEXT: Entries: [ 0, 1, 2 ]
# CASE1-NEXT: Symbols:
# CASE1-NEXT: - Name: bar
diff --git a/llvm/test/tools/obj2yaml/ELF/special-symbol-indices.yaml b/llvm/test/tools/obj2yaml/ELF/special-symbol-indices.yaml
index 27ccb77a82ae..dab050b90045 100644
--- a/llvm/test/tools/obj2yaml/ELF/special-symbol-indices.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/special-symbol-indices.yaml
@@ -7,7 +7,7 @@
# CHECK-NEXT: - Name: absolute
# CHECK-NEXT: Index: SHN_ABS
# CHECK-NEXT: Binding: STB_GLOBAL
-# CHECK-NEXT: Value: 0x0000000000001234
+# CHECK-NEXT: Value: 0x1234
# CHECK-NEXT: - Name: common
# CHECK-NEXT: Index: SHN_COMMON
# CHECK-NEXT: Binding: STB_GLOBAL
diff --git a/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml b/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml
index a2ef5f1f3770..13d13a8d86a5 100644
--- a/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml
@@ -15,10 +15,10 @@
# VALID-NEXT: - Name: .stack_sizes
# VALID-NEXT: Type: SHT_PROGBITS
# VALID-NEXT: Entries:
-# VALID-NEXT: - Address: 0x0000000000000010
-# VALID-NEXT: Size: 0x0000000000000020
-# VALID-NEXT: - Address: 0x0000000000000030
-# VALID-NEXT: Size: 0x0000000000000040
+# VALID-NEXT: - Address: 0x10
+# VALID-NEXT: Size: 0x20
+# VALID-NEXT: - Address: 0x30
+# VALID-NEXT: Size: 0x40
--- !ELF
FileHeader:
@@ -95,17 +95,17 @@ Sections:
# MULTI-NEXT: - Name: .stack_sizes
# MULTI-NEXT: Type: SHT_PROGBITS
# MULTI-NEXT: Entries:
-# MULTI-NEXT: - Address: 0x0000000000000010
-# MULTI-NEXT: Size: 0x0000000000000020
-# MULTI-NEXT: - Address: 0x0000000000000030
-# MULTI-NEXT: Size: 0x0000000000000040
+# MULTI-NEXT: - Address: 0x10
+# MULTI-NEXT: Size: 0x20
+# MULTI-NEXT: - Address: 0x30
+# MULTI-NEXT: Size: 0x40
# MULTI-NEXT: - Name: '.stack_sizes (1)'
# MULTI-NEXT: Type: SHT_PROGBITS
# MULTI-NEXT: Entries:
-# MULTI-NEXT: - Address: 0x0000000000000050
-# MULTI-NEXT: Size: 0x0000000000000001
-# MULTI-NEXT: - Address: 0x0000000000000060
-# MULTI-NEXT: Size: 0x0000000000000002
+# MULTI-NEXT: - Address: 0x50
+# MULTI-NEXT: Size: 0x1
+# MULTI-NEXT: - Address: 0x60
+# MULTI-NEXT: Size: 0x2
--- !ELF
FileHeader:
@@ -116,14 +116,14 @@ Sections:
- Name: .stack_sizes
Type: SHT_PROGBITS
Entries:
- - Address: 0x0000000000000010
- Size: 0x0000000000000020
- - Address: 0x0000000000000030
- Size: 0x0000000000000040
+ - Address: 0x10
+ Size: 0x20
+ - Address: 0x30
+ Size: 0x40
- Name: '.stack_sizes (1)'
Type: SHT_PROGBITS
Entries:
- - Address: 0x0000000000000050
- Size: 0x0000000000000001
- - Address: 0x0000000000000060
- Size: 0x0000000000000002
+ - Address: 0x50
+ Size: 0x1
+ - Address: 0x60
+ Size: 0x2
diff --git a/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml b/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml
index 3877c6d9a68c..2e65ade0bde2 100644
--- a/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml
@@ -6,7 +6,7 @@
# CHECK-NEXT: Type: STT_OBJECT
# CHECK-NEXT: Binding: STB_GLOBAL
# CHECK-NEXT: - Name: an_unknown_type
-# CHECK-NEXT: Type: 0x07
+# CHECK-NEXT: Type: 0x7
# CHECK-NEXT: Binding: STB_GLOBAL
!ELF
diff --git a/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml b/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml
index 12595332c335..762b797ceb2b 100644
--- a/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml
@@ -6,10 +6,10 @@
# CHECK: - Name: .gnu.version_d
# CHECK-NEXT: Type: SHT_GNU_verdef
# CHECK-NEXT: Flags: [ SHF_ALLOC ]
-# CHECK-NEXT: Address: 0x0000000000000230
+# CHECK-NEXT: Address: 0x230
# CHECK-NEXT: Link: .dynstr
-# CHECK-NEXT: AddressAlign: 0x0000000000000004
-# CHECK-NEXT: Info: 0x0000000000000004
+# CHECK-NEXT: AddressAlign: 0x4
+# CHECK-NEXT: Info: 0x4
# CHECK-NEXT: Entries:
# CHECK-NEXT: - Version: 1
# CHECK-NEXT: Flags: 1
@@ -36,15 +36,15 @@ FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_DYN
- Entry: 0x0000000000001000
+ Entry: 0x1000
Sections:
- Name: .gnu.version_d
Type: SHT_GNU_verdef
Flags: [ SHF_ALLOC ]
- Address: 0x0000000000000230
+ Address: 0x230
Link: .dynstr
- AddressAlign: 0x0000000000000004
- Info: 0x0000000000000004
+ AddressAlign: 0x4
+ Info: 0x4
Entries:
- Version: 1
Flags: 1
diff --git a/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml b/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml
index 9c08ae9a9a46..acd997c3ebff 100644
--- a/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml
@@ -6,10 +6,10 @@
# CHECK: - Name: .gnu.version_r
# CHECK-NEXT: Type: SHT_GNU_verneed
# CHECK-NEXT: Flags: [ SHF_ALLOC ]
-# CHECK-NEXT: Address: 0x0000000000200250
+# CHECK-NEXT: Address: 0x200250
# CHECK-NEXT: Link: .dynstr
-# CHECK-NEXT: AddressAlign: 0x0000000000000004
-# CHECK-NEXT: Info: 0x0000000000000002
+# CHECK-NEXT: AddressAlign: 0x4
+# CHECK-NEXT: Info: 0x2
# CHECK-NEXT: Dependencies:
# CHECK-NEXT: - Version: 1
# CHECK-NEXT: File: dso.so.0
diff --git a/llvm/test/tools/obj2yaml/ELF/versym-section.yaml b/llvm/test/tools/obj2yaml/ELF/versym-section.yaml
index fd63f553dc40..c1b6e1423aab 100644
--- a/llvm/test/tools/obj2yaml/ELF/versym-section.yaml
+++ b/llvm/test/tools/obj2yaml/ELF/versym-section.yaml
@@ -8,15 +8,15 @@
# CHECK-NEXT: Class: ELFCLASS64
# CHECK-NEXT: Data: ELFDATA2LSB
# CHECK-NEXT: Type: ET_EXEC
-# CHECK-NEXT: Entry: 0x0000000000201000
+# CHECK-NEXT: Entry: 0x201000
# CHECK-NEXT: Sections:
# CHECK-NEXT: - Name: .gnu.version
# CHECK-NEXT: Type: SHT_GNU_versym
# CHECK-NEXT: Flags: [ SHF_ALLOC ]
-# CHECK-NEXT: Address: 0x0000000000200210
+# CHECK-NEXT: Address: 0x200210
# CHECK-NEXT: Link: .dynsym
-# CHECK-NEXT: AddressAlign: 0x0000000000000002
-# CHECK-NEXT: EntSize: 0x0000000000000002
+# CHECK-NEXT: AddressAlign: 0x2
+# CHECK-NEXT: EntSize: 0x2
# CHECK-NEXT: Entries: [ 0, 3, 4 ]
# CHECK-NEXT: - Name:
# CHECK: DynamicSymbols:
@@ -30,15 +30,15 @@ FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
- Entry: 0x0000000000201000
+ Entry: 0x201000
Sections:
- Name: .gnu.version
Type: SHT_GNU_versym
Flags: [ SHF_ALLOC ]
- Address: 0x0000000000200210
+ Address: 0x200210
Link: .dynsym
- AddressAlign: 0x0000000000000002
- EntSize: 0x0000000000000002
+ AddressAlign: 0x2
+ EntSize: 0x2
Entries: [ 0, 3, 4 ]
DynamicSymbols:
- Name: f1
diff --git a/llvm/test/tools/obj2yaml/MachO/debug-aranges.yaml b/llvm/test/tools/obj2yaml/MachO/debug-aranges.yaml
index 8b08e8e51597..4f475fba7fcb 100644
--- a/llvm/test/tools/obj2yaml/MachO/debug-aranges.yaml
+++ b/llvm/test/tools/obj2yaml/MachO/debug-aranges.yaml
@@ -7,27 +7,27 @@
# ARANGES: Sections:
# ARANGES-NEXT: - sectname: __debug_aranges
# ARANGES-NEXT: segname: __[[SEGNAME]]
-# ARANGES-NEXT: addr: 0x0000000000000000
+# ARANGES-NEXT: addr: 0x0
# ARANGES-NEXT: size: 64
-# ARANGES-NEXT: offset: 0x00000210
+# ARANGES-NEXT: offset: 0x210
# ARANGES-NEXT: align: 0
-# ARANGES-NEXT: reloff: 0x00000000
+# ARANGES-NEXT: reloff: 0x0
# ARANGES-NEXT: nreloc: 0
-# ARANGES-NEXT: flags: 0x00000000
-# ARANGES-NEXT: reserved1: 0x00000000
-# ARANGES-NEXT: reserved2: 0x00000000
-# ARANGES-NEXT: reserved3: 0x00000000
+# ARANGES-NEXT: flags: 0x0
+# ARANGES-NEXT: reserved1: 0x0
+# ARANGES-NEXT: reserved2: 0x0
+# ARANGES-NEXT: reserved3: 0x0
# ARANGES-NEXT: DWARF:
# ARANGES-NEXT: debug_aranges:
-# ARANGES-NEXT: - Length: 0x000000000000003C
+# ARANGES-NEXT: - Length: 0x3C
# ARANGES-NEXT: Version: 2
-# ARANGES-NEXT: CuOffset: 0x0000000000001234
-# ARANGES-NEXT: AddressSize: 0x08
+# ARANGES-NEXT: CuOffset: 0x1234
+# ARANGES-NEXT: AddressSize: 0x8
# ARANGES-NEXT: Descriptors:
-# ARANGES-NEXT: - Address: 0x0000000000001234
-# ARANGES-NEXT: Length: 0x0000000000005678
-# ARANGES-NEXT: - Address: 0x0000000000001234
-# ARANGES-NEXT: Length: 0x0000000000005678
+# ARANGES-NEXT: - Address: 0x1234
+# ARANGES-NEXT: Length: 0x5678
+# ARANGES-NEXT: - Address: 0x1234
+# ARANGES-NEXT: Length: 0x5678
--- !mach-o
IsLittleEndian: true
@@ -83,16 +83,16 @@ DWARF:
# RAW-CONTENT: - sectname: __debug_aranges
# RAW-CONTENT-NEXT: segname: __DWARF
-# RAW-CONTENT-NEXT: addr: 0x0000000000000000
+# RAW-CONTENT-NEXT: addr: 0x0
# RAW-CONTENT-NEXT: size: 64
-# RAW-CONTENT-NEXT: offset: 0x00000210
+# RAW-CONTENT-NEXT: offset: 0x210
# RAW-CONTENT-NEXT: align: 0
-# RAW-CONTENT-NEXT: reloff: 0x00000000
+# RAW-CONTENT-NEXT: reloff: 0x0
# RAW-CONTENT-NEXT: nreloc: 0
-# RAW-CONTENT-NEXT: flags: 0x00000000
-# RAW-CONTENT-NEXT: reserved1: 0x00000000
-# RAW-CONTENT-NEXT: reserved2: 0x00000000
-# RAW-CONTENT-NEXT: reserved3: 0x00000000
+# RAW-CONTENT-NEXT: flags: 0x0
+# RAW-CONTENT-NEXT: reserved1: 0x0
+# RAW-CONTENT-NEXT: reserved2: 0x0
+# RAW-CONTENT-NEXT: reserved3: 0x0
# RAW-CONTENT-NEXT: content: '02000000020034120000080000000000341200000000000078560000000000003412000000000000785600000000000000000000000000000000000000000000'
# RAW-CONTENT-NEXT: ...
diff --git a/llvm/test/tools/obj2yaml/MachO/unrecognized-debug-section.yaml b/llvm/test/tools/obj2yaml/MachO/unrecognized-debug-section.yaml
index 4583fdde27fb..e978a73162a4 100644
--- a/llvm/test/tools/obj2yaml/MachO/unrecognized-debug-section.yaml
+++ b/llvm/test/tools/obj2yaml/MachO/unrecognized-debug-section.yaml
@@ -6,16 +6,16 @@
# UNRECOGNIZED: Sections:
# UNRECOGNIZED-NEXT: - sectname: __debug_foo
# UNRECOGNIZED-NEXT: segname: __DWARF
-# UNRECOGNIZED-NEXT: addr: 0x0000000000000000
+# UNRECOGNIZED-NEXT: addr: 0x0
# UNRECOGNIZED-NEXT: size: 5
-# UNRECOGNIZED-NEXT: offset: 0x00000210
+# UNRECOGNIZED-NEXT: offset: 0x210
# UNRECOGNIZED-NEXT: align: 0
-# UNRECOGNIZED-NEXT: reloff: 0x00000000
+# UNRECOGNIZED-NEXT: reloff: 0x0
# UNRECOGNIZED-NEXT: nreloc: 0
-# UNRECOGNIZED-NEXT: flags: 0x00000000
-# UNRECOGNIZED-NEXT: reserved1: 0x00000000
-# UNRECOGNIZED-NEXT: reserved2: 0x00000000
-# UNRECOGNIZED-NEXT: reserved3: 0x00000000
+# UNRECOGNIZED-NEXT: flags: 0x0
+# UNRECOGNIZED-NEXT: reserved1: 0x0
+# UNRECOGNIZED-NEXT: reserved2: 0x0
+# UNRECOGNIZED-NEXT: reserved3: 0x0
# UNRECOGNIZED-NEXT: content: '0123456789'
# UNRECOGNIZED-NEXT: ...
diff --git a/llvm/test/tools/obj2yaml/Minidump/basic.yaml b/llvm/test/tools/obj2yaml/Minidump/basic.yaml
index 0ed887b5a813..15076604309e 100644
--- a/llvm/test/tools/obj2yaml/Minidump/basic.yaml
+++ b/llvm/test/tools/obj2yaml/Minidump/basic.yaml
@@ -96,7 +96,7 @@ Streams:
# CHECK-NEXT: Platform ID: Linux
# CHECK-NEXT: CSD Version: Linux 3.13.0-91-generic
# CHECK-NEXT: CPU:
-# CHECK-NEXT: CPUID: 0x05060708
+# CHECK-NEXT: CPUID: 0x5060708
# CHECK-NEXT: - Type: LinuxAuxv
# CHECK-NEXT: Content: DEADBEEFBAADF00D
# CHECK-NEXT: - Type: LinuxMaps
@@ -106,9 +106,9 @@ Streams:
# CHECK-EMPTY:
# CHECK-NEXT: - Type: ModuleList
# CHECK-NEXT: Modules:
-# CHECK-NEXT: - Base of Image: 0x0001020304050607
-# CHECK-NEXT: Size of Image: 0x08090A0B
-# CHECK-NEXT: Checksum: 0x0C0D0E0F
+# CHECK-NEXT: - Base of Image: 0x1020304050607
+# CHECK-NEXT: Size of Image: 0x8090A0B
+# CHECK-NEXT: Checksum: 0xC0D0E0F
# CHECK-NEXT: Time Date Stamp: 47
# CHECK-NEXT: Module Name: a.out
# CHECK-NEXT: Version Info:
@@ -141,15 +141,15 @@ Streams:
# CHECK-NEXT: Start of Memory Range: 0x6C6D6E6F70717273
# CHECK-NEXT: Content: 7475767778797A7B
# CHECK-NEXT: - Type: Exception
-# CHECK-NEXT: Thread ID: 0x00000007
+# CHECK-NEXT: Thread ID: 0x7
# CHECK-NEXT: Exception Record:
-# CHECK-NEXT: Exception Code: 0x00000010
-# CHECK-NEXT: Exception Flags: 0x00000005
-# CHECK-NEXT: Exception Record: 0x0102030405060708
-# CHECK-NEXT: Exception Address: 0x0A0B0C0D0E0F1011
+# CHECK-NEXT: Exception Code: 0x10
+# CHECK-NEXT: Exception Flags: 0x5
+# CHECK-NEXT: Exception Record: 0x102030405060708
+# CHECK-NEXT: Exception Address: 0xA0B0C0D0E0F1011
# CHECK-NEXT: Number of Parameters: 2
-# CHECK-NEXT: Parameter 0: 0x0000000000000022
-# CHECK-NEXT: Parameter 1: 0x0000000000000024
+# CHECK-NEXT: Parameter 0: 0x22
+# CHECK-NEXT: Parameter 1: 0x24
# CHECK-NEXT: Thread Context: '8182838485868788'
# CHECK-NEXT: - Type: MemoryList
# CHECK-NEXT: Memory Ranges:
@@ -157,22 +157,22 @@ Streams:
# CHECK-NEXT: Content: '8485868788'
# CHECK-NEXT: - Type: MemoryInfoList
# CHECK-NEXT: Memory Ranges:
-# CHECK-NEXT: - Base Address: 0x0000000000000000
+# CHECK-NEXT: - Base Address: 0x0
# CHECK-NEXT: Allocation Protect: [ ]
-# CHECK-NEXT: Region Size: 0x0000000000010000
+# CHECK-NEXT: Region Size: 0x10000
# CHECK-NEXT: State: [ MEM_FREE ]
# CHECK-NEXT: Protect: [ PAGE_NO_ACCESS ]
# CHECK-NEXT: Type: [ ]
-# CHECK-NEXT: - Base Address: 0x0000000000010000
+# CHECK-NEXT: - Base Address: 0x10000
# CHECK-NEXT: Allocation Protect: [ PAGE_READ_WRITE ]
-# CHECK-NEXT: Region Size: 0x0000000000010000
+# CHECK-NEXT: Region Size: 0x10000
# CHECK-NEXT: State: [ MEM_COMMIT ]
# CHECK-NEXT: Type: [ MEM_MAPPED ]
-# CHECK-NEXT: - Base Address: 0x0000000000020000
-# CHECK-NEXT: Allocation Base: 0x0000000000000000
+# CHECK-NEXT: - Base Address: 0x20000
+# CHECK-NEXT: Allocation Base: 0x0
# CHECK-NEXT: Allocation Protect: [ PAGE_READ_WRITE, PAGE_WRITECOMBINE ]
# CHECK-NEXT: Reserved0: 0xDEADBEEF
-# CHECK-NEXT: Region Size: 0x0000000000010000
+# CHECK-NEXT: Region Size: 0x10000
# CHECK-NEXT: State: [ MEM_COMMIT, MEM_FREE ]
# CHECK-NEXT: Type: [ MEM_PRIVATE, MEM_MAPPED ]
# CHECK-NEXT: Reserved1: 0xBAADF00D
diff --git a/llvm/test/tools/obj2yaml/XCOFF/aix.yaml b/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
index b3e60dfd0580..640331a2c7ce 100644
--- a/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
+++ b/llvm/test/tools/obj2yaml/XCOFF/aix.yaml
@@ -2,79 +2,79 @@
# Test that we can parse the XCOFF object file correctly.
# CHECK: --- !XCOFF
# CHECK-NEXT: FileHeader:
-# CHECK-NEXT: MagicNumber: 0x01DF
+# CHECK-NEXT: MagicNumber: 0x1DF
# CHECK-NEXT: NumberOfSections: 2
# CHECK-NEXT: CreationTime: 1552337792
-# CHECK-NEXT: OffsetToSymbolTable: 0x0000013A
+# CHECK-NEXT: OffsetToSymbolTable: 0x13A
# CHECK-NEXT: EntriesInSymbolTable: 22
# CHECK-NEXT: AuxiliaryHeaderSize: 0
-# CHECK-NEXT: Flags: 0x0000
+# CHECK-NEXT: Flags: 0x0
# CHECK: Symbols:
# CHECK-NEXT: - Name: .file
-# CHECK-NEXT: Value: 0x00000000
+# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: Section: N_DEBUG
-# CHECK-NEXT: Type: 0x0003
+# CHECK-NEXT: Type: 0x3
# CHECK-NEXT: StorageClass: C_FILE
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: i
-# CHECK-NEXT: Value: 0x00000000
+# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: Section: N_UNDEF
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_EXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: TestforXcoff
-# CHECK-NEXT: Value: 0x00000000
+# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: Section: N_UNDEF
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_EXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: .text
-# CHECK-NEXT: Value: 0x00000000
+# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: Section: .text
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_HIDEXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: .main
-# CHECK-NEXT: Value: 0x00000000
+# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: Section: .text
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_EXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: main
-# CHECK-NEXT: Value: 0x00000060
+# CHECK-NEXT: Value: 0x60
# CHECK-NEXT: Section: .data
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_HIDEXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: main
-# CHECK-NEXT: Value: 0x00000060
+# CHECK-NEXT: Value: 0x60
# CHECK-NEXT: Section: .data
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_EXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: .data
-# CHECK-NEXT: Value: 0x00000070
+# CHECK-NEXT: Value: 0x70
# CHECK-NEXT: Section: .data
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_HIDEXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: TOC
-# CHECK-NEXT: Value: 0x00000074
+# CHECK-NEXT: Value: 0x74
# CHECK-NEXT: Section: .data
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_HIDEXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: i
-# CHECK-NEXT: Value: 0x00000074
+# CHECK-NEXT: Value: 0x74
# CHECK-NEXT: Section: .data
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_HIDEXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: - Name: TestforXcoff
-# CHECK-NEXT: Value: 0x00000078
+# CHECK-NEXT: Value: 0x78
# CHECK-NEXT: Section: .data
-# CHECK-NEXT: Type: 0x0000
+# CHECK-NEXT: Type: 0x0
# CHECK-NEXT: StorageClass: C_HIDEXT
# CHECK-NEXT: NumberOfAuxEntries: 1
# CHECK-NEXT: ...
diff --git a/llvm/test/tools/yaml2obj/ELF/abiversion.yaml b/llvm/test/tools/yaml2obj/ELF/abiversion.yaml
index 013b04aa7945..556fb72344e8 100644
--- a/llvm/test/tools/yaml2obj/ELF/abiversion.yaml
+++ b/llvm/test/tools/yaml2obj/ELF/abiversion.yaml
@@ -5,7 +5,7 @@
# RUN: obj2yaml %t | FileCheck %s --check-prefix=TOYAML
# FROMYAML: ABIVersion: 5
-# TOYAML: ABIVersion: 0x05
+# TOYAML: ABIVersion: 0x5
--- !ELF
FileHeader:
More information about the llvm-commits
mailing list