9364eb1d98
* Compute instance exports on demand. Instead having instances eagerly compute a Vec of Externs, and bumping the refcount for each Extern, compute Externs on demand. This also enables `Instance::get_export` to avoid doing a linear search. This also means that the closure returned by `get0` and friends now holds an `InstanceHandle` to dynamically hold the instance live rather than being scoped to a lifetime. * Compute module imports and exports on demand too. And compute Extern::ty on demand too. * Add a utility function for computing an ExternType. * Add a utility function for looking up a function's signature. * Add a utility function for computing the ValType of a Global. * Rename wasmtime_environ::Export to EntityIndex. This helps differentiate it from other Export types in the tree, and describes what it is. * Fix a typo in a comment. * Simplify module imports and exports. * Make `Instance::exports` return the export names. This significantly simplifies the public API, as it's relatively common to need the names, and this avoids the need to do a zip with `Module::exports`. This also changes `ImportType` and `ExportType` to have public members instead of private members and accessors, as I find that simplifies the usage particularly in cases where there are temporary instances. * Remove `Instance::module`. This doesn't quite remove `Instance`'s `module` member, it gets a step closer. * Use a InstanceHandle utility function. * Don't consume self in the `Func::get*` methods. Instead, just create a closure containing the instance handle and the export for them to call. * Use `ExactSizeIterator` to avoid needing separate `num_*` methods. * Rename `Extern::func()` etc. to `into_func()` etc. * Revise examples to avoid using `nth`. * Add convenience methods to instance for getting specific extern types. * Use the convenience functions in more tests and examples. * Avoid cloning strings for `ImportType` and `ExportType`. * Remove more obviated clone() calls. * Simplify `Func`'s closure state. * Make wasmtime::Export's fields private. This makes them more consistent with ExportType. * Fix compilation error. * Make a lifetime parameter explicit, and use better lifetime names. Instead of 'me, use 'instance and 'module to make it clear what the lifetime is. * More lifetime cleanups.
97 lines
2.6 KiB
Rust
97 lines
2.6 KiB
Rust
use crate::{handle_result, wasmtime_error_t};
|
|
use crate::{wasm_extern_t, wasm_globaltype_t, wasm_store_t, wasm_val_t, ExternHost};
|
|
use std::ptr;
|
|
use wasmtime::{Global, HostRef};
|
|
|
|
#[derive(Clone)]
|
|
#[repr(transparent)]
|
|
pub struct wasm_global_t {
|
|
ext: wasm_extern_t,
|
|
}
|
|
|
|
wasmtime_c_api_macros::declare_ref!(wasm_global_t);
|
|
|
|
impl wasm_global_t {
|
|
pub(crate) fn try_from(e: &wasm_extern_t) -> Option<&wasm_global_t> {
|
|
match &e.which {
|
|
ExternHost::Global(_) => Some(unsafe { &*(e as *const _ as *const _) }),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn global(&self) -> &HostRef<Global> {
|
|
match &self.ext.which {
|
|
ExternHost::Global(g) => g,
|
|
_ => unsafe { std::hint::unreachable_unchecked() },
|
|
}
|
|
}
|
|
|
|
fn anyref(&self) -> wasmtime::AnyRef {
|
|
self.global().anyref()
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_global_new(
|
|
store: &wasm_store_t,
|
|
gt: &wasm_globaltype_t,
|
|
val: &wasm_val_t,
|
|
) -> Option<Box<wasm_global_t>> {
|
|
let mut global = ptr::null_mut();
|
|
match wasmtime_global_new(store, gt, val, &mut global) {
|
|
Some(_err) => None,
|
|
None => {
|
|
assert!(!global.is_null());
|
|
Some(unsafe { Box::from_raw(global) })
|
|
}
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasmtime_global_new(
|
|
store: &wasm_store_t,
|
|
gt: &wasm_globaltype_t,
|
|
val: &wasm_val_t,
|
|
ret: &mut *mut wasm_global_t,
|
|
) -> Option<Box<wasmtime_error_t>> {
|
|
let global = Global::new(&store.store.borrow(), gt.ty().ty.clone(), val.val());
|
|
handle_result(global, |global| {
|
|
*ret = Box::into_raw(Box::new(wasm_global_t {
|
|
ext: wasm_extern_t {
|
|
which: ExternHost::Global(HostRef::new(global)),
|
|
},
|
|
}));
|
|
})
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_global_as_extern(g: &wasm_global_t) -> &wasm_extern_t {
|
|
&g.ext
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_global_type(g: &wasm_global_t) -> Box<wasm_globaltype_t> {
|
|
let globaltype = g.global().borrow().ty();
|
|
Box::new(wasm_globaltype_t::new(globaltype))
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_global_get(g: &wasm_global_t, out: &mut wasm_val_t) {
|
|
out.set(g.global().borrow().get());
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_global_set(g: &wasm_global_t, val: &wasm_val_t) {
|
|
let result = g.global().borrow().set(val.val());
|
|
// FIXME(WebAssembly/wasm-c-api#131) should communicate the error here
|
|
drop(result);
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasmtime_global_set(
|
|
g: &wasm_global_t,
|
|
val: &wasm_val_t,
|
|
) -> Option<Box<wasmtime_error_t>> {
|
|
handle_result(g.global().borrow().set(val.val()), |()| {})
|
|
}
|