summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHal Finkel <hfinkel@anl.gov>2015-08-04 15:29:00 +0000
committerHal Finkel <hfinkel@anl.gov>2015-08-04 15:29:00 +0000
commit23cdeeea0f70ceb46710c33271baedef6e936f49 (patch)
treea5a71483d0feb1281bc2a16ecbba43834c9d2e6b
parent75ced2782b73b44823769782977121de2bb71c89 (diff)
downloadbcm5719-llvm-23cdeeea0f70ceb46710c33271baedef6e936f49.tar.gz
bcm5719-llvm-23cdeeea0f70ceb46710c33271baedef6e936f49.zip
[RuntimeDyld] Adapt PPC64 relocations to PPC32
Begin adapting some of the implemented PPC64 relocations for PPC32 (with a test case). Patch by Pierre-Andre Saulais! llvm-svn: 243991
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp23
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h3
-rw-r--r--llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/lit.local.cfg3
-rw-r--r--llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/ppc32_elf_rel_addr16.s47
4 files changed, 76 insertions, 0 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
index 38890aea8b3..dfa52fbea75 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -887,6 +887,26 @@ static inline uint16_t applyPPChighesta (uint64_t value) {
return ((value + 0x8000) >> 48) & 0xffff;
}
+void RuntimeDyldELF::resolvePPC32Relocation(const SectionEntry &Section,
+ uint64_t Offset, uint64_t Value,
+ uint32_t Type, int64_t Addend) {
+ uint8_t *LocalAddress = Section.Address + Offset;
+ switch (Type) {
+ default:
+ llvm_unreachable("Relocation type not implemented yet!");
+ break;
+ case ELF::R_PPC_ADDR16_LO:
+ writeInt16BE(LocalAddress, applyPPClo(Value + Addend));
+ break;
+ case ELF::R_PPC_ADDR16_HI:
+ writeInt16BE(LocalAddress, applyPPChi(Value + Addend));
+ break;
+ case ELF::R_PPC_ADDR16_HA:
+ writeInt16BE(LocalAddress, applyPPCha(Value + Addend));
+ break;
+ }
+}
+
void RuntimeDyldELF::resolvePPC64Relocation(const SectionEntry &Section,
uint64_t Offset, uint64_t Value,
uint32_t Type, int64_t Addend) {
@@ -1075,6 +1095,9 @@ void RuntimeDyldELF::resolveRelocation(const SectionEntry &Section,
else
llvm_unreachable("Mips ABI not handled");
break;
+ case Triple::ppc:
+ resolvePPC32Relocation(Section, Offset, Value, Type, Addend);
+ break;
case Triple::ppc64: // Fall through.
case Triple::ppc64le:
resolvePPC64Relocation(Section, Offset, Value, Type, Addend);
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
index 1a2552deed9..040f986e20f 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
@@ -43,6 +43,9 @@ class RuntimeDyldELF : public RuntimeDyldImpl {
void resolveMIPSRelocation(const SectionEntry &Section, uint64_t Offset,
uint32_t Value, uint32_t Type, int32_t Addend);
+ void resolvePPC32Relocation(const SectionEntry &Section, uint64_t Offset,
+ uint64_t Value, uint32_t Type, int64_t Addend);
+
void resolvePPC64Relocation(const SectionEntry &Section, uint64_t Offset,
uint64_t Value, uint32_t Type, int64_t Addend);
diff --git a/llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/lit.local.cfg b/llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/lit.local.cfg
new file mode 100644
index 00000000000..5d33887ff0a
--- /dev/null
+++ b/llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/lit.local.cfg
@@ -0,0 +1,3 @@
+if not 'PowerPC' in config.root.targets:
+ config.unsupported = True
+
diff --git a/llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/ppc32_elf_rel_addr16.s b/llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/ppc32_elf_rel_addr16.s
new file mode 100644
index 00000000000..ef40259c7b0
--- /dev/null
+++ b/llvm/test/ExecutionEngine/RuntimeDyld/PowerPC/ppc32_elf_rel_addr16.s
@@ -0,0 +1,47 @@
+# RUN: llvm-mc -triple=powerpc-unknown-linux-gnu -filetype=obj -o %T/ppc32_elf_rel_addr16.o %s
+# RUN: llvm-rtdyld -triple=powerpc-unknown-linux-gnu -verify -check=%s %T/ppc32_elf_rel_addr16.o
+ .text
+ .file "ppc32_elf_rel_addr16.ll"
+ .globl lookup
+ .align 2
+ .type lookup,@function
+lookup: # @lookup
+.Lfunc_begin0:
+# BB#0:
+ stw 31, -4(1)
+ stwu 1, -16(1)
+insn_hi:
+# Check the higher 16-bits of the symbol's absolute address
+# rtdyld-check: decode_operand(insn_hi, 1) = elements[31:16]
+ lis 4, elements@ha
+ slwi 3, 3, 2
+ mr 31, 1
+insn_lo:
+# Check the lower 16-bits of the symbol's absolute address
+# rtdyld-check: decode_operand(insn_lo, 2) = elements[15:0]
+ la 4, elements@l(4)
+ lwzx 3, 4, 3
+ addi 1, 1, 16
+ lwz 31, -4(1)
+ blr
+.Lfunc_end0:
+ .size lookup, .Lfunc_end0-.Lfunc_begin0
+
+ .type elements,@object # @elements
+ .data
+ .globl elements
+ .align 2
+elements:
+ .long 14 # 0xe
+ .long 4 # 0x4
+ .long 1 # 0x1
+ .long 3 # 0x3
+ .long 13 # 0xd
+ .long 0 # 0x0
+ .long 32 # 0x20
+ .long 334 # 0x14e
+ .size elements, 32
+
+
+ .ident "clang version 3.7.0 "
+ .section ".note.GNU-stack","",@progbits
OpenPOWER on IntegriCloud