fix: table_init variable order

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

Author: explodingcamera

.github/workflows/test.yaml

@@ -121,14 +121,14 @@ jobs:
           path: examples/rust/out
 
       - name: Run all tests (for the default workspace members)
-        uses: houseabsolute/actions-rust-cross@v0.0.12
+        uses: houseabsolute/actions-rust-cross@v0.0.13
         with:
           command: test
           target: armv7-unknown-linux-gnueabihf
           toolchain: nightly
 
       - name: Run MVP testsuite
-        uses: houseabsolute/actions-rust-cross@v0.0.12
+        uses: houseabsolute/actions-rust-cross@v0.0.13
         with:
           command: test
           args: "-p tinywasm --test test-mvp --release -- --enable"

Cargo.lock

@@ -4,7 +4,7 @@ publish=false
 edition.workspace=true
 
 [dependencies]
-criterion={version="0.5", features=["html_reports"]}
+criterion={version="0.5"}
 tinywasm={path="../crates/tinywasm"}
 wat={version="1"}
 wasmi={version="0.32", features=["std"]}

benchmarks/Cargo.toml

@@ -10,7 +10,7 @@ use crate::{Error, FuncHandle, FuncHandleTyped, Imports, MemoryRef, MemoryRefMut
 ///
 /// See <https://webassembly.github.io/spec/core/exec/runtime.html#module-instances>
 #[derive(Debug, Clone)]
-pub struct ModuleInstance(Rc<ModuleInstanceInner>);
+pub struct ModuleInstance(pub(crate) Rc<ModuleInstanceInner>);
 
 #[allow(dead_code)]
 #[derive(Debug)]

crates/tinywasm/src/instance.rs

@@ -273,7 +273,7 @@ impl<'store, 'stack> Executor<'store, 'stack> {
             TableGet(table_idx) => self.exec_table_get(*table_idx)?,
             TableSet(table_idx) => self.exec_table_set(*table_idx)?,
             TableSize(table_idx) => self.exec_table_size(*table_idx)?,
-            TableInit(table_idx, elem_idx) => self.exec_table_init(*elem_idx, *table_idx)?,
+            TableInit(elem_idx, table_idx) => self.exec_table_init(*elem_idx, *table_idx)?,
             TableGrow(table_idx) => self.exec_table_grow(*table_idx)?,
             TableFill(table_idx) => self.exec_table_fill(*table_idx)?,
 
@@ -715,9 +715,8 @@ impl<'store, 'stack> Executor<'store, 'stack> {
             return Ok(());
         }
 
-        // TODO, not sure how to handle passive elements, but this makes the test pass
-        if let ElementKind::Passive = elem.kind {
-            return Ok(());
+        if let ElementKind::Active { .. } = elem.kind {
+            return Err(Error::Other("table.init with active element".to_string()));
         }
 
         let Some(items) = elem.items.as_ref() else {
@@ -727,7 +726,6 @@ impl<'store, 'stack> Executor<'store, 'stack> {
         table.borrow_mut().init(self.module.func_addrs(), dst, &items[offset as usize..(offset + size) as usize])?;
         Ok(())
     }
-    // todo: this is just a placeholder, need to check the spec
     fn exec_table_grow(&mut self, table_index: u32) -> Result<()> {
         let table = self.store.get_table(self.module.resolve_table_addr(table_index)?)?;
         let sz = table.borrow().size();

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

@@ -105,9 +105,12 @@ impl TableInstance {
     }
 
     pub(crate) fn grow(&mut self, n: i32, init: TableElement) -> Result<()> {
-        let len = n + self.elements.len() as i32;
-        let max = self.kind.size_max.unwrap_or(MAX_TABLE_SIZE) as i32;
+        if n < 0 {
+            return Err(Error::Trap(crate::Trap::TableOutOfBounds { offset: 0, len: 1, max: self.elements.len() }));
+        }
 
+        let len = n as usize + self.elements.len();
+        let max = self.kind.size_max.unwrap_or(MAX_TABLE_SIZE) as usize;
         if len > max {
             return Err(Error::Trap(crate::Trap::TableOutOfBounds {
                 offset: len as usize,
@@ -243,18 +246,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn test_table_grow_and_fit() {
-        let kind = dummy_table_type();
-        let mut table_instance = TableInstance::new(kind, 0);
-
-        let result = table_instance.set(15, TableElement::Initialized(1));
-        assert!(result.is_ok(), "Table grow on set failed");
-
-        let size = table_instance.size();
-        assert!(size >= 16, "Table did not grow to expected size");
-    }
-
     #[test]
     fn test_table_init() {
         let kind = dummy_table_type();