mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-22 04:36:42 +00:00
Execution Engine cleanups
This commit is contained in:
parent
a4927609d7
commit
de22a0a132
1 changed files with 2 additions and 5 deletions
|
|
@ -47,17 +47,14 @@ ReturnCode ExecutionEngine::run(bytes const& _code, RuntimeData* _data, Env* _en
|
||||||
|
|
||||||
ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeData* _data, Env* _env, bytes const& _code)
|
ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeData* _data, Env* _env, bytes const& _code)
|
||||||
{
|
{
|
||||||
auto module = _module.get(); // Keep ownership of the module in _module
|
|
||||||
|
|
||||||
llvm::sys::PrintStackTraceOnErrorSignal();
|
llvm::sys::PrintStackTraceOnErrorSignal();
|
||||||
static const auto program = "EVM JIT";
|
static const auto program = "EVM JIT";
|
||||||
llvm::PrettyStackTraceProgram X(1, &program);
|
llvm::PrettyStackTraceProgram X(1, &program);
|
||||||
|
|
||||||
llvm::InitializeNativeTarget();
|
llvm::InitializeNativeTarget();
|
||||||
llvm::InitializeNativeTargetAsmPrinter();
|
llvm::InitializeNativeTargetAsmPrinter();
|
||||||
llvm::InitializeNativeTargetAsmParser();
|
|
||||||
|
|
||||||
llvm::EngineBuilder builder(module);
|
llvm::EngineBuilder builder(_module.get());
|
||||||
builder.setEngineKind(llvm::EngineKind::JIT);
|
builder.setEngineKind(llvm::EngineKind::JIT);
|
||||||
builder.setUseMCJIT(true);
|
builder.setUseMCJIT(true);
|
||||||
std::unique_ptr<llvm::SectionMemoryManager> memoryManager(new llvm::SectionMemoryManager);
|
std::unique_ptr<llvm::SectionMemoryManager> memoryManager(new llvm::SectionMemoryManager);
|
||||||
|
|
@ -67,7 +64,7 @@ ReturnCode ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeDa
|
||||||
auto triple = llvm::Triple(llvm::sys::getProcessTriple());
|
auto triple = llvm::Triple(llvm::sys::getProcessTriple());
|
||||||
if (triple.getOS() == llvm::Triple::OSType::Win32)
|
if (triple.getOS() == llvm::Triple::OSType::Win32)
|
||||||
triple.setObjectFormat(llvm::Triple::ObjectFormatType::ELF); // MCJIT does not support COFF format
|
triple.setObjectFormat(llvm::Triple::ObjectFormatType::ELF); // MCJIT does not support COFF format
|
||||||
module->setTargetTriple(triple.str());
|
_module->setTargetTriple(triple.str());
|
||||||
|
|
||||||
ExecBundle exec;
|
ExecBundle exec;
|
||||||
exec.engine.reset(builder.create());
|
exec.engine.reset(builder.create());
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue