chore: improve breaking

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

Author: explodingcamera

.gitignore

@@ -1,4 +1,4 @@
 /target
 notes.md
 examples/tinywasm.wat
-examples/wast/*
+examples/wast/*

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "search.exclude": {
+        "**/wasm-testsuite/data": true
+    }
+}

crates/tinywasm/src/func.rs

@@ -67,7 +67,7 @@ impl FuncHandle {
 
         // Once the function returns:
         let result_m = func_ty.results.len();
-        let res = stack.values.pop_n(result_m)?;
+        let res = stack.values.last_n(result_m)?;
 
         Ok(res
             .iter()

crates/tinywasm/src/runtime/executor/mod.rs

@@ -203,7 +203,7 @@ fn exec_one(
                 panic!("Expected {} BrLabel instructions, got {}", len, instr.len());
             }
 
-            todo!()
+            todo!("br_table");
         }
 
         Br(v) => cf.break_to(*v, &mut stack.values)?,

crates/tinywasm/src/runtime/stack/call_stack.rs

@@ -97,8 +97,7 @@ impl CallFrame {
             .get_relative_to_top(break_to_relative as usize)
             .ok_or(Error::LabelStackUnderflow)?;
 
-        // trim the lable's stack from the stack
-        value_stack.truncate_keep(break_to.stack_ptr, break_to.args.results);
+        value_stack.break_to(break_to.stack_ptr, break_to.args.results as usize);
 
         // instr_ptr points to the label instruction, but the next step
         // will increment it by 1 since we're changing the "current" instr_ptr

crates/tinywasm/src/runtime/stack/value_stack.rs

@@ -42,31 +42,24 @@ impl ValueStack {
         self.top
     }
 
-    #[inline]
-    pub(crate) fn _truncate(&mut self, n: usize) {
-        assert!(self.top <= self.stack.len());
-        self.top -= n;
-        self.stack.truncate(self.top);
-    }
-
-    #[inline]
-    // example: [1, 2, 3] n=1, end_keep=1 => [1, 3]
-    // example: [1] n=1, end_keep=1 => [1]
     pub(crate) fn truncate_keep(&mut self, n: usize, end_keep: usize) {
-        if n == end_keep || n == 0 {
-            return;
+        let total_to_keep = n + end_keep;
+        assert!(
+            self.top >= total_to_keep,
+            "Total to keep should be less than or equal to self.top"
+        );
+
+        let current_size = self.stack.len();
+        if current_size <= total_to_keep {
+            return; // No need to truncate if the current size is already less than or equal to total_to_keep
         }
 
-        assert!(self.top <= self.stack.len());
-        info!("removing from {} to {}", self.top - n, self.top - end_keep);
-        self.stack.drain(self.top - n..self.top - end_keep);
-        self.top -= n - end_keep;
-    }
+        let items_to_remove = current_size - total_to_keep;
+        let remove_start_index = self.top - items_to_remove - end_keep;
+        let remove_end_index = self.top - end_keep;
 
-    #[inline]
-    pub(crate) fn _extend(&mut self, values: impl IntoIterator<Item = RawWasmValue> + ExactSizeIterator) {
-        self.top += values.len();
-        self.stack.extend(values);
+        self.stack.drain(remove_start_index..remove_end_index);
+        self.top = total_to_keep; // Update top to reflect the new size
     }
 
     #[inline]
@@ -92,6 +85,21 @@ impl ValueStack {
         self.stack.pop().ok_or(Error::StackUnderflow)
     }
 
+    pub(crate) fn break_to(&mut self, new_stack_size: usize, result_count: usize) {
+        self.stack
+            .copy_within((self.top - result_count)..self.top, new_stack_size);
+        self.top = new_stack_size + result_count;
+        self.stack.truncate(self.top);
+    }
+
+    #[inline]
+    pub(crate) fn last_n(&self, n: usize) -> Result<&[RawWasmValue]> {
+        if self.top < n {
+            return Err(Error::StackUnderflow);
+        }
+        Ok(&self.stack[self.top - n..self.top])
+    }
+
     #[inline]
     pub(crate) fn pop_n(&mut self, n: usize) -> Result<Vec<RawWasmValue>> {
         if self.top < n {
@@ -120,39 +128,6 @@ impl ValueStack {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::std::panic;
-
-    fn crate_stack<T: Into<RawWasmValue> + Copy>(data: &[T]) -> ValueStack {
-        let mut stack = ValueStack::default();
-        stack._extend(data.iter().map(|v| (*v).into()));
-        stack
-    }
-
-    fn assert_truncate_keep<T: Into<RawWasmValue> + Copy>(data: &[T], n: usize, end_keep: usize, expected: &[T]) {
-        let mut stack = crate_stack(data);
-        stack.truncate_keep(n, end_keep);
-        assert_eq!(
-            stack.data(),
-            expected.iter().map(|v| (*v).into()).collect::<Vec<_>>().as_slice()
-        );
-    }
-
-    fn catch_unwind_silent<F: FnOnce() -> R + panic::UnwindSafe, R>(f: F) -> crate::std::thread::Result<R> {
-        let prev_hook = panic::take_hook();
-        panic::set_hook(alloc::boxed::Box::new(|_| {}));
-        let result = panic::catch_unwind(f);
-        panic::set_hook(prev_hook);
-        result
-    }
-
-    #[test]
-    fn test_truncate_keep() {
-        assert_truncate_keep(&[1, 2, 3], 1, 1, &[1, 2, 3]);
-        assert_truncate_keep(&[1], 1, 1, &[1]);
-        assert_truncate_keep(&[1, 2, 3], 2, 1, &[1, 3]);
-        assert_truncate_keep::<i32>(&[], 0, 0, &[]);
-        catch_unwind_silent(|| assert_truncate_keep(&[1, 2, 3], 4, 1, &[1, 3])).expect_err("should panic");
-    }
 
     #[test]
     fn test_value_stack() {

crates/tinywasm/src/runtime/value.rs

@@ -23,9 +23,9 @@ impl RawWasmValue {
             ValType::I64 => WasmValue::I64(self.0 as i64),
             ValType::F32 => WasmValue::F32(f32::from_bits(self.0 as u32)),
             ValType::F64 => WasmValue::F64(f64::from_bits(self.0)),
-            ValType::ExternRef => todo!(),
-            ValType::FuncRef => todo!(),
-            ValType::V128 => todo!(),
+            ValType::ExternRef => todo!("externref"),
+            ValType::FuncRef => todo!("funcref"),
+            ValType::V128 => todo!("v128"),
         }
     }
 }

crates/tinywasm/tests/generated/mvp.csv

@@ -0,0 +1,53 @@
+pub struct IndexMap<K, V> {
+    map: std::collections::HashMap<K, V>,
+    keys: Vec<K>,
+}
+
+impl<K, V> IndexMap<K, V>
+where
+    K: std::cmp::Eq + std::hash::Hash + Clone,
+{
+    pub fn new() -> Self {
+        Self {
+            map: std::collections::HashMap::new(),
+            keys: Vec::new(),
+        }
+    }
+
+    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
+        if self.map.contains_key(&key) {
+            return self.map.insert(key, value);
+        }
+
+        self.keys.push(key.clone());
+        self.map.insert(key, value)
+    }
+
+    pub fn get(&self, key: &K) -> Option<&V> {
+        self.map.get(key)
+    }
+
+    pub fn get_mut(&mut self, key: &K) -> Option<&mut V> {
+        self.map.get_mut(key)
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = (&K, &V)> {
+        self.keys.iter().map(move |k| (k, self.map.get(k).unwrap()))
+    }
+
+    pub fn len(&self) -> usize {
+        self.map.len()
+    }
+
+    pub fn keys(&self) -> impl Iterator<Item = &K> {
+        self.keys.iter()
+    }
+
+    pub fn values(&self) -> impl Iterator<Item = &V> {
+        self.map.values()
+    }
+
+    pub fn values_mut(&mut self) -> impl Iterator<Item = &mut V> {
+        self.map.values_mut()
+    }
+}

crates/tinywasm/tests/testsuite/indexmap.rs

@@ -9,11 +9,14 @@ use std::{
     io::BufReader,
 };
 
+mod indexmap;
 mod run;
 mod util;
 
 use serde::{Deserialize, Serialize};
 
+use self::indexmap::IndexMap;
+
 #[derive(Serialize, Deserialize)]
 pub struct TestGroupResult {
     pub name: String,
@@ -38,14 +41,14 @@ impl TestSuite {
 
     pub fn print_errors(&self) {
         for (group_name, group) in &self.0 {
-            for (test_name, test) in &group.tests {
+            let tests = &group.tests;
+            for (test_name, test) in tests.iter() {
                 if let Err(e) = &test.result {
                     eprintln!(
                         "{} {} failed: {:?}",
-                        link(
-                            format!("{}:{}", group_name.red().underline(), test.linecol.0 + 1).as_str(),
-                            format!("{}:{}", group.file, test.linecol.0 + 1).as_str()
-                        ),
+                        link(group_name, &group.file, Some(test.linecol.0 + 1))
+                            .bold()
+                            .underline(),
                         test_name.bold(),
                         e.to_string().bright_red()
                     );
@@ -110,8 +113,13 @@ impl TestSuite {
     }
 }
 
-fn link(name: &str, file: &str) -> String {
-    format!("\x1b]8;;file://{}\x1b\\{}\x1b]8;;\x1b\\", file, name)
+fn link(name: &str, file: &str, line: Option<usize>) -> String {
+    let (path, name) = match line {
+        None => (file.to_string(), name.to_owned()),
+        Some(line) => (format!("{}:{}:0", file, line), (format!("{}:{}", name, line))),
+    };
+
+    format!("\x1b]8;;file://{}\x1b\\{}\x1b]8;;\x1b\\", path, name)
 }
 
 impl Debug for TestSuite {
@@ -124,7 +132,7 @@ impl Debug for TestSuite {
             total_passed += group_passed;
             total_failed += group_failed;
 
-            writeln!(f, "{}", link(group_name, &group.file).bold().underline())?;
+            writeln!(f, "{}", link(group_name, &group.file, None).bold().underline())?;
             writeln!(f, "  Tests Passed: {}", group_passed.to_string().green())?;
             writeln!(f, "  Tests Failed: {}", group_failed.to_string().red())?;
 
@@ -152,14 +160,14 @@ impl Debug for TestSuite {
 }
 
 struct TestGroup {
-    tests: BTreeMap<String, TestCase>,
+    tests: IndexMap<String, TestCase>,
     file: String,
 }
 
 impl TestGroup {
     fn new(file: &str) -> Self {
         Self {
-            tests: BTreeMap::new(),
+            tests: IndexMap::new(),
             file: file.to_string(),
         }
     }