Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use standard API for js and sys for Module. Added Engine in js #3556

Merged
merged 92 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from 72 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
d09a76e
Use standard API for js and sys for Module. Added Engine in js
syrusakbary Jan 27, 2023
5a030f5
Fix compile
syrusakbary Jan 28, 2023
42fd09b
Move tunables into engine
syrusakbary Jan 30, 2023
cd730e0
Moved the gross of default store to default_engine
syrusakbary Feb 9, 2023
8c45633
Remove deprecated/unused TrapHandler
syrusakbary Feb 9, 2023
83313eb
Improved sys store
syrusakbary Feb 9, 2023
30f4589
Move StoreId to common wasmer_types
syrusakbary Feb 9, 2023
2a067fd
Made store compiler flags clearer
syrusakbary Feb 9, 2023
4c9a154
Use general store
syrusakbary Feb 9, 2023
24253b8
Remove import_shared_memory
syrusakbary Feb 9, 2023
bb34929
Make function_env common for js/sys
syrusakbary Feb 10, 2023
bd55e7b
Remove unused import in wasi
syrusakbary Feb 10, 2023
039098c
Prepare mem_access commons
syrusakbary Feb 10, 2023
5a829bc
Unify mem_access api for js/sys
syrusakbary Feb 10, 2023
543e7cb
Make CI happy. Fix linting and imports
syrusakbary Feb 10, 2023
293834c
Fix pending test
syrusakbary Feb 10, 2023
59a6b19
Fix linting
syrusakbary Feb 10, 2023
312aaf1
Use RawValue for wasmer js
syrusakbary Feb 10, 2023
0dda3c1
Unified extern_ref in js/sys
syrusakbary Feb 10, 2023
a1d3891
Unify native_type::NativeWasmTypeInto in js/sys
syrusakbary Feb 10, 2023
c3576e1
Unified ptr::WasmPtr into js/sys
syrusakbary Feb 11, 2023
c9e18e8
Fixed Context references
syrusakbary Feb 11, 2023
a5e631c
Unified Value into js/sys
syrusakbary Feb 11, 2023
1e405d3
Unified exports in js/sys
syrusakbary Feb 11, 2023
6ede6a1
Unified api for native in js/sys
syrusakbary Feb 11, 2023
7d9ed6b
Unified typed_function in js/sys
syrusakbary Feb 11, 2023
6c6f070
Remove unnecessary compiler flags in wasmer crate
syrusakbary Feb 11, 2023
9f83b84
Moved js-specific functions to as_js module
syrusakbary Feb 11, 2023
4eaddb5
Unify Imports in wasmer js/sys
syrusakbary Feb 11, 2023
b9d2118
Make instance more uniform
syrusakbary Feb 11, 2023
f8176e3
Make js conversion uniform
syrusakbary Feb 12, 2023
58f27ae
Unify InstantiationError
syrusakbary Feb 12, 2023
3d56b6b
Unify Instance in js/sys
syrusakbary Feb 12, 2023
f72220e
Removed repeated comments
syrusakbary Feb 12, 2023
9225560
Merge branch 'master' into std-api
syrusakbary Feb 12, 2023
1d85b30
Moved reexports one level down
syrusakbary Feb 12, 2023
db6430c
Unified Extern in js/sys
syrusakbary Feb 12, 2023
fcad0fa
Make AsJs work with unified Instance
syrusakbary Feb 12, 2023
3b0ee71
Created vm module
syrusakbary Feb 14, 2023
1966af3
Unified extern::Table in js/sys
syrusakbary Feb 14, 2023
4c0bd5c
Unified Memory in js/sys
syrusakbary Feb 15, 2023
4c0399f
Unified global into js/sys
syrusakbary Feb 15, 2023
7bf1bd1
Fixed as_js for global
syrusakbary Feb 15, 2023
3e7552a
Fix global
syrusakbary Feb 15, 2023
e9b8868
Moved ExternRef and FuncRef into crate::vm for unification
syrusakbary Feb 15, 2023
cd4cb7a
Make function internal APIs closer
syrusakbary Feb 15, 2023
b4c190b
Unified Function into js/sys
syrusakbary Feb 15, 2023
95e351a
Merge branch 'master' into std-api
syrusakbary Feb 15, 2023
c45864a
Universalize MemoryView in js/sys
syrusakbary Feb 16, 2023
99d3f84
Simplified errors
syrusakbary Feb 16, 2023
745a06b
Improved module imports
syrusakbary Feb 16, 2023
5faa036
Improved module imports
syrusakbary Feb 16, 2023
e9a4ba4
Fix linting
syrusakbary Feb 16, 2023
c85b2bf
Implement PartialEq for all externals
syrusakbary Feb 17, 2023
db6dd42
Optimized ModuleInfo usage
syrusakbary Feb 17, 2023
d85297f
Fix linting and compilation
syrusakbary Feb 17, 2023
b61e2a1
Added equality to instance, Module and Exports
syrusakbary Feb 17, 2023
bb9ac04
Make API compatible changes with wasmer-js
syrusakbary Feb 17, 2023
ae6c3ba
Merge branch 'master' into std-api
syrusakbary Feb 18, 2023
1f64ba1
Wrap engine
syrusakbary Feb 24, 2023
9ed86ad
Make cli compilable again
syrusakbary Feb 24, 2023
826d321
Merge branch 'master' into std-api
syrusakbary Feb 24, 2023
a6ebf78
Verious fixes for the wasix merge
syrusakbary Feb 24, 2023
5bdf3d4
Fixed unimplemented
syrusakbary Feb 24, 2023
93def03
Address most of the comments
syrusakbary Feb 25, 2023
fe72a5a
Merge branch 'master' into std-api
syrusakbary Feb 28, 2023
09427c3
Make automatically the trait Into<Engine> conversions
syrusakbary Feb 28, 2023
e26a784
Remove unused code
syrusakbary Feb 28, 2023
f342ebe
Fix serialization
syrusakbary Feb 28, 2023
c04e536
Fix code
syrusakbary Feb 28, 2023
bef5f9e
Merge branch 'master' into std-api
syrusakbary Feb 28, 2023
a0e11bf
Fixed linting
syrusakbary Feb 28, 2023
b47cc83
Removed unsafe js intos
syrusakbary Feb 28, 2023
d5c7b8a
Update lib/api/src/engine.rs
syrusakbary Feb 28, 2023
4fb02b8
Update lib/api/src/engine.rs
syrusakbary Feb 28, 2023
fc64202
Use AtomicUsize instead of AtomicU64
syrusakbary Feb 28, 2023
770bb40
Fixed missing memory export in WASI as the API got simplified
syrusakbary Feb 28, 2023
4973be5
Refactored common WasmTypeList implementations
syrusakbary Mar 1, 2023
4629a32
Use js-generic instead of generic for the js engine
syrusakbary Mar 1, 2023
2511d65
Merge branch 'master' into wasix-fixes-for-web
john-sharratt Mar 2, 2023
cbdf356
Merge branch 'std-api' into wasix-fixes-for-web-with-unification
syrusakbary Mar 2, 2023
1c3f966
Merge branch 'master' into std-api
syrusakbary Mar 2, 2023
9719630
Improved linting
syrusakbary Mar 2, 2023
7440c42
Trying to add support for BigInt
syrusakbary Mar 2, 2023
61ca01d
Fix linting errors
syrusakbary Mar 2, 2023
01dc38e
Improved BigInt support
syrusakbary Mar 2, 2023
69f5ec3
Fixed missing api
syrusakbary Mar 2, 2023
8cbd9b6
Added extra comments on what can be Send/Sync
syrusakbary Mar 3, 2023
acd0f1f
Merge branch 'master' into std-api
syrusakbary Mar 6, 2023
07eb2f6
Improved mem_access
syrusakbary Mar 7, 2023
0a31d66
Make WasmRef/WasmSlice access uniform
syrusakbary Mar 7, 2023
e61c206
Merge branch 'master' into std-api
syrusakbary Mar 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/imports_function_env_global.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

let global_count = data.g_counter.get(&mut storemut).unwrap_i32();
data.g_counter
.set(&mut storemut, Value::I32(global_count + add));
.set(&mut storemut, Value::I32(global_count + add))
.unwrap();

*counter_ref += add;
*counter_ref
Expand Down
10 changes: 7 additions & 3 deletions examples/tunables_limit_memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ use std::ptr::NonNull;
use wasmer::{
imports,
vm::{self, MemoryError, MemoryStyle, TableStyle, VMMemoryDefinition, VMTableDefinition},
wat2wasm, BaseTunables, Instance, Memory, MemoryType, Module, Pages, Store, TableType, Target,
Tunables,
wat2wasm, BaseTunables, Engine, Instance, Memory, MemoryType, Module, Pages, Store, TableType,
Target, Tunables,
};
use wasmer_compiler_cranelift::Cranelift;
// This is to be able to set the tunables
use wasmer::NativeEngineExt;

/// A custom tunables that allows you to set a memory limit.
///
Expand Down Expand Up @@ -140,9 +142,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Here is where the fun begins
let base = BaseTunables::for_target(&Target::default());
let tunables = LimitingTunables::new(base, Pages(24));
let mut engine: Engine = compiler.into();
engine.set_tunables(tunables);

// Create a store, that holds the engine and our custom tunables
let mut store = Store::new_with_tunables(compiler, tunables);
let mut store = Store::new(engine);

println!("Compiling module...");
let module = Module::new(&store, wasm_bytes)?;
Expand Down
1 change: 1 addition & 0 deletions lib/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ core = ["hashbrown"]
sys = [
"wasmer-compiler/translator",
"wasmer-compiler/compiler",
"std",
]
sys-default = ["sys", "wat", "cranelift"]
# - Compilers.
Expand Down
92 changes: 92 additions & 0 deletions lib/api/src/engine.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
use core::ops::Deref;

#[cfg(feature = "sys")]
use crate::sys::engine as engine_imp;
#[cfg(feature = "sys")]
pub(crate) use crate::sys::engine::default_engine;

#[cfg(feature = "js")]
use crate::js::engine as engine_imp;
#[cfg(feature = "js")]
pub(crate) use crate::js::engine::default_engine;

/// The engine type
#[derive(Clone, Debug)]
pub struct Engine(pub(crate) engine_imp::Engine);

impl Engine {
#[deprecated(
since = "4.0.0",
syrusakbary marked this conversation as resolved.
Show resolved Hide resolved
note = "engine.cloned() has been deprecated in favor of engine.clone()"
)]
/// Returns the [`Tunables`].
syrusakbary marked this conversation as resolved.
Show resolved Hide resolved
pub fn cloned(&self) -> Self {
self.clone()
}

/// Returns the deterministic id of this engine
pub fn deterministic_id(&self) -> &str {
self.0.deterministic_id()
}
}

impl AsEngineRef for Engine {
fn as_engine_ref(&self) -> EngineRef {
EngineRef { inner: self }
}
}

impl Default for Engine {
fn default() -> Self {
Engine(default_engine())
}
}

impl<T: Into<engine_imp::Engine>> From<T> for Engine {
fn from(t: T) -> Self {
Self(t.into())
}
}

/// A temporary handle to an [`Engine`]
/// EngineRef can be used to build a [`Module`][wasmer::Module]
/// It can be created directly with an [`Engine`]
/// Or from anything implementing [`AsEngineRef`]
/// like from [`Store`][wasmer::Store] typicaly.
pub struct EngineRef<'a> {
/// The inner engine
pub(crate) inner: &'a Engine,
}

impl<'a> EngineRef<'a> {
/// Get inner [`Engine`]
pub fn engine(&self) -> &Engine {
self.inner
}
/// Create an EngineRef from an Engine
pub fn new(engine: &'a Engine) -> Self {
EngineRef { inner: engine }
}
}

/// Helper trait for a value that is convertible to a [`EngineRef`].
pub trait AsEngineRef {
/// Returns a `EngineRef` pointing to the underlying context.
fn as_engine_ref(&self) -> EngineRef<'_>;
}

impl AsEngineRef for EngineRef<'_> {
fn as_engine_ref(&self) -> EngineRef<'_> {
EngineRef { inner: self.inner }
}
}

impl<P> AsEngineRef for P
where
P: Deref,
P::Target: AsEngineRef,
{
fn as_engine_ref(&self) -> EngineRef<'_> {
(**self).as_engine_ref()
}
}
47 changes: 47 additions & 0 deletions lib/api/src/errors.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#[cfg(feature = "js")]
pub use crate::js::errors::{LinkError, RuntimeError};
use thiserror::Error;
#[cfg(feature = "sys")]
pub use wasmer_compiler::{LinkError, RuntimeError};

/// An error while instantiating a module.
///
/// This is not a common WebAssembly error, however
/// we need to differentiate from a `LinkError` (an error
/// that happens while linking, on instantiation), a
/// Trap that occurs when calling the WebAssembly module
/// start function, and an error when initializing the user's
/// host environments.
#[derive(Debug)]
#[cfg_attr(feature = "std", derive(Error))]
pub enum InstantiationError {
/// A linking ocurred during instantiation.
#[cfg_attr(feature = "std", error(transparent))]
Link(LinkError),

/// A runtime error occured while invoking the start function
#[cfg_attr(feature = "std", error(transparent))]
Start(RuntimeError),

/// The module was compiled with a CPU feature that is not available on
/// the current host.
#[cfg_attr(feature = "std", error("missing required CPU features: {0:?}"))]
CpuFeature(String),

/// Import from a different [`Store`].
/// This error occurs when an import from a different store is used.
#[cfg_attr(feature = "std", error("cannot mix imports from different stores"))]
DifferentStores,

/// Import from a different Store.
/// This error occurs when an import from a different store is used.
#[cfg_attr(feature = "std", error("incorrect OS or architecture"))]
DifferentArchOS,
}

#[cfg(feature = "core")]
impl std::fmt::Display for InstantiationError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "InstantiationError")
}
}
12 changes: 3 additions & 9 deletions lib/api/src/sys/exports.rs → lib/api/src/exports.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use super::store::AsStoreRef;
use crate::sys::externals::{Extern, Function, Global, Memory, Table};
use crate::sys::native::TypedFunction;
use crate::sys::WasmTypeList;
use crate::store::AsStoreRef;
use crate::{Extern, Function, Global, Memory, Table, TypedFunction, WasmTypeList};
use indexmap::IndexMap;
use std::fmt;
use std::iter::{ExactSizeIterator, FromIterator};
Expand All @@ -18,9 +16,7 @@ use thiserror::Error;
///
/// ```should_panic
/// # use wasmer::{imports, wat2wasm, Function, Instance, Module, Store, Type, Value, ExportError};
/// # use wasmer::FunctionEnv;
/// # let mut store = Store::default();
/// # let env = FunctionEnv::new(&mut store, ());
/// # let wasm_bytes = wat2wasm(r#"
/// # (module
/// # (global $one (export "glob") f32 (f32.const 1)))
Expand All @@ -37,9 +33,7 @@ use thiserror::Error;
///
/// ```should_panic
/// # use wasmer::{imports, wat2wasm, Function, Instance, Module, Store, Type, Value, ExportError};
/// # use wasmer::FunctionEnv;
/// # let mut store = Store::default();
/// # let env = FunctionEnv::new(&mut store, ());
/// # let wasm_bytes = wat2wasm("(module)".as_bytes()).unwrap();
/// # let module = Module::new(&store, wasm_bytes).unwrap();
/// # let import_object = imports! {};
Expand All @@ -63,7 +57,7 @@ pub enum ExportError {
/// the types of instances.
///
/// TODO: add examples of using exports
#[derive(Clone, Default)]
#[derive(Clone, Default, PartialEq, Eq)]
pub struct Exports {
map: IndexMap<String, Extern>,
}
Expand Down
57 changes: 57 additions & 0 deletions lib/api/src/extern_ref.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
use std::any::Any;

use crate::store::{AsStoreMut, AsStoreRef};

#[cfg(feature = "js")]
use crate::js::extern_ref as extern_ref_imp;
#[cfg(feature = "sys")]
use crate::sys::extern_ref as extern_ref_imp;
use crate::vm::VMExternRef;

#[derive(Debug, Clone)]
#[repr(transparent)]
/// An opaque reference to some data. This reference can be passed through Wasm.
pub struct ExternRef(pub(crate) extern_ref_imp::ExternRef);

impl ExternRef {
/// Make a new extern reference
pub fn new<T>(store: &mut impl AsStoreMut, value: T) -> Self
where
T: Any + Send + Sync + 'static + Sized,
{
ExternRef(extern_ref_imp::ExternRef::new(store, value))
}

/// Try to downcast to the given value.
pub fn downcast<'a, T>(&self, store: &'a impl AsStoreRef) -> Option<&'a T>
where
T: Any + Send + Sync + 'static + Sized,
{
self.0.downcast(store)
}

pub(crate) fn vm_externref(&self) -> VMExternRef {
self.0.vm_externref()
}

pub(crate) unsafe fn from_vm_externref(
store: &mut impl AsStoreMut,
vm_externref: VMExternRef,
) -> Self {
ExternRef(extern_ref_imp::ExternRef::from_vm_externref(
store,
vm_externref,
))
}

/// Checks whether this `ExternRef` can be used with the given context.
///
/// Primitive (`i32`, `i64`, etc) and null funcref/externref values are not
/// tied to a context and can be freely shared between contexts.
///
/// Externref and funcref values are tied to a context and can only be used
/// with that context.
pub fn is_from_store(&self, store: &impl AsStoreRef) -> bool {
self.0.is_from_store(store)
}
}
Loading