i got the asserts to work, at the cost of stack uncertainty

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "rust-analyzer.cargo.features": [
+        "spec-test"
+    ]
+}

Cargo.toml

@@ -24,6 +24,7 @@ criterion = { version = "0.5.1", features = ["html_reports"] }
 [features]
 default = ["hooks"]
 hooks = []
+spec-test = []
 
 [[bench]]
 name = "hook_performance_impact"

src/execution/mod.rs

@@ -104,11 +104,20 @@ where
         let func_ty = self.types.get(func_inst.ty).unwrap_validated();
 
         // Check correct function parameters and return types
-        if func_ty.params.valtypes != Param::TYS {
-            panic!("Invalid `Param` generics");
+        #[cfg(not(feature = "spec-test"))] {
+            if func_ty.params.valtypes != Param::TYS {
+                panic!("Invalid `Param` generics");
+            }
+            if func_ty.returns.valtypes != Returns::TYS {
+                panic!("Invalid `Returns` generics");
+            }
         }
-        if func_ty.returns.valtypes != Returns::TYS {
-            panic!("Invalid `Returns` generics");
+        #[cfg(feature = "spec-test")] {
+            if func_ty.params.valtypes != param.get_types() {
+                debug!("Expected: {:?}", func_ty.params.valtypes);
+                debug!("Actual: {:?}", param.get_types());
+                panic!("Invalid `Param` generics");
+            }
         }
 
         let mut stack = Stack::new();
@@ -122,11 +131,17 @@ where
         error?;
 
         // Pop return values from stack
+        #[cfg(not(feature = "spec-test"))]
         let return_values = Returns::TYS
             .iter()
             .map(|ty| stack.pop_value(*ty))
             .collect::<Vec<Value>>();
 
+        #[cfg(feature = "spec-test")]
+        let return_values = self.types.get(self.store.funcs.get(func_idx).expect("valid FuncIdx").ty).unwrap_validated().returns.valtypes
+            .iter()
+            .map(|ty| stack.pop_value(*ty))
+            .collect::<Vec<Value>>();
         // Values are reversed because they were popped from stack one-by-one. Now reverse them back
         let reversed_values = return_values.into_iter().rev();
         let ret = Returns::from_values(reversed_values);

src/execution/value.rs

@@ -67,6 +67,10 @@ pub trait InteropValueList {
     fn into_values(self) -> Vec<Value>;
     #[allow(warnings)]
     fn from_values(values: impl Iterator<Item = Value>) -> Self;
+    #[cfg(feature = "spec-test")]
+    fn get_types(&self) -> &[ValType] {
+        Self::TYS
+    }
 }
 
 impl InteropValue for u32 {

src/lib.rs

@@ -4,9 +4,9 @@ extern crate alloc;
 extern crate log;
 
 pub use core::error::{Error, Result, RuntimeError};
+pub use core::reader::types::{NumType, ValType};
 pub use execution::*;
 pub use validation::*;
-pub use core::reader::types::{NumType, ValType};
 
 pub(crate) mod core;
 pub(crate) mod execution;

tests/common/mod.rs

@@ -1 +1 @@
-pub mod spec_run;
+pub mod spec_run;

tests/common/spec_run.rs

@@ -1,3 +1 @@
-pub fn run() {
-
-}
+pub fn run() {}

tests/lib.rs

@@ -1,13 +1,12 @@
-use log::log_enabled;
-
-pub mod common;
 mod arithmetic;
+pub mod common;
+#[cfg(feature = "spec-test")]
 mod specification;
 
-
 #[test_log::test]
 pub fn test_test() {
-    let wasm_bytes = wat::parse_str(r#"
+    let wasm_bytes = wat::parse_str(
+        r#"
     (module
         (func (export "add") (param $x i32) (param $y i32) (result i32)
             (i32.add 
@@ -23,13 +22,15 @@ pub fn test_test() {
             )
         )
     )
-    "#).unwrap();
+    "#,
+    )
+    .unwrap();
     let validation_info = wasm::validate(&wasm_bytes).expect("validation failed");
     let mut instance = wasm::RuntimeInstance::new(&validation_info).expect("instantiation failed");
 
-    let rez: i32 = instance.invoke_func(0, (1,2)).unwrap();
+    let rez: i32 = instance.invoke_func(0, (1, 2)).unwrap();
     assert_eq!(rez, 3);
 
-    let rez: i32 = instance.invoke_func(1, (1,2)).unwrap();
+    let rez: i32 = instance.invoke_func(1, (1, 2)).unwrap();
     assert_eq!(rez, 3);
-}
+}

tests/specification/dummy.wast

@@ -1,5 +1,12 @@
+;; i32 operations
+
 (module
   (func (export "add") (param $x i32) (param $y i32) (result i32) (i32.add (local.get $x) (local.get $y)))
+  (func (export "mul") (param $x i32) (param $y i32) (result i32) (i32.mul (local.get $x) (local.get $y)))
+  (func (export "div_s") (param $x i32) (param $y i32) (result i32) (i32.div_s (local.get $x) (local.get $y)))
+  (func (export "div_u") (param $x i32) (param $y i32) (result i32) (i32.div_u (local.get $x) (local.get $y)))
+  (func (export "rem_s") (param $x i32) (param $y i32) (result i32) (i32.rem_s (local.get $x) (local.get $y)))
+  (func (export "rem_u") (param $x i32) (param $y i32) (result i32) (i32.rem_u (local.get $x) (local.get $y)))
 )
 
 (assert_return (invoke "add" (i32.const 1) (i32.const 1)) (i32.const 2))
@@ -9,4 +16,80 @@
 (assert_return (invoke "add" (i32.const 0x7fffffff) (i32.const 1)) (i32.const 0x80000000))
 (assert_return (invoke "add" (i32.const 0x80000000) (i32.const -1)) (i32.const 0x7fffffff))
 (assert_return (invoke "add" (i32.const 0x80000000) (i32.const 0x80000000)) (i32.const 0))
-(assert_return (invoke "add" (i32.const 0x3fffffff) (i32.const 1)) (i32.const 0x40000000))
+(assert_return (invoke "add" (i32.const 0x3fffffff) (i32.const 1)) (i32.const 0x40000000))
+
+(assert_return (invoke "mul" (i32.const 1) (i32.const 1)) (i32.const 1))
+(assert_return (invoke "mul" (i32.const 1) (i32.const 0)) (i32.const 0))
+(assert_return (invoke "mul" (i32.const -1) (i32.const -1)) (i32.const 1))
+(assert_return (invoke "mul" (i32.const 0x10000000) (i32.const 4096)) (i32.const 0))
+(assert_return (invoke "mul" (i32.const 0x80000000) (i32.const 0)) (i32.const 0))
+(assert_return (invoke "mul" (i32.const 0x80000000) (i32.const -1)) (i32.const 0x80000000))
+(assert_return (invoke "mul" (i32.const 0x7fffffff) (i32.const -1)) (i32.const 0x80000001))
+(assert_return (invoke "mul" (i32.const 0x01234567) (i32.const 0x76543210)) (i32.const 0x358e7470))
+(assert_return (invoke "mul" (i32.const 0x7fffffff) (i32.const 0x7fffffff)) (i32.const 1))
+
+(assert_return (invoke "div_s" (i32.const 1) (i32.const 1)) (i32.const 1))
+(assert_return (invoke "div_s" (i32.const 0) (i32.const 1)) (i32.const 0))
+(assert_return (invoke "div_s" (i32.const 0) (i32.const -1)) (i32.const 0))
+(assert_return (invoke "div_s" (i32.const -1) (i32.const -1)) (i32.const 1))
+(assert_return (invoke "div_s" (i32.const 0x80000000) (i32.const 2)) (i32.const 0xc0000000))
+(assert_return (invoke "div_s" (i32.const 0x80000001) (i32.const 1000)) (i32.const 0xffdf3b65))
+(assert_return (invoke "div_s" (i32.const 5) (i32.const 2)) (i32.const 2))
+(assert_return (invoke "div_s" (i32.const -5) (i32.const 2)) (i32.const -2))
+(assert_return (invoke "div_s" (i32.const 5) (i32.const -2)) (i32.const -2))
+(assert_return (invoke "div_s" (i32.const -5) (i32.const -2)) (i32.const 2))
+(assert_return (invoke "div_s" (i32.const 7) (i32.const 3)) (i32.const 2))
+(assert_return (invoke "div_s" (i32.const -7) (i32.const 3)) (i32.const -2))
+(assert_return (invoke "div_s" (i32.const 7) (i32.const -3)) (i32.const -2))
+(assert_return (invoke "div_s" (i32.const -7) (i32.const -3)) (i32.const 2))
+(assert_return (invoke "div_s" (i32.const 11) (i32.const 5)) (i32.const 2))
+(assert_return (invoke "div_s" (i32.const 17) (i32.const 7)) (i32.const 2))
+
+(assert_return (invoke "div_u" (i32.const 1) (i32.const 1)) (i32.const 1))
+(assert_return (invoke "div_u" (i32.const 0) (i32.const 1)) (i32.const 0))
+(assert_return (invoke "div_u" (i32.const -1) (i32.const -1)) (i32.const 1))
+(assert_return (invoke "div_u" (i32.const 0x80000000) (i32.const -1)) (i32.const 0))
+(assert_return (invoke "div_u" (i32.const 0x80000000) (i32.const 2)) (i32.const 0x40000000))
+(assert_return (invoke "div_u" (i32.const 0x8ff00ff0) (i32.const 0x10001)) (i32.const 0x8fef))
+(assert_return (invoke "div_u" (i32.const 0x80000001) (i32.const 1000)) (i32.const 0x20c49b))
+(assert_return (invoke "div_u" (i32.const 5) (i32.const 2)) (i32.const 2))
+(assert_return (invoke "div_u" (i32.const -5) (i32.const 2)) (i32.const 0x7ffffffd))
+(assert_return (invoke "div_u" (i32.const 5) (i32.const -2)) (i32.const 0))
+(assert_return (invoke "div_u" (i32.const -5) (i32.const -2)) (i32.const 0))
+(assert_return (invoke "div_u" (i32.const 7) (i32.const 3)) (i32.const 2))
+(assert_return (invoke "div_u" (i32.const 11) (i32.const 5)) (i32.const 2))
+(assert_return (invoke "div_u" (i32.const 17) (i32.const 7)) (i32.const 2))
+
+(assert_return (invoke "rem_s" (i32.const 0x7fffffff) (i32.const -1)) (i32.const 0))
+(assert_return (invoke "rem_s" (i32.const 1) (i32.const 1)) (i32.const 0))
+(assert_return (invoke "rem_s" (i32.const 0) (i32.const 1)) (i32.const 0))
+(assert_return (invoke "rem_s" (i32.const 0) (i32.const -1)) (i32.const 0))
+(assert_return (invoke "rem_s" (i32.const -1) (i32.const -1)) (i32.const 0))
+(assert_return (invoke "rem_s" (i32.const 0x80000000) (i32.const -1)) (i32.const 0))
+(assert_return (invoke "rem_s" (i32.const 0x80000000) (i32.const 2)) (i32.const 0))
+(assert_return (invoke "rem_s" (i32.const 0x80000001) (i32.const 1000)) (i32.const -647))
+(assert_return (invoke "rem_s" (i32.const 5) (i32.const 2)) (i32.const 1))
+(assert_return (invoke "rem_s" (i32.const -5) (i32.const 2)) (i32.const -1))
+(assert_return (invoke "rem_s" (i32.const 5) (i32.const -2)) (i32.const 1))
+(assert_return (invoke "rem_s" (i32.const -5) (i32.const -2)) (i32.const -1))
+(assert_return (invoke "rem_s" (i32.const 7) (i32.const 3)) (i32.const 1))
+(assert_return (invoke "rem_s" (i32.const -7) (i32.const 3)) (i32.const -1))
+(assert_return (invoke "rem_s" (i32.const 7) (i32.const -3)) (i32.const 1))
+(assert_return (invoke "rem_s" (i32.const -7) (i32.const -3)) (i32.const -1))
+(assert_return (invoke "rem_s" (i32.const 11) (i32.const 5)) (i32.const 1))
+(assert_return (invoke "rem_s" (i32.const 17) (i32.const 7)) (i32.const 3))
+
+(assert_return (invoke "rem_u" (i32.const 1) (i32.const 1)) (i32.const 0))
+(assert_return (invoke "rem_u" (i32.const 0) (i32.const 1)) (i32.const 0))
+(assert_return (invoke "rem_u" (i32.const -1) (i32.const -1)) (i32.const 0))
+(assert_return (invoke "rem_u" (i32.const 0x80000000) (i32.const -1)) (i32.const 0x80000000))
+(assert_return (invoke "rem_u" (i32.const 0x80000000) (i32.const 2)) (i32.const 0))
+(assert_return (invoke "rem_u" (i32.const 0x8ff00ff0) (i32.const 0x10001)) (i32.const 0x8001))
+(assert_return (invoke "rem_u" (i32.const 0x80000001) (i32.const 1000)) (i32.const 649))
+(assert_return (invoke "rem_u" (i32.const 5) (i32.const 2)) (i32.const 1))
+(assert_return (invoke "rem_u" (i32.const -5) (i32.const 2)) (i32.const 1))
+(assert_return (invoke "rem_u" (i32.const 5) (i32.const -2)) (i32.const 5))
+(assert_return (invoke "rem_u" (i32.const -5) (i32.const -2)) (i32.const -5))
+(assert_return (invoke "rem_u" (i32.const 7) (i32.const 3)) (i32.const 1))
+(assert_return (invoke "rem_u" (i32.const 11) (i32.const 5)) (i32.const 1))
+(assert_return (invoke "rem_u" (i32.const 17) (i32.const 7)) (i32.const 3))