mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-10 22:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed LLVM with new compiler structure

Browse Source
This commit is contained in:
Syrus
2020-05-01 22:04:33 -07:00
parent 65b14b9282
commit 20ad3d608f
3 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/compiler-llvm/src/trampoline/wasm.rs
View File

@@ -1,23 +1,11 @@
use crate::config::LLVMConfig;
use crate::translator::intrinsics::{func_type_to_llvm, type_to_llvm, Intrinsics};
use crate::translator::intrinsics::{func_type_to_llvm, Intrinsics};
use inkwell::{
context::Context,
module::{Linkage, Module},
passes::PassManager,
targets::FileType,
types::{BasicType, FunctionType},
values::FunctionValue,
AddressSpace,
context::Context, module::Linkage, passes::PassManager, targets::FileType, types::BasicType,
values::FunctionValue, AddressSpace,
};
use wasm_common::entity::SecondaryMap;
use wasm_common::{FuncType, Type};
use wasmer_compiler::{
Compilation, CompileError, CompiledFunction, CompiledFunctionUnwindInfo, Compiler,
FunctionAddressMap, SourceLoc,
};
use std::fs;
use std::io::Write;
use wasmer_compiler::{CompileError, CompiledFunctionUnwindInfo, FunctionBody};
pub struct FuncTrampoline {
ctx: Context,
@@ -34,7 +22,7 @@ impl FuncTrampoline {
&mut self,
ty: &FuncType,
config: &LLVMConfig,
) -> Result<CompiledFunction, CompileError> {
) -> Result<FunctionBody, CompileError> {
let mut module = self.ctx.create_module("");
let target_triple = config.target_triple();
let target_machine = config.target_machine();
@@ -107,21 +95,9 @@ impl FuncTrampoline {
// TODO: remove debugging
//dbg!(&bytes);
let address_map = FunctionAddressMap {
instructions: vec![],
start_srcloc: SourceLoc::default(),
end_srcloc: SourceLoc::default(),
body_offset: 0,
body_len: 0, // TODO
};
Ok(CompiledFunction {
address_map,
Ok(FunctionBody {
body: bytes,
jt_offsets: SecondaryMap::new(),
unwind_info: CompiledFunctionUnwindInfo::None,
relocations: vec![],
traps: vec![],
})
}
}