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:
#	Cargo.lock
#	Cargo.toml
#	lib/compiler/src/section.rs
This commit is contained in:
Syrus
2020-05-19 19:54:52 -07:00
parent 5bb0074ad1 5dbe419a3f
commit 12b353ca7d
88 changed files with 5121 additions and 3881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ use wasmer_compiler::TrapInformation;
use wasmer_compiler::{Compilation, CompileError, CompiledFunction, Compiler, SectionIndex};
use wasmer_compiler::{CompilerConfig, ModuleTranslationState, Target};
use wasmer_compiler::{FunctionBody, FunctionBodyData};
use wasmer_runtime::Module;
use wasmer_runtime::ModuleInfo;
use wasmer_runtime::TrapCode;
use wasmer_runtime::{MemoryPlan, TablePlan, VMOffsets};
@ -52,7 +52,7 @@ impl Compiler for SinglepassCompiler {
/// associated relocations.
fn compile_module(
&self,
module: &Module,
module: &ModuleInfo,
_module_translation: &ModuleTranslationState,
function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'_>>,
memory_plans: PrimaryMap<MemoryIndex, MemoryPlan>,
@ -131,7 +131,7 @@ impl Compiler for SinglepassCompiler {
fn compile_dynamic_function_trampolines(
&self,
_module: &Module,
_module: &ModuleInfo,
) -> Result<PrimaryMap<FunctionIndex, FunctionBody>, CompileError> {
Ok(PrimaryMap::new())
// unimplemented!("Dynamic funciton trampolines not yet implemented");