summaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/cli/src/bin.rs2
-rw-r--r--crates/tinywasm/src/imports.rs70
-rw-r--r--crates/tinywasm/src/instance.rs7
-rw-r--r--crates/tinywasm/src/lib.rs5
-rw-r--r--crates/tinywasm/src/module.rs10
-rw-r--r--crates/tinywasm/src/store.rs50
-rw-r--r--crates/tinywasm/tests/generated/mvp.csv2
-rw-r--r--crates/tinywasm/tests/generated/progress-mvp.svg8
-rw-r--r--crates/tinywasm/tests/testsuite/run.rs15
-rw-r--r--crates/tinywasm/tests/testsuite/util.rs3
-rw-r--r--crates/types/src/lib.rs13
11 files changed, 141 insertions, 44 deletions
diff --git a/crates/cli/src/bin.rs b/crates/cli/src/bin.rs
index fc680b1..c8ab379 100644
--- a/crates/cli/src/bin.rs
+++ b/crates/cli/src/bin.rs
@@ -114,7 +114,7 @@ fn main() -> Result<()> {
fn run(module: Module, func: Option<String>, args: Vec<WasmValue>) -> Result<()> {
let mut store = tinywasm::Store::default();
- let instance = module.instantiate(&mut store)?;
+ let instance = module.instantiate(&mut store, None)?;
if let Some(func) = func {
let func = instance.exported_func_by_name(&store, &func)?;
diff --git a/crates/tinywasm/src/imports.rs b/crates/tinywasm/src/imports.rs
new file mode 100644
index 0000000..99ebc4b
--- /dev/null
+++ b/crates/tinywasm/src/imports.rs
@@ -0,0 +1,70 @@
+use crate::Result;
+use alloc::{
+ collections::BTreeMap,
+ string::{String, ToString},
+};
+use tinywasm_types::{Global, GlobalType, WasmValue};
+
+#[derive(Debug)]
+#[non_exhaustive]
+/// An external value
+pub enum Extern {
+ /// A global value
+ Global(Global),
+ // Func(HostFunc),
+ // Table(Table),
+}
+
+impl Extern {
+ /// Create a new global import
+ pub fn global(val: WasmValue, mutable: bool) -> Self {
+ Self::Global(Global {
+ ty: GlobalType {
+ ty: val.val_type(),
+ mutable,
+ },
+ init: val.const_instr(),
+ })
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Ord, PartialOrd, Hash)]
+/// Name of an import
+pub struct ExternName {
+ module: String,
+ name: String,
+}
+
+#[derive(Debug, Default)]
+/// Imports for a module instance
+pub struct Imports {
+ values: BTreeMap<ExternName, Extern>,
+}
+
+impl Imports {
+ /// Create a new empty import set
+ pub fn new() -> Self {
+ Imports {
+ values: BTreeMap::new(),
+ }
+ }
+
+ /// Define an import
+ pub fn define(&mut self, module: &str, name: &str, value: Extern) -> Result<&mut Self> {
+ self.values.insert(
+ ExternName {
+ module: module.to_string(),
+ name: name.to_string(),
+ },
+ value,
+ );
+ Ok(self)
+ }
+
+ pub(crate) fn get(&self, module: &str, name: &str) -> Option<&Extern> {
+ self.values.get(&ExternName {
+ module: module.to_string(),
+ name: name.to_string(),
+ })
+ }
+}
diff --git a/crates/tinywasm/src/instance.rs b/crates/tinywasm/src/instance.rs
index 22f3112..55614e5 100644
--- a/crates/tinywasm/src/instance.rs
+++ b/crates/tinywasm/src/instance.rs
@@ -5,7 +5,7 @@ use tinywasm_types::{
use crate::{
func::{FromWasmValueTuple, IntoWasmValueTuple},
- Error, ExportInstance, FuncHandle, Module, Result, Store, TypedFuncHandle,
+ Error, ExportInstance, FuncHandle, Imports, Module, Result, Store, TypedFuncHandle,
};
/// A WebAssembly Module Instance
@@ -36,14 +36,15 @@ pub(crate) struct ModuleInstanceInner {
impl ModuleInstance {
/// Instantiate the module in the given store
- pub fn instantiate(store: &mut Store, module: Module) -> Result<Self> {
+ pub fn instantiate(store: &mut Store, module: Module, imports: Option<Imports>) -> Result<Self> {
let idx = store.next_module_instance_idx();
+ let imports = imports.unwrap_or_default();
let func_addrs = store.add_funcs(module.data.funcs.into(), idx);
let table_addrs = store.add_tables(module.data.table_types.into(), idx);
let mem_addrs = store.add_mems(module.data.memory_types.into(), idx);
- let global_addrs = store.add_globals(module.data.globals.into(), &module.data.imports, idx);
+ let global_addrs = store.add_globals(module.data.globals.into(), &module.data.imports, &imports, idx)?;
let elem_addrs = store.add_elems(module.data.elements.into(), idx);
let data_addrs = store.add_datas(module.data.data.into(), idx);
diff --git a/crates/tinywasm/src/lib.rs b/crates/tinywasm/src/lib.rs
index ec48acf..0a2d875 100644
--- a/crates/tinywasm/src/lib.rs
+++ b/crates/tinywasm/src/lib.rs
@@ -38,7 +38,7 @@
//! // This will allocate the module and its globals into the store
//! // and execute the module's start function.
//! // Every ModuleInstance has its own ID space for functions, globals, etc.
-//! let instance = module.instantiate(&mut store)?;
+//! let instance = module.instantiate(&mut store, None)?;
//!
//! // Get a typed handle to the exported "add" function
//! // Alternatively, you can use `instance.get_func` to get an untyped handle
@@ -94,6 +94,9 @@ pub use export::ExportInstance;
mod func;
pub use func::{FuncHandle, TypedFuncHandle};
+mod imports;
+pub use imports::*;
+
mod runtime;
pub use runtime::*;
diff --git a/crates/tinywasm/src/module.rs b/crates/tinywasm/src/module.rs
index d6799f3..6dfca42 100644
--- a/crates/tinywasm/src/module.rs
+++ b/crates/tinywasm/src/module.rs
@@ -1,6 +1,6 @@
use tinywasm_types::TinyWasmModule;
-use crate::{ModuleInstance, Result, Store};
+use crate::{Imports, ModuleInstance, Result, Store};
#[derive(Debug)]
/// A WebAssembly Module
@@ -53,12 +53,8 @@ impl Module {
/// If you want to run the start function yourself, use `ModuleInstance::instantiate`
///
/// See <https://webassembly.github.io/spec/core/exec/modules.html#exec-instantiation>
- pub fn instantiate(
- self,
- store: &mut Store,
- // imports: Option<()>,
- ) -> Result<ModuleInstance> {
- let instance = ModuleInstance::instantiate(store, self)?;
+ pub fn instantiate(self, store: &mut Store, imports: Option<Imports>) -> Result<ModuleInstance> {
+ let instance = ModuleInstance::instantiate(store, self, imports)?;
// TODO: this currently panics if theres no start fn
// let _ = instance.start(store)?;
diff --git a/crates/tinywasm/src/store.rs b/crates/tinywasm/src/store.rs
index 1632640..845d718 100644
--- a/crates/tinywasm/src/store.rs
+++ b/crates/tinywasm/src/store.rs
@@ -11,7 +11,7 @@ use tinywasm_types::{
use crate::{
runtime::{self, DefaultRuntime},
- Error, ModuleInstance, RawWasmValue, Result,
+ Error, Extern, Imports, ModuleInstance, RawWasmValue, Result,
};
// global store id counter
@@ -144,36 +144,42 @@ impl Store {
pub(crate) fn add_globals(
&mut self,
globals: Vec<Global>,
- imports: &[Import],
+ wasm_imports: &[Import],
+ user_imports: &Imports,
idx: ModuleInstanceAddr,
- ) -> Vec<Addr> {
- let global_count = self.data.globals.len();
- let mut global_addrs = Vec::with_capacity(global_count);
-
+ ) -> Result<Vec<Addr>> {
// TODO: initialize imported globals
- let imported_globals = imports
+ let imported_globals = wasm_imports
.iter()
.filter_map(|import| match &import.kind {
- tinywasm_types::ImportKind::Global(t) => Some(t),
+ tinywasm_types::ImportKind::Global(_) => Some(import),
_ => None,
})
- .collect::<Vec<_>>();
-
- for (i, global) in imported_globals.into_iter().enumerate() {
- log::debug!("imported global: {:?}", global);
- self.data.globals.push(Rc::new(RefCell::new(GlobalInstance::new(
- global.clone(),
- global.ty.default_value().into(),
- idx,
- ))));
- global_addrs.push((i + global_count) as Addr);
- }
+ .map(|import| {
+ let Some(global) = user_imports.get(&import.module, &import.name) else {
+ return Err(Error::Other(format!(
+ "global import not found for {}::{}",
+ import.module, import.name
+ )));
+ };
+ match global {
+ Extern::Global(global) => Ok(global),
+ _ => Err(Error::Other(format!(
+ "expected global import for {}::{}",
+ import.module, import.name
+ ))),
+ }
+ })
+ .collect::<Result<Vec<_>>>()?;
let global_count = self.data.globals.len();
+ let mut global_addrs = Vec::with_capacity(global_count);
+
log::debug!("globals: {:?}", globals);
- for (i, global) in globals.into_iter().enumerate() {
- // TODO: initialize globals
+ let globals = globals.into_iter();
+ let iterator = imported_globals.into_iter().chain(globals.as_ref());
+ for (i, global) in iterator.enumerate() {
use tinywasm_types::ConstInstruction::*;
let val = match global.init {
F32Const(f) => RawWasmValue::from(f),
@@ -197,7 +203,7 @@ impl Store {
global_addrs.push((i + global_count) as Addr);
}
log::debug!("global_addrs: {:?}", global_addrs);
- global_addrs
+ Ok(global_addrs)
}
/// Add elements to the store, returning their addresses in the store
diff --git a/crates/tinywasm/tests/generated/mvp.csv b/crates/tinywasm/tests/generated/mvp.csv
index 0f0f65a..d39acb9 100644
--- a/crates/tinywasm/tests/generated/mvp.csv
+++ b/crates/tinywasm/tests/generated/mvp.csv
@@ -2,4 +2,4 @@
0.0.4,9258,10909,[{"name":"address.wast","passed":0,"failed":54},{"name":"align.wast","passed":0,"failed":109},{"name":"binary-leb128.wast","passed":66,"failed":25},{"name":"binary.wast","passed":104,"failed":8},{"name":"block.wast","passed":0,"failed":171},{"name":"br.wast","passed":0,"failed":21},{"name":"br_if.wast","passed":0,"failed":30},{"name":"br_table.wast","passed":0,"failed":25},{"name":"call.wast","passed":0,"failed":22},{"name":"call_indirect.wast","passed":0,"failed":56},{"name":"comments.wast","passed":4,"failed":4},{"name":"const.wast","passed":702,"failed":76},{"name":"conversions.wast","passed":0,"failed":93},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":0,"failed":61},{"name":"elem.wast","passed":0,"failed":76},{"name":"endianness.wast","passed":0,"failed":1},{"name":"exports.wast","passed":21,"failed":73},{"name":"f32.wast","passed":1005,"failed":1509},{"name":"f32_bitwise.wast","passed":1,"failed":363},{"name":"f32_cmp.wast","passed":2401,"failed":6},{"name":"f64.wast","passed":1005,"failed":1509},{"name":"f64_bitwise.wast","passed":1,"failed":363},{"name":"f64_cmp.wast","passed":2401,"failed":6},{"name":"fac.wast","passed":0,"failed":2},{"name":"float_exprs.wast","passed":269,"failed":591},{"name":"float_literals.wast","passed":34,"failed":129},{"name":"float_memory.wast","passed":0,"failed":6},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":4,"failed":75},{"name":"func_ptrs.wast","passed":0,"failed":16},{"name":"global.wast","passed":4,"failed":49},{"name":"i32.wast","passed":0,"failed":96},{"name":"i64.wast","passed":0,"failed":42},{"name":"if.wast","passed":0,"failed":118},{"name":"imports.wast","passed":1,"failed":156},{"name":"inline-module.wast","passed":0,"failed":1},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":5,"failed":46},{"name":"labels.wast","passed":1,"failed":28},{"name":"left-to-right.wast","passed":0,"failed":1},{"name":"linking.wast","passed":1,"failed":66},{"name":"load.wast","passed":0,"failed":60},{"name":"local_get.wast","passed":2,"failed":34},{"name":"local_set.wast","passed":5,"failed":48},{"name":"local_tee.wast","passed":0,"failed":42},{"name":"loop.wast","passed":0,"failed":43},{"name":"memory.wast","passed":0,"failed":34},{"name":"memory_grow.wast","passed":0,"failed":19},{"name":"memory_redundancy.wast","passed":0,"failed":1},{"name":"memory_size.wast","passed":0,"failed":6},{"name":"memory_trap.wast","passed":0,"failed":172},{"name":"names.wast","passed":484,"failed":1},{"name":"nop.wast","passed":0,"failed":5},{"name":"return.wast","passed":0,"failed":21},{"name":"select.wast","passed":0,"failed":32},{"name":"skip-stack-guard-page.wast","passed":0,"failed":11},{"name":"stack.wast","passed":0,"failed":2},{"name":"start.wast","passed":0,"failed":10},{"name":"store.wast","passed":0,"failed":59},{"name":"switch.wast","passed":1,"failed":27},{"name":"token.wast","passed":16,"failed":42},{"name":"traps.wast","passed":3,"failed":33},{"name":"type.wast","passed":1,"failed":2},{"name":"unreachable.wast","passed":0,"failed":59},{"name":"unreached-invalid.wast","passed":0,"failed":118},{"name":"unwind.wast","passed":1,"failed":49},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":0,"failed":176}]
0.0.5,11135,9093,[{"name":"address.wast","passed":1,"failed":259},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":78,"failed":13},{"name":"binary.wast","passed":107,"failed":5},{"name":"block.wast","passed":170,"failed":53},{"name":"br.wast","passed":20,"failed":77},{"name":"br_if.wast","passed":29,"failed":89},{"name":"br_table.wast","passed":24,"failed":150},{"name":"call.wast","passed":18,"failed":73},{"name":"call_indirect.wast","passed":34,"failed":136},{"name":"comments.wast","passed":5,"failed":3},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":25,"failed":594},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":22,"failed":39},{"name":"elem.wast","passed":27,"failed":72},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":90,"failed":6},{"name":"f32.wast","passed":1018,"failed":1496},{"name":"f32_bitwise.wast","passed":4,"failed":360},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":1018,"failed":1496},{"name":"f64_bitwise.wast","passed":4,"failed":360},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":1,"failed":7},{"name":"float_exprs.wast","passed":275,"failed":625},{"name":"float_literals.wast","passed":112,"failed":51},{"name":"float_memory.wast","passed":0,"failed":90},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":81,"failed":91},{"name":"func_ptrs.wast","passed":7,"failed":29},{"name":"global.wast","passed":50,"failed":60},{"name":"i32.wast","passed":85,"failed":375},{"name":"i64.wast","passed":31,"failed":385},{"name":"if.wast","passed":116,"failed":125},{"name":"imports.wast","passed":23,"failed":160},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":25,"failed":26},{"name":"labels.wast","passed":13,"failed":16},{"name":"left-to-right.wast","passed":0,"failed":96},{"name":"linking.wast","passed":5,"failed":127},{"name":"load.wast","passed":59,"failed":38},{"name":"local_get.wast","passed":18,"failed":18},{"name":"local_set.wast","passed":38,"failed":15},{"name":"local_tee.wast","passed":41,"failed":56},{"name":"loop.wast","passed":42,"failed":78},{"name":"memory.wast","passed":30,"failed":49},{"name":"memory_grow.wast","passed":11,"failed":85},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":1,"failed":181},{"name":"names.wast","passed":484,"failed":2},{"name":"nop.wast","passed":4,"failed":84},{"name":"return.wast","passed":20,"failed":64},{"name":"select.wast","passed":28,"failed":120},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":4,"failed":16},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":39,"failed":19},{"name":"traps.wast","passed":4,"failed":32},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":0,"failed":64},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":9,"failed":41},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
0.1.0,17630,2598,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":110,"failed":2},{"name":"block.wast","passed":193,"failed":30},{"name":"br.wast","passed":84,"failed":13},{"name":"br_if.wast","passed":90,"failed":28},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":29,"failed":62},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":371,"failed":248},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":50,"failed":49},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":92,"failed":4},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":2,"failed":6},{"name":"float_exprs.wast","passed":761,"failed":139},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":124,"failed":48},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":51,"failed":59},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":120,"failed":121},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":14,"failed":15},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":21,"failed":111},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":32,"failed":4},{"name":"local_set.wast","passed":50,"failed":3},{"name":"local_tee.wast","passed":68,"failed":29},{"name":"loop.wast","passed":93,"failed":27},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":46,"failed":42},{"name":"return.wast","passed":73,"failed":11},{"name":"select.wast","passed":86,"failed":62},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":22,"failed":14},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":50,"failed":14},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":35,"failed":15},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
-0.2.0-alpha.0,17821,2399,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":211,"failed":12},{"name":"br.wast","passed":94,"failed":3},{"name":"br_if.wast","passed":107,"failed":11},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":48,"failed":43},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":371,"failed":248},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":54,"failed":45},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":92,"failed":4},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast (skipped)","passed":0,"failed":0},{"name":"float_exprs.wast","passed":761,"failed":139},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":132,"failed":40},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":91,"failed":19},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":126,"failed":115},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":14,"failed":15},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":21,"failed":111},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":32,"failed":4},{"name":"local_set.wast","passed":50,"failed":3},{"name":"local_tee.wast","passed":78,"failed":19},{"name":"loop.wast","passed":107,"failed":13},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":59,"failed":29},{"name":"return.wast","passed":81,"failed":3},{"name":"select.wast","passed":98,"failed":50},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":4,"failed":3},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":22,"failed":14},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":60,"failed":4},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":35,"failed":15},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
+0.2.0-alpha.0,17823,2397,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":211,"failed":12},{"name":"br.wast","passed":94,"failed":3},{"name":"br_if.wast","passed":107,"failed":11},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":48,"failed":43},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":371,"failed":248},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":54,"failed":45},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":92,"failed":4},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast (skipped)","passed":0,"failed":0},{"name":"float_exprs.wast","passed":761,"failed":139},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":132,"failed":40},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":94,"failed":16},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":126,"failed":115},{"name":"imports.wast","passed":75,"failed":108},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":14,"failed":15},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":19,"failed":113},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":32,"failed":4},{"name":"local_set.wast","passed":50,"failed":3},{"name":"local_tee.wast","passed":78,"failed":19},{"name":"loop.wast","passed":107,"failed":13},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":59,"failed":29},{"name":"return.wast","passed":81,"failed":3},{"name":"select.wast","passed":98,"failed":50},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":4,"failed":3},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":22,"failed":14},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":60,"failed":4},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":35,"failed":15},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
diff --git a/crates/tinywasm/tests/generated/progress-mvp.svg b/crates/tinywasm/tests/generated/progress-mvp.svg
index 83066cf..a95188f 100644
--- a/crates/tinywasm/tests/generated/progress-mvp.svg
+++ b/crates/tinywasm/tests/generated/progress-mvp.svg
@@ -53,12 +53,12 @@ v0.1.0 (17630)
</text>
<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="716,345 716,350 "/>
<text x="898" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
-v0.2.0-alpha.0 (17821)
+v0.2.0-alpha.0 (17823)
</text>
<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="898,345 898,350 "/>
-<rect x="85" y="212" width="171" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="448" y="185" width="172" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="812" y="89" width="172" height="255" opacity="0.5" fill="#0000FF" stroke="none"/>
<rect x="630" y="92" width="172" height="252" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="448" y="185" width="172" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
<rect x="266" y="212" width="172" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="812" y="89" width="172" height="255" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="85" y="212" width="171" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
</svg>
diff --git a/crates/tinywasm/tests/testsuite/run.rs b/crates/tinywasm/tests/testsuite/run.rs
index 7ddb2b7..a4ae429 100644
--- a/crates/tinywasm/tests/testsuite/run.rs
+++ b/crates/tinywasm/tests/testsuite/run.rs
@@ -7,7 +7,8 @@ use std::{
use super::TestSuite;
use eyre::{eyre, Result};
use log::{debug, error, info};
-use tinywasm::ModuleInstance;
+use tinywasm::{Extern, Imports, ModuleInstance};
+use tinywasm_types::{Global, WasmValue};
use wast::{lexer::Lexer, parser::ParseBuffer, Wast};
impl TestSuite {
@@ -21,6 +22,16 @@ impl TestSuite {
Ok(())
}
+ fn imports() -> Result<Imports> {
+ let mut imports = Imports::new();
+ imports.define("spectest", "global_i32", Extern::global(WasmValue::I32(666), false))?;
+ imports.define("spectest", "global_i64", Extern::global(WasmValue::I64(666), false))?;
+ imports.define("spectest", "global_f32", Extern::global(WasmValue::F32(666.0), false))?;
+ imports.define("spectest", "global_f64", Extern::global(WasmValue::F64(666.0), false))?;
+
+ Ok(imports)
+ }
+
pub fn run_spec_group(&mut self, tests: &[&str]) -> Result<()> {
tests.iter().for_each(|group| {
let group_wast = wasm_testsuite::get_test_wast(group).expect("failed to get test wast");
@@ -66,7 +77,7 @@ impl TestSuite {
let m = parse_module_bytes(&module.encode().expect("failed to encode module"))
.expect("failed to parse module");
tinywasm::Module::from(m)
- .instantiate(&mut store)
+ .instantiate(&mut store, Some(Self::imports().unwrap()))
.map_err(|e| {
println!("failed to instantiate module: {:?}", e);
e
diff --git a/crates/tinywasm/tests/testsuite/util.rs b/crates/tinywasm/tests/testsuite/util.rs
index 9a4410e..2546ba3 100644
--- a/crates/tinywasm/tests/testsuite/util.rs
+++ b/crates/tinywasm/tests/testsuite/util.rs
@@ -37,6 +37,7 @@ pub fn exec_fn(
module: Option<&TinyWasmModule>,
name: &str,
args: &[tinywasm_types::WasmValue],
+ imports: Option<tinywasm::Imports>,
) -> Result<Vec<tinywasm_types::WasmValue>, tinywasm::Error> {
let Some(module) = module else {
return Err(tinywasm::Error::Other("no module found".to_string()));
@@ -44,7 +45,7 @@ pub fn exec_fn(
let mut store = tinywasm::Store::new();
let module = tinywasm::Module::from(module);
- let instance = module.instantiate(&mut store)?;
+ let instance = module.instantiate(&mut store, imports)?;
instance.exported_func_by_name(&store, name)?.call(&mut store, args)
}
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index 4895418..1213515 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -91,6 +91,15 @@ pub enum WasmValue {
}
impl WasmValue {
+ pub fn const_instr(&self) -> ConstInstruction {
+ match self {
+ Self::I32(i) => ConstInstruction::I32Const(*i),
+ Self::I64(i) => ConstInstruction::I64Const(*i),
+ Self::F32(i) => ConstInstruction::F32Const(*i),
+ Self::F64(i) => ConstInstruction::F64Const(*i),
+ }
+ }
+
/// Get the default value for a given type.
pub fn default_for(ty: ValType) -> Self {
match ty {
@@ -227,7 +236,7 @@ impl WasmValue {
}
/// Type of a WebAssembly value.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub enum ValType {
/// A 32-bit integer.
I32,
@@ -340,7 +349,7 @@ pub struct Global {
pub init: ConstInstruction,
}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct GlobalType {
pub mutable: bool,
pub ty: ValType,
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-03 18:20:47 +0000