feat: fix remaining 2.0 tests

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

.cargo/config.toml

@@ -1,7 +1,7 @@
 [alias]
 version-dev="workspaces version --no-git-commit --force tinywasm*"
 dev="run -- -l debug run"
-test-mvp="test --package tinywasm --test test-mvp --release -- --enable "
-test-2="test --package tinywasm --test test-two --release -- --enable "
-test-wast="test --package tinywasm --test test-wast -- --enable "
-test-wast-release="test --package tinywasm --test test-wast --release -- --enable "
+
+test-wasm-1="test --package tinywasm --test test-wasm-1 --release"
+test-wasm-2="test --package tinywasm --test test-wasm-2 --release"
+test-wast="test --package tinywasm --test test-wast"

.github/workflows/test.yaml

@@ -50,7 +50,10 @@ jobs:
         run: cargo +stable test --workspace && cargo +stable run --example wasm-rust all
 
       - name: Run MVP testsuite
-        run: cargo +stable test-mvp
+        run: cargo +stable test-wasm-1
+
+      - name: Run 2.0 testsuite
+        run: cargo +stable test-wasm-2
 
   test-no-std:
     needs: build-wasm
@@ -77,8 +80,11 @@ jobs:
       - name: Run tests (nightly, no default features)
         run: cargo +nightly test --workspace --no-default-features && cargo +nightly run --example wasm-rust all
 
-      - name: Run MVP testsuite (nightly)
-        run: cargo +nightly test-mvp
+      - name: Run MVP testsuite
+        run: cargo +nightly test-wasm-1
+
+      - name: Run 2.0 testsuite
+        run: cargo +nightly test-wasm-2
 
   test-m1:
     needs: build-wasm
@@ -99,10 +105,15 @@ jobs:
 
       - name: Build (stable)
         run: cargo +stable build
+
       - name: Run tests (stable)
         run: cargo +stable test
+
       - name: Run MVP testsuite
-        run: cargo +stable test-mvp
+        run: cargo +stable test-wasm-1
+
+      - name: Run 2.0 testsuite
+        run: cargo +stable test-wasm-2
 
   test-armv7:
     needs: build-wasm
@@ -131,6 +142,14 @@ jobs:
         uses: houseabsolute/[email protected]
         with:
           command: test
-          args: "-p tinywasm --test test-mvp --release -- --enable"
+          args: "-p tinywasm --test test-wasm-1 --release"
+          target: armv7-unknown-linux-gnueabihf
+          toolchain: nightly
+
+      - name: Run 2.0 testsuite
+        uses: houseabsolute/[email protected]
+        with:
+          command: test
+          args: "-p tinywasm --test test-wasm-2 --release"
           target: armv7-unknown-linux-gnueabihf
           toolchain: nightly

crates/tinywasm/Cargo.toml

@@ -39,17 +39,44 @@ simd=[]
 nightly=["tinywasm-parser?/nightly"]
 
 [[test]]
-name="test-mvp"
+name="test-wasm-1"
 harness=false
+test=false
 
 [[test]]
-name="test-two"
+name="test-wasm-2"
 harness=false
+test=false
 
 [[test]]
-name="test-wast"
+name="test-wasm-multi-memory"
+harness=false
+test=false
+
+[[test]]
+name="test-wasm-memory64"
+harness=false
+test=false
+
+[[test]]
+name="test-wasm-annotations"
+harness=false
+test=false
+
+[[test]]
+name="test-wasm-extended-const"
+harness=false
+test=false
+
+[[test]]
+name="test-wasm-simd"
 harness=false
+test=false
 
+[[test]]
+name="test-wast"
+harness=false
+test=false
 
 [[bench]]
 name="argon2id"

crates/tinywasm/src/interpreter/executor.rs

@@ -666,6 +666,10 @@ impl<'store, 'stack> Executor<'store, 'stack> {
         Ok(())
     }
     fn exec_table_init(&mut self, elem_index: u32, table_index: u32) -> Result<()> {
+        let size: i32 = self.stack.values.pop(); // n
+        let offset: i32 = self.stack.values.pop(); // s
+        let dst: i32 = self.stack.values.pop(); // d
+
         let elem = self
             .store
             .data
@@ -683,11 +687,7 @@ impl<'store, 'stack> Executor<'store, 'stack> {
         let elem_len = elem.items.as_ref().map_or(0, alloc::vec::Vec::len);
         let table_len = table.size();
 
-        let size: i32 = self.stack.values.pop(); // n
-        let offset: i32 = self.stack.values.pop(); // s
-        let dst: i32 = self.stack.values.pop(); // d
-
-        if unlikely(((size + offset) as usize > elem_len) || ((dst + size) > table_len)) {
+        if unlikely(size < 0 || ((size + offset) as usize > elem_len) || ((dst + size) > table_len)) {
             return Err(Trap::TableOutOfBounds { offset: offset as usize, len: size as usize, max: elem_len }.into());
         }
 
@@ -703,7 +703,7 @@ impl<'store, 'stack> Executor<'store, 'stack> {
             return Err(Trap::TableOutOfBounds { offset: 0, len: 0, max: 0 }.into());
         };
 
-        table.init(self.module.func_addrs(), dst, &items[offset as usize..(offset + size) as usize])
+        table.init(dst, &items[offset as usize..(offset + size) as usize])
     }
     fn exec_table_grow(&mut self, table_index: u32) -> Result<()> {
         let table = self.store.get_table_mut(self.module.resolve_table_addr(table_index));

crates/tinywasm/src/store/mod.rs

@@ -339,7 +339,7 @@ impl Store {
                     // This isn't mentioned in the spec, but the "unofficial" testsuite has a test for it:
                     // https://github.com/WebAssembly/testsuite/blob/5a1a590603d81f40ef471abba70a90a9ae5f4627/linking.wast#L264-L276
                     // I have NO IDEA why this is allowed, but it is.
-                    if let Err(Error::Trap(trap)) = table.init_raw(offset, &init) {
+                    if let Err(Error::Trap(trap)) = table.init(offset, &init) {
                         return Ok((elem_addrs.into_boxed_slice(), Some(trap)));
                     }
 

crates/tinywasm/src/store/table.rs

@@ -133,8 +133,7 @@ impl TableInstance {
             .expect("error initializing table: function not found. This should have been caught by the validator")
     }
 
-    // Initialize the table with the given elements
-    pub(crate) fn init_raw(&mut self, offset: i32, init: &[TableElement]) -> Result<()> {
+    pub(crate) fn init(&mut self, offset: i32, init: &[TableElement]) -> Result<()> {
         let offset = offset as usize;
         let end = offset.checked_add(init.len()).ok_or_else(|| {
             Error::Trap(crate::Trap::TableOutOfBounds { offset, len: init.len(), max: self.elements.len() })
@@ -148,12 +147,6 @@ impl TableInstance {
         log::debug!("table: {:?}", self.elements);
         Ok(())
     }
-
-    // Initialize the table with the given elements (resolves function references)
-    pub(crate) fn init(&mut self, func_addrs: &[u32], offset: i32, init: &[TableElement]) -> Result<()> {
-        let init = init.iter().map(|item| item.map(|addr| self.resolve_func_ref(func_addrs, addr))).collect::<Vec<_>>();
-        self.init_raw(offset, &init)
-    }
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -248,8 +241,7 @@ mod tests {
         let mut table_instance = TableInstance::new(kind, 0);
 
         let init_elements = vec![TableElement::Initialized(0); 5];
-        let func_addrs = vec![0, 1, 2, 3, 4];
-        let result = table_instance.init(&func_addrs, 0, &init_elements);
+        let result = table_instance.init(0, &init_elements);
 
         assert!(result.is_ok(), "Initializing table with elements failed");