mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-08-25 09:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make LLVM work with one-vmctx imported functions

Browse Source
This commit is contained in:
Syrus
2020-05-19 21:38:10 -07:00
parent a62b720954
commit c76a3d83db
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/compiler-llvm/src/translator/code.rs
View File

@ -184,7 +184,7 @@ impl FuncTranslator {
let ty = wasm_fn_type.params()[idx];
let ty = type_to_llvm(&intrinsics, ty);
let value = func
.get_nth_param((idx as u32).checked_add(2).unwrap())
.get_nth_param((idx as u32).checked_add(1).unwrap())
.unwrap();
// TODO: don't interleave allocas and stores.
let alloca = cache_builder.build_alloca(ty, "param");
@ -2247,7 +2247,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
};
let params: Vec<_> = std::iter::repeat(callee_vmctx)
.take(2)
.take(1)
.chain(
self.state
.peekn_extra(func_type.params().len())?
@ -2517,7 +2517,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
let pushed_args = self.state.popn_save_extra(func_type.params().len())?;
let args: Vec<_> = std::iter::repeat(ctx_ptr)
.take(2)
.take(1)
.chain(pushed_args.into_iter().enumerate().map(|(i, (v, info))| {
match func_type.params()[i] {
Type::F32 => self.builder.build_bitcast(