fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-03-16 16:20:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge #889

Browse Source 
889: fix(singlepass-backend) Use wasmparser from `runtime-core` r=Hywan a=Hywan

The `wasmer-runtime-core` crate re-exports the `wasmparser`
crate. This patch updates the `singlepass-backend` crate to use
`wasmparser` through the `wasmer-runtime-core` crate, which removes a
direct dependency for this crate.

Co-authored-by: Ivan Enderlin <ivan.enderlin@hoa-project.net>
This commit is contained in:
bors[bot] 2019-10-21 19:29:46 +00:00 committed by GitHub
commit 209a8fa08c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -1680,7 +1680,6 @@ dependencies = [
"nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmer-runtime-core 0.8.0",
"wasmparser 0.39.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]

1
lib/singlepass-backend/Cargo.toml
View File

@ -10,7 +10,6 @@ readme = "README.md"
[dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.8.0" }
wasmparser = "0.39.1"
dynasm = "0.3.2"
dynasmrt = "0.3.1"
lazy_static = "1.4"

8
lib/singlepass-backend/src/codegen_x64.rs
View File

@ -1,15 +1,13 @@
#![allow(clippy::forget_copy)] // Used by dynasm.
#![warn(unused_imports)]
use crate::emitter_x64::*;
use crate::machine::*;
use crate::protect_unix;
use crate::{emitter_x64::*, machine::*, protect_unix};
use dynasmrt::{x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi};
use smallvec::SmallVec;
use std::ptr::NonNull;
use std::{
any::Any,
collections::{BTreeMap, HashMap},
ptr::NonNull,
sync::{Arc, RwLock},
};
use wasmer_runtime_core::{
@ -33,8 +31,8 @@ use wasmer_runtime_core::{
TableIndex, Type,
},
vm::{self, LocalGlobal, LocalTable, INTERNALS_SIZE},
wasmparser::{MemoryImmediate, Operator, Type as WpType, TypeOrFuncType as WpTypeOrFuncType},
};
use wasmparser::{MemoryImmediate, Operator, Type as WpType, TypeOrFuncType as WpTypeOrFuncType};
lazy_static! {
/// Performs a System V call to `target` with [stack_top..stack_base] as the argument list, from right to left.

7
lib/singlepass-backend/src/machine.rs
View File

@ -1,9 +1,10 @@
use crate::emitter_x64::*;
use smallvec::SmallVec;
use std::collections::HashSet;
use wasmer_runtime_core::state::x64::X64Register;
use wasmer_runtime_core::state::*;
use wasmparser::Type as WpType;
use wasmer_runtime_core::{
state::{x64::X64Register, *},
wasmparser::Type as WpType,
};
struct MachineStackOffset(usize);