diff options
| author | Simon Atanasyan <simon@atanasyan.com> | 2014-05-15 18:04:09 +0000 |
|---|---|---|
| committer | Simon Atanasyan <simon@atanasyan.com> | 2014-05-15 18:04:09 +0000 |
| commit | 1564bf7dbe371c219f544fa45adcb6c249a9391c (patch) | |
| tree | 4f49e29795770b241efe70c847878afea68f9f07 | |
| parent | 650c53fe2a98baa2aa753438a6144d40d0f75fca (diff) | |
| download | llvm-1564bf7dbe371c219f544fa45adcb6c249a9391c.tar.gz llvm-1564bf7dbe371c219f544fa45adcb6c249a9391c.tar.bz2 llvm-1564bf7dbe371c219f544fa45adcb6c249a9391c.tar.xz | |
[obj2yaml][ELF] Print relocation's offset as a hex number. Use a proper
types to hold relocation's offset and addend.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208906 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/Object/ELFYAML.h | 4 | ||||
| -rw-r--r-- | test/Object/obj2yaml.test | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/llvm/Object/ELFYAML.h b/include/llvm/Object/ELFYAML.h index 26bfaaed6d..5be7534557 100644 --- a/include/llvm/Object/ELFYAML.h +++ b/include/llvm/Object/ELFYAML.h @@ -89,8 +89,8 @@ struct RawContentSection : Section { } }; struct Relocation { - uint32_t Offset; - uint32_t Addend; + llvm::yaml::Hex64 Offset; + int64_t Addend; ELF_REL Type; StringRef Symbol; }; diff --git a/test/Object/obj2yaml.test b/test/Object/obj2yaml.test index 060297e13c..db03f5afa4 100644 --- a/test/Object/obj2yaml.test +++ b/test/Object/obj2yaml.test @@ -208,23 +208,23 @@ ELF-MIPSEL-NEXT: - Offset: 0 ELF-MIPSEL-NEXT: Symbol: _gp_disp ELF-MIPSEL-NEXT: Type: R_MIPS_HI16 ELF-MIPSEL-NEXT: Addend: 0 -ELF-MIPSEL-NEXT: - Offset: 4 +ELF-MIPSEL-NEXT: - Offset: 0x0000000000000004 ELF-MIPSEL-NEXT: Symbol: _gp_disp ELF-MIPSEL-NEXT: Type: R_MIPS_LO16 ELF-MIPSEL-NEXT: Addend: 0 -ELF-MIPSEL-NEXT: - Offset: 24 +ELF-MIPSEL-NEXT: - Offset: 0x0000000000000018 ELF-MIPSEL-NEXT: Symbol: '$.str' ELF-MIPSEL-NEXT: Type: R_MIPS_GOT16 ELF-MIPSEL-NEXT: Addend: 0 -ELF-MIPSEL-NEXT: - Offset: 28 +ELF-MIPSEL-NEXT: - Offset: 0x000000000000001C ELF-MIPSEL-NEXT: Symbol: '$.str' ELF-MIPSEL-NEXT: Type: R_MIPS_LO16 ELF-MIPSEL-NEXT: Addend: 0 -ELF-MIPSEL-NEXT: - Offset: 32 +ELF-MIPSEL-NEXT: - Offset: 0x0000000000000020 ELF-MIPSEL-NEXT: Symbol: puts ELF-MIPSEL-NEXT: Type: R_MIPS_CALL16 ELF-MIPSEL-NEXT: Addend: 0 -ELF-MIPSEL-NEXT: - Offset: 44 +ELF-MIPSEL-NEXT: - Offset: 0x000000000000002C ELF-MIPSEL-NEXT: Symbol: SomeOtherFunction ELF-MIPSEL-NEXT: Type: R_MIPS_CALL16 ELF-MIPSEL-NEXT: Addend: 0 @@ -373,18 +373,18 @@ ELF-X86-64-NEXT: Link: .symtab ELF-X86-64-NEXT: Info: .text ELF-X86-64-NEXT: AddressAlign: 0x0000000000000008 ELF-X86-64-NEXT: Relocations: -ELF-X86-64-NEXT: - Offset: 13 +ELF-X86-64-NEXT: - Offset: 0x000000000000000D ELF-X86-64-NEXT: Symbol: .rodata.str1.1 ELF-X86-64-NEXT: Type: R_X86_64_32S ELF-X86-64-NEXT: Addend: 0 -ELF-X86-64-NEXT: - Offset: 18 +ELF-X86-64-NEXT: - Offset: 0x0000000000000012 ELF-X86-64-NEXT: Symbol: puts ELF-X86-64-NEXT: Type: R_X86_64_PC32 -ELF-X86-64-NEXT: Addend: 4294967292 -ELF-X86-64-NEXT: - Offset: 25 +ELF-X86-64-NEXT: Addend: -4 +ELF-X86-64-NEXT: - Offset: 0x0000000000000019 ELF-X86-64-NEXT: Symbol: SomeOtherFunction ELF-X86-64-NEXT: Type: R_X86_64_PC32 -ELF-X86-64-NEXT: Addend: 4294967292 +ELF-X86-64-NEXT: Addend: -4 ELF-X86-64-NEXT: Symbols: ELF-X86-64-NEXT: Local: ELF-X86-64-NEXT: - Name: trivial-object-test.s |