summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2014-01-29 18:31:35 +0000
committerLang Hames <lhames@gmail.com>2014-01-29 18:31:35 +0000
commitb492843e53dbc86a34bbddc4c8155f3d23e21185 (patch)
tree0234e984fc14110797c8e69f6ea6a0bbafe43862
parent2bd8350187cf9595dcc33b8474ccd39891af9b36 (diff)
downloadllvm-b492843e53dbc86a34bbddc4c8155f3d23e21185.tar.gz
llvm-b492843e53dbc86a34bbddc4c8155f3d23e21185.tar.bz2
llvm-b492843e53dbc86a34bbddc4c8155f3d23e21185.tar.xz
Add support for PC-relative non-extern relocations to RuntimeDyldMachO.
Also replaces testcase for r180790 (support for absolute non-externs relocs) with a more robust version. <rdar://problem/15864721> git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200404 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp2
-rw-r--r--test/ExecutionEngine/MCJIT/non-extern-addend.ll22
2 files changed, 18 insertions, 6 deletions
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
index d12e7e5e4d..0408337fff 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
@@ -382,6 +382,8 @@ void RuntimeDyldMachO::processRelocationRef(unsigned SectionID,
uint64_t Addr;
Sec.getAddress(Addr);
Value.Addend = Addend - Addr;
+ if (IsPCRel)
+ Value.Addend += Offset + NumBytes;
}
if (Arch == Triple::x86_64 && (RelType == MachO::X86_64_RELOC_GOT ||
diff --git a/test/ExecutionEngine/MCJIT/non-extern-addend.ll b/test/ExecutionEngine/MCJIT/non-extern-addend.ll
index 3a6e634412..cf3ddea6b3 100644
--- a/test/ExecutionEngine/MCJIT/non-extern-addend.ll
+++ b/test/ExecutionEngine/MCJIT/non-extern-addend.ll
@@ -1,12 +1,22 @@
; RUN: %lli_mcjit %s > /dev/null
+; RUN: %lli_mcjit -code-model=small %s > /dev/null
-define i32 @foo(i32 %X, i32 %Y, double %A) {
- %cond212 = fcmp ueq double %A, 2.000000e+00 ; <i1> [#uses=1]
- %cast110 = zext i1 %cond212 to i32 ; <i32> [#uses=1]
- ret i32 %cast110
+define i32 @foo(i32 %x, i32 %y, double %d) {
+entry:
+ %d.int64 = bitcast double %d to i64
+ %d.top64 = lshr i64 %d.int64, 32
+ %d.top = trunc i64 %d.top64 to i32
+ %d.bottom = trunc i64 %d.int64 to i32
+ %topCorrect = icmp eq i32 %d.top, 3735928559
+ %bottomCorrect = icmp eq i32 %d.bottom, 4277009102
+ %right = and i1 %topCorrect, %bottomCorrect
+ %nRight = xor i1 %right, true
+ %retVal = zext i1 %nRight to i32
+ ret i32 %retVal
}
define i32 @main() {
- %reg212 = call i32 @foo( i32 0, i32 1, double 1.000000e+00 ) ; <i32> [#uses=1]
- ret i32 %reg212
+entry:
+ %call = call i32 @foo(i32 0, i32 1, double 0xDEADBEEFFEEDFACE)
+ ret i32 %call
}