chore: undo BlockStack changes

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

Author: explodingcamera

crates/tinywasm/src/engine.rs

@@ -52,10 +52,10 @@ pub const DEFAULT_VALUE_STACK_128_SIZE: usize = 4 * 1024; // 4k slots
 pub const DEFAULT_VALUE_STACK_REF_SIZE: usize = 4 * 1024; // 4k slots
 
 /// Default initial size for the block stack (control frames).
-pub const DEFAULT_BLOCK_STACK_SIZE: usize = 1024; // 1024 frames
+pub const DEFAULT_BLOCK_STACK_SIZE: usize = 2048; // 1024 frames
 
 /// Default initial size for the call stack (function frames).
-pub const DEFAULT_CALL_STACK_SIZE: usize = 1024; // 1024 frames
+pub const DEFAULT_CALL_STACK_SIZE: usize = 2048; // 1024 frames
 
 /// Configuration for the WebAssembly interpreter
 #[derive(Debug, Clone)]
@@ -71,8 +71,9 @@ pub struct Config {
     pub stack_ref_size: usize,
     /// Initial size of the call stack.
     pub call_stack_size: usize,
-    /// Initial size of the control stack (block stack).
-    pub block_stack_size: usize,
+
+    /// Initial size of the block stack.
+    pub block_stack_initial_size: usize,
 }
 
 impl Config {
@@ -90,7 +91,7 @@ impl Default for Config {
             stack_128_size: DEFAULT_VALUE_STACK_128_SIZE,
             stack_ref_size: DEFAULT_VALUE_STACK_REF_SIZE,
             call_stack_size: DEFAULT_CALL_STACK_SIZE,
-            block_stack_size: DEFAULT_BLOCK_STACK_SIZE,
+            block_stack_initial_size: DEFAULT_BLOCK_STACK_SIZE,
         }
     }
 }

crates/tinywasm/src/interpreter/stack/block_stack.rs

@@ -1,15 +1,15 @@
 use crate::engine::Config;
 use alloc::vec::Vec;
 
+use crate::Result;
 use crate::interpreter::values::{StackHeight, StackLocation};
-use crate::{Result, Trap};
 
 #[derive(Debug)]
 pub(crate) struct BlockStack(Vec<BlockFrame>);
 
 impl BlockStack {
     pub(crate) fn new(config: &Config) -> Self {
-        Self(Vec::with_capacity(config.block_stack_size))
+        Self(Vec::with_capacity(config.block_stack_initial_size))
     }
 
     pub(crate) fn clear(&mut self) {
@@ -21,19 +21,15 @@ impl BlockStack {
     }
 
     pub(crate) fn push(&mut self, block: BlockFrame) -> Result<()> {
-        if self.0.len() >= self.0.capacity() {
-            return Err(Trap::BlockStackOverflow.into());
-        }
-
         self.0.push(block);
         Ok(())
     }
 
     /// get the label at the given index, where 0 is the top of the stack
     pub(crate) fn get_relative_to(&self, index: u32, offset: u32) -> Option<&BlockFrame> {
-        let len = (self.0.len() as u32) - offset;
+        let len = (self.0.len() as u32).checked_sub(offset)?;
 
-        // the vast majority of wasm functions don't use break to return
+        // the vast majority of wasm functions don't use break to return, but it is allowed in the spec
         if index >= len {
             return None;
         }

crates/tinywasm/tests/test-wasm-tail-call.rs

@@ -8,6 +8,7 @@ fn main() -> Result<()> {
 
     let mut test_suite = TestSuite::new();
     test_suite.run_files(proposal(&Proposal::TailCall))?;
+    test_suite.print_errors();
     test_suite.save_csv("./tests/generated/wasm-tail-call.csv", env!("CARGO_PKG_VERSION"))?;
     test_suite.report_status()
 }