[llvm] r208906 - [obj2yaml][ELF] Print relocation's offset as a hex number. Use a proper

Simon Atanasyan simon at atanasyan.com
Thu May 15 11:04:10 PDT 2014


Author: atanasyan
Date: Thu May 15 13:04:09 2014
New Revision: 208906

URL: http://llvm.org/viewvc/llvm-project?rev=208906&view=rev
Log:
[obj2yaml][ELF] Print relocation's offset as a hex number. Use a proper
types to hold relocation's offset and addend.

Modified:
    llvm/trunk/include/llvm/Object/ELFYAML.h
    llvm/trunk/test/Object/obj2yaml.test

Modified: llvm/trunk/include/llvm/Object/ELFYAML.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELFYAML.h?rev=208906&r1=208905&r2=208906&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELFYAML.h (original)
+++ llvm/trunk/include/llvm/Object/ELFYAML.h Thu May 15 13:04:09 2014
@@ -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;
 };

Modified: llvm/trunk/test/Object/obj2yaml.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/obj2yaml.test?rev=208906&r1=208905&r2=208906&view=diff
==============================================================================
--- llvm/trunk/test/Object/obj2yaml.test (original)
+++ llvm/trunk/test/Object/obj2yaml.test Thu May 15 13:04:09 2014
@@ -208,23 +208,23 @@ ELF-MIPSEL-NEXT:       - Offset:
 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:            .s
 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





More information about the llvm-commits mailing list