remove the ExecutionEngine binding
the code has no tests and will just bitrot by itself. this is a [breaking-change]
This commit is contained in:
parent
32e462ef99
commit
81df89fc2d
@ -24,7 +24,7 @@ LLVM_EXTRA_INCDIRS_$(1)= $$(call CFG_CC_INCLUDE_$(1),$(S)src/llvm/include) \
|
||||
endif
|
||||
|
||||
RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, \
|
||||
ExecutionEngineWrapper.cpp RustWrapper.cpp PassWrapper.cpp \
|
||||
RustWrapper.cpp PassWrapper.cpp \
|
||||
ArchiveWrapper.cpp)
|
||||
|
||||
RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \
|
||||
|
@ -112,8 +112,7 @@ fn main() {
|
||||
cfg.flag(&flag);
|
||||
}
|
||||
|
||||
cfg.file("../rustllvm/ExecutionEngineWrapper.cpp")
|
||||
.file("../rustllvm/PassWrapper.cpp")
|
||||
cfg.file("../rustllvm/PassWrapper.cpp")
|
||||
.file("../rustllvm/RustWrapper.cpp")
|
||||
.file("../rustllvm/ArchiveWrapper.cpp")
|
||||
.cpp(true)
|
||||
|
@ -1099,15 +1099,6 @@ extern {
|
||||
Name: *const c_char);
|
||||
pub fn LLVMDisposeBuilder(Builder: BuilderRef);
|
||||
|
||||
/* Execution engine */
|
||||
pub fn LLVMBuildExecutionEngine(Mod: ModuleRef) -> ExecutionEngineRef;
|
||||
pub fn LLVMDisposeExecutionEngine(EE: ExecutionEngineRef);
|
||||
pub fn LLVMExecutionEngineFinalizeObject(EE: ExecutionEngineRef);
|
||||
pub fn LLVMRustLoadDynamicLibrary(path: *const c_char) -> Bool;
|
||||
pub fn LLVMExecutionEngineAddModule(EE: ExecutionEngineRef, M: ModuleRef);
|
||||
pub fn LLVMExecutionEngineRemoveModule(EE: ExecutionEngineRef, M: ModuleRef)
|
||||
-> Bool;
|
||||
|
||||
/* Metadata */
|
||||
pub fn LLVMSetCurrentDebugLocation(Builder: BuilderRef, L: ValueRef);
|
||||
pub fn LLVMGetCurrentDebugLocation(Builder: BuilderRef) -> ValueRef;
|
||||
|
@ -1,111 +0,0 @@
|
||||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#include "rustllvm.h"
|
||||
|
||||
#include "llvm/ExecutionEngine/SectionMemoryManager.h"
|
||||
|
||||
using namespace llvm;
|
||||
using namespace llvm::sys;
|
||||
using namespace llvm::object;
|
||||
|
||||
class RustJITMemoryManager : public SectionMemoryManager
|
||||
{
|
||||
typedef SectionMemoryManager Base;
|
||||
|
||||
public:
|
||||
|
||||
RustJITMemoryManager() {}
|
||||
|
||||
uint64_t getSymbolAddress(const std::string &Name) override
|
||||
{
|
||||
return Base::getSymbolAddress(Name);
|
||||
}
|
||||
};
|
||||
|
||||
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(RustJITMemoryManager, LLVMRustJITMemoryManagerRef)
|
||||
|
||||
extern "C" LLVMBool LLVMRustLoadDynamicLibrary(const char *path)
|
||||
{
|
||||
std::string err;
|
||||
DynamicLibrary lib = DynamicLibrary::getPermanentLibrary(path, &err);
|
||||
|
||||
if (!lib.isValid())
|
||||
LLVMRustSetLastError(err.c_str());
|
||||
|
||||
return lib.isValid();
|
||||
}
|
||||
|
||||
// Calls LLVMAddModule;
|
||||
// exists for consistency with LLVMExecutionEngineRemoveModule
|
||||
extern "C" void LLVMExecutionEngineAddModule(
|
||||
LLVMExecutionEngineRef eeref, LLVMModuleRef mref)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
// On Windows, MCJIT must generate ELF objects
|
||||
std::string target = getProcessTriple();
|
||||
target += "-elf";
|
||||
target = Triple::normalize(target);
|
||||
unwrap(mref)->setTargetTriple(target);
|
||||
#endif
|
||||
LLVMAddModule(eeref, mref);
|
||||
}
|
||||
|
||||
// LLVMRemoveModule exists in LLVM's C bindings,
|
||||
// but it requires pointless parameters
|
||||
extern "C" LLVMBool LLVMExecutionEngineRemoveModule(
|
||||
LLVMExecutionEngineRef eeref, LLVMModuleRef mref)
|
||||
{
|
||||
ExecutionEngine *ee = unwrap(eeref);
|
||||
Module *m = unwrap(mref);
|
||||
|
||||
return ee->removeModule(m);
|
||||
}
|
||||
|
||||
extern "C" LLVMExecutionEngineRef LLVMBuildExecutionEngine(LLVMModuleRef mod)
|
||||
{
|
||||
// These are necessary for code generation to work properly.
|
||||
InitializeNativeTarget();
|
||||
InitializeNativeTargetAsmPrinter();
|
||||
InitializeNativeTargetAsmParser();
|
||||
|
||||
#ifdef _WIN32
|
||||
// On Windows, MCJIT must generate ELF objects
|
||||
std::string target = getProcessTriple();
|
||||
target += "-elf";
|
||||
target = Triple::normalize(target);
|
||||
unwrap(mod)->setTargetTriple(target);
|
||||
#endif
|
||||
|
||||
std::string error_str;
|
||||
TargetOptions options;
|
||||
|
||||
RustJITMemoryManager *mm = new RustJITMemoryManager;
|
||||
|
||||
ExecutionEngine *ee =
|
||||
EngineBuilder(std::unique_ptr<Module>(unwrap(mod)))
|
||||
.setMCJITMemoryManager(std::unique_ptr<RustJITMemoryManager>(mm))
|
||||
.setEngineKind(EngineKind::JIT)
|
||||
.setErrorStr(&error_str)
|
||||
.setTargetOptions(options)
|
||||
.create();
|
||||
|
||||
if (!ee)
|
||||
LLVMRustSetLastError(error_str.c_str());
|
||||
|
||||
return wrap(ee);
|
||||
}
|
||||
|
||||
extern "C" void LLVMExecutionEngineFinalizeObject(LLVMExecutionEngineRef eeref)
|
||||
{
|
||||
ExecutionEngine *ee = unwrap(eeref);
|
||||
|
||||
ee->finalizeObject();
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user