diff options
| author | Chris Lattner <sabre@nondot.org> | 2007-12-06 01:08:09 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2007-12-06 01:08:09 +0000 |
| commit | 9f2f142d255bc96f109dd5c6524a485937b1f3a1 (patch) | |
| tree | 60de6e06844b32d1ffd76090df4610c4920bb3cc /lib/ExecutionEngine/JIT | |
| parent | 7f3a75a5290ba4167403626849d666138383fd74 (diff) | |
| download | external_llvm-9f2f142d255bc96f109dd5c6524a485937b1f3a1.zip external_llvm-9f2f142d255bc96f109dd5c6524a485937b1f3a1.tar.gz external_llvm-9f2f142d255bc96f109dd5c6524a485937b1f3a1.tar.bz2 | |
simplify creation of the interpreter, make ExecutionEngine ctor protected,
delete one ExecutionEngine ctor, minor cleanup.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44646 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/JIT')
| -rw-r--r-- | lib/ExecutionEngine/JIT/JIT.cpp | 2 | ||||
| -rw-r--r-- | lib/ExecutionEngine/JIT/JIT.h | 2 | ||||
| -rw-r--r-- | lib/ExecutionEngine/JIT/JITEmitter.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp index 5b04124..b599497 100644 --- a/lib/ExecutionEngine/JIT/JIT.cpp +++ b/lib/ExecutionEngine/JIT/JIT.cpp @@ -66,7 +66,7 @@ JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji) setTargetData(TM.getTargetData()); // Initialize MCE - MCE = createEmitter(*this); + MCE = createEmitter(*this, 0); // Add target data MutexGuard locked(lock); diff --git a/lib/ExecutionEngine/JIT/JIT.h b/lib/ExecutionEngine/JIT/JIT.h index 5a3d661..6453740 100644 --- a/lib/ExecutionEngine/JIT/JIT.h +++ b/lib/ExecutionEngine/JIT/JIT.h @@ -121,7 +121,7 @@ public: /// getCodeEmitter - Return the code emitter this JIT is emitting into. MachineCodeEmitter *getCodeEmitter() const { return MCE; } private: - static MachineCodeEmitter *createEmitter(JIT &J); + static MachineCodeEmitter *createEmitter(JIT &J, JITMemoryManager *JMM); void runJITOnFunction (Function *F); }; diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp index d08bf0b..a1b4b00 100644 --- a/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -312,8 +312,8 @@ namespace { /// Resolver - This contains info about the currently resolved functions. JITResolver Resolver; public: - JITEmitter(JIT &jit) : Resolver(jit) { - MemMgr = JITMemoryManager::CreateDefaultMemManager(); + JITEmitter(JIT &jit, JITMemoryManager *JMM) : Resolver(jit) { + MemMgr = JMM ? JMM : JITMemoryManager::CreateDefaultMemManager(); if (jit.getJITInfo().needsGOT()) { MemMgr->AllocateGOT(); DOUT << "JIT is managing a GOT\n"; @@ -637,8 +637,8 @@ intptr_t JITEmitter::getJumpTableEntryAddress(unsigned Index) const { // Public interface to this file //===----------------------------------------------------------------------===// -MachineCodeEmitter *JIT::createEmitter(JIT &jit) { - return new JITEmitter(jit); +MachineCodeEmitter *JIT::createEmitter(JIT &jit, JITMemoryManager *JMM) { + return new JITEmitter(jit, JMM); } // getPointerToNamedFunction - This function is used as a global wrapper to |