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

Replace wasmparser::Result with wasmer::WasmResult in middleware

Browse Source
This commit is contained in:
Simon Warta
2020-12-21 22:55:37 +01:00
parent a16701ac6d
commit c41451a547
6 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ use crate::codegen_x64::{
use crate::config::Singlepass;
use rayon::prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator};
use std::sync::Arc;
use wasmer_compiler::wasmparser::BinaryReaderError;
use wasmer_compiler::TrapInformation;
use wasmer_compiler::{
Architecture, CompileModuleInfo, CompilerConfig, MiddlewareBinaryReader, ModuleMiddlewareChain,
@ -92,9 +91,9 @@ impl Compiler for SinglepassCompiler {
// This local list excludes arguments.
let mut locals = vec![];
let num_locals = reader.read_local_count().map_err(to_compile_error)?;
let num_locals = reader.read_local_count()?;
for _ in 0..num_locals {
let (count, ty) = reader.read_local_decl().map_err(to_compile_error)?;
let (count, ty) = reader.read_local_decl()?;
for _ in 0..count {
locals.push(ty);
}
@ -113,7 +112,7 @@ impl Compiler for SinglepassCompiler {
while generator.has_control_frames() {
generator.set_srcloc(reader.original_position() as u32);
let op = reader.read_operator().map_err(to_compile_error)?;
let op = reader.read_operator()?;
generator.feed_operator(op).map_err(to_compile_error)?;
}
@ -157,12 +156,6 @@ trait ToCompileError {
fn to_compile_error(self) -> CompileError;
}
impl ToCompileError for BinaryReaderError {
fn to_compile_error(self) -> CompileError {
CompileError::Codegen(self.message().into())
}
}
impl ToCompileError for CodegenError {
fn to_compile_error(self) -> CompileError {
CompileError::Codegen(self.message)