6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-12 13:30:51 +00:00
Code Issues Projects Releases Wiki Activity

[RuntimeDyld] Support more PPC64 relocations

Browse Source 
This adds support for several missing PPC64 relocations in the
straight-forward manner to RuntimeDyldELF.cpp.

Note that this actually fixes a failure of a large-model test case on
PowerPC, allowing the XFAIL to be removed.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211382 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ulrich Weigand 2014-06-20 17:51:47 +00:00
parent c0bf939e80
commit 2a069ac1f3
2 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
View File

@ -702,24 +702,37 @@ void RuntimeDyldELF::findOPDEntrySection(ObjectImage &Obj,
llvm_unreachable("Attempting to get address of ODP entry!"); llvm_unreachable("Attempting to get address of ODP entry!");
} }
// Relocation masks following the #lo(value), #hi(value), #higher(value), // Relocation masks following the #lo(value), #hi(value), #ha(value),
// and #highest(value) macros defined in section 4.5.1. Relocation Types // #higher(value), #highera(value), #highest(value), and #highesta(value)
// in PPC-elf64abi document. // macros defined in section 4.5.1. Relocation Types of the PPC-elf64abi
// // document.
static inline uint16_t applyPPClo(uint64_t value) { return value & 0xffff; } static inline uint16_t applyPPClo(uint64_t value) { return value & 0xffff; }
static inline uint16_t applyPPChi(uint64_t value) { static inline uint16_t applyPPChi(uint64_t value) {
return (value >> 16) & 0xffff; return (value >> 16) & 0xffff;
} }
static inline uint16_t applyPPCha (uint64_t value) {
return ((value + 0x8000) >> 16) & 0xffff;
}
static inline uint16_t applyPPChigher(uint64_t value) { static inline uint16_t applyPPChigher(uint64_t value) {
return (value >> 32) & 0xffff; return (value >> 32) & 0xffff;
} }
static inline uint16_t applyPPChighera (uint64_t value) {
return ((value + 0x8000) >> 32) & 0xffff;
}
static inline uint16_t applyPPChighest(uint64_t value) { static inline uint16_t applyPPChighest(uint64_t value) {
return (value >> 48) & 0xffff; return (value >> 48) & 0xffff;
} }
static inline uint16_t applyPPChighesta (uint64_t value) {
return ((value + 0x8000) >> 48) & 0xffff;
}
void RuntimeDyldELF::resolvePPC64Relocation(const SectionEntry &Section, void RuntimeDyldELF::resolvePPC64Relocation(const SectionEntry &Section,
uint64_t Offset, uint64_t Value, uint64_t Offset, uint64_t Value,
uint32_t Type, int64_t Addend) { uint32_t Type, int64_t Addend) {
@ -728,24 +741,57 @@ void RuntimeDyldELF::resolvePPC64Relocation(const SectionEntry &Section,
default: default:
llvm_unreachable("Relocation type not implemented yet!"); llvm_unreachable("Relocation type not implemented yet!");
break; break;
case ELF::R_PPC64_ADDR16:
writeInt16BE(LocalAddress, applyPPClo(Value + Addend));
break;
case ELF::R_PPC64_ADDR16_DS:
writeInt16BE(LocalAddress, applyPPClo(Value + Addend) & ~3);
break;
case ELF::R_PPC64_ADDR16_LO: case ELF::R_PPC64_ADDR16_LO:
writeInt16BE(LocalAddress, applyPPClo(Value + Addend)); writeInt16BE(LocalAddress, applyPPClo(Value + Addend));
break; break;
case ELF::R_PPC64_ADDR16_LO_DS:
writeInt16BE(LocalAddress, applyPPClo(Value + Addend) & ~3);
break;
case ELF::R_PPC64_ADDR16_HI: case ELF::R_PPC64_ADDR16_HI:
writeInt16BE(LocalAddress, applyPPChi(Value + Addend)); writeInt16BE(LocalAddress, applyPPChi(Value + Addend));
break; break;
case ELF::R_PPC64_ADDR16_HA:
writeInt16BE(LocalAddress, applyPPCha(Value + Addend));
break;
case ELF::R_PPC64_ADDR16_HIGHER: case ELF::R_PPC64_ADDR16_HIGHER:
writeInt16BE(LocalAddress, applyPPChigher(Value + Addend)); writeInt16BE(LocalAddress, applyPPChigher(Value + Addend));
break; break;
case ELF::R_PPC64_ADDR16_HIGHERA:
writeInt16BE(LocalAddress, applyPPChighera(Value + Addend));
break;
case ELF::R_PPC64_ADDR16_HIGHEST: case ELF::R_PPC64_ADDR16_HIGHEST:
writeInt16BE(LocalAddress, applyPPChighest(Value + Addend)); writeInt16BE(LocalAddress, applyPPChighest(Value + Addend));
break; break;
case ELF::R_PPC64_ADDR16_HIGHESTA:
writeInt16BE(LocalAddress, applyPPChighesta(Value + Addend));
break;
case ELF::R_PPC64_ADDR14: { case ELF::R_PPC64_ADDR14: {
assert(((Value + Addend) & 3) == 0); assert(((Value + Addend) & 3) == 0);
// Preserve the AA/LK bits in the branch instruction // Preserve the AA/LK bits in the branch instruction
uint8_t aalk = *(LocalAddress + 3); uint8_t aalk = *(LocalAddress + 3);
writeInt16BE(LocalAddress + 2, (aalk & 3) | ((Value + Addend) & 0xfffc)); writeInt16BE(LocalAddress + 2, (aalk & 3) | ((Value + Addend) & 0xfffc));
} break; } break;
case ELF::R_PPC64_REL16_LO: {
uint64_t FinalAddress = (Section.LoadAddress + Offset);
uint64_t Delta = Value - FinalAddress + Addend;
writeInt16BE(LocalAddress, applyPPClo(Delta));
} break;
case ELF::R_PPC64_REL16_HI: {
uint64_t FinalAddress = (Section.LoadAddress + Offset);
uint64_t Delta = Value - FinalAddress + Addend;
writeInt16BE(LocalAddress, applyPPChi(Delta));
} break;
case ELF::R_PPC64_REL16_HA: {
uint64_t FinalAddress = (Section.LoadAddress + Offset);
uint64_t Delta = Value - FinalAddress + Addend;
writeInt16BE(LocalAddress, applyPPCha(Delta));
} break;
case ELF::R_PPC64_ADDR32: { case ELF::R_PPC64_ADDR32: {
int32_t Result = static_cast<int32_t>(Value + Addend); int32_t Result = static_cast<int32_t>(Value + Addend);
if (SignExtend32<32>(Result) != Result) if (SignExtend32<32>(Result) != Result)
@ -784,10 +830,30 @@ void RuntimeDyldELF::resolvePPC64Relocation(const SectionEntry &Section,
writeInt16BE(LocalAddress, applyPPClo(Value)); writeInt16BE(LocalAddress, applyPPClo(Value));
} break; } break;
case ELF::R_PPC64_TOC16_DS: { case ELF::R_PPC64_TOC16_DS: {
uint64_t TOCStart = findPPC64TOC();
Value = ((Value + Addend) - TOCStart);
writeInt16BE(LocalAddress, applyPPClo(Value) & ~3);
} break;
case ELF::R_PPC64_TOC16_LO: {
uint64_t TOCStart = findPPC64TOC(); uint64_t TOCStart = findPPC64TOC();
Value = ((Value + Addend) - TOCStart); Value = ((Value + Addend) - TOCStart);
writeInt16BE(LocalAddress, applyPPClo(Value)); writeInt16BE(LocalAddress, applyPPClo(Value));
} break; } break;
case ELF::R_PPC64_TOC16_LO_DS: {
uint64_t TOCStart = findPPC64TOC();
Value = ((Value + Addend) - TOCStart);
writeInt16BE(LocalAddress, applyPPClo(Value) & ~3);
} break;
case ELF::R_PPC64_TOC16_HI: {
uint64_t TOCStart = findPPC64TOC();
Value = ((Value + Addend) - TOCStart);
writeInt16BE(LocalAddress, applyPPChi(Value));
} break;
case ELF::R_PPC64_TOC16_HA: {
uint64_t TOCStart = findPPC64TOC();
Value = ((Value + Addend) - TOCStart);
writeInt16BE(LocalAddress, applyPPCha(Value));
} break;
} }
} }

2
test/ExecutionEngine/MCJIT/eh-lg-pic.ll
View File

@ -1,5 +1,5 @@
; RUN: %lli_mcjit -relocation-model=pic -code-model=large %s ; RUN: %lli_mcjit -relocation-model=pic -code-model=large %s
; XFAIL: cygwin, win32, mingw, mips, powerpc64, i686, i386, aarch64, arm ; XFAIL: cygwin, win32, mingw, mips, i686, i386, aarch64, arm
declare i8* @__cxa_allocate_exception(i64) declare i8* @__cxa_allocate_exception(i64)
declare void @__cxa_throw(i8*, i8*, i8*) declare void @__cxa_throw(i8*, i8*, i8*)
declare i32 @__gxx_personality_v0(...) declare i32 @__gxx_personality_v0(...)