rename new crate features

- compact -> indirect-dispatch
- trampolines -> portable-dispatch

Author: Robbepop

crates/fuzz/Cargo.toml

@@ -15,7 +15,7 @@ exclude.workspace = true
 publish = false
 
 [dependencies]
-wasmi = { workspace = true, features = ["std", "simd", "trampolines", "extra-checks"] }
+wasmi = { workspace = true, features = ["std", "simd", "portable-dispatch", "extra-checks"] }
 wasmtime = { workspace = true, optional = true, features = [
     "cranelift",
     "runtime",

crates/wasmi/Cargo.toml

@@ -52,13 +52,13 @@ prefer-btree-collections = [
 ]
 wat = ["dep:wat", "std"]
 simd = ["wasmi_core/simd", "wasmi_ir2/simd", "wasmparser/simd"]
-# Uses a compact representation for the IR to decrease
-# memory consumption at the cost of runtime performance.
-compact = []
-# Uses trampoline instruction dispatch instead of tail calls.
-# While this instruction dispatch is universally applicable it
-# usually is slower than tail dispatch.
-trampolines = []
+
+# Enables a portable dispatch scheme that avoids tail-call reliance.
+# Recommended for targets without stable or guaranteed tail-call support.
+portable-dispatch = []
+# Enables an indirect dispatch scheme using op-codes instead of
+# embedded function pointers for more compact bytecode.
+indirect-dispatch = []
 
 # Enables extra checks performed during Wasmi bytecode execution.
 #

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

@@ -26,7 +26,7 @@ use core::{marker::PhantomData, ops::ControlFlow};
 
 #[inline(always)]
 pub fn fetch_handler(ip: Ip) -> Handler {
-    match cfg!(feature = "compact") {
+    match cfg!(feature = "indirect-dispatch") {
         true => {
             let (_, op_code) = unsafe { ip.decode::<OpCode>() };
             op_code_to_handler(op_code)
@@ -289,7 +289,7 @@ impl<'a, T> HostFuncCall<'a, T, state::Done> {
     }
 }
 
-#[cfg(feature = "trampolines")]
+#[cfg(feature = "portable-dispatch")]
 pub fn execute_until_done(
     mut state: VmState,
     mut ip: Ip,
@@ -321,7 +321,7 @@ pub fn execute_until_done(
     state.into_execution_outcome()
 }
 
-#[cfg(not(feature = "trampolines"))]
+#[cfg(not(feature = "portable-dispatch"))]
 pub fn execute_until_done(
     state: VmState,
     ip: Ip,
@@ -380,11 +380,11 @@ impl From<Error> for ExecutionOutcome {
     }
 }
 
-#[cfg(not(feature = "trampolines"))]
+#[cfg(not(feature = "portable-dispatch"))]
 #[derive(Debug)]
 pub enum NextState {}
 
-#[cfg(feature = "trampolines")]
+#[cfg(feature = "portable-dispatch")]
 #[derive(Debug, Copy, Clone)]
 pub struct NextState {
     ip: Ip,
@@ -457,12 +457,12 @@ impl Break {
 pub type Control<C = (), B = Break> = ControlFlow<B, C>;
 pub type Done<T = NextState> = Control<T, Break>;
 
-#[cfg(feature = "trampolines")]
+#[cfg(feature = "portable-dispatch")]
 pub trait ControlContinue: Sized {
     fn control_continue(ip: Ip, sp: Sp, mem0: Mem0Ptr, mem0_len: Mem0Len, instance: Inst) -> Self;
 }
 
-#[cfg(feature = "trampolines")]
+#[cfg(feature = "portable-dispatch")]
 impl ControlContinue for Done<NextState> {
     fn control_continue(ip: Ip, sp: Sp, mem0: Mem0Ptr, mem0_len: Mem0Len, instance: Inst) -> Self {
         Self::Continue(NextState {
@@ -514,15 +514,15 @@ macro_rules! done {
     }};
 }
 
-#[cfg(not(feature = "trampolines"))]
+#[cfg(not(feature = "portable-dispatch"))]
 macro_rules! dispatch {
     ($state:expr, $ip:expr, $sp:expr, $mem0:expr, $mem0_len:expr, $instance:expr) => {{
         let handler = $crate::engine::executor::handler::dispatch::fetch_handler($ip);
         return handler($state, $ip, $sp, $mem0, $mem0_len, $instance);
     }};
 }
 
-#[cfg(feature = "trampolines")]
+#[cfg(feature = "portable-dispatch")]
 macro_rules! dispatch {
     ($state:expr, $ip:expr, $sp:expr, $mem0:expr, $mem0_len:expr, $instance:expr) => {{
         let _: &mut VmState = $state;

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

@@ -55,7 +55,7 @@ use crate::{
 use core::cmp;
 
 unsafe fn decode_op<Op: ir::Decode>(ip: Ip) -> (Ip, Op) {
-    let ip = match cfg!(feature = "compact") {
+    let ip = match cfg!(feature = "indirect-dispatch") {
         true => unsafe { ip.skip::<ir::OpCode>() },
         false => unsafe { ip.skip::<::core::primitive::usize>() },
     };

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

@@ -6,7 +6,7 @@ mod eval;
 mod exec;
 mod state;
 
-#[cfg(feature = "trampolines")]
+#[cfg(feature = "portable-dispatch")]
 use self::dispatch::ControlContinue;
 pub use self::{
     dispatch::{

crates/wasmi/src/engine/translator/func/encoder.rs

@@ -750,7 +750,7 @@ impl FuelCostsSelector for FuelUsed {
 
 /// Encodes an [`OpCode`] to a generic [`ir::Encoder`].
 fn encode_op_code<E: ir::Encoder>(encoder: &mut E, code: OpCode) -> Result<E::Pos, E::Error> {
-    match cfg!(feature = "compact") {
+    match cfg!(feature = "indirect-dispatch") {
         true => {
             // Note: encoding for indirect-threading
             //

crates/wast/Cargo.toml

@@ -19,7 +19,7 @@ wast = { workspace = true, features = ["wasm-module"] }
 anyhow = "1.0"
 
 [features]
-default = ["trampolines", "extra-checks"]
-compact = ["wasmi/compact"]
-trampolines = ["wasmi/trampolines"]
+default = ["portable-dispatch", "extra-checks"]
+portable-dispatch = ["wasmi/portable-dispatch"]
+indirect-dispatch = ["wasmi/indirect-dispatch"]
 extra-checks = ["wasmi/extra-checks"]