mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-08-24 17:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic function support for singlepass.

Browse Source
This commit is contained in:
losfair
2020-05-27 23:56:39 +08:00
parent 58e0c30c34
commit f1883508e5
2 changed files with 113 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/compiler-singlepass/src/compiler.rs
View File

@ -2,7 +2,10 @@
// Allow unused imports while developing.
#![allow(unused_imports, dead_code)]
use crate::codegen_x64::{gen_import_call_trampoline, gen_std_trampoline, CodegenError, FuncGen};
use crate::codegen_x64::{
gen_import_call_trampoline, gen_std_dynamic_import_trampoline, gen_std_trampoline,
CodegenError, FuncGen,
};
use crate::config::SinglepassConfig;
use rayon::prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator};
use wasm_common::entity::{EntityRef, PrimaryMap};
@ -64,11 +67,7 @@ impl Compiler for SinglepassCompiler {
.collect::<Vec<_>>()
.into_par_iter()
.map(|i| {
gen_import_call_trampoline(
&vmoffsets,
i,
module.signatures[module.functions[i]].clone(),
)
gen_import_call_trampoline(&vmoffsets, i, &module.signatures[module.functions[i]])
})
.collect::<Vec<_>>()
.into_iter()
@ -131,10 +130,21 @@ impl Compiler for SinglepassCompiler {
fn compile_dynamic_function_trampolines(
&self,
_module: &ModuleInfo,
module: &ModuleInfo,
) -> Result<PrimaryMap<FunctionIndex, FunctionBody>, CompileError> {
Ok(PrimaryMap::new())
// unimplemented!("Dynamic funciton trampolines not yet implemented");
let vmoffsets = VMOffsets::new(8, module);
Ok(module
.functions
.values()
.take(module.num_imported_funcs)
.collect::<Vec<_>>()
.par_iter()
.map(|&&sig_index| {
gen_std_dynamic_import_trampoline(&vmoffsets, &module.signatures[sig_index])
})
.collect::<Vec<_>>()
.into_iter()
.collect::<PrimaryMap<FunctionIndex, FunctionBody>>())
}
}