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.
121 lines
2.9 KiB
Rust
121 lines
2.9 KiB
Rust
use crate::wasm_ref_t;
|
|
use crate::{wasm_extern_t, wasm_store_t, wasm_tabletype_t, ExternHost};
|
|
use std::ptr;
|
|
use wasmtime::{AnyRef, HostRef, Table, Val};
|
|
|
|
#[derive(Clone)]
|
|
#[repr(transparent)]
|
|
pub struct wasm_table_t {
|
|
ext: wasm_extern_t,
|
|
}
|
|
|
|
wasmtime_c_api_macros::declare_ref!(wasm_table_t);
|
|
|
|
pub type wasm_table_size_t = u32;
|
|
|
|
impl wasm_table_t {
|
|
pub(crate) fn try_from(e: &wasm_extern_t) -> Option<&wasm_table_t> {
|
|
match &e.which {
|
|
ExternHost::Table(_) => Some(unsafe { &*(e as *const _ as *const _) }),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn table(&self) -> &HostRef<Table> {
|
|
match &self.ext.which {
|
|
ExternHost::Table(t) => t,
|
|
_ => unsafe { std::hint::unreachable_unchecked() },
|
|
}
|
|
}
|
|
|
|
fn anyref(&self) -> wasmtime::AnyRef {
|
|
self.table().anyref()
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub unsafe extern "C" fn wasm_table_new(
|
|
store: &wasm_store_t,
|
|
tt: &wasm_tabletype_t,
|
|
init: *mut wasm_ref_t,
|
|
) -> Option<Box<wasm_table_t>> {
|
|
let init: Val = if !init.is_null() {
|
|
Box::from_raw(init).r.into()
|
|
} else {
|
|
Val::AnyRef(AnyRef::Null)
|
|
};
|
|
let table = Table::new(&store.store.borrow(), tt.ty().ty.clone(), init).ok()?;
|
|
Some(Box::new(wasm_table_t {
|
|
ext: wasm_extern_t {
|
|
which: ExternHost::Table(HostRef::new(table)),
|
|
},
|
|
}))
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_table_type(t: &wasm_table_t) -> Box<wasm_tabletype_t> {
|
|
let ty = t.table().borrow().ty();
|
|
Box::new(wasm_tabletype_t::new(ty))
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub unsafe extern "C" fn wasm_table_get(
|
|
t: &wasm_table_t,
|
|
index: wasm_table_size_t,
|
|
) -> *mut wasm_ref_t {
|
|
match t.table().borrow().get(index) {
|
|
Some(val) => into_funcref(val),
|
|
None => into_funcref(Val::AnyRef(AnyRef::Null)),
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub unsafe extern "C" fn wasm_table_set(
|
|
t: &wasm_table_t,
|
|
index: wasm_table_size_t,
|
|
r: *mut wasm_ref_t,
|
|
) -> bool {
|
|
let val = from_funcref(r);
|
|
t.table().borrow().set(index, val).is_ok()
|
|
}
|
|
|
|
unsafe fn into_funcref(val: Val) -> *mut wasm_ref_t {
|
|
if let Val::AnyRef(AnyRef::Null) = val {
|
|
return ptr::null_mut();
|
|
}
|
|
let anyref = match val.anyref() {
|
|
Some(anyref) => anyref,
|
|
None => return ptr::null_mut(),
|
|
};
|
|
let r = Box::new(wasm_ref_t { r: anyref });
|
|
Box::into_raw(r)
|
|
}
|
|
|
|
unsafe fn from_funcref(r: *mut wasm_ref_t) -> Val {
|
|
if !r.is_null() {
|
|
Box::from_raw(r).r.into()
|
|
} else {
|
|
Val::AnyRef(AnyRef::Null)
|
|
}
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_table_size(t: &wasm_table_t) -> wasm_table_size_t {
|
|
t.table().borrow().size()
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub unsafe extern "C" fn wasm_table_grow(
|
|
t: &wasm_table_t,
|
|
delta: wasm_table_size_t,
|
|
init: *mut wasm_ref_t,
|
|
) -> bool {
|
|
let init = from_funcref(init);
|
|
t.table().borrow().grow(delta, init).is_ok()
|
|
}
|
|
|
|
#[no_mangle]
|
|
pub extern "C" fn wasm_table_as_extern(t: &wasm_table_t) -> &wasm_extern_t {
|
|
&t.ext
|
|
}
|