2012-01-16 23:50:58 +00:00
|
|
|
//===-- RuntimeDyldMachO.cpp - Run-time dynamic linker for MC-JIT -*- C++ -*-=//
|
2011-07-13 07:57:58 +00:00
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// Implementation of the MC-JIT runtime dynamic linker.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2012-12-03 16:50:05 +00:00
|
|
|
#include "RuntimeDyldMachO.h"
|
2014-07-17 18:54:50 +00:00
|
|
|
#include "Targets/RuntimeDyldMachOAArch64.h"
|
2015-01-14 11:23:27 +00:00
|
|
|
#include "Targets/RuntimeDyldMachOARM.h"
|
2014-07-17 18:54:50 +00:00
|
|
|
#include "Targets/RuntimeDyldMachOI386.h"
|
|
|
|
#include "Targets/RuntimeDyldMachOX86_64.h"
|
2015-01-14 11:23:27 +00:00
|
|
|
#include "llvm/ADT/STLExtras.h"
|
|
|
|
#include "llvm/ADT/StringRef.h"
|
2014-07-17 18:54:50 +00:00
|
|
|
|
2011-07-13 07:57:58 +00:00
|
|
|
using namespace llvm;
|
|
|
|
using namespace llvm::object;
|
|
|
|
|
2014-04-22 03:04:17 +00:00
|
|
|
#define DEBUG_TYPE "dyld"
|
|
|
|
|
2014-11-26 16:54:40 +00:00
|
|
|
namespace {
|
|
|
|
|
2015-05-22 10:11:07 +00:00
|
|
|
class LoadedMachOObjectInfo
|
|
|
|
: public RuntimeDyld::LoadedObjectInfoHelper<LoadedMachOObjectInfo> {
|
2014-11-26 16:54:40 +00:00
|
|
|
public:
|
|
|
|
LoadedMachOObjectInfo(RuntimeDyldImpl &RTDyld, unsigned BeginIdx,
|
|
|
|
unsigned EndIdx)
|
2015-05-22 10:11:07 +00:00
|
|
|
: LoadedObjectInfoHelper(RTDyld, BeginIdx, EndIdx) {}
|
2014-11-26 16:54:40 +00:00
|
|
|
|
|
|
|
OwningBinary<ObjectFile>
|
|
|
|
getObjectForDebug(const ObjectFile &Obj) const override {
|
|
|
|
return OwningBinary<ObjectFile>();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2011-07-13 07:57:58 +00:00
|
|
|
namespace llvm {
|
|
|
|
|
2014-08-08 23:12:22 +00:00
|
|
|
int64_t RuntimeDyldMachO::memcpyAddend(const RelocationEntry &RE) const {
|
|
|
|
unsigned NumBytes = 1 << RE.Size;
|
2014-08-29 23:17:47 +00:00
|
|
|
uint8_t *Src = Sections[RE.SectionID].Address + RE.Offset;
|
2014-08-27 17:41:06 +00:00
|
|
|
|
2014-08-29 23:17:47 +00:00
|
|
|
return static_cast<int64_t>(readBytesUnaligned(Src, NumBytes));
|
2014-07-17 18:54:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
RelocationValueRef RuntimeDyldMachO::getRelocationValueRef(
|
2014-11-26 16:54:40 +00:00
|
|
|
const ObjectFile &BaseTObj, const relocation_iterator &RI,
|
2014-11-27 05:40:13 +00:00
|
|
|
const RelocationEntry &RE, ObjSectionToIDMap &ObjSectionToID) {
|
2014-07-17 18:54:50 +00:00
|
|
|
|
|
|
|
const MachOObjectFile &Obj =
|
2014-11-26 16:54:40 +00:00
|
|
|
static_cast<const MachOObjectFile &>(BaseTObj);
|
2014-07-17 18:54:50 +00:00
|
|
|
MachO::any_relocation_info RelInfo =
|
|
|
|
Obj.getRelocation(RI->getRawDataRefImpl());
|
|
|
|
RelocationValueRef Value;
|
|
|
|
|
|
|
|
bool IsExternal = Obj.getPlainRelocationExternal(RelInfo);
|
|
|
|
if (IsExternal) {
|
|
|
|
symbol_iterator Symbol = RI->getSymbol();
|
|
|
|
StringRef TargetName;
|
|
|
|
Symbol->getName(TargetName);
|
2015-01-16 23:13:56 +00:00
|
|
|
RTDyldSymbolTable::const_iterator SI =
|
2014-11-27 05:40:13 +00:00
|
|
|
GlobalSymbolTable.find(TargetName.data());
|
|
|
|
if (SI != GlobalSymbolTable.end()) {
|
2015-01-16 23:13:56 +00:00
|
|
|
const auto &SymInfo = SI->second;
|
|
|
|
Value.SectionID = SymInfo.getSectionID();
|
|
|
|
Value.Offset = SymInfo.getOffset() + RE.Addend;
|
2014-07-17 18:54:50 +00:00
|
|
|
} else {
|
2014-11-27 05:40:13 +00:00
|
|
|
Value.SymbolName = TargetName.data();
|
|
|
|
Value.Offset = RE.Addend;
|
2014-07-17 18:54:50 +00:00
|
|
|
}
|
|
|
|
} else {
|
2015-05-21 21:24:32 +00:00
|
|
|
SectionRef Sec = Obj.getAnyRelocationSection(RelInfo);
|
2014-10-08 15:28:58 +00:00
|
|
|
bool IsCode = Sec.isText();
|
2014-11-26 16:54:40 +00:00
|
|
|
Value.SectionID = findOrEmitSection(Obj, Sec, IsCode, ObjSectionToID);
|
2014-10-08 15:28:58 +00:00
|
|
|
uint64_t Addr = Sec.getAddress();
|
2014-09-07 04:03:32 +00:00
|
|
|
Value.Offset = RE.Addend - Addr;
|
2014-07-17 18:54:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return Value;
|
|
|
|
}
|
|
|
|
|
|
|
|
void RuntimeDyldMachO::makeValueAddendPCRel(RelocationValueRef &Value,
|
2014-11-26 16:54:40 +00:00
|
|
|
const ObjectFile &BaseTObj,
|
2014-07-30 03:35:05 +00:00
|
|
|
const relocation_iterator &RI,
|
|
|
|
unsigned OffsetToNextPC) {
|
2014-07-17 18:54:50 +00:00
|
|
|
const MachOObjectFile &Obj =
|
2014-11-26 16:54:40 +00:00
|
|
|
static_cast<const MachOObjectFile &>(BaseTObj);
|
2014-07-17 18:54:50 +00:00
|
|
|
MachO::any_relocation_info RelInfo =
|
|
|
|
Obj.getRelocation(RI->getRawDataRefImpl());
|
|
|
|
|
|
|
|
bool IsPCRel = Obj.getAnyRelocationPCRel(RelInfo);
|
|
|
|
if (IsPCRel) {
|
|
|
|
uint64_t RelocAddr = 0;
|
|
|
|
RI->getAddress(RelocAddr);
|
2014-09-07 04:03:32 +00:00
|
|
|
Value.Offset += RelocAddr + OffsetToNextPC;
|
2014-07-17 18:54:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void RuntimeDyldMachO::dumpRelocationToResolve(const RelocationEntry &RE,
|
|
|
|
uint64_t Value) const {
|
|
|
|
const SectionEntry &Section = Sections[RE.SectionID];
|
|
|
|
uint8_t *LocalAddress = Section.Address + RE.Offset;
|
|
|
|
uint64_t FinalAddress = Section.LoadAddress + RE.Offset;
|
|
|
|
|
|
|
|
dbgs() << "resolveRelocation Section: " << RE.SectionID
|
|
|
|
<< " LocalAddress: " << format("%p", LocalAddress)
|
2014-08-28 04:25:17 +00:00
|
|
|
<< " FinalAddress: " << format("0x%016" PRIx64, FinalAddress)
|
|
|
|
<< " Value: " << format("0x%016" PRIx64, Value) << " Addend: " << RE.Addend
|
2014-07-17 18:54:50 +00:00
|
|
|
<< " isPCRel: " << RE.IsPCRel << " MachoType: " << RE.RelType
|
|
|
|
<< " Size: " << (1 << RE.Size) << "\n";
|
|
|
|
}
|
|
|
|
|
2014-09-11 19:21:14 +00:00
|
|
|
section_iterator
|
|
|
|
RuntimeDyldMachO::getSectionByAddress(const MachOObjectFile &Obj,
|
|
|
|
uint64_t Addr) {
|
|
|
|
section_iterator SI = Obj.section_begin();
|
|
|
|
section_iterator SE = Obj.section_end();
|
|
|
|
|
|
|
|
for (; SI != SE; ++SI) {
|
2014-10-08 15:28:58 +00:00
|
|
|
uint64_t SAddr = SI->getAddress();
|
|
|
|
uint64_t SSize = SI->getSize();
|
2014-09-11 19:21:14 +00:00
|
|
|
if ((Addr >= SAddr) && (Addr < SAddr + SSize))
|
|
|
|
return SI;
|
|
|
|
}
|
|
|
|
|
|
|
|
return SE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Populate __pointers section.
|
|
|
|
void RuntimeDyldMachO::populateIndirectSymbolPointersSection(
|
2014-11-26 16:54:40 +00:00
|
|
|
const MachOObjectFile &Obj,
|
2014-09-11 19:21:14 +00:00
|
|
|
const SectionRef &PTSection,
|
|
|
|
unsigned PTSectionID) {
|
|
|
|
assert(!Obj.is64Bit() &&
|
|
|
|
"Pointer table section not supported in 64-bit MachO.");
|
|
|
|
|
|
|
|
MachO::dysymtab_command DySymTabCmd = Obj.getDysymtabLoadCommand();
|
|
|
|
MachO::section Sec32 = Obj.getSection(PTSection.getRawDataRefImpl());
|
|
|
|
uint32_t PTSectionSize = Sec32.size;
|
|
|
|
unsigned FirstIndirectSymbol = Sec32.reserved1;
|
|
|
|
const unsigned PTEntrySize = 4;
|
|
|
|
unsigned NumPTEntries = PTSectionSize / PTEntrySize;
|
|
|
|
unsigned PTEntryOffset = 0;
|
|
|
|
|
|
|
|
assert((PTSectionSize % PTEntrySize) == 0 &&
|
|
|
|
"Pointers section does not contain a whole number of stubs?");
|
|
|
|
|
|
|
|
DEBUG(dbgs() << "Populating pointer table section "
|
|
|
|
<< Sections[PTSectionID].Name
|
|
|
|
<< ", Section ID " << PTSectionID << ", "
|
|
|
|
<< NumPTEntries << " entries, " << PTEntrySize
|
|
|
|
<< " bytes each:\n");
|
|
|
|
|
|
|
|
for (unsigned i = 0; i < NumPTEntries; ++i) {
|
|
|
|
unsigned SymbolIndex =
|
|
|
|
Obj.getIndirectSymbolTableEntry(DySymTabCmd, FirstIndirectSymbol + i);
|
|
|
|
symbol_iterator SI = Obj.getSymbolByIndex(SymbolIndex);
|
|
|
|
StringRef IndirectSymbolName;
|
|
|
|
SI->getName(IndirectSymbolName);
|
|
|
|
DEBUG(dbgs() << " " << IndirectSymbolName << ": index " << SymbolIndex
|
|
|
|
<< ", PT offset: " << PTEntryOffset << "\n");
|
|
|
|
RelocationEntry RE(PTSectionID, PTEntryOffset,
|
|
|
|
MachO::GENERIC_RELOC_VANILLA, 0, false, 2);
|
|
|
|
addRelocationForSymbol(RE, IndirectSymbolName);
|
|
|
|
PTEntryOffset += PTEntrySize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-26 16:54:40 +00:00
|
|
|
bool RuntimeDyldMachO::isCompatibleFile(const object::ObjectFile &Obj) const {
|
|
|
|
return Obj.isMachO();
|
2014-07-17 18:54:50 +00:00
|
|
|
}
|
|
|
|
|
2014-09-04 04:53:03 +00:00
|
|
|
template <typename Impl>
|
2015-04-15 03:39:22 +00:00
|
|
|
void RuntimeDyldMachOCRTPBase<Impl>::finalizeLoad(const ObjectFile &Obj,
|
2014-09-04 04:53:03 +00:00
|
|
|
ObjSectionToIDMap &SectionMap) {
|
|
|
|
unsigned EHFrameSID = RTDYLD_INVALID_SECTION_ID;
|
|
|
|
unsigned TextSID = RTDYLD_INVALID_SECTION_ID;
|
|
|
|
unsigned ExceptTabSID = RTDYLD_INVALID_SECTION_ID;
|
|
|
|
|
2015-04-15 03:39:22 +00:00
|
|
|
for (const auto &Section : Obj.sections()) {
|
2014-09-04 04:53:03 +00:00
|
|
|
StringRef Name;
|
|
|
|
Section.getName(Name);
|
2015-04-15 03:39:22 +00:00
|
|
|
|
|
|
|
// Force emission of the __text, __eh_frame, and __gcc_except_tab sections
|
|
|
|
// if they're present. Otherwise call down to the impl to handle other
|
|
|
|
// sections that have already been emitted.
|
|
|
|
if (Name == "__text")
|
|
|
|
TextSID = findOrEmitSection(Obj, Section, true, SectionMap);
|
|
|
|
else if (Name == "__eh_frame")
|
|
|
|
EHFrameSID = findOrEmitSection(Obj, Section, false, SectionMap);
|
2014-09-04 04:53:03 +00:00
|
|
|
else if (Name == "__gcc_except_tab")
|
2015-04-15 03:39:22 +00:00
|
|
|
ExceptTabSID = findOrEmitSection(Obj, Section, true, SectionMap);
|
|
|
|
else {
|
|
|
|
auto I = SectionMap.find(Section);
|
|
|
|
if (I != SectionMap.end())
|
|
|
|
impl().finalizeSection(Obj, I->second, Section);
|
|
|
|
}
|
2014-09-04 04:53:03 +00:00
|
|
|
}
|
|
|
|
UnregisteredEHFrameSections.push_back(
|
|
|
|
EHFrameRelatedSections(EHFrameSID, TextSID, ExceptTabSID));
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename Impl>
|
|
|
|
unsigned char *RuntimeDyldMachOCRTPBase<Impl>::processFDE(unsigned char *P,
|
|
|
|
int64_t DeltaForText,
|
|
|
|
int64_t DeltaForEH) {
|
|
|
|
typedef typename Impl::TargetPtrT TargetPtrT;
|
|
|
|
|
2014-05-12 21:39:59 +00:00
|
|
|
DEBUG(dbgs() << "Processing FDE: Delta for text: " << DeltaForText
|
|
|
|
<< ", Delta for EH: " << DeltaForEH << "\n");
|
2014-11-01 15:52:31 +00:00
|
|
|
uint32_t Length = readBytesUnaligned(P, 4);
|
2013-05-05 20:43:10 +00:00
|
|
|
P += 4;
|
|
|
|
unsigned char *Ret = P + Length;
|
2014-11-01 15:52:31 +00:00
|
|
|
uint32_t Offset = readBytesUnaligned(P, 4);
|
2013-05-05 20:43:10 +00:00
|
|
|
if (Offset == 0) // is a CIE
|
|
|
|
return Ret;
|
|
|
|
|
|
|
|
P += 4;
|
2014-11-01 15:52:31 +00:00
|
|
|
TargetPtrT FDELocation = readBytesUnaligned(P, sizeof(TargetPtrT));
|
2014-09-04 04:53:03 +00:00
|
|
|
TargetPtrT NewLocation = FDELocation - DeltaForText;
|
2014-11-01 15:52:31 +00:00
|
|
|
writeBytesUnaligned(NewLocation, P, sizeof(TargetPtrT));
|
|
|
|
|
2014-09-04 04:53:03 +00:00
|
|
|
P += sizeof(TargetPtrT);
|
2013-05-05 20:43:10 +00:00
|
|
|
|
|
|
|
// Skip the FDE address range
|
2014-09-04 04:53:03 +00:00
|
|
|
P += sizeof(TargetPtrT);
|
2013-05-05 20:43:10 +00:00
|
|
|
|
|
|
|
uint8_t Augmentationsize = *P;
|
|
|
|
P += 1;
|
|
|
|
if (Augmentationsize != 0) {
|
2014-11-01 15:52:31 +00:00
|
|
|
TargetPtrT LSDA = readBytesUnaligned(P, sizeof(TargetPtrT));
|
2014-09-04 04:53:03 +00:00
|
|
|
TargetPtrT NewLSDA = LSDA - DeltaForEH;
|
2014-11-01 15:52:31 +00:00
|
|
|
writeBytesUnaligned(NewLSDA, P, sizeof(TargetPtrT));
|
2013-05-05 20:43:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return Ret;
|
|
|
|
}
|
|
|
|
|
2014-09-04 04:53:03 +00:00
|
|
|
static int64_t computeDelta(SectionEntry *A, SectionEntry *B) {
|
2015-04-15 04:46:01 +00:00
|
|
|
int64_t ObjDistance =
|
|
|
|
static_cast<int64_t>(A->ObjAddress) - static_cast<int64_t>(B->ObjAddress);
|
2014-09-04 04:53:03 +00:00
|
|
|
int64_t MemDistance = A->LoadAddress - B->LoadAddress;
|
2013-05-05 20:43:10 +00:00
|
|
|
return ObjDistance - MemDistance;
|
|
|
|
}
|
|
|
|
|
2014-09-04 04:53:03 +00:00
|
|
|
template <typename Impl>
|
|
|
|
void RuntimeDyldMachOCRTPBase<Impl>::registerEHFrames() {
|
2013-10-11 21:25:48 +00:00
|
|
|
|
|
|
|
for (int i = 0, e = UnregisteredEHFrameSections.size(); i != e; ++i) {
|
|
|
|
EHFrameRelatedSections &SectionInfo = UnregisteredEHFrameSections[i];
|
|
|
|
if (SectionInfo.EHFrameSID == RTDYLD_INVALID_SECTION_ID ||
|
|
|
|
SectionInfo.TextSID == RTDYLD_INVALID_SECTION_ID)
|
|
|
|
continue;
|
|
|
|
SectionEntry *Text = &Sections[SectionInfo.TextSID];
|
|
|
|
SectionEntry *EHFrame = &Sections[SectionInfo.EHFrameSID];
|
2014-04-24 06:44:33 +00:00
|
|
|
SectionEntry *ExceptTab = nullptr;
|
2013-10-11 21:25:48 +00:00
|
|
|
if (SectionInfo.ExceptTabSID != RTDYLD_INVALID_SECTION_ID)
|
|
|
|
ExceptTab = &Sections[SectionInfo.ExceptTabSID];
|
|
|
|
|
2014-09-04 04:53:03 +00:00
|
|
|
int64_t DeltaForText = computeDelta(Text, EHFrame);
|
|
|
|
int64_t DeltaForEH = 0;
|
2013-10-11 21:25:48 +00:00
|
|
|
if (ExceptTab)
|
|
|
|
DeltaForEH = computeDelta(ExceptTab, EHFrame);
|
2013-05-05 20:43:10 +00:00
|
|
|
|
2013-10-11 21:25:48 +00:00
|
|
|
unsigned char *P = EHFrame->Address;
|
|
|
|
unsigned char *End = P + EHFrame->Size;
|
2014-03-21 20:28:42 +00:00
|
|
|
do {
|
2013-10-11 21:25:48 +00:00
|
|
|
P = processFDE(P, DeltaForText, DeltaForEH);
|
2014-03-21 20:28:42 +00:00
|
|
|
} while (P != End);
|
2013-05-05 20:43:10 +00:00
|
|
|
|
[MCJIT][Orc] Refactor RTDyldMemoryManager, weave RuntimeDyld::SymbolInfo through
MCJIT.
This patch decouples the two responsibilities of the RTDyldMemoryManager class,
memory management and symbol resolution, into two new classes:
RuntimeDyld::MemoryManager and RuntimeDyld::SymbolResolver.
The symbol resolution interface is modified slightly, from:
uint64_t getSymbolAddress(const std::string &Name);
to:
RuntimeDyld::SymbolInfo findSymbol(const std::string &Name);
The latter passes symbol flags along with symbol addresses, allowing RuntimeDyld
and others to reason about non-strong/non-exported symbols.
The memory management interface removes the following method:
void notifyObjectLoaded(ExecutionEngine *EE,
const object::ObjectFile &) {}
as it is not related to memory management. (Note: Backwards compatibility *is*
maintained for this method in MCJIT and OrcMCJITReplacement, see below).
The RTDyldMemoryManager class remains in-tree for backwards compatibility.
It inherits directly from RuntimeDyld::SymbolResolver, and indirectly from
RuntimeDyld::MemoryManager via the new MCJITMemoryManager class, which
just subclasses RuntimeDyld::MemoryManager and reintroduces the
notifyObjectLoaded method for backwards compatibility).
The EngineBuilder class retains the existing method:
EngineBuilder&
setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager> mcjmm);
and includes two new methods:
EngineBuilder&
setMemoryManager(std::unique_ptr<MCJITMemoryManager> MM);
EngineBuilder&
setSymbolResolver(std::unique_ptr<RuntimeDyld::SymbolResolver> SR);
Clients should use EITHER:
A single call to setMCJITMemoryManager with an RTDyldMemoryManager.
OR (exclusive)
One call each to each of setMemoryManager and setSymbolResolver.
This patch should be fully compatible with existing uses of RTDyldMemoryManager.
If it is not it should be considered a bug, and the patch either fixed or
reverted.
If clients find the new API to be an improvement the goal will be to deprecate
and eventually remove the RTDyldMemoryManager class in favor of the new classes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233509 91177308-0d34-0410-b5e6-96231b3b80d8
2015-03-30 03:37:06 +00:00
|
|
|
MemMgr.registerEHFrames(EHFrame->Address, EHFrame->LoadAddress,
|
|
|
|
EHFrame->Size);
|
2013-10-11 21:25:48 +00:00
|
|
|
}
|
|
|
|
UnregisteredEHFrameSections.clear();
|
|
|
|
}
|
2013-05-05 20:43:10 +00:00
|
|
|
|
2014-07-17 18:54:50 +00:00
|
|
|
std::unique_ptr<RuntimeDyldMachO>
|
[MCJIT][Orc] Refactor RTDyldMemoryManager, weave RuntimeDyld::SymbolInfo through
MCJIT.
This patch decouples the two responsibilities of the RTDyldMemoryManager class,
memory management and symbol resolution, into two new classes:
RuntimeDyld::MemoryManager and RuntimeDyld::SymbolResolver.
The symbol resolution interface is modified slightly, from:
uint64_t getSymbolAddress(const std::string &Name);
to:
RuntimeDyld::SymbolInfo findSymbol(const std::string &Name);
The latter passes symbol flags along with symbol addresses, allowing RuntimeDyld
and others to reason about non-strong/non-exported symbols.
The memory management interface removes the following method:
void notifyObjectLoaded(ExecutionEngine *EE,
const object::ObjectFile &) {}
as it is not related to memory management. (Note: Backwards compatibility *is*
maintained for this method in MCJIT and OrcMCJITReplacement, see below).
The RTDyldMemoryManager class remains in-tree for backwards compatibility.
It inherits directly from RuntimeDyld::SymbolResolver, and indirectly from
RuntimeDyld::MemoryManager via the new MCJITMemoryManager class, which
just subclasses RuntimeDyld::MemoryManager and reintroduces the
notifyObjectLoaded method for backwards compatibility).
The EngineBuilder class retains the existing method:
EngineBuilder&
setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager> mcjmm);
and includes two new methods:
EngineBuilder&
setMemoryManager(std::unique_ptr<MCJITMemoryManager> MM);
EngineBuilder&
setSymbolResolver(std::unique_ptr<RuntimeDyld::SymbolResolver> SR);
Clients should use EITHER:
A single call to setMCJITMemoryManager with an RTDyldMemoryManager.
OR (exclusive)
One call each to each of setMemoryManager and setSymbolResolver.
This patch should be fully compatible with existing uses of RTDyldMemoryManager.
If it is not it should be considered a bug, and the patch either fixed or
reverted.
If clients find the new API to be an improvement the goal will be to deprecate
and eventually remove the RTDyldMemoryManager class in favor of the new classes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233509 91177308-0d34-0410-b5e6-96231b3b80d8
2015-03-30 03:37:06 +00:00
|
|
|
RuntimeDyldMachO::create(Triple::ArchType Arch,
|
|
|
|
RuntimeDyld::MemoryManager &MemMgr,
|
|
|
|
RuntimeDyld::SymbolResolver &Resolver) {
|
2012-03-30 16:45:19 +00:00
|
|
|
switch (Arch) {
|
2014-03-21 20:28:42 +00:00
|
|
|
default:
|
2014-07-17 18:54:50 +00:00
|
|
|
llvm_unreachable("Unsupported target for RuntimeDyldMachO.");
|
2014-07-11 23:52:07 +00:00
|
|
|
break;
|
[MCJIT][Orc] Refactor RTDyldMemoryManager, weave RuntimeDyld::SymbolInfo through
MCJIT.
This patch decouples the two responsibilities of the RTDyldMemoryManager class,
memory management and symbol resolution, into two new classes:
RuntimeDyld::MemoryManager and RuntimeDyld::SymbolResolver.
The symbol resolution interface is modified slightly, from:
uint64_t getSymbolAddress(const std::string &Name);
to:
RuntimeDyld::SymbolInfo findSymbol(const std::string &Name);
The latter passes symbol flags along with symbol addresses, allowing RuntimeDyld
and others to reason about non-strong/non-exported symbols.
The memory management interface removes the following method:
void notifyObjectLoaded(ExecutionEngine *EE,
const object::ObjectFile &) {}
as it is not related to memory management. (Note: Backwards compatibility *is*
maintained for this method in MCJIT and OrcMCJITReplacement, see below).
The RTDyldMemoryManager class remains in-tree for backwards compatibility.
It inherits directly from RuntimeDyld::SymbolResolver, and indirectly from
RuntimeDyld::MemoryManager via the new MCJITMemoryManager class, which
just subclasses RuntimeDyld::MemoryManager and reintroduces the
notifyObjectLoaded method for backwards compatibility).
The EngineBuilder class retains the existing method:
EngineBuilder&
setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager> mcjmm);
and includes two new methods:
EngineBuilder&
setMemoryManager(std::unique_ptr<MCJITMemoryManager> MM);
EngineBuilder&
setSymbolResolver(std::unique_ptr<RuntimeDyld::SymbolResolver> SR);
Clients should use EITHER:
A single call to setMCJITMemoryManager with an RTDyldMemoryManager.
OR (exclusive)
One call each to each of setMemoryManager and setSymbolResolver.
This patch should be fully compatible with existing uses of RTDyldMemoryManager.
If it is not it should be considered a bug, and the patch either fixed or
reverted.
If clients find the new API to be an improvement the goal will be to deprecate
and eventually remove the RTDyldMemoryManager class in favor of the new classes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233509 91177308-0d34-0410-b5e6-96231b3b80d8
2015-03-30 03:37:06 +00:00
|
|
|
case Triple::arm:
|
|
|
|
return make_unique<RuntimeDyldMachOARM>(MemMgr, Resolver);
|
|
|
|
case Triple::aarch64:
|
|
|
|
return make_unique<RuntimeDyldMachOAArch64>(MemMgr, Resolver);
|
|
|
|
case Triple::x86:
|
|
|
|
return make_unique<RuntimeDyldMachOI386>(MemMgr, Resolver);
|
|
|
|
case Triple::x86_64:
|
|
|
|
return make_unique<RuntimeDyldMachOX86_64>(MemMgr, Resolver);
|
2014-07-11 23:52:07 +00:00
|
|
|
}
|
2014-01-08 04:09:09 +00:00
|
|
|
}
|
|
|
|
|
2014-11-26 16:54:40 +00:00
|
|
|
std::unique_ptr<RuntimeDyld::LoadedObjectInfo>
|
|
|
|
RuntimeDyldMachO::loadObject(const object::ObjectFile &O) {
|
|
|
|
unsigned SectionStartIdx, SectionEndIdx;
|
|
|
|
std::tie(SectionStartIdx, SectionEndIdx) = loadObjectImpl(O);
|
|
|
|
return llvm::make_unique<LoadedMachOObjectInfo>(*this, SectionStartIdx,
|
|
|
|
SectionEndIdx);
|
|
|
|
}
|
|
|
|
|
2011-07-13 07:57:58 +00:00
|
|
|
} // end namespace llvm
|