6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-23 01:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Adding multiple object support to MCJIT EH frame handling

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192504 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Kaylor
2013-10-11 21:25:48 +00:00
parent b19b474de9
commit 528f6d787b
15 changed files with 210 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/ExecutionEngine/MCJIT/MCJIT.cpp
View File

@ -178,14 +178,12 @@ void MCJIT::finalizeLoadedModules() {
if (ModuleStates[M].hasBeenLoaded() &&
!ModuleStates[M].hasBeenFinalized()) {
// FIXME: This should be module specific!
StringRef EHData = Dyld.getEHFrameSection();
if (!EHData.empty())
MemMgr.registerEHFrames(EHData);
ModuleStates[M] = ModuleFinalized;
}
}
Dyld.registerEHFrames();
// Set page permissions.
MemMgr.finalizeMemory();
}
@ -221,14 +219,12 @@ void MCJIT::finalizeObject() {
if (ModuleStates[M].hasBeenLoaded() &&
!ModuleStates[M].hasBeenFinalized()) {
// FIXME: This should be module specific!
StringRef EHData = Dyld.getEHFrameSection();
if (!EHData.empty())
MemMgr.registerEHFrames(EHData);
ModuleStates[M] = ModuleFinalized;
}
}
Dyld.registerEHFrames();
// Set page permissions.
MemMgr.finalizeMemory();
}
@ -248,10 +244,7 @@ void MCJIT::finalizeModule(Module *M) {
// Resolve any outstanding relocations.
Dyld.resolveRelocations();
// FIXME: Should this be module specific?
StringRef EHData = Dyld.getEHFrameSection();
if (!EHData.empty())
MemMgr.registerEHFrames(EHData);
Dyld.registerEHFrames();
// Set page permissions.
MemMgr.finalizeMemory();

4
lib/ExecutionEngine/MCJIT/MCJIT.h
View File

@ -51,8 +51,8 @@ public:
ClientMM->notifyObjectLoaded(EE, Obj);
}
virtual void registerEHFrames(StringRef SectionData) {
ClientMM->registerEHFrames(SectionData);
virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
ClientMM->registerEHFrames(Addr, LoadAddr, Size);
}
virtual bool finalizeMemory(std::string *ErrMsg = 0) {

11
lib/ExecutionEngine/RTDyldMemoryManager.cpp
View File

@ -54,10 +54,15 @@ static const char *processFDE(const char *Entry) {
}
#endif
void RTDyldMemoryManager::registerEHFrames(StringRef SectionData) {
// This implementation handles frame registration for local targets.
// Memory managers for remote targets should re-implement this function
// and use the LoadAddr parameter.
void RTDyldMemoryManager::registerEHFrames(uint8_t *Addr,
uint64_t LoadAddr,
size_t Size) {
#if HAVE_EHTABLE_SUPPORT
const char *P = SectionData.data();
const char *End = SectionData.data() + SectionData.size();
const char *P = (const char *)Addr;
const char *End = P + Size;
do {
P = processFDE(P);
} while(P != End);

9
lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
View File

@ -29,8 +29,7 @@ RuntimeDyldImpl::~RuntimeDyldImpl() {}
namespace llvm {
StringRef RuntimeDyldImpl::getEHFrameSection() {
return StringRef();
void RuntimeDyldImpl::registerEHFrames() {
}
// Resolve the relocations for all symbols we currently know about.
@ -171,7 +170,7 @@ ObjectImage *RuntimeDyldImpl::loadObject(ObjectBuffer *InputBuffer) {
}
// Give the subclasses a chance to tie-up any loose ends.
finalizeLoad();
finalizeLoad(LocalSections);
return obj.take();
}
@ -592,8 +591,8 @@ StringRef RuntimeDyld::getErrorString() {
return Dyld->getErrorString();
}
StringRef RuntimeDyld::getEHFrameSection() {
return Dyld->getEHFrameSection();
void RuntimeDyld::registerEHFrames() {
return Dyld->registerEHFrames();
}
} // end namespace llvm

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

@ -151,12 +151,17 @@ void DyldELFObject<ELFT>::updateSymbolAddress(const SymbolRef &SymRef,
namespace llvm {
StringRef RuntimeDyldELF::getEHFrameSection() {
for (int i = 0, e = Sections.size(); i != e; ++i) {
if (Sections[i].Name == ".eh_frame")
return StringRef((const char*)Sections[i].Address, Sections[i].Size);
void RuntimeDyldELF::registerEHFrames() {
if (!MemMgr)
return;
for (int i = 0, e = UnregisteredEHFrameSections.size(); i != e; ++i) {
SID EHFrameSID = UnregisteredEHFrameSections[i];
uint8_t *EHFrameAddr = Sections[EHFrameSID].Address;
uint64_t EHFrameLoadAddr = Sections[EHFrameSID].LoadAddress;
size_t EHFrameSize = Sections[EHFrameSID].Size;
MemMgr->registerEHFrames(EHFrameAddr, EHFrameLoadAddr, EHFrameSize);
}
return StringRef();
UnregisteredEHFrameSections.clear();
}
ObjectImage *RuntimeDyldELF::createObjectImage(ObjectBuffer *Buffer) {
@ -1342,7 +1347,8 @@ uint64_t RuntimeDyldELF::findGOTEntry(uint64_t LoadAddress,
return 0;
}
void RuntimeDyldELF::finalizeLoad() {
void RuntimeDyldELF::finalizeLoad(ObjSectionToIDMap &SectionMap) {
// If necessary, allocate the global offset table
if (MemMgr) {
// Allocate the GOT if necessary
size_t numGOTEntries = GOTEntries.size();
@ -1365,6 +1371,18 @@ void RuntimeDyldELF::finalizeLoad() {
else {
report_fatal_error("Unable to allocate memory for GOT!");
}
// Look for and record the EH frame section.
ObjSectionToIDMap::iterator i, e;
for (i = SectionMap.begin(), e = SectionMap.end(); i != e; ++i) {
const SectionRef &Section = i->first;
StringRef Name;
Section.getName(Name);
if (Name == ".eh_frame") {
UnregisteredEHFrameSections.push_back(i->second);
break;
}
}
}
bool RuntimeDyldELF::isCompatibleFormat(const ObjectBuffer *Buffer) const {

10
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h
View File

@ -94,11 +94,15 @@ class RuntimeDyldELF : public RuntimeDyldImpl {
// Relocation entries for symbols whose position-independant offset is
// updated in a global offset table.
typedef unsigned SID; // Type for SectionIDs
typedef SmallVector<RelocationValueRef, 2> GOTRelocations;
GOTRelocations GOTEntries; // List of entries requiring finalization.
SmallVector<std::pair<SID, GOTRelocations>, 8> GOTs; // Allocated tables.
// When a module is loaded we save the SectionID of the EH frame section
// in a table until we receive a request to register all unregistered
// EH frame sections with the memory manager.
SmallVector<SID, 2> UnregisteredEHFrameSections;
public:
RuntimeDyldELF(RTDyldMemoryManager *mm) : RuntimeDyldImpl(mm)
{}
@ -112,8 +116,8 @@ public:
StubMap &Stubs);
virtual bool isCompatibleFormat(const ObjectBuffer *Buffer) const;
virtual ObjectImage *createObjectImage(ObjectBuffer *InputBuffer);
virtual StringRef getEHFrameSection();
virtual void finalizeLoad();
virtual void registerEHFrames();
virtual void finalizeLoad(ObjSectionToIDMap &SectionMap);
virtual ~RuntimeDyldELF();
};

7
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
View File

@ -147,6 +147,9 @@ protected:
typedef SmallVector<SectionEntry, 64> SectionList;
SectionList Sections;
typedef unsigned SID; // Type for SectionIDs
#define RTDYLD_INVALID_SECTION_ID ((SID)(-1))
// Keep a map of sections from object file to the SectionID which
// references it.
typedef std::map<SectionRef, unsigned> ObjSectionToIDMap;
@ -357,9 +360,9 @@ public:
virtual bool isCompatibleFormat(const ObjectBuffer *Buffer) const = 0;
virtual StringRef getEHFrameSection();
virtual void registerEHFrames();
virtual void finalizeLoad() {}
virtual void finalizeLoad(ObjSectionToIDMap &SectionMap) {}
};
} // end namespace llvm

75
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
View File

@ -55,33 +55,58 @@ static intptr_t computeDelta(SectionEntry *A, SectionEntry *B) {
return ObjDistance - MemDistance;
}
StringRef RuntimeDyldMachO::getEHFrameSection() {
SectionEntry *Text = NULL;
SectionEntry *EHFrame = NULL;
SectionEntry *ExceptTab = NULL;
for (int i = 0, e = Sections.size(); i != e; ++i) {
if (Sections[i].Name == "__eh_frame")
EHFrame = &Sections[i];
else if (Sections[i].Name == "__text")
Text = &Sections[i];
else if (Sections[i].Name == "__gcc_except_tab")
ExceptTab = &Sections[i];
void RuntimeDyldMachO::registerEHFrames() {
if (!MemMgr)
return;
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];
SectionEntry *ExceptTab = NULL;
if (SectionInfo.ExceptTabSID != RTDYLD_INVALID_SECTION_ID)
ExceptTab = &Sections[SectionInfo.ExceptTabSID];
intptr_t DeltaForText = computeDelta(Text, EHFrame);
intptr_t DeltaForEH = 0;
if (ExceptTab)
DeltaForEH = computeDelta(ExceptTab, EHFrame);
unsigned char *P = EHFrame->Address;
unsigned char *End = P + EHFrame->Size;
do {
P = processFDE(P, DeltaForText, DeltaForEH);
} while(P != End);
MemMgr->registerEHFrames(EHFrame->Address,
EHFrame->LoadAddress,
EHFrame->Size);
}
if (Text == NULL || EHFrame == NULL)
return StringRef();
UnregisteredEHFrameSections.clear();
}
intptr_t DeltaForText = computeDelta(Text, EHFrame);
intptr_t DeltaForEH = 0;
if (ExceptTab)
DeltaForEH = computeDelta(ExceptTab, EHFrame);
unsigned char *P = EHFrame->Address;
unsigned char *End = P + EHFrame->Size;
do {
P = processFDE(P, DeltaForText, DeltaForEH);
} while(P != End);
return StringRef((char*)EHFrame->Address, EHFrame->Size);
void RuntimeDyldMachO::finalizeLoad(ObjSectionToIDMap &SectionMap) {
unsigned EHFrameSID = RTDYLD_INVALID_SECTION_ID;
unsigned TextSID = RTDYLD_INVALID_SECTION_ID;
unsigned ExceptTabSID = RTDYLD_INVALID_SECTION_ID;
ObjSectionToIDMap::iterator i, e;
for (i = SectionMap.begin(), e = SectionMap.end(); i != e; ++i) {
const SectionRef &Section = i->first;
StringRef Name;
Section.getName(Name);
if (Name == "__eh_frame")
EHFrameSID = i->second;
else if (Name == "__text")
TextSID = i->second;
else if (Name == "__gcc_except_tab")
ExceptTabSID = i->second;
}
UnregisteredEHFrameSections.push_back(EHFrameRelatedSections(EHFrameSID,
TextSID,
ExceptTabSID));
}
// The target location for the relocation is described by RE.SectionID and

19
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h
View File

@ -54,6 +54,22 @@ class RuntimeDyldMachO : public RuntimeDyldImpl {
int64_t Addend,
bool isPCRel,
unsigned Size);
struct EHFrameRelatedSections {
EHFrameRelatedSections() : EHFrameSID(RTDYLD_INVALID_SECTION_ID),
TextSID(RTDYLD_INVALID_SECTION_ID),
ExceptTabSID(RTDYLD_INVALID_SECTION_ID) {}
EHFrameRelatedSections(SID EH, SID T, SID Ex)
: EHFrameSID(EH), TextSID(T), ExceptTabSID(Ex) {}
SID EHFrameSID;
SID TextSID;
SID ExceptTabSID;
};
// When a module is loaded we save the SectionID of the EH frame section
// in a table until we receive a request to register all unregistered
// EH frame sections with the memory manager.
SmallVector<EHFrameRelatedSections, 2> UnregisteredEHFrameSections;
public:
RuntimeDyldMachO(RTDyldMemoryManager *mm) : RuntimeDyldImpl(mm) {}
@ -65,7 +81,8 @@ public:
const SymbolTableMap &Symbols,
StubMap &Stubs);
virtual bool isCompatibleFormat(const ObjectBuffer *Buffer) const;
virtual StringRef getEHFrameSection();
virtual void registerEHFrames();
virtual void finalizeLoad(ObjSectionToIDMap &SectionMap);
};
} // end namespace llvm