chore: refactor interpreter loop

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

Author: explodingcamera

crates/tinywasm/benches/tinywasm_modes.rs

@@ -58,14 +58,6 @@ fn criterion_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("tinywasm_modes");
     group.measurement_time(BENCH_MEASUREMENT_TIME);
 
-    group.bench_function("call", |b| {
-        b.iter_batched_ref(
-            || setup_typed_func(module.clone(), None).expect("setup call"),
-            |(store, func)| run_call(store, func).expect("run call"),
-            BatchSize::LargeInput,
-        )
-    });
-
     let per_instruction_engine = Engine::new(Config::new().fuel_policy(FuelPolicy::PerInstruction));
     group.bench_function("resume_fuel_per_instruction", |b| {
         b.iter_batched_ref(
@@ -95,6 +87,14 @@ fn criterion_benchmark(c: &mut Criterion) {
         )
     });
 
+    group.bench_function("call", |b| {
+        b.iter_batched_ref(
+            || setup_typed_func(module.clone(), None).expect("setup call"),
+            |(store, func)| run_call(store, func).expect("run call"),
+            BatchSize::LargeInput,
+        )
+    });
+
     group.finish();
 }
 

crates/tinywasm/src/error.rs

@@ -1,7 +1,7 @@
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 use core::fmt::Debug;
-use core::{fmt::Display, ops::ControlFlow};
+use core::fmt::Display;
 use tinywasm_types::FuncType;
 use tinywasm_types::archive::TwasmError;
 
@@ -274,17 +274,3 @@ impl From<tinywasm_parser::ParseError> for Error {
 
 /// A wrapper around [`core::result::Result`] for tinywasm operations
 pub type Result<T, E = Error> = crate::std::result::Result<T, E>;
-
-pub(crate) trait Controlify<T> {
-    fn to_cf(self) -> ControlFlow<Option<Error>, T>;
-}
-
-impl<T> Controlify<T> for Result<T, Error> {
-    #[inline(always)]
-    fn to_cf(self) -> ControlFlow<Option<Error>, T> {
-        match self {
-            Ok(value) => ControlFlow::Continue(value),
-            Err(err) => ControlFlow::Break(Some(err)),
-        }
-    }
-}

crates/tinywasm/src/interpreter/executor.rs

@@ -38,7 +38,7 @@ impl InterpreterRuntime {
     pub(crate) fn exec_with_time_budget(
         store: &mut Store,
         cf: CallFrame,
-        time_budget: crate::std::time::Duration,
+        time_budget: core::time::Duration,
     ) -> Result<ExecState> {
         executor::Executor::<false>::new(store, cf)?.run_with_time_budget(time_budget)
     }

crates/tinywasm/src/interpreter/mod.rs

@@ -31,21 +31,16 @@ macro_rules! checked_conv_float {
     };
     // Conversion with an intermediate unsigned type and error checking (three types)
     ($from:tt, $intermediate:tt, $to:tt, $self:expr) => {
-        $self
-            .store
-            .stack
-            .values
-            .unary_into::<$from, $to>(|v| {
-                let (min, max) = float_min_max!($from, $intermediate);
-                if unlikely(v.is_nan()) {
-                    return Err(Error::Trap(crate::Trap::InvalidConversionToInt));
-                }
-                if unlikely(v <= min || v >= max) {
-                    return Err(Error::Trap(crate::Trap::IntegerOverflow));
-                }
-                Ok((v as $intermediate as $to).into())
-            })
-            .to_cf()?
+        $self.store.stack.values.unary_into::<$from, $to>(|v| {
+            let (min, max) = float_min_max!($from, $intermediate);
+            if unlikely(v.is_nan()) {
+                return Err(Error::Trap(crate::Trap::InvalidConversionToInt));
+            }
+            if unlikely(v <= min || v >= max) {
+                return Err(Error::Trap(crate::Trap::IntegerOverflow));
+            }
+            Ok((v as $intermediate as $to).into())
+        })?
     };
 }
 

crates/tinywasm/src/interpreter/num_helpers.rs

@@ -100,7 +100,8 @@ fn test_linking_invalid_typed_func() -> Result<()> {
             let mut store = Store::default();
             let mut imports = Imports::new();
             imports.define("host", "hfn", typed_fn).unwrap();
-            module.clone().instantiate(&mut store, Some(imports))?;
+            let link_failure = module.clone().instantiate(&mut store, Some(imports));
+            assert!(link_failure.is_err(), "Expected linking to fail for mismatched typed func, but it succeeded");
         }
     }
 

crates/tinywasm/tests/host_func_signature_check.rs

@@ -7,7 +7,7 @@ out_dir="./target/wasm32-unknown-unknown/wasm"
 dest_dir="out"
 
 rust_features="+simd128,+reference-types,+bulk-memory,+mutable-globals,+multivalue,+sign-ext,+nontrapping-fptoint"
-wasmopt_features="--enable-simd --enable-reference-types --enable-bulk-memory --enable-mutable-globals --enable-multivalue --enable-sign-ext --enable-nontrapping-float-to-int --duplicate-function-elimination"
+wasmopt_features="--enable-simd --enable-tail-call --enable-extended-const --enable-reference-types --enable-bulk-memory --enable-mutable-globals --enable-multivalue --enable-sign-ext --enable-nontrapping-float-to-int --duplicate-function-elimination"
 
 # ensure out dir exists
 mkdir -p "$dest_dir"