From 9c85fa9c3a2066ce851af53d7019e6a25a45af3b Mon Sep 17 00:00:00 2001
From: Henry Gressmann <mail@henrygressmann.de>
Date: Sun, 30 Jun 2024 19:19:45 +0200
Subject: chore: restructure runtime and reduce build dependencies

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>
---
 crates/cli/Cargo.toml                              |  10 +-
 crates/cli/src/bin.rs                              |   7 +-
 crates/parser/Cargo.toml                           |   4 +-
 crates/parser/src/lib.rs                           |  11 +-
 crates/tinywasm/Cargo.toml                         |  28 ++-
 crates/tinywasm/benches/argon2id.rs                |  43 +++++
 crates/tinywasm/benches/fibonacci.rs               |  50 +++++
 crates/tinywasm/benches/tinywasm.rs                |  45 +++++
 crates/tinywasm/src/func.rs                        |   2 +-
 crates/tinywasm/src/imports.rs                     |   2 +-
 crates/tinywasm/src/interpreter/executor.rs        |  10 +-
 crates/tinywasm/src/interpreter/mod.rs             |  15 +-
 .../tinywasm/src/interpreter/stack/block_stack.rs  |   2 +-
 .../tinywasm/src/interpreter/stack/call_stack.rs   |   3 +-
 crates/tinywasm/src/interpreter/stack/mod.rs       |   3 +-
 .../tinywasm/src/interpreter/stack/value_stack.rs  |   7 +-
 crates/tinywasm/src/interpreter/stack/values.rs    | 200 -------------------
 crates/tinywasm/src/interpreter/values.rs          | 214 +++++++++++++++++++++
 crates/tinywasm/src/lib.rs                         |   3 +-
 crates/tinywasm/tests/generated/2.0.csv            |   3 +-
 crates/tinywasm/tests/generated/mvp.csv            |   3 +-
 crates/tinywasm/tests/test-mvp.rs                  |   1 -
 crates/tinywasm/tests/test-two.rs                  |   1 -
 crates/tinywasm/tests/test-wast.rs                 |   1 -
 crates/tinywasm/tests/testsuite/mod.rs             |   1 -
 crates/tinywasm/tests/testsuite/run.rs             |   1 -
 crates/types/Cargo.toml                            |   2 +-
 crates/types/src/lib.rs                            |   9 +-
 28 files changed, 424 insertions(+), 257 deletions(-)
 create mode 100644 crates/tinywasm/benches/argon2id.rs
 create mode 100644 crates/tinywasm/benches/fibonacci.rs
 create mode 100644 crates/tinywasm/benches/tinywasm.rs
 delete mode 100644 crates/tinywasm/src/interpreter/stack/values.rs
 create mode 100644 crates/tinywasm/src/interpreter/values.rs

(limited to 'crates')

diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index bccf998..51a669d 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -15,12 +15,12 @@ path="src/bin.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tinywasm={version="0.7.0", path="../tinywasm", features=["std", "parser"]}
+tinywasm={version="0.8.0-alpha.0", path="../tinywasm", features=["std", "parser"]}
 argh="0.1"
-color-eyre={version="0.6", default-features=false}
-log="0.4"
-pretty_env_logger="0.5"
-wast={version="212.0", optional=true}
+eyre={workspace=true}
+log={workspace=true}
+pretty_env_logger={workspace=true}
+wast={workspace=true, optional=true}
 
 [features]
 default=["wat"]
diff --git a/crates/cli/src/bin.rs b/crates/cli/src/bin.rs
index 6508c5f..15e3fdc 100644
--- a/crates/cli/src/bin.rs
+++ b/crates/cli/src/bin.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use argh::FromArgs;
 use args::WasmArg;
-use color_eyre::eyre::Result;
+use eyre::Result;
 use log::{debug, info};
 use tinywasm::{types::WasmValue, Module};
 
@@ -67,8 +67,6 @@ struct Run {
 }
 
 fn main() -> Result<()> {
-    color_eyre::install()?;
-
     let args: TinyWasmCli = argh::from_env();
     let level = match args.log_level.as_str() {
         "trace" => log::LevelFilter::Trace,
@@ -80,7 +78,6 @@ fn main() -> Result<()> {
     };
 
     pretty_env_logger::formatted_builder().filter_level(level).init();
-
     let cwd = std::env::current_dir()?;
 
     match args.nested {
@@ -96,7 +93,7 @@ fn main() -> Result<()> {
                     tinywasm::Module::parse_bytes(&wasm)?
                 }
                 #[cfg(not(feature = "wat"))]
-                true => return Err(color_eyre::eyre::eyre!("wat support is not enabled in this build")),
+                true => return Err(eyre::eyre!("wat support is not enabled in this build")),
                 false => tinywasm::Module::parse_file(path)?,
             };
 
diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
index 89d2b71..994bd6d 100644
--- a/crates/parser/Cargo.toml
+++ b/crates/parser/Cargo.toml
@@ -10,8 +10,8 @@ rust-version.workspace=true
 
 [dependencies]
 wasmparser={version="0.212", default-features=false, features=["validate"]}
-log={version="0.4", optional=true}
-tinywasm-types={version="0.7.0", path="../types", default-features=false}
+log={workspace=true, optional=true}
+tinywasm-types={version="0.8.0-alpha.0", path="../types", default-features=false}
 
 [features]
 default=["std", "logging"]
diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs
index 8ea5a86..77349b2 100644
--- a/crates/parser/src/lib.rs
+++ b/crates/parser/src/lib.rs
@@ -5,7 +5,6 @@
 ))]
 #![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
 #![forbid(unsafe_code)]
-#![cfg_attr(not(feature = "std"), feature(error_in_core))]
 //! See [`tinywasm`](https://docs.rs/tinywasm) for documentation.
 
 extern crate alloc;
@@ -15,23 +14,25 @@ extern crate std;
 
 // log for logging (optional).
 #[cfg(feature = "logging")]
-#[allow(clippy::single_component_path_imports)]
+#[allow(clippy::single_component_path_imports, unused_imports)]
 use log;
 
 // noop fallback if logging is disabled.
 #[cfg(not(feature = "logging"))]
-mod log {
+#[allow(unused_imports, unused_macros)]
+pub(crate) mod log {
     macro_rules! debug    ( ($($tt:tt)*) => {{}} );
+    macro_rules! info    ( ($($tt:tt)*) => {{}} );
     macro_rules! error    ( ($($tt:tt)*) => {{}} );
     pub(crate) use debug;
     pub(crate) use error;
+    pub(crate) use info;
 }
 
 mod conversion;
 mod error;
 mod module;
 mod visit;
-use alloc::vec::Vec;
 pub use error::*;
 use module::ModuleReader;
 use wasmparser::{Validator, WasmFeaturesInflated};
@@ -114,7 +115,7 @@ impl Parser {
 
         let mut validator = self.create_validator();
         let mut reader = ModuleReader::new();
-        let mut buffer = Vec::new();
+        let mut buffer = alloc::vec::Vec::new();
         let mut parser = wasmparser::Parser::new(0);
         let mut eof = false;
 
diff --git a/crates/tinywasm/Cargo.toml b/crates/tinywasm/Cargo.toml
index 4e15123..8b93a39 100644
--- a/crates/tinywasm/Cargo.toml
+++ b/crates/tinywasm/Cargo.toml
@@ -14,23 +14,24 @@ name="tinywasm"
 path="src/lib.rs"
 
 [dependencies]
-_log={version="0.4", optional=true, package="log"}
-tinywasm-parser={version="0.7.0", path="../parser", default-features=false, optional=true}
-tinywasm-types={version="0.7.0", path="../types", default-features=false}
+log={workspace=true, optional=true}
+tinywasm-parser={version="0.8.0-alpha.0", path="../parser", default-features=false, optional=true}
+tinywasm-types={version="0.8.0-alpha.0", path="../types", default-features=false}
 libm={version="0.2", default-features=false}
 
 [dev-dependencies]
 wasm-testsuite={path="../wasm-testsuite"}
-wast={version="212.0"}
+wast={workspace=true}
+eyre={workspace=true}
+pretty_env_logger={workspace=true}
+criterion={workspace=true}
 owo-colors={version="4.0"}
-eyre={version="0.6"}
 serde_json={version="1.0"}
 serde={version="1.0", features=["derive"]}
-pretty_env_logger="0.5"
 
 [features]
 default=["std", "parser", "logging", "archive"]
-logging=["_log", "tinywasm-parser?/logging", "tinywasm-types/logging"]
+logging=["log", "tinywasm-parser?/logging", "tinywasm-types/logging"]
 std=["tinywasm-parser?/std", "tinywasm-types/std"]
 parser=["tinywasm-parser"]
 archive=["tinywasm-types/archive"]
@@ -48,3 +49,16 @@ harness=false
 [[test]]
 name="test-wast"
 harness=false
+
+
+[[bench]]
+name="argon2id"
+harness=false
+
+[[bench]]
+name="fibonacci"
+harness=false
+
+[[bench]]
+name="tinywasm"
+harness=false
diff --git a/crates/tinywasm/benches/argon2id.rs b/crates/tinywasm/benches/argon2id.rs
new file mode 100644
index 0000000..d87c78e
--- /dev/null
+++ b/crates/tinywasm/benches/argon2id.rs
@@ -0,0 +1,43 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use eyre::Result;
+use tinywasm::*;
+use types::{archive::AlignedVec, TinyWasmModule};
+
+const WASM: &[u8] = include_bytes!("../../../examples/rust/out/argon2id.opt.wasm");
+
+fn argon2id_parse() -> Result<TinyWasmModule> {
+    let parser = tinywasm_parser::Parser::new();
+    let data = parser.parse_module_bytes(WASM)?;
+    Ok(data)
+}
+
+fn argon2id_to_twasm(module: TinyWasmModule) -> Result<AlignedVec> {
+    let twasm = module.serialize_twasm();
+    Ok(twasm)
+}
+
+fn argon2id_from_twasm(twasm: AlignedVec) -> Result<TinyWasmModule> {
+    let module = TinyWasmModule::from_twasm(&twasm)?;
+    Ok(module)
+}
+
+fn argon2id_run(module: TinyWasmModule) -> Result<()> {
+    let mut store = Store::default();
+    let instance = ModuleInstance::instantiate(&mut store, module.into(), None)?;
+    let argon2 = instance.exported_func::<(i32, i32, i32), i32>(&store, "argon2id")?;
+    argon2.call(&mut store, (1000, 1, 1))?;
+    Ok(())
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let module = argon2id_parse().expect("argon2id_parse");
+    let twasm = argon2id_to_twasm(module.clone()).expect("argon2id_to_twasm");
+
+    c.bench_function("argon2id_parse", |b| b.iter(argon2id_parse));
+    c.bench_function("argon2id_to_twasm", |b| b.iter(|| argon2id_to_twasm(module.clone())));
+    c.bench_function("argon2id_from_twasm", |b| b.iter(|| argon2id_from_twasm(twasm.clone())));
+    c.bench_function("argon2id", |b| b.iter(|| argon2id_run(module.clone())));
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);
diff --git a/crates/tinywasm/benches/fibonacci.rs b/crates/tinywasm/benches/fibonacci.rs
new file mode 100644
index 0000000..e5c7184
--- /dev/null
+++ b/crates/tinywasm/benches/fibonacci.rs
@@ -0,0 +1,50 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use eyre::Result;
+use tinywasm::*;
+use types::{archive::AlignedVec, TinyWasmModule};
+
+const WASM: &[u8] = include_bytes!("../../../examples/rust/out/fibonacci.opt.wasm");
+
+fn fibonacci_parse() -> Result<TinyWasmModule> {
+    let parser = tinywasm_parser::Parser::new();
+    let data = parser.parse_module_bytes(WASM)?;
+    Ok(data)
+}
+
+fn fibonacci_to_twasm(module: TinyWasmModule) -> Result<AlignedVec> {
+    let twasm = module.serialize_twasm();
+    Ok(twasm)
+}
+
+fn fibonacci_from_twasm(twasm: AlignedVec) -> Result<TinyWasmModule> {
+    let module = TinyWasmModule::from_twasm(&twasm)?;
+    Ok(module)
+}
+
+fn fibonacci_run(module: TinyWasmModule, recursive: bool, n: i32) -> Result<()> {
+    let mut store = Store::default();
+    let instance = ModuleInstance::instantiate(&mut store, module.into(), None)?;
+    let argon2 = instance.exported_func::<i32, i32>(
+        &store,
+        match recursive {
+            true => "fibonacci_recursive",
+            false => "fibonacci",
+        },
+    )?;
+    argon2.call(&mut store, n)?;
+    Ok(())
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let module = fibonacci_parse().expect("fibonacci_parse");
+    let twasm = fibonacci_to_twasm(module.clone()).expect("fibonacci_to_twasm");
+
+    c.bench_function("fibonacci_parse", |b| b.iter(fibonacci_parse));
+    c.bench_function("fibonacci_to_twasm", |b| b.iter(|| fibonacci_to_twasm(module.clone())));
+    c.bench_function("fibonacci_from_twasm", |b| b.iter(|| fibonacci_from_twasm(twasm.clone())));
+    c.bench_function("fibonacci_iterative_60", |b| b.iter(|| fibonacci_run(module.clone(), false, 60)));
+    c.bench_function("fibonacci_recursive_60", |b| b.iter(|| fibonacci_run(module.clone(), true, 60)));
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);
diff --git a/crates/tinywasm/benches/tinywasm.rs b/crates/tinywasm/benches/tinywasm.rs
new file mode 100644
index 0000000..52bf4a8
--- /dev/null
+++ b/crates/tinywasm/benches/tinywasm.rs
@@ -0,0 +1,45 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use eyre::Result;
+use tinywasm::*;
+use types::{archive::AlignedVec, TinyWasmModule};
+
+const WASM: &[u8] = include_bytes!("../../../examples/rust/out/tinywasm.opt.wasm");
+
+fn tinywasm_parse() -> Result<TinyWasmModule> {
+    let parser = tinywasm_parser::Parser::new();
+    let data = parser.parse_module_bytes(WASM)?;
+    Ok(data)
+}
+
+fn tinywasm_to_twasm(module: TinyWasmModule) -> Result<AlignedVec> {
+    let twasm = module.serialize_twasm();
+    Ok(twasm)
+}
+
+fn tinywasm_from_twasm(twasm: AlignedVec) -> Result<TinyWasmModule> {
+    let module = TinyWasmModule::from_twasm(&twasm)?;
+    Ok(module)
+}
+
+fn tinywasm_run(module: TinyWasmModule) -> Result<()> {
+    let mut store = Store::default();
+    let mut imports = Imports::default();
+    imports.define("env", "printi32", Extern::typed_func(|_: FuncContext<'_>, _: i32| Ok(()))).expect("define");
+    let instance = ModuleInstance::instantiate(&mut store, module.into(), Some(imports)).expect("instantiate");
+    let hello = instance.exported_func::<(), ()>(&store, "hello").expect("exported_func");
+    hello.call(&mut store, ()).expect("call");
+    Ok(())
+}
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let module = tinywasm_parse().expect("tinywasm_parse");
+    let twasm = tinywasm_to_twasm(module.clone()).expect("tinywasm_to_twasm");
+
+    c.bench_function("tinywasm_parse", |b| b.iter(tinywasm_parse));
+    c.bench_function("tinywasm_to_twasm", |b| b.iter(|| tinywasm_to_twasm(module.clone())));
+    c.bench_function("tinywasm_from_twasm", |b| b.iter(|| tinywasm_from_twasm(twasm.clone())));
+    c.bench_function("tinywasm", |b| b.iter(|| tinywasm_run(module.clone())));
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);
diff --git a/crates/tinywasm/src/func.rs b/crates/tinywasm/src/func.rs
index 3b97d93..681ca7e 100644
--- a/crates/tinywasm/src/func.rs
+++ b/crates/tinywasm/src/func.rs
@@ -1,4 +1,4 @@
-use crate::interpreter::{CallFrame, Stack};
+use crate::interpreter::stack::{CallFrame, Stack};
 use crate::{log, unlikely, Function};
 use crate::{Error, FuncContext, Result, Store};
 use alloc::{boxed::Box, format, string::String, string::ToString, vec, vec::Vec};
diff --git a/crates/tinywasm/src/imports.rs b/crates/tinywasm/src/imports.rs
index 8c208f0..c6cd0c2 100644
--- a/crates/tinywasm/src/imports.rs
+++ b/crates/tinywasm/src/imports.rs
@@ -191,7 +191,7 @@ impl From<&Import> for ExternName {
 ///
 /// ## Example
 /// ```rust
-/// # use _log as log;
+/// # use log;
 /// # fn main() -> tinywasm::Result<()> {
 /// use tinywasm::{Imports, Extern};
 /// use tinywasm::types::{ValType, TableType, MemoryType, WasmValue};
diff --git a/crates/tinywasm/src/interpreter/executor.rs b/crates/tinywasm/src/interpreter/executor.rs
index 386099d..7f724f3 100644
--- a/crates/tinywasm/src/interpreter/executor.rs
+++ b/crates/tinywasm/src/interpreter/executor.rs
@@ -1,17 +1,14 @@
 #[cfg(not(feature = "std"))]
-mod no_std_floats;
-
-use interpreter::CallFrame;
-#[cfg(not(feature = "std"))]
 #[allow(unused_imports)]
-use no_std_floats::NoStdFloatExt;
+use super::no_std_floats::NoStdFloatExt;
 
 use alloc::{format, rc::Rc, string::ToString};
 use core::ops::ControlFlow;
+use interpreter::stack::CallFrame;
 use tinywasm_types::*;
 
 use super::num_helpers::*;
-use super::stack::{values::StackHeight, BlockFrame, BlockType, Stack};
+use super::stack::{BlockFrame, BlockType, Stack};
 use super::values::*;
 use crate::*;
 
@@ -32,6 +29,7 @@ impl<'store, 'stack> Executor<'store, 'stack> {
     #[inline]
     pub(crate) fn run_to_completion(&mut self) -> Result<()> {
         loop {
+            // TODO: the result checking takes about 10% of the time
             match self.exec_next()? {
                 ControlFlow::Break(..) => return Ok(()),
                 ControlFlow::Continue(..) => continue,
diff --git a/crates/tinywasm/src/interpreter/mod.rs b/crates/tinywasm/src/interpreter/mod.rs
index f9096f8..0299cb1 100644
--- a/crates/tinywasm/src/interpreter/mod.rs
+++ b/crates/tinywasm/src/interpreter/mod.rs
@@ -1,14 +1,13 @@
-mod executor;
-mod num_helpers;
+pub(crate) mod executor;
+pub(crate) mod num_helpers;
 pub(crate) mod stack;
+mod values;
 
-#[doc(hidden)]
-pub use stack::values;
-pub use stack::values::*;
-
-pub(crate) use stack::{CallFrame, Stack};
+#[cfg(not(feature = "std"))]
+mod no_std_floats;
 
 use crate::{Result, Store};
+pub use values::*;
 
 /// The main TinyWasm runtime.
 ///
@@ -17,7 +16,7 @@ use crate::{Result, Store};
 pub struct InterpreterRuntime {}
 
 impl InterpreterRuntime {
-    pub(crate) fn exec(&self, store: &mut Store, stack: &mut Stack) -> Result<()> {
+    pub(crate) fn exec(&self, store: &mut Store, stack: &mut stack::Stack) -> Result<()> {
         executor::Executor::new(store, stack)?.run_to_completion()
     }
 }
diff --git a/crates/tinywasm/src/interpreter/stack/block_stack.rs b/crates/tinywasm/src/interpreter/stack/block_stack.rs
index cef536a..6121bec 100644
--- a/crates/tinywasm/src/interpreter/stack/block_stack.rs
+++ b/crates/tinywasm/src/interpreter/stack/block_stack.rs
@@ -1,7 +1,7 @@
 use crate::{cold, unlikely, Error, Result};
 use alloc::vec::Vec;
 
-use super::values::{StackHeight, StackLocation};
+use crate::interpreter::values::{StackHeight, StackLocation};
 
 #[derive(Debug)]
 pub(crate) struct BlockStack(Vec<BlockFrame>);
diff --git a/crates/tinywasm/src/interpreter/stack/call_stack.rs b/crates/tinywasm/src/interpreter/stack/call_stack.rs
index 8e9dbe7..18eac4f 100644
--- a/crates/tinywasm/src/interpreter/stack/call_stack.rs
+++ b/crates/tinywasm/src/interpreter/stack/call_stack.rs
@@ -1,5 +1,5 @@
-use super::values::{InternalValue, TinyWasmValue, Value128, Value32, Value64, ValueRef};
 use super::BlockType;
+use crate::interpreter::values::*;
 use crate::unlikely;
 use crate::{Result, Trap};
 
@@ -98,6 +98,7 @@ impl CallFrame {
 
     /// Break to a block at the given index (relative to the current frame)
     /// Returns `None` if there is no block at the given index (e.g. if we need to return, this is handled by the caller)
+    #[inline(always)]
     pub(crate) fn break_to(
         &mut self,
         break_to_relative: u32,
diff --git a/crates/tinywasm/src/interpreter/stack/mod.rs b/crates/tinywasm/src/interpreter/stack/mod.rs
index 3902bd2..c526c4a 100644
--- a/crates/tinywasm/src/interpreter/stack/mod.rs
+++ b/crates/tinywasm/src/interpreter/stack/mod.rs
@@ -1,10 +1,9 @@
 mod block_stack;
 mod call_stack;
 mod value_stack;
-pub mod values;
 
 pub(crate) use block_stack::{BlockFrame, BlockStack, BlockType};
-pub(crate) use call_stack::{CallFrame, CallStack};
+pub(crate) use call_stack::{CallFrame, CallStack, Locals};
 pub(crate) use value_stack::ValueStack;
 
 /// A WebAssembly Stack
diff --git a/crates/tinywasm/src/interpreter/stack/value_stack.rs b/crates/tinywasm/src/interpreter/stack/value_stack.rs
index fc23b48..525d061 100644
--- a/crates/tinywasm/src/interpreter/stack/value_stack.rs
+++ b/crates/tinywasm/src/interpreter/stack/value_stack.rs
@@ -1,8 +1,7 @@
 use alloc::vec::Vec;
 use tinywasm_types::{ValType, WasmValue};
 
-use super::values::*;
-use crate::Result;
+use crate::{interpreter::values::*, Result};
 pub(crate) const STACK_32_SIZE: usize = 1024 * 128;
 pub(crate) const STACK_64_SIZE: usize = 1024 * 128;
 pub(crate) const STACK_128_SIZE: usize = 1024 * 128;
@@ -51,6 +50,7 @@ impl ValueStack {
         T::stack_pop(self).map(|_| ())
     }
 
+    // TODO: this needs to re-introduce the top replacement optimization
     pub(crate) fn select<T: InternalValue>(&mut self) -> Result<()> {
         let cond: i32 = self.pop()?;
         let val2: T = self.pop()?;
@@ -61,6 +61,8 @@ impl ValueStack {
         Ok(())
     }
 
+    // TODO: this needs to re-introduce the top replacement optimization
+    #[inline(always)]
     pub(crate) fn calculate<T: InternalValue, U: InternalValue>(&mut self, func: fn(T, T) -> Result<U>) -> Result<()> {
         let v2 = T::stack_pop(self)?;
         let v1 = T::stack_pop(self)?;
@@ -68,6 +70,7 @@ impl ValueStack {
         Ok(())
     }
 
+    // TODO: this needs to re-introduce the top replacement optimization
     pub(crate) fn replace_top<T: InternalValue, U: InternalValue>(&mut self, func: fn(T) -> Result<U>) -> Result<()> {
         let v1 = T::stack_pop(self)?;
         U::stack_push(self, func(v1)?);
diff --git a/crates/tinywasm/src/interpreter/stack/values.rs b/crates/tinywasm/src/interpreter/stack/values.rs
deleted file mode 100644
index 6e8274f..0000000
--- a/crates/tinywasm/src/interpreter/stack/values.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-#![allow(missing_docs)]
-use super::{call_stack::Locals, ValueStack};
-use crate::{Error, Result};
-use tinywasm_types::{LocalAddr, ValType, WasmValue};
-
-pub(crate) type Value32 = u32;
-pub(crate) type Value64 = u64;
-pub(crate) type Value128 = u128;
-pub(crate) type ValueRef = Option<u32>;
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-/// A untyped WebAssembly value
-pub enum TinyWasmValue {
-    Value32(Value32),
-    Value64(Value64),
-    Value128(Value128),
-    ValueRef(ValueRef),
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct StackLocation {
-    pub(crate) s32: u32,
-    pub(crate) s64: u32,
-    pub(crate) s128: u32,
-    pub(crate) sref: u32,
-}
-
-#[derive(Debug, Clone, Copy, Default)]
-pub(crate) struct StackHeight {
-    pub(crate) s32: u16,
-    pub(crate) s64: u16,
-    pub(crate) s128: u16,
-    pub(crate) sref: u16,
-}
-
-impl From<ValType> for StackHeight {
-    fn from(value: ValType) -> Self {
-        match value {
-            ValType::I32 | ValType::F32 => Self { s32: 1, ..Default::default() },
-            ValType::I64 | ValType::F64 => Self { s64: 1, ..Default::default() },
-            ValType::V128 => Self { s128: 1, ..Default::default() },
-            ValType::RefExtern | ValType::RefFunc => Self { sref: 1, ..Default::default() },
-        }
-    }
-}
-
-impl From<&[ValType]> for StackHeight {
-    fn from(value: &[ValType]) -> Self {
-        let mut s32 = 0;
-        let mut s64 = 0;
-        let mut s128 = 0;
-        let mut sref = 0;
-        for val_type in value.iter() {
-            match val_type {
-                ValType::I32 | ValType::F32 => s32 += 1,
-                ValType::I64 | ValType::F64 => s64 += 1,
-                ValType::V128 => s128 += 1,
-                ValType::RefExtern | ValType::RefFunc => sref += 1,
-            }
-        }
-        Self { s32, s64, s128, sref }
-    }
-}
-
-impl TinyWasmValue {
-    pub fn unwrap_32(&self) -> Value32 {
-        match self {
-            TinyWasmValue::Value32(v) => *v,
-            _ => unreachable!("Expected Value32"),
-        }
-    }
-
-    pub fn unwrap_64(&self) -> Value64 {
-        match self {
-            TinyWasmValue::Value64(v) => *v,
-            _ => unreachable!("Expected Value64"),
-        }
-    }
-
-    pub fn unwrap_128(&self) -> Value128 {
-        match self {
-            TinyWasmValue::Value128(v) => *v,
-            _ => unreachable!("Expected Value128"),
-        }
-    }
-
-    pub fn unwrap_ref(&self) -> ValueRef {
-        match self {
-            TinyWasmValue::ValueRef(v) => *v,
-            _ => unreachable!("Expected ValueRef"),
-        }
-    }
-
-    pub fn attach_type(&self, ty: ValType) -> WasmValue {
-        match ty {
-            ValType::I32 => WasmValue::I32(self.unwrap_32() as i32),
-            ValType::I64 => WasmValue::I64(self.unwrap_64() as i64),
-            ValType::F32 => WasmValue::F32(f32::from_bits(self.unwrap_32())),
-            ValType::F64 => WasmValue::F64(f64::from_bits(self.unwrap_64())),
-            ValType::V128 => WasmValue::V128(self.unwrap_128()),
-            ValType::RefExtern => match self.unwrap_ref() {
-                Some(v) => WasmValue::RefExtern(v),
-                None => WasmValue::RefNull(ValType::RefExtern),
-            },
-            ValType::RefFunc => match self.unwrap_ref() {
-                Some(v) => WasmValue::RefFunc(v),
-                None => WasmValue::RefNull(ValType::RefFunc),
-            },
-        }
-    }
-}
-
-impl From<&WasmValue> for TinyWasmValue {
-    fn from(value: &WasmValue) -> Self {
-        match value {
-            WasmValue::I32(v) => TinyWasmValue::Value32(*v as u32),
-            WasmValue::I64(v) => TinyWasmValue::Value64(*v as u64),
-            WasmValue::V128(v) => TinyWasmValue::Value128(*v),
-            WasmValue::F32(v) => TinyWasmValue::Value32(v.to_bits()),
-            WasmValue::F64(v) => TinyWasmValue::Value64(v.to_bits()),
-            WasmValue::RefFunc(v) => TinyWasmValue::ValueRef(Some(*v)),
-            WasmValue::RefExtern(v) => TinyWasmValue::ValueRef(Some(*v)),
-            WasmValue::RefNull(_) => TinyWasmValue::ValueRef(None),
-        }
-    }
-}
-
-impl From<WasmValue> for TinyWasmValue {
-    fn from(value: WasmValue) -> Self {
-        TinyWasmValue::from(&value)
-    }
-}
-
-mod sealed {
-    #[allow(unreachable_pub)]
-    pub trait Sealed {}
-}
-
-pub(crate) trait InternalValue: sealed::Sealed {
-    fn stack_push(stack: &mut ValueStack, value: Self);
-    fn stack_pop(stack: &mut ValueStack) -> Result<Self>
-    where
-        Self: Sized;
-    fn stack_peek(stack: &ValueStack) -> Result<Self>
-    where
-        Self: Sized;
-    fn local_get(locals: &Locals, index: LocalAddr) -> Result<Self>
-    where
-        Self: Sized;
-    fn local_set(locals: &mut Locals, index: LocalAddr, value: Self) -> Result<()>;
-}
-
-macro_rules! impl_internalvalue {
-    ($( $variant:ident, $stack:ident, $locals:ident, $internal:ty, $outer:ty, $to_internal:expr, $to_outer:expr )*) => {
-        $(
-            impl sealed::Sealed for $outer {}
-
-            impl From<$outer> for TinyWasmValue {
-                fn from(value: $outer) -> Self {
-                    TinyWasmValue::$variant($to_internal(value))
-                }
-            }
-
-            impl InternalValue for $outer {
-                #[inline]
-                fn stack_push(stack: &mut ValueStack, value: Self) {
-                    stack.$stack.push($to_internal(value));
-                }
-                #[inline]
-                fn stack_pop(stack: &mut ValueStack) -> Result<Self> {
-                    stack.$stack.pop().ok_or(Error::ValueStackUnderflow).map($to_outer)
-                }
-                #[inline]
-                fn stack_peek(stack: &ValueStack) -> Result<Self> {
-                    stack.$stack.last().copied().ok_or(Error::ValueStackUnderflow).map($to_outer)
-                }
-                #[inline]
-                fn local_get(locals: &Locals, index: LocalAddr) -> Result<Self> {
-                    Ok($to_outer(locals.$locals[index as usize]))
-                }
-                #[inline]
-                fn local_set(locals: &mut Locals, index: LocalAddr, value: Self) -> Result<()> {
-                    locals.$locals[index as usize] = $to_internal(value);
-                    Ok(())
-                }
-            }
-        )*
-    };
-}
-
-impl_internalvalue! {
-    Value32, stack_32, locals_32, u32, u32, |v| v, |v| v
-    Value64, stack_64, locals_64, u64, u64, |v| v, |v| v
-    Value32, stack_32, locals_32, u32, i32, |v| v as u32, |v: u32| v as i32
-    Value64, stack_64, locals_64, u64, i64, |v| v as u64, |v| v as i64
-    Value32, stack_32, locals_32, u32, f32, f32::to_bits, f32::from_bits
-    Value64, stack_64, locals_64, u64, f64, f64::to_bits, f64::from_bits
-    Value128, stack_128, locals_128, Value128, Value128, |v| v, |v| v
-    ValueRef, stack_ref, locals_ref, ValueRef, ValueRef, |v| v, |v| v
-}
diff --git a/crates/tinywasm/src/interpreter/values.rs b/crates/tinywasm/src/interpreter/values.rs
new file mode 100644
index 0000000..c934e51
--- /dev/null
+++ b/crates/tinywasm/src/interpreter/values.rs
@@ -0,0 +1,214 @@
+#![allow(missing_docs)]
+use crate::{Error, Result};
+use tinywasm_types::{LocalAddr, ValType, WasmValue};
+
+use super::stack::{Locals, ValueStack};
+
+pub(crate) type Value32 = u32;
+pub(crate) type Value64 = u64;
+pub(crate) type Value128 = u128;
+pub(crate) type ValueRef = Option<u32>;
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+/// A untyped WebAssembly value
+pub enum TinyWasmValue {
+    Value32(Value32),
+    Value64(Value64),
+    Value128(Value128),
+    ValueRef(ValueRef),
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct StackLocation {
+    pub(crate) s32: u32,
+    pub(crate) s64: u32,
+    pub(crate) s128: u32,
+    pub(crate) sref: u32,
+}
+
+#[derive(Debug, Clone, Copy, Default)]
+pub(crate) struct StackHeight {
+    pub(crate) s32: u16,
+    pub(crate) s64: u16,
+    pub(crate) s128: u16,
+    pub(crate) sref: u16,
+}
+
+impl From<ValType> for StackHeight {
+    fn from(value: ValType) -> Self {
+        match value {
+            ValType::I32 | ValType::F32 => Self { s32: 1, ..Default::default() },
+            ValType::I64 | ValType::F64 => Self { s64: 1, ..Default::default() },
+            ValType::V128 => Self { s128: 1, ..Default::default() },
+            ValType::RefExtern | ValType::RefFunc => Self { sref: 1, ..Default::default() },
+        }
+    }
+}
+
+impl From<&[ValType]> for StackHeight {
+    fn from(value: &[ValType]) -> Self {
+        let mut s32 = 0;
+        let mut s64 = 0;
+        let mut s128 = 0;
+        let mut sref = 0;
+        for val_type in value.iter() {
+            match val_type {
+                ValType::I32 | ValType::F32 => s32 += 1,
+                ValType::I64 | ValType::F64 => s64 += 1,
+                ValType::V128 => s128 += 1,
+                ValType::RefExtern | ValType::RefFunc => sref += 1,
+            }
+        }
+        Self { s32, s64, s128, sref }
+    }
+}
+
+impl TinyWasmValue {
+    pub fn unwrap_32(&self) -> Value32 {
+        match self {
+            TinyWasmValue::Value32(v) => *v,
+            _ => unreachable!("Expected Value32"),
+        }
+    }
+
+    pub fn unwrap_64(&self) -> Value64 {
+        match self {
+            TinyWasmValue::Value64(v) => *v,
+            _ => unreachable!("Expected Value64"),
+        }
+    }
+
+    pub fn unwrap_128(&self) -> Value128 {
+        match self {
+            TinyWasmValue::Value128(v) => *v,
+            _ => unreachable!("Expected Value128"),
+        }
+    }
+
+    pub fn unwrap_ref(&self) -> ValueRef {
+        match self {
+            TinyWasmValue::ValueRef(v) => *v,
+            _ => unreachable!("Expected ValueRef"),
+        }
+    }
+
+    pub fn attach_type(&self, ty: ValType) -> WasmValue {
+        match ty {
+            ValType::I32 => WasmValue::I32(self.unwrap_32() as i32),
+            ValType::I64 => WasmValue::I64(self.unwrap_64() as i64),
+            ValType::F32 => WasmValue::F32(f32::from_bits(self.unwrap_32())),
+            ValType::F64 => WasmValue::F64(f64::from_bits(self.unwrap_64())),
+            ValType::V128 => WasmValue::V128(self.unwrap_128()),
+            ValType::RefExtern => match self.unwrap_ref() {
+                Some(v) => WasmValue::RefExtern(v),
+                None => WasmValue::RefNull(ValType::RefExtern),
+            },
+            ValType::RefFunc => match self.unwrap_ref() {
+                Some(v) => WasmValue::RefFunc(v),
+                None => WasmValue::RefNull(ValType::RefFunc),
+            },
+        }
+    }
+}
+
+impl From<&WasmValue> for TinyWasmValue {
+    fn from(value: &WasmValue) -> Self {
+        match value {
+            WasmValue::I32(v) => TinyWasmValue::Value32(*v as u32),
+            WasmValue::I64(v) => TinyWasmValue::Value64(*v as u64),
+            WasmValue::V128(v) => TinyWasmValue::Value128(*v),
+            WasmValue::F32(v) => TinyWasmValue::Value32(v.to_bits()),
+            WasmValue::F64(v) => TinyWasmValue::Value64(v.to_bits()),
+            WasmValue::RefFunc(v) => TinyWasmValue::ValueRef(Some(*v)),
+            WasmValue::RefExtern(v) => TinyWasmValue::ValueRef(Some(*v)),
+            WasmValue::RefNull(_) => TinyWasmValue::ValueRef(None),
+        }
+    }
+}
+
+impl From<WasmValue> for TinyWasmValue {
+    fn from(value: WasmValue) -> Self {
+        TinyWasmValue::from(&value)
+    }
+}
+
+mod sealed {
+    #[allow(unreachable_pub)]
+    pub trait Sealed {}
+}
+
+pub(crate) trait InternalValue: sealed::Sealed {
+    fn stack_push(stack: &mut ValueStack, value: Self);
+    fn stack_pop(stack: &mut ValueStack) -> Result<Self>
+    where
+        Self: Sized;
+    fn stack_peek(stack: &ValueStack) -> Result<Self>
+    where
+        Self: Sized;
+    fn local_get(locals: &Locals, index: LocalAddr) -> Result<Self>
+    where
+        Self: Sized;
+    fn local_set(locals: &mut Locals, index: LocalAddr, value: Self) -> Result<()>;
+}
+
+macro_rules! impl_internalvalue {
+    ($( $variant:ident, $stack:ident, $locals:ident, $internal:ty, $outer:ty, $to_internal:expr, $to_outer:expr )*) => {
+        $(
+            impl sealed::Sealed for $outer {}
+
+            impl From<$outer> for TinyWasmValue {
+                #[inline(always)]
+                fn from(value: $outer) -> Self {
+                    TinyWasmValue::$variant($to_internal(value))
+                }
+            }
+
+            impl InternalValue for $outer {
+                #[inline(always)]
+                fn stack_push(stack: &mut ValueStack, value: Self) {
+                    stack.$stack.push($to_internal(value));
+                }
+                #[inline(always)]
+                fn stack_pop(stack: &mut ValueStack) -> Result<Self> {
+                    match stack.$stack.pop() {
+                        Some(v) => Ok($to_outer(v)),
+                        None => {
+                            crate::cold();
+                            Err(Error::ValueStackUnderflow)
+                        },
+                    }
+                }
+                #[inline(always)]
+                fn stack_peek(stack: &ValueStack) -> Result<Self> {
+                    match stack.$stack.last() {
+                        Some(v) => Ok($to_outer(*v)),
+                        None => {
+                            crate::cold();
+                            Err(Error::ValueStackUnderflow)
+                        },
+                    }
+                }
+                #[inline(always)]
+                fn local_get(locals: &Locals, index: LocalAddr) -> Result<Self> {
+                    Ok($to_outer(locals.$locals[index as usize]))
+                }
+                #[inline(always)]
+                fn local_set(locals: &mut Locals, index: LocalAddr, value: Self) -> Result<()> {
+                    locals.$locals[index as usize] = $to_internal(value);
+                    Ok(())
+                }
+            }
+        )*
+    };
+}
+
+impl_internalvalue! {
+    Value32, stack_32, locals_32, u32, u32, |v| v, |v| v
+    Value64, stack_64, locals_64, u64, u64, |v| v, |v| v
+    Value32, stack_32, locals_32, u32, i32, |v| v as u32, |v: u32| v as i32
+    Value64, stack_64, locals_64, u64, i64, |v| v as u64, |v| v as i64
+    Value32, stack_32, locals_32, u32, f32, f32::to_bits, f32::from_bits
+    Value64, stack_64, locals_64, u64, f64, f64::to_bits, f64::from_bits
+    Value128, stack_128, locals_128, Value128, Value128, |v| v, |v| v
+    ValueRef, stack_ref, locals_ref, ValueRef, ValueRef, |v| v, |v| v
+}
diff --git a/crates/tinywasm/src/lib.rs b/crates/tinywasm/src/lib.rs
index c1c2549..cf6f585 100644
--- a/crates/tinywasm/src/lib.rs
+++ b/crates/tinywasm/src/lib.rs
@@ -78,10 +78,11 @@ extern crate alloc;
 // log for logging (optional).
 #[cfg(feature = "logging")]
 #[allow(clippy::single_component_path_imports)]
-use _log as log;
+use log;
 
 // noop fallback if logging is disabled.
 #[cfg(not(feature = "logging"))]
+#[allow(unused_imports, unused_macros)]
 pub(crate) mod log {
     macro_rules! debug    ( ($($tt:tt)*) => {{}} );
     macro_rules! info    ( ($($tt:tt)*) => {{}} );
diff --git a/crates/tinywasm/tests/generated/2.0.csv b/crates/tinywasm/tests/generated/2.0.csv
index 3ad4978..1018f36 100644
--- a/crates/tinywasm/tests/generated/2.0.csv
+++ b/crates/tinywasm/tests/generated/2.0.csv
@@ -3,4 +3,5 @@
 0.4.1,27551,335,[{"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":"bulk.wast","passed":75,"failed":42},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":170,"failed":0},{"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":99,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":186,"failed":0},{"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":132,"failed":0},{"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_copy.wast","passed":4450,"failed":0},{"name":"memory_fill.wast","passed":100,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_init.wast","passed":240,"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":"ref_func.wast","passed":9,"failed":8},{"name":"ref_is_null.wast","passed":4,"failed":12},{"name":"ref_null.wast","passed":1,"failed":2},{"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":"table-sub.wast","passed":2,"failed":0},{"name":"table.wast","passed":19,"failed":0},{"name":"table_copy.wast","passed":1613,"failed":115},{"name":"table_fill.wast","passed":23,"failed":22},{"name":"table_get.wast","passed":10,"failed":6},{"name":"table_grow.wast","passed":21,"failed":29},{"name":"table_init.wast","passed":719,"failed":61},{"name":"table_set.wast","passed":19,"failed":7},{"name":"table_size.wast","passed":8,"failed":31},{"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":"unreached-valid.wast","passed":7,"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.5.0,27551,335,[{"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":"bulk.wast","passed":75,"failed":42},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":170,"failed":0},{"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":99,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":186,"failed":0},{"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":132,"failed":0},{"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_copy.wast","passed":4450,"failed":0},{"name":"memory_fill.wast","passed":100,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_init.wast","passed":240,"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":"ref_func.wast","passed":9,"failed":8},{"name":"ref_is_null.wast","passed":4,"failed":12},{"name":"ref_null.wast","passed":1,"failed":2},{"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":"table-sub.wast","passed":2,"failed":0},{"name":"table.wast","passed":19,"failed":0},{"name":"table_copy.wast","passed":1613,"failed":115},{"name":"table_fill.wast","passed":23,"failed":22},{"name":"table_get.wast","passed":10,"failed":6},{"name":"table_grow.wast","passed":21,"failed":29},{"name":"table_init.wast","passed":719,"failed":61},{"name":"table_set.wast","passed":19,"failed":7},{"name":"table_size.wast","passed":8,"failed":31},{"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":"unreached-valid.wast","passed":7,"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.6.1,27572,335,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"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":"bulk.wast","passed":75,"failed":42},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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_copy.wast","passed":4450,"failed":0},{"name":"memory_fill.wast","passed":100,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_init.wast","passed":240,"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":"ref_func.wast","passed":9,"failed":8},{"name":"ref_is_null.wast","passed":4,"failed":12},{"name":"ref_null.wast","passed":1,"failed":2},{"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":"table-sub.wast","passed":2,"failed":0},{"name":"table.wast","passed":19,"failed":0},{"name":"table_copy.wast","passed":1613,"failed":115},{"name":"table_fill.wast","passed":23,"failed":22},{"name":"table_get.wast","passed":10,"failed":6},{"name":"table_grow.wast","passed":21,"failed":29},{"name":"table_init.wast","passed":719,"failed":61},{"name":"table_set.wast","passed":19,"failed":7},{"name":"table_size.wast","passed":8,"failed":31},{"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":"unreached-valid.wast","passed":7,"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.7.0,27871,48,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":104,"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":"bulk.wast","passed":112,"failed":5},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":88,"failed":0},{"name":"memory_copy.wast","passed":4450,"failed":0},{"name":"memory_fill.wast","passed":100,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_init.wast","passed":240,"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":"obsolete-keywords.wast","passed":11,"failed":0},{"name":"ref_func.wast","passed":17,"failed":0},{"name":"ref_is_null.wast","passed":16,"failed":0},{"name":"ref_null.wast","passed":3,"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":"table-sub.wast","passed":2,"failed":0},{"name":"table.wast","passed":19,"failed":0},{"name":"table_copy.wast","passed":1728,"failed":0},{"name":"table_fill.wast","passed":45,"failed":0},{"name":"table_get.wast","passed":16,"failed":0},{"name":"table_grow.wast","passed":50,"failed":0},{"name":"table_init.wast","passed":737,"failed":43},{"name":"table_set.wast","passed":26,"failed":0},{"name":"table_size.wast","passed":39,"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":"unreached-valid.wast","passed":7,"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.7.0,27572,335,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"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":"bulk.wast","passed":75,"failed":42},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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_copy.wast","passed":4450,"failed":0},{"name":"memory_fill.wast","passed":100,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_init.wast","passed":240,"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":"ref_func.wast","passed":9,"failed":8},{"name":"ref_is_null.wast","passed":4,"failed":12},{"name":"ref_null.wast","passed":1,"failed":2},{"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":"table-sub.wast","passed":2,"failed":0},{"name":"table.wast","passed":19,"failed":0},{"name":"table_copy.wast","passed":1613,"failed":115},{"name":"table_fill.wast","passed":23,"failed":22},{"name":"table_get.wast","passed":10,"failed":6},{"name":"table_grow.wast","passed":21,"failed":29},{"name":"table_init.wast","passed":719,"failed":61},{"name":"table_set.wast","passed":19,"failed":7},{"name":"table_size.wast","passed":8,"failed":31},{"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":"unreached-valid.wast","passed":7,"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.8.0-alpha.0,27871,48,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":104,"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":"bulk.wast","passed":112,"failed":5},{"name":"call.wast","passed":91,"failed":0},{"name":"call_indirect.wast","passed":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":88,"failed":0},{"name":"memory_copy.wast","passed":4450,"failed":0},{"name":"memory_fill.wast","passed":100,"failed":0},{"name":"memory_grow.wast","passed":96,"failed":0},{"name":"memory_init.wast","passed":240,"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":"obsolete-keywords.wast","passed":11,"failed":0},{"name":"ref_func.wast","passed":17,"failed":0},{"name":"ref_is_null.wast","passed":16,"failed":0},{"name":"ref_null.wast","passed":3,"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":"table-sub.wast","passed":2,"failed":0},{"name":"table.wast","passed":19,"failed":0},{"name":"table_copy.wast","passed":1728,"failed":0},{"name":"table_fill.wast","passed":45,"failed":0},{"name":"table_get.wast","passed":16,"failed":0},{"name":"table_grow.wast","passed":50,"failed":0},{"name":"table_init.wast","passed":737,"failed":43},{"name":"table_set.wast","passed":26,"failed":0},{"name":"table_size.wast","passed":39,"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":"unreached-valid.wast","passed":7,"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/mvp.csv b/crates/tinywasm/tests/generated/mvp.csv
index 41b2d92..dc213fc 100644
--- a/crates/tinywasm/tests/generated/mvp.csv
+++ b/crates/tinywasm/tests/generated/mvp.csv
@@ -8,4 +8,5 @@
 0.5.0,20272,0,[{"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":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":"table.wast","passed":19,"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":"unreached-valid.wast","passed":7,"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.6.0,20278,0,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"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":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":"table.wast","passed":19,"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":"unreached-valid.wast","passed":7,"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.6.1,20278,0,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"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":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":"table.wast","passed":19,"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":"unreached-valid.wast","passed":7,"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.7.0,20279,0,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":104,"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":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":88,"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":"table.wast","passed":19,"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":"unreached-valid.wast","passed":7,"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.7.0,20278,0,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"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":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":"table.wast","passed":19,"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":"unreached-valid.wast","passed":7,"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.8.0-alpha.0,20279,0,[{"name":"address.wast","passed":260,"failed":0},{"name":"align.wast","passed":162,"failed":0},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":104,"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":170,"failed":0},{"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":98,"failed":0},{"name":"endianness.wast","passed":69,"failed":0},{"name":"exports.wast","passed":96,"failed":0},{"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":179,"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":186,"failed":0},{"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":132,"failed":0},{"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":88,"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":"table.wast","passed":19,"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":"unreached-valid.wast","passed":7,"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/test-mvp.rs b/crates/tinywasm/tests/test-mvp.rs
index a1c2067..445b7fa 100644
--- a/crates/tinywasm/tests/test-mvp.rs
+++ b/crates/tinywasm/tests/test-mvp.rs
@@ -1,5 +1,4 @@
 mod testsuite;
-use _log as log;
 use eyre::{eyre, Result};
 use owo_colors::OwoColorize;
 use testsuite::TestSuite;
diff --git a/crates/tinywasm/tests/test-two.rs b/crates/tinywasm/tests/test-two.rs
index b5ed9c8..e710d1a 100644
--- a/crates/tinywasm/tests/test-two.rs
+++ b/crates/tinywasm/tests/test-two.rs
@@ -1,5 +1,4 @@
 mod testsuite;
-use _log as log;
 use eyre::{eyre, Result};
 use owo_colors::OwoColorize;
 use testsuite::TestSuite;
diff --git a/crates/tinywasm/tests/test-wast.rs b/crates/tinywasm/tests/test-wast.rs
index fa3af91..1d3fbe3 100644
--- a/crates/tinywasm/tests/test-wast.rs
+++ b/crates/tinywasm/tests/test-wast.rs
@@ -1,6 +1,5 @@
 use std::path::PathBuf;
 
-use _log as log;
 use eyre::{bail, eyre, Result};
 use owo_colors::OwoColorize;
 use testsuite::TestSuite;
diff --git a/crates/tinywasm/tests/testsuite/mod.rs b/crates/tinywasm/tests/testsuite/mod.rs
index 6223982..35f0607 100644
--- a/crates/tinywasm/tests/testsuite/mod.rs
+++ b/crates/tinywasm/tests/testsuite/mod.rs
@@ -1,6 +1,5 @@
 #![allow(dead_code)] // rust analyzer doesn't recognize that code is used by tests without harness
 
-use _log as log;
 use eyre::Result;
 use owo_colors::OwoColorize;
 use std::io::{BufRead, Seek, SeekFrom};
diff --git a/crates/tinywasm/tests/testsuite/run.rs b/crates/tinywasm/tests/testsuite/run.rs
index 456b0a4..c005b9a 100644
--- a/crates/tinywasm/tests/testsuite/run.rs
+++ b/crates/tinywasm/tests/testsuite/run.rs
@@ -3,7 +3,6 @@ use crate::testsuite::util::*;
 use std::{borrow::Cow, collections::HashMap};
 
 use super::TestSuite;
-use _log as log;
 use eyre::{eyre, Result};
 use log::{debug, error, info};
 use tinywasm::{Extern, Imports, ModuleInstance};
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index df89c89..b643964 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -9,7 +9,7 @@ repository.workspace=true
 rust-version.workspace=true
 
 [dependencies]
-log={version="0.4", optional=true}
+log={workspace=true, optional=true}
 rkyv={version="0.7", optional=true, default-features=false, features=["size_32", "validation"]}
 bytecheck={version="0.7", optional=true}
 
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index cdee7e6..db39689 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -14,14 +14,19 @@ use core::{fmt::Debug, ops::Range};
 
 // log for logging (optional).
 #[cfg(feature = "logging")]
-#[allow(clippy::single_component_path_imports, unused)]
+#[allow(clippy::single_component_path_imports, unused_imports)]
 use log;
 
+// noop fallback if logging is disabled.
 #[cfg(not(feature = "logging"))]
-#[macro_use]
+#[allow(unused_imports, unused_macros)]
 pub(crate) mod log {
+    macro_rules! debug    ( ($($tt:tt)*) => {{}} );
+    macro_rules! info    ( ($($tt:tt)*) => {{}} );
     macro_rules! error    ( ($($tt:tt)*) => {{}} );
+    pub(crate) use debug;
     pub(crate) use error;
+    pub(crate) use info;
 }
 
 mod instructions;
-- 
cgit v1.3.1