add done macro

Author: Robbepop

crates/wasmi/src/engine/executor/handler/dispatch.rs

@@ -312,12 +312,12 @@ macro_rules! exec_break {
     }};
 }
 
-macro_rules! trap {
-    ($trap_code:expr, $state:expr, $ip:expr, $sp:expr, $mem0:expr, $mem0_len:expr, $instance:expr) => {{
-        $state.done($crate::engine::executor::handler::state::DoneReason::Trap(
-            $trap_code,
-        ));
-        exec_break!($ip, $sp, $mem0, $mem0_len, $instance)
+macro_rules! done {
+    ($state:expr, $reason:expr) => {{
+        $state.done(<_ as ::core::convert::Into<
+            $crate::engine::executor::handler::DoneReason,
+        >>::into($reason));
+        $crate::engine::executor::handler::Done::control_break()
     }};
 }
 

crates/wasmi/src/engine/executor/handler/mod.rs

@@ -6,6 +6,7 @@ mod utils;
 mod exec;
 mod state;
 
+use self::{dispatch::Done, state::DoneReason};
 pub use self::{
     dispatch::{init_wasm_func_call, op_code_to_handler},
     state::Stack,

crates/wasmi/src/engine/executor/handler/state.rs

@@ -62,6 +62,12 @@ pub enum DoneReason {
     CompileError(Error),
 }
 
+impl From<TrapCode> for DoneReason {
+    fn from(trap_code: TrapCode) -> Self {
+        Self::Trap(trap_code)
+    }
+}
+
 #[derive(Debug, Copy, Clone)]
 #[repr(transparent)]
 pub struct Mem0Ptr(*mut u8);