fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-18 19:31:22 +00:00
Code Issues Projects Releases Wiki Activity

fix(singlepass-backend) Use wasmparser from runtime-core.

Browse Source 
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.
This commit is contained in:
Ivan Enderlin
2019-10-18 11:09:58 +02:00
parent 8c308d055b
commit e559b54309
4 changed files with 7 additions and 10 deletions
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)", "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)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmer-runtime-core 0.8.0", "wasmer-runtime-core 0.8.0",
"wasmparser 0.39.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]

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

@ -10,7 +10,6 @@ readme = "README.md"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.8.0" } wasmer-runtime-core = { path = "../runtime-core", version = "0.8.0" }
wasmparser = "0.39.1"
dynasm = "0.3.2" dynasm = "0.3.2"
dynasmrt = "0.3.1" dynasmrt = "0.3.1"
lazy_static = "1.4" 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. #![allow(clippy::forget_copy)] // Used by dynasm.
#![warn(unused_imports)] #![warn(unused_imports)]
use crate::emitter_x64::*; use crate::{emitter_x64::*, machine::*, protect_unix};
use crate::machine::*;
use crate::protect_unix;
use dynasmrt::{x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi}; use dynasmrt::{x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::ptr::NonNull;
use std::{ use std::{
any::Any, any::Any,
collections::{BTreeMap, HashMap}, collections::{BTreeMap, HashMap},
ptr::NonNull,
sync::{Arc, RwLock}, sync::{Arc, RwLock},
}; };
use wasmer_runtime_core::{ use wasmer_runtime_core::{
@ -33,8 +31,8 @@ use wasmer_runtime_core::{
TableIndex, Type, TableIndex, Type,
}, },
vm::{self, LocalGlobal, LocalTable, INTERNALS_SIZE}, 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! { lazy_static! {
/// Performs a System V call to `target` with [stack_top..stack_base] as the argument list, from right to left. /// 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 crate::emitter_x64::*;
use smallvec::SmallVec; use smallvec::SmallVec;
use std::collections::HashSet; use std::collections::HashSet;
use wasmer_runtime_core::state::x64::X64Register; use wasmer_runtime_core::{
use wasmer_runtime_core::state::*; state::{x64::X64Register, *},
use wasmparser::Type as WpType; wasmparser::Type as WpType,
};
struct MachineStackOffset(usize); struct MachineStackOffset(usize);