winch: Move the AtomicWaitKind definition to the MacroAssembler (#10853)

This commit is a small refactoring which moves the definition of the
`AtomicWaitKind` enum to the `MacroAssembler`, to ensure with the
other operation kind definitions.

Author: saulecabrera

winch/codegen/src/codegen/mod.rs

@@ -3,8 +3,9 @@ use crate::{
     codegen::BlockSig,
     isa::reg::{Reg, writable},
     masm::{
-        Extend, Imm, IntCmpKind, LaneSelector, LoadKind, MacroAssembler, OperandSize, RegImm,
-        RmwOp, SPOffset, ShiftKind, StoreKind, TrapCode, UNTRUSTED_FLAGS, Zero,
+        AtomicWaitKind, Extend, Imm, IntCmpKind, LaneSelector, LoadKind, MacroAssembler,
+        OperandSize, RegImm, RmwOp, SPOffset, ShiftKind, StoreKind, TrapCode, UNTRUSTED_FLAGS,
+        Zero,
     },
     stack::TypedReg,
 };
@@ -83,13 +84,6 @@ pub(crate) struct SourceLocation {
     pub current: (CodeOffset, RelSourceLoc),
 }
 
-/// Represents the `memory.atomic.wait*` kind.
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum AtomicWaitKind {
-    Wait32,
-    Wait64,
-}
-
 /// The code generation abstraction.
 pub(crate) struct CodeGen<'a, 'translation: 'a, 'data: 'translation, M, P>
 where

winch/codegen/src/masm.rs

@@ -23,6 +23,13 @@ pub(crate) enum DivKind {
     Unsigned,
 }
 
+/// Represents the `memory.atomic.wait*` kind.
+#[derive(Debug, Clone, Copy)]
+pub(crate) enum AtomicWaitKind {
+    Wait32,
+    Wait64,
+}
+
 /// Remainder kind.
 #[derive(Copy, Clone)]
 pub(crate) enum RemKind {

winch/codegen/src/visitor.rs

@@ -6,16 +6,16 @@
 
 use crate::abi::RetArea;
 use crate::codegen::{
-    AtomicWaitKind, Callee, CodeGen, CodeGenError, ConditionalBranch, ControlStackFrame, Emission,
-    FnCall, UnconditionalBranch, control_index,
+    Callee, CodeGen, CodeGenError, ConditionalBranch, ControlStackFrame, Emission, FnCall,
+    UnconditionalBranch, control_index,
 };
 use crate::masm::{
-    DivKind, Extend, ExtractLaneKind, FloatCmpKind, IntCmpKind, LoadKind, MacroAssembler,
-    MulWideKind, OperandSize, RegImm, RemKind, ReplaceLaneKind, RmwOp, RoundingMode, SPOffset,
-    ShiftKind, Signed, SplatKind, SplatLoadKind, StoreKind, TruncKind, V128AbsKind, V128AddKind,
-    V128ConvertKind, V128ExtAddKind, V128ExtMulKind, V128ExtendKind, V128LoadExtendKind,
-    V128MaxKind, V128MinKind, V128MulKind, V128NarrowKind, V128NegKind, V128SubKind, V128TruncKind,
-    VectorCompareKind, VectorEqualityKind, Zero,
+    AtomicWaitKind, DivKind, Extend, ExtractLaneKind, FloatCmpKind, IntCmpKind, LoadKind,
+    MacroAssembler, MulWideKind, OperandSize, RegImm, RemKind, ReplaceLaneKind, RmwOp,
+    RoundingMode, SPOffset, ShiftKind, Signed, SplatKind, SplatLoadKind, StoreKind, TruncKind,
+    V128AbsKind, V128AddKind, V128ConvertKind, V128ExtAddKind, V128ExtMulKind, V128ExtendKind,
+    V128LoadExtendKind, V128MaxKind, V128MinKind, V128MulKind, V128NarrowKind, V128NegKind,
+    V128SubKind, V128TruncKind, VectorCompareKind, VectorEqualityKind, Zero,
 };
 
 use crate::reg::{Reg, writable};