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

Make dynamic functions work again

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

12
lib/compiler-cranelift/src/trampoline/dynamic_function.rs
View File

@@ -3,7 +3,7 @@
use super::binemit::TrampolineRelocSink;
use crate::translator::{compiled_function_unwind_info, signature_to_cranelift_ir};
use cranelift_codegen::ir::{
types, ExternalName, Function, InstBuilder, MemFlags, StackSlotData, StackSlotKind,
ExternalName, Function, InstBuilder, MemFlags, StackSlotData, StackSlotKind,
};
use cranelift_codegen::isa::TargetIsa;
use cranelift_codegen::print_errors::pretty_error;
@@ -13,7 +13,6 @@ use std::cmp;
use std::mem;
use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
use wasm_common::entity::EntityRef;
use wasm_common::SignatureIndex;
use wasmer_compiler::{CompileError, FunctionBody};
use wasmer_runtime::{ModuleInfo, VMOffsets};
@@ -37,9 +36,6 @@ pub fn make_trampoline_dynamic_function(
ir::ArgumentPurpose::VMContext,
));
// Add the `sig_index` parameter.
stub_sig.params.push(ir::AbiParam::new(types::I32));
// Add the `values_vec` parameter.
stub_sig.params.push(ir::AbiParam::new(pointer_type));
@@ -80,10 +76,12 @@ pub fn make_trampoline_dynamic_function(
let block_params = builder.func.dfg.block_params(block0);
let vmctx_ptr_val = block_params[0];
// Note: not used at the moment, but keeping in case is useful
// for the future
// Get the signature index
let caller_sig_id = builder.ins().iconst(types::I32, sig_index.index() as i64);
// let caller_sig_id = builder.ins().iconst(types::I32, sig_index.index() as i64);
let callee_args = vec![vmctx_ptr_val, caller_sig_id, values_vec_ptr_val];
let callee_args = vec![vmctx_ptr_val, values_vec_ptr_val];
let new_sig = builder.import_signature(stub_sig);