move return exec handler in front of call_{imported,indirect}

Author: Robbepop

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

@@ -191,6 +191,24 @@ global_set_execution_handler! {
     fn global_set_v128_s(GlobalSetV128_S, V128);
 }
 
+execution_handler! {
+    fn r#return(
+        state: &mut VmState,
+        ip: Ip,
+        sp: Sp,
+        mem0: Mem0Ptr,
+        mem0_len: Mem0Len,
+        instance: Inst,
+        ireg: Ireg,
+        freg32: Freg32,
+        freg64: Freg64,
+    ) -> Done = {
+        let mut args = Args::from_parts(ip, sp, mem0, mem0_len, instance, ireg, freg32, freg64);
+        args.pop_frame(state)?;
+        dispatch!(state, args)
+    }
+}
+
 execution_handler! {
     fn call_internal(
         state: &mut VmState,
@@ -348,24 +366,6 @@ return_call_indirect_execution_handler! {
     fn return_call_indirect_table0_s(ReturnCallIndirectTable0_S);
 }
 
-execution_handler! {
-    fn r#return(
-        state: &mut VmState,
-        ip: Ip,
-        sp: Sp,
-        mem0: Mem0Ptr,
-        mem0_len: Mem0Len,
-        instance: Inst,
-        ireg: Ireg,
-        freg32: Freg32,
-        freg64: Freg64,
-    ) -> Done = {
-        let mut args = Args::from_parts(ip, sp, mem0, mem0_len, instance, ireg, freg32, freg64);
-        args.pop_frame(state)?;
-        dispatch!(state, args)
-    }
-}
-
 execution_handler! {
     fn memory_size(
         state: &mut VmState,