test: make tests work on more targets (#11)

- Tests can now be run on more targets (Fixes #7)
- Nightly version has been updated to fix broken builds in some cases (Fixes #8)

15 files changed, 31 insertions, 433 deletions

diff --git a/crates/benchmarks/Cargo.toml b/crates/benchmarks/Cargo.toml
deleted file mode 100644
index b9225c1..0000000
--- a/crates/benchmarks/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name="benchmarks"
-publish=false
-edition.workspace=true
-
-[dependencies]
-criterion={version="0.5", features=["html_reports"]}
-tinywasm={path="../../crates/tinywasm", features=["unsafe"]}
-wat={version="1.0"}
-wasmi={version="0.31", features=["std"]}
-wasmer={version="4.2", features=["cranelift", "singlepass"]}
-argon2={version="0.5"}
-
-[[bench]]
-name="selfhosted"
-harness=false
-
-[[bench]]
-name="fibonacci"
-harness=false
-
-[[bench]]
-name="argon2id"
-harness=false
diff --git a/crates/benchmarks/benches/argon2id.rs b/crates/benchmarks/benches/argon2id.rs
deleted file mode 100644
index 7c1ffc5..0000000
--- a/crates/benchmarks/benches/argon2id.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-mod util;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use util::wasm_to_twasm;
-
-fn run_tinywasm(twasm: &[u8], params: (i32, i32, i32), name: &str) {
-    let (mut store, instance) = util::tinywasm(twasm);
-    let argon2 = instance.exported_func::<(i32, i32, i32), i32>(&store, name).expect("exported_func");
-    argon2.call(&mut store, params).expect("call");
-}
-
-fn run_wasmi(wasm: &[u8], params: (i32, i32, i32), name: &str) {
-    let (module, mut store, linker) = util::wasmi(wasm);
-    let instance = linker.instantiate(&mut store, &module).expect("instantiate").start(&mut store).expect("start");
-    let argon2 = instance.get_typed_func::<(i32, i32, i32), i32>(&mut store, name).expect("get_typed_func");
-    argon2.call(&mut store, params).expect("call");
-}
-
-fn run_wasmer(wasm: &[u8], params: (i32, i32, i32), name: &str) {
-    use wasmer::Value;
-    let (mut store, instance) = util::wasmer(wasm);
-    let argon2 = instance.exports.get_function(name).expect("get_function");
-    argon2.call(&mut store, &[Value::I32(params.0), Value::I32(params.1), Value::I32(params.2)]).expect("call");
-}
-
-fn run_native(params: (i32, i32, i32)) {
-    fn run_native(m_cost: i32, t_cost: i32, p_cost: i32) {
-        let password = b"password";
-        let salt = b"some random salt";
-
-        let params = argon2::Params::new(m_cost as u32, t_cost as u32, p_cost as u32, None).unwrap();
-        let argon = argon2::Argon2::new(argon2::Algorithm::Argon2id, argon2::Version::V0x13, params);
-
-        let mut hash = [0u8; 32];
-        argon.hash_password_into(password, salt, &mut hash).unwrap();
-    }
-    run_native(params.0, params.1, params.2)
-}
-
-const ARGON2ID: &[u8] = include_bytes!("../../../examples/rust/out/argon2id.wasm");
-fn criterion_benchmark(c: &mut Criterion) {
-    let twasm = wasm_to_twasm(ARGON2ID);
-    let params = (1000, 2, 1);
-
-    let mut group = c.benchmark_group("argon2id");
-    group.measurement_time(std::time::Duration::from_secs(7));
-    group.sample_size(10);
-
-    group.bench_function("native", |b| b.iter(|| run_native(black_box(params))));
-    group.bench_function("tinywasm", |b| b.iter(|| run_tinywasm(&twasm, black_box(params), "argon2id")));
-    group.bench_function("wasmi", |b| b.iter(|| run_wasmi(ARGON2ID, black_box(params), "argon2id")));
-    group.bench_function("wasmer", |b| b.iter(|| run_wasmer(ARGON2ID, black_box(params), "argon2id")));
-}
-
-criterion_group!(
-    name = benches;
-    config = Criterion::default().significance_level(0.1);
-    targets = criterion_benchmark
-);
-
-criterion_main!(benches);
diff --git a/crates/benchmarks/benches/fibonacci.rs b/crates/benchmarks/benches/fibonacci.rs
deleted file mode 100644
index 8a4dab2..0000000
--- a/crates/benchmarks/benches/fibonacci.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-mod util;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use util::wasm_to_twasm;
-
-fn run_tinywasm(twasm: &[u8], iterations: i32, name: &str) {
-    let (mut store, instance) = util::tinywasm(twasm);
-    let fib = instance.exported_func::<i32, i32>(&store, name).expect("exported_func");
-    fib.call(&mut store, iterations).expect("call");
-}
-
-fn run_wasmi(wasm: &[u8], iterations: i32, name: &str) {
-    let (module, mut store, linker) = util::wasmi(wasm);
-    let instance = linker.instantiate(&mut store, &module).expect("instantiate").start(&mut store).expect("start");
-    let fib = instance.get_typed_func::<i32, i32>(&mut store, name).expect("get_typed_func");
-    fib.call(&mut store, iterations).expect("call");
-}
-
-fn run_wasmer(wasm: &[u8], iterations: i32, name: &str) {
-    use wasmer::*;
-    let compiler = wasmer::Singlepass::default();
-    let mut store = Store::new(compiler);
-    let import_object = imports! {};
-    let module = wasmer::Module::from_binary(&store, wasm).expect("wasmer::Module::from_binary");
-    let instance = Instance::new(&mut store, &module, &import_object).expect("Instance::new");
-    let fib = instance.exports.get_typed_function::<i32, i32>(&store, name).expect("get_function");
-    fib.call(&mut store, iterations).expect("call");
-}
-
-fn run_native(n: i32) -> i32 {
-    let mut sum = 0;
-    let mut last = 0;
-    let mut curr = 1;
-    for _i in 1..n {
-        sum = last + curr;
-        last = curr;
-        curr = sum;
-    }
-    sum
-}
-
-fn run_native_recursive(n: i32) -> i32 {
-    if n <= 1 {
-        return n;
-    }
-    run_native_recursive(n - 1) + run_native_recursive(n - 2)
-}
-
-const FIBONACCI: &[u8] = include_bytes!("../../../examples/rust/out/fibonacci.wasm");
-fn criterion_benchmark(c: &mut Criterion) {
-    let twasm = wasm_to_twasm(FIBONACCI);
-
-    {
-        let mut group = c.benchmark_group("fibonacci");
-        group.bench_function("native", |b| b.iter(|| run_native(black_box(60))));
-        group.bench_function("tinywasm", |b| b.iter(|| run_tinywasm(&twasm, black_box(60), "fibonacci")));
-        group.bench_function("wasmi", |b| b.iter(|| run_wasmi(FIBONACCI, black_box(60), "fibonacci")));
-        group.bench_function("wasmer", |b| b.iter(|| run_wasmer(FIBONACCI, black_box(60), "fibonacci")));
-    }
-
-    {
-        let mut group = c.benchmark_group("fibonacci-recursive");
-        group.measurement_time(std::time::Duration::from_secs(5));
-        group.bench_function("native", |b| b.iter(|| run_native_recursive(black_box(26))));
-        group.bench_function("tinywasm", |b| b.iter(|| run_tinywasm(&twasm, black_box(26), "fibonacci_recursive")));
-        group.bench_function("wasmi", |b| b.iter(|| run_wasmi(FIBONACCI, black_box(26), "fibonacci_recursive")));
-        group.bench_function("wasmer", |b| b.iter(|| run_wasmer(FIBONACCI, black_box(26), "fibonacci_recursive")));
-    }
-}
-
-criterion_group!(
-    name = benches;
-    config = Criterion::default().significance_level(0.1);
-    targets = criterion_benchmark
-);
-
-criterion_main!(benches);
diff --git a/crates/benchmarks/benches/selfhosted.rs b/crates/benchmarks/benches/selfhosted.rs
deleted file mode 100644
index 94dfdce..0000000
--- a/crates/benchmarks/benches/selfhosted.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-mod util;
-use crate::util::twasm_to_module;
-use criterion::{criterion_group, criterion_main, Criterion};
-
-fn run_native() {
-    use tinywasm::*;
-    let module = tinywasm::Module::parse_bytes(include_bytes!("../../../examples/rust/out/print.wasm")).expect("parse");
-    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, Some(imports)).expect("instantiate");
-    let hello = instance.exported_func::<(i32, i32), ()>(&store, "add_and_print").expect("exported_func");
-    hello.call(&mut store, (2, 3)).expect("call");
-}
-
-fn run_tinywasm(twasm: &[u8]) {
-    use tinywasm::*;
-    let module = twasm_to_module(twasm);
-    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, Some(imports)).expect("instantiate");
-    let hello = instance.exported_func::<(), ()>(&store, "hello").expect("exported_func");
-    hello.call(&mut store, ()).expect("call");
-}
-
-fn run_wasmi(wasm: &[u8]) {
-    use wasmi::*;
-    let engine = Engine::default();
-    let module = wasmi::Module::new(&engine, wasm).expect("wasmi::Module::new");
-    let mut store = Store::new(&engine, ());
-    let mut linker = <Linker<()>>::new(&engine);
-    linker.define("env", "printi32", Func::wrap(&mut store, |_: Caller<'_, ()>, _: i32| {})).expect("define");
-    let instance = linker.instantiate(&mut store, &module).expect("instantiate").start(&mut store).expect("start");
-    let hello = instance.get_typed_func::<(), ()>(&mut store, "hello").expect("get_typed_func");
-    hello.call(&mut store, ()).expect("call");
-}
-
-fn run_wasmer(wasm: &[u8]) {
-    use wasmer::*;
-    let engine = wasmer::Engine::default();
-    let mut store = Store::default();
-    let import_object = imports! {
-        "env" => {
-            "printi32" => Function::new_typed(&mut store, |_: i32| {}),
-        },
-    };
-    let module = wasmer::Module::from_binary(&engine, wasm).expect("wasmer::Module::from_binary");
-    let instance = Instance::new(&mut store, &module, &import_object).expect("Instance::new");
-    let hello = instance.exports.get_function("hello").expect("get_function");
-    hello.call(&mut store, &[]).expect("call");
-}
-
-const TINYWASM: &[u8] = include_bytes!("../../../examples/rust/out/tinywasm.wasm");
-fn criterion_benchmark(c: &mut Criterion) {
-    {
-        let mut group = c.benchmark_group("selfhosted-parse");
-        group.bench_function("tinywasm", |b| b.iter(|| util::parse_wasm(TINYWASM)));
-    }
-
-    {
-        let twasm = util::wasm_to_twasm(TINYWASM);
-        let mut group = c.benchmark_group("selfhosted");
-        group.bench_function("native", |b| b.iter(run_native));
-        group.bench_function("tinywasm", |b| b.iter(|| run_tinywasm(&twasm)));
-        group.bench_function("wasmi", |b| b.iter(|| run_wasmi(TINYWASM)));
-        group.bench_function("wasmer", |b| b.iter(|| run_wasmer(TINYWASM)));
-    }
-}
-
-criterion_group!(
-    name = benches;
-    config = Criterion::default().sample_size(100).measurement_time(std::time::Duration::from_secs(5)).significance_level(0.1);
-    targets = criterion_benchmark
-);
-
-criterion_main!(benches);
diff --git a/crates/benchmarks/benches/util/mod.rs b/crates/benchmarks/benches/util/mod.rs
deleted file mode 100644
index 0df2a52..0000000
--- a/crates/benchmarks/benches/util/mod.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-#![allow(dead_code)]
-
-use tinywasm::{self, parser::Parser, types::TinyWasmModule};
-
-pub fn parse_wasm(wasm: &[u8]) -> TinyWasmModule {
-    let parser = Parser::new();
-    parser.parse_module_bytes(wasm).expect("parse_module_bytes")
-}
-
-pub fn wasm_to_twasm(wasm: &[u8]) -> Vec<u8> {
-    let parser = Parser::new();
-    let res = parser.parse_module_bytes(wasm).expect("parse_module_bytes");
-    res.serialize_twasm().to_vec()
-}
-
-#[inline]
-pub fn twasm_to_module(twasm: &[u8]) -> tinywasm::Module {
-    unsafe { TinyWasmModule::from_twasm_unchecked(twasm) }.into()
-}
-
-pub fn tinywasm(twasm: &[u8]) -> (tinywasm::Store, tinywasm::ModuleInstance) {
-    use tinywasm::*;
-    let module = twasm_to_module(twasm);
-    let mut store = Store::default();
-    let imports = Imports::default();
-    let instance = ModuleInstance::instantiate(&mut store, module, Some(imports)).expect("instantiate");
-    (store, instance)
-}
-
-pub fn wasmi(wasm: &[u8]) -> (wasmi::Module, wasmi::Store<()>, wasmi::Linker<()>) {
-    use wasmi::*;
-    let engine = Engine::default();
-    let module = wasmi::Module::new(&engine, wasm).expect("wasmi::Module::new");
-    let store = Store::new(&engine, ());
-    let linker = <Linker<()>>::new(&engine);
-    (module, store, linker)
-}
-
-pub fn wasmer(wasm: &[u8]) -> (wasmer::Store, wasmer::Instance) {
-    use wasmer::*;
-    let compiler = Singlepass::default();
-    let mut store = Store::new(compiler);
-    let import_object = imports! {};
-    let module = Module::new(&store, wasm).expect("wasmer::Module::new");
-    let instance = Instance::new(&mut store, &module, &import_object).expect("Instance::new");
-    (store, instance)
-}
diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
index b21c0ac..197023d 100644
--- a/crates/parser/Cargo.toml
+++ b/crates/parser/Cargo.toml
@@ -17,4 +17,3 @@ tinywasm-types={version="0.5.0", path="../types", default-features=false}
 default=["std", "logging"]
 logging=["log"]
 std=["tinywasm-types/std"]
- 
diff --git a/crates/tinywasm/Cargo.toml b/crates/tinywasm/Cargo.toml
index dc0f525..3f42ca0 100644
--- a/crates/tinywasm/Cargo.toml
+++ b/crates/tinywasm/Cargo.toml
@@ -25,7 +25,6 @@ owo-colors={version="4.0"}
 eyre={version="0.6"}
 serde_json={version="1.0"}
 serde={version="1.0", features=["derive"]}
-plotters={version="0.3"}
 pretty_env_logger="0.5"
 
 [features]
@@ -37,10 +36,6 @@ unsafe=["tinywasm-types/unsafe"]
 archive=["tinywasm-types/archive"]
 
 [[test]]
-name="generate-charts"
-harness=false
-
-[[test]]
 name="test-mvp"
 harness=false
 
diff --git a/crates/tinywasm/src/runtime/stack/block_stack.rs b/crates/tinywasm/src/runtime/stack/block_stack.rs
index 4fe7690..edaf2d1 100644
--- a/crates/tinywasm/src/runtime/stack/block_stack.rs
+++ b/crates/tinywasm/src/runtime/stack/block_stack.rs
@@ -3,7 +3,7 @@ use alloc::vec::Vec;
 use tinywasm_types::BlockArgs;
 
 #[derive(Debug, Clone, Default)]
-pub(crate) struct BlockStack(Vec<BlockFrame>); // TODO: maybe Box<[LabelFrame]> by analyzing the lable count when parsing the module?
+pub(crate) struct BlockStack(Vec<BlockFrame>); // TODO: maybe Box<[LabelFrame]> by analyzing the label count when parsing the module?
 
 impl BlockStack {
     #[inline]
diff --git a/crates/tinywasm/tests/charts/mod.rs b/crates/tinywasm/tests/charts/mod.rs
deleted file mode 100644
index fba287b..0000000
--- a/crates/tinywasm/tests/charts/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod progress;
-pub use progress::create_progress_chart;
diff --git a/crates/tinywasm/tests/charts/progress.rs b/crates/tinywasm/tests/charts/progress.rs
deleted file mode 100644
index 1ecc09c..0000000
--- a/crates/tinywasm/tests/charts/progress.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use eyre::Result;
-use plotters::prelude::*;
-use std::fs::File;
-use std::io::{self, BufRead};
-use std::path::Path;
-
-const FONT: &str = "Victor Mono";
-
-pub fn create_progress_chart(name: &str, csv_path: &Path, output_path: &Path) -> Result<()> {
-    let file = File::open(csv_path)?;
-    let reader = io::BufReader::new(file);
-
-    let mut max_tests = 0;
-    let mut data: Vec<u32> = Vec::new();
-    let mut versions: Vec<String> = Vec::new();
-
-    for line in reader.lines() {
-        let line = line?;
-        let parts: Vec<&str> = line.split(',').collect();
-
-        if parts.len() > 3 {
-            let version = format!("v{}", parts[0]);
-            let passed: u32 = parts[1].parse()?;
-            let failed: u32 = parts[2].parse()?;
-            let total = failed + passed;
-
-            if total > max_tests {
-                max_tests = total;
-            }
-
-            versions.push(version);
-            data.push(passed);
-        }
-    }
-
-    let root_area = SVGBackend::new(output_path, (1000, 400)).into_drawing_area();
-    root_area.fill(&WHITE)?;
-
-    let mut chart = ChartBuilder::on(&root_area)
-        .x_label_area_size(45)
-        .y_label_area_size(70)
-        .margin(10)
-        .margin_top(20)
-        .caption(name, (FONT, 30.0, FontStyle::Bold))
-        .build_cartesian_2d((0..(versions.len() - 1) as u32).into_segmented(), 0..max_tests)?;
-
-    chart
-        .configure_mesh()
-        .light_line_style(TRANSPARENT)
-        .bold_line_style(BLACK.mix(0.3))
-        .max_light_lines(10)
-        .disable_x_mesh()
-        .y_desc("Tests Passed")
-        .y_label_style((FONT, 15))
-        .x_desc("TinyWasm Version")
-        .x_labels((versions.len()).min(4))
-        .x_label_style((FONT, 15))
-        .x_label_formatter(&|x| {
-            let SegmentValue::CenterOf(value) = x else {
-                return "".to_string();
-            };
-            let v = versions.get(*value as usize).unwrap_or(&"".to_string()).to_string();
-            format!("{} ({})", v, data[*value as usize])
-        })
-        .axis_desc_style((FONT, 15, FontStyle::Bold))
-        .draw()?;
-
-    chart.draw_series(
-        Histogram::vertical(&chart)
-            .style(BLUE.mix(0.5).filled())
-            .data(data.iter().enumerate().map(|(x, y)| (x as u32, *y))),
-    )?;
-
-    root_area.present()?;
-
-    Ok(())
-}
diff --git a/crates/tinywasm/tests/generate-charts.rs b/crates/tinywasm/tests/generate-charts.rs
deleted file mode 100644
index ec48703..0000000
--- a/crates/tinywasm/tests/generate-charts.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-mod charts;
-use eyre::Result;
-
-fn main() -> Result<()> {
-    generate_charts()
-}
-
-fn generate_charts() -> Result<()> {
-    let args = std::env::args().collect::<Vec<_>>();
-    if args.len() < 2 || args[1] != "--enable" {
-        return Ok(());
-    }
-
-    charts::create_progress_chart(
-        "WebAssembly 1.0 Test Suite",
-        std::path::Path::new("./tests/generated/mvp.csv"),
-        std::path::Path::new("./tests/generated/progress-mvp.svg"),
-    )?;
-
-    println!("created progress chart: ./tests/generated/progress-mvp.svg");
-
-    charts::create_progress_chart(
-        "WebAssembly 2.0 Test Suite",
-        std::path::Path::new("./tests/generated/2.0.csv"),
-        std::path::Path::new("./tests/generated/progress-2.0.svg"),
-    )?;
-
-    println!("created progress chart: ./tests/generated/progress-2.0.svg");
-
-    Ok(())
-}
diff --git a/crates/tinywasm/tests/generated/progress-2.0.svg b/crates/tinywasm/tests/generated/progress-2.0.svg
index 6424367..32eee9e 100644
--- a/crates/tinywasm/tests/generated/progress-2.0.svg
+++ b/crates/tinywasm/tests/generated/progress-2.0.svg
@@ -41,19 +41,24 @@ TinyWasm Version
 </text>
 <polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="74,85 79,85 "/>
 <polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="80,345 989,345 "/>
-<text x="231" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
+<text x="193" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
 v0.3.0 (26722)
 </text>
-<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="231,345 231,350 "/>
-<text x="534" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
+<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="193,345 193,350 "/>
+<text x="420" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
 v0.4.0 (27549)
 </text>
-<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="534,345 534,350 "/>
-<text x="837" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
-v0.4.1 (27552)
+<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="420,345 420,350 "/>
+<text x="648" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
+v0.4.1 (27551)
 </text>
-<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="837,345 837,350 "/>
-<rect x="388" y="58" width="293" height="286" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="691" y="58" width="293" height="286" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="85" y="67" width="293" height="277" opacity="0.5" fill="#0000FF" stroke="none"/>
+<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="648,345 648,350 "/>
+<text x="875" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
+v0.5.0 (27551)
+</text>
+<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="875,345 875,350 "/>
+<rect x="767" y="58" width="217" height="286" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="312" y="58" width="217" height="286" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="539" y="58" width="218" height="286" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="85" y="67" width="217" height="277" opacity="0.5" fill="#0000FF" stroke="none"/>
 </svg>
diff --git a/crates/tinywasm/tests/generated/progress-mvp.svg b/crates/tinywasm/tests/generated/progress-mvp.svg
index 2a26dd5..dcb1838 100644
--- a/crates/tinywasm/tests/generated/progress-mvp.svg
+++ b/crates/tinywasm/tests/generated/progress-mvp.svg
@@ -36,27 +36,20 @@ TinyWasm Version
 </text>
 <polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="74,58 79,58 "/>
 <polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="80,345 989,345 "/>
-<text x="144" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
+<text x="136" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
 v0.0.4 (9258)
 </text>
-<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="144,345 144,350 "/>
-<text x="404" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
-v0.1.0 (17630)
+<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="136,345 136,350 "/>
+<text x="704" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
+v0.4.0 (20254)
 </text>
-<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="404,345 404,350 "/>
-<text x="664" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
-v0.3.0 (20254)
-</text>
-<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="664,345 664,350 "/>
-<text x="924" y="355" dy="0.76em" text-anchor="middle" font-family="Victor Mono" font-size="12.096774193548388" opacity="1" fill="#000000">
-v0.4.1 (20257)
-</text>
-<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="924,345 924,350 "/>
-<rect x="214" y="185" width="120" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="604" y="55" width="120" height="289" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="85" y="212" width="119" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="474" y="68" width="120" height="276" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="344" y="92" width="120" height="252" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="734" y="55" width="120" height="289" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="864" y="54" width="120" height="290" opacity="0.5" fill="#0000FF" stroke="none"/>
+<polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="704,345 704,350 "/>
+<rect x="85" y="212" width="103" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="652" y="55" width="104" height="289" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="312" y="92" width="103" height="252" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="766" y="54" width="104" height="290" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="880" y="54" width="104" height="290" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="539" y="55" width="103" height="289" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="425" y="68" width="104" height="276" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="198" y="185" width="104" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
 </svg>
diff --git a/crates/types/src/instructions.rs b/crates/types/src/instructions.rs
index 9923116..c932704 100644
--- a/crates/types/src/instructions.rs
+++ b/crates/types/src/instructions.rs
@@ -72,7 +72,7 @@ pub enum ConstInstruction {
 /// Wasm Bytecode can map to multiple of these instructions.
 ///
 /// # Differences to the spec
-/// * `br_table` stores the jump lables in the following `br_label` instructions to keep this enum small.
+/// * `br_table` stores the jump labels in the following `br_label` instructions to keep this enum small.
 /// * Lables/Blocks: we store the label end offset in the instruction itself and
 ///   have seperate EndBlockFrame and EndFunc instructions to mark the end of a block or function.
 ///   This makes it easier to implement the label stack iteratively.
diff --git a/crates/wasm-testsuite/Cargo.toml b/crates/wasm-testsuite/Cargo.toml
index 97c1f58..2e2fc21 100644
--- a/crates/wasm-testsuite/Cargo.toml
+++ b/crates/wasm-testsuite/Cargo.toml
@@ -15,4 +15,4 @@ path="lib.rs"
 independent=true
 
 [dependencies]
-rust-embed={version="8.1.0", features=["include-exclude"]}
+rust-embed={version="8.3", features=["include-exclude"]}