chore: improve testsuite

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

4 files changed, 127 insertions, 95 deletions

diff --git a/crates/tinywasm/tests/generated/mvp.csv b/crates/tinywasm/tests/generated/mvp.csv
index a21f4e4..6e46b59 100644
--- a/crates/tinywasm/tests/generated/mvp.csv
+++ b/crates/tinywasm/tests/generated/mvp.csv
@@ -2,4 +2,4 @@
 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,19344,884,[{"name":"address.wast","passed":181,"failed":79},{"name":"align.wast","passed":156,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":220,"failed":3},{"name":"br.wast","passed":97,"failed":0},{"name":"br_if.wast","passed":118,"failed":0},{"name":"br_table.wast","passed":171,"failed":3},{"name":"call.wast","passed":73,"failed":18},{"name":"call_indirect.wast","passed":50,"failed":120},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":439,"failed":180},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":56,"failed":43},{"name":"endianness.wast","passed":29,"failed":40},{"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":6,"failed":2},{"name":"float_exprs.wast","passed":890,"failed":10},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":78,"failed":12},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":5,"failed":0},{"name":"func.wast","passed":168,"failed":4},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":103,"failed":7},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":231,"failed":10},{"name":"imports.wast","passed":80,"failed":103},{"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":26,"failed":3},{"name":"left-to-right.wast","passed":92,"failed":4},{"name":"linking.wast","passed":29,"failed":103},{"name":"load.wast","passed":93,"failed":4},{"name":"local_get.wast","passed":36,"failed":0},{"name":"local_set.wast","passed":53,"failed":0},{"name":"local_tee.wast","passed":93,"failed":4},{"name":"loop.wast","passed":116,"failed":4},{"name":"memory.wast","passed":78,"failed":1},{"name":"memory_grow.wast","passed":91,"failed":5},{"name":"memory_redundancy.wast","passed":8,"failed":0},{"name":"memory_size.wast","passed":35,"failed":7},{"name":"memory_trap.wast","passed":180,"failed":2},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":78,"failed":10},{"name":"return.wast","passed":84,"failed":0},{"name":"select.wast","passed":114,"failed":34},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":7,"failed":0},{"name":"start.wast","passed":11,"failed":9},{"name":"store.wast","passed":68,"failed":0},{"name":"switch.wast","passed":28,"failed":0},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":36,"failed":0},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":64,"failed":0},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":50,"failed":0},{"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.3.0-alpha.0,20071,157,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":156,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":223,"failed":0},{"name":"br.wast","passed":97,"failed":0},{"name":"br_if.wast","passed":118,"failed":0},{"name":"br_table.wast","passed":174,"failed":0},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":169,"failed":1},{"name":"comments.wast","passed":8,"failed":0},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":619,"failed":0},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":61,"failed":0},{"name":"elem.wast","passed":84,"failed":15},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":93,"failed":3},{"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":8,"failed":0},{"name":"float_exprs.wast","passed":900,"failed":0},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":90,"failed":0},{"name":"float_misc.wast","passed":441,"failed":0},{"name":"forward.wast","passed":5,"failed":0},{"name":"func.wast","passed":172,"failed":0},{"name":"func_ptrs.wast","passed":36,"failed":0},{"name":"global.wast","passed":110,"failed":0},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":241,"failed":0},{"name":"imports.wast","passed":108,"failed":75},{"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":29,"failed":0},{"name":"left-to-right.wast","passed":96,"failed":0},{"name":"linking.wast","passed":69,"failed":63},{"name":"load.wast","passed":97,"failed":0},{"name":"local_get.wast","passed":36,"failed":0},{"name":"local_set.wast","passed":53,"failed":0},{"name":"local_tee.wast","passed":97,"failed":0},{"name":"loop.wast","passed":120,"failed":0},{"name":"memory.wast","passed":79,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_redundancy.wast","passed":8,"failed":0},{"name":"memory_size.wast","passed":42,"failed":0},{"name":"memory_trap.wast","passed":182,"failed":0},{"name":"names.wast","passed":486,"failed":0},{"name":"nop.wast","passed":88,"failed":0},{"name":"return.wast","passed":84,"failed":0},{"name":"select.wast","passed":148,"failed":0},{"name":"skip-stack-guard-page.wast","passed":11,"failed":0},{"name":"stack.wast","passed":7,"failed":0},{"name":"start.wast","passed":20,"failed":0},{"name":"store.wast","passed":68,"failed":0},{"name":"switch.wast","passed":28,"failed":0},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":36,"failed":0},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":64,"failed":0},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":50,"failed":0},{"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.3.0-alpha.0,20084,144,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":156,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":223,"failed":0},{"name":"br.wast","passed":97,"failed":0},{"name":"br_if.wast","passed":118,"failed":0},{"name":"br_table.wast","passed":174,"failed":0},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":169,"failed":1},{"name":"comments.wast","passed":8,"failed":0},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":619,"failed":0},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":61,"failed":0},{"name":"elem.wast","passed":83,"failed":16},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":94,"failed":2},{"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":8,"failed":0},{"name":"float_exprs.wast","passed":900,"failed":0},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":90,"failed":0},{"name":"float_misc.wast","passed":441,"failed":0},{"name":"forward.wast","passed":5,"failed":0},{"name":"func.wast","passed":172,"failed":0},{"name":"func_ptrs.wast","passed":36,"failed":0},{"name":"global.wast","passed":110,"failed":0},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":241,"failed":0},{"name":"imports.wast","passed":105,"failed":78},{"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":29,"failed":0},{"name":"left-to-right.wast","passed":96,"failed":0},{"name":"linking.wast","passed":85,"failed":47},{"name":"load.wast","passed":97,"failed":0},{"name":"local_get.wast","passed":36,"failed":0},{"name":"local_set.wast","passed":53,"failed":0},{"name":"local_tee.wast","passed":97,"failed":0},{"name":"loop.wast","passed":120,"failed":0},{"name":"memory.wast","passed":79,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_redundancy.wast","passed":8,"failed":0},{"name":"memory_size.wast","passed":42,"failed":0},{"name":"memory_trap.wast","passed":182,"failed":0},{"name":"names.wast","passed":486,"failed":0},{"name":"nop.wast","passed":88,"failed":0},{"name":"return.wast","passed":84,"failed":0},{"name":"select.wast","passed":148,"failed":0},{"name":"skip-stack-guard-page.wast","passed":11,"failed":0},{"name":"stack.wast","passed":7,"failed":0},{"name":"start.wast","passed":20,"failed":0},{"name":"store.wast","passed":68,"failed":0},{"name":"switch.wast","passed":28,"failed":0},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":36,"failed":0},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":64,"failed":0},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":50,"failed":0},{"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 5d42f8f..809c464 100644
--- a/crates/tinywasm/tests/generated/progress-mvp.svg
+++ b/crates/tinywasm/tests/generated/progress-mvp.svg
@@ -53,12 +53,12 @@ v0.2.0 (19344)
 </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.3.0-alpha.0 (20068)
+v0.3.0-alpha.0 (20084)
 </text>
 <polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="898,345 898,350 "/>
-<rect x="448" y="92" width="172" height="252" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="812" y="57" width="172" height="287" opacity="0.5" fill="#0000FF" stroke="none"/>
 <rect x="266" y="185" width="172" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="85" y="212" width="171" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="812" y="57" width="172" height="287" opacity="0.5" fill="#0000FF" stroke="none"/>
 <rect x="630" y="67" width="172" height="277" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="85" y="212" width="171" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="448" y="92" width="172" height="252" 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 1d1502b..a48c271 100644
--- a/crates/tinywasm/tests/testsuite/run.rs
+++ b/crates/tinywasm/tests/testsuite/run.rs
@@ -1,5 +1,5 @@
 use crate::testsuite::util::*;
-use std::borrow::Cow;
+use std::{borrow::Cow, collections::HashMap};
 
 use super::TestSuite;
 use eyre::{eyre, Result};
@@ -8,6 +8,61 @@ use tinywasm::{Extern, Imports, ModuleInstance};
 use tinywasm_types::{ExternVal, MemoryType, ModuleInstanceAddr, TableType, ValType, WasmValue};
 use wast::{lexer::Lexer, parser::ParseBuffer, QuoteWat, Wast};
 
+struct RegisteredModules {
+    modules: HashMap<String, ModuleInstanceAddr>,
+    last_module: Option<(ModuleInstanceAddr, Option<String>)>,
+}
+
+impl RegisteredModules {
+    fn modules(&self) -> &HashMap<String, ModuleInstanceAddr> {
+        &self.modules
+    }
+
+    fn update_last_module(&mut self, addr: ModuleInstanceAddr, name: Option<String>) {
+        self.last_module = Some((addr, name));
+    }
+    fn register(&mut self, name: String, addr: ModuleInstanceAddr) {
+        log::debug!("registering module: {}", name);
+        self.modules.insert(name.clone(), addr);
+        self.last_module = Some((addr, Some(name)));
+    }
+
+    fn get_idx(&self, module_id: Option<wast::token::Id<'_>>) -> Option<&ModuleInstanceAddr> {
+        match module_id {
+            Some(module) => {
+                log::debug!("getting module: {}", module.name());
+
+                if let Some(addr) = self.modules.get(module.name()) {
+                    return Some(addr);
+                }
+
+                let Some((last, Some(name))) = self.last_module.as_ref() else {
+                    return None;
+                };
+
+                match module.name() == name {
+                    true => Some(&last),
+                    false => None,
+                }
+            }
+            None => self.last_module.as_ref().map(|(addr, _)| addr),
+        }
+    }
+
+    fn get<'a>(
+        &self,
+        module_id: Option<wast::token::Id<'_>>,
+        store: &'a tinywasm::Store,
+    ) -> Option<&'a ModuleInstance> {
+        let addr = self.get_idx(module_id)?;
+        store.get_module_instance(*addr)
+    }
+
+    fn last<'a>(&self, store: &'a tinywasm::Store) -> Option<&'a ModuleInstance> {
+        store.get_module_instance(self.last_module.as_ref()?.0)
+    }
+}
+
 impl TestSuite {
     pub fn run_paths(&mut self, tests: &[&str]) -> Result<()> {
         tests.iter().for_each(|group| {
@@ -19,7 +74,7 @@ impl TestSuite {
         Ok(())
     }
 
-    fn imports(registered_modules: Vec<(String, ModuleInstanceAddr)>) -> Result<Imports> {
+    fn imports(modules: &HashMap<std::string::String, u32>) -> Result<Imports> {
         let mut imports = Imports::new();
 
         let table =
@@ -75,9 +130,9 @@ impl TestSuite {
             .define("spectest", "print_i32_f32", print_i32_f32)?
             .define("spectest", "print_f64_f64", print_f64_f64)?;
 
-        for (name, addr) in registered_modules {
+        for (name, addr) in modules {
             log::debug!("registering module: {}", name);
-            imports.link_module(&name, addr)?;
+            imports.link_module(&name, *addr)?;
         }
 
         Ok(imports)
@@ -111,8 +166,7 @@ impl TestSuite {
         let wast_data = wast::parser::parse::<Wast>(&buf).expect("failed to parse wat");
 
         let mut store = tinywasm::Store::default();
-        let mut registered_modules = Vec::new();
-        let mut last_module: Option<ModuleInstance> = None;
+        let mut registered_modules = RegisteredModules { modules: HashMap::new(), last_module: None };
 
         println!("running {} tests for group: {}", wast_data.directives.len(), group_name);
         for (i, directive) in wast_data.directives.into_iter().enumerate() {
@@ -121,7 +175,7 @@ impl TestSuite {
 
             match directive {
                 Register { span, name, .. } => {
-                    let Some(last) = &last_module else {
+                    let Some(last) = registered_modules.last(&store) else {
                         test_group.add_result(
                             &format!("Register({})", i),
                             span.linecol_in(wast),
@@ -129,8 +183,7 @@ impl TestSuite {
                         );
                         continue;
                     };
-
-                    registered_modules.push((name.to_string(), last.id()));
+                    registered_modules.register(name.to_string(), last.id());
                     test_group.add_result(&format!("Register({})", i), span.linecol_in(wast), Ok(()));
                 }
 
@@ -139,7 +192,7 @@ impl TestSuite {
                     // store = tinywasm::Store::default();
                     debug!("got wat module");
                     let result = catch_unwind_silent(|| {
-                        let bytes = match module {
+                        let (name, bytes) = match module {
                             QuoteWat::QuoteModule(_, quoted_wat) => {
                                 let wat = quoted_wat
                                     .iter()
@@ -150,32 +203,34 @@ impl TestSuite {
                                 let lexer = Lexer::new(&wat);
                                 let buf = ParseBuffer::new_with_lexer(lexer).expect("failed to create parse buffer");
                                 let mut wat_data = wast::parser::parse::<wast::Wat>(&buf).expect("failed to parse wat");
-                                wat_data.encode()
+                                (None, wat_data.encode().expect("failed to encode module"))
+                            }
+                            QuoteWat::Wat(mut wat) => {
+                                let wast::Wat::Module(ref module) = wat else {
+                                    unimplemented!("Not supported");
+                                };
+                                (
+                                    module.id.map(|id| id.name().to_string()),
+                                    wat.encode().expect("failed to encode module"),
+                                )
                             }
-                            QuoteWat::Wat(mut wat) => wat.encode(),
                             _ => unimplemented!("Not supported"),
-                        }
-                        .expect("failed to encode module");
+                        };
 
                         let m = parse_module_bytes(&bytes).expect("failed to parse module bytes");
-                        tinywasm::Module::from(m)
-                            .instantiate(&mut store, Some(Self::imports(registered_modules.clone()).unwrap()))
-                            .map_err(|e| {
-                                println!("failed to instantiate module: {:?}", e);
-                                e
-                            })
-                            .expect("failed to instantiate module")
+
+                        let module_instance = tinywasm::Module::from(m)
+                            .instantiate(&mut store, Some(Self::imports(registered_modules.modules()).unwrap()))
+                            .expect("failed to instantiate module");
+
+                        (name, module_instance)
                     })
                     .map_err(|e| eyre!("failed to parse wat module: {:?}", try_downcast_panic(e)));
 
                     match &result {
-                        Err(_) => last_module = None,
-                        Ok(m) => last_module = Some(m.clone()),
-                    }
-
-                    if let Err(err) = &result {
-                        debug!("failed to parse module: {:?}", err)
-                    }
+                        Err(err) => debug!("failed to parse module: {:?}", err),
+                        Ok((name, module)) => registered_modules.update_last_module(module.id(), name.clone()),
+                    };
 
                     test_group.add_result(&format!("Wat({})", i), span.linecol_in(wast), result.map(|_| ()));
                 }
@@ -216,17 +271,10 @@ impl TestSuite {
                 }
 
                 AssertExhaustion { call, message, span } => {
-                    let module = last_module.as_ref();
-                    let name = call.name;
-
-                    let args = call
-                        .args
-                        .into_iter()
-                        .map(wastarg2tinywasmvalue)
-                        .collect::<Result<Vec<_>>>()
-                        .expect("failed to convert args");
-
-                    let res = catch_unwind_silent(|| exec_fn_instance(module, &mut store, name, &args).map(|_| ()));
+                    let module = registered_modules.get_idx(call.module);
+                    let args = convert_wastargs(call.args).expect("failed to convert args");
+                    let res =
+                        catch_unwind_silent(|| exec_fn_instance(module, &mut store, call.name, &args).map(|_| ()));
 
                     let Ok(Err(tinywasm::Error::Trap(trap))) = res else {
                         test_group.add_result(
@@ -251,29 +299,26 @@ impl TestSuite {
 
                 AssertTrap { exec, message, span } => {
                     let res: Result<tinywasm::Result<()>, _> = catch_unwind_silent(|| {
-                        let (module, name, args) = match exec {
+                        let invoke = match exec {
                             wast::WastExecute::Wat(mut wat) => {
                                 let module = parse_module_bytes(&wat.encode().expect("failed to encode module"))
                                     .expect("failed to parse module");
                                 let module = tinywasm::Module::from(module);
                                 module.instantiate(
                                     &mut store,
-                                    Some(Self::imports(registered_modules.clone()).unwrap()),
+                                    Some(Self::imports(registered_modules.modules()).unwrap()),
                                 )?;
                                 return Ok(());
                             }
                             wast::WastExecute::Get { module: _, global: _ } => {
                                 panic!("get not supported");
                             }
-                            wast::WastExecute::Invoke(invoke) => (last_module.as_ref(), invoke.name, invoke.args),
+                            wast::WastExecute::Invoke(invoke) => invoke,
                         };
-                        let args = args
-                            .into_iter()
-                            .map(wastarg2tinywasmvalue)
-                            .collect::<Result<Vec<_>>>()
-                            .expect("failed to convert args");
 
-                        exec_fn_instance(module, &mut store, name, &args).map(|_| ())
+                        let module = registered_modules.get_idx(invoke.module);
+                        let args = convert_wastargs(invoke.args).expect("failed to convert args");
+                        exec_fn_instance(module, &mut store, invoke.name, &args).map(|_| ())
                     });
 
                     match res {
@@ -309,16 +354,11 @@ impl TestSuite {
 
                 Invoke(invoke) => {
                     let name = invoke.name;
-                    let res: Result<Result<()>, _> = catch_unwind_silent(|| {
-                        let args =
-                            invoke.args.into_iter().map(wastarg2tinywasmvalue).collect::<Result<Vec<_>>>().map_err(
-                                |e| {
-                                    error!("failed to convert args: {:?}", e);
-                                    e
-                                },
-                            )?;
 
-                        exec_fn_instance(last_module.as_ref(), &mut store, invoke.name, &args).map_err(|e| {
+                    let res: Result<Result<()>, _> = catch_unwind_silent(|| {
+                        let args = convert_wastargs(invoke.args)?;
+                        let module = registered_modules.get_idx(invoke.module);
+                        exec_fn_instance(module, &mut store, invoke.name, &args).map_err(|e| {
                             error!("failed to execute function: {:?}", e);
                             e
                         })?;
@@ -326,30 +366,17 @@ impl TestSuite {
                     });
 
                     let res = res.map_err(|e| eyre!("test panicked: {:?}", try_downcast_panic(e))).and_then(|r| r);
-
                     test_group.add_result(&format!("Invoke({}-{})", name, i), span.linecol_in(wast), res);
                 }
 
                 AssertReturn { span, exec, results } => {
                     info!("AssertReturn: {:?}", exec);
-                    let expected =
-                        results.into_iter().map(wastret2tinywasmvalue).collect::<Result<Vec<_>>>().map_err(|e| {
-                            error!("failed to convert expected results: {:?}", e);
-                            e
-                        })?;
+                    let expected = convert_wastret(results)?;
 
                     let invoke = match match exec {
                         wast::WastExecute::Wat(_) => Err(eyre!("wat not supported")),
                         wast::WastExecute::Get { module: module_id, global } => {
-                            let module = match module_id {
-                                None => last_module.as_ref(),
-                                Some(module_id) => registered_modules
-                                    .iter()
-                                    .find(|(m, _)| m == module_id.name())
-                                    .map(|(_, addr)| store.get_module_instance(*addr))
-                                    .flatten(),
-                            };
-
+                            let module = registered_modules.get(module_id, &store);
                             let Some(module) = module else {
                                 test_group.add_result(
                                     &format!("AssertReturn(unsupported-{})", i),
@@ -408,23 +435,16 @@ impl TestSuite {
                             continue;
                         }
                     };
-                    let invoke_name = invoke.name;
 
+                    let invoke_name = invoke.name;
                     let res: Result<Result<()>, _> = catch_unwind_silent(|| {
                         debug!("invoke: {:?}", invoke);
-                        let args =
-                            invoke.args.into_iter().map(wastarg2tinywasmvalue).collect::<Result<Vec<_>>>().map_err(
-                                |e| {
-                                    error!("failed to convert args: {:?}", e);
-                                    e
-                                },
-                            )?;
-
-                        let outcomes =
-                            exec_fn_instance(last_module.as_ref(), &mut store, invoke.name, &args).map_err(|e| {
-                                error!("failed to execute function: {:?}", e);
-                                e
-                            })?;
+                        let args = convert_wastargs(invoke.args)?;
+                        let module = registered_modules.get_idx(invoke.module);
+                        let outcomes = exec_fn_instance(module, &mut store, invoke.name, &args).map_err(|e| {
+                            error!("failed to execute function: {:?}", e);
+                            e
+                        })?;
 
                         debug!("outcomes: {:?}", outcomes);
 
diff --git a/crates/tinywasm/tests/testsuite/util.rs b/crates/tinywasm/tests/testsuite/util.rs
index bb134d2..a3bb1a1 100644
--- a/crates/tinywasm/tests/testsuite/util.rs
+++ b/crates/tinywasm/tests/testsuite/util.rs
@@ -1,7 +1,7 @@
 use std::panic::{self, AssertUnwindSafe};
 
 use eyre::{eyre, Result};
-use tinywasm_types::{TinyWasmModule, WasmValue};
+use tinywasm_types::{ModuleInstanceAddr, TinyWasmModule, WasmValue};
 
 pub fn try_downcast_panic(panic: Box<dyn std::any::Any + Send>) -> String {
     let info = panic.downcast_ref::<panic::PanicInfo>().or(None).map(|p| p.to_string()).clone();
@@ -12,7 +12,7 @@ pub fn try_downcast_panic(panic: Box<dyn std::any::Any + Send>) -> String {
 }
 
 pub fn exec_fn_instance(
-    instance: Option<&tinywasm::ModuleInstance>,
+    instance: Option<&ModuleInstanceAddr>,
     store: &mut tinywasm::Store,
     name: &str,
     args: &[tinywasm_types::WasmValue],
@@ -21,6 +21,10 @@ pub fn exec_fn_instance(
         return Err(tinywasm::Error::Other("no instance found".to_string()));
     };
 
+    let Some(instance) = store.get_module_instance(*instance) else {
+        return Err(tinywasm::Error::Other("no instance found".to_string()));
+    };
+
     let func = instance.exported_func_by_name(store, name)?;
     func.call(store, args)
 }
@@ -54,7 +58,15 @@ pub fn parse_module_bytes(bytes: &[u8]) -> Result<TinyWasmModule> {
     Ok(parser.parse_module_bytes(bytes)?)
 }
 
-pub fn wastarg2tinywasmvalue(arg: wast::WastArg) -> Result<tinywasm_types::WasmValue> {
+pub fn convert_wastargs(args: Vec<wast::WastArg>) -> Result<Vec<tinywasm_types::WasmValue>> {
+    args.into_iter().map(|a| wastarg2tinywasmvalue(a)).collect()
+}
+
+pub fn convert_wastret(args: Vec<wast::WastRet>) -> Result<Vec<tinywasm_types::WasmValue>> {
+    args.into_iter().map(|a| wastret2tinywasmvalue(a)).collect()
+}
+
+fn wastarg2tinywasmvalue(arg: wast::WastArg) -> Result<tinywasm_types::WasmValue> {
     let wast::WastArg::Core(arg) = arg else {
         return Err(eyre!("unsupported arg type: Component"));
     };
@@ -75,7 +87,7 @@ pub fn wastarg2tinywasmvalue(arg: wast::WastArg) -> Result<tinywasm_types::WasmV
     })
 }
 
-pub fn wastret2tinywasmvalue(arg: wast::WastRet) -> Result<tinywasm_types::WasmValue> {
+fn wastret2tinywasmvalue(arg: wast::WastRet) -> Result<tinywasm_types::WasmValue> {
     let wast::WastRet::Core(arg) = arg else {
         return Err(eyre!("unsupported arg type"));
     };