Move Webassembly objects to Store and remove Context

Co-authored-by: ptitSeb <sebastien.chev@gmail.com>
Co-authored-by: Manos Pitsidianakis <manos@wasmer.io>
This commit is contained in:
Syrus Akbary
2022-07-08 15:33:29 -07:00
committed by Manos Pitsidianakis
parent b5ae6399ce
commit a419ccdf52
214 changed files with 5800 additions and 5759 deletions

View File

@ -18,8 +18,8 @@
//! Ready?
use wasmer::{
imports, wat2wasm, Context, ContextMut, Function, FunctionType, Instance, Module, Store, Type,
TypedFunction, Value,
imports, wat2wasm, Function, FunctionEnv, FunctionEnvMut, FunctionType, Instance, Module,
Store, Type, TypedFunction, Value,
};
use wasmer_compiler::Universal;
use wasmer_compiler_cranelift::Cranelift;
@ -45,8 +45,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Note that we don't need to specify the engine/compiler if we want to use
// the default provided by Wasmer.
// You can use `Store::default()` for that.
let store = Store::new_with_engine(&Universal::new(Cranelift::default()).engine());
let mut ctx = Context::new(&store, ());
let mut store = Store::new_with_engine(&Universal::new(Cranelift::default()).engine());
let mut ctx1 = FunctionEnv::new(&mut store, ());
struct MyEnv;
let mut ctx2 = FunctionEnv::new(&mut store, MyEnv {});
println!("Compiling module...");
// Let's compile the Wasm module.
@ -54,17 +56,22 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Create the functions
let multiply_dynamic_signature = FunctionType::new(vec![Type::I32], vec![Type::I32]);
let multiply_dynamic = Function::new(&mut ctx, &multiply_dynamic_signature, |_ctx, args| {
println!("Calling `multiply_dynamic`...");
let multiply_dynamic = Function::new(
&mut store,
&ctx1,
&multiply_dynamic_signature,
|_ctx, args| {
println!("Calling `multiply_dynamic`...");
let result = args[0].unwrap_i32() * 2;
let result = args[0].unwrap_i32() * 2;
println!("Result of `multiply_dynamic`: {:?}", result);
println!("Result of `multiply_dynamic`: {:?}", result);
Ok(vec![Value::I32(result)])
});
Ok(vec![Value::I32(result)])
},
);
fn multiply(_ctx: ContextMut<()>, a: i32) -> i32 {
fn multiply(_ctx: FunctionEnvMut<MyEnv>, a: i32) -> i32 {
println!("Calling `multiply_native`...");
let result = a * 3;
@ -72,7 +79,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
result
}
let multiply_native = Function::new_native(&mut ctx, multiply);
let multiply_native = Function::new_native(&mut store, &ctx2, multiply);
// Create an import object.
let import_object = imports! {
@ -84,18 +91,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
println!("Instantiating module...");
// Let's instantiate the Wasm module.
let instance = Instance::new(&mut ctx, &module, &import_object)?;
let instance = Instance::new(&mut store, &module, &import_object)?;
// Here we go.
//
// The Wasm module exports a function called `sum`. Let's get it.
let sum: TypedFunction<(i32, i32), i32> =
instance.exports.get_function("sum")?.native(&mut ctx)?;
instance.exports.get_function("sum")?.native(&mut store)?;
println!("Calling `sum` function...");
// Let's call the `sum` exported function. It will call each
// of the imported functions.
let result = sum.call(&mut ctx, 1, 2)?;
let result = sum.call(&mut store, 1, 2)?;
println!("Results of `sum`: {:?}", result);
assert_eq!(result, 8);