refactor WasmInteger trait

Author: Robbepop

crates/wasmi/src/engine/translator/func2/mod.rs

@@ -860,7 +860,7 @@ impl FuncTranslator {
             (lhs, Operand::Immediate(rhs)) => {
                 let lhs = self.layout.operand_to_reg(lhs)?;
                 let rhs = T::from(rhs.val());
-                let Some(non_zero_rhs) = <T as WasmInteger>::NonZero::try_from(rhs).ok() else {
+                let Some(non_zero_rhs) = <T as WasmInteger>::non_zero(rhs) else {
                     // Optimization: division by zero always traps
                     return self.translate_trap(TrapCode::IntegerDivisionByZero);
                 };

crates/wasmi/src/engine/translator/utils.rs

@@ -42,51 +42,43 @@ impl_typed_for! {
 pub trait WasmInteger:
     Copy
     + Eq
+    + Typed
     + From<TypedVal>
     + Into<TypedVal>
     + From<UntypedVal>
     + Into<UntypedVal>
     + TryInto<Const16<Self>>
-    + Typed
 {
     /// The non-zero type of the [`WasmInteger`].
-    type NonZero: Copy + TryFrom<Self> + Into<UntypedVal> + TryInto<Const16<Self::NonZero>>;
+    type NonZero: Copy + Into<Self> + TryInto<Const16<Self::NonZero>> + Into<UntypedVal>;
+
+    /// Returns `self` as [`Self::NonZero`] if possible.
+    ///
+    /// Returns `None` if `self` is zero.
+    fn non_zero(self) -> Option<Self::NonZero>;
 
     /// Returns `true` if `self` is equal to zero (0).
     fn eq_zero(self) -> bool;
 }
 
-impl WasmInteger for i32 {
-    type NonZero = NonZero<Self>;
-
-    fn eq_zero(self) -> bool {
-        self == 0
-    }
-}
-
-impl WasmInteger for u32 {
-    type NonZero = NonZero<Self>;
-
-    fn eq_zero(self) -> bool {
-        self == 0
-    }
-}
-
-impl WasmInteger for i64 {
-    type NonZero = NonZero<Self>;
-
-    fn eq_zero(self) -> bool {
-        self == 0
-    }
-}
+macro_rules! impl_wasm_integer {
+    ($($ty:ty),*) => {
+        $(
+            impl WasmInteger for $ty {
+                type NonZero = NonZero<Self>;
 
-impl WasmInteger for u64 {
-    type NonZero = NonZero<Self>;
+                fn non_zero(self) -> Option<Self::NonZero> {
+                    Self::NonZero::new(self)
+                }
 
-    fn eq_zero(self) -> bool {
-        self == 0
-    }
+                fn eq_zero(self) -> bool {
+                    self == 0
+                }
+            }
+        )*
+    };
 }
+impl_wasm_integer!(i32, u32, i64, u64);
 
 /// A WebAssembly float. Either `f32` or `f64`.
 ///