[llvm] r252423 - [RuntimeDyld] Add support for R_X86_64_PC8 relocation.

Maksim Panchenko via llvm-commits llvm-commits at lists.llvm.org
Sun Nov 8 11:34:17 PST 2015


Author: maks
Date: Sun Nov  8 13:34:17 2015
New Revision: 252423

URL: http://llvm.org/viewvc/llvm-project?rev=252423&view=rev
Log:
[RuntimeDyld] Add support for R_X86_64_PC8 relocation.

Added:
    llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/ELF_x64-64_PC8_relocations.s
Modified:
    llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp

Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp?rev=252423&r1=252422&r2=252423&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp Sun Nov  8 13:34:17 2015
@@ -249,6 +249,14 @@ void RuntimeDyldELF::resolveX86_64Reloca
                  << format("%p\n", Section.Address + Offset));
     break;
   }
+  case ELF::R_X86_64_PC8: {
+    uint64_t FinalAddress = Section.LoadAddress + Offset;
+    int64_t RealOffset = Value + Addend - FinalAddress;
+    assert(isInt<8>(RealOffset));
+    int8_t TruncOffset = (RealOffset & 0xFF);
+    Section.Address[Offset] = TruncOffset;
+    break;
+  }
   case ELF::R_X86_64_PC32: {
     uint64_t FinalAddress = Section.LoadAddress + Offset;
     int64_t RealOffset = Value + Addend - FinalAddress;

Added: llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/ELF_x64-64_PC8_relocations.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/ELF_x64-64_PC8_relocations.s?rev=252423&view=auto
==============================================================================
--- llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/ELF_x64-64_PC8_relocations.s (added)
+++ llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/ELF_x64-64_PC8_relocations.s Sun Nov  8 13:34:17 2015
@@ -0,0 +1,26 @@
+# RUN: llvm-mc -triple=x86_64-pc-linux -relocation-model=pic -filetype=obj -o %T/test_ELF_x86-64_PC8.o %s
+# RUN: llvm-rtdyld -triple=x86_64-pc-linux -verify -map-section test_ELF_x86-64_PC8.o,.text.bar=0x10000 -map-section test_ELF_x86-64_PC8.o,.text.baz=0x10040 %T/test_ELF_x86-64_PC8.o
+# RUN: llvm-rtdyld -triple=x86_64-pc-linux -verify -map-section test_ELF_x86-64_PC8.o,.text.baz=0x10000 -map-section test_ELF_x86-64_PC8.o,.text.bar=0x10040 %T/test_ELF_x86-64_PC8.o
+
+# Test that R_X86_64_PC8 relocation works.
+
+  .section .text.bar,"ax"
+	.align	16, 0x90
+	.type	bar, at function
+bar:
+	retq
+.Ltmp1:
+	.size	bar, .Ltmp1-bar
+
+  .section .text.baz,"ax"
+	.align	16, 0x90
+	.type	baz, at function
+baz:
+  movq  %rdi, %rcx
+  jrcxz bar
+	retq
+.Ltmp2:
+	.size	baz, .Ltmp2-baz
+
+
+	.section	".note.GNU-stack","", at progbits




More information about the llvm-commits mailing list