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

Merge branch 'master' into singlepass

Browse Source 
# Conflicts:
#	lib/compiler-singlepass/src/compiler.rs
This commit is contained in:
Syrus
2020-05-04 15:10:49 -07:00
parent b5c96bf426 dad68819ff
commit 01ed7d115c
49 changed files with 400 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use crate::config::SinglepassConfig;
use rayon::prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator};
use wasm_common::entity::{EntityRef, PrimaryMap};
use wasm_common::Features;
use wasm_common::{FuncIndex, FuncType, LocalFuncIndex, MemoryIndex, TableIndex};
use wasm_common::{FunctionIndex, FunctionType, LocalFunctionIndex, MemoryIndex, TableIndex};
use wasmer_compiler::wasmparser::{BinaryReader, BinaryReaderError};
use wasmer_compiler::TrapInformation;
use wasmer_compiler::{Compilation, CompileError, CompiledFunction, Compiler, SectionIndex};
@ -54,12 +54,12 @@ impl Compiler for SinglepassCompiler {
&self,
module: &Module,
module_translation: &ModuleTranslationState,
function_body_inputs: PrimaryMap<LocalFuncIndex, FunctionBodyData<'_>>,
function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'_>>,
memory_plans: PrimaryMap<MemoryIndex, MemoryPlan>,
table_plans: PrimaryMap<TableIndex, TablePlan>,
) -> Result<Compilation, CompileError> {
let import_trampolines: PrimaryMap<SectionIndex, _> = (0..module.num_imported_funcs)
.map(FuncIndex::new)
.map(FunctionIndex::new)
.collect::<Vec<_>>()
.into_par_iter()
.map(|i| gen_import_call_trampoline(i, module.signatures[module.functions[i]].clone()))
@ -68,7 +68,7 @@ impl Compiler for SinglepassCompiler {
.collect();
let functions = function_body_inputs
.into_iter()
.collect::<Vec<(LocalFuncIndex, &FunctionBodyData<'_>)>>()
.collect::<Vec<(LocalFunctionIndex, &FunctionBodyData<'_>)>>()
.par_iter()
.map(|(i, input)| {
let mut reader = BinaryReader::new_with_offset(input.data, input.module_offset);
@ -105,14 +105,14 @@ impl Compiler for SinglepassCompiler {
})
.collect::<Result<Vec<CompiledFunction>, CompileError>>()?
.into_iter()
.collect::<PrimaryMap<LocalFuncIndex, CompiledFunction>>();
.collect::<PrimaryMap<LocalFunctionIndex, CompiledFunction>>();
Ok(Compilation::new(functions, import_trampolines))
}
fn compile_wasm_trampolines(
&self,
signatures: &[FuncType],
signatures: &[FunctionType],
) -> Result<Vec<FunctionBody>, CompileError> {
Ok(signatures
.par_iter()