Adding multiple object support to MCJIT EH frame handling
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192504 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/lib/ExecutionEngine/MCJIT/MCJIT.cpp
index 541ba9e..fa2c984 100644
--- a/lib/ExecutionEngine/MCJIT/MCJIT.cpp
+++ b/lib/ExecutionEngine/MCJIT/MCJIT.cpp
@@ -178,14 +178,12 @@
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 @@
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 @@
// 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();
diff --git a/lib/ExecutionEngine/MCJIT/MCJIT.h b/lib/ExecutionEngine/MCJIT/MCJIT.h
index 6969ff1..fe59288 100644
--- a/lib/ExecutionEngine/MCJIT/MCJIT.h
+++ b/lib/ExecutionEngine/MCJIT/MCJIT.h
@@ -51,8 +51,8 @@
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) {