Clean-up Wasmi engine imports and exports (#1228)

* clean-up Wasmi engine imports and exports

* fix doc test imports

* apply rustfmt

Author: Robbepop

crates/wasmi/src/engine/code_map.rs

@@ -15,10 +15,8 @@ use super::{
 use crate::{
     collections::arena::{Arena, ArenaIndex},
     core::{TrapCode, UntypedVal},
-    engine::{
-        bytecode::{index::InternalFunc, Instruction},
-        utils::unreachable_unchecked,
-    },
+    engine::utils::unreachable_unchecked,
+    ir::{index::InternalFunc, Instruction},
     module::{FuncIdx, ModuleHeader},
     store::{Fuel, FuelError},
     Config,

crates/wasmi/src/engine/executor/cache.rs

@@ -1,7 +1,8 @@
 use crate::{
     core::UntypedVal,
-    engine::{bytecode::index, DedupFuncType},
+    engine::DedupFuncType,
     instance::InstanceEntity,
+    ir::index,
     memory::DataSegment,
     module::DEFAULT_MEMORY_INDEX,
     store::StoreInner,

crates/wasmi/src/engine/executor/instr_ptr.rs

@@ -1,4 +1,4 @@
-use crate::engine::bytecode::Instruction;
+use crate::ir::Instruction;
 
 /// The instruction pointer to the instruction of a function on the call stack.
 #[derive(Debug, Copy, Clone)]

crates/wasmi/src/engine/executor/instrs.rs

@@ -3,14 +3,13 @@ use super::{cache::CachedInstance, InstructionPtr, Stack};
 use crate::{
     core::{hint, TrapCode, UntypedVal},
     engine::{
-        bytecode::{index, BlockFuel, Const16, Instruction, Reg},
         code_map::CodeMap,
         executor::stack::{CallFrame, FrameRegisters, ValueStack},
         utils::unreachable_unchecked,
         DedupFuncType,
         EngineFunc,
     },
-    ir::ShiftAmount,
+    ir::{index, BlockFuel, Const16, Instruction, Reg, ShiftAmount},
     memory::DataSegment,
     store::StoreInner,
     table::ElementSegment,

crates/wasmi/src/engine/executor/instrs/binary.rs

@@ -1,14 +1,13 @@
 use super::{Executor, UntypedValueExt};
 use crate::{
     core::{TrapCode, UntypedVal},
-    engine::bytecode::{Const16, Reg, Sign},
-    ir::ShiftAmount,
+    ir::{Const16, Reg, ShiftAmount, Sign},
     Error,
 };
 use core::num::{NonZeroI32, NonZeroI64, NonZeroU32, NonZeroU64};
 
 #[cfg(doc)]
-use crate::engine::bytecode::Instruction;
+use crate::ir::Instruction;
 
 macro_rules! impl_binary {
     ( $( (Instruction::$var_name:ident, $fn_name:ident, $op:expr) ),* $(,)? ) => {

crates/wasmi/src/engine/executor/instrs/branch.rs

@@ -1,17 +1,15 @@
 use super::Executor;
 use crate::{
     core::UntypedVal,
-    engine::{
-        bytecode::{
-            BranchOffset,
-            BranchOffset16,
-            Comparator,
-            ComparatorAndOffset,
-            Const16,
-            Instruction,
-            Reg,
-        },
-        utils::unreachable_unchecked,
+    engine::utils::unreachable_unchecked,
+    ir::{
+        BranchOffset,
+        BranchOffset16,
+        Comparator,
+        ComparatorAndOffset,
+        Const16,
+        Instruction,
+        Reg,
     },
 };
 use core::cmp;

crates/wasmi/src/engine/executor/instrs/call.rs

@@ -2,14 +2,14 @@ use super::{Executor, InstructionPtr};
 use crate::{
     core::TrapCode,
     engine::{
-        bytecode::{index, Instruction, Reg, RegSpan},
         code_map::CompiledFuncRef,
         executor::stack::{CallFrame, FrameParams, ValueStack},
         utils::unreachable_unchecked,
         EngineFunc,
         FuncParams,
     },
     func::{FuncEntity, HostFuncEntity},
+    ir::{index, Instruction, Reg, RegSpan},
     store::StoreInner,
     CallHook,
     Error,

crates/wasmi/src/engine/executor/instrs/comparison.rs

@@ -1,11 +1,11 @@
 use super::Executor;
 use crate::{
     core::UntypedVal,
-    engine::bytecode::{Const16, Reg},
+    ir::{Const16, Reg},
 };
 
 #[cfg(doc)]
-use crate::engine::bytecode::Instruction;
+use crate::ir::Instruction;
 
 macro_rules! impl_comparison {
     ( $( (Instruction::$var_name:ident, $fn_name:ident, $op:expr) ),* $(,)? ) => {

crates/wasmi/src/engine/executor/instrs/conversion.rs

@@ -1,8 +1,8 @@
 use super::Executor;
-use crate::{core::UntypedVal, engine::bytecode::Reg, Error};
+use crate::{core::UntypedVal, ir::Reg, Error};
 
 #[cfg(doc)]
-use crate::engine::bytecode::Instruction;
+use crate::ir::Instruction;
 
 macro_rules! impl_conversion_impls {
     ( $( (Instruction::$var_name:ident, $fn_name:ident, $op:expr) ),* $(,)? ) => {

crates/wasmi/src/engine/executor/instrs/copy.rs

@@ -1,10 +1,8 @@
 use super::{Executor, InstructionPtr};
 use crate::{
     core::UntypedVal,
-    engine::{
-        bytecode::{AnyConst32, Const32, FixedRegSpan, Instruction, Reg, RegSpan},
-        utils::unreachable_unchecked,
-    },
+    engine::utils::unreachable_unchecked,
+    ir::{AnyConst32, Const32, FixedRegSpan, Instruction, Reg, RegSpan},
 };
 use core::slice;
 use smallvec::SmallVec;