Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Debugging: refactor stack frame cursor into frame handle abstraction. (#12566)

Chris Fallin7e0331c27018
diff --git a/crates/cranelift/src/compiler.rs b/crates/cranelift/src/compiler.rs
index 3b75e2821d..7ea49bbcba 100644
--- a/crates/cranelift/src/compiler.rs
+++ b/crates/cranelift/src/compiler.rs
@@ -434,8 +434,36 @@ impl wasmtime_environ::Compiler for Compiler {
callee,
&[callee_vmctx, caller_vmctx, args_base, args_len],
);
+
+ // Increment the "execution version" on the VMStoreContext if
+ // guest debugging is enabled.
+ if self.tunables.debug_guest {
+ let vmstore_ctx_ptr = builder.ins().load(
+ pointer_type,
+ MemFlags::trusted().with_readonly(),
+ caller_vmctx,
+ i32::from(ptr_size.vmctx_store_context()),
+ );
+ let old_version = builder.ins().load(
+ ir::types::I64,
+ MemFlags::trusted(),
+ vmstore_ctx_ptr,
+ i32::from(ptr_size.vmstore_context_execution_version()),
+ );
+ let new_version = builder.ins().iadd_imm(old_version, 1);
+ builder.ins().store(
+ MemFlags::trusted(),
+ new_version,
+ vmstore_ctx_ptr,
+ i32::from(ptr_size.vmstore_context_execution_version()),
+ );
+ }
+
+ // Invoke `raise` if the callee (host) returned an error.
let succeeded = builder.func.dfg.inst_results(call)[0];
self.raise_if_host_trapped(&mut builder, caller_vmctx, succeeded);
+
+ // Return results from the array as native return values.
let results =
self.load_values_from_array(wasm_func_ty.returns(), &mut builder, args_base, args_len);
builder.ins().return_(&results);
diff --git a/crates/debugger/src/lib.rs b/crates/debugger/src/lib.rs
index f37bcd4b71..68508b2e35 100644
--- a/crates/debugger/src/lib.rs
+++ b/crates/debugger/src/lib.rs
@@ -498,17 +498,31 @@ mod test {
assert!(matches!(event, DebugRunResult::Breakpoint));
// At (before executing) first `local.get`.
debugger
- .with_store(|store| {
- let mut frame = store.debug_frames().unwrap();
- assert!(!frame.done());
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().0.as_u32(), 0);
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().1, 36);
- assert_eq!(frame.num_locals(), 2);
- assert_eq!(frame.num_stacks(), 0);
- assert_eq!(frame.local(0).unwrap_i32(), 1);
- assert_eq!(frame.local(1).unwrap_i32(), 2);
- assert_eq!(frame.move_to_parent(), FrameParentResult::SameActivation);
- assert!(frame.done());
+ .with_store(|mut store| {
+ let frame = store.debug_exit_frames().next().unwrap();
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .0
+ .as_u32(),
+ 0
+ );
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .1,
+ 36
+ );
+ assert_eq!(frame.num_locals(&mut store).unwrap(), 2);
+ assert_eq!(frame.num_stacks(&mut store).unwrap(), 0);
+ assert_eq!(frame.local(&mut store, 0).unwrap().unwrap_i32(), 1);
+ assert_eq!(frame.local(&mut store, 1).unwrap().unwrap_i32(), 2);
+ let frame = frame.parent(&mut store).unwrap();
+ assert!(frame.is_none());
})
.await?;
@@ -516,18 +530,32 @@ mod test {
// At second `local.get`.
assert!(matches!(event, DebugRunResult::Breakpoint));
debugger
- .with_store(|store| {
- let mut frame = store.debug_frames().unwrap();
- assert!(!frame.done());
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().0.as_u32(), 0);
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().1, 38);
- assert_eq!(frame.num_locals(), 2);
- assert_eq!(frame.num_stacks(), 1);
- assert_eq!(frame.local(0).unwrap_i32(), 1);
- assert_eq!(frame.local(1).unwrap_i32(), 2);
- assert_eq!(frame.stack(0).unwrap_i32(), 1);
- assert_eq!(frame.move_to_parent(), FrameParentResult::SameActivation);
- assert!(frame.done());
+ .with_store(|mut store| {
+ let frame = store.debug_exit_frames().next().unwrap();
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .0
+ .as_u32(),
+ 0
+ );
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .1,
+ 38
+ );
+ assert_eq!(frame.num_locals(&mut store).unwrap(), 2);
+ assert_eq!(frame.num_stacks(&mut store).unwrap(), 1);
+ assert_eq!(frame.local(&mut store, 0).unwrap().unwrap_i32(), 1);
+ assert_eq!(frame.local(&mut store, 1).unwrap().unwrap_i32(), 2);
+ assert_eq!(frame.stack(&mut store, 0).unwrap().unwrap_i32(), 1);
+ let frame = frame.parent(&mut store).unwrap();
+ assert!(frame.is_none());
})
.await?;
@@ -535,19 +563,33 @@ mod test {
// At `i32.add`.
assert!(matches!(event, DebugRunResult::Breakpoint));
debugger
- .with_store(|store| {
- let mut frame = store.debug_frames().unwrap();
- assert!(!frame.done());
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().0.as_u32(), 0);
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().1, 40);
- assert_eq!(frame.num_locals(), 2);
- assert_eq!(frame.num_stacks(), 2);
- assert_eq!(frame.local(0).unwrap_i32(), 1);
- assert_eq!(frame.local(1).unwrap_i32(), 2);
- assert_eq!(frame.stack(0).unwrap_i32(), 1);
- assert_eq!(frame.stack(1).unwrap_i32(), 2);
- assert_eq!(frame.move_to_parent(), FrameParentResult::SameActivation);
- assert!(frame.done());
+ .with_store(|mut store| {
+ let frame = store.debug_exit_frames().next().unwrap();
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .0
+ .as_u32(),
+ 0
+ );
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .1,
+ 40
+ );
+ assert_eq!(frame.num_locals(&mut store).unwrap(), 2);
+ assert_eq!(frame.num_stacks(&mut store).unwrap(), 2);
+ assert_eq!(frame.local(&mut store, 0).unwrap().unwrap_i32(), 1);
+ assert_eq!(frame.local(&mut store, 1).unwrap().unwrap_i32(), 2);
+ assert_eq!(frame.stack(&mut store, 0).unwrap().unwrap_i32(), 1);
+ assert_eq!(frame.stack(&mut store, 1).unwrap().unwrap_i32(), 2);
+ let frame = frame.parent(&mut store).unwrap();
+ assert!(frame.is_none());
})
.await?;
@@ -555,18 +597,32 @@ mod test {
// At return point.
assert!(matches!(event, DebugRunResult::Breakpoint));
debugger
- .with_store(|store| {
- let mut frame = store.debug_frames().unwrap();
- assert!(!frame.done());
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().0.as_u32(), 0);
- assert_eq!(frame.wasm_function_index_and_pc().unwrap().1, 41);
- assert_eq!(frame.num_locals(), 2);
- assert_eq!(frame.num_stacks(), 1);
- assert_eq!(frame.local(0).unwrap_i32(), 1);
- assert_eq!(frame.local(1).unwrap_i32(), 2);
- assert_eq!(frame.stack(0).unwrap_i32(), 3);
- assert_eq!(frame.move_to_parent(), FrameParentResult::SameActivation);
- assert!(frame.done());
+ .with_store(|mut store| {
+ let frame = store.debug_exit_frames().next().unwrap();
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .0
+ .as_u32(),
+ 0
+ );
+ assert_eq!(
+ frame
+ .wasm_function_index_and_pc(&mut store)
+ .unwrap()
+ .unwrap()
+ .1,
+ 41
+ );
+ assert_eq!(frame.num_locals(&mut store).unwrap(), 2);
+ assert_eq!(frame.num_stacks(&mut store).unwrap(), 1);
+ assert_eq!(frame.local(&mut store, 0).unwrap().unwrap_i32(), 1);
+ assert_eq!(frame.local(&mut store, 1).unwrap().unwrap_i32(), 2);
+ assert_eq!(frame.stack(&mut store, 0).unwrap().unwrap_i32(), 3);
+ let frame = frame.parent(&mut store).unwrap();
+ assert!(frame.is_none());
})
.await?;
diff --git a/crates/environ/src/vmoffsets.rs b/crates/environ/src/vmoffsets.rs
index 60c88a2c52..5f1d41e1c7 100644
--- a/crates/environ/src/vmoffsets.rs
+++ b/crates/environ/src/vmoffsets.rs
@@ -181,10 +181,17 @@ pub trait PtrSize {
self.vmstore_context_fuel_consumed() + 8
}
+ /// Return the offset of the `execution_version` field of
+ /// `VMStoreContext`
+ #[inline]
+ fn vmstore_context_execution_version(&self) -> u8 {
+ self.vmstore_context_epoch_deadline() + 8
+ }
+
/// Return the offset of the `stack_limit` field of `VMStoreContext`
#[inline]
fn vmstore_context_stack_limit(&self) -> u8 {
- self.vmstore_context_epoch_deadline() + 8
+ self.vmstore_context_execution_version() + 8
}
/// Return the offset of the `gc_heap` field of `VMStoreContext`.
diff --git a/crates/unwinder/src/stackwalk.rs b/crates/unwinder/src/stackwalk.rs
index 80dcb7eeea..60d33747ce 100644
--- a/crates/unwinder/src/stackwalk.rs
+++ b/crates/unwinder/src/stackwalk.rs
@@ -97,91 +97,128 @@ impl Frame {
}
}
-/// Provide an iterator that walks through a contiguous sequence of
-/// Wasm frames starting with the frame at the given PC and FP and
-/// ending at `trampoline_fp`. This FP should correspond to that of a
-/// trampoline that was used to enter the Wasm code.
-///
-/// We require that the initial PC, FP, and `trampoline_fp` values are
-/// non-null (non-zero).
-///
-/// # Safety
-///
-/// This function is not safe as `unwind`, `pc`, `fp`, and `trampoline_fp` must
-/// all be "correct" in that if they're wrong or mistakenly have the wrong value
-/// then this method may segfault. These values must point to valid Wasmtime
-/// compiled code which respects the frame pointers that Wasmtime currently
-/// requires.
-///
-/// The iterator that this function returns *must* be consumed while
-/// the frames are still active. That is, it cannot be stashed and
-/// consumed after returning back into the Wasm activation that is
-/// being iterated over.
-///
-/// Ordinarily this can be ensured by holding the unsafe iterator
-/// together with a borrow of the `Store` that owns the stack;
-/// higher-level layers wrap the two together.
-pub unsafe fn frame_iterator(
- unwind: &dyn Unwind,
- mut pc: usize,
- mut fp: usize,
+/// A cursor over `Frame`s in a single activation of Wasm.
+#[derive(Clone)]
+pub struct FrameCursor {
+ pc: usize,
+ fp: usize,
trampoline_fp: usize,
-) -> impl Iterator<Item = Frame> {
- log::trace!("=== Tracing through contiguous sequence of Wasm frames ===");
- log::trace!("trampoline_fp = 0x{trampoline_fp:016x}");
- log::trace!(" initial pc = 0x{pc:016x}");
- log::trace!(" initial fp = 0x{fp:016x}");
+}
- // Safety requirements documented above.
- assert_ne!(pc, 0);
- assert_ne!(fp, 0);
- assert_ne!(trampoline_fp, 0);
+impl FrameCursor {
+ /// Provide a cursor that walks through a contiguous sequence of Wasm
+ /// frames starting with the frame at the given PC and FP and ending
+ /// at `trampoline_fp`. This FP should correspond to that of a
+ /// trampoline that was used to enter the Wasm code.
+ ///
+ /// We require that the initial PC, FP, and `trampoline_fp` values are
+ /// non-null (non-zero).
+ ///
+ /// The returned type is a cursor, not a literal `Iterator`
+ /// implementation, because we do not want to capture the `&dyn
+ /// Unwind` (rather the cursor's `next` method requires the `&dyn
+ /// Unwind` separately, which permits more flexible usage).
+ ///
+ /// # Safety
+ ///
+ /// This function is not safe as `unwind`, `pc`, `fp`, and `trampoline_fp` must
+ /// all be "correct" in that if they're wrong or mistakenly have the wrong value
+ /// then this method may segfault. These values must point to valid Wasmtime
+ /// compiled code which respects the frame pointers that Wasmtime currently
+ /// requires.
+ ///
+ /// The iterator that this function returns *must* be consumed while
+ /// the frames are still active. That is, it cannot be stashed and
+ /// consumed after returning back into the Wasm activation that is
+ /// being iterated over.
+ ///
+ /// Ordinarily this can be ensured by holding the unsafe iterator
+ /// together with a borrow of the `Store` that owns the stack;
+ /// higher-level layers wrap the two together.
+ pub unsafe fn new(pc: usize, fp: usize, trampoline_fp: usize) -> FrameCursor {
+ log::trace!("=== Tracing through contiguous sequence of Wasm frames ===");
+ log::trace!("trampoline_fp = 0x{trampoline_fp:016x}");
+ log::trace!(" initial pc = 0x{pc:016x}");
+ log::trace!(" initial fp = 0x{fp:016x}");
- // This loop will walk the linked list of frame pointers starting
- // at `fp` and going up until `trampoline_fp`. We know that both
- // `fp` and `trampoline_fp` are "trusted values" aka generated and
- // maintained by Wasmtime. This means that it should be safe to
- // walk the linked list of pointers and inspect Wasm frames.
- //
- // Note, though, that any frames outside of this range are not
- // guaranteed to have valid frame pointers. For example native code
- // might be using the frame pointer as a general purpose register. Thus
- // we need to be careful to only walk frame pointers in this one
- // contiguous linked list.
- //
- // To know when to stop iteration all architectures' stacks currently
- // look something like this:
- //
- // | ... |
- // | Native Frames |
- // | ... |
- // |-------------------|
- // | ... | <-- Trampoline FP |
- // | Trampoline Frame | |
- // | ... | <-- Trampoline SP |
- // |-------------------| Stack
- // | Return Address | Grows
- // | Previous FP | <-- Wasm FP Down
- // | ... | |
- // | Cranelift Frames | |
- // | ... | V
- //
- // The trampoline records its own frame pointer (`trampoline_fp`),
- // which is guaranteed to be above all Wasm code. To check when
+ // Safety requirements documented above.
+ assert_ne!(pc, 0);
+ assert_ne!(fp, 0);
+ assert_ne!(trampoline_fp, 0);
- // to check when the next frame pointer is equal to
- // `trampoline_fp`. Once that's hit then we know that the entire
- // linked list has been traversed.
- //
- // Note that it might be possible that this loop doesn't execute
- // at all. For example if the entry trampoline called Wasm code
- // which `return_call`'d an exit trampoline, then `fp ==
- // trampoline_fp` on the entry of this function, meaning the loop
- // won't actually execute anything.
- core::iter::from_fn(move || {
- if fp == trampoline_fp {
+ FrameCursor {
+ pc,
+ fp,
+ trampoline_fp,
+ }
+ }
+
+ /// Get the frame that this cursor currently points at.
+ pub fn frame(&self) -> Frame {
+ assert!(!self.done());
+ Frame {
+ pc: self.pc,
+ fp: self.fp,
+ }
+ }
+
+ /// Returns whether the cursor is "done", i.e., no other frame is
+ /// available in this activation.
+ pub fn done(&self) -> bool {
+ self.fp == self.trampoline_fp
+ }
+
+ /// Move to the next frame in this activation, if any.
+ ///
+ /// # Safety
+ ///
+ /// The `unwind` passed in must correspond to the host
+ /// implementation from which this stack came.
+ pub unsafe fn advance(&mut self, unwind: &dyn Unwind) {
+ // This logic will walk the linked list of frame pointers starting
+ // at `fp` and going up until `trampoline_fp`. We know that both
+ // `fp` and `trampoline_fp` are "trusted values" aka generated and
+ // maintained by Wasmtime. This means that it should be safe to
+ // walk the linked list of pointers and inspect Wasm frames.
+ //
+ // Note, though, that any frames outside of this range are not
+ // guaranteed to have valid frame pointers. For example native code
+ // might be using the frame pointer as a general purpose register. Thus
+ // we need to be careful to only walk frame pointers in this one
+ // contiguous linked list.
+ //
+ // To know when to stop iteration all architectures' stacks currently
+ // look something like this:
+ //
+ // | ... |
+ // | Native Frames |
+ // | ... |
+ // |-------------------|
+ // | ... | <-- Trampoline FP |
+ // | Trampoline Frame | |
+ // | ... | <-- Trampoline SP |
+ // |-------------------| Stack
+ // | Return Address | Grows
+ // | Previous FP | <-- Wasm FP Down
+ // | ... | |
+ // | Cranelift Frames | |
+ // | ... | V
+ //
+ // The trampoline records its own frame pointer (`trampoline_fp`),
+ // which is guaranteed to be above all Wasm code. To check when
+
+ // to check when the next frame pointer is equal to
+ // `trampoline_fp`. Once that's hit then we know that the entire
+ // linked list has been traversed.
+ //
+ // Note that it might be possible that this loop doesn't execute
+ // at all. For example if the entry trampoline called Wasm code
+ // which `return_call`'d an exit trampoline, then `fp ==
+ // trampoline_fp` on the entry of this function, meaning the loop
+ // won't actually execute anything.
+ if self.fp == self.trampoline_fp {
log::trace!("=== Done tracing contiguous sequence of Wasm frames ===");
- return None;
+ return;
}
// At the start of each iteration of the loop, we know that
@@ -194,20 +231,23 @@ pub unsafe fn frame_iterator(
// we are dealing with should be less than the frame pointer
// on entry to Wasm code. Finally also assert that it's
// aligned correctly as an additional sanity check.
- assert!(trampoline_fp > fp, "{trampoline_fp:#x} > {fp:#x}");
- unwind.assert_fp_is_aligned(fp);
+ assert!(
+ self.trampoline_fp > self.fp,
+ "{:#x} > {:#x}",
+ self.trampoline_fp,
+ self.fp
+ );
+ unwind.assert_fp_is_aligned(self.fp);
log::trace!("--- Tracing through one Wasm frame ---");
- log::trace!("pc = {:p}", pc as *const ());
- log::trace!("fp = {:p}", fp as *const ());
-
- let frame = Frame { pc, fp };
+ log::trace!("pc = {:p}", self.pc as *const ());
+ log::trace!("fp = {:p}", self.fp as *const ());
// SAFETY: this unsafe traversal of the linked list on the stack is
// reflected in the contract of this function where `pc`, `fp`,
// `trampoline_fp`, and `unwind` must all be trusted/correct values.
unsafe {
- pc = unwind.get_next_older_pc_from_fp(fp);
+ self.pc = unwind.get_next_older_pc_from_fp(self.fp);
// We rely on this offset being zero for all supported
// architectures in
@@ -218,15 +258,51 @@ pub unsafe fn frame_iterator(
// Get the next older frame pointer from the current Wasm
// frame pointer.
- let next_older_fp = *(fp as *mut usize).add(unwind.next_older_fp_from_fp_offset());
+ let next_older_fp = *(self.fp as *mut usize).add(unwind.next_older_fp_from_fp_offset());
// Because the stack always grows down, the older FP must be greater
// than the current FP.
- assert!(next_older_fp > fp, "{next_older_fp:#x} > {fp:#x}");
- fp = next_older_fp;
+ assert!(
+ next_older_fp > self.fp,
+ "{next_older_fp:#x} > {fp:#x}",
+ fp = self.fp
+ );
+ self.fp = next_older_fp;
}
+ }
+}
- Some(frame)
+/// Wrap `FrameCursor` in a true iterator.
+///
+/// This captures the `unwind` borrow for the duration of the
+/// iterator's lifetime.
+///
+/// # Safety
+///
+/// Safety conditions for this function are the same as for the
+/// [`FrameCursor::new`] function, plus the condition on `unwind` from
+/// the [`FrameCursor::advance`] method.
+pub unsafe fn frame_iterator(
+ unwind: &dyn Unwind,
+ pc: usize,
+ fp: usize,
+ trampoline_fp: usize,
+) -> impl Iterator<Item = Frame> {
+ // SAFETY: our safety conditions include those of
+ // `FrameCursor::new`.
+ let mut cursor = unsafe { FrameCursor::new(pc, fp, trampoline_fp) };
+ core::iter::from_fn(move || {
+ if cursor.done() {
+ None
+ } else {
+ let frame = cursor.frame();
+ // SAFETY: `unwind` is associated with the stack as per
+ // our safety conditions.
+ unsafe {
+ cursor.advance(unwind);
+ }
+ Some(frame)
+ }
})
}
diff --git a/crates/wasmtime/src/config.rs b/crates/wasmtime/src/config.rs
index 6c611d5405..2f0109f4f4 100644
--- a/crates/wasmtime/src/config.rs
+++ b/crates/wasmtime/src/config.rs
@@ -451,9 +451,9 @@ impl Config {
/// Breakpoints, watchpoints, and stepping are not yet supported,
/// but will be added in a future version of Wasmtime.
///
- /// This enables use of the [`crate::DebugFrameCursor`] API which is
- /// provided by [`crate::Caller::debug_frames`] from within a
- /// hostcall context.
+ /// This enables use of the [`crate::FrameHandle`] API which is
+ /// provided by [`crate::Caller::debug_exit_frames`] or
+ /// [`crate::Store::debug_exit_frames`].
///
/// ***Note*** Enabling this option is not compatible with the
/// Winch compiler.
diff --git a/crates/wasmtime/src/runtime/debug.rs b/crates/wasmtime/src/runtime/debug.rs
index 67c7e4caee..9432700341 100644
--- a/crates/wasmtime/src/runtime/debug.rs
+++ b/crates/wasmtime/src/runtime/debug.rs
@@ -1,15 +1,18 @@
//! Debugging API.
-use crate::Result;
+use super::store::AsStoreOpaque;
+use crate::store::StoreId;
+use crate::vm::{Activation, Backtrace};
use crate::{
- AnyRef, AsContext, AsContextMut, CodeMemory, ExnRef, Extern, ExternRef, Func, Instance, Module,
+ AnyRef, AsContextMut, CodeMemory, ExnRef, Extern, ExternRef, Func, Instance, Module,
OwnedRooted, StoreContext, StoreContextMut, Val,
code::StoreCodePC,
module::ModuleRegistry,
store::{AutoAssertNoGc, StoreOpaque},
- vm::{CompiledModuleId, FrameOrHostCode, StoreBacktrace, VMContext},
+ vm::{CompiledModuleId, VMContext},
};
-use alloc::collections::BTreeSet;
+use crate::{Caller, Result, Store};
+use alloc::collections::{BTreeMap, BTreeSet, btree_map::Entry};
use alloc::vec;
use alloc::vec::Vec;
use core::{ffi::c_void, ptr::NonNull};
@@ -20,52 +23,82 @@ use wasmtime_environ::{
FrameStateSlotOffset, FrameTableBreakpointData, FrameTableDescriptorIndex, FrameValType,
FuncIndex, FuncKey, GlobalIndex, MemoryIndex, TableIndex, TagIndex, Trap,
};
-use wasmtime_unwinder::Frame;
+use wasmtime_unwinder::{Frame, FrameCursor};
-use super::store::AsStoreOpaque;
+impl<T> Store<T> {
+ /// Provide a frame handle for all activations, in order from
+ /// innermost (most recently called) to outermost on the stack.
+ ///
+ /// An activation is a contiguous sequence of Wasm frames (called
+ /// functions) that were called from host code and called back out
+ /// to host code. If there are activations from multiple stores on
+ /// the stack, for example if Wasm code in one store calls out to
+ /// host code which invokes another Wasm function in another
+ /// store, then the other stores are "opaque" to our view here in
+ /// the same way that host code is.
+ ///
+ /// Returns an empty list if debug instrumentation is not enabled
+ /// for the engine containing this store.
+ pub fn debug_exit_frames(&mut self) -> impl Iterator<Item = FrameHandle> {
+ self.as_store_opaque().debug_exit_frames()
+ }
-impl<'a, T> StoreContextMut<'a, T> {
- /// Provide an object that captures Wasm stack state, including
- /// Wasm VM-level values (locals and operand stack).
- ///
- /// This object views all activations for the current store that
- /// are on the stack. An activation is a contiguous sequence of
- /// Wasm frames (called functions) that were called from host code
- /// and called back out to host code. If there are activations
- /// from multiple stores on the stack, for example if Wasm code in
- /// one store calls out to host code which invokes another Wasm
- /// function in another store, then the other stores are "opaque"
- /// to our view here in the same way that host code is.
- ///
- /// Returns `None` if debug instrumentation is not enabled for
- /// the engine containing this store.
- pub fn debug_frames(self) -> Option<DebugFrameCursor<'a, T>> {
- if !self.engine().tunables().debug_guest {
- return None;
- }
+ /// Start an edit session to update breakpoints.
+ pub fn edit_breakpoints<'a>(&'a mut self) -> Option<BreakpointEdit<'a>> {
+ self.as_store_opaque().edit_breakpoints()
+ }
+}
- let iter = StoreBacktrace::new(self);
- let mut view = DebugFrameCursor {
- iter,
- is_trapping_frame: false,
- frames: vec![],
- current: None,
+impl StoreOpaque {
+ fn debug_exit_frames(&mut self) -> impl Iterator<Item = FrameHandle> {
+ let activations = if self.engine().tunables().debug_guest {
+ Backtrace::activations(self)
+ } else {
+ vec![]
};
- view.move_to_parent(); // Load the first frame.
- Some(view)
+
+ activations
+ .into_iter()
+ // SAFETY: each activation is currently active and will
+ // remain so (we have a mutable borrow of the store).
+ .filter_map(|act| unsafe { FrameHandle::exit_frame(self, act) })
}
- /// Start an edit session to update breakpoints.
- pub fn edit_breakpoints(self) -> Option<BreakpointEdit<'a>> {
+ fn edit_breakpoints<'a>(&'a mut self) -> Option<BreakpointEdit<'a>> {
if !self.engine().tunables().debug_guest {
return None;
}
- let (breakpoints, registry) = self.0.breakpoints_and_registry_mut();
+ let (breakpoints, registry) = self.breakpoints_and_registry_mut();
Some(breakpoints.edit(registry))
}
}
+impl<'a, T> StoreContextMut<'a, T> {
+ /// Provide a frame handle for all activations, in order from
+ /// innermost (most recently called) to outermost on the stack.
+ ///
+ /// See [`Store::debug_exit_frames`] for more details.
+ pub fn debug_exit_frames(&mut self) -> impl Iterator<Item = FrameHandle> {
+ self.0.as_store_opaque().debug_exit_frames()
+ }
+
+ /// Start an edit session to update breakpoints.
+ pub fn edit_breakpoints(self) -> Option<BreakpointEdit<'a>> {
+ self.0.as_store_opaque().edit_breakpoints()
+ }
+}
+
+impl<'a, T> Caller<'a, T> {
+ /// Provide a frame handle for all activations, in order from
+ /// innermost (most recently called) to outermost on the stack.
+ ///
+ /// See [`Store::debug_exit_frames`] for more details.
+ pub fn debug_exit_frames(&mut self) -> impl Iterator<Item = FrameHandle> {
+ self.store.0.as_store_opaque().debug_exit_frames()
+ }
+}
+
impl Instance {
/// Get access to a global within this instance's globals index
/// space.
@@ -262,158 +295,209 @@ impl<'a, T> StoreContext<'a, T> {
}
}
-/// A view of an active stack frame, with the ability to move up the
-/// stack.
+/// A handle to a stack frame, valid as long as execution is not
+/// resumed in the associated `Store`.
///
-/// See the documentation on `Store::debug_frames` for more information
-/// about which frames this view will show.
-pub struct DebugFrameCursor<'a, T: 'static> {
- /// Iterator over frames.
- ///
- /// This iterator owns the store while the view exists (accessible
- /// as `iter.store`).
- iter: StoreBacktrace<'a, T>,
-
- /// Is the next frame to be visited by the iterator a trapping
- /// frame?
- ///
- /// This alters how we interpret `pc`: for a trap, we look at the
- /// instruction that *starts* at `pc`, while for all frames
- /// further up the stack (i.e., at a callsite), we look at the
- /// instruction that *ends* at `pc`.
- is_trapping_frame: bool,
-
- /// Virtual frame queue: decoded from `iter`, not yet
- /// yielded. Innermost frame on top (last).
- ///
- /// This is only non-empty when there is more than one virtual
- /// frame in a physical frame (i.e., for inlining); thus, its size
- /// is bounded by our inlining depth.
- frames: Vec<VirtualFrame>,
-
- /// Currently focused virtual frame.
- current: Option<FrameData>,
-}
-
-/// The result type from `DebugFrameCursor::move_to_parent()`:
-/// indicates whether the cursor skipped over host code to move to the
-/// next Wasm frame.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum FrameParentResult {
- /// The new frame is in the same Wasm activation.
- SameActivation,
- /// The new frame is in the next higher Wasm activation on the
- /// stack.
- NewActivation,
+/// This handle can be held and cloned and used to refer to a frame
+/// within a paused store. It is cheap: it internally consists of a
+/// pointer to the actual frame, together with some metadata to
+/// determine when that pointer has gone stale.
+///
+/// At the API level, any usage of this frame handle requires a
+/// mutable borrow of the `Store`, because the `Store` logically owns
+/// the stack(s) for any execution within it. However, the existence
+/// of the handle itself does not hold a borrow on the `Store`; hence,
+/// the `Store` can continue to be used and queried, and some state
+/// (e.g. memories, tables, GC objects) can even be mutated, as long
+/// as execution is not resumed. The intent of this API is to allow a
+/// wide variety of debugger implementation strategies that expose
+/// stack frames and also allow other commands/actions at the same
+/// time.
+///
+/// The user can use [`FrameHandle::is_valid`] to determine if the
+/// handle is still valid and usable.
+#[derive(Clone)]
+pub struct FrameHandle {
+ /// The unwinder cursor at this frame.
+ cursor: FrameCursor,
+
+ /// The index of the virtual frame within the physical frame.
+ virtual_frame_idx: usize,
+
+ /// The unique Store this frame came from, to ensure the handle is
+ /// used with the correct Store.
+ store_id: StoreId,
+
+ /// Store `execution_version`.
+ store_version: u64,
}
-impl<'a, T: 'static> DebugFrameCursor<'a, T> {
- /// Move up to the next frame in the activation.
- ///
- /// Returns `FrameParentMove` as an indication whether the
- /// moved-to frame is in the same activation or skipped over host
- /// code.
- pub fn move_to_parent(&mut self) -> FrameParentResult {
- // If there are no virtual frames to yield, take and decode
- // the next physical frame.
- //
- // Note that `if` rather than `while` here, and the assert
- // that we get some virtual frames back, enforce the invariant
- // that each physical frame decodes to at least one virtual
- // frame (i.e., there are no physical frames for interstitial
- // functions or other things that we completely ignore). If
- // this ever changes, we can remove the assert and convert
- // this to a loop that polls until it finds virtual frames.
- let mut result = FrameParentResult::SameActivation;
- self.current = None;
- while self.frames.is_empty() {
- let Some(next_frame) = self.iter.next() else {
- return result;
- };
- self.frames = match next_frame {
- FrameOrHostCode::Frame(frame) => VirtualFrame::decode(
- self.iter.store_mut().0.as_store_opaque(),
- frame,
- self.is_trapping_frame,
- ),
- FrameOrHostCode::HostCode => {
- result = FrameParentResult::NewActivation;
- continue;
- }
- };
- debug_assert!(!self.frames.is_empty());
- self.is_trapping_frame = false;
+impl FrameHandle {
+ /// Create a new FrameHandle at the exit frame of an activation.
+ ///
+ /// # Safety
+ ///
+ /// The provided activation must be valid currently.
+ unsafe fn exit_frame(store: &mut StoreOpaque, activation: Activation) -> Option<FrameHandle> {
+ // SAFETY: activation is valid as per our safety condition.
+ let mut cursor = unsafe { activation.cursor() };
+
+ // Find the first virtual frame. Each physical frame may have
+ // zero or more virtual frames.
+ while !cursor.done() {
+ let (cache, registry) = store.frame_data_cache_mut_and_registry();
+ let frames = cache.lookup_or_compute(registry, cursor.frame());
+ if frames.len() > 0 {
+ return Some(FrameHandle {
+ cursor,
+ virtual_frame_idx: 0,
+ store_id: store.id(),
+ store_version: store.vm_store_context().execution_version,
+ });
+ }
+ // SAFETY: activation is still valid (valid on entry per
+ // our safety condition, and we have not returned control
+ // since above).
+ unsafe {
+ cursor.advance(store.unwinder());
+ }
}
- // Take a frame and focus it as the current one.
- self.current = self.frames.pop().map(|vf| FrameData::compute(vf));
- result
+ None
+ }
+
+ /// Determine whether this handle can still be used to refer to a
+ /// frame.
+ pub fn is_valid(&self, mut store: impl AsContextMut) -> bool {
+ let store = store.as_context_mut();
+ self.is_valid_impl(store.0.as_store_opaque())
}
- /// Has the iterator reached the end of the activation?
- pub fn done(&self) -> bool {
- self.current.is_none()
+ fn is_valid_impl(&self, store: &StoreOpaque) -> bool {
+ let id = store.id();
+ let version = store.vm_store_context().execution_version;
+ self.store_id == id && self.store_version == version
}
- fn frame_data(&self) -> &FrameData {
- self.current.as_ref().expect("No current frame")
+ /// Get a handle to the next frame up the activation (the one that
+ /// called this frame), if any.
+ pub fn parent(&self, mut store: impl AsContextMut) -> Result<Option<FrameHandle>> {
+ let mut store = store.as_context_mut();
+ if !self.is_valid(&mut store) {
+ crate::error::bail!("Frame handle is no longer valid.");
+ }
+
+ let mut parent = self.clone();
+ parent.virtual_frame_idx += 1;
+
+ while !parent.cursor.done() {
+ let (cache, registry) = store
+ .0
+ .as_store_opaque()
+ .frame_data_cache_mut_and_registry();
+ let frames = cache.lookup_or_compute(registry, parent.cursor.frame());
+ if parent.virtual_frame_idx < frames.len() {
+ return Ok(Some(parent));
+ }
+ parent.virtual_frame_idx = 0;
+ // SAFETY: activation is valid because we checked validity
+ // wrt execution version at the top of this function, and
+ // we have not returned since.
+ unsafe {
+ parent.cursor.advance(store.0.as_store_opaque().unwinder());
+ }
+ }
+
+ Ok(None)
}
- fn raw_instance(&self) -> &crate::vm::Instance {
+ fn frame_data<'a>(&self, store: &'a mut StoreOpaque) -> Result<&'a FrameData> {
+ if !self.is_valid_impl(store) {
+ crate::error::bail!("Frame handle is no longer valid.");
+ }
+ let (cache, registry) = store.frame_data_cache_mut_and_registry();
+ let frames = cache.lookup_or_compute(registry, self.cursor.frame());
+ // `virtual_frame_idx` counts up for ease of iteration
+ // behavior, while the frames are stored in outer-to-inner
+ // (i.e., caller to callee) order, so we need to reverse here.
+ Ok(&frames[frames.len() - 1 - self.virtual_frame_idx])
+ }
+
+ fn raw_instance<'a>(&self, store: &mut StoreOpaque) -> Result<&'a crate::vm::Instance> {
+ let frame_data = self.frame_data(store)?;
+
// Read out the vmctx slot.
- // SAFETY: vmctx is always at offset 0 in the slot.
- // (See crates/cranelift/src/func_environ.rs in `update_stack_slot_vmctx()`.)
- let vmctx: *mut VMContext = unsafe { *(self.frame_data().slot_addr as *mut _) };
+ // SAFETY: vmctx is always at offset 0 in the slot. (See
+ // crates/cranelift/src/func_environ.rs in
+ // `update_stack_slot_vmctx()`.) The frame/activation is
+ // still valid because we verified this in `frame_data` above.
+ let vmctx: *mut VMContext =
+ unsafe { *(frame_data.slot_addr(self.cursor.frame().fp()) as *mut _) };
let vmctx = NonNull::new(vmctx).expect("null vmctx in debug state slot");
// SAFETY: the stored vmctx value is a valid instance in this
// store; we only visit frames from this store in the
// backtrace.
let instance = unsafe { crate::vm::Instance::from_vmctx(vmctx) };
// SAFETY: the instance pointer read above is valid.
- unsafe { instance.as_ref() }
+ Ok(unsafe { instance.as_ref() })
}
/// Get the instance associated with the current frame.
- pub fn instance(&mut self) -> Instance {
- let instance = self.raw_instance();
- Instance::from_wasmtime(instance.id(), self.iter.store_mut().0.as_store_opaque())
+ pub fn instance(&self, mut store: impl AsContextMut) -> Result<Instance> {
+ let store = store.as_context_mut();
+ let instance = self.raw_instance(store.0.as_store_opaque())?;
+ let id = instance.id();
+ Ok(Instance::from_wasmtime(id, store.0.as_store_opaque()))
}
/// Get the module associated with the current frame, if any
/// (i.e., not a container instance for a host-created entity).
- pub fn module(&self) -> Option<&Module> {
- let instance = self.raw_instance();
- instance.runtime_module()
+ pub fn module<'a, T: 'static>(
+ &self,
+ store: impl Into<StoreContextMut<'a, T>>,
+ ) -> Result<Option<&'a Module>> {
+ let store = store.into();
+ let instance = self.raw_instance(store.0.as_store_opaque())?;
+ Ok(instance.runtime_module())
}
/// Get the raw function index associated with the current frame, and the
/// PC as an offset within its code section, if it is a Wasm
/// function directly from the given `Module` (rather than a
/// trampoline).
- pub fn wasm_function_index_and_pc(&self) -> Option<(DefinedFuncIndex, u32)> {
- let data = self.frame_data();
- let FuncKey::DefinedWasmFunction(module, func) = data.func_key else {
- return None;
+ pub fn wasm_function_index_and_pc(
+ &self,
+ mut store: impl AsContextMut,
+ ) -> Result<Option<(DefinedFuncIndex, u32)>> {
+ let mut store = store.as_context_mut();
+ let frame_data = self.frame_data(store.0.as_store_opaque())?;
+ let FuncKey::DefinedWasmFunction(module, func) = frame_data.func_key else {
+ return Ok(None);
};
+ let wasm_pc = frame_data.wasm_pc;
debug_assert_eq!(
module,
- self.module()
+ self.module(&mut store)?
.expect("module should be defined if this is a defined function")
.env_module()
.module_index
);
- Some((func, data.wasm_pc))
+ Ok(Some((func, wasm_pc)))
}
/// Get the number of locals in this frame.
- pub fn num_locals(&self) -> u32 {
- u32::try_from(self.frame_data().locals.len()).unwrap()
+ pub fn num_locals(&self, mut store: impl AsContextMut) -> Result<u32> {
+ let store = store.as_context_mut();
+ let frame_data = self.frame_data(store.0.as_store_opaque())?;
+ Ok(u32::try_from(frame_data.locals.len()).unwrap())
}
/// Get the depth of the operand stack in this frame.
- pub fn num_stacks(&self) -> u32 {
- u32::try_from(self.frame_data().stack.len()).unwrap()
+ pub fn num_stacks(&self, mut store: impl AsContextMut) -> Result<u32> {
+ let store = store.as_context_mut();
+ let frame_data = self.frame_data(store.0.as_store_opaque())?;
+ Ok(u32::try_from(frame_data.stack.len()).unwrap())
}
/// Get the type and value of the given local in this frame.
@@ -422,13 +506,16 @@ impl<'a, T: 'static> DebugFrameCursor<'a, T> {
///
/// Panics if the index is out-of-range (greater than
/// `num_locals()`).
- pub fn local(&mut self, index: u32) -> Val {
- let data = self.frame_data();
- let (offset, ty) = data.locals[usize::try_from(index).unwrap()];
- let slot_addr = data.slot_addr;
+ pub fn local(&self, mut store: impl AsContextMut, index: u32) -> Result<Val> {
+ let store = store.as_context_mut();
+ let frame_data = self.frame_data(store.0.as_store_opaque())?;
+ let (offset, ty) = frame_data.locals[usize::try_from(index).unwrap()];
+ let slot_addr = frame_data.slot_addr(self.cursor.frame().fp());
// SAFETY: compiler produced metadata to describe this local
- // slot and stored a value of the correct type into it.
- unsafe { read_value(&mut self.iter.store_mut().0, slot_addr, offset, ty) }
+ // slot and stored a value of the correct type into it. Slot
+ // address is valid because we checked liveness of the
+ // activation/frame via `frame_data` above.
+ Ok(unsafe { read_value(store.0.as_store_opaque(), slot_addr, offset, ty) })
}
/// Get the type and value of the given operand-stack value in
@@ -438,31 +525,66 @@ impl<'a, T: 'static> DebugFrameCursor<'a, T> {
/// from there are more recently pushed values. In other words,
/// index order reads the Wasm virtual machine's abstract stack
/// state left-to-right.
- pub fn stack(&mut self, index: u32) -> Val {
- let data = self.frame_data();
- let (offset, ty) = data.stack[usize::try_from(index).unwrap()];
- let slot_addr = data.slot_addr;
+ pub fn stack(&self, mut store: impl AsContextMut, index: u32) -> Result<Val> {
+ let store = store.as_context_mut();
+ let frame_data = self.frame_data(store.0.as_store_opaque())?;
+ let (offset, ty) = frame_data.stack[usize::try_from(index).unwrap()];
+ let slot_addr = frame_data.slot_addr(self.cursor.frame().fp());
// SAFETY: compiler produced metadata to describe this
// operand-stack slot and stored a value of the correct type
- // into it.
- unsafe { read_value(&mut self.iter.store_mut().0, slot_addr, offset, ty) }
+ // into it. Slot address is valid because we checked liveness
+ // of the activation/frame via `frame_data` above.
+ Ok(unsafe { read_value(store.0.as_store_opaque(), slot_addr, offset, ty) })
+ }
+}
+
+/// A cache from `StoreCodePC`s for modules' private code within a
+/// store to pre-computed layout data for the virtual stack frame(s)
+/// present at that physical PC.
+pub(crate) struct FrameDataCache {
+ /// For a given physical PC, the list of virtual frames, from
+ /// inner (most recently called/inlined) to outer.
+ by_pc: BTreeMap<StoreCodePC, Vec<FrameData>>,
+}
+
+impl FrameDataCache {
+ pub(crate) fn new() -> FrameDataCache {
+ FrameDataCache {
+ by_pc: BTreeMap::new(),
+ }
+ }
+
+ /// Look up (or compute) the list of `FrameData`s from a physical
+ /// `Frame`.
+ fn lookup_or_compute<'a>(
+ &'a mut self,
+ registry: &ModuleRegistry,
+ frame: Frame,
+ ) -> &'a [FrameData] {
+ let pc = StoreCodePC::from_raw(frame.pc());
+ match self.by_pc.entry(pc) {
+ Entry::Occupied(frames) => frames.into_mut(),
+ Entry::Vacant(v) => {
+ // Although inlining can mix modules, `module` is the
+ // module that actually contains the physical PC
+ // (i.e., the outermost function that inlined the
+ // others).
+ let (module, frames) = VirtualFrame::decode(registry, frame.pc());
+ let frames = frames
+ .into_iter()
+ .map(|frame| FrameData::compute(frame, &module))
+ .collect::<Vec<_>>();
+ v.insert(frames)
+ }
+ }
}
}
/// Internal data pre-computed for one stack frame.
///
-/// This combines physical frame info (pc, fp) with the module this PC
-/// maps to (yielding a frame table) and one frame as produced by the
-/// progpoint lookup (Wasm PC, frame descriptor index, stack shape).
+/// This represents one frame as produced by the progpoint lookup
+/// (Wasm PC, frame descriptor index, stack shape).
struct VirtualFrame {
- /// The frame pointer.
- fp: *const u8,
- /// The resolved module handle for the physical PC.
- ///
- /// The module for each inlined frame within the physical frame is
- /// resolved from the vmctx reachable for each such frame; this
- /// module isused only for looking up the frame table.
- module: Module,
/// The Wasm PC for this frame.
wasm_pc: u32,
/// The frame descriptor for this frame.
@@ -474,36 +596,32 @@ struct VirtualFrame {
impl VirtualFrame {
/// Return virtual frames corresponding to a physical frame, from
/// outermost to innermost.
- fn decode(store: &mut StoreOpaque, frame: Frame, is_trapping_frame: bool) -> Vec<VirtualFrame> {
- let (module_with_code, pc) = store
- .modules()
- .module_and_code_by_pc(frame.pc())
+ fn decode(registry: &ModuleRegistry, pc: usize) -> (Module, Vec<VirtualFrame>) {
+ let (module_with_code, pc) = registry
+ .module_and_code_by_pc(pc)
.expect("Wasm frame PC does not correspond to a module");
let module = module_with_code.module();
let table = module.frame_table().unwrap();
let pc = u32::try_from(pc).expect("PC offset too large");
- let pos = if is_trapping_frame {
- FrameInstPos::Pre
- } else {
- FrameInstPos::Post
- };
- let program_points = table.find_program_point(pc, pos).expect("There must be a program point record in every frame when debug instrumentation is enabled");
-
- program_points
- .map(|(wasm_pc, frame_descriptor, stack_shape)| VirtualFrame {
- fp: core::ptr::with_exposed_provenance(frame.fp()),
- module: module.clone(),
- wasm_pc,
- frame_descriptor,
- stack_shape,
- })
- .collect()
+ let program_points = table.find_program_point(pc, FrameInstPos::Post)
+ .expect("There must be a program point record in every frame when debug instrumentation is enabled");
+
+ (
+ module.clone(),
+ program_points
+ .map(|(wasm_pc, frame_descriptor, stack_shape)| VirtualFrame {
+ wasm_pc,
+ frame_descriptor,
+ stack_shape,
+ })
+ .collect(),
+ )
}
}
/// Data computed when we visit a given frame.
struct FrameData {
- slot_addr: *const u8,
+ slot_to_fp_offset: usize,
func_key: FuncKey,
wasm_pc: u32,
/// Shape of locals in this frame.
@@ -525,16 +643,14 @@ struct FrameData {
}
impl FrameData {
- fn compute(frame: VirtualFrame) -> Self {
- let frame_table = frame.module.frame_table().unwrap();
+ fn compute(frame: VirtualFrame, module: &Module) -> Self {
+ let frame_table = module.frame_table().unwrap();
// Parse the frame descriptor.
let (data, slot_to_fp_offset) = frame_table
.frame_descriptor(frame.frame_descriptor)
.unwrap();
let frame_state_slot = FrameStateSlot::parse(data).unwrap();
- let slot_addr = frame
- .fp
- .wrapping_sub(usize::try_from(slot_to_fp_offset).unwrap());
+ let slot_to_fp_offset = usize::try_from(slot_to_fp_offset).unwrap();
// Materialize the stack shape so we have O(1) access to its
// elements, and so we don't need to keep the borrow to the
@@ -549,13 +665,18 @@ impl FrameData {
let locals = frame_state_slot.locals().collect::<Vec<_>>();
FrameData {
- slot_addr,
+ slot_to_fp_offset,
func_key: frame_state_slot.func_key(),
wasm_pc: frame.wasm_pc,
stack,
locals,
}
}
+
+ fn slot_addr(&self, fp: usize) -> *mut u8 {
+ let fp: *mut u8 = core::ptr::with_exposed_provenance_mut(fp);
+ fp.wrapping_sub(self.slot_to_fp_offset)
+ }
}
/// Read the value at the given offset.
@@ -664,18 +785,6 @@ pub(crate) fn gc_refs_in_frame<'a>(ft: FrameTable<'a>, pc: u32, fp: *mut usize)
ret
}
-impl<'a, T: 'static> AsContext for DebugFrameCursor<'a, T> {
- type Data = T;
- fn as_context(&self) -> StoreContext<'_, Self::Data> {
- StoreContext(self.iter.store().0)
- }
-}
-impl<'a, T: 'static> AsContextMut for DebugFrameCursor<'a, T> {
- fn as_context_mut(&mut self) -> StoreContextMut<'_, Self::Data> {
- StoreContextMut(self.iter.store_mut().0)
- }
-}
-
/// One debug event that occurs when running Wasm code on a store with
/// a debug handler attached.
#[derive(Debug)]
diff --git a/crates/wasmtime/src/runtime/func.rs b/crates/wasmtime/src/runtime/func.rs
index 7a5a11c14c..66044e2de3 100644
--- a/crates/wasmtime/src/runtime/func.rs
+++ b/crates/wasmtime/src/runtime/func.rs
@@ -2122,18 +2122,6 @@ impl<T> Caller<'_, T> {
pub fn fuel_async_yield_interval(&mut self, interval: Option<u64>) -> Result<()> {
self.store.fuel_async_yield_interval(interval)
}
-
- /// Provide an object that views Wasm stack state, including Wasm
- /// VM-level values (locals and operand stack), when debugging is
- /// enabled.
- ///
- /// See [`Store::debug_frames`] for more details.
- ///
- /// [`Store::debug_frames`]: crate::Store::debug_frames
- #[cfg(feature = "debug")]
- pub fn debug_frames(&mut self) -> Option<crate::DebugFrameCursor<'_, T>> {
- self.store.as_context_mut().debug_frames()
- }
}
impl<T: 'static> AsContext for Caller<'_, T> {
diff --git a/crates/wasmtime/src/runtime/store.rs b/crates/wasmtime/src/runtime/store.rs
index dc2d34121d..dc6d38d441 100644
--- a/crates/wasmtime/src/runtime/store.rs
+++ b/crates/wasmtime/src/runtime/store.rs
@@ -99,7 +99,7 @@ use crate::runtime::vm::{
};
use crate::trampoline::VMHostGlobalContext;
#[cfg(feature = "debug")]
-use crate::{BreakpointState, DebugHandler};
+use crate::{BreakpointState, DebugHandler, FrameDataCache};
use crate::{Engine, Module, Val, ValRaw, module::ModuleRegistry};
#[cfg(feature = "gc")]
use crate::{ExnRef, Rooted};
@@ -553,6 +553,22 @@ pub struct StoreOpaque {
/// logic before returning to allow execution to resume.
#[cfg(feature = "debug")]
breakpoints: BreakpointState,
+
+ /// The debug PC-to-FrameData cache for this store.
+ ///
+ /// When guest debugging is enabled, we parse compiler metadata
+ /// and pass out `FrameHandle`s that represent Wasm guest
+ /// frames. These handles represent a specific frame within a
+ /// frozen stack and are invalidated upon further execution. In
+ /// order to keep these handles lightweight, and to avoid
+ /// redundant work when passing out *new* handles after further
+ /// execution, we cache the mapping from store-specific PCs to
+ /// parsed frame data. (This cache needs to be store-specific
+ /// rather than e.g. engine-specific because each store has its
+ /// own privately mapped copy of guest code when debugging is
+ /// enabled, so the key-space is unique for each store.)
+ #[cfg(feature = "debug")]
+ frame_data_cache: FrameDataCache,
}
/// Self-pointer to `StoreInner<T>` from within a `StoreOpaque` which is chiefly
@@ -760,6 +776,8 @@ impl<T> Store<T> {
executor: Executor::new(engine)?,
#[cfg(feature = "debug")]
breakpoints: Default::default(),
+ #[cfg(feature = "debug")]
+ frame_data_cache: FrameDataCache::new(),
};
let mut inner = try_new::<Box<_>>(StoreInner {
inner,
@@ -1236,23 +1254,6 @@ impl<T> Store<T> {
self.inner.pending_exception.is_some()
}
- /// Provide an object that views Wasm stack state, including Wasm
- /// VM-level values (locals and operand stack), when debugging is
- /// enabled.
- ///
- /// Returns `None` if debug instrumentation is not enabled for
- /// the engine containing this store.
- #[cfg(feature = "debug")]
- pub fn debug_frames(&mut self) -> Option<crate::DebugFrameCursor<'_, T>> {
- self.as_context_mut().debug_frames()
- }
-
- /// Start an edit session to update breakpoints.
- #[cfg(feature = "debug")]
- pub fn edit_breakpoints(&mut self) -> Option<crate::BreakpointEdit<'_>> {
- self.as_context_mut().edit_breakpoints()
- }
-
/// Return all breakpoints.
#[cfg(feature = "debug")]
pub fn breakpoints(&self) -> Option<impl Iterator<Item = crate::Breakpoint> + '_> {
@@ -1656,6 +1657,13 @@ impl StoreOpaque {
(&self.breakpoints, &self.modules)
}
+ #[cfg(feature = "debug")]
+ pub(crate) fn frame_data_cache_mut_and_registry(
+ &mut self,
+ ) -> (&mut FrameDataCache, &ModuleRegistry) {
+ (&mut self.frame_data_cache, &self.modules)
+ }
+
#[inline]
pub(crate) fn modules(&self) -> &ModuleRegistry {
&self.modules
diff --git a/crates/wasmtime/src/runtime/vm/traphandlers.rs b/crates/wasmtime/src/runtime/vm/traphandlers.rs
index c3f44de86a..1f33be4c4a 100644
--- a/crates/wasmtime/src/runtime/vm/traphandlers.rs
+++ b/crates/wasmtime/src/runtime/vm/traphandlers.rs
@@ -30,9 +30,9 @@ use core::num::NonZeroU32;
use core::ptr::{self, NonNull};
use wasmtime_unwinder::Handler;
-pub use self::backtrace::Backtrace;
#[cfg(feature = "debug")]
-pub(crate) use self::backtrace::{FrameOrHostCode, StoreBacktrace};
+pub(crate) use self::backtrace::Activation;
+pub use self::backtrace::Backtrace;
#[cfg(feature = "gc")]
pub use wasmtime_unwinder::Frame;
diff --git a/crates/wasmtime/src/runtime/vm/traphandlers/backtrace.rs b/crates/wasmtime/src/runtime/vm/traphandlers/backtrace.rs
index f32559ab2d..ff171f4c6e 100644
--- a/crates/wasmtime/src/runtime/vm/traphandlers/backtrace.rs
+++ b/crates/wasmtime/src/runtime/vm/traphandlers/backtrace.rs
@@ -30,10 +30,10 @@ use crate::runtime::vm::{
};
#[cfg(all(feature = "gc", feature = "stack-switching"))]
use crate::vm::stack_switching::{VMContRef, VMStackState};
-#[cfg(feature = "debug")]
-use crate::{StoreContext, StoreContextMut};
use core::ops::ControlFlow;
use wasmtime_unwinder::Frame;
+#[cfg(feature = "debug")]
+use wasmtime_unwinder::FrameCursor;
/// A WebAssembly stack trace.
#[derive(Debug)]
@@ -47,6 +47,22 @@ pub(crate) struct Activation {
entry_trampoline_fp: usize,
}
+impl Activation {
+ /// Create a frame cursor starting at the exit frame of this activation.
+ ///
+ /// # Safety
+ ///
+ /// This activation must currently be valid (i.e., execution must
+ /// not have returned into the activation to unwind any frames,
+ /// and the stack must not have been freed).
+ #[cfg(feature = "debug")]
+ pub(crate) unsafe fn cursor(&self) -> FrameCursor {
+ // SAFETY: validity of this activation is ensured by our
+ // safety condition.
+ unsafe { FrameCursor::new(self.exit_pc, self.exit_fp, self.entry_trampoline_fp) }
+ }
+}
+
impl Backtrace {
/// Returns an empty backtrace
pub fn empty() -> Backtrace {
@@ -364,7 +380,7 @@ impl Backtrace {
/// Capture all Activations reachable from the current point
/// within a hostcall.
#[cfg(feature = "debug")]
- fn activations(store: &StoreOpaque) -> Vec<Activation> {
+ pub(crate) fn activations(store: &StoreOpaque) -> Vec<Activation> {
let mut activations = vec![];
let vm_store_context = store.vm_store_context();
tls::with(|state| match state {
@@ -386,192 +402,3 @@ impl Backtrace {
self.0.iter()
}
}
-
-/// An iterator over one Wasm activation.
-#[cfg(feature = "debug")]
-struct ActivationBacktrace<'a, T: 'static> {
- pub(crate) store: StoreContextMut<'a, T>,
- inner: Box<dyn Iterator<Item = Frame>>,
-}
-
-#[cfg(feature = "debug")]
-impl<'a, T: 'static> ActivationBacktrace<'a, T> {
- /// Return an iterator over a Wasm activation.
- ///
- /// The iterator captures the store with a mutable borrow, and
- /// then yields it back at each frame. This ensures that the stack
- /// remains live while still providing a mutable store that may be
- /// needed to access items in the frame (e.g., to create new roots
- /// when reading out GC refs).
- ///
- /// This serves as an alternative to `Backtrace::trace()` and
- /// friends: it allows external iteration (and e.g. lazily walking
- /// through frames in a stack) rather than visiting via a closure.
- pub(crate) fn new(
- store: StoreContextMut<'a, T>,
- activation: Activation,
- ) -> ActivationBacktrace<'a, T> {
- let inner: Box<dyn Iterator<Item = Frame>> = if activation.exit_fp == 0 {
- // No activations on this Store; return an empty iterator.
- Box::new(core::iter::empty())
- } else {
- let unwind = store.0.unwinder();
- // Establish the iterator.
- Box::new(unsafe {
- wasmtime_unwinder::frame_iterator(
- unwind,
- activation.exit_pc,
- activation.exit_fp,
- activation.entry_trampoline_fp,
- )
- })
- };
-
- ActivationBacktrace { store, inner }
- }
-}
-
-#[cfg(feature = "debug")]
-impl<'a, T: 'static> Iterator for ActivationBacktrace<'a, T> {
- type Item = Frame;
- fn next(&mut self) -> Option<Self::Item> {
- self.inner.next()
- }
-}
-
-/// An iterator over all Wasm activations in a Store.
-#[cfg(feature = "debug")]
-pub(crate) struct StoreBacktrace<'a, T: 'static> {
- /// The current activation iterator or the Store itself if no more
- /// activations.
- ///
- /// This is `Option` so that we can move to the next while
- /// transferring ownership of the Store without deconstructing
- /// this whole iterator.
- current: Option<StoreOrActivationBacktrace<'a, T>>,
- activations: Vec<Activation>,
-}
-
-/// Either an iterator over a Wasm activation, or a `StoreContextMut`
-/// if no activations are left.
-#[cfg(feature = "debug")]
-enum StoreOrActivationBacktrace<'a, T: 'static> {
- Store(StoreContextMut<'a, T>),
- Activation(ActivationBacktrace<'a, T>),
-}
-
-#[cfg(feature = "debug")]
-impl<'a, T: 'static> StoreOrActivationBacktrace<'a, T> {
- fn is_activation(&self) -> bool {
- match self {
- Self::Activation(_) => true,
- _ => false,
- }
- }
-}
-
-#[cfg(feature = "debug")]
-impl<'a, T> StoreBacktrace<'a, T> {
- /// Return an iterator over all Wasm activations in a Store, in
- /// invocation order.
- ///
- /// The iterator captures the store with a mutable borrow, and
- /// then yields it back at each frame. This ensures that the stack
- /// remains live while still providing a mutable store that may be
- /// needed to access items in the frame (e.g., to create new roots
- /// when reading out GC refs).
- ///
- /// This serves as an alternative to `Backtrace::trace()` and
- /// friends: it allows external iteration (and e.g. lazily walking
- /// through frames in a stack) rather than visiting via a closure.
- pub(crate) fn new(store: StoreContextMut<'a, T>) -> StoreBacktrace<'a, T> {
- // Get all activations, in innermost-to-outermost order.
- use crate::store::AsStoreOpaque;
- let mut activations = Backtrace::activations(store.0.as_store_opaque());
- // Reverse to outermost-to-innermost so we can pop off the end.
- activations.reverse();
- // Create our inner state: either an activation iterator on
- // the innermost activation that owns the store, or a sentinel
- // if there are no activations.
- let current = match activations.pop() {
- Some(innermost) => {
- StoreOrActivationBacktrace::Activation(ActivationBacktrace::new(store, innermost))
- }
- None => StoreOrActivationBacktrace::Store(store),
- };
- StoreBacktrace {
- current: Some(current),
- activations,
- }
- }
-
- /// Get the Store underlying this iteration.
- pub fn store(&self) -> StoreContext<'_, T> {
- match self.current.as_ref().unwrap() {
- StoreOrActivationBacktrace::Activation(activation) => StoreContext(activation.store.0),
- StoreOrActivationBacktrace::Store(store) => StoreContext(store.0),
- }
- }
-
- /// Get the Store underlying this iteration.
- pub fn store_mut(&mut self) -> StoreContextMut<'_, T> {
- match self.current.as_mut().unwrap() {
- StoreOrActivationBacktrace::Activation(activation) => {
- StoreContextMut(activation.store.0)
- }
- StoreOrActivationBacktrace::Store(store) => StoreContextMut(store.0),
- }
- }
-
- fn take_store(&mut self) -> StoreContextMut<'a, T> {
- match self.current.take().unwrap() {
- StoreOrActivationBacktrace::Activation(activation) => activation.store,
- StoreOrActivationBacktrace::Store(store) => store,
- }
- }
-
- /// Move to the next activation.
- fn next_activation(&mut self) {
- let activation = self.activations.pop();
- let store = self.take_store();
- self.current = Some(match activation {
- Some(activation) => {
- StoreOrActivationBacktrace::Activation(ActivationBacktrace::new(store, activation))
- }
- None => StoreOrActivationBacktrace::Store(store),
- });
- }
-}
-
-/// A single item in an iteration over a store's frames: either a Wasm
-/// frame, or a sentinel representing host code between activations.
-#[cfg(feature = "debug")]
-pub enum FrameOrHostCode {
- /// A WebAsembly frame.
- Frame(Frame),
- /// Some number of host frames between Wasm activations.
- HostCode,
-}
-
-#[cfg(feature = "debug")]
-impl<'a, T: 'static> Iterator for StoreBacktrace<'a, T> {
- type Item = FrameOrHostCode;
- fn next(&mut self) -> Option<Self::Item> {
- match self.current.as_mut().unwrap() {
- StoreOrActivationBacktrace::Store(_) => None,
- StoreOrActivationBacktrace::Activation(act) => match act.next() {
- Some(frame) => Some(FrameOrHostCode::Frame(frame)),
- None => {
- self.next_activation();
- // If there's another activation waiting, return
- // HostCode between the two; otherwise, don't.
- if self.current.as_ref().unwrap().is_activation() {
- Some(FrameOrHostCode::HostCode)
- } else {
- None
- }
- }
- },
- }
- }
-}
diff --git a/crates/wasmtime/src/runtime/vm/vmcontext.rs b/crates/wasmtime/src/runtime/vm/vmcontext.rs
index c3287979a1..aac495af2a 100644
--- a/crates/wasmtime/src/runtime/vm/vmcontext.rs
+++ b/crates/wasmtime/src/runtime/vm/vmcontext.rs
@@ -1104,6 +1104,39 @@ pub struct VMStoreContext {
/// yield if running asynchronously.
pub epoch_deadline: UnsafeCell<u64>,
+ /// The "store version".
+ ///
+ /// This is used to test whether stack-frame handles referring to
+ /// suspended stack frames remain valid.
+ ///
+ /// The invariant that this upward-counting number must satisfy
+ /// is: the number must be incremented whenever execution starts
+ /// or resumes in the `Store` or when any stack is
+ /// dropped/freed. That way, if we take a reference to some
+ /// suspended stack frame and track the "version" at the time we
+ /// took that reference, if the version still matches, we can be
+ /// sure that nothing could have unwound the referenced Wasm
+ /// frame.
+ ///
+ /// This version number is incremented in exactly one place: the
+ /// Wasm-to-host trampolines, after return from host code. Note
+ /// that this captures both the normal "return into Wasm" case
+ /// (where Wasm frames can subsequently return normally and thus
+ /// invalidate frames), and the "trap/exception unwinds Wasm
+ /// frames" case, which is done internally via the `raise` libcall
+ /// invoked after the main hostcall returns an error, and after we
+ /// increment this version number.
+ ///
+ /// Note that this also handles the fiber/future-drop case because
+ /// because we *always* return into the trampoline to clean up;
+ /// that trampoline immediately raises an error and uses the
+ /// longjmp-like unwind within Cranelift frames to skip over all
+ /// the guest Wasm frames, but not before it increments the
+ /// store's execution version number.
+ ///
+ /// This field is in use only if guest debugging is enabled.
+ pub execution_version: u64,
+
/// Current stack limit of the wasm module.
///
/// For more information see `crates/cranelift/src/lib.rs`.
@@ -1260,6 +1293,7 @@ impl Default for VMStoreContext {
VMStoreContext {
fuel_consumed: UnsafeCell::new(0),
epoch_deadline: UnsafeCell::new(0),
+ execution_version: 0,
stack_limit: UnsafeCell::new(usize::max_value()),
gc_heap: VMMemoryDefinition {
base: NonNull::dangling().into(),
@@ -1299,6 +1333,10 @@ mod test_vmstore_context {
offset_of!(VMStoreContext, epoch_deadline),
usize::from(offsets.ptr.vmstore_context_epoch_deadline())
);
+ assert_eq!(
+ offset_of!(VMStoreContext, execution_version),
+ usize::from(offsets.ptr.vmstore_context_execution_version())
+ );
assert_eq!(
offset_of!(VMStoreContext, gc_heap),
usize::from(offsets.ptr.vmstore_context_gc_heap())
diff --git a/tests/all/debug.rs b/tests/all/debug.rs
index 87e75784fe..8ef5da10ca 100644
--- a/tests/all/debug.rs
+++ b/tests/all/debug.rs
@@ -1,12 +1,14 @@
//! Tests for instrumentation-based debugging.
-use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::{Arc, Mutex};
use wasmtime::{
- AsContextMut, Caller, Config, DebugEvent, DebugHandler, Engine, Extern, FrameParentResult,
- Func, Global, GlobalType, Instance, Module, Mutability, Store, StoreContextMut, Val, ValType,
+ AsContextMut, Caller, Config, DebugEvent, DebugHandler, Engine, Extern, FrameHandle, Func,
+ Global, GlobalType, Instance, Module, Mutability, Store, StoreContextMut, Val, ValType,
};
+use crate::async_functions::PollOnce;
+
#[test]
fn debugging_does_not_work_with_signal_based_traps() {
let mut config = Config::default();
@@ -24,7 +26,7 @@ fn debugging_apis_are_denied_without_debugging() -> wasmtime::Result<()> {
let mut store = Store::new(&engine, ());
let instance = Instance::new(&mut store, &module, &[])?;
- assert!(store.debug_frames().is_none());
+ assert!(store.debug_exit_frames().next().is_none());
assert!(instance.debug_global(&mut store, 0).is_none());
Ok(())
@@ -43,14 +45,18 @@ fn get_module_and_store<C: Fn(&mut Config)>(
Ok((module, Store::new(&engine, ())))
}
-fn test_stack_values<C: Fn(&mut Config), F: Fn(Caller<'_, ()>) + Send + Sync + 'static>(
+fn test_stack_values<
+ C: Fn(&mut Config),
+ F: Fn(Caller<'_, ()>) -> wasmtime::Result<()> + Send + Sync + 'static,
+>(
wat: &str,
c: C,
f: F,
) -> wasmtime::Result<()> {
let (module, mut store) = get_module_and_store(c, wat)?;
let func = Func::wrap(&mut store, move |caller: Caller<'_, ()>| {
- f(caller);
+ f(caller)?;
+ Ok(())
});
let instance = Instance::new(&mut store, &module, &[Extern::Func(func)])?;
let mut results = [];
@@ -92,25 +98,44 @@ fn stack_values_two_frames() -> wasmtime::Result<()> {
}
},
|mut caller: Caller<'_, ()>| {
- let mut stack = caller.debug_frames().unwrap();
- assert!(!stack.done());
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().0.as_u32(), 1);
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().1, 65);
-
- assert_eq!(stack.num_locals(), 2);
- assert_eq!(stack.num_stacks(), 2);
- assert_eq!(stack.local(0).unwrap_i32(), 1);
- assert_eq!(stack.local(1).unwrap_i32(), 2);
- assert_eq!(stack.stack(0).unwrap_i32(), 1);
- assert_eq!(stack.stack(1).unwrap_i32(), 2);
-
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(!stack.done());
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().0.as_u32(), 0);
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().1, 55);
-
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ let stack = caller.debug_exit_frames().next().unwrap();
+ assert_eq!(
+ stack
+ .wasm_function_index_and_pc(&mut caller)?
+ .unwrap()
+ .0
+ .as_u32(),
+ 1
+ );
+ assert_eq!(
+ stack.wasm_function_index_and_pc(&mut caller)?.unwrap().1,
+ 65
+ );
+
+ assert_eq!(stack.num_locals(&mut caller)?, 2);
+ assert_eq!(stack.num_stacks(&mut caller)?, 2);
+ assert_eq!(stack.local(&mut caller, 0)?.unwrap_i32(), 1);
+ assert_eq!(stack.local(&mut caller, 1)?.unwrap_i32(), 2);
+ assert_eq!(stack.stack(&mut caller, 0)?.unwrap_i32(), 1);
+ assert_eq!(stack.stack(&mut caller, 1)?.unwrap_i32(), 2);
+
+ let stack = stack.parent(&mut caller)?.unwrap();
+ assert_eq!(
+ stack
+ .wasm_function_index_and_pc(&mut caller)?
+ .unwrap()
+ .0
+ .as_u32(),
+ 0
+ );
+ assert_eq!(
+ stack.wasm_function_index_and_pc(&mut caller)?.unwrap().1,
+ 55
+ );
+
+ let stack = stack.parent(&mut caller)?;
+ assert!(stack.is_none());
+ Ok(())
},
)?;
}
@@ -135,12 +160,12 @@ fn stack_values_exceptions() -> wasmtime::Result<()> {
"#,
|_config| {},
|mut caller: Caller<'_, ()>| {
- let mut stack = caller.debug_frames().unwrap();
- assert!(!stack.done());
- assert_eq!(stack.num_stacks(), 1);
- assert_eq!(stack.stack(0).unwrap_i32(), 42);
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ let stack = caller.debug_exit_frames().next().unwrap();
+ assert_eq!(stack.num_stacks(&mut caller)?, 1);
+ assert_eq!(stack.stack(&mut caller, 0)?.unwrap_i32(), 42);
+ let stack = stack.parent(&mut caller)?;
+ assert!(stack.is_none());
+ Ok(())
},
)
}
@@ -162,12 +187,12 @@ fn stack_values_dead_gc_ref() -> wasmtime::Result<()> {
config.wasm_gc(true);
},
|mut caller: Caller<'_, ()>| {
- let mut stack = caller.debug_frames().unwrap();
- assert!(!stack.done());
- assert_eq!(stack.num_stacks(), 1);
- assert!(stack.stack(0).unwrap_anyref().is_some());
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ let stack = caller.debug_exit_frames().next().unwrap();
+ assert_eq!(stack.num_stacks(&mut caller)?, 1);
+ assert!(stack.stack(&mut caller, 0)?.unwrap_anyref().is_some());
+ let stack = stack.parent(&mut caller)?;
+ assert!(stack.is_none());
+ Ok(())
},
)
}
@@ -189,28 +214,28 @@ fn gc_access_during_call() -> wasmtime::Result<()> {
config.wasm_gc(true);
},
|mut caller: Caller<'_, ()>| {
- let mut stack = caller.debug_frames().unwrap();
+ let stack = caller.debug_exit_frames().next().unwrap();
// Do a GC while we hold the stack cursor.
- stack.as_context_mut().gc(None).unwrap();
+ caller.as_context_mut().gc(None).unwrap();
- assert!(!stack.done());
- assert_eq!(stack.num_stacks(), 0);
- assert_eq!(stack.num_locals(), 1);
+ assert_eq!(stack.num_stacks(&mut caller)?, 0);
+ assert_eq!(stack.num_locals(&mut caller)?, 1);
// Note that this struct is dead during the call, and the
// ref could otherwise be optimized away (no longer in the
// stackmap at this point); but we verify it is still
// alive here because it is rooted in the
// debug-instrumentation slot.
let s = stack
- .local(0)
+ .local(&mut caller, 0)?
.unwrap_any_ref()
.unwrap()
- .unwrap_struct(&stack)
+ .unwrap_struct(&caller)
.unwrap();
- assert_eq!(s.field(&mut stack, 0).unwrap().unwrap_i32(), 42);
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ assert_eq!(s.field(&mut caller, 0).unwrap().unwrap_i32(), 42);
+ let stack = stack.parent(&mut caller)?;
+ assert!(stack.is_none());
+ Ok(())
},
)
}
@@ -252,35 +277,64 @@ fn stack_values_two_activations() -> wasmtime::Result<()> {
let module1_clone = module1.clone();
let module2_clone = module2.clone();
let host2 = Func::wrap(&mut store, move |mut caller: Caller<'_, ()>| {
- let mut stack = caller.debug_frames().unwrap();
- assert!(!stack.done());
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().0.as_u32(), 0);
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().1, 56);
- assert!(Module::same(stack.module().unwrap(), &module2_clone));
- assert_eq!(stack.num_locals(), 2);
- assert_eq!(stack.num_stacks(), 2);
- assert_eq!(stack.local(0).unwrap_i32(), 1);
- assert_eq!(stack.local(1).unwrap_i32(), 2);
- assert_eq!(stack.stack(0).unwrap_i32(), 1);
- assert_eq!(stack.stack(1).unwrap_i32(), 2);
- let inner_instance = stack.instance();
-
- assert_eq!(stack.move_to_parent(), FrameParentResult::NewActivation);
- assert!(!stack.done());
-
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().0.as_u32(), 0);
- assert_eq!(stack.wasm_function_index_and_pc().unwrap().1, 56);
- assert!(Module::same(stack.module().unwrap(), &module1_clone));
- assert_eq!(stack.num_locals(), 0);
- assert_eq!(stack.num_stacks(), 2);
- assert_eq!(stack.stack(0).unwrap_i32(), 1);
- assert_eq!(stack.stack(1).unwrap_i32(), 2);
- let outer_instance = stack.instance();
-
+ let exits = caller.debug_exit_frames().collect::<Vec<_>>();
+ assert_eq!(exits.len(), 2);
+ let stack = exits[0].clone();
+ assert_eq!(
+ stack
+ .wasm_function_index_and_pc(&mut caller)?
+ .unwrap()
+ .0
+ .as_u32(),
+ 0
+ );
+ assert_eq!(
+ stack.wasm_function_index_and_pc(&mut caller)?.unwrap().1,
+ 56
+ );
+ assert!(Module::same(
+ stack.module(&mut caller)?.unwrap(),
+ &module2_clone
+ ));
+ assert_eq!(stack.num_locals(&mut caller)?, 2);
+ assert_eq!(stack.num_stacks(&mut caller)?, 2);
+ assert_eq!(stack.local(&mut caller, 0)?.unwrap_i32(), 1);
+ assert_eq!(stack.local(&mut caller, 1)?.unwrap_i32(), 2);
+ assert_eq!(stack.stack(&mut caller, 0)?.unwrap_i32(), 1);
+ assert_eq!(stack.stack(&mut caller, 1)?.unwrap_i32(), 2);
+ let inner_instance = stack.instance(&mut caller)?;
+
+ let stack = stack.parent(&mut caller)?;
+ assert!(stack.is_none());
+
+ let stack = exits[1].clone();
+ assert_eq!(
+ stack
+ .wasm_function_index_and_pc(&mut caller)?
+ .unwrap()
+ .0
+ .as_u32(),
+ 0
+ );
+ assert_eq!(
+ stack.wasm_function_index_and_pc(&mut caller)?.unwrap().1,
+ 56
+ );
+ assert!(Module::same(
+ stack.module(&mut caller)?.unwrap(),
+ &module1_clone
+ ));
+ assert_eq!(stack.num_locals(&mut caller)?, 0);
+ assert_eq!(stack.num_stacks(&mut caller)?, 2);
+ assert_eq!(stack.stack(&mut caller, 0)?.unwrap_i32(), 1);
+ assert_eq!(stack.stack(&mut caller, 1)?.unwrap_i32(), 2);
+ let outer_instance = stack.instance(&mut caller)?;
assert_ne!(inner_instance, outer_instance);
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ let stack = stack.parent(&mut caller)?;
+ assert!(stack.is_none());
+
+ Ok(())
});
let instance2 = Instance::new(&mut store, &module2, &[Extern::Func(host2)])?;
@@ -313,10 +367,8 @@ fn debug_frames_on_store_with_no_wasm_activation() -> wasmtime::Result<()> {
config.guest_debug(true);
let engine = Engine::new(&config)?;
let mut store = Store::new(&engine, ());
- let frames = store
- .debug_frames()
- .expect("Debug frames should be available");
- assert!(frames.done());
+ let frames = store.debug_exit_frames().collect::<Vec<_>>();
+ assert_eq!(frames.len(), 0);
Ok(())
}
@@ -521,14 +573,12 @@ async fn uncaught_exception_events() -> wasmtime::Result<()> {
{ 0 ;
wasmtime::DebugEvent::UncaughtExceptionThrown(e) => {
assert_eq!(e.field(&mut store, 0).unwrap().unwrap_i32(), 42);
- let mut stack = store.debug_frames().expect("frame cursor must be available");
- assert!(!stack.done());
- assert_eq!(stack.num_locals(), 1);
- assert_eq!(stack.local(0).unwrap_i32(), 100);
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(!stack.done());
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ let stack = store.debug_exit_frames().next().unwrap();
+ assert_eq!(stack.num_locals(&mut store).unwrap(), 1);
+ assert_eq!(stack.local(&mut store, 0).unwrap().unwrap_i32(), 100);
+ let stack = stack.parent(&mut store).unwrap().unwrap();
+ let stack = stack.parent(&mut store).unwrap();
+ assert!(stack.is_none());
}
}
);
@@ -576,14 +626,12 @@ async fn caught_exception_events() -> wasmtime::Result<()> {
{ 0 ;
wasmtime::DebugEvent::CaughtExceptionThrown(e) => {
assert_eq!(e.field(&mut store, 0).unwrap().unwrap_i32(), 42);
- let mut stack = store.debug_frames().expect("frame cursor must be available");
- assert!(!stack.done());
- assert_eq!(stack.num_locals(), 1);
- assert_eq!(stack.local(0).unwrap_i32(), 100);
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(!stack.done());
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ let stack = store.debug_exit_frames().next().unwrap();
+ assert_eq!(stack.num_locals(&mut store).unwrap(), 1);
+ assert_eq!(stack.local(&mut store, 0).unwrap().unwrap_i32(), 100);
+ let stack = stack.parent(&mut store).unwrap().unwrap();
+ let stack = stack.parent(&mut store).unwrap();
+ assert!(stack.is_none());
}
}
);
@@ -705,16 +753,15 @@ async fn breakpoint_events() -> wasmtime::Result<()> {
D, store,
{ 0 ;
wasmtime::DebugEvent::Breakpoint => {
- let mut stack = store.debug_frames().expect("frame cursor must be available");
- assert!(!stack.done());
- assert_eq!(stack.num_locals(), 2);
- assert_eq!(stack.local(0).unwrap_i32(), 1);
- assert_eq!(stack.local(1).unwrap_i32(), 2);
- let (func, pc) = stack.wasm_function_index_and_pc().unwrap();
+ let stack = store.debug_exit_frames().next().unwrap();
+ assert_eq!(stack.num_locals(&mut store).unwrap(), 2);
+ assert_eq!(stack.local(&mut store, 0).unwrap().unwrap_i32(), 1);
+ assert_eq!(stack.local(&mut store, 1).unwrap().unwrap_i32(), 2);
+ let (func, pc) = stack.wasm_function_index_and_pc(&mut store).unwrap().unwrap();
assert_eq!(func.as_u32(), 0);
assert_eq!(pc, 0x28);
- assert_eq!(stack.move_to_parent(), FrameParentResult::SameActivation);
- assert!(stack.done());
+ let stack = stack.parent(&mut store).unwrap();
+ assert!(stack.is_none());
}
}
);
@@ -757,36 +804,32 @@ async fn breakpoint_events() -> wasmtime::Result<()> {
D2, store,
{ 0 ;
wasmtime::DebugEvent::Breakpoint => {
- let stack = store.debug_frames().unwrap();
- assert!(!stack.done());
- let (_, pc) = stack.wasm_function_index_and_pc().unwrap();
+ let stack = store.debug_exit_frames().next().unwrap();
+ let (_, pc) = stack.wasm_function_index_and_pc(&mut store).unwrap().unwrap();
assert_eq!(pc, 0x24);
}
},
{
1 ;
wasmtime::DebugEvent::Breakpoint => {
- let stack = store.debug_frames().unwrap();
- assert!(!stack.done());
- let (_, pc) = stack.wasm_function_index_and_pc().unwrap();
+ let stack = store.debug_exit_frames().next().unwrap();
+ let (_, pc) = stack.wasm_function_index_and_pc(&mut store).unwrap().unwrap();
assert_eq!(pc, 0x26);
}
},
{
2 ;
wasmtime::DebugEvent::Breakpoint => {
- let stack = store.debug_frames().unwrap();
- assert!(!stack.done());
- let (_, pc) = stack.wasm_function_index_and_pc().unwrap();
+ let stack = store.debug_exit_frames().next().unwrap();
+ let (_, pc) = stack.wasm_function_index_and_pc(&mut store).unwrap().unwrap();
assert_eq!(pc, 0x28);
}
},
{
3 ;
wasmtime::DebugEvent::Breakpoint => {
- let stack = store.debug_frames().unwrap();
- assert!(!stack.done());
- let (_, pc) = stack.wasm_function_index_and_pc().unwrap();
+ let stack = store.debug_exit_frames().next().unwrap();
+ let (_, pc) = stack.wasm_function_index_and_pc(&mut store).unwrap().unwrap();
assert_eq!(pc, 0x29);
}
}
@@ -933,3 +976,108 @@ async fn epoch_events() -> wasmtime::Result<()> {
Ok(())
}
+
+#[tokio::test]
+#[cfg_attr(miri, ignore)]
+async fn invalidated_frame_handles() -> wasmtime::Result<()> {
+ let (module, mut store) = get_module_and_store(
+ |_config| {},
+ r#"
+ (module
+ (import "" "" (func))
+ (func (export "main")
+ (local i32 i32)
+ i32.const 1
+ local.set 0
+ i32.const 2
+ local.set 1
+ call 2
+ call 0)
+ (func
+ (local i32 i32)
+ i32.const 3
+ local.set 0
+ i32.const 4
+ local.set 1
+ call 0))
+ "#,
+ )?;
+
+ let handle: Arc<Mutex<Option<FrameHandle>>> = Arc::new(Mutex::new(None));
+
+ let hostfunc = Func::wrap_async(&mut store, move |mut caller, _args: ()| {
+ let handle = handle.clone();
+ Box::new(async move {
+ let frame = handle.lock().unwrap().take();
+ if let Some(frame) = frame {
+ // Ensure that the handle has been invalidated.
+ assert!(!frame.is_valid(&mut caller));
+ // Ensure that attempts to fetch data from the frame
+ // fail with a clean `Err`, not a panic or crash.
+ let result = frame.wasm_function_index_and_pc(&mut caller);
+ assert!(result.is_err());
+ // Ensure that we can get a new frame handle and use it.
+ let frame = caller.debug_exit_frames().next().unwrap();
+ assert_eq!(frame.num_locals(&mut caller)?, 2);
+ assert_eq!(frame.local(&mut caller, 0)?.unwrap_i32(), 1);
+ assert_eq!(frame.local(&mut caller, 1)?.unwrap_i32(), 2);
+ } else {
+ let frame = caller.debug_exit_frames().next().unwrap();
+ assert_eq!(frame.num_locals(&mut caller)?, 2);
+ assert_eq!(frame.local(&mut caller, 0)?.unwrap_i32(), 3);
+ assert_eq!(frame.local(&mut caller, 1)?.unwrap_i32(), 4);
+ *handle.lock().unwrap() = Some(frame);
+ }
+ Ok(())
+ })
+ });
+
+ let instance = Instance::new_async(&mut store, &module, &[Extern::Func(hostfunc)]).await?;
+ let main = instance.get_func(&mut store, "main").unwrap();
+ main.call_async(&mut store, &[], &mut []).await?;
+
+ Ok(())
+}
+
+#[tokio::test]
+#[cfg_attr(miri, ignore)]
+async fn invalidated_frame_handles_in_dropped_future() -> wasmtime::Result<()> {
+ let (module, mut store) = get_module_and_store(
+ |_config| {},
+ r#"
+ (module
+ (import "" "" (func))
+ (func (export "main")
+ call 0))
+ "#,
+ )?;
+
+ let handle: Arc<Mutex<Option<FrameHandle>>> = Arc::new(Mutex::new(None));
+ let handle_clone = handle.clone();
+
+ let hostfunc = Func::wrap_async(&mut store, move |mut caller, _args: ()| {
+ let handle_clone = handle_clone.clone();
+ Box::new(async move {
+ let frame = caller.debug_exit_frames().next().unwrap();
+ *handle_clone.lock().unwrap() = Some(frame);
+ tokio::task::yield_now().await;
+ })
+ });
+
+ let instance = Instance::new_async(&mut store, &module, &[Extern::Func(hostfunc)]).await?;
+ let main = instance.get_func(&mut store, "main").unwrap();
+ let future = Box::pin(main.call_async(&mut store, &[], &mut []));
+
+ // Poll once, then drop.
+ let poll_once = PollOnce::new(future);
+ let future = poll_once.await;
+
+ drop(future);
+
+ // The frame handle should now be invalid.
+ let mut handle = handle.lock().unwrap();
+ let frame = handle.take().unwrap();
+ assert!(!frame.is_valid(&mut store));
+
+ Ok(())
+}
diff --git a/tests/disas/aarch64-entry-trampoline.wat b/tests/disas/aarch64-entry-trampoline.wat
index e33140c981..679518b191 100644
--- a/tests/disas/aarch64-entry-trampoline.wat
+++ b/tests/disas/aarch64-entry-trampoline.wat
@@ -18,11 +18,11 @@
;; stp d8, d9, [sp, #-0x10]!
;; ldr x11, [x0, #8]
;; mov x12, x29
-;; str x12, [x11, #0x40]
+;; str x12, [x11, #0x48]
;; mov x12, sp
-;; str x12, [x11, #0x38]
+;; str x12, [x11, #0x40]
;; adr x13, #0x94
-;; str x13, [x11, #0x48]
+;; str x13, [x11, #0x50]
;; mov x2, x0
;; mov x3, x1
;; bl #0
diff --git a/tests/disas/arith.wat b/tests/disas/arith.wat
index 86b7da91ac..4c11e32051 100644
--- a/tests/disas/arith.wat
+++ b/tests/disas/arith.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/basic-wat-test.wat b/tests/disas/basic-wat-test.wat
index cfebf958ca..d61b3f66a6 100644
--- a/tests/disas/basic-wat-test.wat
+++ b/tests/disas/basic-wat-test.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/bounds-check.wat b/tests/disas/bounds-check.wat
index 0ac31ec59f..6405f57f26 100644
--- a/tests/disas/bounds-check.wat
+++ b/tests/disas/bounds-check.wat
@@ -27,7 +27,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/br_table.wat b/tests/disas/br_table.wat
index 1428a11da5..bb172d6d87 100644
--- a/tests/disas/br_table.wat
+++ b/tests/disas/br_table.wat
@@ -34,7 +34,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -70,7 +70,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -106,7 +106,7 @@
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -130,7 +130,7 @@
;; function u0:3(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/byteswap.wat b/tests/disas/byteswap.wat
index 29a4de12c0..c20ea245de 100644
--- a/tests/disas/byteswap.wat
+++ b/tests/disas/byteswap.wat
@@ -74,7 +74,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -88,7 +88,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64):
diff --git a/tests/disas/call-indirect.wat b/tests/disas/call-indirect.wat
index 0f2e06916d..03eea1afde 100644
--- a/tests/disas/call-indirect.wat
+++ b/tests/disas/call-indirect.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+48
;; gv5 = load.i64 notrap aligned gv3+56
diff --git a/tests/disas/call-simd.wat b/tests/disas/call-simd.wat
index 5dc68f0a31..c7ebc8d928 100644
--- a/tests/disas/call-simd.wat
+++ b/tests/disas/call-simd.wat
@@ -18,7 +18,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; sig0 = (i64 vmctx, i64, i8x16, i8x16) -> i8x16 tail
;; fn0 = colocated u0:1 sig0
;; const0 = 0x00000004000000030000000200000001
@@ -37,7 +37,7 @@
;; function u0:1(i64 vmctx, i64, i8x16, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i8x16, v3: i8x16):
diff --git a/tests/disas/call.wat b/tests/disas/call.wat
index e6eb116b73..415cd87c49 100644
--- a/tests/disas/call.wat
+++ b/tests/disas/call.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; sig0 = (i64 vmctx, i64) -> i32 tail
;; fn0 = colocated u0:1 sig0
;; stack_limit = gv2
@@ -32,7 +32,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/component-model/direct-adapter-calls-inlining.wat b/tests/disas/component-model/direct-adapter-calls-inlining.wat
index 41bfa66c1d..8e8f38ec3f 100644
--- a/tests/disas/component-model/direct-adapter-calls-inlining.wat
+++ b/tests/disas/component-model/direct-adapter-calls-inlining.wat
@@ -57,17 +57,17 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = vmctx
;; gv5 = load.i64 notrap aligned readonly gv4+8
-;; gv6 = load.i64 notrap aligned gv5+16
+;; gv6 = load.i64 notrap aligned gv5+24
;; gv7 = vmctx
;; gv8 = load.i64 notrap aligned readonly can_move gv7+120
;; gv9 = load.i64 notrap aligned readonly can_move gv7+96
;; gv10 = vmctx
;; gv11 = load.i64 notrap aligned readonly gv10+8
-;; gv12 = load.i64 notrap aligned gv11+16
+;; gv12 = load.i64 notrap aligned gv11+24
;; sig0 = (i64 vmctx, i64, i32) -> i32 tail
;; sig1 = (i64 vmctx, i64, i32) tail
;; sig2 = (i64 vmctx, i64, i32) -> i32 tail
diff --git a/tests/disas/component-model/direct-adapter-calls-x64.wat b/tests/disas/component-model/direct-adapter-calls-x64.wat
index 984198c73b..fc93912611 100644
--- a/tests/disas/component-model/direct-adapter-calls-x64.wat
+++ b/tests/disas/component-model/direct-adapter-calls-x64.wat
@@ -67,7 +67,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r10
-;; movq 0x10(%r10), %r10
+;; movq 0x18(%r10), %r10
;; addq $0x10, %r10
;; cmpq %rsp, %r10
;; ja 0x4f
@@ -84,7 +84,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r10
-;; movq 0x10(%r10), %r10
+;; movq 0x18(%r10), %r10
;; addq $0x20, %r10
;; cmpq %rsp, %r10
;; ja 0xf2
diff --git a/tests/disas/component-model/direct-adapter-calls.wat b/tests/disas/component-model/direct-adapter-calls.wat
index 8f935101d4..9af7f1ab5e 100644
--- a/tests/disas/component-model/direct-adapter-calls.wat
+++ b/tests/disas/component-model/direct-adapter-calls.wat
@@ -60,7 +60,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -75,7 +75,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i64, i32) -> i32 tail
;; fn0 = colocated u2:0 sig0
@@ -94,7 +94,7 @@
;; function u2:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+120
;; gv5 = load.i64 notrap aligned readonly can_move gv3+96
diff --git a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
index 603bd1f9a8..c54a1a20ba 100644
--- a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
@@ -61,7 +61,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i64, i32) -> i32 tail
;; stack_limit = gv2
diff --git a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
index 9743c270d7..e70b793a02 100644
--- a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
+++ b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
@@ -45,7 +45,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i64) -> i64 tail
;; sig1 = (i64 vmctx, i64, i64) -> i32 tail
@@ -67,7 +67,7 @@
;; block4:
;; @0153 v4 = load.i64 notrap aligned readonly can_move v0+64
;; v17 = load.i64 notrap aligned readonly can_move vmctx v4+16
-;; v18 = load.i64 notrap aligned readonly can_move vmctx v17+96
+;; v18 = load.i64 notrap aligned readonly can_move vmctx v17+104
;; v20 = load.i8 notrap aligned v18
;; jump block5
;;
diff --git a/tests/disas/component-model/inlining-bug.wat b/tests/disas/component-model/inlining-bug.wat
index e2d4dbfdd1..87e398ad92 100644
--- a/tests/disas/component-model/inlining-bug.wat
+++ b/tests/disas/component-model/inlining-bug.wat
@@ -37,15 +37,15 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = vmctx
;; gv5 = load.i64 notrap aligned readonly gv4+8
-;; gv6 = load.i64 notrap aligned gv5+16
+;; gv6 = load.i64 notrap aligned gv5+24
;; gv7 = vmctx
;; gv8 = vmctx
;; gv9 = load.i64 notrap aligned readonly gv8+8
-;; gv10 = load.i64 notrap aligned gv9+16
+;; gv10 = load.i64 notrap aligned gv9+24
;; sig0 = (i64 vmctx, i64) -> i32 tail
;; sig1 = (i64 vmctx, i64) -> i32 tail
;; sig2 = (i64 vmctx, i64) tail
diff --git a/tests/disas/component-model/inlining-fuzz-bug.wat b/tests/disas/component-model/inlining-fuzz-bug.wat
index 07278ac8f5..38ae6c9b84 100644
--- a/tests/disas/component-model/inlining-fuzz-bug.wat
+++ b/tests/disas/component-model/inlining-fuzz-bug.wat
@@ -40,18 +40,18 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = vmctx
;; gv5 = load.i64 notrap aligned readonly gv4+8
-;; gv6 = load.i64 notrap aligned gv5+16
+;; gv6 = load.i64 notrap aligned gv5+24
;; gv7 = vmctx
;; gv8 = vmctx
;; gv9 = load.i64 notrap aligned readonly gv8+8
-;; gv10 = load.i64 notrap aligned gv9+16
+;; gv10 = load.i64 notrap aligned gv9+24
;; gv11 = vmctx
;; gv12 = load.i64 notrap aligned readonly gv11+8
-;; gv13 = load.i64 notrap aligned gv12+16
+;; gv13 = load.i64 notrap aligned gv12+24
;; sig0 = (i64 vmctx, i64) -> i32 tail
;; sig1 = (i64 vmctx, i64) -> i32 tail
;; fn0 = colocated u1:0 sig0
diff --git a/tests/disas/component-model/issue-11458.wat b/tests/disas/component-model/issue-11458.wat
index 82f3b75e53..02d0b2fbef 100644
--- a/tests/disas/component-model/issue-11458.wat
+++ b/tests/disas/component-model/issue-11458.wat
@@ -22,11 +22,11 @@
;; function u1:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = vmctx
;; gv5 = load.i64 notrap aligned readonly gv4+8
-;; gv6 = load.i64 notrap aligned gv5+16
+;; gv6 = load.i64 notrap aligned gv5+24
;; sig0 = (i64 vmctx, i64, i32) -> i32 tail
;; sig1 = (i64 vmctx, i64, i32) -> i32 tail
;; fn0 = colocated u0:0 sig0
diff --git a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
index 89f1871c85..63095242a6 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
@@ -67,7 +67,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i64, i32) -> i32 tail
;; stack_limit = gv2
diff --git a/tests/disas/component-model/unsafe-intrinsics-used.wat b/tests/disas/component-model/unsafe-intrinsics-used.wat
index 07a961cd09..3d9f9ed52e 100644
--- a/tests/disas/component-model/unsafe-intrinsics-used.wat
+++ b/tests/disas/component-model/unsafe-intrinsics-used.wat
@@ -37,7 +37,7 @@
;; function u0:0(i64 vmctx, i64) -> i64 tail {
;; block0(v0: i64, v1: i64):
;; v2 = load.i64 notrap aligned readonly can_move vmctx v0+16
-;; v3 = load.i64 notrap aligned readonly can_move vmctx v2+96
+;; v3 = load.i64 notrap aligned readonly can_move vmctx v2+104
;; return v3
;; }
;;
diff --git a/tests/disas/conditional-traps.wat b/tests/disas/conditional-traps.wat
index 2ca6f358eb..3b05dafecb 100644
--- a/tests/disas/conditional-traps.wat
+++ b/tests/disas/conditional-traps.wat
@@ -24,7 +24,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -41,7 +41,7 @@
;; function u0:1(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/dead-code.wat b/tests/disas/dead-code.wat
index 0ecbd02f89..6d4990cc3a 100644
--- a/tests/disas/dead-code.wat
+++ b/tests/disas/dead-code.wat
@@ -24,7 +24,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -49,7 +49,7 @@
;; function u0:1(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -62,7 +62,7 @@
;; function u0:2(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -75,7 +75,7 @@
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/debug-exceptions.wat b/tests/disas/debug-exceptions.wat
index 9b1abb072e..146dfb1d09 100644
--- a/tests/disas/debug-exceptions.wat
+++ b/tests/disas/debug-exceptions.wat
@@ -27,7 +27,7 @@
;; stp d8, d9, [sp, #-0x10]!
;; sub sp, sp, #0x30
;; ldr x3, [x2, #8]
-;; ldr x3, [x3, #0x10]
+;; ldr x3, [x3, #0x18]
;; mov x4, sp
;; cmp x4, x3
;; b.lo #0x190
@@ -36,39 +36,39 @@
;; stur x2, [sp, #0x10]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 53, slot at FP-0xc0, locals , stack
-;; ╰─╼ breakpoint patch: wasm PC 53, patch bytes [29, 1, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 53, patch bytes [38, 1, 0, 148]
;; ldur x0, [sp, #0x10]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 55, slot at FP-0xc0, locals , stack
-;; ╰─╼ breakpoint patch: wasm PC 55, patch bytes [27, 1, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 55, patch bytes [36, 1, 0, 148]
;; ldur x0, [sp, #0x10]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 61, slot at FP-0xc0, locals , stack
-;; ╰─╼ breakpoint patch: wasm PC 61, patch bytes [25, 1, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 61, patch bytes [34, 1, 0, 148]
;; mov w22, #0x2a
;; stur w22, [sp, #8]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 63, slot at FP-0xc0, locals , stack I32 @ slot+0x8
-;; ╰─╼ breakpoint patch: wasm PC 63, patch bytes [22, 1, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 63, patch bytes [31, 1, 0, 148]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 64, slot at FP-0xc0, locals , stack
-;; ╰─╼ breakpoint patch: wasm PC 64, patch bytes [21, 1, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 64, patch bytes [30, 1, 0, 148]
;; stur w22, [sp, #8]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 66, slot at FP-0xc0, locals , stack I32 @ slot+0x8
-;; ╰─╼ breakpoint patch: wasm PC 66, patch bytes [19, 1, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 66, patch bytes [28, 1, 0, 148]
;; ldur x2, [sp, #0x10]
-;; bl #0x424
+;; bl #0x448
;; 84: mov x24, x2
;; mov w3, #0x4000000
;; mov w4, #2
;; mov w5, #0x28
;; mov w6, #8
;; ldur x2, [sp, #0x10]
-;; bl #0x344
+;; bl #0x368
;; a0: ldur x0, [sp, #0x10]
;; ldr x5, [x0, #8]
-;; ldr x6, [x5, #0x18]
+;; ldr x6, [x5, #0x20]
;; stur x5, [sp, #0x20]
;; add x15, x6, #0x20
;; str w22, [x15, w2, uxtw]
@@ -81,14 +81,14 @@
;; str w3, [x4, w2, uxtw]
;; mov x3, x2
;; ldur x2, [sp, #0x10]
-;; bl #0x45c
+;; bl #0x480
;; ├─╼ exception frame offset: SP = FP - 0xc0
;; ╰─╼ exception handler: tag=0, context at [SP+0x10], handler=0xf8
;; e0: mov w3, #9
;; ldur x2, [sp, #0x10]
-;; bl #0x3b8
+;; bl #0x3dc
;; ec: ldur x2, [sp, #0x10]
-;; bl #0x3f0
+;; bl #0x414
;; f4: .byte 0x1f, 0xc1, 0x00, 0x00
;; mov x9, x0
;; mov w6, w9
@@ -98,7 +98,7 @@
;; uxtb w6, w7
;; cbnz x6, #0x1a8
;; 114: ldur x4, [sp, #0x20]
-;; ldr x8, [x4, #0x20]
+;; ldr x8, [x4, #0x28]
;; cmp x5, x8
;; cset x10, hi
;; uxtb w10, w10
@@ -110,7 +110,7 @@
;; ldur x0, [sp, #0x10]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 72, slot at FP-0xc0, locals , stack I32 @ slot+0x8
-;; ╰─╼ breakpoint patch: wasm PC 72, patch bytes [225, 0, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 72, patch bytes [234, 0, 0, 148]
;; ldr x14, [x0, #0x30]
;; ldr x2, [x0, #0x40]
;; ldur x3, [sp, #0x10]
@@ -119,10 +119,10 @@
;; 154: ldur x0, [sp, #0x10]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 74, slot at FP-0xc0, locals , stack I32 @ slot+0x8
-;; ╰─╼ breakpoint patch: wasm PC 74, patch bytes [219, 0, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 74, patch bytes [228, 0, 0, 148]
;; nop
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 75, slot at FP-0xc0, locals , stack
-;; ╰─╼ breakpoint patch: wasm PC 75, patch bytes [218, 0, 0, 148]
+;; ╰─╼ breakpoint patch: wasm PC 75, patch bytes [227, 0, 0, 148]
;; add sp, sp, #0x30
;; ldp d8, d9, [sp], #0x10
;; ldp d10, d11, [sp], #0x10
@@ -137,9 +137,9 @@
;; ret
;; 190: stur x2, [sp, #0x10]
;; 194: mov w3, #0
-;; 198: bl #0x3b8
+;; 198: bl #0x3dc
;; 19c: ldur x2, [sp, #0x10]
-;; 1a0: bl #0x3f0
+;; 1a0: bl #0x414
;; 1a4: .byte 0x1f, 0xc1, 0x00, 0x00
;; 1a8: .byte 0x1f, 0xc1, 0x00, 0x00
;; 1ac: .byte 0x1f, 0xc1, 0x00, 0x00
diff --git a/tests/disas/debug.wat b/tests/disas/debug.wat
index 5b5e68fffe..f753515961 100644
--- a/tests/disas/debug.wat
+++ b/tests/disas/debug.wat
@@ -16,27 +16,27 @@
;; movl %edx, 8(%rsp)
;; movl %ecx, 0xc(%rsp)
;; movq 8(%rdi), %rax
-;; movq 0x10(%rax), %rax
+;; movq 0x18(%rax), %rax
;; movq %rsp, %r8
;; cmpq %rax, %r8
;; jb 0x62
;; 29: movq %rdi, (%rsp)
;; nopl (%rax, %rax)
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 36, slot at FP-0x30, locals I32 @ slot+0x8, I32 @ slot+0xc, stack
-;; ╰─╼ breakpoint patch: wasm PC 36, patch bytes [232, 176, 1, 0, 0]
+;; ╰─╼ breakpoint patch: wasm PC 36, patch bytes [232, 190, 1, 0, 0]
;; movl %edx, 0x10(%rsp)
;; nopl (%rax, %rax)
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 38, slot at FP-0x30, locals I32 @ slot+0x8, I32 @ slot+0xc, stack I32 @ slot+0x10
-;; ╰─╼ breakpoint patch: wasm PC 38, patch bytes [232, 167, 1, 0, 0]
+;; ╰─╼ breakpoint patch: wasm PC 38, patch bytes [232, 181, 1, 0, 0]
;; movl %ecx, 0x14(%rsp)
;; nopl (%rax, %rax)
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 40, slot at FP-0x30, locals I32 @ slot+0x8, I32 @ slot+0xc, stack I32 @ slot+0x10, I32 @ slot+0x14
-;; ╰─╼ breakpoint patch: wasm PC 40, patch bytes [232, 158, 1, 0, 0]
+;; ╰─╼ breakpoint patch: wasm PC 40, patch bytes [232, 172, 1, 0, 0]
;; leal (%rdx, %rcx), %eax
;; movl %eax, 0x10(%rsp)
;; nopl (%rax, %rax)
;; ├─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 41, slot at FP-0x30, locals I32 @ slot+0x8, I32 @ slot+0xc, stack I32 @ slot+0x10
-;; ╰─╼ breakpoint patch: wasm PC 41, patch bytes [232, 146, 1, 0, 0]
+;; ╰─╼ breakpoint patch: wasm PC 41, patch bytes [232, 160, 1, 0, 0]
;; movl %eax, 0x10(%rsp)
;; movq 0x20(%rsp), %rbx
;; addq $0x30, %rsp
@@ -45,9 +45,9 @@
;; retq
;; 62: movq %rdi, %rbx
;; 65: xorl %esi, %esi
-;; 67: callq 0x186
+;; 67: callq 0x194
;; 6c: movq %rbx, %rdi
-;; 6f: callq 0x1b6
+;; 6f: callq 0x1c4
;; 74: ud2
;;
;; wasm[0]::array_to_wasm_trampoline[0]:
@@ -64,11 +64,11 @@
;; movq %rdx, (%rsp)
;; movq 8(%rdi), %r11
;; movq %rbp, %rax
-;; movq %rax, 0x40(%r11)
+;; movq %rax, 0x48(%r11)
;; movq %rsp, %rax
-;; movq %rax, 0x38(%r11)
+;; movq %rax, 0x40(%r11)
;; leaq 0x39(%rip), %rax
-;; movq %rax, 0x48(%r11)
+;; movq %rax, 0x50(%r11)
;; movq %r10, %rdx
;; callq 0
;; ├─╼ exception frame offset: SP = FP - 0x40
@@ -100,45 +100,49 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; subq $0x30, %rsp
-;; movq %r14, 0x20(%rsp)
+;; movq %r15, 0x20(%rsp)
;; movq %rdx, %rax
-;; movq 8(%rsi), %r9
-;; movq %rbp, %r10
-;; movq %r10, 0x28(%r9)
-;; movq %rbp, %r10
-;; movq 8(%r10), %r11
-;; movq %r11, 0x30(%r9)
+;; movq 8(%rsi), %r10
+;; movq %rsi, %r8
+;; movq %rbp, %r11
+;; movq %r11, 0x30(%r10)
+;; movq %rbp, %r11
+;; movq 8(%r11), %rsi
+;; movq %rsi, 0x38(%r10)
;; leaq (%rsp), %rdx
-;; movq %rax, %r11
-;; movl %r11d, (%rsp)
+;; movq %rax, %rsi
+;; movl %esi, (%rsp)
;; movl %ecx, 0x10(%rsp)
-;; movq 8(%rdi), %r8
+;; movq 8(%rdi), %rax
;; movl $2, %ecx
-;; movq %rsi, %r14
-;; callq *%r8
+;; movq %r8, %r15
+;; movq %r15, %rsi
+;; callq *%rax
+;; movq 8(%r15), %rcx
+;; addq $1, 0x10(%rcx)
;; testb %al, %al
-;; je 0x174
-;; 163: movl (%rsp), %eax
-;; movq 0x20(%rsp), %r14
+;; je 0x181
+;; 170: movl (%rsp), %eax
+;; movq 0x20(%rsp), %r15
;; addq $0x30, %rsp
;; movq %rbp, %rsp
;; popq %rbp
;; retq
-;; 174: movq 0x10(%r14), %rcx
-;; 178: movq 0x198(%rcx), %rcx
-;; 17f: movq %r14, %rdi
-;; 182: callq *%rcx
-;; 184: ud2
+;; 181: movq 0x10(%r15), %r8
+;; 185: movq 0x198(%r8), %r8
+;; 18c: movq %r15, %rdi
+;; 18f: callq *%r8
+;; 192: ud2
;;
;; wasmtime_builtin_trap:
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %rax
;; movq %rbp, %rcx
-;; movq %rcx, 0x28(%rax)
+;; movq %rcx, 0x30(%rax)
;; movq %rbp, %rcx
;; movq 8(%rcx), %rcx
-;; movq %rcx, 0x30(%rax)
+;; movq %rcx, 0x38(%rax)
;; movq 0x10(%rdi), %rax
;; movq 0x190(%rax), %rax
;; movzbq %sil, %rsi
@@ -152,10 +156,10 @@
;; movq %rsp, %rbp
;; movq 8(%rdi), %r10
;; movq %rbp, %r11
-;; movq %r11, 0x28(%r10)
+;; movq %r11, 0x30(%r10)
;; movq %rbp, %r11
;; movq 8(%r11), %rsi
-;; movq %rsi, 0x30(%r10)
+;; movq %rsi, 0x38(%r10)
;; movq 0x10(%rdi), %rsi
;; movq 0x198(%rsi), %rsi
;; callq *%rsi
@@ -195,17 +199,17 @@
;; movdqu %xmm15, 0x140(%rsp)
;; movq 8(%rdi), %rax
;; movq %rbp, %rcx
-;; movq %rcx, 0x28(%rax)
+;; movq %rcx, 0x30(%rax)
;; movq %rbp, %rcx
;; movq 8(%rcx), %rcx
-;; movq %rcx, 0x30(%rax)
+;; movq %rcx, 0x38(%rax)
;; movq 0x10(%rdi), %rcx
;; movq 0x1c8(%rcx), %rcx
;; movq %rdi, %rbx
;; callq *%rcx
;; testb %al, %al
-;; je 0x3a7
-;; 2db: movq (%rsp), %rax
+;; je 0x3b5
+;; 2e9: movq (%rsp), %rax
;; movq 8(%rsp), %rcx
;; movq 0x10(%rsp), %rdx
;; movq 0x18(%rsp), %rbx
@@ -235,8 +239,8 @@
;; movq %rbp, %rsp
;; popq %rbp
;; retq
-;; 3a7: movq 0x10(%rbx), %r8
-;; 3ab: movq 0x198(%r8), %r8
-;; 3b2: movq %rbx, %rdi
-;; 3b5: callq *%r8
-;; 3b8: ud2
+;; 3b5: movq 0x10(%rbx), %r8
+;; 3b9: movq 0x198(%r8), %r8
+;; 3c0: movq %rbx, %rdi
+;; 3c3: callq *%r8
+;; 3c6: ud2
diff --git a/tests/disas/duplicate-function-types.wat b/tests/disas/duplicate-function-types.wat
index 3976f808e5..05352ffdb3 100644
--- a/tests/disas/duplicate-function-types.wat
+++ b/tests/disas/duplicate-function-types.wat
@@ -19,7 +19,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; gv5 = load.i64 notrap aligned gv4
diff --git a/tests/disas/duplicate-loads-dynamic-memory.wat b/tests/disas/duplicate-loads-dynamic-memory.wat
index a407ecc9fb..b4ee0b4c7d 100644
--- a/tests/disas/duplicate-loads-dynamic-memory.wat
+++ b/tests/disas/duplicate-loads-dynamic-memory.wat
@@ -25,7 +25,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -49,7 +49,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/duplicate-loads-static-memory.wat b/tests/disas/duplicate-loads-static-memory.wat
index 1c179e9e28..063f8a98dc 100644
--- a/tests/disas/duplicate-loads-static-memory.wat
+++ b/tests/disas/duplicate-loads-static-memory.wat
@@ -20,7 +20,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -40,7 +40,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/dynamic-memory-no-spectre-access-same-index-different-offsets.wat b/tests/disas/dynamic-memory-no-spectre-access-same-index-different-offsets.wat
index 2630720feb..3eade3d3ef 100644
--- a/tests/disas/dynamic-memory-no-spectre-access-same-index-different-offsets.wat
+++ b/tests/disas/dynamic-memory-no-spectre-access-same-index-different-offsets.wat
@@ -38,7 +38,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -71,7 +71,7 @@
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat b/tests/disas/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat
index 5cbab9f10f..8e673587a7 100644
--- a/tests/disas/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat
+++ b/tests/disas/dynamic-memory-yes-spectre-access-same-index-different-offsets.wat
@@ -34,7 +34,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -69,7 +69,7 @@
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/epoch-interruption-x86.wat b/tests/disas/epoch-interruption-x86.wat
index 043114a2b2..81d6b17926 100644
--- a/tests/disas/epoch-interruption-x86.wat
+++ b/tests/disas/epoch-interruption-x86.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r10
-;; movq 0x10(%r10), %r10
+;; movq 0x18(%r10), %r10
;; addq $0x30, %r10
;; cmpq %rsp, %r10
;; ja 0x7e
diff --git a/tests/disas/epoch-interruption.wat b/tests/disas/epoch-interruption.wat
index 4b9dfd41dc..db17fe360b 100644
--- a/tests/disas/epoch-interruption.wat
+++ b/tests/disas/epoch-interruption.wat
@@ -7,7 +7,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
;; sig0 = (i64 vmctx) -> i64 tail
diff --git a/tests/disas/exceptions.wat b/tests/disas/exceptions.wat
index c125c8b60c..4354a908c7 100644
--- a/tests/disas/exceptions.wat
+++ b/tests/disas/exceptions.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r10
-;; movq 0x10(%r10), %r10
+;; movq 0x18(%r10), %r10
;; addq $0x50, %r10
;; cmpq %rsp, %r10
;; ja 0xa2
@@ -42,7 +42,7 @@
;; movq %r12, %rdi
;; callq 0x34f
;; movq 8(%r12), %r8
-;; movq 0x18(%r8), %r8
+;; movq 0x20(%r8), %r8
;; movl %eax, %r9d
;; movq %r15, %rdx
;; movl %edx, 0x20(%r8, %r9)
@@ -62,7 +62,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r10
-;; movq 0x10(%r10), %r10
+;; movq 0x18(%r10), %r10
;; addq $0x50, %r10
;; cmpq %rsp, %r10
;; ja 0x14f
@@ -83,7 +83,7 @@
;; jmp 0x12d
;; 116: movq (%rsp), %rdi
;; movq 8(%rdi), %rcx
-;; movq 0x18(%rcx), %rcx
+;; movq 0x20(%rcx), %rcx
;; movl %eax, %edx
;; movl 0x20(%rcx, %rdx), %eax
;; movq 0x28(%rcx, %rdx), %rcx
diff --git a/tests/disas/f32-load.wat b/tests/disas/f32-load.wat
index 0180a5bbe8..6f96bdd69a 100644
--- a/tests/disas/f32-load.wat
+++ b/tests/disas/f32-load.wat
@@ -9,7 +9,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/f32-store.wat b/tests/disas/f32-store.wat
index d319f78d2b..f3b6433502 100644
--- a/tests/disas/f32-store.wat
+++ b/tests/disas/f32-store.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/f64-load.wat b/tests/disas/f64-load.wat
index 204f21d0f0..0992356689 100644
--- a/tests/disas/f64-load.wat
+++ b/tests/disas/f64-load.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> f64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/f64-store.wat b/tests/disas/f64-store.wat
index 753a06166e..4caf5489ef 100644
--- a/tests/disas/f64-store.wat
+++ b/tests/disas/f64-store.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, f64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/fac-multi-value.wat b/tests/disas/fac-multi-value.wat
index bb436439bb..2c8db84005 100644
--- a/tests/disas/fac-multi-value.wat
+++ b/tests/disas/fac-multi-value.wat
@@ -23,7 +23,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64):
@@ -36,7 +36,7 @@
;; function u0:1(i64 vmctx, i64, i64, i64) -> i64, i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64):
@@ -49,7 +49,7 @@
;; function u0:2(i64 vmctx, i64, i64) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; sig0 = (i64 vmctx, i64, i64, i64) -> i64, i64, i64 tail
;; sig1 = (i64 vmctx, i64, i64) -> i64, i64 tail
;; fn0 = colocated u0:1 sig0
diff --git a/tests/disas/fibonacci.wat b/tests/disas/fibonacci.wat
index 24ca0f71e4..78c3214ff6 100644
--- a/tests/disas/fibonacci.wat
+++ b/tests/disas/fibonacci.wat
@@ -26,7 +26,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/fixed-size-memory.wat b/tests/disas/fixed-size-memory.wat
index f16b7683e1..4dc7cac8c4 100644
--- a/tests/disas/fixed-size-memory.wat
+++ b/tests/disas/fixed-size-memory.wat
@@ -23,7 +23,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/gc/drc/array-fill.wat b/tests/disas/gc/drc/array-fill.wat
index f11bbf3235..bf0be2fe45 100644
--- a/tests/disas/gc/drc/array-fill.wat
+++ b/tests/disas/gc/drc/array-fill.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i64, v5: i32):
;; @0027 trapz v2, user15
;; @0027 v41 = load.i64 notrap aligned readonly can_move v0+8
-;; @0027 v7 = load.i64 notrap aligned readonly can_move v41+24
+;; @0027 v7 = load.i64 notrap aligned readonly can_move v41+32
;; @0027 v6 = uextend.i64 v2
;; @0027 v8 = iadd v7, v6
;; @0027 v9 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-get-s.wat b/tests/disas/gc/drc/array-get-s.wat
index 5183060689..709263f339 100644
--- a/tests/disas/gc/drc/array-get-s.wat
+++ b/tests/disas/gc/drc/array-get-s.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @0022 trapz v2, user15
;; @0022 v34 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+24
+;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+32
;; @0022 v5 = uextend.i64 v2
;; @0022 v7 = iadd v6, v5
;; @0022 v8 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-get-u.wat b/tests/disas/gc/drc/array-get-u.wat
index 8c9ce0a979..422e56da9b 100644
--- a/tests/disas/gc/drc/array-get-u.wat
+++ b/tests/disas/gc/drc/array-get-u.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @0022 trapz v2, user15
;; @0022 v34 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+24
+;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+32
;; @0022 v5 = uextend.i64 v2
;; @0022 v7 = iadd v6, v5
;; @0022 v8 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-get.wat b/tests/disas/gc/drc/array-get.wat
index 8aaf3770c3..dfaefc0c15 100644
--- a/tests/disas/gc/drc/array-get.wat
+++ b/tests/disas/gc/drc/array-get.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @0022 trapz v2, user15
;; @0022 v33 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v6 = load.i64 notrap aligned readonly can_move v33+24
+;; @0022 v6 = load.i64 notrap aligned readonly can_move v33+32
;; @0022 v5 = uextend.i64 v2
;; @0022 v7 = iadd v6, v5
;; @0022 v8 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-len.wat b/tests/disas/gc/drc/array-len.wat
index 444db28ad6..93b984a9fc 100644
--- a/tests/disas/gc/drc/array-len.wat
+++ b/tests/disas/gc/drc/array-len.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @001f trapz v2, user15
;; @001f v10 = load.i64 notrap aligned readonly can_move v0+8
-;; @001f v5 = load.i64 notrap aligned readonly can_move v10+24
+;; @001f v5 = load.i64 notrap aligned readonly can_move v10+32
;; @001f v4 = uextend.i64 v2
;; @001f v6 = iadd v5, v4
;; @001f v7 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
index 31cbaf7fc6..bd7ea5b1ff 100644
--- a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
@@ -15,11 +15,11 @@
;; ss2 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:27 sig0
;; stack_limit = gv2
@@ -38,7 +38,7 @@
;; @0025 v17 = call fn0(v0, v14, v15, v148, v16), stack_map=[i32 @ ss2+0, i32 @ ss1+0, i32 @ ss0+0] ; v14 = -1476395008, v15 = 0, v148 = 40, v16 = 8
;; @0025 v6 = iconst.i32 3
;; @0025 v129 = load.i64 notrap aligned readonly can_move v0+8
-;; @0025 v18 = load.i64 notrap aligned readonly can_move v129+24
+;; @0025 v18 = load.i64 notrap aligned readonly can_move v129+32
;; @0025 v19 = uextend.i64 v17
;; @0025 v20 = iadd v18, v19
;; v128 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-new-fixed.wat b/tests/disas/gc/drc/array-new-fixed.wat
index 9f8e985bd7..14e2cf7184 100644
--- a/tests/disas/gc/drc/array-new-fixed.wat
+++ b/tests/disas/gc/drc/array-new-fixed.wat
@@ -12,10 +12,10 @@
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:27 sig0
;; stack_limit = gv2
@@ -28,7 +28,7 @@
;; @0025 v17 = call fn0(v0, v14, v15, v45, v16) ; v14 = -1476395008, v15 = 0, v45 = 56, v16 = 8
;; @0025 v6 = iconst.i32 3
;; @0025 v30 = load.i64 notrap aligned readonly can_move v0+8
-;; @0025 v18 = load.i64 notrap aligned readonly can_move v30+24
+;; @0025 v18 = load.i64 notrap aligned readonly can_move v30+32
;; @0025 v19 = uextend.i64 v17
;; @0025 v20 = iadd v18, v19
;; v35 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-new.wat b/tests/disas/gc/drc/array-new.wat
index fd30585c07..f571e9ac21 100644
--- a/tests/disas/gc/drc/array-new.wat
+++ b/tests/disas/gc/drc/array-new.wat
@@ -12,10 +12,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:27 sig0
;; stack_limit = gv2
@@ -36,7 +36,7 @@
;; v40 = iconst.i32 8
;; @0022 v15 = call fn0(v0, v12, v13, v10, v40) ; v12 = -1476395008, v13 = 0, v40 = 8
;; @0022 v31 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v16 = load.i64 notrap aligned readonly can_move v31+24
+;; @0022 v16 = load.i64 notrap aligned readonly can_move v31+32
;; @0022 v17 = uextend.i64 v15
;; @0022 v18 = iadd v16, v17
;; v30 = iconst.i64 24
diff --git a/tests/disas/gc/drc/array-set.wat b/tests/disas/gc/drc/array-set.wat
index c88b126502..4bc559dfce 100644
--- a/tests/disas/gc/drc/array-set.wat
+++ b/tests/disas/gc/drc/array-set.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i64):
;; @0024 trapz v2, user15
;; @0024 v32 = load.i64 notrap aligned readonly can_move v0+8
-;; @0024 v6 = load.i64 notrap aligned readonly can_move v32+24
+;; @0024 v6 = load.i64 notrap aligned readonly can_move v32+32
;; @0024 v5 = uextend.i64 v2
;; @0024 v7 = iadd v6, v5
;; @0024 v8 = iconst.i64 24
diff --git a/tests/disas/gc/drc/br-on-cast-fail.wat b/tests/disas/gc/drc/br-on-cast-fail.wat
index fc5d97c033..a2df46d4e4 100644
--- a/tests/disas/gc/drc/br-on-cast-fail.wat
+++ b/tests/disas/gc/drc/br-on-cast-fail.wat
@@ -20,11 +20,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; sig1 = (i64 vmctx, i64) tail
;; fn0 = colocated u805306368:35 sig0
@@ -46,7 +46,7 @@
;;
;; block4:
;; @002e v36 = load.i64 notrap aligned readonly can_move v0+8
-;; @002e v14 = load.i64 notrap aligned readonly can_move v36+24
+;; @002e v14 = load.i64 notrap aligned readonly can_move v36+32
;; @002e v13 = uextend.i64 v2
;; @002e v15 = iadd v14, v13
;; @002e v16 = iconst.i64 4
diff --git a/tests/disas/gc/drc/br-on-cast.wat b/tests/disas/gc/drc/br-on-cast.wat
index cdc1fcaf3e..cd377e166a 100644
--- a/tests/disas/gc/drc/br-on-cast.wat
+++ b/tests/disas/gc/drc/br-on-cast.wat
@@ -20,11 +20,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; sig1 = (i64 vmctx, i64) tail
;; fn0 = colocated u805306368:35 sig0
@@ -46,7 +46,7 @@
;;
;; block4:
;; @002f v36 = load.i64 notrap aligned readonly can_move v0+8
-;; @002f v14 = load.i64 notrap aligned readonly can_move v36+24
+;; @002f v14 = load.i64 notrap aligned readonly can_move v36+32
;; @002f v13 = uextend.i64 v2
;; @002f v15 = iadd v14, v13
;; @002f v16 = iconst.i64 4
diff --git a/tests/disas/gc/drc/call-indirect-and-subtyping.wat b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
index 68391822d8..7bec29f3f9 100644
--- a/tests/disas/gc/drc/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
@@ -19,7 +19,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+96
;; sig0 = (i64 vmctx, i64) tail
diff --git a/tests/disas/gc/drc/externref-globals.wat b/tests/disas/gc/drc/externref-globals.wat
index 44ad9c2831..97c15a63b3 100644
--- a/tests/disas/gc/drc/externref-globals.wat
+++ b/tests/disas/gc/drc/externref-globals.wat
@@ -15,11 +15,11 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -36,7 +36,7 @@
;;
;; block2:
;; @0034 v50 = load.i64 notrap aligned readonly can_move v0+8
-;; @0034 v11 = load.i64 notrap aligned readonly can_move v50+24
+;; @0034 v11 = load.i64 notrap aligned readonly can_move v50+32
;; @0034 v10 = uextend.i64 v5
;; @0034 v12 = iadd v11, v10
;; @0034 v13 = load.i32 notrap aligned v12
@@ -72,11 +72,11 @@
;; function u0:1(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32) tail
;; fn0 = colocated u805306368:25 sig0
;; stack_limit = gv2
@@ -95,7 +95,7 @@
;;
;; block2:
;; @003b v44 = load.i64 notrap aligned readonly can_move v0+8
-;; @003b v27 = load.i64 notrap aligned readonly can_move v44+24
+;; @003b v27 = load.i64 notrap aligned readonly can_move v44+32
;; @003b v10 = uextend.i64 v2
;; @003b v12 = iadd v27, v10
;; @003b v29 = iconst.i64 8
@@ -119,7 +119,7 @@
;;
;; block4:
;; v74 = load.i64 notrap aligned readonly can_move v0+8
-;; v75 = load.i64 notrap aligned readonly can_move v74+24
+;; v75 = load.i64 notrap aligned readonly can_move v74+32
;; @003b v26 = uextend.i64 v5
;; @003b v28 = iadd v75, v26
;; v76 = iconst.i64 8
diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-get.wat b/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
index d0dd4fe7e9..82674939ba 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
@@ -12,11 +12,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i64 tail
;; fn0 = colocated u805306368:29 sig0
;; stack_limit = gv2
@@ -24,7 +24,7 @@
;; block0(v0: i64, v1: i64, v2: i32):
;; @0020 trapz v2, user15
;; @0020 v13 = load.i64 notrap aligned readonly can_move v0+8
-;; @0020 v5 = load.i64 notrap aligned readonly can_move v13+24
+;; @0020 v5 = load.i64 notrap aligned readonly can_move v13+32
;; @0020 v4 = uextend.i64 v2
;; @0020 v6 = iadd v5, v4
;; @0020 v7 = iconst.i64 24
diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
index 0d1ad8a3ef..55c1c80ca7 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
@@ -13,10 +13,10 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; sig1 = (i64 vmctx, i64) -> i64 tail
;; fn0 = colocated u805306368:27 sig0
@@ -34,7 +34,7 @@
;; @0020 v15 = call fn1(v0, v2), stack_map=[i32 @ ss0+0]
;; @0020 v16 = ireduce.i32 v15
;; @0020 v22 = load.i64 notrap aligned readonly can_move v0+8
-;; @0020 v10 = load.i64 notrap aligned readonly can_move v22+24
+;; @0020 v10 = load.i64 notrap aligned readonly can_move v22+32
;; @0020 v11 = uextend.i64 v9
;; @0020 v12 = iadd v10, v11
;; v20 = iconst.i64 24
diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-set.wat b/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
index 7f82110b0b..c9ffd92e67 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
@@ -12,11 +12,11 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i64) -> i64 tail
;; fn0 = colocated u805306368:28 sig0
;; stack_limit = gv2
@@ -26,7 +26,7 @@
;; @0022 v10 = call fn0(v0, v3)
;; @0022 v11 = ireduce.i32 v10
;; @0022 v12 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v5 = load.i64 notrap aligned readonly can_move v12+24
+;; @0022 v5 = load.i64 notrap aligned readonly can_move v12+32
;; @0022 v4 = uextend.i64 v2
;; @0022 v6 = iadd v5, v4
;; @0022 v7 = iconst.i64 24
diff --git a/tests/disas/gc/drc/i31ref-globals.wat b/tests/disas/gc/drc/i31ref-globals.wat
index 995f8cc990..fc144f8bd4 100644
--- a/tests/disas/gc/drc/i31ref-globals.wat
+++ b/tests/disas/gc/drc/i31ref-globals.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
@@ -32,7 +32,7 @@
;; function u0:1(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
diff --git a/tests/disas/gc/drc/multiple-array-get.wat b/tests/disas/gc/drc/multiple-array-get.wat
index 4b4cabdf1c..89b3e5e771 100644
--- a/tests/disas/gc/drc/multiple-array-get.wat
+++ b/tests/disas/gc/drc/multiple-array-get.wat
@@ -13,17 +13,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32):
;; @0024 trapz v2, user15
;; @0024 v65 = load.i64 notrap aligned readonly can_move v0+8
-;; @0024 v8 = load.i64 notrap aligned readonly can_move v65+24
+;; @0024 v8 = load.i64 notrap aligned readonly can_move v65+32
;; @0024 v7 = uextend.i64 v2
;; @0024 v9 = iadd v8, v7
;; @0024 v10 = iconst.i64 24
diff --git a/tests/disas/gc/drc/multiple-struct-get.wat b/tests/disas/gc/drc/multiple-struct-get.wat
index bc1f3bc782..eb6ec1f056 100644
--- a/tests/disas/gc/drc/multiple-struct-get.wat
+++ b/tests/disas/gc/drc/multiple-struct-get.wat
@@ -14,17 +14,17 @@
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @0023 trapz v2, user15
;; @0023 v20 = load.i64 notrap aligned readonly can_move v0+8
-;; @0023 v6 = load.i64 notrap aligned readonly can_move v20+24
+;; @0023 v6 = load.i64 notrap aligned readonly can_move v20+32
;; @0023 v5 = uextend.i64 v2
;; @0023 v7 = iadd v6, v5
;; @0023 v8 = iconst.i64 24
diff --git a/tests/disas/gc/drc/ref-cast.wat b/tests/disas/gc/drc/ref-cast.wat
index 4056ef24b3..4f53a5cf13 100644
--- a/tests/disas/gc/drc/ref-cast.wat
+++ b/tests/disas/gc/drc/ref-cast.wat
@@ -12,11 +12,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:35 sig0
;; stack_limit = gv2
@@ -37,7 +37,7 @@
;;
;; block3:
;; @001e v30 = load.i64 notrap aligned readonly can_move v0+8
-;; @001e v14 = load.i64 notrap aligned readonly can_move v30+24
+;; @001e v14 = load.i64 notrap aligned readonly can_move v30+32
;; @001e v13 = uextend.i64 v2
;; @001e v15 = iadd v14, v13
;; @001e v16 = iconst.i64 4
diff --git a/tests/disas/gc/drc/ref-is-null.wat b/tests/disas/gc/drc/ref-is-null.wat
index 0201f2b106..4897296d8d 100644
--- a/tests/disas/gc/drc/ref-is-null.wat
+++ b/tests/disas/gc/drc/ref-is-null.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -29,7 +29,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/drc/ref-test-any.wat b/tests/disas/gc/drc/ref-test-any.wat
index b350700cc2..9f38d117f3 100644
--- a/tests/disas/gc/drc/ref-test-any.wat
+++ b/tests/disas/gc/drc/ref-test-any.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -29,7 +29,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/drc/ref-test-array.wat b/tests/disas/gc/drc/ref-test-array.wat
index 7eec8231a5..9895604b86 100644
--- a/tests/disas/gc/drc/ref-test-array.wat
+++ b/tests/disas/gc/drc/ref-test-array.wat
@@ -10,11 +10,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -31,7 +31,7 @@
;;
;; block3:
;; @001b v21 = load.i64 notrap aligned readonly can_move v0+8
-;; @001b v11 = load.i64 notrap aligned readonly can_move v21+24
+;; @001b v11 = load.i64 notrap aligned readonly can_move v21+32
;; @001b v10 = uextend.i64 v2
;; @001b v12 = iadd v11, v10
;; @001b v15 = load.i32 notrap aligned readonly v12
diff --git a/tests/disas/gc/drc/ref-test-concrete-func-type.wat b/tests/disas/gc/drc/ref-test-concrete-func-type.wat
index bc034f636e..a1f5d90904 100644
--- a/tests/disas/gc/drc/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-func-type.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:35 sig0
diff --git a/tests/disas/gc/drc/ref-test-concrete-type.wat b/tests/disas/gc/drc/ref-test-concrete-type.wat
index bf4405a5e4..0ea03f50a4 100644
--- a/tests/disas/gc/drc/ref-test-concrete-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-type.wat
@@ -11,11 +11,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:35 sig0
;; stack_limit = gv2
@@ -34,7 +34,7 @@
;;
;; block3:
;; @001d v25 = load.i64 notrap aligned readonly can_move v0+8
-;; @001d v14 = load.i64 notrap aligned readonly can_move v25+24
+;; @001d v14 = load.i64 notrap aligned readonly can_move v25+32
;; @001d v13 = uextend.i64 v2
;; @001d v15 = iadd v14, v13
;; @001d v16 = iconst.i64 4
diff --git a/tests/disas/gc/drc/ref-test-eq.wat b/tests/disas/gc/drc/ref-test-eq.wat
index 0c37f6a497..0161a22282 100644
--- a/tests/disas/gc/drc/ref-test-eq.wat
+++ b/tests/disas/gc/drc/ref-test-eq.wat
@@ -10,11 +10,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -30,7 +30,7 @@
;;
;; block3:
;; @001b v21 = load.i64 notrap aligned readonly can_move v0+8
-;; @001b v11 = load.i64 notrap aligned readonly can_move v21+24
+;; @001b v11 = load.i64 notrap aligned readonly can_move v21+32
;; @001b v10 = uextend.i64 v2
;; @001b v12 = iadd v11, v10
;; @001b v15 = load.i32 notrap aligned readonly v12
diff --git a/tests/disas/gc/drc/ref-test-i31.wat b/tests/disas/gc/drc/ref-test-i31.wat
index a150ed6a24..b6993c5715 100644
--- a/tests/disas/gc/drc/ref-test-i31.wat
+++ b/tests/disas/gc/drc/ref-test-i31.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/drc/ref-test-none.wat b/tests/disas/gc/drc/ref-test-none.wat
index e3ca30dbbf..720fbce076 100644
--- a/tests/disas/gc/drc/ref-test-none.wat
+++ b/tests/disas/gc/drc/ref-test-none.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -27,7 +27,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/drc/ref-test-struct.wat b/tests/disas/gc/drc/ref-test-struct.wat
index 9b23c24f12..f5dbc7da13 100644
--- a/tests/disas/gc/drc/ref-test-struct.wat
+++ b/tests/disas/gc/drc/ref-test-struct.wat
@@ -10,11 +10,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -31,7 +31,7 @@
;;
;; block3:
;; @001b v21 = load.i64 notrap aligned readonly can_move v0+8
-;; @001b v11 = load.i64 notrap aligned readonly can_move v21+24
+;; @001b v11 = load.i64 notrap aligned readonly can_move v21+32
;; @001b v10 = uextend.i64 v2
;; @001b v12 = iadd v11, v10
;; @001b v15 = load.i32 notrap aligned readonly v12
diff --git a/tests/disas/gc/drc/struct-get.wat b/tests/disas/gc/drc/struct-get.wat
index 0c87b1bf42..3316536921 100644
--- a/tests/disas/gc/drc/struct-get.wat
+++ b/tests/disas/gc/drc/struct-get.wat
@@ -26,17 +26,17 @@
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @0033 trapz v2, user15
;; @0033 v10 = load.i64 notrap aligned readonly can_move v0+8
-;; @0033 v5 = load.i64 notrap aligned readonly can_move v10+24
+;; @0033 v5 = load.i64 notrap aligned readonly can_move v10+32
;; @0033 v4 = uextend.i64 v2
;; @0033 v6 = iadd v5, v4
;; @0033 v7 = iconst.i64 24
@@ -51,17 +51,17 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @003c trapz v2, user15
;; @003c v11 = load.i64 notrap aligned readonly can_move v0+8
-;; @003c v5 = load.i64 notrap aligned readonly can_move v11+24
+;; @003c v5 = load.i64 notrap aligned readonly can_move v11+32
;; @003c v4 = uextend.i64 v2
;; @003c v6 = iadd v5, v4
;; @003c v7 = iconst.i64 28
@@ -77,17 +77,17 @@
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @0045 trapz v2, user15
;; @0045 v11 = load.i64 notrap aligned readonly can_move v0+8
-;; @0045 v5 = load.i64 notrap aligned readonly can_move v11+24
+;; @0045 v5 = load.i64 notrap aligned readonly can_move v11+32
;; @0045 v4 = uextend.i64 v2
;; @0045 v6 = iadd v5, v4
;; @0045 v7 = iconst.i64 28
@@ -103,17 +103,17 @@
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @004e trapz v2, user15
;; @004e v58 = load.i64 notrap aligned readonly can_move v0+8
-;; @004e v5 = load.i64 notrap aligned readonly can_move v58+24
+;; @004e v5 = load.i64 notrap aligned readonly can_move v58+32
;; @004e v4 = uextend.i64 v2
;; @004e v6 = iadd v5, v4
;; @004e v7 = iconst.i64 32
diff --git a/tests/disas/gc/drc/struct-new-default.wat b/tests/disas/gc/drc/struct-new-default.wat
index 42f735a4be..5213951ba4 100644
--- a/tests/disas/gc/drc/struct-new-default.wat
+++ b/tests/disas/gc/drc/struct-new-default.wat
@@ -14,11 +14,11 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:27 sig0
;; stack_limit = gv2
@@ -31,7 +31,7 @@
;; @0021 v11 = call fn0(v0, v8, v4, v6, v10) ; v8 = -1342177280, v4 = 0, v6 = 40, v10 = 8
;; @0021 v3 = f32const 0.0
;; @0021 v44 = load.i64 notrap aligned readonly can_move v0+8
-;; @0021 v12 = load.i64 notrap aligned readonly can_move v44+24
+;; @0021 v12 = load.i64 notrap aligned readonly can_move v44+32
;; @0021 v13 = uextend.i64 v11
;; @0021 v14 = iadd v12, v13
;; v43 = iconst.i64 24
diff --git a/tests/disas/gc/drc/struct-new.wat b/tests/disas/gc/drc/struct-new.wat
index 9794d0fe87..621fd0c2fc 100644
--- a/tests/disas/gc/drc/struct-new.wat
+++ b/tests/disas/gc/drc/struct-new.wat
@@ -15,11 +15,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:27 sig0
;; stack_limit = gv2
@@ -33,7 +33,7 @@
;; @002a v10 = iconst.i32 8
;; @002a v11 = call fn0(v0, v8, v9, v6, v10), stack_map=[i32 @ ss0+0] ; v8 = -1342177280, v9 = 0, v6 = 40, v10 = 8
;; @002a v54 = load.i64 notrap aligned readonly can_move v0+8
-;; @002a v12 = load.i64 notrap aligned readonly can_move v54+24
+;; @002a v12 = load.i64 notrap aligned readonly can_move v54+32
;; @002a v13 = uextend.i64 v11
;; @002a v14 = iadd v12, v13
;; v53 = iconst.i64 24
diff --git a/tests/disas/gc/drc/struct-set.wat b/tests/disas/gc/drc/struct-set.wat
index 118899ecbc..ac37b7e901 100644
--- a/tests/disas/gc/drc/struct-set.wat
+++ b/tests/disas/gc/drc/struct-set.wat
@@ -22,17 +22,17 @@
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: f32):
;; @0034 trapz v2, user15
;; @0034 v9 = load.i64 notrap aligned readonly can_move v0+8
-;; @0034 v5 = load.i64 notrap aligned readonly can_move v9+24
+;; @0034 v5 = load.i64 notrap aligned readonly can_move v9+32
;; @0034 v4 = uextend.i64 v2
;; @0034 v6 = iadd v5, v4
;; @0034 v7 = iconst.i64 24
@@ -47,17 +47,17 @@
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @003f trapz v2, user15
;; @003f v9 = load.i64 notrap aligned readonly can_move v0+8
-;; @003f v5 = load.i64 notrap aligned readonly can_move v9+24
+;; @003f v5 = load.i64 notrap aligned readonly can_move v9+32
;; @003f v4 = uextend.i64 v2
;; @003f v6 = iadd v5, v4
;; @003f v7 = iconst.i64 28
@@ -72,11 +72,11 @@
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32) tail
;; fn0 = colocated u805306368:25 sig0
;; stack_limit = gv2
@@ -84,7 +84,7 @@
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @004a trapz v2, user15
;; @004a v59 = load.i64 notrap aligned readonly can_move v0+8
-;; @004a v5 = load.i64 notrap aligned readonly can_move v59+24
+;; @004a v5 = load.i64 notrap aligned readonly can_move v59+32
;; @004a v4 = uextend.i64 v2
;; @004a v6 = iadd v5, v4
;; @004a v7 = iconst.i64 32
diff --git a/tests/disas/gc/null/array-fill.wat b/tests/disas/gc/null/array-fill.wat
index 2dd07bec43..0ee9ed2501 100644
--- a/tests/disas/gc/null/array-fill.wat
+++ b/tests/disas/gc/null/array-fill.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i64, v5: i32):
;; @0027 trapz v2, user15
;; @0027 v41 = load.i64 notrap aligned readonly can_move v0+8
-;; @0027 v7 = load.i64 notrap aligned readonly can_move v41+24
+;; @0027 v7 = load.i64 notrap aligned readonly can_move v41+32
;; @0027 v6 = uextend.i64 v2
;; @0027 v8 = iadd v7, v6
;; @0027 v9 = iconst.i64 8
diff --git a/tests/disas/gc/null/array-get-s.wat b/tests/disas/gc/null/array-get-s.wat
index 0a04f752e7..4896b0fd27 100644
--- a/tests/disas/gc/null/array-get-s.wat
+++ b/tests/disas/gc/null/array-get-s.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @0022 trapz v2, user15
;; @0022 v34 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+24
+;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+32
;; @0022 v5 = uextend.i64 v2
;; @0022 v7 = iadd v6, v5
;; @0022 v8 = iconst.i64 8
diff --git a/tests/disas/gc/null/array-get-u.wat b/tests/disas/gc/null/array-get-u.wat
index 8f2f564f7f..b1267fe290 100644
--- a/tests/disas/gc/null/array-get-u.wat
+++ b/tests/disas/gc/null/array-get-u.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @0022 trapz v2, user15
;; @0022 v34 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+24
+;; @0022 v6 = load.i64 notrap aligned readonly can_move v34+32
;; @0022 v5 = uextend.i64 v2
;; @0022 v7 = iadd v6, v5
;; @0022 v8 = iconst.i64 8
diff --git a/tests/disas/gc/null/array-get.wat b/tests/disas/gc/null/array-get.wat
index 4037eb150d..1536cf3cf7 100644
--- a/tests/disas/gc/null/array-get.wat
+++ b/tests/disas/gc/null/array-get.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @0022 trapz v2, user15
;; @0022 v33 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v6 = load.i64 notrap aligned readonly can_move v33+24
+;; @0022 v6 = load.i64 notrap aligned readonly can_move v33+32
;; @0022 v5 = uextend.i64 v2
;; @0022 v7 = iadd v6, v5
;; @0022 v8 = iconst.i64 8
diff --git a/tests/disas/gc/null/array-len.wat b/tests/disas/gc/null/array-len.wat
index e551e1e921..8bda2bf10f 100644
--- a/tests/disas/gc/null/array-len.wat
+++ b/tests/disas/gc/null/array-len.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @001f trapz v2, user15
;; @001f v10 = load.i64 notrap aligned readonly can_move v0+8
-;; @001f v5 = load.i64 notrap aligned readonly can_move v10+24
+;; @001f v5 = load.i64 notrap aligned readonly can_move v10+32
;; @001f v4 = uextend.i64 v2
;; @001f v6 = iadd v5, v4
;; @001f v7 = iconst.i64 8
diff --git a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
index 57f8d27b25..c9fc3d9127 100644
--- a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
@@ -15,11 +15,11 @@
;; ss2 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned gv4+32
-;; gv6 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned gv4+40
+;; gv6 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i64) -> i8 tail
;; fn0 = colocated u805306368:26 sig0
;; stack_limit = gv2
@@ -40,14 +40,14 @@
;; v74 = iconst.i32 24
;; @0025 v24 = uadd_overflow_trap v23, v74, user17 ; v74 = 24
;; @0025 v56 = load.i64 notrap aligned readonly can_move v0+8
-;; @0025 v26 = load.i64 notrap aligned v56+32
+;; @0025 v26 = load.i64 notrap aligned v56+40
;; @0025 v25 = uextend.i64 v24
;; @0025 v27 = icmp ule v25, v26
;; @0025 brif v27, block2, block3
;;
;; block2:
;; v90 = iconst.i32 -1476394984
-;; @0025 v31 = load.i64 notrap aligned readonly can_move v56+24
+;; @0025 v31 = load.i64 notrap aligned readonly can_move v56+32
;; v175 = band.i32 v21, v89 ; v89 = -8
;; v176 = uextend.i64 v175
;; @0025 v33 = iadd v31, v176
diff --git a/tests/disas/gc/null/array-new-fixed.wat b/tests/disas/gc/null/array-new-fixed.wat
index 36422419ee..607ddc6967 100644
--- a/tests/disas/gc/null/array-new-fixed.wat
+++ b/tests/disas/gc/null/array-new-fixed.wat
@@ -12,11 +12,11 @@
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned gv4+32
-;; gv6 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned gv4+40
+;; gv6 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i64) -> i8 tail
;; fn0 = colocated u805306368:26 sig0
;; stack_limit = gv2
@@ -31,14 +31,14 @@
;; v65 = iconst.i32 40
;; @0025 v24 = uadd_overflow_trap v23, v65, user17 ; v65 = 40
;; @0025 v50 = load.i64 notrap aligned readonly can_move v0+8
-;; @0025 v26 = load.i64 notrap aligned v50+32
+;; @0025 v26 = load.i64 notrap aligned v50+40
;; @0025 v25 = uextend.i64 v24
;; @0025 v27 = icmp ule v25, v26
;; @0025 brif v27, block2, block3
;;
;; block2:
;; v81 = iconst.i32 -1476394968
-;; @0025 v31 = load.i64 notrap aligned readonly can_move v50+24
+;; @0025 v31 = load.i64 notrap aligned readonly can_move v50+32
;; v150 = band.i32 v21, v80 ; v80 = -8
;; v151 = uextend.i64 v150
;; @0025 v33 = iadd v31, v151
diff --git a/tests/disas/gc/null/array-new.wat b/tests/disas/gc/null/array-new.wat
index cd144cbb97..cc9b53721f 100644
--- a/tests/disas/gc/null/array-new.wat
+++ b/tests/disas/gc/null/array-new.wat
@@ -12,11 +12,11 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned gv4+32
-;; gv6 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned gv4+40
+;; gv6 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i64) -> i8 tail
;; fn0 = colocated u805306368:26 sig0
;; stack_limit = gv2
@@ -43,7 +43,7 @@
;; @0022 v21 = band v19, v73 ; v73 = -8
;; @0022 v22 = uadd_overflow_trap v21, v10, user17
;; @0022 v51 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v24 = load.i64 notrap aligned v51+32
+;; @0022 v24 = load.i64 notrap aligned v51+40
;; @0022 v23 = uextend.i64 v22
;; @0022 v25 = icmp ule v23, v24
;; @0022 brif v25, block2, block3
@@ -51,7 +51,7 @@
;; block2:
;; @0022 v32 = iconst.i32 -1476395008
;; v74 = bor.i32 v10, v32 ; v32 = -1476395008
-;; @0022 v29 = load.i64 notrap aligned readonly can_move v51+24
+;; @0022 v29 = load.i64 notrap aligned readonly can_move v51+32
;; v88 = band.i32 v19, v73 ; v73 = -8
;; v89 = uextend.i64 v88
;; @0022 v31 = iadd v29, v89
diff --git a/tests/disas/gc/null/array-set.wat b/tests/disas/gc/null/array-set.wat
index 2f2540d42e..0fa90539fe 100644
--- a/tests/disas/gc/null/array-set.wat
+++ b/tests/disas/gc/null/array-set.wat
@@ -12,17 +12,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i64):
;; @0024 trapz v2, user15
;; @0024 v32 = load.i64 notrap aligned readonly can_move v0+8
-;; @0024 v6 = load.i64 notrap aligned readonly can_move v32+24
+;; @0024 v6 = load.i64 notrap aligned readonly can_move v32+32
;; @0024 v5 = uextend.i64 v2
;; @0024 v7 = iadd v6, v5
;; @0024 v8 = iconst.i64 8
diff --git a/tests/disas/gc/null/br-on-cast-fail.wat b/tests/disas/gc/null/br-on-cast-fail.wat
index 6cda7d3895..2160f78ffa 100644
--- a/tests/disas/gc/null/br-on-cast-fail.wat
+++ b/tests/disas/gc/null/br-on-cast-fail.wat
@@ -20,11 +20,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; sig1 = (i64 vmctx, i64) tail
;; fn0 = colocated u805306368:35 sig0
@@ -46,7 +46,7 @@
;;
;; block4:
;; @002e v36 = load.i64 notrap aligned readonly can_move v0+8
-;; @002e v14 = load.i64 notrap aligned readonly can_move v36+24
+;; @002e v14 = load.i64 notrap aligned readonly can_move v36+32
;; @002e v13 = uextend.i64 v2
;; @002e v15 = iadd v14, v13
;; @002e v16 = iconst.i64 4
diff --git a/tests/disas/gc/null/br-on-cast.wat b/tests/disas/gc/null/br-on-cast.wat
index 4ced43b49a..8541ac7976 100644
--- a/tests/disas/gc/null/br-on-cast.wat
+++ b/tests/disas/gc/null/br-on-cast.wat
@@ -20,11 +20,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; sig1 = (i64 vmctx, i64) tail
;; fn0 = colocated u805306368:35 sig0
@@ -46,7 +46,7 @@
;;
;; block4:
;; @002f v36 = load.i64 notrap aligned readonly can_move v0+8
-;; @002f v14 = load.i64 notrap aligned readonly can_move v36+24
+;; @002f v14 = load.i64 notrap aligned readonly can_move v36+32
;; @002f v13 = uextend.i64 v2
;; @002f v15 = iadd v14, v13
;; @002f v16 = iconst.i64 4
diff --git a/tests/disas/gc/null/call-indirect-and-subtyping.wat b/tests/disas/gc/null/call-indirect-and-subtyping.wat
index 5766332c56..2b63d4ce04 100644
--- a/tests/disas/gc/null/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/null/call-indirect-and-subtyping.wat
@@ -19,7 +19,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+96
;; sig0 = (i64 vmctx, i64) tail
diff --git a/tests/disas/gc/null/externref-globals.wat b/tests/disas/gc/null/externref-globals.wat
index aca114dd07..93daf78214 100644
--- a/tests/disas/gc/null/externref-globals.wat
+++ b/tests/disas/gc/null/externref-globals.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
@@ -32,7 +32,7 @@
;; function u0:1(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
diff --git a/tests/disas/gc/null/funcref-in-gc-heap-get.wat b/tests/disas/gc/null/funcref-in-gc-heap-get.wat
index 78e4178a67..48adc71c27 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-get.wat
@@ -12,11 +12,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i64 tail
;; fn0 = colocated u805306368:29 sig0
;; stack_limit = gv2
@@ -24,7 +24,7 @@
;; block0(v0: i64, v1: i64, v2: i32):
;; @0020 trapz v2, user15
;; @0020 v13 = load.i64 notrap aligned readonly can_move v0+8
-;; @0020 v5 = load.i64 notrap aligned readonly can_move v13+24
+;; @0020 v5 = load.i64 notrap aligned readonly can_move v13+32
;; @0020 v4 = uextend.i64 v2
;; @0020 v6 = iadd v5, v4
;; @0020 v7 = iconst.i64 8
diff --git a/tests/disas/gc/null/funcref-in-gc-heap-new.wat b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
index baef7b3e99..5cc7a10682 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
@@ -12,11 +12,11 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned gv4+32
-;; gv6 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned gv4+40
+;; gv6 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i64) -> i8 tail
;; sig1 = (i64 vmctx, i64) -> i64 tail
;; fn0 = colocated u805306368:26 sig0
@@ -33,14 +33,14 @@
;; @0020 v4 = iconst.i32 16
;; @0020 v16 = uadd_overflow_trap v15, v4, user17 ; v4 = 16
;; @0020 v38 = load.i64 notrap aligned readonly can_move v0+8
-;; @0020 v18 = load.i64 notrap aligned v38+32
+;; @0020 v18 = load.i64 notrap aligned v38+40
;; @0020 v17 = uextend.i64 v16
;; @0020 v19 = icmp ule v17, v18
;; @0020 brif v19, block2, block3
;;
;; block2:
;; v55 = iconst.i32 -1342177264
-;; @0020 v23 = load.i64 notrap aligned readonly can_move v38+24
+;; @0020 v23 = load.i64 notrap aligned readonly can_move v38+32
;; v62 = band.i32 v13, v54 ; v54 = -8
;; v63 = uextend.i64 v62
;; @0020 v25 = iadd v23, v63
diff --git a/tests/disas/gc/null/funcref-in-gc-heap-set.wat b/tests/disas/gc/null/funcref-in-gc-heap-set.wat
index 02f060375c..7572102ecd 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-set.wat
@@ -12,11 +12,11 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i64) -> i64 tail
;; fn0 = colocated u805306368:28 sig0
;; stack_limit = gv2
@@ -26,7 +26,7 @@
;; @0022 v10 = call fn0(v0, v3)
;; @0022 v11 = ireduce.i32 v10
;; @0022 v12 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v5 = load.i64 notrap aligned readonly can_move v12+24
+;; @0022 v5 = load.i64 notrap aligned readonly can_move v12+32
;; @0022 v4 = uextend.i64 v2
;; @0022 v6 = iadd v5, v4
;; @0022 v7 = iconst.i64 8
diff --git a/tests/disas/gc/null/i31ref-globals.wat b/tests/disas/gc/null/i31ref-globals.wat
index df998b2c2e..25cc289a84 100644
--- a/tests/disas/gc/null/i31ref-globals.wat
+++ b/tests/disas/gc/null/i31ref-globals.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
@@ -32,7 +32,7 @@
;; function u0:1(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
diff --git a/tests/disas/gc/null/multiple-array-get.wat b/tests/disas/gc/null/multiple-array-get.wat
index 0e7fc6d469..ad073e5d16 100644
--- a/tests/disas/gc/null/multiple-array-get.wat
+++ b/tests/disas/gc/null/multiple-array-get.wat
@@ -13,17 +13,17 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32):
;; @0024 trapz v2, user15
;; @0024 v65 = load.i64 notrap aligned readonly can_move v0+8
-;; @0024 v8 = load.i64 notrap aligned readonly can_move v65+24
+;; @0024 v8 = load.i64 notrap aligned readonly can_move v65+32
;; @0024 v7 = uextend.i64 v2
;; @0024 v9 = iadd v8, v7
;; @0024 v10 = iconst.i64 8
diff --git a/tests/disas/gc/null/multiple-struct-get.wat b/tests/disas/gc/null/multiple-struct-get.wat
index dce103bd7b..c1bf36395b 100644
--- a/tests/disas/gc/null/multiple-struct-get.wat
+++ b/tests/disas/gc/null/multiple-struct-get.wat
@@ -14,17 +14,17 @@
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @0023 trapz v2, user15
;; @0023 v20 = load.i64 notrap aligned readonly can_move v0+8
-;; @0023 v6 = load.i64 notrap aligned readonly can_move v20+24
+;; @0023 v6 = load.i64 notrap aligned readonly can_move v20+32
;; @0023 v5 = uextend.i64 v2
;; @0023 v7 = iadd v6, v5
;; @0023 v8 = iconst.i64 8
diff --git a/tests/disas/gc/null/ref-cast.wat b/tests/disas/gc/null/ref-cast.wat
index ce6c41a8d3..81fd44c6a5 100644
--- a/tests/disas/gc/null/ref-cast.wat
+++ b/tests/disas/gc/null/ref-cast.wat
@@ -12,11 +12,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:35 sig0
;; stack_limit = gv2
@@ -37,7 +37,7 @@
;;
;; block3:
;; @001e v30 = load.i64 notrap aligned readonly can_move v0+8
-;; @001e v14 = load.i64 notrap aligned readonly can_move v30+24
+;; @001e v14 = load.i64 notrap aligned readonly can_move v30+32
;; @001e v13 = uextend.i64 v2
;; @001e v15 = iadd v14, v13
;; @001e v16 = iconst.i64 4
diff --git a/tests/disas/gc/null/ref-is-null.wat b/tests/disas/gc/null/ref-is-null.wat
index 8ddc6548bd..f76da9b39b 100644
--- a/tests/disas/gc/null/ref-is-null.wat
+++ b/tests/disas/gc/null/ref-is-null.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -29,7 +29,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/null/ref-test-any.wat b/tests/disas/gc/null/ref-test-any.wat
index 4d4deffb01..49a44f2fee 100644
--- a/tests/disas/gc/null/ref-test-any.wat
+++ b/tests/disas/gc/null/ref-test-any.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -29,7 +29,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/null/ref-test-array.wat b/tests/disas/gc/null/ref-test-array.wat
index b9403ae749..ad44ef52ac 100644
--- a/tests/disas/gc/null/ref-test-array.wat
+++ b/tests/disas/gc/null/ref-test-array.wat
@@ -10,11 +10,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -31,7 +31,7 @@
;;
;; block3:
;; @001b v21 = load.i64 notrap aligned readonly can_move v0+8
-;; @001b v11 = load.i64 notrap aligned readonly can_move v21+24
+;; @001b v11 = load.i64 notrap aligned readonly can_move v21+32
;; @001b v10 = uextend.i64 v2
;; @001b v12 = iadd v11, v10
;; @001b v15 = load.i32 notrap aligned readonly v12
diff --git a/tests/disas/gc/null/ref-test-concrete-func-type.wat b/tests/disas/gc/null/ref-test-concrete-func-type.wat
index 9438b3f2e4..1911938a53 100644
--- a/tests/disas/gc/null/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-func-type.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:35 sig0
diff --git a/tests/disas/gc/null/ref-test-concrete-type.wat b/tests/disas/gc/null/ref-test-concrete-type.wat
index a0f18bbc6c..87126b5942 100644
--- a/tests/disas/gc/null/ref-test-concrete-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-type.wat
@@ -11,11 +11,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:35 sig0
;; stack_limit = gv2
@@ -34,7 +34,7 @@
;;
;; block3:
;; @001d v25 = load.i64 notrap aligned readonly can_move v0+8
-;; @001d v14 = load.i64 notrap aligned readonly can_move v25+24
+;; @001d v14 = load.i64 notrap aligned readonly can_move v25+32
;; @001d v13 = uextend.i64 v2
;; @001d v15 = iadd v14, v13
;; @001d v16 = iconst.i64 4
diff --git a/tests/disas/gc/null/ref-test-eq.wat b/tests/disas/gc/null/ref-test-eq.wat
index 8b7fe2a10a..f64058b78b 100644
--- a/tests/disas/gc/null/ref-test-eq.wat
+++ b/tests/disas/gc/null/ref-test-eq.wat
@@ -10,11 +10,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -30,7 +30,7 @@
;;
;; block3:
;; @001b v21 = load.i64 notrap aligned readonly can_move v0+8
-;; @001b v11 = load.i64 notrap aligned readonly can_move v21+24
+;; @001b v11 = load.i64 notrap aligned readonly can_move v21+32
;; @001b v10 = uextend.i64 v2
;; @001b v12 = iadd v11, v10
;; @001b v15 = load.i32 notrap aligned readonly v12
diff --git a/tests/disas/gc/null/ref-test-i31.wat b/tests/disas/gc/null/ref-test-i31.wat
index 69e0d38612..d995ad1137 100644
--- a/tests/disas/gc/null/ref-test-i31.wat
+++ b/tests/disas/gc/null/ref-test-i31.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/null/ref-test-none.wat b/tests/disas/gc/null/ref-test-none.wat
index 46857fc95f..94f2148cb6 100644
--- a/tests/disas/gc/null/ref-test-none.wat
+++ b/tests/disas/gc/null/ref-test-none.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -27,7 +27,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/gc/null/ref-test-struct.wat b/tests/disas/gc/null/ref-test-struct.wat
index 308eb3cc12..adca0039e2 100644
--- a/tests/disas/gc/null/ref-test-struct.wat
+++ b/tests/disas/gc/null/ref-test-struct.wat
@@ -10,11 +10,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -31,7 +31,7 @@
;;
;; block3:
;; @001b v21 = load.i64 notrap aligned readonly can_move v0+8
-;; @001b v11 = load.i64 notrap aligned readonly can_move v21+24
+;; @001b v11 = load.i64 notrap aligned readonly can_move v21+32
;; @001b v10 = uextend.i64 v2
;; @001b v12 = iadd v11, v10
;; @001b v15 = load.i32 notrap aligned readonly v12
diff --git a/tests/disas/gc/null/struct-get.wat b/tests/disas/gc/null/struct-get.wat
index ef75daf799..807aa1711b 100644
--- a/tests/disas/gc/null/struct-get.wat
+++ b/tests/disas/gc/null/struct-get.wat
@@ -26,17 +26,17 @@
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @0033 trapz v2, user15
;; @0033 v10 = load.i64 notrap aligned readonly can_move v0+8
-;; @0033 v5 = load.i64 notrap aligned readonly can_move v10+24
+;; @0033 v5 = load.i64 notrap aligned readonly can_move v10+32
;; @0033 v4 = uextend.i64 v2
;; @0033 v6 = iadd v5, v4
;; @0033 v7 = iconst.i64 8
@@ -51,17 +51,17 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @003c trapz v2, user15
;; @003c v11 = load.i64 notrap aligned readonly can_move v0+8
-;; @003c v5 = load.i64 notrap aligned readonly can_move v11+24
+;; @003c v5 = load.i64 notrap aligned readonly can_move v11+32
;; @003c v4 = uextend.i64 v2
;; @003c v6 = iadd v5, v4
;; @003c v7 = iconst.i64 12
@@ -77,17 +77,17 @@
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @0045 trapz v2, user15
;; @0045 v11 = load.i64 notrap aligned readonly can_move v0+8
-;; @0045 v5 = load.i64 notrap aligned readonly can_move v11+24
+;; @0045 v5 = load.i64 notrap aligned readonly can_move v11+32
;; @0045 v4 = uextend.i64 v2
;; @0045 v6 = iadd v5, v4
;; @0045 v7 = iconst.i64 12
@@ -103,17 +103,17 @@
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @004e trapz v2, user15
;; @004e v10 = load.i64 notrap aligned readonly can_move v0+8
-;; @004e v5 = load.i64 notrap aligned readonly can_move v10+24
+;; @004e v5 = load.i64 notrap aligned readonly can_move v10+32
;; @004e v4 = uextend.i64 v2
;; @004e v6 = iadd v5, v4
;; @004e v7 = iconst.i64 16
diff --git a/tests/disas/gc/null/struct-new-default.wat b/tests/disas/gc/null/struct-new-default.wat
index 092c3deda1..c518682451 100644
--- a/tests/disas/gc/null/struct-new-default.wat
+++ b/tests/disas/gc/null/struct-new-default.wat
@@ -14,11 +14,11 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned gv4+32
-;; gv6 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned gv4+40
+;; gv6 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i64) -> i8 tail
;; fn0 = colocated u805306368:26 sig0
;; stack_limit = gv2
@@ -33,14 +33,14 @@
;; @0021 v6 = iconst.i32 24
;; @0021 v18 = uadd_overflow_trap v17, v6, user17 ; v6 = 24
;; @0021 v41 = load.i64 notrap aligned readonly can_move v0+8
-;; @0021 v20 = load.i64 notrap aligned v41+32
+;; @0021 v20 = load.i64 notrap aligned v41+40
;; @0021 v19 = uextend.i64 v18
;; @0021 v21 = icmp ule v19, v20
;; @0021 brif v21, block2, block3
;;
;; block2:
;; v57 = iconst.i32 -1342177256
-;; @0021 v25 = load.i64 notrap aligned readonly can_move v41+24
+;; @0021 v25 = load.i64 notrap aligned readonly can_move v41+32
;; v64 = band.i32 v15, v56 ; v56 = -8
;; v65 = uextend.i64 v64
;; @0021 v27 = iadd v25, v65
diff --git a/tests/disas/gc/null/struct-new.wat b/tests/disas/gc/null/struct-new.wat
index e9f75c07b4..f8b78dde8e 100644
--- a/tests/disas/gc/null/struct-new.wat
+++ b/tests/disas/gc/null/struct-new.wat
@@ -15,11 +15,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned gv4+32
-;; gv6 = load.i64 notrap aligned readonly can_move gv4+24
+;; gv5 = load.i64 notrap aligned gv4+40
+;; gv6 = load.i64 notrap aligned readonly can_move gv4+32
;; sig0 = (i64 vmctx, i64) -> i8 tail
;; fn0 = colocated u805306368:26 sig0
;; stack_limit = gv2
@@ -36,14 +36,14 @@
;; @002a v6 = iconst.i32 24
;; @002a v18 = uadd_overflow_trap v17, v6, user17 ; v6 = 24
;; @002a v43 = load.i64 notrap aligned readonly can_move v0+8
-;; @002a v20 = load.i64 notrap aligned v43+32
+;; @002a v20 = load.i64 notrap aligned v43+40
;; @002a v19 = uextend.i64 v18
;; @002a v21 = icmp ule v19, v20
;; @002a brif v21, block2, block3
;;
;; block2:
;; v61 = iconst.i32 -1342177256
-;; @002a v25 = load.i64 notrap aligned readonly can_move v43+24
+;; @002a v25 = load.i64 notrap aligned readonly can_move v43+32
;; v68 = band.i32 v15, v60 ; v60 = -8
;; v69 = uextend.i64 v68
;; @002a v27 = iadd v25, v69
diff --git a/tests/disas/gc/null/struct-set.wat b/tests/disas/gc/null/struct-set.wat
index f467789666..30e88dedfe 100644
--- a/tests/disas/gc/null/struct-set.wat
+++ b/tests/disas/gc/null/struct-set.wat
@@ -22,17 +22,17 @@
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: f32):
;; @0034 trapz v2, user15
;; @0034 v9 = load.i64 notrap aligned readonly can_move v0+8
-;; @0034 v5 = load.i64 notrap aligned readonly can_move v9+24
+;; @0034 v5 = load.i64 notrap aligned readonly can_move v9+32
;; @0034 v4 = uextend.i64 v2
;; @0034 v6 = iadd v5, v4
;; @0034 v7 = iconst.i64 8
@@ -47,17 +47,17 @@
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @003f trapz v2, user15
;; @003f v9 = load.i64 notrap aligned readonly can_move v0+8
-;; @003f v5 = load.i64 notrap aligned readonly can_move v9+24
+;; @003f v5 = load.i64 notrap aligned readonly can_move v9+32
;; @003f v4 = uextend.i64 v2
;; @003f v6 = iadd v5, v4
;; @003f v7 = iconst.i64 12
@@ -72,17 +72,17 @@
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
;; @004a trapz v2, user15
;; @004a v9 = load.i64 notrap aligned readonly can_move v0+8
-;; @004a v5 = load.i64 notrap aligned readonly can_move v9+24
+;; @004a v5 = load.i64 notrap aligned readonly can_move v9+32
;; @004a v4 = uextend.i64 v2
;; @004a v6 = iadd v5, v4
;; @004a v7 = iconst.i64 16
diff --git a/tests/disas/gc/null/v128-fields.wat b/tests/disas/gc/null/v128-fields.wat
index f721d0f216..76350405b5 100644
--- a/tests/disas/gc/null/v128-fields.wat
+++ b/tests/disas/gc/null/v128-fields.wat
@@ -14,17 +14,17 @@
;; function u0:0(i64 vmctx, i64, i32) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
;; @0022 trapz v2, user15
;; @0022 v19 = load.i64 notrap aligned readonly can_move v0+8
-;; @0022 v5 = load.i64 notrap aligned readonly can_move v19+24
+;; @0022 v5 = load.i64 notrap aligned readonly can_move v19+32
;; @0022 v4 = uextend.i64 v2
;; @0022 v6 = iadd v5, v4
;; @0022 v7 = iconst.i64 16
diff --git a/tests/disas/gc/struct-new-default.wat b/tests/disas/gc/struct-new-default.wat
index ad4851ed15..795bba74b8 100644
--- a/tests/disas/gc/struct-new-default.wat
+++ b/tests/disas/gc/struct-new-default.wat
@@ -15,11 +15,11 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:27 sig0
;; const0 = 0x00000000000000000000000000000000
@@ -33,7 +33,7 @@
;; @0023 v12 = call fn0(v0, v9, v4, v7, v11) ; v9 = -1342177280, v4 = 0, v7 = 64, v11 = 16
;; @0023 v3 = f32const 0.0
;; @0023 v47 = load.i64 notrap aligned readonly can_move v0+8
-;; @0023 v13 = load.i64 notrap aligned readonly can_move v47+24
+;; @0023 v13 = load.i64 notrap aligned readonly can_move v47+32
;; @0023 v14 = uextend.i64 v12
;; @0023 v15 = iadd v13, v14
;; v46 = iconst.i64 24
diff --git a/tests/disas/gc/struct-new-stack-map.wat b/tests/disas/gc/struct-new-stack-map.wat
index a58654548d..b8b248201f 100644
--- a/tests/disas/gc/struct-new-stack-map.wat
+++ b/tests/disas/gc/struct-new-stack-map.wat
@@ -15,7 +15,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r10
-;; movq 0x10(%r10), %r10
+;; movq 0x18(%r10), %r10
;; addq $0x40, %r10
;; cmpq %rsp, %r10
;; ja 0xb5
@@ -33,7 +33,7 @@
;; callq 0x12f
;; movq 8(%r13), %rdx
;; ╰─╼ stack_map: frame_size=48, frame_offsets=[0]
-;; movq 0x18(%rdx), %rdx
+;; movq 0x20(%rdx), %rdx
;; movl %eax, %r8d
;; movdqu 8(%rsp), %xmm0
;; movss %xmm0, 0x18(%rdx, %r8)
diff --git a/tests/disas/gc/struct-new.wat b/tests/disas/gc/struct-new.wat
index 82adb310ad..3020d440a0 100644
--- a/tests/disas/gc/struct-new.wat
+++ b/tests/disas/gc/struct-new.wat
@@ -15,11 +15,11 @@
;; ss0 = explicit_slot 4, align = 4
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; sig0 = (i64 vmctx, i32, i32, i32, i32) -> i32 tail
;; fn0 = colocated u805306368:27 sig0
;; stack_limit = gv2
@@ -33,7 +33,7 @@
;; @002a v10 = iconst.i32 8
;; @002a v11 = call fn0(v0, v8, v9, v6, v10), stack_map=[i32 @ ss0+0] ; v8 = -1342177280, v9 = 0, v6 = 40, v10 = 8
;; @002a v54 = load.i64 notrap aligned readonly can_move v0+8
-;; @002a v12 = load.i64 notrap aligned readonly can_move v54+24
+;; @002a v12 = load.i64 notrap aligned readonly can_move v54+32
;; @002a v13 = uextend.i64 v11
;; @002a v14 = iadd v12, v13
;; v53 = iconst.i64 24
diff --git a/tests/disas/global-get.wat b/tests/disas/global-get.wat
index ca3eeaa4d9..d3788f1d70 100644
--- a/tests/disas/global-get.wat
+++ b/tests/disas/global-get.wat
@@ -33,7 +33,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; stack_limit = gv2
@@ -50,7 +50,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+72
;; stack_limit = gv2
@@ -67,7 +67,7 @@
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -81,7 +81,7 @@
;; function u0:3(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
diff --git a/tests/disas/globals.wat b/tests/disas/globals.wat
index 0ecea42ab6..447e0d409a 100644
--- a/tests/disas/globals.wat
+++ b/tests/disas/globals.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i128-cmp.wat b/tests/disas/i128-cmp.wat
index 7089c9311b..aa49bdceb5 100644
--- a/tests/disas/i128-cmp.wat
+++ b/tests/disas/i128-cmp.wat
@@ -102,7 +102,7 @@
;; function u0:0(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
@@ -119,7 +119,7 @@
;; function u0:1(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
@@ -136,7 +136,7 @@
;; function u0:2(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
@@ -153,7 +153,7 @@
;; function u0:3(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
@@ -170,7 +170,7 @@
;; function u0:4(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
@@ -187,7 +187,7 @@
;; function u0:5(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
@@ -204,7 +204,7 @@
;; function u0:6(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
@@ -221,7 +221,7 @@
;; function u0:7(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i64):
diff --git a/tests/disas/i32-load.wat b/tests/disas/i32-load.wat
index a39d5a3a80..38aa477605 100644
--- a/tests/disas/i32-load.wat
+++ b/tests/disas/i32-load.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i32-load16-s.wat b/tests/disas/i32-load16-s.wat
index cf8b6dbdff..f25f29e259 100644
--- a/tests/disas/i32-load16-s.wat
+++ b/tests/disas/i32-load16-s.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i32-load16-u.wat b/tests/disas/i32-load16-u.wat
index e4bbba0310..740bd34d91 100644
--- a/tests/disas/i32-load16-u.wat
+++ b/tests/disas/i32-load16-u.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i32-load8-s.wat b/tests/disas/i32-load8-s.wat
index 80e623e83f..a6430c10d7 100644
--- a/tests/disas/i32-load8-s.wat
+++ b/tests/disas/i32-load8-s.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i32-load8-u.wat b/tests/disas/i32-load8-u.wat
index 8053f5294c..959250f533 100644
--- a/tests/disas/i32-load8-u.wat
+++ b/tests/disas/i32-load8-u.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i32-store.wat b/tests/disas/i32-store.wat
index 746d55320f..dcb8f1b736 100644
--- a/tests/disas/i32-store.wat
+++ b/tests/disas/i32-store.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i32-store16.wat b/tests/disas/i32-store16.wat
index 48bb2bb2c7..8de09bffac 100644
--- a/tests/disas/i32-store16.wat
+++ b/tests/disas/i32-store16.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i32-store8.wat b/tests/disas/i32-store8.wat
index b7a68d1add..4bbe0f2bc8 100644
--- a/tests/disas/i32-store8.wat
+++ b/tests/disas/i32-store8.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-load.wat b/tests/disas/i64-load.wat
index f45aef0ae3..564ec9a2b7 100644
--- a/tests/disas/i64-load.wat
+++ b/tests/disas/i64-load.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-load16-s.wat b/tests/disas/i64-load16-s.wat
index a42f798344..f62bcdee2f 100644
--- a/tests/disas/i64-load16-s.wat
+++ b/tests/disas/i64-load16-s.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-load16-u.wat b/tests/disas/i64-load16-u.wat
index 44fb1fd66f..15565385dc 100644
--- a/tests/disas/i64-load16-u.wat
+++ b/tests/disas/i64-load16-u.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-load8-s.wat b/tests/disas/i64-load8-s.wat
index 519089558c..4258fb7f58 100644
--- a/tests/disas/i64-load8-s.wat
+++ b/tests/disas/i64-load8-s.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-load8-u.wat b/tests/disas/i64-load8-u.wat
index 7e5fad3cba..3aa49760f8 100644
--- a/tests/disas/i64-load8-u.wat
+++ b/tests/disas/i64-load8-u.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-store.wat b/tests/disas/i64-store.wat
index b316f90f5d..a55b9b33d0 100644
--- a/tests/disas/i64-store.wat
+++ b/tests/disas/i64-store.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-store16.wat b/tests/disas/i64-store16.wat
index 28b414beb3..fba65aed7d 100644
--- a/tests/disas/i64-store16.wat
+++ b/tests/disas/i64-store16.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-store32.wat b/tests/disas/i64-store32.wat
index ae511bb0c4..ac5f28cbfd 100644
--- a/tests/disas/i64-store32.wat
+++ b/tests/disas/i64-store32.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/i64-store8.wat b/tests/disas/i64-store8.wat
index 30d29c5f8d..756086216b 100644
--- a/tests/disas/i64-store8.wat
+++ b/tests/disas/i64-store8.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/icall-loop.wat b/tests/disas/icall-loop.wat
index 74442cb427..892206bcf1 100644
--- a/tests/disas/icall-loop.wat
+++ b/tests/disas/icall-loop.wat
@@ -25,7 +25,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64) -> i32 tail
@@ -73,7 +73,7 @@
;; function u0:1(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64) -> i32 tail
diff --git a/tests/disas/icall-simd.wat b/tests/disas/icall-simd.wat
index c820284359..9066a3e340 100644
--- a/tests/disas/icall-simd.wat
+++ b/tests/disas/icall-simd.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64, i8x16) -> i8x16 tail
diff --git a/tests/disas/icall.wat b/tests/disas/icall.wat
index ae5822604c..c02c3c457f 100644
--- a/tests/disas/icall.wat
+++ b/tests/disas/icall.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i32, f32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64, f32) -> i32 tail
diff --git a/tests/disas/if-reachability-translation-0.wat b/tests/disas/if-reachability-translation-0.wat
index a19d8c8581..7172d9788b 100644
--- a/tests/disas/if-reachability-translation-0.wat
+++ b/tests/disas/if-reachability-translation-0.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/if-reachability-translation-1.wat b/tests/disas/if-reachability-translation-1.wat
index 41c8b4abcf..d2d0eda351 100644
--- a/tests/disas/if-reachability-translation-1.wat
+++ b/tests/disas/if-reachability-translation-1.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/if-reachability-translation-2.wat b/tests/disas/if-reachability-translation-2.wat
index 520df041b5..208fca857e 100644
--- a/tests/disas/if-reachability-translation-2.wat
+++ b/tests/disas/if-reachability-translation-2.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/if-reachability-translation-3.wat b/tests/disas/if-reachability-translation-3.wat
index feee290721..5c046bb4b4 100644
--- a/tests/disas/if-reachability-translation-3.wat
+++ b/tests/disas/if-reachability-translation-3.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/if-reachability-translation-4.wat b/tests/disas/if-reachability-translation-4.wat
index 245c92a040..8fbfb6447b 100644
--- a/tests/disas/if-reachability-translation-4.wat
+++ b/tests/disas/if-reachability-translation-4.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/if-reachability-translation-5.wat b/tests/disas/if-reachability-translation-5.wat
index 8f5a0117e4..380fe8cdf4 100644
--- a/tests/disas/if-reachability-translation-5.wat
+++ b/tests/disas/if-reachability-translation-5.wat
@@ -18,7 +18,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
diff --git a/tests/disas/if-reachability-translation-6.wat b/tests/disas/if-reachability-translation-6.wat
index 358e679a2f..285e03749b 100644
--- a/tests/disas/if-reachability-translation-6.wat
+++ b/tests/disas/if-reachability-translation-6.wat
@@ -18,7 +18,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
diff --git a/tests/disas/if-unreachable-else-params-2.wat b/tests/disas/if-unreachable-else-params-2.wat
index 00c8632e56..9ea6e9468b 100644
--- a/tests/disas/if-unreachable-else-params-2.wat
+++ b/tests/disas/if-unreachable-else-params-2.wat
@@ -22,7 +22,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> f64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/if-unreachable-else-params.wat b/tests/disas/if-unreachable-else-params.wat
index d40293fcfc..454cbf89b8 100644
--- a/tests/disas/if-unreachable-else-params.wat
+++ b/tests/disas/if-unreachable-else-params.wat
@@ -45,7 +45,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/indirect-call-no-caching.wat b/tests/disas/indirect-call-no-caching.wat
index a69e77623c..ca2a591dd9 100644
--- a/tests/disas/indirect-call-no-caching.wat
+++ b/tests/disas/indirect-call-no-caching.wat
@@ -23,7 +23,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -37,7 +37,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -51,7 +51,7 @@
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -65,7 +65,7 @@
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64) -> i32 tail
diff --git a/tests/disas/intra-module-inlining.wat b/tests/disas/intra-module-inlining.wat
index 88673d22b2..57749f97e1 100644
--- a/tests/disas/intra-module-inlining.wat
+++ b/tests/disas/intra-module-inlining.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -26,10 +26,10 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly gv3+8
-;; gv5 = load.i64 notrap aligned gv4+16
+;; gv5 = load.i64 notrap aligned gv4+24
;; sig0 = (i64 vmctx, i64) -> i32 tail
;; fn0 = colocated u0:0 sig0
;; stack_limit = gv2
diff --git a/tests/disas/issue-10929-v128-icmp-egraphs.wat b/tests/disas/issue-10929-v128-icmp-egraphs.wat
index f1e573e18c..8d906ef67d 100644
--- a/tests/disas/issue-10929-v128-icmp-egraphs.wat
+++ b/tests/disas/issue-10929-v128-icmp-egraphs.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i8x16):
diff --git a/tests/disas/issue-5696.wat b/tests/disas/issue-5696.wat
index f803d80b96..eee46097d0 100644
--- a/tests/disas/issue-5696.wat
+++ b/tests/disas/issue-5696.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64):
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index 18238927bf..3713784b42 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index da610585ba..807ef0c51c 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 9c3796673e..0fb86e47dc 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
index b35453d5ac..f2dd2b6e28 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index ef5db91b57..514005211a 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 3e716da31b..2738c93981 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
index 23d7b91cdf..2fa019b3f6 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 987e4e67fa..fd192faa8b 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -49,7 +49,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 5c1d903cab..a375141063 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -49,7 +49,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
index ad5296e4dd..a3d8d4f385 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 7a6c08714d..040bdc2b81 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -49,7 +49,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 4788175fa7..727d3707bc 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -49,7 +49,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index f1d2fb0e4b..2d732c19dc 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index edca58ecc1..071c1cee22 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index b16f64dc18..41f7f89e67 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 30d1e7b3dd..125600739e 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index d408bb7e19..5d2824ed8b 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 860d68019c..96b8d395de 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index c500b7e65b..a93bb3b251 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index cba7dd8dc0..ac4833e174 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 4c3dcf0d91..a6a4f03bb0 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index b08b6065a8..a32b008368 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index dd612fda85..5e07e71267 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 71df9fb20c..9eb8e9472b 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index 68501efd6d..994d02a987 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 53c2150f89..296d848771 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 83bf773dc6..41755f4136 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index c302344a4a..214e5d90f8 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index eba3d0232e..ed0426c812 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 966f9678de..2c064d2e54 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
index a79d5252f2..449ad49d14 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index b084358dbf..f1741d8e15 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index d0042f44c0..b50d7a0647 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
index c1a85fb703..643e9f8581 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 8b790b7544..328161faab 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 9853f6c1d9..bece38fa80 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -48,7 +48,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 20bb53b40b..ad335b91a3 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index ab4c231f79..f0655273d0 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 3007ba36e8..8d1d78d02c 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 70ff7ced8d..944309fbbe 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 8ca14bee95..ae400e92f2 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index c9d27bc39e..a019b57543 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index 0d2157c371..69d93bb9da 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index ca0327d39b..f7f6cfb150 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 4cd8a9d81b..ab74d87b80 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index d9dadf3172..c763f92fdc 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index 60da5a4fbe..60147188f4 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index c5a7828bce..d9f54721c8 100644
--- a/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index 61e4104d45..d90cfeca1b 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index a3ca369274..f18cc613ae 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 758797e003..98f6be8e30 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
index c63fa5bdec..5c5a3a57fc 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -41,7 +41,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index ca0d1329a2..e85f6b96b5 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 04c83f8b83..a79af65496 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
index 4709b6f80b..b605822063 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 4ba1cc2e7a..93645c3b0e 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index f200d312b0..3bf097d7c0 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
index 18d1f9fcb5..646bf35799 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -41,7 +41,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index e246ef68be..ec1caad015 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index dc61e3de96..79403464b8 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -47,7 +47,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index ab9007413c..b250b56d27 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -41,7 +41,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 0afc75c33b..41bd965cb7 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 0bc58ed527..d444296db2 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index a3e1b4b7f7..95124842c3 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -41,7 +41,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 01407b4e0a..53b3e64327 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 0ad51ab307..42aae9d8d4 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index 56fd8c8823..ee837786e1 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -41,7 +41,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 402d36af7f..2c655f91c3 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index bb09ad5dbb..07e1743a49 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index 864429cff8..4f293f188b 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -41,7 +41,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index e7830cd09a..566dffed4c 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index fb7ec29b2a..6dd973f723 100644
--- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index f0e3fd0484..b5ac229012 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 6d708e6bde..14e6cf687f 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 4fbe404de2..1be73a0a48 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index afbf12fcf3..b5064db26b 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 4a2f1c866f..e20654fd17 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 09e039c3d0..6c73ec808c 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
index 5d0792a67b..a384ecc9c3 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index dbed9b9cae..7e9edf0c0b 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 61ce676d32..7c1485b9e6 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
index ca7dd7a378..35462f7349 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 02175e0079..0cb1cd7f0c 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 7a2a7e70da..60ab0570cb 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 08a44be720..6bf2bbe9a1 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 4651d01c0c..98e530b2b1 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index b3b7493a86..652f639a57 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index c552550afa..f32b3e7074 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -43,7 +43,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index afc15a1838..5a823e9145 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 23c331e9af..525561563d 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -45,7 +45,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index c2068a4c5a..76ce54d057 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 418729c344..873a01a79b 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index e9dea6d634..263701d98a 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index b0928680ae..418e373477 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -44,7 +44,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index bc25f83bbb..42bac7b627 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 55b642db3c..8554b9b22f 100644
--- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index 97f194048c..7d2f692e8a 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index fc19f436f1..126d25aa01 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index faa702ee98..029395d23f 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -43,7 +43,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
index 25833322a8..08707d1192 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 4d9c757e4d..6995dbe147 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index ef7467b9ed..fcfdd59715 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -43,7 +43,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
index 3b03a50331..9b7464e25e 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index cc9d3a0615..091ba214b8 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -42,7 +42,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index d86bf4de90..ea8fd5288c 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -44,7 +44,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
index bf1c7aeb24..489224398c 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r9, %r15, 0x48(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 70b0824f0a..0092ff94ed 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -42,7 +42,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index bdca8b9263..44e214cd50 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -44,7 +44,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 866d4c56d8..486c049e29 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 9df90a3d09..28cae9ae49 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 3d3cf7798d..8b44d717b6 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 980237f9fb..b3b103dac5 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 8e71806d73..24a8d6d9fc 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index fed8c504c3..6e26403541 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index 5cb9573a15..a5ababf485 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r9, %r15, 0x48(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 9c8ad51b9e..ef00afabd8 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index f71c689f3c..b1e365e77e 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -44,7 +44,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index d8e8de3e37..3a600b12cc 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r9, %r15, 0x48(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index aed5f66a86..a9fce097c3 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 139bcbf750..ff7597bade 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -44,7 +44,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index 64b5f093b2..ca13fc96b9 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index fbc15f636b..92040dadb2 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 7597c7e91c..0a4cbfb263 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index 94c2f672c6..5c2f998e7b 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 2154a7cc4d..5e1504f741 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index e8064b23c3..95e1d75833 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
index 1a50239f1e..7685768ca2 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 7c67633580..1fd892d91d 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 6ea118fd97..de995926e0 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -43,7 +43,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
index 8a16b6191e..b6bb4768ee 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index ea7396d946..d9475da460 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 92635e7d07..06b29f4030 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -43,7 +43,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index dc0c999de1..22a35a1758 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 70516219f7..7971670a19 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index a89c44066a..6377d330d1 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 7e6aa338fd..fd850e4931 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 05ffe2252c..d98f86b8f7 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index a531a7a0ab..827290efa9 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index a8cbc1adf9..4ed6d1bad2 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 0ccc1f3513..b559c7322a 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index db71fb99da..6d0066b18b 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index 20d6934921..59d9d6c040 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index 3af3d365b9..e2e0cee776 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index be60beea5c..7b80efa1a5 100644
--- a/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index f337c1f83f..2135696718 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index daecf11244..85b8f5553d 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 228f5edfde..d4c1a2d0e7 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
index d4245a393e..2c85389388 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -35,7 +35,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 8f63b121d7..26a6762d00 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index c82e9b3a1c..189438612f 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
index c40aa8466a..4ea4955c26 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index 4869ac0cdd..ad44c4baba 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 19ee9b5380..c8469318a3 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
index 98ab03319b..9851d892bf 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -35,7 +35,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index b1449c9de6..c6d3e031cb 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index e891c7547c..c62b865039 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -41,7 +41,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 4fa183c67f..9cab85de36 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -35,7 +35,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index cc0fe627dd..62176a2207 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index f8f6c57011..fdfef2a089 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 4e3b9d97b7..4330ef6fad 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -35,7 +35,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index c761df012f..61e4063ff4 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index b665c3c34e..75bd25718f 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index e6e799ee3b..a4bf37f169 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -35,7 +35,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index f8f25f31fa..87a05c1af5 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 3c51f5b960..069fa3a178 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index 90c4cb01b1..a1b89395fd 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -35,7 +35,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index 23f6e640b1..d96d65a5c2 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 9c9aabb57a..e7e6d0c57a 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index e69adbc754..8ff93de5e1 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 398972b671..a0206196af 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 4bdb730075..042b68893a 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index 2ea624614e..eeeea78da3 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 6494cfa2e2..0b821c8708 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 498e774ef3..6af33ad0bb 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
index a13dda8971..ce7fdabce6 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
index d6c1b01d10..4678d93e05 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 9f616e62b4..b7fcb65789 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
index ddf161f3af..6baf1d9acd 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
index 3904c3a00c..f4ad401530 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 1af8c157eb..8377da665f 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 2b91523e04..a5e16ce752 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 60a60fc709..038a6a6388 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index df0fe1e426..51a4e64547 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index da53b616b1..6c53af79a1 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -36,7 +36,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 375399a930..ee9c6adaa0 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 1d1284745b..8fec3d258f 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -37,7 +37,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index a9d12236bf..65c06c499a 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
index 8b384bca7f..e6c1878b7a 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index e0189bbfb4..f991ba7d24 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index 37205b2dbb..41adac7f64 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -38,7 +38,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
index 49439e0259..661674159d 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -39,7 +39,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 15572f6b06..c0a1812909 100644
--- a/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/s390x/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -20,7 +20,7 @@
;; wasm[0]::function[0]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -40,7 +40,7 @@
;;
;; wasm[0]::function[1]:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/memory-min-max-same.wat b/tests/disas/memory-min-max-same.wat
index 75d433e74d..fc4e33d929 100644
--- a/tests/disas/memory-min-max-same.wat
+++ b/tests/disas/memory-min-max-same.wat
@@ -36,7 +36,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/memory.wat b/tests/disas/memory.wat
index bcf61b1f98..802200ad2c 100644
--- a/tests/disas/memory.wat
+++ b/tests/disas/memory.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/multi-0.wat b/tests/disas/multi-0.wat
index 91c65e7a67..355a28b394 100644
--- a/tests/disas/multi-0.wat
+++ b/tests/disas/multi-0.wat
@@ -7,7 +7,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64):
diff --git a/tests/disas/multi-1.wat b/tests/disas/multi-1.wat
index e1c064ca24..20f55253a1 100644
--- a/tests/disas/multi-1.wat
+++ b/tests/disas/multi-1.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32, i64, f64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i32):
diff --git a/tests/disas/multi-10.wat b/tests/disas/multi-10.wat
index 54956d9923..491b4108e3 100644
--- a/tests/disas/multi-10.wat
+++ b/tests/disas/multi-10.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i32):
diff --git a/tests/disas/multi-11.wat b/tests/disas/multi-11.wat
index d43648803d..44805bd3ee 100644
--- a/tests/disas/multi-11.wat
+++ b/tests/disas/multi-11.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64):
diff --git a/tests/disas/multi-12.wat b/tests/disas/multi-12.wat
index e1c78e6e70..d68b478ba3 100644
--- a/tests/disas/multi-12.wat
+++ b/tests/disas/multi-12.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64):
diff --git a/tests/disas/multi-13.wat b/tests/disas/multi-13.wat
index 2f002f90b8..203a4a96aa 100644
--- a/tests/disas/multi-13.wat
+++ b/tests/disas/multi-13.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
diff --git a/tests/disas/multi-14.wat b/tests/disas/multi-14.wat
index bc5b320bab..6fe45c17a3 100644
--- a/tests/disas/multi-14.wat
+++ b/tests/disas/multi-14.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32):
diff --git a/tests/disas/multi-15.wat b/tests/disas/multi-15.wat
index 100a7dc69e..832847006d 100644
--- a/tests/disas/multi-15.wat
+++ b/tests/disas/multi-15.wat
@@ -26,7 +26,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64, f32, f32, i32, f64, f32, i32, i32, i32, f32, f64, f64, f64, i32, i32, f32) -> f64, f32, i32, i32, i32, i64, f32, i32, i32, f32, f64, f64, i32, f32, i32, f64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i64, v4: f32, v5: f32, v6: i32, v7: f64, v8: f32, v9: i32, v10: i32, v11: i32, v12: f32, v13: f64, v14: f64, v15: f64, v16: i32, v17: i32, v18: f32):
diff --git a/tests/disas/multi-16.wat b/tests/disas/multi-16.wat
index cff6ac5185..cb60532c64 100644
--- a/tests/disas/multi-16.wat
+++ b/tests/disas/multi-16.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/multi-17.wat b/tests/disas/multi-17.wat
index 3379b7c08d..2c3b537c27 100644
--- a/tests/disas/multi-17.wat
+++ b/tests/disas/multi-17.wat
@@ -30,7 +30,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; sig0 = (i64 vmctx, i64, i32, i32, i32) -> i32 tail
;; fn0 = colocated u0:0 sig0
;; stack_limit = gv2
diff --git a/tests/disas/multi-2.wat b/tests/disas/multi-2.wat
index 1781239d04..281c2ef779 100644
--- a/tests/disas/multi-2.wat
+++ b/tests/disas/multi-2.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i64, i64) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64):
diff --git a/tests/disas/multi-3.wat b/tests/disas/multi-3.wat
index 631a7cd242..228660680c 100644
--- a/tests/disas/multi-3.wat
+++ b/tests/disas/multi-3.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64, i64) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i64, v4: i64):
diff --git a/tests/disas/multi-4.wat b/tests/disas/multi-4.wat
index 534837f784..e1a1e7893e 100644
--- a/tests/disas/multi-4.wat
+++ b/tests/disas/multi-4.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64, i64) -> i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i64, v4: i64):
diff --git a/tests/disas/multi-5.wat b/tests/disas/multi-5.wat
index 81384fb5da..f091f98b92 100644
--- a/tests/disas/multi-5.wat
+++ b/tests/disas/multi-5.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/multi-6.wat b/tests/disas/multi-6.wat
index 099cc67494..3ce038baaf 100644
--- a/tests/disas/multi-6.wat
+++ b/tests/disas/multi-6.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/multi-7.wat b/tests/disas/multi-7.wat
index ee691fa7c6..de2138d0fc 100644
--- a/tests/disas/multi-7.wat
+++ b/tests/disas/multi-7.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i32):
diff --git a/tests/disas/multi-8.wat b/tests/disas/multi-8.wat
index 11f2d4fd76..b32a53998f 100644
--- a/tests/disas/multi-8.wat
+++ b/tests/disas/multi-8.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i32):
diff --git a/tests/disas/multi-9.wat b/tests/disas/multi-9.wat
index dcc0dfb390..55f15287dd 100644
--- a/tests/disas/multi-9.wat
+++ b/tests/disas/multi-9.wat
@@ -19,7 +19,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i32):
diff --git a/tests/disas/non-fixed-size-memory.wat b/tests/disas/non-fixed-size-memory.wat
index 179336f349..a21e2a9539 100644
--- a/tests/disas/non-fixed-size-memory.wat
+++ b/tests/disas/non-fixed-size-memory.wat
@@ -23,7 +23,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned can_move checked gv3+56
diff --git a/tests/disas/nullref.wat b/tests/disas/nullref.wat
index 9dff438df0..91ead14c55 100644
--- a/tests/disas/nullref.wat
+++ b/tests/disas/nullref.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -29,7 +29,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/passive-data.wat b/tests/disas/passive-data.wat
index c0f20e442f..576e6f408d 100644
--- a/tests/disas/passive-data.wat
+++ b/tests/disas/passive-data.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -38,7 +38,7 @@
;; function u0:1(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32) -> i8 tail
;; fn0 = colocated u805306368:8 sig0
diff --git a/tests/disas/pr2303.wat b/tests/disas/pr2303.wat
index 03849ca76f..28d43a5180 100644
--- a/tests/disas/pr2303.wat
+++ b/tests/disas/pr2303.wat
@@ -19,7 +19,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/pr2559.wat b/tests/disas/pr2559.wat
index c3ea9a9c90..5f66e5d7f2 100644
--- a/tests/disas/pr2559.wat
+++ b/tests/disas/pr2559.wat
@@ -55,7 +55,7 @@
;; function u0:0(i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; sig0 = (i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail
;; fn0 = colocated u0:0 sig0
;; stack_limit = gv2
@@ -95,7 +95,7 @@
;; function u0:1(i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; sig0 = (i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail
;; fn0 = colocated u0:1 sig0
;; stack_limit = gv2
diff --git a/tests/disas/pulley-entry-trampoline.wat b/tests/disas/pulley-entry-trampoline.wat
index a4c3848bc8..1b87bbb44b 100644
--- a/tests/disas/pulley-entry-trampoline.wat
+++ b/tests/disas/pulley-entry-trampoline.wat
@@ -8,11 +8,11 @@
;; push_frame_save 128, x16, x17, x18, x19, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, sp, spilltmp0
;; xload64le_o32 x11, x0, 8
;; xmov_fp x12
-;; xstore64le_o32 x11, 64, x12
+;; xstore64le_o32 x11, 72, x12
;; xmov x12, sp
-;; xstore64le_o32 x11, 56, x12
+;; xstore64le_o32 x11, 64, x12
;; xpcadd x13, 0x1c // target = 0x40
-;; xstore64le_o32 x11, 72, x13
+;; xstore64le_o32 x11, 80, x13
;; call -0x33 // target = 0x0
;; ├─╼ exception frame offset: SP = FP - 0x80
;; ╰─╼ exception handler: default handler, no dynamic context, handler=0x40
diff --git a/tests/disas/readonly-funcrefs.wat b/tests/disas/readonly-funcrefs.wat
index d9300bb09e..7b48c46313 100644
--- a/tests/disas/readonly-funcrefs.wat
+++ b/tests/disas/readonly-funcrefs.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -34,7 +34,7 @@
;; function u0:1(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64) tail
diff --git a/tests/disas/readonly-heap-base-pointer1.wat b/tests/disas/readonly-heap-base-pointer1.wat
index 0a75c9b547..a5b928417b 100644
--- a/tests/disas/readonly-heap-base-pointer1.wat
+++ b/tests/disas/readonly-heap-base-pointer1.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/readonly-heap-base-pointer2.wat b/tests/disas/readonly-heap-base-pointer2.wat
index 6c2ede6e53..2c58fd0cb7 100644
--- a/tests/disas/readonly-heap-base-pointer2.wat
+++ b/tests/disas/readonly-heap-base-pointer2.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; gv5 = load.i64 notrap aligned gv4+8
diff --git a/tests/disas/readonly-heap-base-pointer3.wat b/tests/disas/readonly-heap-base-pointer3.wat
index ca5541c166..71f250663d 100644
--- a/tests/disas/readonly-heap-base-pointer3.wat
+++ b/tests/disas/readonly-heap-base-pointer3.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/ref-func-0.wat b/tests/disas/ref-func-0.wat
index 8ebbadbf79..486d5d628b 100644
--- a/tests/disas/ref-func-0.wat
+++ b/tests/disas/ref-func-0.wat
@@ -16,11 +16,11 @@
;; function u0:0(i64 vmctx, i64) -> i32, i32, i64, i64 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv5 = load.i64 notrap aligned readonly can_move gv4+24
-;; gv6 = load.i64 notrap aligned gv4+32
+;; gv5 = load.i64 notrap aligned readonly can_move gv4+32
+;; gv6 = load.i64 notrap aligned gv4+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -38,7 +38,7 @@
;; block2:
;; @008f v13 = uextend.i64 v8
;; @008f v109 = load.i64 notrap aligned readonly can_move v0+8
-;; @008f v14 = load.i64 notrap aligned readonly can_move v109+24
+;; @008f v14 = load.i64 notrap aligned readonly can_move v109+32
;; @008f v15 = iadd v14, v13
;; @008f v16 = load.i32 notrap aligned v15
;; @008f v17 = iconst.i32 2
@@ -50,7 +50,7 @@
;; @008f v21 = load.i32 notrap aligned v20
;; @008f v22 = uextend.i64 v8
;; @008f v107 = load.i64 notrap aligned readonly can_move v0+8
-;; @008f v23 = load.i64 notrap aligned readonly can_move v107+24
+;; @008f v23 = load.i64 notrap aligned readonly can_move v107+32
;; @008f v24 = iadd v23, v22
;; @008f v25 = iconst.i64 16
;; @008f v26 = iadd v24, v25 ; v25 = 16
@@ -59,12 +59,12 @@
;; @008f v28 = bor.i32 v16, v27 ; v27 = 2
;; @008f v29 = uextend.i64 v8
;; @008f v105 = load.i64 notrap aligned readonly can_move v0+8
-;; @008f v30 = load.i64 notrap aligned readonly can_move v105+24
+;; @008f v30 = load.i64 notrap aligned readonly can_move v105+32
;; @008f v31 = iadd v30, v29
;; @008f store notrap aligned v28, v31
;; @008f v32 = uextend.i64 v8
;; @008f v103 = load.i64 notrap aligned readonly can_move v0+8
-;; @008f v33 = load.i64 notrap aligned readonly can_move v103+24
+;; @008f v33 = load.i64 notrap aligned readonly can_move v103+32
;; @008f v34 = iadd v33, v32
;; @008f v35 = iconst.i64 8
;; @008f v36 = iadd v34, v35 ; v35 = 8
@@ -73,7 +73,7 @@
;; @008f v38 = iadd v37, v102 ; v102 = 1
;; @008f v39 = uextend.i64 v8
;; @008f v100 = load.i64 notrap aligned readonly can_move v0+8
-;; @008f v40 = load.i64 notrap aligned readonly can_move v100+24
+;; @008f v40 = load.i64 notrap aligned readonly can_move v100+32
;; @008f v41 = iadd v40, v39
;; @008f v42 = iconst.i64 8
;; @008f v43 = iadd v41, v42 ; v42 = 8
@@ -96,7 +96,7 @@
;; block5:
;; @0091 v51 = uextend.i64 v46
;; @0091 v95 = load.i64 notrap aligned readonly can_move v0+8
-;; @0091 v52 = load.i64 notrap aligned readonly can_move v95+24
+;; @0091 v52 = load.i64 notrap aligned readonly can_move v95+32
;; @0091 v53 = iadd v52, v51
;; @0091 v54 = load.i32 notrap aligned v53
;; @0091 v55 = iconst.i32 2
@@ -108,7 +108,7 @@
;; @0091 v59 = load.i32 notrap aligned v58
;; @0091 v60 = uextend.i64 v46
;; @0091 v93 = load.i64 notrap aligned readonly can_move v0+8
-;; @0091 v61 = load.i64 notrap aligned readonly can_move v93+24
+;; @0091 v61 = load.i64 notrap aligned readonly can_move v93+32
;; @0091 v62 = iadd v61, v60
;; @0091 v63 = iconst.i64 16
;; @0091 v64 = iadd v62, v63 ; v63 = 16
@@ -117,12 +117,12 @@
;; @0091 v66 = bor.i32 v54, v65 ; v65 = 2
;; @0091 v67 = uextend.i64 v46
;; @0091 v91 = load.i64 notrap aligned readonly can_move v0+8
-;; @0091 v68 = load.i64 notrap aligned readonly can_move v91+24
+;; @0091 v68 = load.i64 notrap aligned readonly can_move v91+32
;; @0091 v69 = iadd v68, v67
;; @0091 store notrap aligned v66, v69
;; @0091 v70 = uextend.i64 v46
;; @0091 v89 = load.i64 notrap aligned readonly can_move v0+8
-;; @0091 v71 = load.i64 notrap aligned readonly can_move v89+24
+;; @0091 v71 = load.i64 notrap aligned readonly can_move v89+32
;; @0091 v72 = iadd v71, v70
;; @0091 v73 = iconst.i64 8
;; @0091 v74 = iadd v72, v73 ; v73 = 8
@@ -131,7 +131,7 @@
;; @0091 v76 = iadd v75, v88 ; v88 = 1
;; @0091 v77 = uextend.i64 v46
;; @0091 v86 = load.i64 notrap aligned readonly can_move v0+8
-;; @0091 v78 = load.i64 notrap aligned readonly can_move v86+24
+;; @0091 v78 = load.i64 notrap aligned readonly can_move v86+32
;; @0091 v79 = iadd v78, v77
;; @0091 v80 = iconst.i64 8
;; @0091 v81 = iadd v79, v80 ; v80 = 8
diff --git a/tests/disas/riscv64-component-builtins-asm.wat b/tests/disas/riscv64-component-builtins-asm.wat
index 9bc5c184b4..3ee1b839fd 100644
--- a/tests/disas/riscv64-component-builtins-asm.wat
+++ b/tests/disas/riscv64-component-builtins-asm.wat
@@ -22,9 +22,9 @@
;; mv a7, a2
;; ld a1, 0x10(a0)
;; mv a2, s0
-;; sd a2, 0x28(a1)
-;; ld a2, 8(s0)
;; sd a2, 0x30(a1)
+;; ld a2, 8(s0)
+;; sd a2, 0x38(a1)
;; lw a2, 0x20(a0)
;; andi a2, a2, 1
;; bnez a2, 8
diff --git a/tests/disas/riscv64-component-builtins.wat b/tests/disas/riscv64-component-builtins.wat
index 00d44db611..e6d01af8c8 100644
--- a/tests/disas/riscv64-component-builtins.wat
+++ b/tests/disas/riscv64-component-builtins.wat
@@ -17,9 +17,9 @@
;; block0(v0: i64, v1: i64, v2: i32):
;; v3 = load.i64 notrap aligned v0+16
;; v4 = get_frame_pointer.i64
-;; store notrap aligned v4, v3+40
+;; store notrap aligned v4, v3+48
;; v5 = get_return_address.i64
-;; store notrap aligned v5, v3+48
+;; store notrap aligned v5, v3+56
;; v6 = load.i32 notrap aligned v0+32
;; v17 = iconst.i32 1
;; v7 = band v6, v17 ; v17 = 1
diff --git a/tests/disas/riscv64-entry-trampoline.wat b/tests/disas/riscv64-entry-trampoline.wat
index af4d4fec67..5b789b9d6f 100644
--- a/tests/disas/riscv64-entry-trampoline.wat
+++ b/tests/disas/riscv64-entry-trampoline.wat
@@ -35,12 +35,12 @@
;; fsd fs11, 8(sp)
;; ld a5, 8(a0)
;; mv a2, s0
-;; sd a2, 0x40(a5)
+;; sd a2, 0x48(a5)
;; mv a2, sp
-;; sd a2, 0x38(a5)
+;; sd a2, 0x40(a5)
;; auipc a2, 0
;; addi a2, a2, 0x88
-;; sd a2, 0x48(a5)
+;; sd a2, 0x50(a5)
;; auipc ra, 0
;; jalr ra, ra, -0xb0
;; ├─╼ exception frame offset: SP = FP - 0xc0
diff --git a/tests/disas/s390x-entry-trampoline.wat b/tests/disas/s390x-entry-trampoline.wat
index b390876a66..142100da8c 100644
--- a/tests/disas/s390x-entry-trampoline.wat
+++ b/tests/disas/s390x-entry-trampoline.wat
@@ -19,11 +19,11 @@
;; std %f15, 0xd8(%r15)
;; lg %r5, 8(%r2)
;; lg %r4, 0(%r15)
-;; stg %r4, 0x40(%r5)
+;; stg %r4, 0x48(%r5)
;; lgr %r4, %r15
-;; stg %r4, 0x38(%r5)
+;; stg %r4, 0x40(%r5)
;; larl %r4, 0xbe
-;; stg %r4, 0x48(%r5)
+;; stg %r4, 0x50(%r5)
;; brasl %r14, 0
;; ├─╼ exception frame offset: SP = FP - 0xe0
;; ╰─╼ exception handler: default handler, no dynamic context, handler=0xbe
diff --git a/tests/disas/s390x-wide-arithmetic.wat b/tests/disas/s390x-wide-arithmetic.wat
index 817a2302e3..066100ad0b 100644
--- a/tests/disas/s390x-wide-arithmetic.wat
+++ b/tests/disas/s390x-wide-arithmetic.wat
@@ -46,7 +46,7 @@
;; wasm[0]::function[0]::add128:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -63,7 +63,7 @@
;;
;; wasm[0]::function[1]::sub128:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -80,7 +80,7 @@
;;
;; wasm[0]::function[2]::signed:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -96,7 +96,7 @@
;;
;; wasm[0]::function[3]::unsigned:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -113,7 +113,7 @@
;;
;; wasm[0]::function[4]::signed_only_high:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
@@ -129,7 +129,7 @@
;;
;; wasm[0]::function[5]::unsigned_only_high:
;; lg %r1, 8(%r2)
-;; lg %r1, 0x10(%r1)
+;; lg %r1, 0x18(%r1)
;; la %r1, 0xa0(%r1)
;; clgrtle %r15, %r1
;; stmg %r14, %r15, 0x70(%r15)
diff --git a/tests/disas/select.wat b/tests/disas/select.wat
index d974c93ce9..16b6ad8798 100644
--- a/tests/disas/select.wat
+++ b/tests/disas/select.wat
@@ -23,7 +23,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -40,7 +40,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -57,7 +57,7 @@
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
diff --git a/tests/disas/simd-store.wat b/tests/disas/simd-store.wat
index 20409b9172..14fee31d9f 100644
--- a/tests/disas/simd-store.wat
+++ b/tests/disas/simd-store.wat
@@ -87,7 +87,7 @@
;; function u0:0(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -109,7 +109,7 @@
;; function u0:10(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -133,7 +133,7 @@
;; function u0:11(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -157,7 +157,7 @@
;; function u0:12(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -179,7 +179,7 @@
;; function u0:13(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -203,7 +203,7 @@
;; function u0:14(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -227,7 +227,7 @@
;; function u0:15(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -249,7 +249,7 @@
;; function u0:16(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -273,7 +273,7 @@
;; function u0:17(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -297,7 +297,7 @@
;; function u0:18(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -321,7 +321,7 @@
;; function u0:19(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -343,7 +343,7 @@
;; function u0:1(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -367,7 +367,7 @@
;; function u0:20(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -391,7 +391,7 @@
;; function u0:21(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -415,7 +415,7 @@
;; function u0:22(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -439,7 +439,7 @@
;; function u0:23(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -463,7 +463,7 @@
;; function u0:24(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -487,7 +487,7 @@
;; function u0:25(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -511,7 +511,7 @@
;; function u0:26(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -535,7 +535,7 @@
;; function u0:27(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -559,7 +559,7 @@
;; function u0:28(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -583,7 +583,7 @@
;; function u0:29(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -607,7 +607,7 @@
;; function u0:2(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -631,7 +631,7 @@
;; function u0:30(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -655,7 +655,7 @@
;; function u0:31(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -679,7 +679,7 @@
;; function u0:32(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -703,7 +703,7 @@
;; function u0:33(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -727,7 +727,7 @@
;; function u0:3(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -751,7 +751,7 @@
;; function u0:4(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -773,7 +773,7 @@
;; function u0:5(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -797,7 +797,7 @@
;; function u0:6(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -821,7 +821,7 @@
;; function u0:7(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -845,7 +845,7 @@
;; function u0:8(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
@@ -867,7 +867,7 @@
;; function u0:9(i64 vmctx, i64, i8x16) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+64
;; gv5 = load.i64 notrap aligned readonly can_move checked gv3+56
diff --git a/tests/disas/simd.wat b/tests/disas/simd.wat
index cac0e7ae9d..eaa35dbef6 100644
--- a/tests/disas/simd.wat
+++ b/tests/disas/simd.wat
@@ -33,7 +33,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -49,7 +49,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; const0 = 0x00000000000000000000000000000000
;; stack_limit = gv2
;;
@@ -68,7 +68,7 @@
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; const0 = 0x00000004000000030000000200000001
;; stack_limit = gv2
;;
@@ -85,7 +85,7 @@
;; function u0:3(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; const0 = 0x00000000000000000000000000000000
;; stack_limit = gv2
;;
diff --git a/tests/disas/simple.wat b/tests/disas/simple.wat
index a1f917d941..7fb9a43bc5 100644
--- a/tests/disas/simple.wat
+++ b/tests/disas/simple.wat
@@ -21,7 +21,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -36,7 +36,7 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -48,7 +48,7 @@
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/stack-switching/resume-suspend-data-passing.wat b/tests/disas/stack-switching/resume-suspend-data-passing.wat
index 95d4d42a70..4ab1455b7e 100644
--- a/tests/disas/stack-switching/resume-suspend-data-passing.wat
+++ b/tests/disas/stack-switching/resume-suspend-data-passing.wat
@@ -41,7 +41,7 @@
;; ss0 = explicit_slot 16, align = 65536
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
@@ -58,8 +58,8 @@
;;
;; block2(v4: i32):
;; @0044 v8 = load.i64 notrap aligned v0+8
-;; @0044 v9 = load.i64 notrap aligned v8+80
-;; @0044 v10 = load.i64 notrap aligned v8+88
+;; @0044 v9 = load.i64 notrap aligned v8+88
+;; @0044 v10 = load.i64 notrap aligned v8+96
;; v65 = iconst.i64 1
;; v64 = iconst.i64 24
;; @003a v2 = iconst.i32 0
@@ -148,7 +148,7 @@
;; ss0 = explicit_slot 8, align = 256
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32) -> i64 tail
;; sig1 = (i64 vmctx, i64, i32, i32) -> i64 tail
@@ -200,16 +200,16 @@
;; @0062 store notrap aligned v131, v18+72
;; @0062 v24 = load.i64 notrap aligned v18+64
;; @0062 v25 = load.i64 notrap aligned v0+8
-;; @0062 v26 = load.i64 notrap aligned v25+80
-;; @0062 v27 = load.i64 notrap aligned v25+88
+;; @0062 v26 = load.i64 notrap aligned v25+88
+;; @0062 v27 = load.i64 notrap aligned v25+96
;; @0062 store notrap aligned v26, v24+48
;; @0062 store notrap aligned v27, v24+56
;; v132 = iconst.i64 0
;; @0062 store notrap aligned v132, v18+64 ; v132 = 0
;; @0062 v30 = load.i64 notrap aligned v0+8
;; v133 = iconst.i64 2
-;; @0062 store notrap aligned v133, v30+80 ; v133 = 2
-;; @0062 store notrap aligned v18, v30+88
+;; @0062 store notrap aligned v133, v30+88 ; v133 = 2
+;; @0062 store notrap aligned v18, v30+96
;; v134 = iconst.i32 1
;; v135 = iconst.i64 16
;; v136 = iadd v18, v135 ; v135 = 16
@@ -218,14 +218,14 @@
;; v138 = iadd v27, v135 ; v135 = 16
;; @0062 store notrap aligned v137, v138 ; v137 = 2
;; @0062 v36 = load.i64 notrap aligned readonly v0+8
-;; @0062 v38 = load.i64 notrap aligned v36+64
+;; @0062 v38 = load.i64 notrap aligned v36+72
;; @0062 store notrap aligned v38, v27+8
-;; @0062 v39 = load.i64 notrap aligned v36+16
+;; @0062 v39 = load.i64 notrap aligned v36+24
;; @0062 store notrap aligned v39, v27
;; @0062 v41 = load.i64 notrap aligned v18
-;; @0062 store notrap aligned v41, v36+16
+;; @0062 store notrap aligned v41, v36+24
;; @0062 v42 = load.i64 notrap aligned v18+8
-;; @0062 store notrap aligned v42, v36+64
+;; @0062 store notrap aligned v42, v36+72
;; v139 = iconst.i64 24
;; v140 = iadd v27, v139 ; v139 = 24
;; @0062 store notrap aligned v134, v140+4 ; v134 = 1
@@ -242,10 +242,10 @@
;; v146 = iconst.i64 0x0001_0000_0000
;; @0062 v56 = stack_switch v145, v145, v146 ; v146 = 0x0001_0000_0000
;; @0062 v57 = load.i64 notrap aligned v0+8
-;; @0062 v58 = load.i64 notrap aligned v57+80
-;; @0062 v59 = load.i64 notrap aligned v57+88
-;; @0062 store notrap aligned v26, v57+80
-;; @0062 store notrap aligned v27, v57+88
+;; @0062 v58 = load.i64 notrap aligned v57+88
+;; @0062 v59 = load.i64 notrap aligned v57+96
+;; @0062 store notrap aligned v26, v57+88
+;; @0062 store notrap aligned v27, v57+96
;; @0062 store notrap aligned v134, v138 ; v134 = 1
;; v147 = iconst.i32 0
;; @0062 store notrap aligned v147, v140 ; v147 = 0
@@ -257,12 +257,12 @@
;; @0062 brif v149, block7, block6
;;
;; block7:
-;; @0062 v69 = load.i64 notrap aligned v36+64
+;; @0062 v69 = load.i64 notrap aligned v36+72
;; @0062 store notrap aligned v69, v59+8
;; @0062 v71 = load.i64 notrap aligned v27
-;; @0062 store notrap aligned v71, v36+16
+;; @0062 store notrap aligned v71, v36+24
;; @0062 v72 = load.i64 notrap aligned v27+8
-;; @0062 store notrap aligned v72, v36+64
+;; @0062 store notrap aligned v72, v36+72
;; @0062 v74 = load.i64 notrap aligned v59+72
;; @0062 jump block8
;;
@@ -284,9 +284,9 @@
;;
;; block6:
;; @0062 v84 = load.i64 notrap aligned v27
-;; @0062 store notrap aligned v84, v36+16
+;; @0062 store notrap aligned v84, v36+24
;; @0062 v85 = load.i64 notrap aligned v27+8
-;; @0062 store notrap aligned v85, v36+64
+;; @0062 store notrap aligned v85, v36+72
;; @0062 v87 = iconst.i32 4
;; v150 = iconst.i64 16
;; v151 = iadd.i64 v59, v150 ; v150 = 16
diff --git a/tests/disas/stack-switching/resume-suspend.wat b/tests/disas/stack-switching/resume-suspend.wat
index 2600a0c36a..8e84fc3e0c 100644
--- a/tests/disas/stack-switching/resume-suspend.wat
+++ b/tests/disas/stack-switching/resume-suspend.wat
@@ -25,14 +25,14 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
;; @003b v5 = load.i64 notrap aligned v0+8
-;; @003b v6 = load.i64 notrap aligned v5+80
-;; @003b v7 = load.i64 notrap aligned v5+88
+;; @003b v6 = load.i64 notrap aligned v5+88
+;; @003b v7 = load.i64 notrap aligned v5+96
;; v54 = iconst.i64 1
;; v53 = iconst.i64 24
;; @003b v16 = iconst.i32 0
@@ -109,7 +109,7 @@
;; ss0 = explicit_slot 8, align = 256
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32) -> i64 tail
;; sig1 = (i64 vmctx, i64, i32, i32) -> i64 tail
@@ -144,16 +144,16 @@
;; @004e store notrap aligned v26, v138+72
;; @004e v27 = load.i64 notrap aligned v138+64
;; @004e v28 = load.i64 notrap aligned v0+8
-;; @004e v29 = load.i64 notrap aligned v28+80
-;; @004e v30 = load.i64 notrap aligned v28+88
+;; @004e v29 = load.i64 notrap aligned v28+88
+;; @004e v30 = load.i64 notrap aligned v28+96
;; @004e store notrap aligned v29, v27+48
;; @004e store notrap aligned v30, v27+56
;; @0040 v2 = iconst.i64 0
;; @004e store notrap aligned v2, v138+64 ; v2 = 0
;; @004e v33 = load.i64 notrap aligned v0+8
;; @004e v32 = iconst.i64 2
-;; @004e store notrap aligned v32, v33+80 ; v32 = 2
-;; @004e store notrap aligned v138, v33+88
+;; @004e store notrap aligned v32, v33+88 ; v32 = 2
+;; @004e store notrap aligned v138, v33+96
;; @004e v35 = iconst.i32 1
;; v123 = iconst.i64 16
;; @004e v36 = iadd v138, v123 ; v123 = 16
@@ -162,14 +162,14 @@
;; @004e v38 = iadd v30, v123 ; v123 = 16
;; @004e store notrap aligned v37, v38 ; v37 = 2
;; @004e v39 = load.i64 notrap aligned readonly v0+8
-;; @004e v41 = load.i64 notrap aligned v39+64
+;; @004e v41 = load.i64 notrap aligned v39+72
;; @004e store notrap aligned v41, v30+8
-;; @004e v42 = load.i64 notrap aligned v39+16
+;; @004e v42 = load.i64 notrap aligned v39+24
;; @004e store notrap aligned v42, v30
;; @004e v44 = load.i64 notrap aligned v138
-;; @004e store notrap aligned v44, v39+16
+;; @004e store notrap aligned v44, v39+24
;; @004e v45 = load.i64 notrap aligned v138+8
-;; @004e store notrap aligned v45, v39+64
+;; @004e store notrap aligned v45, v39+72
;; v119 = iconst.i64 24
;; @004e v46 = iadd v30, v119 ; v119 = 24
;; @004e store notrap aligned v35, v46+4 ; v35 = 1
@@ -188,10 +188,10 @@
;; v142 = iconst.i64 0x0001_0000_0000
;; @004e v59 = stack_switch v58, v58, v142 ; v142 = 0x0001_0000_0000
;; @004e v60 = load.i64 notrap aligned v0+8
-;; @004e v61 = load.i64 notrap aligned v60+80
-;; @004e v62 = load.i64 notrap aligned v60+88
-;; @004e store notrap aligned v29, v60+80
-;; @004e store notrap aligned v30, v60+88
+;; @004e v61 = load.i64 notrap aligned v60+88
+;; @004e v62 = load.i64 notrap aligned v60+96
+;; @004e store notrap aligned v29, v60+88
+;; @004e store notrap aligned v30, v60+96
;; @004e store notrap aligned v35, v38 ; v35 = 1
;; v145 = iconst.i32 0
;; @004e store notrap aligned v145, v46 ; v145 = 0
@@ -203,12 +203,12 @@
;; @004e brif v69, block5, block4
;;
;; block5:
-;; @004e v72 = load.i64 notrap aligned v39+64
+;; @004e v72 = load.i64 notrap aligned v39+72
;; @004e store notrap aligned v72, v62+8
;; @004e v74 = load.i64 notrap aligned v30
-;; @004e store notrap aligned v74, v39+16
+;; @004e store notrap aligned v74, v39+24
;; @004e v75 = load.i64 notrap aligned v30+8
-;; @004e store notrap aligned v75, v39+64
+;; @004e store notrap aligned v75, v39+72
;; @004e v77 = load.i64 notrap aligned v62+72
;; @004e jump block6
;;
@@ -234,9 +234,9 @@
;;
;; block4:
;; @004e v86 = load.i64 notrap aligned v30
-;; @004e store notrap aligned v86, v39+16
+;; @004e store notrap aligned v86, v39+24
;; @004e v87 = load.i64 notrap aligned v30+8
-;; @004e store notrap aligned v87, v39+64
+;; @004e store notrap aligned v87, v39+72
;; @004e v89 = iconst.i32 4
;; v146 = iconst.i64 16
;; v147 = iadd.i64 v62, v146 ; v146 = 16
diff --git a/tests/disas/stack-switching/symmetric-switch.wat b/tests/disas/stack-switching/symmetric-switch.wat
index 8423e68e50..c1138303a5 100644
--- a/tests/disas/stack-switching/symmetric-switch.wat
+++ b/tests/disas/stack-switching/symmetric-switch.wat
@@ -29,7 +29,7 @@
;; ss0 = explicit_slot 24, align = 256
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32) -> i64 tail
;; sig1 = (i64 vmctx, i64, i32, i32) -> i64 tail
@@ -66,8 +66,8 @@
;; v134 = iconst.i64 48
;; @003e v22 = iadd v0, v134 ; v134 = 48
;; @003e v23 = load.i64 notrap aligned v0+8
-;; @003e v24 = load.i64 notrap aligned v23+80
-;; @003e v25 = load.i64 notrap aligned v23+88
+;; @003e v24 = load.i64 notrap aligned v23+88
+;; @003e v25 = load.i64 notrap aligned v23+96
;; @003e jump block2(v24, v25)
;;
;; block2(v26: i64, v27: i64):
@@ -118,7 +118,7 @@
;; @003e v49 = load.i64 notrap aligned readonly v0+8
;; v126 = iconst.i64 0
;; @003e v50 = iadd v44, v126 ; v126 = 0
-;; @003e v51 = load.i64 notrap aligned v49+64
+;; @003e v51 = load.i64 notrap aligned v49+72
;; @003e store notrap aligned v51, v50+8
;; @003e v52 = load.i64 notrap aligned v25+72
;; @003e v53 = uextend.i128 v25
@@ -177,14 +177,14 @@
;; @003e store.i64 notrap aligned v30, v79+56
;; @003e v80 = iconst.i64 2
;; @003e v81 = load.i64 notrap aligned v0+8
-;; @003e store notrap aligned v80, v81+80 ; v80 = 2
-;; @003e store.i64 notrap aligned v15, v81+88
+;; @003e store notrap aligned v80, v81+88 ; v80 = 2
+;; @003e store.i64 notrap aligned v15, v81+96
;; v112 = iconst.i64 0
;; @003e v82 = iadd v76, v112 ; v112 = 0
;; @003e v83 = load.i64 notrap aligned v82
-;; @003e store notrap aligned v83, v49+16
+;; @003e store notrap aligned v83, v49+24
;; @003e v84 = load.i64 notrap aligned v82+8
-;; @003e store notrap aligned v84, v49+64
+;; @003e store notrap aligned v84, v49+72
;; v111 = iconst.i64 80
;; @003e v85 = iadd.i64 v27, v111 ; v111 = 80
;; @003e v86 = load.i64 notrap aligned v85
@@ -230,7 +230,7 @@
;; function u0:1(i64 vmctx, i64, i128) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i128):
@@ -244,7 +244,7 @@
;; ss0 = explicit_slot 8, align = 256
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32) -> i64 tail
;; sig1 = (i64 vmctx, i64, i32, i32) -> i64 tail
@@ -283,16 +283,16 @@
;; @004b store notrap aligned v20, v15+72
;; @004b v21 = load.i64 notrap aligned v15+64
;; @004b v22 = load.i64 notrap aligned v0+8
-;; @004b v23 = load.i64 notrap aligned v22+80
-;; @004b v24 = load.i64 notrap aligned v22+88
+;; @004b v23 = load.i64 notrap aligned v22+88
+;; @004b v24 = load.i64 notrap aligned v22+96
;; @004b store notrap aligned v23, v21+48
;; @004b store notrap aligned v24, v21+56
;; @004b v25 = iconst.i64 0
;; @004b store notrap aligned v25, v15+64 ; v25 = 0
;; @004b v26 = iconst.i64 2
;; @004b v27 = load.i64 notrap aligned v0+8
-;; @004b store notrap aligned v26, v27+80 ; v26 = 2
-;; @004b store notrap aligned v15, v27+88
+;; @004b store notrap aligned v26, v27+88 ; v26 = 2
+;; @004b store notrap aligned v15, v27+96
;; v107 = iconst.i64 0
;; @004b v28 = iadd v15, v107 ; v107 = 0
;; @004b v29 = iconst.i32 1
@@ -306,16 +306,16 @@
;; @004b v33 = load.i64 notrap aligned readonly v0+8
;; v104 = iconst.i64 0
;; @004b v34 = iadd v24, v104 ; v104 = 0
-;; @004b v35 = load.i64 notrap aligned v33+64
+;; @004b v35 = load.i64 notrap aligned v33+72
;; @004b store notrap aligned v35, v34+8
-;; @004b v36 = load.i64 notrap aligned v33+16
+;; @004b v36 = load.i64 notrap aligned v33+24
;; @004b store notrap aligned v36, v34
;; v103 = iconst.i64 0
;; @004b v37 = iadd v28, v103 ; v103 = 0
;; @004b v38 = load.i64 notrap aligned v37
-;; @004b store notrap aligned v38, v33+16
+;; @004b store notrap aligned v38, v33+24
;; @004b v39 = load.i64 notrap aligned v37+8
-;; @004b store notrap aligned v39, v33+64
+;; @004b store notrap aligned v39, v33+72
;; v102 = iconst.i64 24
;; @004b v40 = iadd v24, v102 ; v102 = 24
;; @004b v41 = iconst.i32 1
@@ -340,11 +340,11 @@
;; @004b v52 = iadd v51, v98 ; v98 = -24
;; @004b v53 = stack_switch v52, v52, v49
;; @004b v54 = load.i64 notrap aligned v0+8
-;; @004b v55 = load.i64 notrap aligned v54+80
-;; @004b v56 = load.i64 notrap aligned v54+88
+;; @004b v55 = load.i64 notrap aligned v54+88
+;; @004b v56 = load.i64 notrap aligned v54+96
;; @004b v57 = load.i64 notrap aligned v0+8
-;; @004b store notrap aligned v23, v57+80
-;; @004b store notrap aligned v24, v57+88
+;; @004b store notrap aligned v23, v57+88
+;; @004b store notrap aligned v24, v57+96
;; @004b v58 = iconst.i32 1
;; v97 = iconst.i64 16
;; @004b v59 = iadd v24, v97 ; v97 = 16
@@ -365,14 +365,14 @@
;; @004b v64 = iadd.i64 v56, v95 ; v95 = 0
;; v94 = iconst.i64 0
;; @004b v65 = iadd v64, v94 ; v94 = 0
-;; @004b v66 = load.i64 notrap aligned v33+64
+;; @004b v66 = load.i64 notrap aligned v33+72
;; @004b store notrap aligned v66, v65+8
;; v93 = iconst.i64 0
;; @004b v67 = iadd.i64 v24, v93 ; v93 = 0
;; @004b v68 = load.i64 notrap aligned v67
-;; @004b store notrap aligned v68, v33+16
+;; @004b store notrap aligned v68, v33+24
;; @004b v69 = load.i64 notrap aligned v67+8
-;; @004b store notrap aligned v69, v33+64
+;; @004b store notrap aligned v69, v33+72
;; @004b v70 = ireduce.i32 v53
;; @004b v71 = load.i64 notrap aligned v56+72
;; @004b v72 = uextend.i128 v56
@@ -393,9 +393,9 @@
;; v90 = iconst.i64 0
;; @004b v76 = iadd.i64 v24, v90 ; v90 = 0
;; @004b v77 = load.i64 notrap aligned v76
-;; @004b store notrap aligned v77, v33+16
+;; @004b store notrap aligned v77, v33+24
;; @004b v78 = load.i64 notrap aligned v76+8
-;; @004b store notrap aligned v78, v33+64
+;; @004b store notrap aligned v78, v33+72
;; v89 = iconst.i64 0
;; @004b v79 = iadd.i64 v56, v89 ; v89 = 0
;; @004b v80 = iconst.i32 4
diff --git a/tests/disas/sub-global.wat b/tests/disas/sub-global.wat
index f31ce12d59..2a59855dba 100644
--- a/tests/disas/sub-global.wat
+++ b/tests/disas/sub-global.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; stack_limit = gv2
;;
diff --git a/tests/disas/table-copy.wat b/tests/disas/table-copy.wat
index 05dd9e62cd..8a32eb1a59 100644
--- a/tests/disas/table-copy.wat
+++ b/tests/disas/table-copy.wat
@@ -26,7 +26,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32, v6: i32, v7: i32):
@@ -39,7 +39,7 @@
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32, v6: i32, v7: i32):
@@ -52,7 +52,7 @@
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32, v6: i32, v7: i32):
@@ -65,7 +65,7 @@
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32, i32, i64, i64, i64) -> i8 tail
;; fn0 = colocated u805306368:1 sig0
@@ -87,7 +87,7 @@
;; function u0:4(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i32, i32, i64, i64, i64) -> i8 tail
;; fn0 = colocated u805306368:1 sig0
diff --git a/tests/disas/table-get-fixed-size.wat b/tests/disas/table-get-fixed-size.wat
index 1ab69dae32..fb858954c4 100644
--- a/tests/disas/table-get-fixed-size.wat
+++ b/tests/disas/table-get-fixed-size.wat
@@ -18,12 +18,12 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; gv5 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv6 = load.i64 notrap aligned readonly can_move gv5+24
-;; gv7 = load.i64 notrap aligned gv5+32
+;; gv6 = load.i64 notrap aligned readonly can_move gv5+32
+;; gv7 = load.i64 notrap aligned gv5+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -49,7 +49,7 @@
;; block2:
;; @0054 v17 = uextend.i64 v12
;; @0054 v57 = load.i64 notrap aligned readonly can_move v0+8
-;; @0054 v18 = load.i64 notrap aligned readonly can_move v57+24
+;; @0054 v18 = load.i64 notrap aligned readonly can_move v57+32
;; @0054 v19 = iadd v18, v17
;; @0054 v20 = load.i32 notrap aligned v19
;; @0054 v21 = iconst.i32 2
@@ -61,7 +61,7 @@
;; @0054 v25 = load.i32 notrap aligned v24
;; @0054 v26 = uextend.i64 v12
;; @0054 v55 = load.i64 notrap aligned readonly can_move v0+8
-;; @0054 v27 = load.i64 notrap aligned readonly can_move v55+24
+;; @0054 v27 = load.i64 notrap aligned readonly can_move v55+32
;; @0054 v28 = iadd v27, v26
;; @0054 v29 = iconst.i64 16
;; @0054 v30 = iadd v28, v29 ; v29 = 16
@@ -70,12 +70,12 @@
;; @0054 v32 = bor.i32 v20, v31 ; v31 = 2
;; @0054 v33 = uextend.i64 v12
;; @0054 v53 = load.i64 notrap aligned readonly can_move v0+8
-;; @0054 v34 = load.i64 notrap aligned readonly can_move v53+24
+;; @0054 v34 = load.i64 notrap aligned readonly can_move v53+32
;; @0054 v35 = iadd v34, v33
;; @0054 store notrap aligned v32, v35
;; @0054 v36 = uextend.i64 v12
;; @0054 v51 = load.i64 notrap aligned readonly can_move v0+8
-;; @0054 v37 = load.i64 notrap aligned readonly can_move v51+24
+;; @0054 v37 = load.i64 notrap aligned readonly can_move v51+32
;; @0054 v38 = iadd v37, v36
;; @0054 v39 = iconst.i64 8
;; @0054 v40 = iadd v38, v39 ; v39 = 8
@@ -84,7 +84,7 @@
;; @0054 v42 = iadd v41, v50 ; v50 = 1
;; @0054 v43 = uextend.i64 v12
;; @0054 v48 = load.i64 notrap aligned readonly can_move v0+8
-;; @0054 v44 = load.i64 notrap aligned readonly can_move v48+24
+;; @0054 v44 = load.i64 notrap aligned readonly can_move v48+32
;; @0054 v45 = iadd v44, v43
;; @0054 v46 = iconst.i64 8
;; @0054 v47 = iadd v45, v46 ; v46 = 8
@@ -102,12 +102,12 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; gv5 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv6 = load.i64 notrap aligned readonly can_move gv5+24
-;; gv7 = load.i64 notrap aligned gv5+32
+;; gv6 = load.i64 notrap aligned readonly can_move gv5+32
+;; gv7 = load.i64 notrap aligned gv5+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -132,7 +132,7 @@
;; block2:
;; @005b v17 = uextend.i64 v12
;; @005b v57 = load.i64 notrap aligned readonly can_move v0+8
-;; @005b v18 = load.i64 notrap aligned readonly can_move v57+24
+;; @005b v18 = load.i64 notrap aligned readonly can_move v57+32
;; @005b v19 = iadd v18, v17
;; @005b v20 = load.i32 notrap aligned v19
;; @005b v21 = iconst.i32 2
@@ -144,7 +144,7 @@
;; @005b v25 = load.i32 notrap aligned v24
;; @005b v26 = uextend.i64 v12
;; @005b v55 = load.i64 notrap aligned readonly can_move v0+8
-;; @005b v27 = load.i64 notrap aligned readonly can_move v55+24
+;; @005b v27 = load.i64 notrap aligned readonly can_move v55+32
;; @005b v28 = iadd v27, v26
;; @005b v29 = iconst.i64 16
;; @005b v30 = iadd v28, v29 ; v29 = 16
@@ -153,12 +153,12 @@
;; @005b v32 = bor.i32 v20, v31 ; v31 = 2
;; @005b v33 = uextend.i64 v12
;; @005b v53 = load.i64 notrap aligned readonly can_move v0+8
-;; @005b v34 = load.i64 notrap aligned readonly can_move v53+24
+;; @005b v34 = load.i64 notrap aligned readonly can_move v53+32
;; @005b v35 = iadd v34, v33
;; @005b store notrap aligned v32, v35
;; @005b v36 = uextend.i64 v12
;; @005b v51 = load.i64 notrap aligned readonly can_move v0+8
-;; @005b v37 = load.i64 notrap aligned readonly can_move v51+24
+;; @005b v37 = load.i64 notrap aligned readonly can_move v51+32
;; @005b v38 = iadd v37, v36
;; @005b v39 = iconst.i64 8
;; @005b v40 = iadd v38, v39 ; v39 = 8
@@ -167,7 +167,7 @@
;; @005b v42 = iadd v41, v50 ; v50 = 1
;; @005b v43 = uextend.i64 v12
;; @005b v48 = load.i64 notrap aligned readonly can_move v0+8
-;; @005b v44 = load.i64 notrap aligned readonly can_move v48+24
+;; @005b v44 = load.i64 notrap aligned readonly can_move v48+32
;; @005b v45 = iadd v44, v43
;; @005b v46 = iconst.i64 8
;; @005b v47 = iadd v45, v46 ; v46 = 8
diff --git a/tests/disas/table-get.wat b/tests/disas/table-get.wat
index ac6a1baa0e..8b807242be 100644
--- a/tests/disas/table-get.wat
+++ b/tests/disas/table-get.wat
@@ -17,13 +17,13 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+48
;; gv5 = load.i64 notrap aligned gv3+56
;; gv6 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv7 = load.i64 notrap aligned readonly can_move gv6+24
-;; gv8 = load.i64 notrap aligned gv6+32
+;; gv7 = load.i64 notrap aligned readonly can_move gv6+32
+;; gv8 = load.i64 notrap aligned gv6+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -50,7 +50,7 @@
;; block2:
;; @0053 v18 = uextend.i64 v13
;; @0053 v58 = load.i64 notrap aligned readonly can_move v0+8
-;; @0053 v19 = load.i64 notrap aligned readonly can_move v58+24
+;; @0053 v19 = load.i64 notrap aligned readonly can_move v58+32
;; @0053 v20 = iadd v19, v18
;; @0053 v21 = load.i32 notrap aligned v20
;; @0053 v22 = iconst.i32 2
@@ -62,7 +62,7 @@
;; @0053 v26 = load.i32 notrap aligned v25
;; @0053 v27 = uextend.i64 v13
;; @0053 v56 = load.i64 notrap aligned readonly can_move v0+8
-;; @0053 v28 = load.i64 notrap aligned readonly can_move v56+24
+;; @0053 v28 = load.i64 notrap aligned readonly can_move v56+32
;; @0053 v29 = iadd v28, v27
;; @0053 v30 = iconst.i64 16
;; @0053 v31 = iadd v29, v30 ; v30 = 16
@@ -71,12 +71,12 @@
;; @0053 v33 = bor.i32 v21, v32 ; v32 = 2
;; @0053 v34 = uextend.i64 v13
;; @0053 v54 = load.i64 notrap aligned readonly can_move v0+8
-;; @0053 v35 = load.i64 notrap aligned readonly can_move v54+24
+;; @0053 v35 = load.i64 notrap aligned readonly can_move v54+32
;; @0053 v36 = iadd v35, v34
;; @0053 store notrap aligned v33, v36
;; @0053 v37 = uextend.i64 v13
;; @0053 v52 = load.i64 notrap aligned readonly can_move v0+8
-;; @0053 v38 = load.i64 notrap aligned readonly can_move v52+24
+;; @0053 v38 = load.i64 notrap aligned readonly can_move v52+32
;; @0053 v39 = iadd v38, v37
;; @0053 v40 = iconst.i64 8
;; @0053 v41 = iadd v39, v40 ; v40 = 8
@@ -85,7 +85,7 @@
;; @0053 v43 = iadd v42, v51 ; v51 = 1
;; @0053 v44 = uextend.i64 v13
;; @0053 v49 = load.i64 notrap aligned readonly can_move v0+8
-;; @0053 v45 = load.i64 notrap aligned readonly can_move v49+24
+;; @0053 v45 = load.i64 notrap aligned readonly can_move v49+32
;; @0053 v46 = iadd v45, v44
;; @0053 v47 = iconst.i64 8
;; @0053 v48 = iadd v46, v47 ; v47 = 8
@@ -103,13 +103,13 @@
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+48
;; gv5 = load.i64 notrap aligned gv3+56
;; gv6 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv7 = load.i64 notrap aligned readonly can_move gv6+24
-;; gv8 = load.i64 notrap aligned gv6+32
+;; gv7 = load.i64 notrap aligned readonly can_move gv6+32
+;; gv8 = load.i64 notrap aligned gv6+40
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32):
@@ -135,7 +135,7 @@
;; block2:
;; @005a v18 = uextend.i64 v13
;; @005a v58 = load.i64 notrap aligned readonly can_move v0+8
-;; @005a v19 = load.i64 notrap aligned readonly can_move v58+24
+;; @005a v19 = load.i64 notrap aligned readonly can_move v58+32
;; @005a v20 = iadd v19, v18
;; @005a v21 = load.i32 notrap aligned v20
;; @005a v22 = iconst.i32 2
@@ -147,7 +147,7 @@
;; @005a v26 = load.i32 notrap aligned v25
;; @005a v27 = uextend.i64 v13
;; @005a v56 = load.i64 notrap aligned readonly can_move v0+8
-;; @005a v28 = load.i64 notrap aligned readonly can_move v56+24
+;; @005a v28 = load.i64 notrap aligned readonly can_move v56+32
;; @005a v29 = iadd v28, v27
;; @005a v30 = iconst.i64 16
;; @005a v31 = iadd v29, v30 ; v30 = 16
@@ -156,12 +156,12 @@
;; @005a v33 = bor.i32 v21, v32 ; v32 = 2
;; @005a v34 = uextend.i64 v13
;; @005a v54 = load.i64 notrap aligned readonly can_move v0+8
-;; @005a v35 = load.i64 notrap aligned readonly can_move v54+24
+;; @005a v35 = load.i64 notrap aligned readonly can_move v54+32
;; @005a v36 = iadd v35, v34
;; @005a store notrap aligned v33, v36
;; @005a v37 = uextend.i64 v13
;; @005a v52 = load.i64 notrap aligned readonly can_move v0+8
-;; @005a v38 = load.i64 notrap aligned readonly can_move v52+24
+;; @005a v38 = load.i64 notrap aligned readonly can_move v52+32
;; @005a v39 = iadd v38, v37
;; @005a v40 = iconst.i64 8
;; @005a v41 = iadd v39, v40 ; v40 = 8
@@ -170,7 +170,7 @@
;; @005a v43 = iadd v42, v51 ; v51 = 1
;; @005a v44 = uextend.i64 v13
;; @005a v49 = load.i64 notrap aligned readonly can_move v0+8
-;; @005a v45 = load.i64 notrap aligned readonly can_move v49+24
+;; @005a v45 = load.i64 notrap aligned readonly can_move v49+32
;; @005a v46 = iadd v45, v44
;; @005a v47 = iconst.i64 8
;; @005a v48 = iadd v46, v47 ; v47 = 8
diff --git a/tests/disas/table-set-fixed-size.wat b/tests/disas/table-set-fixed-size.wat
index d35111f901..2123283c5f 100644
--- a/tests/disas/table-set-fixed-size.wat
+++ b/tests/disas/table-set-fixed-size.wat
@@ -19,12 +19,12 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; gv5 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv6 = load.i64 notrap aligned readonly can_move gv5+24
-;; gv7 = load.i64 notrap aligned gv5+32
+;; gv6 = load.i64 notrap aligned readonly can_move gv5+32
+;; gv7 = load.i64 notrap aligned gv5+40
;; sig0 = (i64 vmctx, i32) tail
;; fn0 = colocated u805306368:25 sig0
;; stack_limit = gv2
@@ -52,7 +52,7 @@
;; block2:
;; @0056 v17 = uextend.i64 v2
;; @0056 v58 = load.i64 notrap aligned readonly can_move v0+8
-;; @0056 v18 = load.i64 notrap aligned readonly can_move v58+24
+;; @0056 v18 = load.i64 notrap aligned readonly can_move v58+32
;; @0056 v19 = iadd v18, v17
;; @0056 v20 = iconst.i64 8
;; @0056 v21 = iadd v19, v20 ; v20 = 8
@@ -61,7 +61,7 @@
;; @0056 v23 = iadd v22, v57 ; v57 = 1
;; @0056 v24 = uextend.i64 v2
;; @0056 v55 = load.i64 notrap aligned readonly can_move v0+8
-;; @0056 v25 = load.i64 notrap aligned readonly can_move v55+24
+;; @0056 v25 = load.i64 notrap aligned readonly can_move v55+32
;; @0056 v26 = iadd v25, v24
;; @0056 v27 = iconst.i64 8
;; @0056 v28 = iadd v26, v27 ; v27 = 8
@@ -81,7 +81,7 @@
;; block4:
;; @0056 v33 = uextend.i64 v12
;; @0056 v51 = load.i64 notrap aligned readonly can_move v0+8
-;; @0056 v34 = load.i64 notrap aligned readonly can_move v51+24
+;; @0056 v34 = load.i64 notrap aligned readonly can_move v51+32
;; @0056 v35 = iadd v34, v33
;; @0056 v36 = iconst.i64 8
;; @0056 v37 = iadd v35, v36 ; v36 = 8
@@ -99,7 +99,7 @@
;; block6:
;; @0056 v42 = uextend.i64 v12
;; @0056 v47 = load.i64 notrap aligned readonly can_move v0+8
-;; @0056 v43 = load.i64 notrap aligned readonly can_move v47+24
+;; @0056 v43 = load.i64 notrap aligned readonly can_move v47+32
;; @0056 v44 = iadd v43, v42
;; @0056 v45 = iconst.i64 8
;; @0056 v46 = iadd v44, v45 ; v45 = 8
@@ -116,12 +116,12 @@
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; gv5 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv6 = load.i64 notrap aligned readonly can_move gv5+24
-;; gv7 = load.i64 notrap aligned gv5+32
+;; gv6 = load.i64 notrap aligned readonly can_move gv5+32
+;; gv7 = load.i64 notrap aligned gv5+40
;; sig0 = (i64 vmctx, i32) tail
;; fn0 = colocated u805306368:25 sig0
;; stack_limit = gv2
@@ -148,7 +148,7 @@
;; block2:
;; @005f v17 = uextend.i64 v3
;; @005f v58 = load.i64 notrap aligned readonly can_move v0+8
-;; @005f v18 = load.i64 notrap aligned readonly can_move v58+24
+;; @005f v18 = load.i64 notrap aligned readonly can_move v58+32
;; @005f v19 = iadd v18, v17
;; @005f v20 = iconst.i64 8
;; @005f v21 = iadd v19, v20 ; v20 = 8
@@ -157,7 +157,7 @@
;; @005f v23 = iadd v22, v57 ; v57 = 1
;; @005f v24 = uextend.i64 v3
;; @005f v55 = load.i64 notrap aligned readonly can_move v0+8
-;; @005f v25 = load.i64 notrap aligned readonly can_move v55+24
+;; @005f v25 = load.i64 notrap aligned readonly can_move v55+32
;; @005f v26 = iadd v25, v24
;; @005f v27 = iconst.i64 8
;; @005f v28 = iadd v26, v27 ; v27 = 8
@@ -177,7 +177,7 @@
;; block4:
;; @005f v33 = uextend.i64 v12
;; @005f v51 = load.i64 notrap aligned readonly can_move v0+8
-;; @005f v34 = load.i64 notrap aligned readonly can_move v51+24
+;; @005f v34 = load.i64 notrap aligned readonly can_move v51+32
;; @005f v35 = iadd v34, v33
;; @005f v36 = iconst.i64 8
;; @005f v37 = iadd v35, v36 ; v36 = 8
@@ -195,7 +195,7 @@
;; block6:
;; @005f v42 = uextend.i64 v12
;; @005f v47 = load.i64 notrap aligned readonly can_move v0+8
-;; @005f v43 = load.i64 notrap aligned readonly can_move v47+24
+;; @005f v43 = load.i64 notrap aligned readonly can_move v47+32
;; @005f v44 = iadd v43, v42
;; @005f v45 = iconst.i64 8
;; @005f v46 = iadd v44, v45 ; v45 = 8
diff --git a/tests/disas/table-set.wat b/tests/disas/table-set.wat
index ceb3a92b71..fd50e78534 100644
--- a/tests/disas/table-set.wat
+++ b/tests/disas/table-set.wat
@@ -19,13 +19,13 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+48
;; gv5 = load.i64 notrap aligned gv3+56
;; gv6 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv7 = load.i64 notrap aligned readonly can_move gv6+24
-;; gv8 = load.i64 notrap aligned gv6+32
+;; gv7 = load.i64 notrap aligned readonly can_move gv6+32
+;; gv8 = load.i64 notrap aligned gv6+40
;; sig0 = (i64 vmctx, i32) tail
;; fn0 = colocated u805306368:25 sig0
;; stack_limit = gv2
@@ -54,7 +54,7 @@
;; block2:
;; @0055 v18 = uextend.i64 v2
;; @0055 v59 = load.i64 notrap aligned readonly can_move v0+8
-;; @0055 v19 = load.i64 notrap aligned readonly can_move v59+24
+;; @0055 v19 = load.i64 notrap aligned readonly can_move v59+32
;; @0055 v20 = iadd v19, v18
;; @0055 v21 = iconst.i64 8
;; @0055 v22 = iadd v20, v21 ; v21 = 8
@@ -63,7 +63,7 @@
;; @0055 v24 = iadd v23, v58 ; v58 = 1
;; @0055 v25 = uextend.i64 v2
;; @0055 v56 = load.i64 notrap aligned readonly can_move v0+8
-;; @0055 v26 = load.i64 notrap aligned readonly can_move v56+24
+;; @0055 v26 = load.i64 notrap aligned readonly can_move v56+32
;; @0055 v27 = iadd v26, v25
;; @0055 v28 = iconst.i64 8
;; @0055 v29 = iadd v27, v28 ; v28 = 8
@@ -83,7 +83,7 @@
;; block4:
;; @0055 v34 = uextend.i64 v13
;; @0055 v52 = load.i64 notrap aligned readonly can_move v0+8
-;; @0055 v35 = load.i64 notrap aligned readonly can_move v52+24
+;; @0055 v35 = load.i64 notrap aligned readonly can_move v52+32
;; @0055 v36 = iadd v35, v34
;; @0055 v37 = iconst.i64 8
;; @0055 v38 = iadd v36, v37 ; v37 = 8
@@ -101,7 +101,7 @@
;; block6:
;; @0055 v43 = uextend.i64 v13
;; @0055 v48 = load.i64 notrap aligned readonly can_move v0+8
-;; @0055 v44 = load.i64 notrap aligned readonly can_move v48+24
+;; @0055 v44 = load.i64 notrap aligned readonly can_move v48+32
;; @0055 v45 = iadd v44, v43
;; @0055 v46 = iconst.i64 8
;; @0055 v47 = iadd v45, v46 ; v46 = 8
@@ -118,13 +118,13 @@
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned gv3+48
;; gv5 = load.i64 notrap aligned gv3+56
;; gv6 = load.i64 notrap aligned readonly can_move gv3+8
-;; gv7 = load.i64 notrap aligned readonly can_move gv6+24
-;; gv8 = load.i64 notrap aligned gv6+32
+;; gv7 = load.i64 notrap aligned readonly can_move gv6+32
+;; gv8 = load.i64 notrap aligned gv6+40
;; sig0 = (i64 vmctx, i32) tail
;; fn0 = colocated u805306368:25 sig0
;; stack_limit = gv2
@@ -152,7 +152,7 @@
;; block2:
;; @005e v18 = uextend.i64 v3
;; @005e v59 = load.i64 notrap aligned readonly can_move v0+8
-;; @005e v19 = load.i64 notrap aligned readonly can_move v59+24
+;; @005e v19 = load.i64 notrap aligned readonly can_move v59+32
;; @005e v20 = iadd v19, v18
;; @005e v21 = iconst.i64 8
;; @005e v22 = iadd v20, v21 ; v21 = 8
@@ -161,7 +161,7 @@
;; @005e v24 = iadd v23, v58 ; v58 = 1
;; @005e v25 = uextend.i64 v3
;; @005e v56 = load.i64 notrap aligned readonly can_move v0+8
-;; @005e v26 = load.i64 notrap aligned readonly can_move v56+24
+;; @005e v26 = load.i64 notrap aligned readonly can_move v56+32
;; @005e v27 = iadd v26, v25
;; @005e v28 = iconst.i64 8
;; @005e v29 = iadd v27, v28 ; v28 = 8
@@ -181,7 +181,7 @@
;; block4:
;; @005e v34 = uextend.i64 v13
;; @005e v52 = load.i64 notrap aligned readonly can_move v0+8
-;; @005e v35 = load.i64 notrap aligned readonly can_move v52+24
+;; @005e v35 = load.i64 notrap aligned readonly can_move v52+32
;; @005e v36 = iadd v35, v34
;; @005e v37 = iconst.i64 8
;; @005e v38 = iadd v36, v37 ; v37 = 8
@@ -199,7 +199,7 @@
;; block6:
;; @005e v43 = uextend.i64 v13
;; @005e v48 = load.i64 notrap aligned readonly can_move v0+8
-;; @005e v44 = load.i64 notrap aligned readonly can_move v48+24
+;; @005e v44 = load.i64 notrap aligned readonly can_move v48+32
;; @005e v45 = iadd v44, v43
;; @005e v46 = iconst.i64 8
;; @005e v47 = iadd v45, v46 ; v46 = 8
diff --git a/tests/disas/trunc.wat b/tests/disas/trunc.wat
index e6acff281e..6f69c3594b 100644
--- a/tests/disas/trunc.wat
+++ b/tests/disas/trunc.wat
@@ -14,7 +14,7 @@
;; movq %r14, 0x10(%rsp)
;; movq 8(%rdi), %r11
;; movq %rdi, %r14
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; movq %rsp, %rsi
;; cmpq %r11, %rsi
;; jb 0x118
diff --git a/tests/disas/trunc32.wat b/tests/disas/trunc32.wat
index 8e5e2e8a63..019f36cbb3 100644
--- a/tests/disas/trunc32.wat
+++ b/tests/disas/trunc32.wat
@@ -15,7 +15,7 @@
;; movdqu %xmm0, (%rsp)
;; movq 8(%rdi), %rax
;; movq %rdi, %r12
-;; movq 0x10(%rax), %rax
+;; movq 0x18(%rax), %rax
;; movq %rsp, %rcx
;; cmpq %rax, %rcx
;; jb 0x10d
diff --git a/tests/disas/typed-funcrefs-eager-init.wat b/tests/disas/typed-funcrefs-eager-init.wat
index a2011f17c1..210b6d2bd1 100644
--- a/tests/disas/typed-funcrefs-eager-init.wat
+++ b/tests/disas/typed-funcrefs-eager-init.wat
@@ -116,7 +116,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32):
@@ -129,7 +129,7 @@
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail
@@ -159,7 +159,7 @@
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail
@@ -189,7 +189,7 @@
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail
;; stack_limit = gv2
diff --git a/tests/disas/typed-funcrefs.wat b/tests/disas/typed-funcrefs.wat
index bfed93b39d..db83bf16cb 100644
--- a/tests/disas/typed-funcrefs.wat
+++ b/tests/disas/typed-funcrefs.wat
@@ -116,7 +116,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32):
@@ -129,7 +129,7 @@
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i32, i64) -> i64 tail
@@ -183,7 +183,7 @@
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; gv4 = load.i64 notrap aligned readonly can_move gv3+48
;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail
@@ -237,7 +237,7 @@
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail
;; stack_limit = gv2
diff --git a/tests/disas/unreachable_code.wat b/tests/disas/unreachable_code.wat
index a1de24fd0e..fe6e365c72 100644
--- a/tests/disas/unreachable_code.wat
+++ b/tests/disas/unreachable_code.wat
@@ -81,7 +81,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -91,7 +91,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -104,7 +104,7 @@
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
@@ -136,7 +136,7 @@
;; function u0:3(i64 vmctx, i64) tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; stack_limit = gv2
;;
;; block0(v0: i64, v1: i64):
diff --git a/tests/disas/winch/aarch64/br/as_br_if_cond.wat b/tests/disas/winch/aarch64/br/as_br_if_cond.wat
index bba1c84507..d9b53d9d11 100644
--- a/tests/disas/winch/aarch64/br/as_br_if_cond.wat
+++ b/tests/disas/winch/aarch64/br/as_br_if_cond.wat
@@ -11,7 +11,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br/as_br_value.wat b/tests/disas/winch/aarch64/br/as_br_value.wat
index 8e07aab524..07c5d0a481 100644
--- a/tests/disas/winch/aarch64/br/as_br_value.wat
+++ b/tests/disas/winch/aarch64/br/as_br_value.wat
@@ -11,7 +11,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br/as_if_cond.wat b/tests/disas/winch/aarch64/br/as_if_cond.wat
index adce06f31c..2d1d33ba42 100644
--- a/tests/disas/winch/aarch64/br/as_if_cond.wat
+++ b/tests/disas/winch/aarch64/br/as_if_cond.wat
@@ -16,7 +16,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br/as_if_else.wat b/tests/disas/winch/aarch64/br/as_if_else.wat
index 7fc6f2b0a5..d4c1509609 100644
--- a/tests/disas/winch/aarch64/br/as_if_else.wat
+++ b/tests/disas/winch/aarch64/br/as_if_else.wat
@@ -16,7 +16,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br/as_if_then.wat b/tests/disas/winch/aarch64/br/as_if_then.wat
index 788ec3b515..a9ee6bf8b6 100644
--- a/tests/disas/winch/aarch64/br/as_if_then.wat
+++ b/tests/disas/winch/aarch64/br/as_if_then.wat
@@ -16,7 +16,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br/as_loop_first.wat b/tests/disas/winch/aarch64/br/as_loop_first.wat
index 1039444453..834d295878 100644
--- a/tests/disas/winch/aarch64/br/as_loop_first.wat
+++ b/tests/disas/winch/aarch64/br/as_loop_first.wat
@@ -12,7 +12,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br/br_jump.wat b/tests/disas/winch/aarch64/br/br_jump.wat
index ea06e108d7..97dc3f4f0e 100644
--- a/tests/disas/winch/aarch64/br/br_jump.wat
+++ b/tests/disas/winch/aarch64/br/br_jump.wat
@@ -19,7 +19,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat b/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat
index a643bfeb5b..8580aeb32a 100644
--- a/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat
+++ b/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat
@@ -11,7 +11,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br_if/as_br_value.wat b/tests/disas/winch/aarch64/br_if/as_br_value.wat
index 0c1f46fdc7..f5dad10940 100644
--- a/tests/disas/winch/aarch64/br_if/as_br_value.wat
+++ b/tests/disas/winch/aarch64/br_if/as_br_value.wat
@@ -11,7 +11,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br_if/as_if_cond.wat b/tests/disas/winch/aarch64/br_if/as_if_cond.wat
index 5926bdaf28..c5e3d31696 100644
--- a/tests/disas/winch/aarch64/br_if/as_if_cond.wat
+++ b/tests/disas/winch/aarch64/br_if/as_if_cond.wat
@@ -17,7 +17,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br_if/as_local_set_value.wat b/tests/disas/winch/aarch64/br_if/as_local_set_value.wat
index 607289161c..a9d8fb0fe1 100644
--- a/tests/disas/winch/aarch64/br_if/as_local_set_value.wat
+++ b/tests/disas/winch/aarch64/br_if/as_local_set_value.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br_table/large.wat b/tests/disas/winch/aarch64/br_table/large.wat
index 8d6f66907d..d6112bd1c5 100644
--- a/tests/disas/winch/aarch64/br_table/large.wat
+++ b/tests/disas/winch/aarch64/br_table/large.wat
@@ -744,7 +744,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat b/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat
index 08d040cc9b..e156b44413 100644
--- a/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat
+++ b/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat
@@ -24,7 +24,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/call/multi.wat b/tests/disas/winch/aarch64/call/multi.wat
index 92d4c8b276..6281933c4d 100644
--- a/tests/disas/winch/aarch64/call/multi.wat
+++ b/tests/disas/winch/aarch64/call/multi.wat
@@ -16,7 +16,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x1, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x1c
;; add x16, x16, x17
@@ -52,7 +52,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/call/params.wat b/tests/disas/winch/aarch64/call/params.wat
index d7c7dd8521..e8e66f1844 100644
--- a/tests/disas/winch/aarch64/call/params.wat
+++ b/tests/disas/winch/aarch64/call/params.wat
@@ -43,7 +43,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x40
;; add x16, x16, x17
@@ -129,7 +129,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x28
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/call/recursive.wat b/tests/disas/winch/aarch64/call/recursive.wat
index dc234f2cc4..93e829eec6 100644
--- a/tests/disas/winch/aarch64/call/recursive.wat
+++ b/tests/disas/winch/aarch64/call/recursive.wat
@@ -30,7 +30,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/call/reg_on_stack.wat b/tests/disas/winch/aarch64/call/reg_on_stack.wat
index 8c43145a0c..e8961264ad 100644
--- a/tests/disas/winch/aarch64/call/reg_on_stack.wat
+++ b/tests/disas/winch/aarch64/call/reg_on_stack.wat
@@ -19,7 +19,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x24
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/call/simple.wat b/tests/disas/winch/aarch64/call/simple.wat
index 4f73ec6fce..4b5e5a2d5c 100644
--- a/tests/disas/winch/aarch64/call/simple.wat
+++ b/tests/disas/winch/aarch64/call/simple.wat
@@ -21,7 +21,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
@@ -62,7 +62,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/call_indirect/call_indirect.wat b/tests/disas/winch/aarch64/call_indirect/call_indirect.wat
index 731043475f..ff45963ef7 100644
--- a/tests/disas/winch/aarch64/call_indirect/call_indirect.wat
+++ b/tests/disas/winch/aarch64/call_indirect/call_indirect.wat
@@ -35,7 +35,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x30
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/call_indirect/local_arg.wat b/tests/disas/winch/aarch64/call_indirect/local_arg.wat
index b91b748f9f..0e47ceacb9 100644
--- a/tests/disas/winch/aarch64/call_indirect/local_arg.wat
+++ b/tests/disas/winch/aarch64/call_indirect/local_arg.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
@@ -49,7 +49,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x24
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat b/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat
index 484d5cc148..b8b4f69022 100644
--- a/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat
+++ b/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat b/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat
index fe41240585..8f1c0e9aae 100644
--- a/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat
+++ b/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_add/const.wat b/tests/disas/winch/aarch64/f32_add/const.wat
index 2bc44f8af7..b74780f63c 100644
--- a/tests/disas/winch/aarch64/f32_add/const.wat
+++ b/tests/disas/winch/aarch64/f32_add/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_add/locals.wat b/tests/disas/winch/aarch64/f32_add/locals.wat
index 2e3367b702..07cd7ec45f 100644
--- a/tests/disas/winch/aarch64/f32_add/locals.wat
+++ b/tests/disas/winch/aarch64/f32_add/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_add/params.wat b/tests/disas/winch/aarch64/f32_add/params.wat
index 5610d3906a..3aabe47bcf 100644
--- a/tests/disas/winch/aarch64/f32_add/params.wat
+++ b/tests/disas/winch/aarch64/f32_add/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat
index 6e57566af4..28555d9ded 100644
--- a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat
+++ b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat
index e3022757ac..6cbc6bc815 100644
--- a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat
+++ b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat
index 92d1013516..6f1ff0bc1a 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat
index 5f75d9f759..ddf5bd5a57 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat
index ad7fe49648..7bd8b4e3a6 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat
index 72d0b275f0..ebce830617 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x14
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat
index 210b75d0bc..2c8a7ec12e 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat
index a59833025c..2716c72c15 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat
index fe6a4bc4e5..0af0ddb6ba 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat
index 8af93e4fb4..032018d520 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x14
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat
index c5dab9e174..e1a6195047 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat
index 7e6952ff3e..70ac41cdf1 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat
index 16d3709696..e39aefae04 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat
index 35e5ddf101..b3cd3fe295 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x14
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat
index c0f895f963..c91b11a03b 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat
index b043a1889a..6ffade9a67 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat
index 8a72730b6d..23d5412f0b 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat
index 51a40224fc..df61f0b50d 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x14
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_copysign/const.wat b/tests/disas/winch/aarch64/f32_copysign/const.wat
index e34b822b33..679406f1f0 100644
--- a/tests/disas/winch/aarch64/f32_copysign/const.wat
+++ b/tests/disas/winch/aarch64/f32_copysign/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_copysign/locals.wat b/tests/disas/winch/aarch64/f32_copysign/locals.wat
index bce63c30b4..d58491207c 100644
--- a/tests/disas/winch/aarch64/f32_copysign/locals.wat
+++ b/tests/disas/winch/aarch64/f32_copysign/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_copysign/params.wat b/tests/disas/winch/aarch64/f32_copysign/params.wat
index 93960d5d1a..e27c0a4785 100644
--- a/tests/disas/winch/aarch64/f32_copysign/params.wat
+++ b/tests/disas/winch/aarch64/f32_copysign/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_demote_f64/const.wat b/tests/disas/winch/aarch64/f32_demote_f64/const.wat
index 3bdae1f32e..a19a339e0c 100644
--- a/tests/disas/winch/aarch64/f32_demote_f64/const.wat
+++ b/tests/disas/winch/aarch64/f32_demote_f64/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_demote_f64/locals.wat b/tests/disas/winch/aarch64/f32_demote_f64/locals.wat
index ffc7f59d0e..d5ee6b1f42 100644
--- a/tests/disas/winch/aarch64/f32_demote_f64/locals.wat
+++ b/tests/disas/winch/aarch64/f32_demote_f64/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_demote_f64/params.wat b/tests/disas/winch/aarch64/f32_demote_f64/params.wat
index 286b9b84a7..1f1e5ce8ae 100644
--- a/tests/disas/winch/aarch64/f32_demote_f64/params.wat
+++ b/tests/disas/winch/aarch64/f32_demote_f64/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_div/const.wat b/tests/disas/winch/aarch64/f32_div/const.wat
index f687d1f27a..de2f3f398e 100644
--- a/tests/disas/winch/aarch64/f32_div/const.wat
+++ b/tests/disas/winch/aarch64/f32_div/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_div/locals.wat b/tests/disas/winch/aarch64/f32_div/locals.wat
index 684ec883d9..ca10d26421 100644
--- a/tests/disas/winch/aarch64/f32_div/locals.wat
+++ b/tests/disas/winch/aarch64/f32_div/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_div/params.wat b/tests/disas/winch/aarch64/f32_div/params.wat
index 0f50261267..061165c313 100644
--- a/tests/disas/winch/aarch64/f32_div/params.wat
+++ b/tests/disas/winch/aarch64/f32_div/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_eq/const.wat b/tests/disas/winch/aarch64/f32_eq/const.wat
index 57c94f89fa..d20226db85 100644
--- a/tests/disas/winch/aarch64/f32_eq/const.wat
+++ b/tests/disas/winch/aarch64/f32_eq/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_eq/locals.wat b/tests/disas/winch/aarch64/f32_eq/locals.wat
index 5d8f3e77c1..451ecaa38e 100644
--- a/tests/disas/winch/aarch64/f32_eq/locals.wat
+++ b/tests/disas/winch/aarch64/f32_eq/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_eq/params.wat b/tests/disas/winch/aarch64/f32_eq/params.wat
index 636453f939..0e9e94b1d8 100644
--- a/tests/disas/winch/aarch64/f32_eq/params.wat
+++ b/tests/disas/winch/aarch64/f32_eq/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat b/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat
index a908a066ac..448bf9c351 100644
--- a/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat
+++ b/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat b/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat
index b7cc321a22..b7e230e70a 100644
--- a/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat
+++ b/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ge/const.wat b/tests/disas/winch/aarch64/f32_ge/const.wat
index ef4f6132ab..528b2cb90d 100644
--- a/tests/disas/winch/aarch64/f32_ge/const.wat
+++ b/tests/disas/winch/aarch64/f32_ge/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ge/locals.wat b/tests/disas/winch/aarch64/f32_ge/locals.wat
index e246353aed..36b7962f1c 100644
--- a/tests/disas/winch/aarch64/f32_ge/locals.wat
+++ b/tests/disas/winch/aarch64/f32_ge/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ge/params.wat b/tests/disas/winch/aarch64/f32_ge/params.wat
index 8abb550335..5b43096adb 100644
--- a/tests/disas/winch/aarch64/f32_ge/params.wat
+++ b/tests/disas/winch/aarch64/f32_ge/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_gt/const.wat b/tests/disas/winch/aarch64/f32_gt/const.wat
index 7e57cbb0c7..e0bafff0c7 100644
--- a/tests/disas/winch/aarch64/f32_gt/const.wat
+++ b/tests/disas/winch/aarch64/f32_gt/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_gt/locals.wat b/tests/disas/winch/aarch64/f32_gt/locals.wat
index e12be6a7f9..1c16189b0d 100644
--- a/tests/disas/winch/aarch64/f32_gt/locals.wat
+++ b/tests/disas/winch/aarch64/f32_gt/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_gt/params.wat b/tests/disas/winch/aarch64/f32_gt/params.wat
index d6b979baca..3ee87e8ff8 100644
--- a/tests/disas/winch/aarch64/f32_gt/params.wat
+++ b/tests/disas/winch/aarch64/f32_gt/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_le/const.wat b/tests/disas/winch/aarch64/f32_le/const.wat
index 845c14f1e3..ddfd92597d 100644
--- a/tests/disas/winch/aarch64/f32_le/const.wat
+++ b/tests/disas/winch/aarch64/f32_le/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_le/locals.wat b/tests/disas/winch/aarch64/f32_le/locals.wat
index 59eba714bc..32664c4c79 100644
--- a/tests/disas/winch/aarch64/f32_le/locals.wat
+++ b/tests/disas/winch/aarch64/f32_le/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_le/params.wat b/tests/disas/winch/aarch64/f32_le/params.wat
index faa5d917f8..71067dbb85 100644
--- a/tests/disas/winch/aarch64/f32_le/params.wat
+++ b/tests/disas/winch/aarch64/f32_le/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_lt/const.wat b/tests/disas/winch/aarch64/f32_lt/const.wat
index 0a7481afa8..d161ee2968 100644
--- a/tests/disas/winch/aarch64/f32_lt/const.wat
+++ b/tests/disas/winch/aarch64/f32_lt/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_lt/locals.wat b/tests/disas/winch/aarch64/f32_lt/locals.wat
index 4dc9b509be..1d9e4bd1c6 100644
--- a/tests/disas/winch/aarch64/f32_lt/locals.wat
+++ b/tests/disas/winch/aarch64/f32_lt/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_lt/params.wat b/tests/disas/winch/aarch64/f32_lt/params.wat
index c092ff4892..93e3f2f0f3 100644
--- a/tests/disas/winch/aarch64/f32_lt/params.wat
+++ b/tests/disas/winch/aarch64/f32_lt/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_max/const.wat b/tests/disas/winch/aarch64/f32_max/const.wat
index 45eb4c4832..541bf01a16 100644
--- a/tests/disas/winch/aarch64/f32_max/const.wat
+++ b/tests/disas/winch/aarch64/f32_max/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_max/locals.wat b/tests/disas/winch/aarch64/f32_max/locals.wat
index bd0b120b8b..a86fde7f67 100644
--- a/tests/disas/winch/aarch64/f32_max/locals.wat
+++ b/tests/disas/winch/aarch64/f32_max/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_max/params.wat b/tests/disas/winch/aarch64/f32_max/params.wat
index 2be7d2c7d0..4f40806c5b 100644
--- a/tests/disas/winch/aarch64/f32_max/params.wat
+++ b/tests/disas/winch/aarch64/f32_max/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_min/const.wat b/tests/disas/winch/aarch64/f32_min/const.wat
index 90d4128930..936168d2bf 100644
--- a/tests/disas/winch/aarch64/f32_min/const.wat
+++ b/tests/disas/winch/aarch64/f32_min/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_min/locals.wat b/tests/disas/winch/aarch64/f32_min/locals.wat
index 6378e5d95b..796b706cbe 100644
--- a/tests/disas/winch/aarch64/f32_min/locals.wat
+++ b/tests/disas/winch/aarch64/f32_min/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_min/params.wat b/tests/disas/winch/aarch64/f32_min/params.wat
index 0bf37de44a..108055afa4 100644
--- a/tests/disas/winch/aarch64/f32_min/params.wat
+++ b/tests/disas/winch/aarch64/f32_min/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_mul/const.wat b/tests/disas/winch/aarch64/f32_mul/const.wat
index a935864f74..503922ff78 100644
--- a/tests/disas/winch/aarch64/f32_mul/const.wat
+++ b/tests/disas/winch/aarch64/f32_mul/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_mul/locals.wat b/tests/disas/winch/aarch64/f32_mul/locals.wat
index 56af23bb3a..189ddf197c 100644
--- a/tests/disas/winch/aarch64/f32_mul/locals.wat
+++ b/tests/disas/winch/aarch64/f32_mul/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_mul/params.wat b/tests/disas/winch/aarch64/f32_mul/params.wat
index 8512a535aa..c0d6d351ef 100644
--- a/tests/disas/winch/aarch64/f32_mul/params.wat
+++ b/tests/disas/winch/aarch64/f32_mul/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ne/const.wat b/tests/disas/winch/aarch64/f32_ne/const.wat
index bd241d0a70..3ad555142a 100644
--- a/tests/disas/winch/aarch64/f32_ne/const.wat
+++ b/tests/disas/winch/aarch64/f32_ne/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ne/locals.wat b/tests/disas/winch/aarch64/f32_ne/locals.wat
index f531c38e58..831340d73d 100644
--- a/tests/disas/winch/aarch64/f32_ne/locals.wat
+++ b/tests/disas/winch/aarch64/f32_ne/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_ne/params.wat b/tests/disas/winch/aarch64/f32_ne/params.wat
index 5b37817520..e01eb9a260 100644
--- a/tests/disas/winch/aarch64/f32_ne/params.wat
+++ b/tests/disas/winch/aarch64/f32_ne/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat
index 55912614bf..ad2a4b16e6 100644
--- a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat
+++ b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat
index 9a81f19587..e8bf0fc43c 100644
--- a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat
+++ b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat b/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat
index d901b33433..e3ac1adbc7 100644
--- a/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat
+++ b/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat b/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat
index 1d6859821e..ad889e23a9 100644
--- a/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat
+++ b/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat
index d73cd488ea..be139f6c48 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat
index 6ea3200976..c5d00e9ed2 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat
index dac3ae206e..04ee3a2575 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat
index 0a8361b2c0..875364863f 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat
index 29dcc40b3e..297249296d 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x14
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat
index ac6c2e100e..6437dca1c0 100644
--- a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat
+++ b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat
index 3d2058b1be..3386a6b394 100644
--- a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat
+++ b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_sub/const.wat b/tests/disas/winch/aarch64/f32_sub/const.wat
index 8770ddfb98..e330e0264a 100644
--- a/tests/disas/winch/aarch64/f32_sub/const.wat
+++ b/tests/disas/winch/aarch64/f32_sub/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_sub/locals.wat b/tests/disas/winch/aarch64/f32_sub/locals.wat
index 5425673603..2fc97a5813 100644
--- a/tests/disas/winch/aarch64/f32_sub/locals.wat
+++ b/tests/disas/winch/aarch64/f32_sub/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_sub/params.wat b/tests/disas/winch/aarch64/f32_sub/params.wat
index ea541caa14..8e82d58d89 100644
--- a/tests/disas/winch/aarch64/f32_sub/params.wat
+++ b/tests/disas/winch/aarch64/f32_sub/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat
index 95671e3406..2a2c6a490e 100644
--- a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat
+++ b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat
index e42c4170da..6949d39124 100644
--- a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat
+++ b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat b/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat
index 37d097ac31..c02fdbafb3 100644
--- a/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat
+++ b/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat b/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat
index 7ac51d3760..6cd024efe6 100644
--- a/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat
+++ b/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_add/const.wat b/tests/disas/winch/aarch64/f64_add/const.wat
index 885a92b881..474ee91026 100644
--- a/tests/disas/winch/aarch64/f64_add/const.wat
+++ b/tests/disas/winch/aarch64/f64_add/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_add/locals.wat b/tests/disas/winch/aarch64/f64_add/locals.wat
index 9c5062667a..e60fd0b34e 100644
--- a/tests/disas/winch/aarch64/f64_add/locals.wat
+++ b/tests/disas/winch/aarch64/f64_add/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_add/params.wat b/tests/disas/winch/aarch64/f64_add/params.wat
index 40c1bf910e..bd20a404b7 100644
--- a/tests/disas/winch/aarch64/f64_add/params.wat
+++ b/tests/disas/winch/aarch64/f64_add/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat
index 9f3dbfd84e..b51f275675 100644
--- a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat
+++ b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat
index 3fe784732d..963e4b6dde 100644
--- a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat
+++ b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat
index 1b3bfc1182..a016e215e2 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat
index f13bc96189..fca1c27354 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat
index 724d7a5bbb..74b928c75c 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat
index caef35d25d..06c26d6fdf 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat
index 9ca043fe62..c3c9a9e20f 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat
index 60c848cc20..a2c5928eab 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat
index a3085ff17e..d5a8c06a95 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat
index 629c633b77..59b6998e8f 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat
index 35ec13cd91..4d7370822f 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat
index 5f0fb98bbb..2daa67fae6 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat
index 8b09ba135b..6c1fbd9f5d 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat
index 13cbdbebb7..43d95f3c38 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat
index a2b19eedd1..9283c76f23 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat
index 89e5c5faf3..241fa37497 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat
index 36e5d27150..be478d811b 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat
index 03eb0dfee9..67779b5d17 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_copysign/const.wat b/tests/disas/winch/aarch64/f64_copysign/const.wat
index 0a13debe4d..3ec667e75f 100644
--- a/tests/disas/winch/aarch64/f64_copysign/const.wat
+++ b/tests/disas/winch/aarch64/f64_copysign/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_copysign/locals.wat b/tests/disas/winch/aarch64/f64_copysign/locals.wat
index 86b103c55f..2642bdd349 100644
--- a/tests/disas/winch/aarch64/f64_copysign/locals.wat
+++ b/tests/disas/winch/aarch64/f64_copysign/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_copysign/params.wat b/tests/disas/winch/aarch64/f64_copysign/params.wat
index 31bb216e56..3220abb7f5 100644
--- a/tests/disas/winch/aarch64/f64_copysign/params.wat
+++ b/tests/disas/winch/aarch64/f64_copysign/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_div/const.wat b/tests/disas/winch/aarch64/f64_div/const.wat
index 1b56b3d2d3..bfe2652a58 100644
--- a/tests/disas/winch/aarch64/f64_div/const.wat
+++ b/tests/disas/winch/aarch64/f64_div/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_div/locals.wat b/tests/disas/winch/aarch64/f64_div/locals.wat
index 92a4b343ce..308d086f40 100644
--- a/tests/disas/winch/aarch64/f64_div/locals.wat
+++ b/tests/disas/winch/aarch64/f64_div/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_div/params.wat b/tests/disas/winch/aarch64/f64_div/params.wat
index 870b6cd63f..6a4913c5c0 100644
--- a/tests/disas/winch/aarch64/f64_div/params.wat
+++ b/tests/disas/winch/aarch64/f64_div/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_eq/const.wat b/tests/disas/winch/aarch64/f64_eq/const.wat
index bb240ac4d8..232d8ef3b8 100644
--- a/tests/disas/winch/aarch64/f64_eq/const.wat
+++ b/tests/disas/winch/aarch64/f64_eq/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_eq/locals.wat b/tests/disas/winch/aarch64/f64_eq/locals.wat
index f177bcd88e..04e0c6bf6d 100644
--- a/tests/disas/winch/aarch64/f64_eq/locals.wat
+++ b/tests/disas/winch/aarch64/f64_eq/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_eq/params.wat b/tests/disas/winch/aarch64/f64_eq/params.wat
index ea528ddded..d23b111bc2 100644
--- a/tests/disas/winch/aarch64/f64_eq/params.wat
+++ b/tests/disas/winch/aarch64/f64_eq/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat b/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat
index 5597d904a2..0505c9db35 100644
--- a/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat
+++ b/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat b/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat
index 89c403b48a..4a724afa57 100644
--- a/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat
+++ b/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ge/const.wat b/tests/disas/winch/aarch64/f64_ge/const.wat
index 004a84cf6e..0b64df6062 100644
--- a/tests/disas/winch/aarch64/f64_ge/const.wat
+++ b/tests/disas/winch/aarch64/f64_ge/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ge/locals.wat b/tests/disas/winch/aarch64/f64_ge/locals.wat
index 9273bf15bb..2cdcd168c4 100644
--- a/tests/disas/winch/aarch64/f64_ge/locals.wat
+++ b/tests/disas/winch/aarch64/f64_ge/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ge/params.wat b/tests/disas/winch/aarch64/f64_ge/params.wat
index d060e16d6f..b723d74e87 100644
--- a/tests/disas/winch/aarch64/f64_ge/params.wat
+++ b/tests/disas/winch/aarch64/f64_ge/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_gt/const.wat b/tests/disas/winch/aarch64/f64_gt/const.wat
index 54bd762b94..327c5e831c 100644
--- a/tests/disas/winch/aarch64/f64_gt/const.wat
+++ b/tests/disas/winch/aarch64/f64_gt/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_gt/locals.wat b/tests/disas/winch/aarch64/f64_gt/locals.wat
index 9249a92be4..90cd450d5e 100644
--- a/tests/disas/winch/aarch64/f64_gt/locals.wat
+++ b/tests/disas/winch/aarch64/f64_gt/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_gt/params.wat b/tests/disas/winch/aarch64/f64_gt/params.wat
index 5fd18846f7..244220ccb4 100644
--- a/tests/disas/winch/aarch64/f64_gt/params.wat
+++ b/tests/disas/winch/aarch64/f64_gt/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_le/const.wat b/tests/disas/winch/aarch64/f64_le/const.wat
index 21b93116ca..e3a502b41a 100644
--- a/tests/disas/winch/aarch64/f64_le/const.wat
+++ b/tests/disas/winch/aarch64/f64_le/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_le/locals.wat b/tests/disas/winch/aarch64/f64_le/locals.wat
index 29a8bcb1a9..5e9cafdcbd 100644
--- a/tests/disas/winch/aarch64/f64_le/locals.wat
+++ b/tests/disas/winch/aarch64/f64_le/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_le/params.wat b/tests/disas/winch/aarch64/f64_le/params.wat
index 4062438423..c7941bbcce 100644
--- a/tests/disas/winch/aarch64/f64_le/params.wat
+++ b/tests/disas/winch/aarch64/f64_le/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_lt/const.wat b/tests/disas/winch/aarch64/f64_lt/const.wat
index b36ccc97c9..a4782aa262 100644
--- a/tests/disas/winch/aarch64/f64_lt/const.wat
+++ b/tests/disas/winch/aarch64/f64_lt/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_lt/locals.wat b/tests/disas/winch/aarch64/f64_lt/locals.wat
index ba4bc962a7..a2fee2009c 100644
--- a/tests/disas/winch/aarch64/f64_lt/locals.wat
+++ b/tests/disas/winch/aarch64/f64_lt/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_lt/params.wat b/tests/disas/winch/aarch64/f64_lt/params.wat
index 91e1aae064..948a444da1 100644
--- a/tests/disas/winch/aarch64/f64_lt/params.wat
+++ b/tests/disas/winch/aarch64/f64_lt/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_max/const.wat b/tests/disas/winch/aarch64/f64_max/const.wat
index 59869bfafc..70879d637b 100644
--- a/tests/disas/winch/aarch64/f64_max/const.wat
+++ b/tests/disas/winch/aarch64/f64_max/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_max/locals.wat b/tests/disas/winch/aarch64/f64_max/locals.wat
index 26556b025c..a0b30cb6b0 100644
--- a/tests/disas/winch/aarch64/f64_max/locals.wat
+++ b/tests/disas/winch/aarch64/f64_max/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_max/params.wat b/tests/disas/winch/aarch64/f64_max/params.wat
index 353a8a173e..f1c5ef945c 100644
--- a/tests/disas/winch/aarch64/f64_max/params.wat
+++ b/tests/disas/winch/aarch64/f64_max/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_min/const.wat b/tests/disas/winch/aarch64/f64_min/const.wat
index 63301f7a9b..2668111a86 100644
--- a/tests/disas/winch/aarch64/f64_min/const.wat
+++ b/tests/disas/winch/aarch64/f64_min/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_min/locals.wat b/tests/disas/winch/aarch64/f64_min/locals.wat
index 9f4c8d1421..5b219954d5 100644
--- a/tests/disas/winch/aarch64/f64_min/locals.wat
+++ b/tests/disas/winch/aarch64/f64_min/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_min/params.wat b/tests/disas/winch/aarch64/f64_min/params.wat
index c821eaa62d..f4c30d5921 100644
--- a/tests/disas/winch/aarch64/f64_min/params.wat
+++ b/tests/disas/winch/aarch64/f64_min/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_mul/const.wat b/tests/disas/winch/aarch64/f64_mul/const.wat
index 2372dcfb8c..2cb2cf2ac7 100644
--- a/tests/disas/winch/aarch64/f64_mul/const.wat
+++ b/tests/disas/winch/aarch64/f64_mul/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_mul/locals.wat b/tests/disas/winch/aarch64/f64_mul/locals.wat
index 0ec200b653..8228e95160 100644
--- a/tests/disas/winch/aarch64/f64_mul/locals.wat
+++ b/tests/disas/winch/aarch64/f64_mul/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_mul/params.wat b/tests/disas/winch/aarch64/f64_mul/params.wat
index ba4dec1545..8006746ddd 100644
--- a/tests/disas/winch/aarch64/f64_mul/params.wat
+++ b/tests/disas/winch/aarch64/f64_mul/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ne/const.wat b/tests/disas/winch/aarch64/f64_ne/const.wat
index 83fec277a1..ba0d8768cd 100644
--- a/tests/disas/winch/aarch64/f64_ne/const.wat
+++ b/tests/disas/winch/aarch64/f64_ne/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ne/locals.wat b/tests/disas/winch/aarch64/f64_ne/locals.wat
index 619e3c635c..9d0b774e18 100644
--- a/tests/disas/winch/aarch64/f64_ne/locals.wat
+++ b/tests/disas/winch/aarch64/f64_ne/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_ne/params.wat b/tests/disas/winch/aarch64/f64_ne/params.wat
index 8f3fb90908..d58565d7b9 100644
--- a/tests/disas/winch/aarch64/f64_ne/params.wat
+++ b/tests/disas/winch/aarch64/f64_ne/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat
index df158bc22b..aae2523d23 100644
--- a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat
+++ b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat
index f68aba109e..d07e4b5928 100644
--- a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat
+++ b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat b/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat
index 2776cb5ec0..8d9103e7c4 100644
--- a/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat
+++ b/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat b/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat
index 87fa8de361..6a89b468a7 100644
--- a/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat
+++ b/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_promote_f32/const.wat b/tests/disas/winch/aarch64/f64_promote_f32/const.wat
index 05e2c066c9..d226a17929 100644
--- a/tests/disas/winch/aarch64/f64_promote_f32/const.wat
+++ b/tests/disas/winch/aarch64/f64_promote_f32/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_promote_f32/locals.wat b/tests/disas/winch/aarch64/f64_promote_f32/locals.wat
index f60cd611ca..178cd454f8 100644
--- a/tests/disas/winch/aarch64/f64_promote_f32/locals.wat
+++ b/tests/disas/winch/aarch64/f64_promote_f32/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_promote_f32/params.wat b/tests/disas/winch/aarch64/f64_promote_f32/params.wat
index 4f44b8a318..1151a22634 100644
--- a/tests/disas/winch/aarch64/f64_promote_f32/params.wat
+++ b/tests/disas/winch/aarch64/f64_promote_f32/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat
index 4bf58a0505..2d7a768649 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat
index 273b7e05f3..b2b09ccfe0 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat
index 04c04fdc62..27aa5e1ffa 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat
index 89436c0ca6..65098218d5 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat
index ad1711867c..db891e5953 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat
index 2c9fe8c15e..9323a40add 100644
--- a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat
+++ b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat
index 6cd904f780..9bee443327 100644
--- a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat
+++ b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_sub/const.wat b/tests/disas/winch/aarch64/f64_sub/const.wat
index 53f12843ba..454b20a0c9 100644
--- a/tests/disas/winch/aarch64/f64_sub/const.wat
+++ b/tests/disas/winch/aarch64/f64_sub/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_sub/locals.wat b/tests/disas/winch/aarch64/f64_sub/locals.wat
index 2fc6ff64e8..8f74027b70 100644
--- a/tests/disas/winch/aarch64/f64_sub/locals.wat
+++ b/tests/disas/winch/aarch64/f64_sub/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_sub/params.wat b/tests/disas/winch/aarch64/f64_sub/params.wat
index 8171944aed..df38171a0a 100644
--- a/tests/disas/winch/aarch64/f64_sub/params.wat
+++ b/tests/disas/winch/aarch64/f64_sub/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat
index ccaf025b73..f4ec90fce6 100644
--- a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat
+++ b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat
index 96187f0b2a..4709be4978 100644
--- a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat
+++ b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/const.wat b/tests/disas/winch/aarch64/i32_add/const.wat
index 0aa89c17fe..0f3bcb7d7d 100644
--- a/tests/disas/winch/aarch64/i32_add/const.wat
+++ b/tests/disas/winch/aarch64/i32_add/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/locals.wat b/tests/disas/winch/aarch64/i32_add/locals.wat
index 3ded58e9e9..d75948e8c7 100644
--- a/tests/disas/winch/aarch64/i32_add/locals.wat
+++ b/tests/disas/winch/aarch64/i32_add/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/max.wat b/tests/disas/winch/aarch64/i32_add/max.wat
index cfa55b62d2..e38b7bafc4 100644
--- a/tests/disas/winch/aarch64/i32_add/max.wat
+++ b/tests/disas/winch/aarch64/i32_add/max.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/max_one.wat b/tests/disas/winch/aarch64/i32_add/max_one.wat
index d1dd7e58c9..f2e8618d36 100644
--- a/tests/disas/winch/aarch64/i32_add/max_one.wat
+++ b/tests/disas/winch/aarch64/i32_add/max_one.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/mixed.wat b/tests/disas/winch/aarch64/i32_add/mixed.wat
index f4ef2f5d26..647a5367da 100644
--- a/tests/disas/winch/aarch64/i32_add/mixed.wat
+++ b/tests/disas/winch/aarch64/i32_add/mixed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/params.wat b/tests/disas/winch/aarch64/i32_add/params.wat
index 7cab94b6fd..7321d041b4 100644
--- a/tests/disas/winch/aarch64/i32_add/params.wat
+++ b/tests/disas/winch/aarch64/i32_add/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/signed.wat b/tests/disas/winch/aarch64/i32_add/signed.wat
index 9f1f67fff3..77e734a091 100644
--- a/tests/disas/winch/aarch64/i32_add/signed.wat
+++ b/tests/disas/winch/aarch64/i32_add/signed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat
index 8bbf6d0e8e..18b9a0df16 100644
--- a/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_and/const.wat b/tests/disas/winch/aarch64/i32_and/const.wat
index 3b503cd111..59f61709e7 100644
--- a/tests/disas/winch/aarch64/i32_and/const.wat
+++ b/tests/disas/winch/aarch64/i32_and/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_and/locals.wat b/tests/disas/winch/aarch64/i32_and/locals.wat
index f0e2fe3641..3d5ef6be50 100644
--- a/tests/disas/winch/aarch64/i32_and/locals.wat
+++ b/tests/disas/winch/aarch64/i32_and/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_and/params.wat b/tests/disas/winch/aarch64/i32_and/params.wat
index 6ebd044c33..e55c61f4a0 100644
--- a/tests/disas/winch/aarch64/i32_and/params.wat
+++ b/tests/disas/winch/aarch64/i32_and/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_clz/const.wat b/tests/disas/winch/aarch64/i32_clz/const.wat
index 1f8465e39a..9b26934cbf 100644
--- a/tests/disas/winch/aarch64/i32_clz/const.wat
+++ b/tests/disas/winch/aarch64/i32_clz/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_clz/locals.wat b/tests/disas/winch/aarch64/i32_clz/locals.wat
index 7d7da92762..24543884b3 100644
--- a/tests/disas/winch/aarch64/i32_clz/locals.wat
+++ b/tests/disas/winch/aarch64/i32_clz/locals.wat
@@ -17,7 +17,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_clz/params.wat b/tests/disas/winch/aarch64/i32_clz/params.wat
index 9d78b5198a..1b0823ebb3 100644
--- a/tests/disas/winch/aarch64/i32_clz/params.wat
+++ b/tests/disas/winch/aarch64/i32_clz/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ctz/const.wat b/tests/disas/winch/aarch64/i32_ctz/const.wat
index 7a320a02f7..1bfd92a789 100644
--- a/tests/disas/winch/aarch64/i32_ctz/const.wat
+++ b/tests/disas/winch/aarch64/i32_ctz/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ctz/locals.wat b/tests/disas/winch/aarch64/i32_ctz/locals.wat
index b916691e02..d853ca67e8 100644
--- a/tests/disas/winch/aarch64/i32_ctz/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ctz/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ctz/params.wat b/tests/disas/winch/aarch64/i32_ctz/params.wat
index f550f42a18..6bc2bd213d 100644
--- a/tests/disas/winch/aarch64/i32_ctz/params.wat
+++ b/tests/disas/winch/aarch64/i32_ctz/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divs/const.wat b/tests/disas/winch/aarch64/i32_divs/const.wat
index 2da98641d0..97722b9321 100644
--- a/tests/disas/winch/aarch64/i32_divs/const.wat
+++ b/tests/disas/winch/aarch64/i32_divs/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divs/one_zero.wat b/tests/disas/winch/aarch64/i32_divs/one_zero.wat
index 0965ab2c97..67d5bb8787 100644
--- a/tests/disas/winch/aarch64/i32_divs/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divs/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divs/overflow.wat b/tests/disas/winch/aarch64/i32_divs/overflow.wat
index 14b4bd156d..d7736b3a43 100644
--- a/tests/disas/winch/aarch64/i32_divs/overflow.wat
+++ b/tests/disas/winch/aarch64/i32_divs/overflow.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divs/params.wat b/tests/disas/winch/aarch64/i32_divs/params.wat
index 3e4aaf8bef..75ed3ecddc 100644
--- a/tests/disas/winch/aarch64/i32_divs/params.wat
+++ b/tests/disas/winch/aarch64/i32_divs/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divs/zero_zero.wat b/tests/disas/winch/aarch64/i32_divs/zero_zero.wat
index 81d6354f14..0411ef6aa2 100644
--- a/tests/disas/winch/aarch64/i32_divs/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divs/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divu/const.wat b/tests/disas/winch/aarch64/i32_divu/const.wat
index 801a417687..1299fee706 100644
--- a/tests/disas/winch/aarch64/i32_divu/const.wat
+++ b/tests/disas/winch/aarch64/i32_divu/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divu/one_zero.wat b/tests/disas/winch/aarch64/i32_divu/one_zero.wat
index 407ae9fd80..57fe89c7cf 100644
--- a/tests/disas/winch/aarch64/i32_divu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divu/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divu/params.wat b/tests/disas/winch/aarch64/i32_divu/params.wat
index da82352103..f375f0d42f 100644
--- a/tests/disas/winch/aarch64/i32_divu/params.wat
+++ b/tests/disas/winch/aarch64/i32_divu/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divu/signed.wat b/tests/disas/winch/aarch64/i32_divu/signed.wat
index 371633b39a..67a7140336 100644
--- a/tests/disas/winch/aarch64/i32_divu/signed.wat
+++ b/tests/disas/winch/aarch64/i32_divu/signed.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_divu/zero_zero.wat b/tests/disas/winch/aarch64/i32_divu/zero_zero.wat
index f7f8453251..b9fb07e159 100644
--- a/tests/disas/winch/aarch64/i32_divu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divu/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_eq/const.wat b/tests/disas/winch/aarch64/i32_eq/const.wat
index 7a45579cd1..224cd99a59 100644
--- a/tests/disas/winch/aarch64/i32_eq/const.wat
+++ b/tests/disas/winch/aarch64/i32_eq/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_eq/locals.wat b/tests/disas/winch/aarch64/i32_eq/locals.wat
index 7703c01b45..0241439f82 100644
--- a/tests/disas/winch/aarch64/i32_eq/locals.wat
+++ b/tests/disas/winch/aarch64/i32_eq/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_eq/params.wat b/tests/disas/winch/aarch64/i32_eq/params.wat
index 3668b3a7cf..234f42c1bc 100644
--- a/tests/disas/winch/aarch64/i32_eq/params.wat
+++ b/tests/disas/winch/aarch64/i32_eq/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_extend_16_s/const.wat b/tests/disas/winch/aarch64/i32_extend_16_s/const.wat
index ccd809f58b..a6d5d884d1 100644
--- a/tests/disas/winch/aarch64/i32_extend_16_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_extend_16_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat b/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat
index 5fc65c8d0d..dd6b13d011 100644
--- a/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_extend_16_s/params.wat b/tests/disas/winch/aarch64/i32_extend_16_s/params.wat
index 59c018cdc1..78dc5c0815 100644
--- a/tests/disas/winch/aarch64/i32_extend_16_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_extend_16_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_extend_8_s/const.wat b/tests/disas/winch/aarch64/i32_extend_8_s/const.wat
index e730db12e9..a8e4f1b003 100644
--- a/tests/disas/winch/aarch64/i32_extend_8_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_extend_8_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat b/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat
index 8f3e3a252f..05c1550bbc 100644
--- a/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_extend_8_s/params.wat b/tests/disas/winch/aarch64/i32_extend_8_s/params.wat
index d755643d61..6217b720d6 100644
--- a/tests/disas/winch/aarch64/i32_extend_8_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_extend_8_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ge_s/const.wat b/tests/disas/winch/aarch64/i32_ge_s/const.wat
index d3091ee627..0101fc9b34 100644
--- a/tests/disas/winch/aarch64/i32_ge_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_ge_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ge_s/locals.wat b/tests/disas/winch/aarch64/i32_ge_s/locals.wat
index d7bfe5468c..88afc6078a 100644
--- a/tests/disas/winch/aarch64/i32_ge_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ge_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ge_s/params.wat b/tests/disas/winch/aarch64/i32_ge_s/params.wat
index 665eb78d7c..08664e4cb4 100644
--- a/tests/disas/winch/aarch64/i32_ge_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_ge_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ge_u/const.wat b/tests/disas/winch/aarch64/i32_ge_u/const.wat
index c2f578df67..c20f830ab1 100644
--- a/tests/disas/winch/aarch64/i32_ge_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_ge_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ge_u/locals.wat b/tests/disas/winch/aarch64/i32_ge_u/locals.wat
index 4667c08839..99d1ac964b 100644
--- a/tests/disas/winch/aarch64/i32_ge_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ge_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ge_u/params.wat b/tests/disas/winch/aarch64/i32_ge_u/params.wat
index 94bf2f723c..d9db849d75 100644
--- a/tests/disas/winch/aarch64/i32_ge_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_ge_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_gt_s/const.wat b/tests/disas/winch/aarch64/i32_gt_s/const.wat
index 4f1b6ce6ea..7157a758fb 100644
--- a/tests/disas/winch/aarch64/i32_gt_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_gt_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_gt_s/locals.wat b/tests/disas/winch/aarch64/i32_gt_s/locals.wat
index 8c2d55ea65..f009f21d29 100644
--- a/tests/disas/winch/aarch64/i32_gt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_gt_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_gt_s/params.wat b/tests/disas/winch/aarch64/i32_gt_s/params.wat
index 5e2e340b88..c3a0d9a176 100644
--- a/tests/disas/winch/aarch64/i32_gt_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_gt_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_gt_u/const.wat b/tests/disas/winch/aarch64/i32_gt_u/const.wat
index 1694d65d1c..85833c6a09 100644
--- a/tests/disas/winch/aarch64/i32_gt_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_gt_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_gt_u/locals.wat b/tests/disas/winch/aarch64/i32_gt_u/locals.wat
index e96126dca6..c534ee302a 100644
--- a/tests/disas/winch/aarch64/i32_gt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_gt_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_gt_u/params.wat b/tests/disas/winch/aarch64/i32_gt_u/params.wat
index 7e5476f3f2..0c4f0da42a 100644
--- a/tests/disas/winch/aarch64/i32_gt_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_gt_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_le_s/const.wat b/tests/disas/winch/aarch64/i32_le_s/const.wat
index 15be668b71..76f3e014be 100644
--- a/tests/disas/winch/aarch64/i32_le_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_le_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_le_s/locals.wat b/tests/disas/winch/aarch64/i32_le_s/locals.wat
index 8ff8067a7f..729c6710d9 100644
--- a/tests/disas/winch/aarch64/i32_le_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_le_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_le_s/params.wat b/tests/disas/winch/aarch64/i32_le_s/params.wat
index 984664ca95..deb243bf56 100644
--- a/tests/disas/winch/aarch64/i32_le_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_le_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_le_u/const.wat b/tests/disas/winch/aarch64/i32_le_u/const.wat
index d0fb78088e..70c8e08040 100644
--- a/tests/disas/winch/aarch64/i32_le_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_le_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_le_u/locals.wat b/tests/disas/winch/aarch64/i32_le_u/locals.wat
index 04cac5d33b..724436de76 100644
--- a/tests/disas/winch/aarch64/i32_le_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_le_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_le_u/params.wat b/tests/disas/winch/aarch64/i32_le_u/params.wat
index c007d80afb..6061068a4b 100644
--- a/tests/disas/winch/aarch64/i32_le_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_le_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_lt_s/const.wat b/tests/disas/winch/aarch64/i32_lt_s/const.wat
index 59c8c0382f..4625c7f3e5 100644
--- a/tests/disas/winch/aarch64/i32_lt_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_lt_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_lt_s/locals.wat b/tests/disas/winch/aarch64/i32_lt_s/locals.wat
index 43210d7b96..f28cc9afd0 100644
--- a/tests/disas/winch/aarch64/i32_lt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_lt_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_lt_s/params.wat b/tests/disas/winch/aarch64/i32_lt_s/params.wat
index cde361db06..f504f7a8a8 100644
--- a/tests/disas/winch/aarch64/i32_lt_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_lt_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_lt_u/const.wat b/tests/disas/winch/aarch64/i32_lt_u/const.wat
index a0cdd3db11..4364bbfb13 100644
--- a/tests/disas/winch/aarch64/i32_lt_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_lt_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_lt_u/locals.wat b/tests/disas/winch/aarch64/i32_lt_u/locals.wat
index f2e72f312d..40653bd762 100644
--- a/tests/disas/winch/aarch64/i32_lt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_lt_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_lt_u/params.wat b/tests/disas/winch/aarch64/i32_lt_u/params.wat
index 7a1bd03bd2..c0f7eac728 100644
--- a/tests/disas/winch/aarch64/i32_lt_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_lt_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/const.wat b/tests/disas/winch/aarch64/i32_mul/const.wat
index 1c7ce0c3b8..f56fbd7219 100644
--- a/tests/disas/winch/aarch64/i32_mul/const.wat
+++ b/tests/disas/winch/aarch64/i32_mul/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/locals.wat b/tests/disas/winch/aarch64/i32_mul/locals.wat
index 50bee40ce3..8c3fb56367 100644
--- a/tests/disas/winch/aarch64/i32_mul/locals.wat
+++ b/tests/disas/winch/aarch64/i32_mul/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/max.wat b/tests/disas/winch/aarch64/i32_mul/max.wat
index 4c975fa494..4351b3e9b2 100644
--- a/tests/disas/winch/aarch64/i32_mul/max.wat
+++ b/tests/disas/winch/aarch64/i32_mul/max.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/max_one.wat b/tests/disas/winch/aarch64/i32_mul/max_one.wat
index 722042ccef..75ae949c8a 100644
--- a/tests/disas/winch/aarch64/i32_mul/max_one.wat
+++ b/tests/disas/winch/aarch64/i32_mul/max_one.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/mixed.wat b/tests/disas/winch/aarch64/i32_mul/mixed.wat
index f191853a99..1c8bc14772 100644
--- a/tests/disas/winch/aarch64/i32_mul/mixed.wat
+++ b/tests/disas/winch/aarch64/i32_mul/mixed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/params.wat b/tests/disas/winch/aarch64/i32_mul/params.wat
index 4b5a8271ec..d45d489207 100644
--- a/tests/disas/winch/aarch64/i32_mul/params.wat
+++ b/tests/disas/winch/aarch64/i32_mul/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/signed.wat b/tests/disas/winch/aarch64/i32_mul/signed.wat
index 7beafb2535..68d4f34c60 100644
--- a/tests/disas/winch/aarch64/i32_mul/signed.wat
+++ b/tests/disas/winch/aarch64/i32_mul/signed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat
index 1e435a9479..bc7fdc8214 100644
--- a/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ne/const.wat b/tests/disas/winch/aarch64/i32_ne/const.wat
index 502ac022a0..1179bde8c0 100644
--- a/tests/disas/winch/aarch64/i32_ne/const.wat
+++ b/tests/disas/winch/aarch64/i32_ne/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ne/locals.wat b/tests/disas/winch/aarch64/i32_ne/locals.wat
index 12eb89a65f..82c573072e 100644
--- a/tests/disas/winch/aarch64/i32_ne/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ne/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_ne/params.wat b/tests/disas/winch/aarch64/i32_ne/params.wat
index 576b240442..a093f38c72 100644
--- a/tests/disas/winch/aarch64/i32_ne/params.wat
+++ b/tests/disas/winch/aarch64/i32_ne/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_or/const.wat b/tests/disas/winch/aarch64/i32_or/const.wat
index 2a92f1409f..3210f342f6 100644
--- a/tests/disas/winch/aarch64/i32_or/const.wat
+++ b/tests/disas/winch/aarch64/i32_or/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_or/locals.wat b/tests/disas/winch/aarch64/i32_or/locals.wat
index 5311caeb5d..783a232aff 100644
--- a/tests/disas/winch/aarch64/i32_or/locals.wat
+++ b/tests/disas/winch/aarch64/i32_or/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_or/params.wat b/tests/disas/winch/aarch64/i32_or/params.wat
index b8b372a355..dfa031ea98 100644
--- a/tests/disas/winch/aarch64/i32_or/params.wat
+++ b/tests/disas/winch/aarch64/i32_or/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_popcnt/const.wat b/tests/disas/winch/aarch64/i32_popcnt/const.wat
index d08d3bb714..fe0d0bda1a 100644
--- a/tests/disas/winch/aarch64/i32_popcnt/const.wat
+++ b/tests/disas/winch/aarch64/i32_popcnt/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_popcnt/reg.wat b/tests/disas/winch/aarch64/i32_popcnt/reg.wat
index 181f16ed8f..cb5f7605ac 100644
--- a/tests/disas/winch/aarch64/i32_popcnt/reg.wat
+++ b/tests/disas/winch/aarch64/i32_popcnt/reg.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat
index 4dc317c066..c8f7d14c81 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat
index d0f44f03da..9b4663c082 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat
index 213b40e51f..fd339c1326 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat
index e18dcc7bc0..68b045d35b 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rems/const.wat b/tests/disas/winch/aarch64/i32_rems/const.wat
index 2f77e81c8a..6221aa1997 100644
--- a/tests/disas/winch/aarch64/i32_rems/const.wat
+++ b/tests/disas/winch/aarch64/i32_rems/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rems/one_zero.wat b/tests/disas/winch/aarch64/i32_rems/one_zero.wat
index 9fe77bb1bf..27ff43e9b3 100644
--- a/tests/disas/winch/aarch64/i32_rems/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_rems/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rems/overflow.wat b/tests/disas/winch/aarch64/i32_rems/overflow.wat
index a6dbb71510..b75d2d0bcc 100644
--- a/tests/disas/winch/aarch64/i32_rems/overflow.wat
+++ b/tests/disas/winch/aarch64/i32_rems/overflow.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rems/params.wat b/tests/disas/winch/aarch64/i32_rems/params.wat
index e52a31c9e9..45c90d253d 100644
--- a/tests/disas/winch/aarch64/i32_rems/params.wat
+++ b/tests/disas/winch/aarch64/i32_rems/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rems/zero_zero.wat b/tests/disas/winch/aarch64/i32_rems/zero_zero.wat
index 33f01c5b4d..b182177497 100644
--- a/tests/disas/winch/aarch64/i32_rems/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_rems/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_remu/const.wat b/tests/disas/winch/aarch64/i32_remu/const.wat
index ddece345bc..5a14683315 100644
--- a/tests/disas/winch/aarch64/i32_remu/const.wat
+++ b/tests/disas/winch/aarch64/i32_remu/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_remu/one_zero.wat b/tests/disas/winch/aarch64/i32_remu/one_zero.wat
index 2fbbbcf2b4..d957fdb01b 100644
--- a/tests/disas/winch/aarch64/i32_remu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_remu/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_remu/params.wat b/tests/disas/winch/aarch64/i32_remu/params.wat
index d6eac0ca37..fa4cc3b0a6 100644
--- a/tests/disas/winch/aarch64/i32_remu/params.wat
+++ b/tests/disas/winch/aarch64/i32_remu/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_remu/signed.wat b/tests/disas/winch/aarch64/i32_remu/signed.wat
index 3ef16ff11b..426e5c982e 100644
--- a/tests/disas/winch/aarch64/i32_remu/signed.wat
+++ b/tests/disas/winch/aarch64/i32_remu/signed.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_remu/zero_zero.wat b/tests/disas/winch/aarch64/i32_remu/zero_zero.wat
index a8f20002a2..6171a826e4 100644
--- a/tests/disas/winch/aarch64/i32_remu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_remu/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotl/16_const.wat b/tests/disas/winch/aarch64/i32_rotl/16_const.wat
index 98a6834b85..d633ba3963 100644
--- a/tests/disas/winch/aarch64/i32_rotl/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotl/8_const.wat b/tests/disas/winch/aarch64/i32_rotl/8_const.wat
index 63ba50a657..40b3e6d62c 100644
--- a/tests/disas/winch/aarch64/i32_rotl/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotl/locals.wat b/tests/disas/winch/aarch64/i32_rotl/locals.wat
index 1dd974ddca..abd9df83c3 100644
--- a/tests/disas/winch/aarch64/i32_rotl/locals.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotl/params.wat b/tests/disas/winch/aarch64/i32_rotl/params.wat
index c086317485..ee64fd4522 100644
--- a/tests/disas/winch/aarch64/i32_rotl/params.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotr/16_const.wat b/tests/disas/winch/aarch64/i32_rotr/16_const.wat
index db815fde41..79e295382f 100644
--- a/tests/disas/winch/aarch64/i32_rotr/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotr/8_const.wat b/tests/disas/winch/aarch64/i32_rotr/8_const.wat
index b623fe1257..b0b834135b 100644
--- a/tests/disas/winch/aarch64/i32_rotr/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotr/locals.wat b/tests/disas/winch/aarch64/i32_rotr/locals.wat
index 9b7cd316a0..99e82efeec 100644
--- a/tests/disas/winch/aarch64/i32_rotr/locals.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_rotr/params.wat b/tests/disas/winch/aarch64/i32_rotr/params.wat
index 92e7679c99..4e69aa80ff 100644
--- a/tests/disas/winch/aarch64/i32_rotr/params.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shl/16_const.wat b/tests/disas/winch/aarch64/i32_shl/16_const.wat
index 710d975566..0b804241a0 100644
--- a/tests/disas/winch/aarch64/i32_shl/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_shl/16_const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shl/8_const.wat b/tests/disas/winch/aarch64/i32_shl/8_const.wat
index ee4d598db8..12e842cffd 100644
--- a/tests/disas/winch/aarch64/i32_shl/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_shl/8_const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shl/imm.wat b/tests/disas/winch/aarch64/i32_shl/imm.wat
index 9d56e4f91f..73fc51afc9 100644
--- a/tests/disas/winch/aarch64/i32_shl/imm.wat
+++ b/tests/disas/winch/aarch64/i32_shl/imm.wat
@@ -20,7 +20,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shl/locals.wat b/tests/disas/winch/aarch64/i32_shl/locals.wat
index 06f85c989c..1500d2e22c 100644
--- a/tests/disas/winch/aarch64/i32_shl/locals.wat
+++ b/tests/disas/winch/aarch64/i32_shl/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shl/params.wat b/tests/disas/winch/aarch64/i32_shl/params.wat
index 486101777a..f8f367d26d 100644
--- a/tests/disas/winch/aarch64/i32_shl/params.wat
+++ b/tests/disas/winch/aarch64/i32_shl/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_s/16_const.wat b/tests/disas/winch/aarch64/i32_shr_s/16_const.wat
index 6e386d9928..f2b0da3948 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_s/8_const.wat b/tests/disas/winch/aarch64/i32_shr_s/8_const.wat
index a9cf490dcc..8999c2cd2e 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_s/locals.wat b/tests/disas/winch/aarch64/i32_shr_s/locals.wat
index c8db1a862a..1e663d7b9c 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_s/params.wat b/tests/disas/winch/aarch64/i32_shr_s/params.wat
index 10e2525a7f..dab7b8e3c4 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_u/16_const.wat b/tests/disas/winch/aarch64/i32_shr_u/16_const.wat
index adcb675548..accf5fcd35 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_u/8_const.wat b/tests/disas/winch/aarch64/i32_shr_u/8_const.wat
index 2962f5f17c..537e867583 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_u/locals.wat b/tests/disas/winch/aarch64/i32_shr_u/locals.wat
index e7fed28add..85020fb103 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_shr_u/params.wat b/tests/disas/winch/aarch64/i32_shr_u/params.wat
index ee6acd8696..7a039b33c1 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/const.wat b/tests/disas/winch/aarch64/i32_sub/const.wat
index 2c824def4e..e6c9153a96 100644
--- a/tests/disas/winch/aarch64/i32_sub/const.wat
+++ b/tests/disas/winch/aarch64/i32_sub/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/locals.wat b/tests/disas/winch/aarch64/i32_sub/locals.wat
index 78db7c8c20..7010935a8c 100644
--- a/tests/disas/winch/aarch64/i32_sub/locals.wat
+++ b/tests/disas/winch/aarch64/i32_sub/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/max.wat b/tests/disas/winch/aarch64/i32_sub/max.wat
index 3622879706..8fd8ab9544 100644
--- a/tests/disas/winch/aarch64/i32_sub/max.wat
+++ b/tests/disas/winch/aarch64/i32_sub/max.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/max_one.wat b/tests/disas/winch/aarch64/i32_sub/max_one.wat
index 1d96ceb58a..8fc4e424e1 100644
--- a/tests/disas/winch/aarch64/i32_sub/max_one.wat
+++ b/tests/disas/winch/aarch64/i32_sub/max_one.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/mixed.wat b/tests/disas/winch/aarch64/i32_sub/mixed.wat
index a3d6d731e3..f2e205bc52 100644
--- a/tests/disas/winch/aarch64/i32_sub/mixed.wat
+++ b/tests/disas/winch/aarch64/i32_sub/mixed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/params.wat b/tests/disas/winch/aarch64/i32_sub/params.wat
index daab0bde9f..95338ca146 100644
--- a/tests/disas/winch/aarch64/i32_sub/params.wat
+++ b/tests/disas/winch/aarch64/i32_sub/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/signed.wat b/tests/disas/winch/aarch64/i32_sub/signed.wat
index ac3c47f0c1..d0e548b5df 100644
--- a/tests/disas/winch/aarch64/i32_sub/signed.wat
+++ b/tests/disas/winch/aarch64/i32_sub/signed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat
index 5315c9a99b..f18bb80af9 100644
--- a/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat b/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat
index af129a78ce..ebf9a2d5a2 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat
index d3005cf749..5a9e6442a8 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat b/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat
index e38e46b4cd..c34416ac06 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat b/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat
index 6f9b7ef1df..6d106f1b4c 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat
index d1e635a099..6eeadd567f 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat b/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat
index 36e09ba1f5..5393be570f 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat b/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat
index c54cb23557..ce7afbcb9f 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat
index 55e1bac7c3..9eef21a359 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat b/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat
index 7533c7a18f..8c457bc508 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat b/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat
index d17c3ac4ca..829855d2f7 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat
index 6f6a4b7543..0b5e47c400 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat b/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat
index 0ec41883a2..6cfda95fc1 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_wrap_i64/const.wat b/tests/disas/winch/aarch64/i32_wrap_i64/const.wat
index a0824a417f..5d069064b3 100644
--- a/tests/disas/winch/aarch64/i32_wrap_i64/const.wat
+++ b/tests/disas/winch/aarch64/i32_wrap_i64/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat b/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat
index 30ea193f3c..522ff2903f 100644
--- a/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat
+++ b/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_wrap_i64/params.wat b/tests/disas/winch/aarch64/i32_wrap_i64/params.wat
index 96987b153f..c585fffd4a 100644
--- a/tests/disas/winch/aarch64/i32_wrap_i64/params.wat
+++ b/tests/disas/winch/aarch64/i32_wrap_i64/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_xor/const.wat b/tests/disas/winch/aarch64/i32_xor/const.wat
index 971f09f998..3b60d0a6a6 100644
--- a/tests/disas/winch/aarch64/i32_xor/const.wat
+++ b/tests/disas/winch/aarch64/i32_xor/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_xor/locals.wat b/tests/disas/winch/aarch64/i32_xor/locals.wat
index e65d5d242b..49bf429f7f 100644
--- a/tests/disas/winch/aarch64/i32_xor/locals.wat
+++ b/tests/disas/winch/aarch64/i32_xor/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i32_xor/params.wat b/tests/disas/winch/aarch64/i32_xor/params.wat
index 912b78e2ea..6e33101f0e 100644
--- a/tests/disas/winch/aarch64/i32_xor/params.wat
+++ b/tests/disas/winch/aarch64/i32_xor/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/const.wat b/tests/disas/winch/aarch64/i64_add/const.wat
index 872f35d067..7a87822547 100644
--- a/tests/disas/winch/aarch64/i64_add/const.wat
+++ b/tests/disas/winch/aarch64/i64_add/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/locals.wat b/tests/disas/winch/aarch64/i64_add/locals.wat
index 30ff9e67b0..d6b45a1b26 100644
--- a/tests/disas/winch/aarch64/i64_add/locals.wat
+++ b/tests/disas/winch/aarch64/i64_add/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/max.wat b/tests/disas/winch/aarch64/i64_add/max.wat
index 3d4a1c38e7..7c24f1faa4 100644
--- a/tests/disas/winch/aarch64/i64_add/max.wat
+++ b/tests/disas/winch/aarch64/i64_add/max.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/max_one.wat b/tests/disas/winch/aarch64/i64_add/max_one.wat
index da2278f38d..e300fe7f93 100644
--- a/tests/disas/winch/aarch64/i64_add/max_one.wat
+++ b/tests/disas/winch/aarch64/i64_add/max_one.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/mixed.wat b/tests/disas/winch/aarch64/i64_add/mixed.wat
index 91ec9b85f3..d43bdc3cbe 100644
--- a/tests/disas/winch/aarch64/i64_add/mixed.wat
+++ b/tests/disas/winch/aarch64/i64_add/mixed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/params.wat b/tests/disas/winch/aarch64/i64_add/params.wat
index 4c29c88378..96da5ef96b 100644
--- a/tests/disas/winch/aarch64/i64_add/params.wat
+++ b/tests/disas/winch/aarch64/i64_add/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/signed.wat b/tests/disas/winch/aarch64/i64_add/signed.wat
index 7df286bb91..de0023bedc 100644
--- a/tests/disas/winch/aarch64/i64_add/signed.wat
+++ b/tests/disas/winch/aarch64/i64_add/signed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat
index 1e9cf7a407..021c2c1245 100644
--- a/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_and/32_const.wat b/tests/disas/winch/aarch64/i64_and/32_const.wat
index 00a108bac6..13bb0be7c4 100644
--- a/tests/disas/winch/aarch64/i64_and/32_const.wat
+++ b/tests/disas/winch/aarch64/i64_and/32_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_and/64_const.wat b/tests/disas/winch/aarch64/i64_and/64_const.wat
index 67a92962bf..c66edf9569 100644
--- a/tests/disas/winch/aarch64/i64_and/64_const.wat
+++ b/tests/disas/winch/aarch64/i64_and/64_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_and/locals.wat b/tests/disas/winch/aarch64/i64_and/locals.wat
index c4279ecbe5..680c356afd 100644
--- a/tests/disas/winch/aarch64/i64_and/locals.wat
+++ b/tests/disas/winch/aarch64/i64_and/locals.wat
@@ -22,7 +22,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_and/params.wat b/tests/disas/winch/aarch64/i64_and/params.wat
index 702bf5a19f..a8361585e6 100644
--- a/tests/disas/winch/aarch64/i64_and/params.wat
+++ b/tests/disas/winch/aarch64/i64_and/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_clz/const.wat b/tests/disas/winch/aarch64/i64_clz/const.wat
index 5dab46ca6c..4eca4fa20b 100644
--- a/tests/disas/winch/aarch64/i64_clz/const.wat
+++ b/tests/disas/winch/aarch64/i64_clz/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_clz/locals.wat b/tests/disas/winch/aarch64/i64_clz/locals.wat
index 6c9db434ad..15d465cfdb 100644
--- a/tests/disas/winch/aarch64/i64_clz/locals.wat
+++ b/tests/disas/winch/aarch64/i64_clz/locals.wat
@@ -17,7 +17,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_clz/params.wat b/tests/disas/winch/aarch64/i64_clz/params.wat
index c73d3c51ff..c80661babf 100644
--- a/tests/disas/winch/aarch64/i64_clz/params.wat
+++ b/tests/disas/winch/aarch64/i64_clz/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ctz/const.wat b/tests/disas/winch/aarch64/i64_ctz/const.wat
index 71d0dbc403..115f5056b9 100644
--- a/tests/disas/winch/aarch64/i64_ctz/const.wat
+++ b/tests/disas/winch/aarch64/i64_ctz/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ctz/locals.wat b/tests/disas/winch/aarch64/i64_ctz/locals.wat
index b8e6b062b7..46d0809af5 100644
--- a/tests/disas/winch/aarch64/i64_ctz/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ctz/locals.wat
@@ -17,7 +17,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ctz/params.wat b/tests/disas/winch/aarch64/i64_ctz/params.wat
index 9dea2ceba2..101e22e68b 100644
--- a/tests/disas/winch/aarch64/i64_ctz/params.wat
+++ b/tests/disas/winch/aarch64/i64_ctz/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divs/const.wat b/tests/disas/winch/aarch64/i64_divs/const.wat
index 064fd3b588..6bf83a04b7 100644
--- a/tests/disas/winch/aarch64/i64_divs/const.wat
+++ b/tests/disas/winch/aarch64/i64_divs/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divs/one_zero.wat b/tests/disas/winch/aarch64/i64_divs/one_zero.wat
index 8dd5740018..29d7a30e69 100644
--- a/tests/disas/winch/aarch64/i64_divs/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divs/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divs/overflow.wat b/tests/disas/winch/aarch64/i64_divs/overflow.wat
index a49611fc30..cb06665e9a 100644
--- a/tests/disas/winch/aarch64/i64_divs/overflow.wat
+++ b/tests/disas/winch/aarch64/i64_divs/overflow.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divs/params.wat b/tests/disas/winch/aarch64/i64_divs/params.wat
index e5a0649667..c695f861f6 100644
--- a/tests/disas/winch/aarch64/i64_divs/params.wat
+++ b/tests/disas/winch/aarch64/i64_divs/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divs/zero_zero.wat b/tests/disas/winch/aarch64/i64_divs/zero_zero.wat
index 772e58ca70..6431cf9bd8 100644
--- a/tests/disas/winch/aarch64/i64_divs/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divs/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divu/const.wat b/tests/disas/winch/aarch64/i64_divu/const.wat
index cf8ded17c0..1599193c17 100644
--- a/tests/disas/winch/aarch64/i64_divu/const.wat
+++ b/tests/disas/winch/aarch64/i64_divu/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divu/one_zero.wat b/tests/disas/winch/aarch64/i64_divu/one_zero.wat
index ccfe91d56f..58d5a774ab 100644
--- a/tests/disas/winch/aarch64/i64_divu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divu/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divu/params.wat b/tests/disas/winch/aarch64/i64_divu/params.wat
index d157500b89..8b96163519 100644
--- a/tests/disas/winch/aarch64/i64_divu/params.wat
+++ b/tests/disas/winch/aarch64/i64_divu/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divu/signed.wat b/tests/disas/winch/aarch64/i64_divu/signed.wat
index 6a601719f4..f69396c285 100644
--- a/tests/disas/winch/aarch64/i64_divu/signed.wat
+++ b/tests/disas/winch/aarch64/i64_divu/signed.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_divu/zero_zero.wat b/tests/disas/winch/aarch64/i64_divu/zero_zero.wat
index 55540b5410..215ae5e9a8 100644
--- a/tests/disas/winch/aarch64/i64_divu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divu/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_eq/const.wat b/tests/disas/winch/aarch64/i64_eq/const.wat
index fbf5eb0f95..cbff73646a 100644
--- a/tests/disas/winch/aarch64/i64_eq/const.wat
+++ b/tests/disas/winch/aarch64/i64_eq/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_eq/locals.wat b/tests/disas/winch/aarch64/i64_eq/locals.wat
index 25d41c1f07..debeda91e3 100644
--- a/tests/disas/winch/aarch64/i64_eq/locals.wat
+++ b/tests/disas/winch/aarch64/i64_eq/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_eq/params.wat b/tests/disas/winch/aarch64/i64_eq/params.wat
index 97f836d17f..3cd8e99c51 100644
--- a/tests/disas/winch/aarch64/i64_eq/params.wat
+++ b/tests/disas/winch/aarch64/i64_eq/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_16_s/const.wat b/tests/disas/winch/aarch64/i64_extend_16_s/const.wat
index a13f3c07d3..ee8dab0a1b 100644
--- a/tests/disas/winch/aarch64/i64_extend_16_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_16_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat
index 3d8dedde13..ed28aae583 100644
--- a/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_16_s/params.wat b/tests/disas/winch/aarch64/i64_extend_16_s/params.wat
index a61dc9d5e7..902d8a8cd4 100644
--- a/tests/disas/winch/aarch64/i64_extend_16_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_16_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_32_s/const.wat b/tests/disas/winch/aarch64/i64_extend_32_s/const.wat
index 45ac5f9b09..b894f80d9b 100644
--- a/tests/disas/winch/aarch64/i64_extend_32_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_32_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat
index f00b910a35..1e07b09249 100644
--- a/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_32_s/params.wat b/tests/disas/winch/aarch64/i64_extend_32_s/params.wat
index 3bc594f010..592faba89f 100644
--- a/tests/disas/winch/aarch64/i64_extend_32_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_32_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_8_s/const.wat b/tests/disas/winch/aarch64/i64_extend_8_s/const.wat
index e68ccb745b..389c457c7e 100644
--- a/tests/disas/winch/aarch64/i64_extend_8_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_8_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat
index e577aafbcb..28a580528c 100644
--- a/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_8_s/params.wat b/tests/disas/winch/aarch64/i64_extend_8_s/params.wat
index e044a4e017..2da23a407d 100644
--- a/tests/disas/winch/aarch64/i64_extend_8_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_8_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat b/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat
index 5e5d797827..613d589b1e 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat
index 8c1478524a..a91670b875 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat b/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat
index 02deb53103..12a4636316 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat b/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat
index d9786d7a63..dab891e592 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat b/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat
index b6a47513af..a2cfa0a4ab 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat b/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat
index ffa546ab59..9adc9b2c23 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ge_s/const.wat b/tests/disas/winch/aarch64/i64_ge_s/const.wat
index 8b596508bd..b5fd369b4d 100644
--- a/tests/disas/winch/aarch64/i64_ge_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_ge_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ge_s/locals.wat b/tests/disas/winch/aarch64/i64_ge_s/locals.wat
index 9245ad4f1b..837ead01d4 100644
--- a/tests/disas/winch/aarch64/i64_ge_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ge_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ge_s/params.wat b/tests/disas/winch/aarch64/i64_ge_s/params.wat
index 3f8aaf4e11..6a55394f20 100644
--- a/tests/disas/winch/aarch64/i64_ge_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_ge_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ge_u/const.wat b/tests/disas/winch/aarch64/i64_ge_u/const.wat
index 7dbbd69193..c16e907b31 100644
--- a/tests/disas/winch/aarch64/i64_ge_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_ge_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ge_u/locals.wat b/tests/disas/winch/aarch64/i64_ge_u/locals.wat
index b1fd24a10c..4d35ad5a15 100644
--- a/tests/disas/winch/aarch64/i64_ge_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ge_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ge_u/params.wat b/tests/disas/winch/aarch64/i64_ge_u/params.wat
index d25a8d8d77..dd174c386b 100644
--- a/tests/disas/winch/aarch64/i64_ge_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_ge_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_gt_s/const.wat b/tests/disas/winch/aarch64/i64_gt_s/const.wat
index 26cb92e533..4a8f318515 100644
--- a/tests/disas/winch/aarch64/i64_gt_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_gt_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_gt_s/locals.wat b/tests/disas/winch/aarch64/i64_gt_s/locals.wat
index 429d690fef..2e00b60d1d 100644
--- a/tests/disas/winch/aarch64/i64_gt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_gt_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_gt_s/params.wat b/tests/disas/winch/aarch64/i64_gt_s/params.wat
index 8ab3122a92..dde0ca2769 100644
--- a/tests/disas/winch/aarch64/i64_gt_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_gt_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_gt_u/const.wat b/tests/disas/winch/aarch64/i64_gt_u/const.wat
index 8439b3219b..c7fdba5ff2 100644
--- a/tests/disas/winch/aarch64/i64_gt_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_gt_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_gt_u/locals.wat b/tests/disas/winch/aarch64/i64_gt_u/locals.wat
index 0cbe5b9bf9..e0f6ef7cec 100644
--- a/tests/disas/winch/aarch64/i64_gt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_gt_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_gt_u/params.wat b/tests/disas/winch/aarch64/i64_gt_u/params.wat
index 2fa1eafe24..582b12d017 100644
--- a/tests/disas/winch/aarch64/i64_gt_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_gt_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_le_s/const.wat b/tests/disas/winch/aarch64/i64_le_s/const.wat
index ac8a746fe4..b62b32b7eb 100644
--- a/tests/disas/winch/aarch64/i64_le_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_le_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_le_s/locals.wat b/tests/disas/winch/aarch64/i64_le_s/locals.wat
index f40c59a1bd..2e84df6e1e 100644
--- a/tests/disas/winch/aarch64/i64_le_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_le_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_le_s/params.wat b/tests/disas/winch/aarch64/i64_le_s/params.wat
index 1226183439..8a097664f5 100644
--- a/tests/disas/winch/aarch64/i64_le_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_le_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_le_u/const.wat b/tests/disas/winch/aarch64/i64_le_u/const.wat
index defa03943b..6943d33118 100644
--- a/tests/disas/winch/aarch64/i64_le_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_le_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_le_u/locals.wat b/tests/disas/winch/aarch64/i64_le_u/locals.wat
index 4f6befdf0a..e64aeadbf0 100644
--- a/tests/disas/winch/aarch64/i64_le_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_le_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_le_u/params.wat b/tests/disas/winch/aarch64/i64_le_u/params.wat
index 0542af73dd..d38f117a86 100644
--- a/tests/disas/winch/aarch64/i64_le_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_le_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_lt_s/const.wat b/tests/disas/winch/aarch64/i64_lt_s/const.wat
index a60d59eb4d..afd811389c 100644
--- a/tests/disas/winch/aarch64/i64_lt_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_lt_s/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_lt_s/locals.wat b/tests/disas/winch/aarch64/i64_lt_s/locals.wat
index f532faef09..efeb0d5e04 100644
--- a/tests/disas/winch/aarch64/i64_lt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_lt_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_lt_s/params.wat b/tests/disas/winch/aarch64/i64_lt_s/params.wat
index e325f4d13b..636b8a83be 100644
--- a/tests/disas/winch/aarch64/i64_lt_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_lt_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_lt_u/const.wat b/tests/disas/winch/aarch64/i64_lt_u/const.wat
index db40a88a63..a4d85254a3 100644
--- a/tests/disas/winch/aarch64/i64_lt_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_lt_u/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_lt_u/locals.wat b/tests/disas/winch/aarch64/i64_lt_u/locals.wat
index 42e1d67a98..eb5da4f3d0 100644
--- a/tests/disas/winch/aarch64/i64_lt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_lt_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_lt_u/params.wat b/tests/disas/winch/aarch64/i64_lt_u/params.wat
index 24931fabde..9ea854ded3 100644
--- a/tests/disas/winch/aarch64/i64_lt_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_lt_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/const.wat b/tests/disas/winch/aarch64/i64_mul/const.wat
index 502a0be4f2..6afa709bd5 100644
--- a/tests/disas/winch/aarch64/i64_mul/const.wat
+++ b/tests/disas/winch/aarch64/i64_mul/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/locals.wat b/tests/disas/winch/aarch64/i64_mul/locals.wat
index 182acc3213..33f60a23ad 100644
--- a/tests/disas/winch/aarch64/i64_mul/locals.wat
+++ b/tests/disas/winch/aarch64/i64_mul/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/max.wat b/tests/disas/winch/aarch64/i64_mul/max.wat
index 5d20aeff78..bd78df5af2 100644
--- a/tests/disas/winch/aarch64/i64_mul/max.wat
+++ b/tests/disas/winch/aarch64/i64_mul/max.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/max_one.wat b/tests/disas/winch/aarch64/i64_mul/max_one.wat
index bed89caa9e..de2cba7194 100644
--- a/tests/disas/winch/aarch64/i64_mul/max_one.wat
+++ b/tests/disas/winch/aarch64/i64_mul/max_one.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/mixed.wat b/tests/disas/winch/aarch64/i64_mul/mixed.wat
index 77f904d6a5..dcc654b947 100644
--- a/tests/disas/winch/aarch64/i64_mul/mixed.wat
+++ b/tests/disas/winch/aarch64/i64_mul/mixed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/params.wat b/tests/disas/winch/aarch64/i64_mul/params.wat
index e0d13df18b..7a4d732d0a 100644
--- a/tests/disas/winch/aarch64/i64_mul/params.wat
+++ b/tests/disas/winch/aarch64/i64_mul/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/signed.wat b/tests/disas/winch/aarch64/i64_mul/signed.wat
index f91c4f2792..cf4f07bdd5 100644
--- a/tests/disas/winch/aarch64/i64_mul/signed.wat
+++ b/tests/disas/winch/aarch64/i64_mul/signed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat
index 84579fbf0b..8686ecee04 100644
--- a/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ne/const.wat b/tests/disas/winch/aarch64/i64_ne/const.wat
index d2a763e873..707e9d9b2b 100644
--- a/tests/disas/winch/aarch64/i64_ne/const.wat
+++ b/tests/disas/winch/aarch64/i64_ne/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ne/locals.wat b/tests/disas/winch/aarch64/i64_ne/locals.wat
index 585051aa1d..be347fd98f 100644
--- a/tests/disas/winch/aarch64/i64_ne/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ne/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_ne/params.wat b/tests/disas/winch/aarch64/i64_ne/params.wat
index ff03a30752..d248596bc7 100644
--- a/tests/disas/winch/aarch64/i64_ne/params.wat
+++ b/tests/disas/winch/aarch64/i64_ne/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_or/32_const.wat b/tests/disas/winch/aarch64/i64_or/32_const.wat
index 9e54037e26..7a57ab96b7 100644
--- a/tests/disas/winch/aarch64/i64_or/32_const.wat
+++ b/tests/disas/winch/aarch64/i64_or/32_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_or/64_const.wat b/tests/disas/winch/aarch64/i64_or/64_const.wat
index 560ccc0a84..f8beaa7677 100644
--- a/tests/disas/winch/aarch64/i64_or/64_const.wat
+++ b/tests/disas/winch/aarch64/i64_or/64_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_or/locals.wat b/tests/disas/winch/aarch64/i64_or/locals.wat
index f979a5415a..b2697566ec 100644
--- a/tests/disas/winch/aarch64/i64_or/locals.wat
+++ b/tests/disas/winch/aarch64/i64_or/locals.wat
@@ -22,7 +22,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_or/params.wat b/tests/disas/winch/aarch64/i64_or/params.wat
index 5bf5a84da7..43d37cfb02 100644
--- a/tests/disas/winch/aarch64/i64_or/params.wat
+++ b/tests/disas/winch/aarch64/i64_or/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_popcnt/const.wat b/tests/disas/winch/aarch64/i64_popcnt/const.wat
index 01d31b1c87..1f448e0d7b 100644
--- a/tests/disas/winch/aarch64/i64_popcnt/const.wat
+++ b/tests/disas/winch/aarch64/i64_popcnt/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_popcnt/reg.wat b/tests/disas/winch/aarch64/i64_popcnt/reg.wat
index 06594feb35..418b40ab04 100644
--- a/tests/disas/winch/aarch64/i64_popcnt/reg.wat
+++ b/tests/disas/winch/aarch64/i64_popcnt/reg.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat
index 1d4f6125a7..38ba69cafe 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat
index b6627af0d6..98b468e998 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat
index b506d65565..b9dfc8db84 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat
index 6675eaace0..7b11e04a47 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rems/const.wat b/tests/disas/winch/aarch64/i64_rems/const.wat
index 6a6e4ae789..c14f538bbd 100644
--- a/tests/disas/winch/aarch64/i64_rems/const.wat
+++ b/tests/disas/winch/aarch64/i64_rems/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rems/one_zero.wat b/tests/disas/winch/aarch64/i64_rems/one_zero.wat
index e855ef1dbe..aa5532a4af 100644
--- a/tests/disas/winch/aarch64/i64_rems/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_rems/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rems/overflow.wat b/tests/disas/winch/aarch64/i64_rems/overflow.wat
index 6471bcbc9f..41db5285b2 100644
--- a/tests/disas/winch/aarch64/i64_rems/overflow.wat
+++ b/tests/disas/winch/aarch64/i64_rems/overflow.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rems/params.wat b/tests/disas/winch/aarch64/i64_rems/params.wat
index b370e0700e..4f55c6a5bc 100644
--- a/tests/disas/winch/aarch64/i64_rems/params.wat
+++ b/tests/disas/winch/aarch64/i64_rems/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rems/zero_zero.wat b/tests/disas/winch/aarch64/i64_rems/zero_zero.wat
index 9792bd9d0e..e5d5abc910 100644
--- a/tests/disas/winch/aarch64/i64_rems/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_rems/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_remu/const.wat b/tests/disas/winch/aarch64/i64_remu/const.wat
index 55b0399a78..63c5ce8e18 100644
--- a/tests/disas/winch/aarch64/i64_remu/const.wat
+++ b/tests/disas/winch/aarch64/i64_remu/const.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_remu/one_zero.wat b/tests/disas/winch/aarch64/i64_remu/one_zero.wat
index 657623086f..c803b8f9d6 100644
--- a/tests/disas/winch/aarch64/i64_remu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_remu/one_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_remu/params.wat b/tests/disas/winch/aarch64/i64_remu/params.wat
index ec5457ce89..184469344a 100644
--- a/tests/disas/winch/aarch64/i64_remu/params.wat
+++ b/tests/disas/winch/aarch64/i64_remu/params.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_remu/signed.wat b/tests/disas/winch/aarch64/i64_remu/signed.wat
index 3da53878ba..c2e1b4e592 100644
--- a/tests/disas/winch/aarch64/i64_remu/signed.wat
+++ b/tests/disas/winch/aarch64/i64_remu/signed.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_remu/zero_zero.wat b/tests/disas/winch/aarch64/i64_remu/zero_zero.wat
index ca0536b4da..44cb640797 100644
--- a/tests/disas/winch/aarch64/i64_remu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_remu/zero_zero.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotl/16_const.wat b/tests/disas/winch/aarch64/i64_rotl/16_const.wat
index 7210ee1bdb..1a64e44c6f 100644
--- a/tests/disas/winch/aarch64/i64_rotl/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotl/8_const.wat b/tests/disas/winch/aarch64/i64_rotl/8_const.wat
index 055d339e84..2ec42f63d0 100644
--- a/tests/disas/winch/aarch64/i64_rotl/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotl/locals.wat b/tests/disas/winch/aarch64/i64_rotl/locals.wat
index 86e54b7ab7..719407f249 100644
--- a/tests/disas/winch/aarch64/i64_rotl/locals.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotl/params.wat b/tests/disas/winch/aarch64/i64_rotl/params.wat
index 19cc0a13db..0328e75533 100644
--- a/tests/disas/winch/aarch64/i64_rotl/params.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotr/16_const.wat b/tests/disas/winch/aarch64/i64_rotr/16_const.wat
index 5d70549f6c..3897f019f2 100644
--- a/tests/disas/winch/aarch64/i64_rotr/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotr/8_const.wat b/tests/disas/winch/aarch64/i64_rotr/8_const.wat
index 48935ff023..85e58e0126 100644
--- a/tests/disas/winch/aarch64/i64_rotr/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotr/locals.wat b/tests/disas/winch/aarch64/i64_rotr/locals.wat
index 6dd7a54b3d..b6d0b0a150 100644
--- a/tests/disas/winch/aarch64/i64_rotr/locals.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_rotr/params.wat b/tests/disas/winch/aarch64/i64_rotr/params.wat
index 54106215ce..89f71a7308 100644
--- a/tests/disas/winch/aarch64/i64_rotr/params.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shl/16_const.wat b/tests/disas/winch/aarch64/i64_shl/16_const.wat
index 2e889942d2..3bc9fbaac5 100644
--- a/tests/disas/winch/aarch64/i64_shl/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_shl/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shl/8_const.wat b/tests/disas/winch/aarch64/i64_shl/8_const.wat
index 225466663e..492458e2d2 100644
--- a/tests/disas/winch/aarch64/i64_shl/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_shl/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shl/imm.wat b/tests/disas/winch/aarch64/i64_shl/imm.wat
index cd967acd40..78664a0b5d 100644
--- a/tests/disas/winch/aarch64/i64_shl/imm.wat
+++ b/tests/disas/winch/aarch64/i64_shl/imm.wat
@@ -20,7 +20,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shl/locals.wat b/tests/disas/winch/aarch64/i64_shl/locals.wat
index 31acd80aa7..ec46eb7b1e 100644
--- a/tests/disas/winch/aarch64/i64_shl/locals.wat
+++ b/tests/disas/winch/aarch64/i64_shl/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shl/params.wat b/tests/disas/winch/aarch64/i64_shl/params.wat
index c734e4049f..c19e6735a6 100644
--- a/tests/disas/winch/aarch64/i64_shl/params.wat
+++ b/tests/disas/winch/aarch64/i64_shl/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_s/16_const.wat b/tests/disas/winch/aarch64/i64_shr_s/16_const.wat
index 87238c702f..61694a9e83 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_s/8_const.wat b/tests/disas/winch/aarch64/i64_shr_s/8_const.wat
index a59853e468..32486c291d 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_s/locals.wat b/tests/disas/winch/aarch64/i64_shr_s/locals.wat
index 7d454f8845..adf8f0c175 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_s/params.wat b/tests/disas/winch/aarch64/i64_shr_s/params.wat
index dfa030c856..7fbfefd5cd 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_u/16_const.wat b/tests/disas/winch/aarch64/i64_shr_u/16_const.wat
index ee73116e0f..e38857c3f8 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/16_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_u/8_const.wat b/tests/disas/winch/aarch64/i64_shr_u/8_const.wat
index a04235767c..4d8af6ee8a 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/8_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_u/locals.wat b/tests/disas/winch/aarch64/i64_shr_u/locals.wat
index 09e3739b88..18264acadc 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_shr_u/params.wat b/tests/disas/winch/aarch64/i64_shr_u/params.wat
index 94c8a793f7..8b571550f0 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/const.wat b/tests/disas/winch/aarch64/i64_sub/const.wat
index 217da9643c..b143fb7280 100644
--- a/tests/disas/winch/aarch64/i64_sub/const.wat
+++ b/tests/disas/winch/aarch64/i64_sub/const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/locals.wat b/tests/disas/winch/aarch64/i64_sub/locals.wat
index 50dcda5889..5ed7746a73 100644
--- a/tests/disas/winch/aarch64/i64_sub/locals.wat
+++ b/tests/disas/winch/aarch64/i64_sub/locals.wat
@@ -23,7 +23,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/max.wat b/tests/disas/winch/aarch64/i64_sub/max.wat
index cd8352df50..78735eb275 100644
--- a/tests/disas/winch/aarch64/i64_sub/max.wat
+++ b/tests/disas/winch/aarch64/i64_sub/max.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/max_one.wat b/tests/disas/winch/aarch64/i64_sub/max_one.wat
index 195bdc2dc8..9868db628e 100644
--- a/tests/disas/winch/aarch64/i64_sub/max_one.wat
+++ b/tests/disas/winch/aarch64/i64_sub/max_one.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/mixed.wat b/tests/disas/winch/aarch64/i64_sub/mixed.wat
index e1f7aaead3..41f9dcf2ed 100644
--- a/tests/disas/winch/aarch64/i64_sub/mixed.wat
+++ b/tests/disas/winch/aarch64/i64_sub/mixed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/params.wat b/tests/disas/winch/aarch64/i64_sub/params.wat
index 67760edc2b..b8685defbf 100644
--- a/tests/disas/winch/aarch64/i64_sub/params.wat
+++ b/tests/disas/winch/aarch64/i64_sub/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/signed.wat b/tests/disas/winch/aarch64/i64_sub/signed.wat
index 98d0f1aeeb..7b4198147f 100644
--- a/tests/disas/winch/aarch64/i64_sub/signed.wat
+++ b/tests/disas/winch/aarch64/i64_sub/signed.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat
index 7424bce537..e9340ea223 100644
--- a/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat b/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat
index a2615c38ba..a8cf0c3866 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat
index 684756f235..e2a4a4166f 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat b/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat
index 5d23ad3faf..631ebb0873 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat b/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat
index 5b09f947c7..55fe4928bd 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat
index d9967481da..6b17af10e8 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat b/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat
index 2b3b3237b9..9c1caa2ac6 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat b/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat
index e53cb5a456..678744c809 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat
index 0193a5621a..b1d374b396 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat b/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat
index b29ab98990..c4a129aebb 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat b/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat
index e59f6436c5..abc55dd39c 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat
index 06b07b185d..92ec10ddc3 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat b/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat
index 88d85ee090..86deab44bc 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_xor/32_const.wat b/tests/disas/winch/aarch64/i64_xor/32_const.wat
index 7db4865fa8..902847d8fd 100644
--- a/tests/disas/winch/aarch64/i64_xor/32_const.wat
+++ b/tests/disas/winch/aarch64/i64_xor/32_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_xor/64_const.wat b/tests/disas/winch/aarch64/i64_xor/64_const.wat
index 5a39200e12..9d5c102eb0 100644
--- a/tests/disas/winch/aarch64/i64_xor/64_const.wat
+++ b/tests/disas/winch/aarch64/i64_xor/64_const.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_xor/locals.wat b/tests/disas/winch/aarch64/i64_xor/locals.wat
index b2cabbb205..1e1b152390 100644
--- a/tests/disas/winch/aarch64/i64_xor/locals.wat
+++ b/tests/disas/winch/aarch64/i64_xor/locals.wat
@@ -22,7 +22,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/i64_xor/params.wat b/tests/disas/winch/aarch64/i64_xor/params.wat
index f39faedd1f..0f5aafe868 100644
--- a/tests/disas/winch/aarch64/i64_xor/params.wat
+++ b/tests/disas/winch/aarch64/i64_xor/params.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/load/dynamic_heap.wat b/tests/disas/winch/aarch64/load/dynamic_heap.wat
index 48a41b0106..1ee8089ac0 100644
--- a/tests/disas/winch/aarch64/load/dynamic_heap.wat
+++ b/tests/disas/winch/aarch64/load/dynamic_heap.wat
@@ -25,7 +25,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x1, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x28
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/load/f32.wat b/tests/disas/winch/aarch64/load/f32.wat
index ec7cf050a0..eaa217d4b5 100644
--- a/tests/disas/winch/aarch64/load/f32.wat
+++ b/tests/disas/winch/aarch64/load/f32.wat
@@ -12,7 +12,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/load/f64.wat b/tests/disas/winch/aarch64/load/f64.wat
index 898d3be0c6..415116440d 100644
--- a/tests/disas/winch/aarch64/load/f64.wat
+++ b/tests/disas/winch/aarch64/load/f64.wat
@@ -11,7 +11,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/load/i32.wat b/tests/disas/winch/aarch64/load/i32.wat
index c6fdd71a22..b056feacdc 100644
--- a/tests/disas/winch/aarch64/load/i32.wat
+++ b/tests/disas/winch/aarch64/load/i32.wat
@@ -12,7 +12,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/load/i64.wat b/tests/disas/winch/aarch64/load/i64.wat
index 28dbc88d34..76a80970ca 100644
--- a/tests/disas/winch/aarch64/load/i64.wat
+++ b/tests/disas/winch/aarch64/load/i64.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x18
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/nop/nop.wat b/tests/disas/winch/aarch64/nop/nop.wat
index ee61218ca3..1e9044b10c 100644
--- a/tests/disas/winch/aarch64/nop/nop.wat
+++ b/tests/disas/winch/aarch64/nop/nop.wat
@@ -12,7 +12,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/params/400_params.wat b/tests/disas/winch/aarch64/params/400_params.wat
index 53918251b9..2c19f60171 100644
--- a/tests/disas/winch/aarch64/params/400_params.wat
+++ b/tests/disas/winch/aarch64/params/400_params.wat
@@ -55,7 +55,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x28
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/params/multi_values.wat b/tests/disas/winch/aarch64/params/multi_values.wat
index ff77e2ada6..0c0b36c691 100644
--- a/tests/disas/winch/aarch64/params/multi_values.wat
+++ b/tests/disas/winch/aarch64/params/multi_values.wat
@@ -15,7 +15,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x1, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x34
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/store/dynamic_heap.wat b/tests/disas/winch/aarch64/store/dynamic_heap.wat
index d71ffefd0d..24c7b3455e 100644
--- a/tests/disas/winch/aarch64/store/dynamic_heap.wat
+++ b/tests/disas/winch/aarch64/store/dynamic_heap.wat
@@ -25,7 +25,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x20
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/store/f32.wat b/tests/disas/winch/aarch64/store/f32.wat
index 8a62e46598..c9555ba4dc 100644
--- a/tests/disas/winch/aarch64/store/f32.wat
+++ b/tests/disas/winch/aarch64/store/f32.wat
@@ -11,7 +11,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/store/f64.wat b/tests/disas/winch/aarch64/store/f64.wat
index 6d475b34f6..f2aee771a2 100644
--- a/tests/disas/winch/aarch64/store/f64.wat
+++ b/tests/disas/winch/aarch64/store/f64.wat
@@ -12,7 +12,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/store/i32.wat b/tests/disas/winch/aarch64/store/i32.wat
index d296e51cf9..48fba51040 100644
--- a/tests/disas/winch/aarch64/store/i32.wat
+++ b/tests/disas/winch/aarch64/store/i32.wat
@@ -13,7 +13,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/aarch64/store/i64.wat b/tests/disas/winch/aarch64/store/i64.wat
index edceb3ec25..66eeacb443 100644
--- a/tests/disas/winch/aarch64/store/i64.wat
+++ b/tests/disas/winch/aarch64/store/i64.wat
@@ -14,7 +14,7 @@
;; str x28, [sp, #-0x10]!
;; mov x28, sp
;; ldur x16, [x0, #8]
-;; ldur x16, [x16, #0x10]
+;; ldur x16, [x16, #0x18]
;; mov x17, #0
;; movk x17, #0x10
;; add x16, x16, x17
diff --git a/tests/disas/winch/x64/atomic/fence/fence.wat b/tests/disas/winch/x64/atomic/fence/fence.wat
index 831541da69..5fb841aa8e 100644
--- a/tests/disas/winch/x64/atomic/fence/fence.wat
+++ b/tests/disas/winch/x64/atomic/fence/fence.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x62
diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat
index ad142829d9..f96d7b8d33 100644
--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat
+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5f
diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat
index 7b4460e9b0..4c82b1db26 100644
--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat
index f9bd5a84df..9a410d10a3 100644
--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat
index 7900e74dc3..be89e8f71b 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5c
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat
index 874ab8e6ee..da9c5e1d24 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5b
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat
index 634c8215b7..be4b6bbe01 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x59
diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat
index 5f200c348d..4c0117c165 100644
--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat
+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/atomic/notify/notify.wat b/tests/disas/winch/x64/atomic/notify/notify.wat
index 4f8e4e0e3d..fac012d3ad 100644
--- a/tests/disas/winch/x64/atomic/notify/notify.wat
+++ b/tests/disas/winch/x64/atomic/notify/notify.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/atomic/notify/notify_offset.wat b/tests/disas/winch/x64/atomic/notify/notify_offset.wat
index 5f5fd6c8d4..f7ba24a2c3 100644
--- a/tests/disas/winch/x64/atomic/notify/notify_offset.wat
+++ b/tests/disas/winch/x64/atomic/notify/notify_offset.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x84
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat
index 2b36806dbd..5c18877214 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat
index e089128ca4..b8652f7b97 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat
index 865f06896c..5c1ce19f75 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat
index 09cf75b265..a66156bea0 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x69
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat
index 0f9a79126f..6adfe16211 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat
index cc2d2689c0..05ee601a5a 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat
index a635c00d1f..9ed0adca60 100644
--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat
+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat
index 094e2718d3..976fdbea55 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat
index bdaa548f2c..59883fd36b 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat
index d53e521412..5072b914b8 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x87
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat
index 956de13040..c7af5bece1 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x7c
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat
index ff207f1309..d050fe6d30 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x75
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat
index 20137775a5..a2abddb5c2 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat
index bc4f6cf060..2bea25bb3a 100644
--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat
+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat
index 8607ccf1d9..e7482e01df 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x95
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat
index c30ac3c456..fdae2a0131 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x80
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat
index 7f5e6101c4..f5dc01fd46 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x91
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat
index 8d73b13b3a..43431830fa 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x72
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat
index c3f463ff4c..83aad3af07 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6d
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat
index 5d0b70643e..5937429bcc 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat
index 2d3fe4af31..35d973ffcf 100644
--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x70
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat
index ae2b0d58d2..6a38c317e0 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat
index acd9659b64..d159cb36d4 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat
index c636e33a0d..85bd3a14b1 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x87
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat
index 7803731751..f185ee1a60 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x7c
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat
index 1c810caa21..5c096d070f 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x75
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat
index b5eebfc5a3..ddf236cc81 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat
index 284f1c145a..e5413396db 100644
--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat
+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat
index c1234c15a8..60303b2447 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat
index f8b2c82f9a..ef6c163742 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat
index ec75825808..d1f2c4f1a0 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat
index 8d87569521..a8c7d943c1 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6c
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat
index 7f8a3b9f6d..177df49343 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat
index b71f0ca1d7..c447ab0fa5 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat
index a7c964f811..8853273adc 100644
--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat
+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6a
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat
index 59c78e89dd..6b23469c5e 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat
index 547c66777f..039f1630aa 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat
index 6609e80359..1b55d38f18 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x62
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat
index d0ee459929..582fdd104b 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat
index b077a98dd7..c5cbcc4890 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x62
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat
index 65d6b6bb74..0fe33e382e 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat
index 69f6f53f64..8e16eddf52 100644
--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat
index 43965035e1..d125eb187f 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat
index 7636806d2e..699c3d7fe1 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat
index 4e2e8934c4..7baad5281b 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x87
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat
index 9795e15643..28ab3167a7 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x7c
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat
index 8a7aaf1f08..7c90075772 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x75
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat
index 633c8f0203..7e46836ca4 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat
index 259e4552f8..5b42ab4712 100644
--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat
+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat
index 14b2e1dbd9..7b42620f4a 100644
--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat
+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat
index a48100c115..532bf26102 100644
--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat
+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat
index 237de3c9f1..24f37436f3 100644
--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat
+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat
index 2c1befcd1f..cce1b25e9d 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat
index bdba0b836b..8afe4b346e 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat
index d65f05bbc4..96817f3f6c 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat
index 33789eccc3..0379939c3b 100644
--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat
+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/atomic/wait/wait32.wat b/tests/disas/winch/x64/atomic/wait/wait32.wat
index 2d018f2f70..714dd8e63f 100644
--- a/tests/disas/winch/x64/atomic/wait/wait32.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait32.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/atomic/wait/wait32_offset.wat b/tests/disas/winch/x64/atomic/wait/wait32_offset.wat
index bca69bb45e..fe7f95e704 100644
--- a/tests/disas/winch/x64/atomic/wait/wait32_offset.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait32_offset.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x91
diff --git a/tests/disas/winch/x64/atomic/wait/wait64.wat b/tests/disas/winch/x64/atomic/wait/wait64.wat
index 92e9279f34..a950e66394 100644
--- a/tests/disas/winch/x64/atomic/wait/wait64.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait64.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/atomic/wait/wait64_offset.wat b/tests/disas/winch/x64/atomic/wait/wait64_offset.wat
index 60278a7855..01cf1bcbda 100644
--- a/tests/disas/winch/x64/atomic/wait/wait64_offset.wat
+++ b/tests/disas/winch/x64/atomic/wait/wait64_offset.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x89
diff --git a/tests/disas/winch/x64/block/as_if_cond.wat b/tests/disas/winch/x64/block/as_if_cond.wat
index 8c70bb1923..3fbcc9e31c 100644
--- a/tests/disas/winch/x64/block/as_if_cond.wat
+++ b/tests/disas/winch/x64/block/as_if_cond.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x95
diff --git a/tests/disas/winch/x64/block/as_if_else.wat b/tests/disas/winch/x64/block/as_if_else.wat
index a31b4b880e..2aa95c6089 100644
--- a/tests/disas/winch/x64/block/as_if_else.wat
+++ b/tests/disas/winch/x64/block/as_if_else.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/block/as_if_then.wat b/tests/disas/winch/x64/block/as_if_then.wat
index 80302c1b48..20406c3912 100644
--- a/tests/disas/winch/x64/block/as_if_then.wat
+++ b/tests/disas/winch/x64/block/as_if_then.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/block/deep.wat b/tests/disas/winch/x64/block/deep.wat
index 908f8e98f3..0b47440b56 100644
--- a/tests/disas/winch/x64/block/deep.wat
+++ b/tests/disas/winch/x64/block/deep.wat
@@ -49,7 +49,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -66,7 +66,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/block/empty.wat b/tests/disas/winch/x64/block/empty.wat
index b799b7bc62..0d720cba12 100644
--- a/tests/disas/winch/x64/block/empty.wat
+++ b/tests/disas/winch/x64/block/empty.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/block/get_and_set.wat b/tests/disas/winch/x64/block/get_and_set.wat
index 6bf5f0e512..4e3068cd1f 100644
--- a/tests/disas/winch/x64/block/get_and_set.wat
+++ b/tests/disas/winch/x64/block/get_and_set.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x5b
diff --git a/tests/disas/winch/x64/block/get_and_tee.wat b/tests/disas/winch/x64/block/get_and_tee.wat
index 22048cee71..f9bdf33852 100644
--- a/tests/disas/winch/x64/block/get_and_tee.wat
+++ b/tests/disas/winch/x64/block/get_and_tee.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x5b
diff --git a/tests/disas/winch/x64/block/issue-10613.wat b/tests/disas/winch/x64/block/issue-10613.wat
index 5f6b6ed3b3..3e953da4af 100644
--- a/tests/disas/winch/x64/block/issue-10613.wat
+++ b/tests/disas/winch/x64/block/issue-10613.wat
@@ -24,7 +24,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x40, %r11
;; cmpq %rsp, %r11
;; ja 0x108
@@ -87,7 +87,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x28, %r11
;; cmpq %rsp, %r11
;; ja 0x16f
@@ -118,7 +118,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x28, %r11
;; cmpq %rsp, %r11
;; ja 0x1df
diff --git a/tests/disas/winch/x64/block/nested.wat b/tests/disas/winch/x64/block/nested.wat
index bcc72f2f9f..c01545d8ed 100644
--- a/tests/disas/winch/x64/block/nested.wat
+++ b/tests/disas/winch/x64/block/nested.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x9d
diff --git a/tests/disas/winch/x64/block/singular.wat b/tests/disas/winch/x64/block/singular.wat
index 1a69ecc4a4..c8a5523775 100644
--- a/tests/disas/winch/x64/block/singular.wat
+++ b/tests/disas/winch/x64/block/singular.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
diff --git a/tests/disas/winch/x64/block/with_local_float.wat b/tests/disas/winch/x64/block/with_local_float.wat
index 243acd06af..0d6ea13910 100644
--- a/tests/disas/winch/x64/block/with_local_float.wat
+++ b/tests/disas/winch/x64/block/with_local_float.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x5f
diff --git a/tests/disas/winch/x64/br/as_block_first.wat b/tests/disas/winch/x64/br/as_block_first.wat
index 2a69e085bc..36d7900e6a 100644
--- a/tests/disas/winch/x64/br/as_block_first.wat
+++ b/tests/disas/winch/x64/br/as_block_first.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/br/as_block_last.wat b/tests/disas/winch/x64/br/as_block_last.wat
index 586d60b6a7..db65d326e7 100644
--- a/tests/disas/winch/x64/br/as_block_last.wat
+++ b/tests/disas/winch/x64/br/as_block_last.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x88
diff --git a/tests/disas/winch/x64/br/as_block_mid.wat b/tests/disas/winch/x64/br/as_block_mid.wat
index 398ab40748..4243546498 100644
--- a/tests/disas/winch/x64/br/as_block_mid.wat
+++ b/tests/disas/winch/x64/br/as_block_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x88
diff --git a/tests/disas/winch/x64/br/as_block_value.wat b/tests/disas/winch/x64/br/as_block_value.wat
index 73eb761fda..3e620e63f3 100644
--- a/tests/disas/winch/x64/br/as_block_value.wat
+++ b/tests/disas/winch/x64/br/as_block_value.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/br/as_br_if_cond.wat b/tests/disas/winch/x64/br/as_br_if_cond.wat
index 3635405183..0006dc8059 100644
--- a/tests/disas/winch/x64/br/as_br_if_cond.wat
+++ b/tests/disas/winch/x64/br/as_br_if_cond.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
diff --git a/tests/disas/winch/x64/br/as_br_value.wat b/tests/disas/winch/x64/br/as_br_value.wat
index 9d91276722..056b2d4e31 100644
--- a/tests/disas/winch/x64/br/as_br_value.wat
+++ b/tests/disas/winch/x64/br/as_br_value.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
diff --git a/tests/disas/winch/x64/br/as_call_all.wat b/tests/disas/winch/x64/br/as_call_all.wat
index c1e05cf6e6..833e9b37ae 100644
--- a/tests/disas/winch/x64/br/as_call_all.wat
+++ b/tests/disas/winch/x64/br/as_call_all.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/br/as_call_first.wat b/tests/disas/winch/x64/br/as_call_first.wat
index c38171cca4..6052c055df 100644
--- a/tests/disas/winch/x64/br/as_call_first.wat
+++ b/tests/disas/winch/x64/br/as_call_first.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -34,7 +34,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/br/as_call_last.wat b/tests/disas/winch/x64/br/as_call_last.wat
index fb85134ef4..2923d1ab5b 100644
--- a/tests/disas/winch/x64/br/as_call_last.wat
+++ b/tests/disas/winch/x64/br/as_call_last.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -33,7 +33,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/br/as_call_mid.wat b/tests/disas/winch/x64/br/as_call_mid.wat
index 6b8d020b69..b6aadf073f 100644
--- a/tests/disas/winch/x64/br/as_call_mid.wat
+++ b/tests/disas/winch/x64/br/as_call_mid.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -34,7 +34,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/br/as_if_cond.wat b/tests/disas/winch/x64/br/as_if_cond.wat
index 1e2eca729f..541112e12b 100644
--- a/tests/disas/winch/x64/br/as_if_cond.wat
+++ b/tests/disas/winch/x64/br/as_if_cond.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
diff --git a/tests/disas/winch/x64/br/as_if_else.wat b/tests/disas/winch/x64/br/as_if_else.wat
index dd295f9305..4f5f9828e5 100644
--- a/tests/disas/winch/x64/br/as_if_else.wat
+++ b/tests/disas/winch/x64/br/as_if_else.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5b
diff --git a/tests/disas/winch/x64/br/as_if_then.wat b/tests/disas/winch/x64/br/as_if_then.wat
index ee3c122396..353aae158f 100644
--- a/tests/disas/winch/x64/br/as_if_then.wat
+++ b/tests/disas/winch/x64/br/as_if_then.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5b
diff --git a/tests/disas/winch/x64/br/as_loop_first.wat b/tests/disas/winch/x64/br/as_loop_first.wat
index 8930055613..de9d125410 100644
--- a/tests/disas/winch/x64/br/as_loop_first.wat
+++ b/tests/disas/winch/x64/br/as_loop_first.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
diff --git a/tests/disas/winch/x64/br/as_loop_last.wat b/tests/disas/winch/x64/br/as_loop_last.wat
index 896c5944ed..8e9097717c 100644
--- a/tests/disas/winch/x64/br/as_loop_last.wat
+++ b/tests/disas/winch/x64/br/as_loop_last.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/br/as_loop_mid.wat b/tests/disas/winch/x64/br/as_loop_mid.wat
index e682cdf1cf..a709808c15 100644
--- a/tests/disas/winch/x64/br/as_loop_mid.wat
+++ b/tests/disas/winch/x64/br/as_loop_mid.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/br/br_jump.wat b/tests/disas/winch/x64/br/br_jump.wat
index 8e8baca2f3..720c996853 100644
--- a/tests/disas/winch/x64/br/br_jump.wat
+++ b/tests/disas/winch/x64/br/br_jump.wat
@@ -17,7 +17,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x28, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/br_if/as_block_last.wat b/tests/disas/winch/x64/br_if/as_block_last.wat
index 1dff9eed92..52f99f1dad 100644
--- a/tests/disas/winch/x64/br_if/as_block_last.wat
+++ b/tests/disas/winch/x64/br_if/as_block_last.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xa9
diff --git a/tests/disas/winch/x64/br_if/as_block_last_value.wat b/tests/disas/winch/x64/br_if/as_block_last_value.wat
index 835b212f7b..ca20f699e9 100644
--- a/tests/disas/winch/x64/br_if/as_block_last_value.wat
+++ b/tests/disas/winch/x64/br_if/as_block_last_value.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xae
diff --git a/tests/disas/winch/x64/br_if/as_br_if_cond.wat b/tests/disas/winch/x64/br_if/as_br_if_cond.wat
index f216d81768..af94f4b14e 100644
--- a/tests/disas/winch/x64/br_if/as_br_if_cond.wat
+++ b/tests/disas/winch/x64/br_if/as_br_if_cond.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/br_if/as_br_value.wat b/tests/disas/winch/x64/br_if/as_br_value.wat
index 043dfdd9a5..92cc7f5baa 100644
--- a/tests/disas/winch/x64/br_if/as_br_value.wat
+++ b/tests/disas/winch/x64/br_if/as_br_value.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/br_if/as_call_first.wat b/tests/disas/winch/x64/br_if/as_call_first.wat
index b4aedc86e1..6eca24863b 100644
--- a/tests/disas/winch/x64/br_if/as_call_first.wat
+++ b/tests/disas/winch/x64/br_if/as_call_first.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -35,7 +35,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xd8
diff --git a/tests/disas/winch/x64/br_if/as_call_last.wat b/tests/disas/winch/x64/br_if/as_call_last.wat
index f4d3f1d147..42294ab378 100644
--- a/tests/disas/winch/x64/br_if/as_call_last.wat
+++ b/tests/disas/winch/x64/br_if/as_call_last.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -35,7 +35,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xd8
diff --git a/tests/disas/winch/x64/br_if/as_call_mid.wat b/tests/disas/winch/x64/br_if/as_call_mid.wat
index 5628a1c1ef..d2c4cbffcd 100644
--- a/tests/disas/winch/x64/br_if/as_call_mid.wat
+++ b/tests/disas/winch/x64/br_if/as_call_mid.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -35,7 +35,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xd8
diff --git a/tests/disas/winch/x64/br_if/as_if_cond.wat b/tests/disas/winch/x64/br_if/as_if_cond.wat
index 10b1259a12..e1b26ce053 100644
--- a/tests/disas/winch/x64/br_if/as_if_cond.wat
+++ b/tests/disas/winch/x64/br_if/as_if_cond.wat
@@ -15,7 +15,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/br_if/as_if_else.wat b/tests/disas/winch/x64/br_if/as_if_else.wat
index 86f91cc4ec..4ce0489447 100644
--- a/tests/disas/winch/x64/br_if/as_if_else.wat
+++ b/tests/disas/winch/x64/br_if/as_if_else.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xae
diff --git a/tests/disas/winch/x64/br_if/as_if_then.wat b/tests/disas/winch/x64/br_if/as_if_then.wat
index 88ef2c37cb..822d3338d4 100644
--- a/tests/disas/winch/x64/br_if/as_if_then.wat
+++ b/tests/disas/winch/x64/br_if/as_if_then.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xae
diff --git a/tests/disas/winch/x64/br_if/as_local_set_value.wat b/tests/disas/winch/x64/br_if/as_local_set_value.wat
index bbb848531f..bb8dc20795 100644
--- a/tests/disas/winch/x64/br_if/as_local_set_value.wat
+++ b/tests/disas/winch/x64/br_if/as_local_set_value.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x62
diff --git a/tests/disas/winch/x64/br_if/as_loop_last.wat b/tests/disas/winch/x64/br_if/as_loop_last.wat
index 51ad3cb09e..b352d1496b 100644
--- a/tests/disas/winch/x64/br_if/as_loop_last.wat
+++ b/tests/disas/winch/x64/br_if/as_loop_last.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x99
diff --git a/tests/disas/winch/x64/br_if/save_state_before_br_emission.wat b/tests/disas/winch/x64/br_if/save_state_before_br_emission.wat
index 649b560727..25d2ced313 100644
--- a/tests/disas/winch/x64/br_if/save_state_before_br_emission.wat
+++ b/tests/disas/winch/x64/br_if/save_state_before_br_emission.wat
@@ -41,7 +41,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x58, %r11
;; cmpq %rsp, %r11
;; ja 0x130
diff --git a/tests/disas/winch/x64/br_if/with_machine_stack_entry.wat b/tests/disas/winch/x64/br_if/with_machine_stack_entry.wat
index 3709c83f42..498f165a8f 100644
--- a/tests/disas/winch/x64/br_if/with_machine_stack_entry.wat
+++ b/tests/disas/winch/x64/br_if/with_machine_stack_entry.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x8b
@@ -50,7 +50,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xcd
diff --git a/tests/disas/winch/x64/br_table/ensure_sp_state.wat b/tests/disas/winch/x64/br_table/ensure_sp_state.wat
index fcfdb9ca90..30724bb817 100644
--- a/tests/disas/winch/x64/br_table/ensure_sp_state.wat
+++ b/tests/disas/winch/x64/br_table/ensure_sp_state.wat
@@ -15,7 +15,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x77
diff --git a/tests/disas/winch/x64/br_table/large.wat b/tests/disas/winch/x64/br_table/large.wat
index b0634c812f..b1e2103c27 100644
--- a/tests/disas/winch/x64/br_table/large.wat
+++ b/tests/disas/winch/x64/br_table/large.wat
@@ -742,7 +742,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x1810b
diff --git a/tests/disas/winch/x64/br_table/nested_br_table_loop_block.wat b/tests/disas/winch/x64/br_table/nested_br_table_loop_block.wat
index 9099086e83..a830f74dfc 100644
--- a/tests/disas/winch/x64/br_table/nested_br_table_loop_block.wat
+++ b/tests/disas/winch/x64/br_table/nested_br_table_loop_block.wat
@@ -22,7 +22,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xa6
diff --git a/tests/disas/winch/x64/br_table/stack_handling.wat b/tests/disas/winch/x64/br_table/stack_handling.wat
index 22984f88ea..3d66380410 100644
--- a/tests/disas/winch/x64/br_table/stack_handling.wat
+++ b/tests/disas/winch/x64/br_table/stack_handling.wat
@@ -15,7 +15,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x91
diff --git a/tests/disas/winch/x64/br_table/use-innermost-frame.wat b/tests/disas/winch/x64/br_table/use-innermost-frame.wat
index 372b59a328..c29aaa5d5f 100644
--- a/tests/disas/winch/x64/br_table/use-innermost-frame.wat
+++ b/tests/disas/winch/x64/br_table/use-innermost-frame.wat
@@ -1946,7 +1946,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x161
@@ -2023,7 +2023,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x980, %r11
;; cmpq %rsp, %r11
;; ja 0x4a84
@@ -2419,7 +2419,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4bf1
diff --git a/tests/disas/winch/x64/call/multi.wat b/tests/disas/winch/x64/call/multi.wat
index 0cf5684dc8..13d97b4b63 100644
--- a/tests/disas/winch/x64/call/multi.wat
+++ b/tests/disas/winch/x64/call/multi.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x64
@@ -39,7 +39,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xd9
diff --git a/tests/disas/winch/x64/call/params.wat b/tests/disas/winch/x64/call/params.wat
index bd0af89775..87dc038ac5 100644
--- a/tests/disas/winch/x64/call/params.wat
+++ b/tests/disas/winch/x64/call/params.wat
@@ -40,7 +40,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x60, %r11
;; cmpq %rsp, %r11
;; ja 0x182
@@ -123,7 +123,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x20a
diff --git a/tests/disas/winch/x64/call/recursive.wat b/tests/disas/winch/x64/call/recursive.wat
index e9497ae39b..4eb4b2e067 100644
--- a/tests/disas/winch/x64/call/recursive.wat
+++ b/tests/disas/winch/x64/call/recursive.wat
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0xee
diff --git a/tests/disas/winch/x64/call/reg_on_stack.wat b/tests/disas/winch/x64/call/reg_on_stack.wat
index ff2bdc80b7..2a644271e7 100644
--- a/tests/disas/winch/x64/call/reg_on_stack.wat
+++ b/tests/disas/winch/x64/call/reg_on_stack.wat
@@ -15,7 +15,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0xd1
diff --git a/tests/disas/winch/x64/call/simple.wat b/tests/disas/winch/x64/call/simple.wat
index e0415a8c7d..4e63ec0aa5 100644
--- a/tests/disas/winch/x64/call/simple.wat
+++ b/tests/disas/winch/x64/call/simple.wat
@@ -18,7 +18,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x28, %r11
;; cmpq %rsp, %r11
;; ja 0x97
@@ -55,7 +55,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xee
diff --git a/tests/disas/winch/x64/call_indirect/call_indirect.wat b/tests/disas/winch/x64/call_indirect/call_indirect.wat
index d6ac1776bd..26d788b04c 100644
--- a/tests/disas/winch/x64/call_indirect/call_indirect.wat
+++ b/tests/disas/winch/x64/call_indirect/call_indirect.wat
@@ -34,7 +34,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x229
diff --git a/tests/disas/winch/x64/call_indirect/local_arg.wat b/tests/disas/winch/x64/call_indirect/local_arg.wat
index a28a35c29d..8db6c8195a 100644
--- a/tests/disas/winch/x64/call_indirect/local_arg.wat
+++ b/tests/disas/winch/x64/call_indirect/local_arg.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
@@ -39,7 +39,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x156
diff --git a/tests/disas/winch/x64/epoch/func.wat b/tests/disas/winch/x64/epoch/func.wat
index 87a203e4b3..b087ee61cf 100644
--- a/tests/disas/winch/x64/epoch/func.wat
+++ b/tests/disas/winch/x64/epoch/func.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/epoch/loop.wat b/tests/disas/winch/x64/epoch/loop.wat
index 77ebfad29d..720ee49fe4 100644
--- a/tests/disas/winch/x64/epoch/loop.wat
+++ b/tests/disas/winch/x64/epoch/loop.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x87
diff --git a/tests/disas/winch/x64/f32_abs/f32_abs_const.wat b/tests/disas/winch/x64/f32_abs/f32_abs_const.wat
index f4e7542312..e59aea929d 100644
--- a/tests/disas/winch/x64/f32_abs/f32_abs_const.wat
+++ b/tests/disas/winch/x64/f32_abs/f32_abs_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f32_abs/f32_abs_param.wat b/tests/disas/winch/x64/f32_abs/f32_abs_param.wat
index 0037800b80..42c16cd684 100644
--- a/tests/disas/winch/x64/f32_abs/f32_abs_param.wat
+++ b/tests/disas/winch/x64/f32_abs/f32_abs_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/f32_add/const.wat b/tests/disas/winch/x64/f32_add/const.wat
index 6a3fc4d01d..e270cace1c 100644
--- a/tests/disas/winch/x64/f32_add/const.wat
+++ b/tests/disas/winch/x64/f32_add/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f32_add/locals.wat b/tests/disas/winch/x64/f32_add/locals.wat
index c98840522b..c6ccaef796 100644
--- a/tests/disas/winch/x64/f32_add/locals.wat
+++ b/tests/disas/winch/x64/f32_add/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f32_add/params.wat b/tests/disas/winch/x64/f32_add/params.wat
index 5ff19bc604..8cacebd330 100644
--- a/tests/disas/winch/x64/f32_add/params.wat
+++ b/tests/disas/winch/x64/f32_add/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/f32_ceil/f32_ceil_const_sse41.wat b/tests/disas/winch/x64/f32_ceil/f32_ceil_const_sse41.wat
index 2b763a9a3d..3ea313b941 100644
--- a/tests/disas/winch/x64/f32_ceil/f32_ceil_const_sse41.wat
+++ b/tests/disas/winch/x64/f32_ceil/f32_ceil_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32_ceil/f32_ceil_param.wat b/tests/disas/winch/x64/f32_ceil/f32_ceil_param.wat
index 69d565b6d8..3ef7a29cc7 100644
--- a/tests/disas/winch/x64/f32_ceil/f32_ceil_param.wat
+++ b/tests/disas/winch/x64/f32_ceil/f32_ceil_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f32_ceil/f32_ceil_param_sse41.wat b/tests/disas/winch/x64/f32_ceil/f32_ceil_param_sse41.wat
index 930b8c9e95..47fda13284 100644
--- a/tests/disas/winch/x64/f32_ceil/f32_ceil_param_sse41.wat
+++ b/tests/disas/winch/x64/f32_ceil/f32_ceil_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f32_const/call_id.wat b/tests/disas/winch/x64/f32_const/call_id.wat
index 6bde44dbb8..6fac770cf5 100644
--- a/tests/disas/winch/x64/f32_const/call_id.wat
+++ b/tests/disas/winch/x64/f32_const/call_id.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xa0
diff --git a/tests/disas/winch/x64/f32_const/id.wat b/tests/disas/winch/x64/f32_const/id.wat
index bdc14ec536..e1d1cb2a6d 100644
--- a/tests/disas/winch/x64/f32_const/id.wat
+++ b/tests/disas/winch/x64/f32_const/id.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f32_convert_i32_s/const.wat b/tests/disas/winch/x64/f32_convert_i32_s/const.wat
index 66f7b01fb9..5a11fb84d9 100644
--- a/tests/disas/winch/x64/f32_convert_i32_s/const.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/f32_convert_i32_s/locals.wat b/tests/disas/winch/x64/f32_convert_i32_s/locals.wat
index e2d5346de4..f5f8ad91af 100644
--- a/tests/disas/winch/x64/f32_convert_i32_s/locals.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/f32_convert_i32_s/params.wat b/tests/disas/winch/x64/f32_convert_i32_s/params.wat
index 81d9885d31..91a31ef42e 100644
--- a/tests/disas/winch/x64/f32_convert_i32_s/params.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f32_convert_i32_s/spilled.wat b/tests/disas/winch/x64/f32_convert_i32_s/spilled.wat
index 0076e188cf..e4c44e7178 100644
--- a/tests/disas/winch/x64/f32_convert_i32_s/spilled.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_s/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x59
diff --git a/tests/disas/winch/x64/f32_convert_i32_u/const.wat b/tests/disas/winch/x64/f32_convert_i32_u/const.wat
index dea11022d8..06048787ef 100644
--- a/tests/disas/winch/x64/f32_convert_i32_u/const.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6d
diff --git a/tests/disas/winch/x64/f32_convert_i32_u/locals.wat b/tests/disas/winch/x64/f32_convert_i32_u/locals.wat
index c48cdd271c..686e6fc2fa 100644
--- a/tests/disas/winch/x64/f32_convert_i32_u/locals.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x76
diff --git a/tests/disas/winch/x64/f32_convert_i32_u/params.wat b/tests/disas/winch/x64/f32_convert_i32_u/params.wat
index d9715950c3..354edba932 100644
--- a/tests/disas/winch/x64/f32_convert_i32_u/params.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f32_convert_i32_u/spilled.wat b/tests/disas/winch/x64/f32_convert_i32_u/spilled.wat
index b2810cfc09..762c6fca27 100644
--- a/tests/disas/winch/x64/f32_convert_i32_u/spilled.wat
+++ b/tests/disas/winch/x64/f32_convert_i32_u/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x85
diff --git a/tests/disas/winch/x64/f32_convert_i64_s/const.wat b/tests/disas/winch/x64/f32_convert_i64_s/const.wat
index 953cd2f793..5ddc411562 100644
--- a/tests/disas/winch/x64/f32_convert_i64_s/const.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/f32_convert_i64_s/locals.wat b/tests/disas/winch/x64/f32_convert_i64_s/locals.wat
index 0a5fa1a89a..addfa24c4a 100644
--- a/tests/disas/winch/x64/f32_convert_i64_s/locals.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/f32_convert_i64_s/params.wat b/tests/disas/winch/x64/f32_convert_i64_s/params.wat
index 64fb6dae3f..9c24930c01 100644
--- a/tests/disas/winch/x64/f32_convert_i64_s/params.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/f32_convert_i64_s/spilled.wat b/tests/disas/winch/x64/f32_convert_i64_s/spilled.wat
index 14884bb4d7..f84387e2bd 100644
--- a/tests/disas/winch/x64/f32_convert_i64_s/spilled.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_s/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/f32_convert_i64_u/const.wat b/tests/disas/winch/x64/f32_convert_i64_u/const.wat
index f636dc05e4..8049ef1923 100644
--- a/tests/disas/winch/x64/f32_convert_i64_u/const.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
diff --git a/tests/disas/winch/x64/f32_convert_i64_u/locals.wat b/tests/disas/winch/x64/f32_convert_i64_u/locals.wat
index d687b1610c..0886e8fc86 100644
--- a/tests/disas/winch/x64/f32_convert_i64_u/locals.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x75
diff --git a/tests/disas/winch/x64/f32_convert_i64_u/params.wat b/tests/disas/winch/x64/f32_convert_i64_u/params.wat
index 491bba6ca1..8e498efdec 100644
--- a/tests/disas/winch/x64/f32_convert_i64_u/params.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f32_convert_i64_u/spilled.wat b/tests/disas/winch/x64/f32_convert_i64_u/spilled.wat
index d5ceb62713..8971b1ed46 100644
--- a/tests/disas/winch/x64/f32_convert_i64_u/spilled.wat
+++ b/tests/disas/winch/x64/f32_convert_i64_u/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x83
diff --git a/tests/disas/winch/x64/f32_copysign/const.wat b/tests/disas/winch/x64/f32_copysign/const.wat
index f6e82ca166..4c11da750d 100644
--- a/tests/disas/winch/x64/f32_copysign/const.wat
+++ b/tests/disas/winch/x64/f32_copysign/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/f32_copysign/locals.wat b/tests/disas/winch/x64/f32_copysign/locals.wat
index 925358133f..96f026e7b1 100644
--- a/tests/disas/winch/x64/f32_copysign/locals.wat
+++ b/tests/disas/winch/x64/f32_copysign/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x87
diff --git a/tests/disas/winch/x64/f32_copysign/params.wat b/tests/disas/winch/x64/f32_copysign/params.wat
index d7f99cf6dd..18e77bf839 100644
--- a/tests/disas/winch/x64/f32_copysign/params.wat
+++ b/tests/disas/winch/x64/f32_copysign/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/f32_demote_f64/const.wat b/tests/disas/winch/x64/f32_demote_f64/const.wat
index e6534bc17e..fa4cbb42e5 100644
--- a/tests/disas/winch/x64/f32_demote_f64/const.wat
+++ b/tests/disas/winch/x64/f32_demote_f64/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f32_demote_f64/locals.wat b/tests/disas/winch/x64/f32_demote_f64/locals.wat
index 90e811be06..70501d15a5 100644
--- a/tests/disas/winch/x64/f32_demote_f64/locals.wat
+++ b/tests/disas/winch/x64/f32_demote_f64/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/f32_demote_f64/params.wat b/tests/disas/winch/x64/f32_demote_f64/params.wat
index 87df36851f..f3ba148b12 100644
--- a/tests/disas/winch/x64/f32_demote_f64/params.wat
+++ b/tests/disas/winch/x64/f32_demote_f64/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/f32_demote_f64/spilled.wat b/tests/disas/winch/x64/f32_demote_f64/spilled.wat
index 6eaa1ad4f2..d4d28d7da7 100644
--- a/tests/disas/winch/x64/f32_demote_f64/spilled.wat
+++ b/tests/disas/winch/x64/f32_demote_f64/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x5c
diff --git a/tests/disas/winch/x64/f32_div/const.wat b/tests/disas/winch/x64/f32_div/const.wat
index 5f85a08ab4..1c84b21b59 100644
--- a/tests/disas/winch/x64/f32_div/const.wat
+++ b/tests/disas/winch/x64/f32_div/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f32_div/locals.wat b/tests/disas/winch/x64/f32_div/locals.wat
index b4a9d2eaea..e71008892f 100644
--- a/tests/disas/winch/x64/f32_div/locals.wat
+++ b/tests/disas/winch/x64/f32_div/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f32_div/params.wat b/tests/disas/winch/x64/f32_div/params.wat
index e0c7cd1725..57b9cf3e6d 100644
--- a/tests/disas/winch/x64/f32_div/params.wat
+++ b/tests/disas/winch/x64/f32_div/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/f32_eq/const.wat b/tests/disas/winch/x64/f32_eq/const.wat
index 219a510aca..edeccfeafc 100644
--- a/tests/disas/winch/x64/f32_eq/const.wat
+++ b/tests/disas/winch/x64/f32_eq/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/f32_eq/locals.wat b/tests/disas/winch/x64/f32_eq/locals.wat
index 9b630c5403..dedef23a5e 100644
--- a/tests/disas/winch/x64/f32_eq/locals.wat
+++ b/tests/disas/winch/x64/f32_eq/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/f32_eq/params.wat b/tests/disas/winch/x64/f32_eq/params.wat
index 16fe450c9f..6a491be654 100644
--- a/tests/disas/winch/x64/f32_eq/params.wat
+++ b/tests/disas/winch/x64/f32_eq/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x69
diff --git a/tests/disas/winch/x64/f32_floor/f32_floor_const_sse41.wat b/tests/disas/winch/x64/f32_floor/f32_floor_const_sse41.wat
index 57eb1561e7..f14e2bb5fe 100644
--- a/tests/disas/winch/x64/f32_floor/f32_floor_const_sse41.wat
+++ b/tests/disas/winch/x64/f32_floor/f32_floor_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32_floor/f32_floor_param.wat b/tests/disas/winch/x64/f32_floor/f32_floor_param.wat
index f9db481766..191d1feb01 100644
--- a/tests/disas/winch/x64/f32_floor/f32_floor_param.wat
+++ b/tests/disas/winch/x64/f32_floor/f32_floor_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f32_floor/f32_floor_param_sse41.wat b/tests/disas/winch/x64/f32_floor/f32_floor_param_sse41.wat
index 2775b3ef61..3d06feacd5 100644
--- a/tests/disas/winch/x64/f32_floor/f32_floor_param_sse41.wat
+++ b/tests/disas/winch/x64/f32_floor/f32_floor_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f32_ge/const.wat b/tests/disas/winch/x64/f32_ge/const.wat
index 6eaad2ec79..9c959625f4 100644
--- a/tests/disas/winch/x64/f32_ge/const.wat
+++ b/tests/disas/winch/x64/f32_ge/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/f32_ge/locals.wat b/tests/disas/winch/x64/f32_ge/locals.wat
index 2bf7fd4b55..f6aae2fc3e 100644
--- a/tests/disas/winch/x64/f32_ge/locals.wat
+++ b/tests/disas/winch/x64/f32_ge/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/f32_ge/params.wat b/tests/disas/winch/x64/f32_ge/params.wat
index 7d35824862..8de0a01123 100644
--- a/tests/disas/winch/x64/f32_ge/params.wat
+++ b/tests/disas/winch/x64/f32_ge/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x69
diff --git a/tests/disas/winch/x64/f32_gt/const.wat b/tests/disas/winch/x64/f32_gt/const.wat
index b79d055c0c..636448cd9f 100644
--- a/tests/disas/winch/x64/f32_gt/const.wat
+++ b/tests/disas/winch/x64/f32_gt/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/f32_gt/locals.wat b/tests/disas/winch/x64/f32_gt/locals.wat
index 042bfca96b..a1516937fc 100644
--- a/tests/disas/winch/x64/f32_gt/locals.wat
+++ b/tests/disas/winch/x64/f32_gt/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/f32_gt/params.wat b/tests/disas/winch/x64/f32_gt/params.wat
index 2c406c5582..f9be194776 100644
--- a/tests/disas/winch/x64/f32_gt/params.wat
+++ b/tests/disas/winch/x64/f32_gt/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x69
diff --git a/tests/disas/winch/x64/f32_le/const.wat b/tests/disas/winch/x64/f32_le/const.wat
index b363d3d146..3eb0c984db 100644
--- a/tests/disas/winch/x64/f32_le/const.wat
+++ b/tests/disas/winch/x64/f32_le/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/f32_le/locals.wat b/tests/disas/winch/x64/f32_le/locals.wat
index d4872a1a8b..2c6e5bfa51 100644
--- a/tests/disas/winch/x64/f32_le/locals.wat
+++ b/tests/disas/winch/x64/f32_le/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x75
diff --git a/tests/disas/winch/x64/f32_le/params.wat b/tests/disas/winch/x64/f32_le/params.wat
index 5347d7f714..a04a1b81e6 100644
--- a/tests/disas/winch/x64/f32_le/params.wat
+++ b/tests/disas/winch/x64/f32_le/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5c
diff --git a/tests/disas/winch/x64/f32_lt/const.wat b/tests/disas/winch/x64/f32_lt/const.wat
index 889be0931d..9b661c7b6b 100644
--- a/tests/disas/winch/x64/f32_lt/const.wat
+++ b/tests/disas/winch/x64/f32_lt/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/f32_lt/locals.wat b/tests/disas/winch/x64/f32_lt/locals.wat
index 0069e31bc1..6128f88f80 100644
--- a/tests/disas/winch/x64/f32_lt/locals.wat
+++ b/tests/disas/winch/x64/f32_lt/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x75
diff --git a/tests/disas/winch/x64/f32_lt/params.wat b/tests/disas/winch/x64/f32_lt/params.wat
index 0ed7c2283e..d506a22040 100644
--- a/tests/disas/winch/x64/f32_lt/params.wat
+++ b/tests/disas/winch/x64/f32_lt/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5c
diff --git a/tests/disas/winch/x64/f32_max/const.wat b/tests/disas/winch/x64/f32_max/const.wat
index 5a9ac0392a..232610e0c9 100644
--- a/tests/disas/winch/x64/f32_max/const.wat
+++ b/tests/disas/winch/x64/f32_max/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x70
diff --git a/tests/disas/winch/x64/f32_max/locals.wat b/tests/disas/winch/x64/f32_max/locals.wat
index 3ec3b36ccd..8794a8d692 100644
--- a/tests/disas/winch/x64/f32_max/locals.wat
+++ b/tests/disas/winch/x64/f32_max/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x92
diff --git a/tests/disas/winch/x64/f32_max/params.wat b/tests/disas/winch/x64/f32_max/params.wat
index 70b5a238af..2f8598d648 100644
--- a/tests/disas/winch/x64/f32_max/params.wat
+++ b/tests/disas/winch/x64/f32_max/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x79
diff --git a/tests/disas/winch/x64/f32_min/const.wat b/tests/disas/winch/x64/f32_min/const.wat
index 84bf1cd1c2..a6e507d8f0 100644
--- a/tests/disas/winch/x64/f32_min/const.wat
+++ b/tests/disas/winch/x64/f32_min/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x70
diff --git a/tests/disas/winch/x64/f32_min/locals.wat b/tests/disas/winch/x64/f32_min/locals.wat
index b31e5021ce..6d14b3fc45 100644
--- a/tests/disas/winch/x64/f32_min/locals.wat
+++ b/tests/disas/winch/x64/f32_min/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x92
diff --git a/tests/disas/winch/x64/f32_min/params.wat b/tests/disas/winch/x64/f32_min/params.wat
index ba18a5c051..1b2a6a30cf 100644
--- a/tests/disas/winch/x64/f32_min/params.wat
+++ b/tests/disas/winch/x64/f32_min/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x79
diff --git a/tests/disas/winch/x64/f32_mul/const.wat b/tests/disas/winch/x64/f32_mul/const.wat
index 2ba31a7ad1..bdc3cf6819 100644
--- a/tests/disas/winch/x64/f32_mul/const.wat
+++ b/tests/disas/winch/x64/f32_mul/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f32_mul/locals.wat b/tests/disas/winch/x64/f32_mul/locals.wat
index 854f1bedd1..0a844b7d5e 100644
--- a/tests/disas/winch/x64/f32_mul/locals.wat
+++ b/tests/disas/winch/x64/f32_mul/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f32_mul/params.wat b/tests/disas/winch/x64/f32_mul/params.wat
index 3b222591bf..0e1d53abc0 100644
--- a/tests/disas/winch/x64/f32_mul/params.wat
+++ b/tests/disas/winch/x64/f32_mul/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/f32_ne/const.wat b/tests/disas/winch/x64/f32_ne/const.wat
index 5633530ab4..f695c73c22 100644
--- a/tests/disas/winch/x64/f32_ne/const.wat
+++ b/tests/disas/winch/x64/f32_ne/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/f32_ne/locals.wat b/tests/disas/winch/x64/f32_ne/locals.wat
index 267df7da31..149afaf445 100644
--- a/tests/disas/winch/x64/f32_ne/locals.wat
+++ b/tests/disas/winch/x64/f32_ne/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/f32_ne/params.wat b/tests/disas/winch/x64/f32_ne/params.wat
index 1e1147703d..ad2417aa95 100644
--- a/tests/disas/winch/x64/f32_ne/params.wat
+++ b/tests/disas/winch/x64/f32_ne/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x69
diff --git a/tests/disas/winch/x64/f32_nearest/f32_floor_const_sse41.wat b/tests/disas/winch/x64/f32_nearest/f32_floor_const_sse41.wat
index 89f68a1b1c..35c39199da 100644
--- a/tests/disas/winch/x64/f32_nearest/f32_floor_const_sse41.wat
+++ b/tests/disas/winch/x64/f32_nearest/f32_floor_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32_nearest/f32_floor_param_sse41.wat b/tests/disas/winch/x64/f32_nearest/f32_floor_param_sse41.wat
index 549264ec63..9bc4e9b23c 100644
--- a/tests/disas/winch/x64/f32_nearest/f32_floor_param_sse41.wat
+++ b/tests/disas/winch/x64/f32_nearest/f32_floor_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f32_nearest/f32_nearest_param.wat b/tests/disas/winch/x64/f32_nearest/f32_nearest_param.wat
index adc7fa0af7..0ab1e30664 100644
--- a/tests/disas/winch/x64/f32_nearest/f32_nearest_param.wat
+++ b/tests/disas/winch/x64/f32_nearest/f32_nearest_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f32_neg/f32_neg_const.wat b/tests/disas/winch/x64/f32_neg/f32_neg_const.wat
index a372df3c6d..595caabdba 100644
--- a/tests/disas/winch/x64/f32_neg/f32_neg_const.wat
+++ b/tests/disas/winch/x64/f32_neg/f32_neg_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f32_neg/f32_neg_param.wat b/tests/disas/winch/x64/f32_neg/f32_neg_param.wat
index f698521bdc..f5a1aa235e 100644
--- a/tests/disas/winch/x64/f32_neg/f32_neg_param.wat
+++ b/tests/disas/winch/x64/f32_neg/f32_neg_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/f32_reinterpret_i32/const.wat b/tests/disas/winch/x64/f32_reinterpret_i32/const.wat
index 5b9db9b294..2909cbc3be 100644
--- a/tests/disas/winch/x64/f32_reinterpret_i32/const.wat
+++ b/tests/disas/winch/x64/f32_reinterpret_i32/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/f32_reinterpret_i32/locals.wat b/tests/disas/winch/x64/f32_reinterpret_i32/locals.wat
index 2dc391bb71..b65ea85dc3 100644
--- a/tests/disas/winch/x64/f32_reinterpret_i32/locals.wat
+++ b/tests/disas/winch/x64/f32_reinterpret_i32/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/f32_reinterpret_i32/params.wat b/tests/disas/winch/x64/f32_reinterpret_i32/params.wat
index 24f199586a..3604fab1d9 100644
--- a/tests/disas/winch/x64/f32_reinterpret_i32/params.wat
+++ b/tests/disas/winch/x64/f32_reinterpret_i32/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f32_reinterpret_i32/ret_int.wat b/tests/disas/winch/x64/f32_reinterpret_i32/ret_int.wat
index db013de511..48225ec580 100644
--- a/tests/disas/winch/x64/f32_reinterpret_i32/ret_int.wat
+++ b/tests/disas/winch/x64/f32_reinterpret_i32/ret_int.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32_reinterpret_i32/spilled.wat b/tests/disas/winch/x64/f32_reinterpret_i32/spilled.wat
index 9daf30bec7..c109aac75f 100644
--- a/tests/disas/winch/x64/f32_reinterpret_i32/spilled.wat
+++ b/tests/disas/winch/x64/f32_reinterpret_i32/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x59
diff --git a/tests/disas/winch/x64/f32_sqrt/f32_sqrt_const.wat b/tests/disas/winch/x64/f32_sqrt/f32_sqrt_const.wat
index db5297e87a..39f756f496 100644
--- a/tests/disas/winch/x64/f32_sqrt/f32_sqrt_const.wat
+++ b/tests/disas/winch/x64/f32_sqrt/f32_sqrt_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f32_sqrt/f32_sqrt_param.wat b/tests/disas/winch/x64/f32_sqrt/f32_sqrt_param.wat
index 7f077ccc32..5f9708cf33 100644
--- a/tests/disas/winch/x64/f32_sqrt/f32_sqrt_param.wat
+++ b/tests/disas/winch/x64/f32_sqrt/f32_sqrt_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/f32_sub/const.wat b/tests/disas/winch/x64/f32_sub/const.wat
index 2dd2f798d1..2815f6cdcc 100644
--- a/tests/disas/winch/x64/f32_sub/const.wat
+++ b/tests/disas/winch/x64/f32_sub/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f32_sub/locals.wat b/tests/disas/winch/x64/f32_sub/locals.wat
index b0937902bd..b9d97c90b0 100644
--- a/tests/disas/winch/x64/f32_sub/locals.wat
+++ b/tests/disas/winch/x64/f32_sub/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f32_sub/params.wat b/tests/disas/winch/x64/f32_sub/params.wat
index 178d2b263e..6cb11a1f50 100644
--- a/tests/disas/winch/x64/f32_sub/params.wat
+++ b/tests/disas/winch/x64/f32_sub/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/f32_trunc/f32_trunc_const_sse41.wat b/tests/disas/winch/x64/f32_trunc/f32_trunc_const_sse41.wat
index 62e6106c6b..e3bdc1b757 100644
--- a/tests/disas/winch/x64/f32_trunc/f32_trunc_const_sse41.wat
+++ b/tests/disas/winch/x64/f32_trunc/f32_trunc_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32_trunc/f32_trunc_param.wat b/tests/disas/winch/x64/f32_trunc/f32_trunc_param.wat
index 9aebb3411a..696a17c15a 100644
--- a/tests/disas/winch/x64/f32_trunc/f32_trunc_param.wat
+++ b/tests/disas/winch/x64/f32_trunc/f32_trunc_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f32_trunc/f32_trunc_param_sse41.wat b/tests/disas/winch/x64/f32_trunc/f32_trunc_param_sse41.wat
index 8444b1d56f..74bb65a276 100644
--- a/tests/disas/winch/x64/f32_trunc/f32_trunc_param_sse41.wat
+++ b/tests/disas/winch/x64/f32_trunc/f32_trunc_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f32x4_abs/const_avx.wat b/tests/disas/winch/x64/f32x4_abs/const_avx.wat
index cf61376bf8..85de1324de 100644
--- a/tests/disas/winch/x64/f32x4_abs/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_abs/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_add/const_avx.wat b/tests/disas/winch/x64/f32x4_add/const_avx.wat
index caca9215ca..b381b45a25 100644
--- a/tests/disas/winch/x64/f32x4_add/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_add/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_ceil/const_avx.wat b/tests/disas/winch/x64/f32x4_ceil/const_avx.wat
index 5831d777d1..8556472d60 100644
--- a/tests/disas/winch/x64/f32x4_ceil/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_ceil/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32x4_convert_i32x4_s/const_avx.wat b/tests/disas/winch/x64/f32x4_convert_i32x4_s/const_avx.wat
index e19e2c2b16..741e5e05ec 100644
--- a/tests/disas/winch/x64/f32x4_convert_i32x4_s/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_convert_i32x4_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f32x4_convert_i32x4_u/const_avx.wat b/tests/disas/winch/x64/f32x4_convert_i32x4_u/const_avx.wat
index 07647a878e..b0d6e41153 100644
--- a/tests/disas/winch/x64/f32x4_convert_i32x4_u/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_convert_i32x4_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/f32x4_demote_f64x2_zero/const_avx.wat b/tests/disas/winch/x64/f32x4_demote_f64x2_zero/const_avx.wat
index e258b6b1e3..72e6e60cc3 100644
--- a/tests/disas/winch/x64/f32x4_demote_f64x2_zero/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_demote_f64x2_zero/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f32x4_div/const_avx.wat b/tests/disas/winch/x64/f32x4_div/const_avx.wat
index 9a69c27e9a..6e83aac142 100644
--- a/tests/disas/winch/x64/f32x4_div/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_div/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_eq/const_avx.wat b/tests/disas/winch/x64/f32x4_eq/const_avx.wat
index 12ba46174c..5f11907c36 100644
--- a/tests/disas/winch/x64/f32x4_eq/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_eq/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f32x4_extract_lane/first_lane_avx.wat b/tests/disas/winch/x64/f32x4_extract_lane/first_lane_avx.wat
index 7364662cf8..0a06197d1d 100644
--- a/tests/disas/winch/x64/f32x4_extract_lane/first_lane_avx.wat
+++ b/tests/disas/winch/x64/f32x4_extract_lane/first_lane_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/f32x4_extract_lane/second_lane_avx.wat b/tests/disas/winch/x64/f32x4_extract_lane/second_lane_avx.wat
index 9c9a696943..68eb1c98a0 100644
--- a/tests/disas/winch/x64/f32x4_extract_lane/second_lane_avx.wat
+++ b/tests/disas/winch/x64/f32x4_extract_lane/second_lane_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f32x4_floor/const_avx.wat b/tests/disas/winch/x64/f32x4_floor/const_avx.wat
index 42092db4e7..bc127936e6 100644
--- a/tests/disas/winch/x64/f32x4_floor/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_floor/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32x4_ge/const_avx.wat b/tests/disas/winch/x64/f32x4_ge/const_avx.wat
index 077187b132..78e6311ea6 100644
--- a/tests/disas/winch/x64/f32x4_ge/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_ge/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f32x4_gt/const_avx.wat b/tests/disas/winch/x64/f32x4_gt/const_avx.wat
index 018dfe381b..f6332884ec 100644
--- a/tests/disas/winch/x64/f32x4_gt/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_gt/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f32x4_le/const_avx.wat b/tests/disas/winch/x64/f32x4_le/const_avx.wat
index 0def8e888d..044b0dc3f5 100644
--- a/tests/disas/winch/x64/f32x4_le/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_le/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f32x4_lt/const_avx.wat b/tests/disas/winch/x64/f32x4_lt/const_avx.wat
index 1a6883fb1c..716b6043a5 100644
--- a/tests/disas/winch/x64/f32x4_lt/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_lt/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f32x4_max/const_avx.wat b/tests/disas/winch/x64/f32x4_max/const_avx.wat
index 913ff34de0..13d8b86eff 100644
--- a/tests/disas/winch/x64/f32x4_max/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_max/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x70
diff --git a/tests/disas/winch/x64/f32x4_min/const_avx.wat b/tests/disas/winch/x64/f32x4_min/const_avx.wat
index bb8df2fa6e..952534efd5 100644
--- a/tests/disas/winch/x64/f32x4_min/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_min/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
diff --git a/tests/disas/winch/x64/f32x4_mul/const_avx.wat b/tests/disas/winch/x64/f32x4_mul/const_avx.wat
index 19987c5115..66e2920e96 100644
--- a/tests/disas/winch/x64/f32x4_mul/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_mul/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_ne/const_avx.wat b/tests/disas/winch/x64/f32x4_ne/const_avx.wat
index 3792bcaae5..fa87dcfe05 100644
--- a/tests/disas/winch/x64/f32x4_ne/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_ne/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f32x4_nearest/const_avx.wat b/tests/disas/winch/x64/f32x4_nearest/const_avx.wat
index 3c8c05ab72..d993846a7f 100644
--- a/tests/disas/winch/x64/f32x4_nearest/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_nearest/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f32x4_neg/const_avx.wat b/tests/disas/winch/x64/f32x4_neg/const_avx.wat
index 57217d87e5..811e08a207 100644
--- a/tests/disas/winch/x64/f32x4_neg/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_neg/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_pmax/const_avx.wat b/tests/disas/winch/x64/f32x4_pmax/const_avx.wat
index f00c59757f..303ebb864e 100644
--- a/tests/disas/winch/x64/f32x4_pmax/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_pmax/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_pmin/const_avx.wat b/tests/disas/winch/x64/f32x4_pmin/const_avx.wat
index 44131cc870..8c8cd070be 100644
--- a/tests/disas/winch/x64/f32x4_pmin/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_pmin/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_replace_lane/const_avx.wat b/tests/disas/winch/x64/f32x4_replace_lane/const_avx.wat
index 71ca8f8cf0..c7f185d3b9 100644
--- a/tests/disas/winch/x64/f32x4_replace_lane/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_replace_lane/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/f32x4_replace_lane/param_avx.wat b/tests/disas/winch/x64/f32x4_replace_lane/param_avx.wat
index bed0f7c77e..720f8516db 100644
--- a/tests/disas/winch/x64/f32x4_replace_lane/param_avx.wat
+++ b/tests/disas/winch/x64/f32x4_replace_lane/param_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/f32x4_splat/const_avx2.wat b/tests/disas/winch/x64/f32x4_splat/const_avx2.wat
index 1473daf2bb..dcdf90642c 100644
--- a/tests/disas/winch/x64/f32x4_splat/const_avx2.wat
+++ b/tests/disas/winch/x64/f32x4_splat/const_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f32x4_splat/params_avx2.wat b/tests/disas/winch/x64/f32x4_splat/params_avx2.wat
index a01ee687b5..05b8c1a8cd 100644
--- a/tests/disas/winch/x64/f32x4_splat/params_avx2.wat
+++ b/tests/disas/winch/x64/f32x4_splat/params_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/f32x4_sqrt/const_avx.wat b/tests/disas/winch/x64/f32x4_sqrt/const_avx.wat
index dcf5845691..85405682a1 100644
--- a/tests/disas/winch/x64/f32x4_sqrt/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_sqrt/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f32x4_sub/const_avx.wat b/tests/disas/winch/x64/f32x4_sub/const_avx.wat
index 65687f73f5..57f220de65 100644
--- a/tests/disas/winch/x64/f32x4_sub/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_sub/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f32x4_trunc/const_avx.wat b/tests/disas/winch/x64/f32x4_trunc/const_avx.wat
index cc6cb63e25..cf6273d255 100644
--- a/tests/disas/winch/x64/f32x4_trunc/const_avx.wat
+++ b/tests/disas/winch/x64/f32x4_trunc/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64_abs/f64_abs_const.wat b/tests/disas/winch/x64/f64_abs/f64_abs_const.wat
index 441460c6d1..130e489e42 100644
--- a/tests/disas/winch/x64/f64_abs/f64_abs_const.wat
+++ b/tests/disas/winch/x64/f64_abs/f64_abs_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/f64_abs/f64_abs_param.wat b/tests/disas/winch/x64/f64_abs/f64_abs_param.wat
index f44c74ae7f..3e4b734705 100644
--- a/tests/disas/winch/x64/f64_abs/f64_abs_param.wat
+++ b/tests/disas/winch/x64/f64_abs/f64_abs_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x59
diff --git a/tests/disas/winch/x64/f64_add/const.wat b/tests/disas/winch/x64/f64_add/const.wat
index 6cd2f075a6..e1fc46a5c4 100644
--- a/tests/disas/winch/x64/f64_add/const.wat
+++ b/tests/disas/winch/x64/f64_add/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f64_add/locals.wat b/tests/disas/winch/x64/f64_add/locals.wat
index ba37f695f4..502827d003 100644
--- a/tests/disas/winch/x64/f64_add/locals.wat
+++ b/tests/disas/winch/x64/f64_add/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x72
diff --git a/tests/disas/winch/x64/f64_add/params.wat b/tests/disas/winch/x64/f64_add/params.wat
index 039cf380bb..021105e18d 100644
--- a/tests/disas/winch/x64/f64_add/params.wat
+++ b/tests/disas/winch/x64/f64_add/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/f64_ceil/f64_ceil_const_sse41.wat b/tests/disas/winch/x64/f64_ceil/f64_ceil_const_sse41.wat
index 761060910b..56f53722d6 100644
--- a/tests/disas/winch/x64/f64_ceil/f64_ceil_const_sse41.wat
+++ b/tests/disas/winch/x64/f64_ceil/f64_ceil_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64_ceil/f64_ceil_param.wat b/tests/disas/winch/x64/f64_ceil/f64_ceil_param.wat
index cdc1b87b18..cca7df3169 100644
--- a/tests/disas/winch/x64/f64_ceil/f64_ceil_param.wat
+++ b/tests/disas/winch/x64/f64_ceil/f64_ceil_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f64_ceil/f64_ceil_param_sse41.wat b/tests/disas/winch/x64/f64_ceil/f64_ceil_param_sse41.wat
index fb589dbafa..0aaad953fb 100644
--- a/tests/disas/winch/x64/f64_ceil/f64_ceil_param_sse41.wat
+++ b/tests/disas/winch/x64/f64_ceil/f64_ceil_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f64_const/call_id.wat b/tests/disas/winch/x64/f64_const/call_id.wat
index cff85c9282..002104fb78 100644
--- a/tests/disas/winch/x64/f64_const/call_id.wat
+++ b/tests/disas/winch/x64/f64_const/call_id.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xa0
diff --git a/tests/disas/winch/x64/f64_const/id.wat b/tests/disas/winch/x64/f64_const/id.wat
index 8326b4aa27..e3baa3101e 100644
--- a/tests/disas/winch/x64/f64_const/id.wat
+++ b/tests/disas/winch/x64/f64_const/id.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f64_convert_i32_s/const.wat b/tests/disas/winch/x64/f64_convert_i32_s/const.wat
index 5a73e00aec..9e45a7c0b2 100644
--- a/tests/disas/winch/x64/f64_convert_i32_s/const.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/f64_convert_i32_s/locals.wat b/tests/disas/winch/x64/f64_convert_i32_s/locals.wat
index 5eb6f3f12b..89370e8e36 100644
--- a/tests/disas/winch/x64/f64_convert_i32_s/locals.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/f64_convert_i32_s/params.wat b/tests/disas/winch/x64/f64_convert_i32_s/params.wat
index c3deeaf3dd..2c1395aa7d 100644
--- a/tests/disas/winch/x64/f64_convert_i32_s/params.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f64_convert_i32_s/spilled.wat b/tests/disas/winch/x64/f64_convert_i32_s/spilled.wat
index c6f12e4ac6..a42c69c3d1 100644
--- a/tests/disas/winch/x64/f64_convert_i32_s/spilled.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_s/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x59
diff --git a/tests/disas/winch/x64/f64_convert_i32_u/const.wat b/tests/disas/winch/x64/f64_convert_i32_u/const.wat
index 576e992b9e..cc3e5c9374 100644
--- a/tests/disas/winch/x64/f64_convert_i32_u/const.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6d
diff --git a/tests/disas/winch/x64/f64_convert_i32_u/locals.wat b/tests/disas/winch/x64/f64_convert_i32_u/locals.wat
index 573224e921..ff752039cf 100644
--- a/tests/disas/winch/x64/f64_convert_i32_u/locals.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x76
diff --git a/tests/disas/winch/x64/f64_convert_i32_u/params.wat b/tests/disas/winch/x64/f64_convert_i32_u/params.wat
index 8552b4af1a..4d529674df 100644
--- a/tests/disas/winch/x64/f64_convert_i32_u/params.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f64_convert_i32_u/spilled.wat b/tests/disas/winch/x64/f64_convert_i32_u/spilled.wat
index 45182c7d34..e911e89c73 100644
--- a/tests/disas/winch/x64/f64_convert_i32_u/spilled.wat
+++ b/tests/disas/winch/x64/f64_convert_i32_u/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x85
diff --git a/tests/disas/winch/x64/f64_convert_i64_s/const.wat b/tests/disas/winch/x64/f64_convert_i64_s/const.wat
index 7bf84086a2..75e27cd2ac 100644
--- a/tests/disas/winch/x64/f64_convert_i64_s/const.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/f64_convert_i64_s/locals.wat b/tests/disas/winch/x64/f64_convert_i64_s/locals.wat
index 412ac79da4..55f4f93366 100644
--- a/tests/disas/winch/x64/f64_convert_i64_s/locals.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/f64_convert_i64_s/params.wat b/tests/disas/winch/x64/f64_convert_i64_s/params.wat
index 3c57f95a70..e7106ae4f2 100644
--- a/tests/disas/winch/x64/f64_convert_i64_s/params.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/f64_convert_i64_s/spilled.wat b/tests/disas/winch/x64/f64_convert_i64_s/spilled.wat
index 30a3678895..1d32064a48 100644
--- a/tests/disas/winch/x64/f64_convert_i64_s/spilled.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_s/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/f64_convert_i64_u/const.wat b/tests/disas/winch/x64/f64_convert_i64_u/const.wat
index 42e6f21ced..6aa80db97f 100644
--- a/tests/disas/winch/x64/f64_convert_i64_u/const.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
diff --git a/tests/disas/winch/x64/f64_convert_i64_u/locals.wat b/tests/disas/winch/x64/f64_convert_i64_u/locals.wat
index 6c6badc3f3..a0917dba71 100644
--- a/tests/disas/winch/x64/f64_convert_i64_u/locals.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x75
diff --git a/tests/disas/winch/x64/f64_convert_i64_u/params.wat b/tests/disas/winch/x64/f64_convert_i64_u/params.wat
index 0ee08bf843..db6a4d12e9 100644
--- a/tests/disas/winch/x64/f64_convert_i64_u/params.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/f64_convert_i64_u/spilled.wat b/tests/disas/winch/x64/f64_convert_i64_u/spilled.wat
index 42aeee8b37..a641fa7fb2 100644
--- a/tests/disas/winch/x64/f64_convert_i64_u/spilled.wat
+++ b/tests/disas/winch/x64/f64_convert_i64_u/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x83
diff --git a/tests/disas/winch/x64/f64_copysign/const.wat b/tests/disas/winch/x64/f64_copysign/const.wat
index ca5fc0ff1e..70bb856964 100644
--- a/tests/disas/winch/x64/f64_copysign/const.wat
+++ b/tests/disas/winch/x64/f64_copysign/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6c
diff --git a/tests/disas/winch/x64/f64_copysign/locals.wat b/tests/disas/winch/x64/f64_copysign/locals.wat
index e8173d0388..c71f6077af 100644
--- a/tests/disas/winch/x64/f64_copysign/locals.wat
+++ b/tests/disas/winch/x64/f64_copysign/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x8f
diff --git a/tests/disas/winch/x64/f64_copysign/params.wat b/tests/disas/winch/x64/f64_copysign/params.wat
index 3c35edc944..17f5d56af7 100644
--- a/tests/disas/winch/x64/f64_copysign/params.wat
+++ b/tests/disas/winch/x64/f64_copysign/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x73
diff --git a/tests/disas/winch/x64/f64_div/const.wat b/tests/disas/winch/x64/f64_div/const.wat
index 38d1363c61..4788fce93a 100644
--- a/tests/disas/winch/x64/f64_div/const.wat
+++ b/tests/disas/winch/x64/f64_div/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f64_div/locals.wat b/tests/disas/winch/x64/f64_div/locals.wat
index e854bfed7d..ca5bb72152 100644
--- a/tests/disas/winch/x64/f64_div/locals.wat
+++ b/tests/disas/winch/x64/f64_div/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x72
diff --git a/tests/disas/winch/x64/f64_div/params.wat b/tests/disas/winch/x64/f64_div/params.wat
index edad829b0f..5e62977765 100644
--- a/tests/disas/winch/x64/f64_div/params.wat
+++ b/tests/disas/winch/x64/f64_div/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/f64_eq/const.wat b/tests/disas/winch/x64/f64_eq/const.wat
index 92a9e56108..29e9ef2486 100644
--- a/tests/disas/winch/x64/f64_eq/const.wat
+++ b/tests/disas/winch/x64/f64_eq/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/f64_eq/locals.wat b/tests/disas/winch/x64/f64_eq/locals.wat
index 0822ae42f2..4215560919 100644
--- a/tests/disas/winch/x64/f64_eq/locals.wat
+++ b/tests/disas/winch/x64/f64_eq/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x84
diff --git a/tests/disas/winch/x64/f64_eq/params.wat b/tests/disas/winch/x64/f64_eq/params.wat
index bbe47c67c8..d57c09883e 100644
--- a/tests/disas/winch/x64/f64_eq/params.wat
+++ b/tests/disas/winch/x64/f64_eq/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/f64_floor/f64_floor_const_sse41.wat b/tests/disas/winch/x64/f64_floor/f64_floor_const_sse41.wat
index 48761265a3..f84da5ae95 100644
--- a/tests/disas/winch/x64/f64_floor/f64_floor_const_sse41.wat
+++ b/tests/disas/winch/x64/f64_floor/f64_floor_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64_floor/f64_floor_param.wat b/tests/disas/winch/x64/f64_floor/f64_floor_param.wat
index 2b4debf2fd..a23d819426 100644
--- a/tests/disas/winch/x64/f64_floor/f64_floor_param.wat
+++ b/tests/disas/winch/x64/f64_floor/f64_floor_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f64_floor/f64_floor_param_sse41.wat b/tests/disas/winch/x64/f64_floor/f64_floor_param_sse41.wat
index 756b511001..d96cf3f596 100644
--- a/tests/disas/winch/x64/f64_floor/f64_floor_param_sse41.wat
+++ b/tests/disas/winch/x64/f64_floor/f64_floor_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f64_ge/const.wat b/tests/disas/winch/x64/f64_ge/const.wat
index a9f96ecee2..3b93c86349 100644
--- a/tests/disas/winch/x64/f64_ge/const.wat
+++ b/tests/disas/winch/x64/f64_ge/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/f64_ge/locals.wat b/tests/disas/winch/x64/f64_ge/locals.wat
index b0f0de24d3..357a55a663 100644
--- a/tests/disas/winch/x64/f64_ge/locals.wat
+++ b/tests/disas/winch/x64/f64_ge/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x84
diff --git a/tests/disas/winch/x64/f64_ge/params.wat b/tests/disas/winch/x64/f64_ge/params.wat
index c841a1e217..b14684f3c2 100644
--- a/tests/disas/winch/x64/f64_ge/params.wat
+++ b/tests/disas/winch/x64/f64_ge/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/f64_gt/const.wat b/tests/disas/winch/x64/f64_gt/const.wat
index 73039ca827..2c9533f9d5 100644
--- a/tests/disas/winch/x64/f64_gt/const.wat
+++ b/tests/disas/winch/x64/f64_gt/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/f64_gt/locals.wat b/tests/disas/winch/x64/f64_gt/locals.wat
index 99a00003ea..c11fb2371e 100644
--- a/tests/disas/winch/x64/f64_gt/locals.wat
+++ b/tests/disas/winch/x64/f64_gt/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x84
diff --git a/tests/disas/winch/x64/f64_gt/params.wat b/tests/disas/winch/x64/f64_gt/params.wat
index 2feaa9510d..aba4da6885 100644
--- a/tests/disas/winch/x64/f64_gt/params.wat
+++ b/tests/disas/winch/x64/f64_gt/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/f64_le/const.wat b/tests/disas/winch/x64/f64_le/const.wat
index 6c21b60936..ecf3c7cccc 100644
--- a/tests/disas/winch/x64/f64_le/const.wat
+++ b/tests/disas/winch/x64/f64_le/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/f64_le/locals.wat b/tests/disas/winch/x64/f64_le/locals.wat
index 16d2363207..c46681d705 100644
--- a/tests/disas/winch/x64/f64_le/locals.wat
+++ b/tests/disas/winch/x64/f64_le/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x77
diff --git a/tests/disas/winch/x64/f64_le/params.wat b/tests/disas/winch/x64/f64_le/params.wat
index 16d2363207..c46681d705 100644
--- a/tests/disas/winch/x64/f64_le/params.wat
+++ b/tests/disas/winch/x64/f64_le/params.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x77
diff --git a/tests/disas/winch/x64/f64_lt/const.wat b/tests/disas/winch/x64/f64_lt/const.wat
index aaeb1f63a1..c81fed7500 100644
--- a/tests/disas/winch/x64/f64_lt/const.wat
+++ b/tests/disas/winch/x64/f64_lt/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/f64_lt/locals.wat b/tests/disas/winch/x64/f64_lt/locals.wat
index 4832e89054..8663255614 100644
--- a/tests/disas/winch/x64/f64_lt/locals.wat
+++ b/tests/disas/winch/x64/f64_lt/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x77
diff --git a/tests/disas/winch/x64/f64_lt/params.wat b/tests/disas/winch/x64/f64_lt/params.wat
index 579980e038..e51ed5dd33 100644
--- a/tests/disas/winch/x64/f64_lt/params.wat
+++ b/tests/disas/winch/x64/f64_lt/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5b
diff --git a/tests/disas/winch/x64/f64_max/const.wat b/tests/disas/winch/x64/f64_max/const.wat
index cd8ad13c30..4db6aba4c1 100644
--- a/tests/disas/winch/x64/f64_max/const.wat
+++ b/tests/disas/winch/x64/f64_max/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x72
diff --git a/tests/disas/winch/x64/f64_max/locals.wat b/tests/disas/winch/x64/f64_max/locals.wat
index efcbbdb9bf..7a307b5832 100644
--- a/tests/disas/winch/x64/f64_max/locals.wat
+++ b/tests/disas/winch/x64/f64_max/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x95
diff --git a/tests/disas/winch/x64/f64_max/params.wat b/tests/disas/winch/x64/f64_max/params.wat
index c6e5073ef4..605b337bdf 100644
--- a/tests/disas/winch/x64/f64_max/params.wat
+++ b/tests/disas/winch/x64/f64_max/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x79
diff --git a/tests/disas/winch/x64/f64_min/const.wat b/tests/disas/winch/x64/f64_min/const.wat
index ce4dda3d70..c7daeed36f 100644
--- a/tests/disas/winch/x64/f64_min/const.wat
+++ b/tests/disas/winch/x64/f64_min/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x72
diff --git a/tests/disas/winch/x64/f64_min/locals.wat b/tests/disas/winch/x64/f64_min/locals.wat
index 144ca9d44e..74f3cc7f74 100644
--- a/tests/disas/winch/x64/f64_min/locals.wat
+++ b/tests/disas/winch/x64/f64_min/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x95
diff --git a/tests/disas/winch/x64/f64_min/params.wat b/tests/disas/winch/x64/f64_min/params.wat
index 5924820d5a..bec3ec7097 100644
--- a/tests/disas/winch/x64/f64_min/params.wat
+++ b/tests/disas/winch/x64/f64_min/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x79
diff --git a/tests/disas/winch/x64/f64_mul/const.wat b/tests/disas/winch/x64/f64_mul/const.wat
index 205b517395..404e66cb4a 100644
--- a/tests/disas/winch/x64/f64_mul/const.wat
+++ b/tests/disas/winch/x64/f64_mul/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f64_mul/locals.wat b/tests/disas/winch/x64/f64_mul/locals.wat
index 51725337d9..5e96823c84 100644
--- a/tests/disas/winch/x64/f64_mul/locals.wat
+++ b/tests/disas/winch/x64/f64_mul/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x72
diff --git a/tests/disas/winch/x64/f64_mul/params.wat b/tests/disas/winch/x64/f64_mul/params.wat
index b701b5128c..97f4579974 100644
--- a/tests/disas/winch/x64/f64_mul/params.wat
+++ b/tests/disas/winch/x64/f64_mul/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/f64_ne/const.wat b/tests/disas/winch/x64/f64_ne/const.wat
index 1f2ba4d930..c4188eb3e8 100644
--- a/tests/disas/winch/x64/f64_ne/const.wat
+++ b/tests/disas/winch/x64/f64_ne/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/f64_ne/locals.wat b/tests/disas/winch/x64/f64_ne/locals.wat
index eafabb0b89..974f42e8cd 100644
--- a/tests/disas/winch/x64/f64_ne/locals.wat
+++ b/tests/disas/winch/x64/f64_ne/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x84
diff --git a/tests/disas/winch/x64/f64_ne/params.wat b/tests/disas/winch/x64/f64_ne/params.wat
index 97ff312f3e..2446a3a27a 100644
--- a/tests/disas/winch/x64/f64_ne/params.wat
+++ b/tests/disas/winch/x64/f64_ne/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/f64_nearest/f64_nearest_const_sse41.wat b/tests/disas/winch/x64/f64_nearest/f64_nearest_const_sse41.wat
index b91e526bfc..1d9dfc93a7 100644
--- a/tests/disas/winch/x64/f64_nearest/f64_nearest_const_sse41.wat
+++ b/tests/disas/winch/x64/f64_nearest/f64_nearest_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64_nearest/f64_nearest_param.wat b/tests/disas/winch/x64/f64_nearest/f64_nearest_param.wat
index e78d9a01fe..43427ea2e9 100644
--- a/tests/disas/winch/x64/f64_nearest/f64_nearest_param.wat
+++ b/tests/disas/winch/x64/f64_nearest/f64_nearest_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f64_nearest/f64_nearest_param_sse41.wat b/tests/disas/winch/x64/f64_nearest/f64_nearest_param_sse41.wat
index 8863cda484..37ebf14bb9 100644
--- a/tests/disas/winch/x64/f64_nearest/f64_nearest_param_sse41.wat
+++ b/tests/disas/winch/x64/f64_nearest/f64_nearest_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f64_neg/f64_neg_const.wat b/tests/disas/winch/x64/f64_neg/f64_neg_const.wat
index 58b35b3289..7149bfb98d 100644
--- a/tests/disas/winch/x64/f64_neg/f64_neg_const.wat
+++ b/tests/disas/winch/x64/f64_neg/f64_neg_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/f64_neg/f64_neg_param.wat b/tests/disas/winch/x64/f64_neg/f64_neg_param.wat
index 48844363e1..0413f82c60 100644
--- a/tests/disas/winch/x64/f64_neg/f64_neg_param.wat
+++ b/tests/disas/winch/x64/f64_neg/f64_neg_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x59
diff --git a/tests/disas/winch/x64/f64_promote_f32/const.wat b/tests/disas/winch/x64/f64_promote_f32/const.wat
index 59980ed9a5..4a7e927b38 100644
--- a/tests/disas/winch/x64/f64_promote_f32/const.wat
+++ b/tests/disas/winch/x64/f64_promote_f32/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f64_promote_f32/locals.wat b/tests/disas/winch/x64/f64_promote_f32/locals.wat
index fc6a142c74..8056f4262b 100644
--- a/tests/disas/winch/x64/f64_promote_f32/locals.wat
+++ b/tests/disas/winch/x64/f64_promote_f32/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/f64_promote_f32/params.wat b/tests/disas/winch/x64/f64_promote_f32/params.wat
index 1925a8d2f0..a84773c8df 100644
--- a/tests/disas/winch/x64/f64_promote_f32/params.wat
+++ b/tests/disas/winch/x64/f64_promote_f32/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/f64_promote_f32/spilled.wat b/tests/disas/winch/x64/f64_promote_f32/spilled.wat
index 499b335b15..c4c57bd20e 100644
--- a/tests/disas/winch/x64/f64_promote_f32/spilled.wat
+++ b/tests/disas/winch/x64/f64_promote_f32/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x5c
diff --git a/tests/disas/winch/x64/f64_reinterpret_i64/const.wat b/tests/disas/winch/x64/f64_reinterpret_i64/const.wat
index 2ced5f4e6e..9372d95912 100644
--- a/tests/disas/winch/x64/f64_reinterpret_i64/const.wat
+++ b/tests/disas/winch/x64/f64_reinterpret_i64/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/f64_reinterpret_i64/locals.wat b/tests/disas/winch/x64/f64_reinterpret_i64/locals.wat
index 27c0f5c66a..3724e85d5f 100644
--- a/tests/disas/winch/x64/f64_reinterpret_i64/locals.wat
+++ b/tests/disas/winch/x64/f64_reinterpret_i64/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/f64_reinterpret_i64/params.wat b/tests/disas/winch/x64/f64_reinterpret_i64/params.wat
index 0c7a4cad40..f04bcff48e 100644
--- a/tests/disas/winch/x64/f64_reinterpret_i64/params.wat
+++ b/tests/disas/winch/x64/f64_reinterpret_i64/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/f64_reinterpret_i64/ret_int.wat b/tests/disas/winch/x64/f64_reinterpret_i64/ret_int.wat
index 8ec95173e8..aff8c6e8bf 100644
--- a/tests/disas/winch/x64/f64_reinterpret_i64/ret_int.wat
+++ b/tests/disas/winch/x64/f64_reinterpret_i64/ret_int.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x47
diff --git a/tests/disas/winch/x64/f64_reinterpret_i64/spilled.wat b/tests/disas/winch/x64/f64_reinterpret_i64/spilled.wat
index 80c78db4bd..2786bda73c 100644
--- a/tests/disas/winch/x64/f64_reinterpret_i64/spilled.wat
+++ b/tests/disas/winch/x64/f64_reinterpret_i64/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/f64_sqrt/f64_sqrt_const.wat b/tests/disas/winch/x64/f64_sqrt/f64_sqrt_const.wat
index dace37aef6..76d6543f77 100644
--- a/tests/disas/winch/x64/f64_sqrt/f64_sqrt_const.wat
+++ b/tests/disas/winch/x64/f64_sqrt/f64_sqrt_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f64_sqrt/f64_sqrt_param.wat b/tests/disas/winch/x64/f64_sqrt/f64_sqrt_param.wat
index f828e088a2..f8fade2130 100644
--- a/tests/disas/winch/x64/f64_sqrt/f64_sqrt_param.wat
+++ b/tests/disas/winch/x64/f64_sqrt/f64_sqrt_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/f64_sub/const.wat b/tests/disas/winch/x64/f64_sub/const.wat
index b38f64964a..3eada341e4 100644
--- a/tests/disas/winch/x64/f64_sub/const.wat
+++ b/tests/disas/winch/x64/f64_sub/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/f64_sub/locals.wat b/tests/disas/winch/x64/f64_sub/locals.wat
index 7a92f0773c..de8f911ce9 100644
--- a/tests/disas/winch/x64/f64_sub/locals.wat
+++ b/tests/disas/winch/x64/f64_sub/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x72
diff --git a/tests/disas/winch/x64/f64_sub/params.wat b/tests/disas/winch/x64/f64_sub/params.wat
index 4428399f85..ebcef90407 100644
--- a/tests/disas/winch/x64/f64_sub/params.wat
+++ b/tests/disas/winch/x64/f64_sub/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/f64_trunc/f64_trunc_const_sse41.wat b/tests/disas/winch/x64/f64_trunc/f64_trunc_const_sse41.wat
index f9cd824e28..6cf5f4fdc0 100644
--- a/tests/disas/winch/x64/f64_trunc/f64_trunc_const_sse41.wat
+++ b/tests/disas/winch/x64/f64_trunc/f64_trunc_const_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64_trunc/f64_trunc_param.wat b/tests/disas/winch/x64/f64_trunc/f64_trunc_param.wat
index 138fff2647..8c98aa5367 100644
--- a/tests/disas/winch/x64/f64_trunc/f64_trunc_param.wat
+++ b/tests/disas/winch/x64/f64_trunc/f64_trunc_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x7b
diff --git a/tests/disas/winch/x64/f64_trunc/f64_trunc_param_sse41.wat b/tests/disas/winch/x64/f64_trunc/f64_trunc_param_sse41.wat
index cb5dc9e9ce..b3b21a9048 100644
--- a/tests/disas/winch/x64/f64_trunc/f64_trunc_param_sse41.wat
+++ b/tests/disas/winch/x64/f64_trunc/f64_trunc_param_sse41.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/f64x2_abs/const_avx.wat b/tests/disas/winch/x64/f64x2_abs/const_avx.wat
index 0ccfe19514..331ebe6fed 100644
--- a/tests/disas/winch/x64/f64x2_abs/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_abs/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_add/const_avx.wat b/tests/disas/winch/x64/f64x2_add/const_avx.wat
index cb22471d82..9fbcdcc11c 100644
--- a/tests/disas/winch/x64/f64x2_add/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_add/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_ceil/const_avx.wat b/tests/disas/winch/x64/f64x2_ceil/const_avx.wat
index 93b1fb2e6f..b09b5a8a7b 100644
--- a/tests/disas/winch/x64/f64x2_ceil/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_ceil/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64x2_convert_low_i32x4_s/const_avx.wat b/tests/disas/winch/x64/f64x2_convert_low_i32x4_s/const_avx.wat
index d365d10be8..8dfa7aa1d7 100644
--- a/tests/disas/winch/x64/f64x2_convert_low_i32x4_s/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_convert_low_i32x4_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f64x2_convert_low_i32x4_u/const_avx.wat b/tests/disas/winch/x64/f64x2_convert_low_i32x4_u/const_avx.wat
index 97cfdd14c7..5f7daa9fda 100644
--- a/tests/disas/winch/x64/f64x2_convert_low_i32x4_u/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_convert_low_i32x4_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_div/const_avx.wat b/tests/disas/winch/x64/f64x2_div/const_avx.wat
index 8a1e3ab6c7..7b28025352 100644
--- a/tests/disas/winch/x64/f64x2_div/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_div/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_eq/const_avx.wat b/tests/disas/winch/x64/f64x2_eq/const_avx.wat
index 07f2712b70..cecb0bd3b3 100644
--- a/tests/disas/winch/x64/f64x2_eq/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_eq/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f64x2_extract_lane/first_lane_avx.wat b/tests/disas/winch/x64/f64x2_extract_lane/first_lane_avx.wat
index 46f2f3dcbd..a16d717cd7 100644
--- a/tests/disas/winch/x64/f64x2_extract_lane/first_lane_avx.wat
+++ b/tests/disas/winch/x64/f64x2_extract_lane/first_lane_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/f64x2_extract_lane/second_lane_avx.wat b/tests/disas/winch/x64/f64x2_extract_lane/second_lane_avx.wat
index 16d822fffc..0ecac2f8bc 100644
--- a/tests/disas/winch/x64/f64x2_extract_lane/second_lane_avx.wat
+++ b/tests/disas/winch/x64/f64x2_extract_lane/second_lane_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f64x2_floor/const_avx.wat b/tests/disas/winch/x64/f64x2_floor/const_avx.wat
index f51d6264d1..4e2f4bac6c 100644
--- a/tests/disas/winch/x64/f64x2_floor/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_floor/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64x2_ge/const_avx.wat b/tests/disas/winch/x64/f64x2_ge/const_avx.wat
index cd61fd4415..7f06e208fb 100644
--- a/tests/disas/winch/x64/f64x2_ge/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_ge/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f64x2_gt/const_avx.wat b/tests/disas/winch/x64/f64x2_gt/const_avx.wat
index f60ba50e0b..57329372ee 100644
--- a/tests/disas/winch/x64/f64x2_gt/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_gt/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f64x2_le/const_avx.wat b/tests/disas/winch/x64/f64x2_le/const_avx.wat
index c459df5214..fd55b23648 100644
--- a/tests/disas/winch/x64/f64x2_le/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_le/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f64x2_lt/const_avx.wat b/tests/disas/winch/x64/f64x2_lt/const_avx.wat
index f97542a2db..2b4cbf2f5f 100644
--- a/tests/disas/winch/x64/f64x2_lt/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_lt/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f64x2_max/const_avx.wat b/tests/disas/winch/x64/f64x2_max/const_avx.wat
index 5af7f38497..878ad3de2f 100644
--- a/tests/disas/winch/x64/f64x2_max/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_max/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x70
diff --git a/tests/disas/winch/x64/f64x2_min/const_avx.wat b/tests/disas/winch/x64/f64x2_min/const_avx.wat
index a130aad078..21bd484947 100644
--- a/tests/disas/winch/x64/f64x2_min/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_min/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
diff --git a/tests/disas/winch/x64/f64x2_mul/const_avx.wat b/tests/disas/winch/x64/f64x2_mul/const_avx.wat
index 2f71b3cc16..c340c5db66 100644
--- a/tests/disas/winch/x64/f64x2_mul/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_mul/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_ne/const_avx.wat b/tests/disas/winch/x64/f64x2_ne/const_avx.wat
index 7698bc8274..2a53b742a5 100644
--- a/tests/disas/winch/x64/f64x2_ne/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_ne/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/f64x2_nearest/const_avx.wat b/tests/disas/winch/x64/f64x2_nearest/const_avx.wat
index a863eee7d5..2ebe3a34c2 100644
--- a/tests/disas/winch/x64/f64x2_nearest/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_nearest/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/f64x2_neg/const_avx.wat b/tests/disas/winch/x64/f64x2_neg/const_avx.wat
index c6ac5f2af2..9a24180293 100644
--- a/tests/disas/winch/x64/f64x2_neg/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_neg/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_pmax/const_avx.wat b/tests/disas/winch/x64/f64x2_pmax/const_avx.wat
index d228bd2c47..53af5c2c6d 100644
--- a/tests/disas/winch/x64/f64x2_pmax/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_pmax/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_pmin/const_avx.wat b/tests/disas/winch/x64/f64x2_pmin/const_avx.wat
index 6041a1520c..b4c45e77da 100644
--- a/tests/disas/winch/x64/f64x2_pmin/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_pmin/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_promote_low_f32x4/const_avx.wat b/tests/disas/winch/x64/f64x2_promote_low_f32x4/const_avx.wat
index b1ca11dc68..38005602e5 100644
--- a/tests/disas/winch/x64/f64x2_promote_low_f32x4/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_promote_low_f32x4/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f64x2_replace_lane/const_lane0_avx.wat b/tests/disas/winch/x64/f64x2_replace_lane/const_lane0_avx.wat
index e0632eb577..7028458fe2 100644
--- a/tests/disas/winch/x64/f64x2_replace_lane/const_lane0_avx.wat
+++ b/tests/disas/winch/x64/f64x2_replace_lane/const_lane0_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/f64x2_replace_lane/const_lane1_avx.wat b/tests/disas/winch/x64/f64x2_replace_lane/const_lane1_avx.wat
index cfcb7ce24c..bd5ae4e0c6 100644
--- a/tests/disas/winch/x64/f64x2_replace_lane/const_lane1_avx.wat
+++ b/tests/disas/winch/x64/f64x2_replace_lane/const_lane1_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/f64x2_replace_lane/param_lane0_avx.wat b/tests/disas/winch/x64/f64x2_replace_lane/param_lane0_avx.wat
index edeb622a8e..0acef33a43 100644
--- a/tests/disas/winch/x64/f64x2_replace_lane/param_lane0_avx.wat
+++ b/tests/disas/winch/x64/f64x2_replace_lane/param_lane0_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/f64x2_replace_lane/param_lane1_avx.wat b/tests/disas/winch/x64/f64x2_replace_lane/param_lane1_avx.wat
index 744e98cf75..2e74286165 100644
--- a/tests/disas/winch/x64/f64x2_replace_lane/param_lane1_avx.wat
+++ b/tests/disas/winch/x64/f64x2_replace_lane/param_lane1_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/f64x2_splat/const_avx.wat b/tests/disas/winch/x64/f64x2_splat/const_avx.wat
index 834238215c..e6bb0ab1e0 100644
--- a/tests/disas/winch/x64/f64x2_splat/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_splat/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/f64x2_splat/param_avx.wat b/tests/disas/winch/x64/f64x2_splat/param_avx.wat
index e774eac74e..62986f2509 100644
--- a/tests/disas/winch/x64/f64x2_splat/param_avx.wat
+++ b/tests/disas/winch/x64/f64x2_splat/param_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/f64x2_sqrt/const_avx.wat b/tests/disas/winch/x64/f64x2_sqrt/const_avx.wat
index b2e0ac5739..3eedade6ef 100644
--- a/tests/disas/winch/x64/f64x2_sqrt/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_sqrt/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/f64x2_sub/const_avx.wat b/tests/disas/winch/x64/f64x2_sub/const_avx.wat
index e085ad64eb..4527fe9fc7 100644
--- a/tests/disas/winch/x64/f64x2_sub/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_sub/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/f64x2_trunc/const_avx.wat b/tests/disas/winch/x64/f64x2_trunc/const_avx.wat
index 27750047d7..c64701bbda 100644
--- a/tests/disas/winch/x64/f64x2_trunc/const_avx.wat
+++ b/tests/disas/winch/x64/f64x2_trunc/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/fuel/call.wat b/tests/disas/winch/x64/fuel/call.wat
index efd069f711..274046f661 100644
--- a/tests/disas/winch/x64/fuel/call.wat
+++ b/tests/disas/winch/x64/fuel/call.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xae
@@ -57,7 +57,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x117
diff --git a/tests/disas/winch/x64/fuel/func.wat b/tests/disas/winch/x64/fuel/func.wat
index 14ab5b2471..f9b8da67a8 100644
--- a/tests/disas/winch/x64/fuel/func.wat
+++ b/tests/disas/winch/x64/fuel/func.wat
@@ -7,7 +7,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/fuel/loop.wat b/tests/disas/winch/x64/fuel/loop.wat
index 3487f1061f..b31304f35c 100644
--- a/tests/disas/winch/x64/fuel/loop.wat
+++ b/tests/disas/winch/x64/fuel/loop.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x9b
diff --git a/tests/disas/winch/x64/i16x8/add/add.wat b/tests/disas/winch/x64/i16x8/add/add.wat
index 342d0a2299..657377ab1d 100644
--- a/tests/disas/winch/x64/i16x8/add/add.wat
+++ b/tests/disas/winch/x64/i16x8/add/add.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8/add/add_sat_s.wat b/tests/disas/winch/x64/i16x8/add/add_sat_s.wat
index 308fa357f8..f3244ab709 100644
--- a/tests/disas/winch/x64/i16x8/add/add_sat_s.wat
+++ b/tests/disas/winch/x64/i16x8/add/add_sat_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8/add/add_sat_u.wat b/tests/disas/winch/x64/i16x8/add/add_sat_u.wat
index c8a5960b28..66cf701d26 100644
--- a/tests/disas/winch/x64/i16x8/add/add_sat_u.wat
+++ b/tests/disas/winch/x64/i16x8/add/add_sat_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8/extadd/extadd_s.wat b/tests/disas/winch/x64/i16x8/extadd/extadd_s.wat
index 01f0439693..d414064e00 100644
--- a/tests/disas/winch/x64/i16x8/extadd/extadd_s.wat
+++ b/tests/disas/winch/x64/i16x8/extadd/extadd_s.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i16x8/extadd/extadd_u.wat b/tests/disas/winch/x64/i16x8/extadd/extadd_u.wat
index 5f6ef7cdde..243fe0e048 100644
--- a/tests/disas/winch/x64/i16x8/extadd/extadd_u.wat
+++ b/tests/disas/winch/x64/i16x8/extadd/extadd_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/i16x8/extmul/high_s.wat b/tests/disas/winch/x64/i16x8/extmul/high_s.wat
index 2311f3eed2..915b52cd69 100644
--- a/tests/disas/winch/x64/i16x8/extmul/high_s.wat
+++ b/tests/disas/winch/x64/i16x8/extmul/high_s.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x6d
diff --git a/tests/disas/winch/x64/i16x8/extmul/high_u.wat b/tests/disas/winch/x64/i16x8/extmul/high_u.wat
index 98c2f87b9e..de4008b34e 100644
--- a/tests/disas/winch/x64/i16x8/extmul/high_u.wat
+++ b/tests/disas/winch/x64/i16x8/extmul/high_u.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
diff --git a/tests/disas/winch/x64/i16x8/extmul/low_s.wat b/tests/disas/winch/x64/i16x8/extmul/low_s.wat
index 31386be0a5..25537bcc75 100644
--- a/tests/disas/winch/x64/i16x8/extmul/low_s.wat
+++ b/tests/disas/winch/x64/i16x8/extmul/low_s.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/i16x8/extmul/low_u.wat b/tests/disas/winch/x64/i16x8/extmul/low_u.wat
index 621b5d0518..9cdf9a6e86 100644
--- a/tests/disas/winch/x64/i16x8/extmul/low_u.wat
+++ b/tests/disas/winch/x64/i16x8/extmul/low_u.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/i16x8/extract_lane_s/const_avx.wat b/tests/disas/winch/x64/i16x8/extract_lane_s/const_avx.wat
index 24f20e35c5..29a064b1ec 100644
--- a/tests/disas/winch/x64/i16x8/extract_lane_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8/extract_lane_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i16x8/extract_lane_u/const.wat b/tests/disas/winch/x64/i16x8/extract_lane_u/const.wat
index 034256a74a..9489083565 100644
--- a/tests/disas/winch/x64/i16x8/extract_lane_u/const.wat
+++ b/tests/disas/winch/x64/i16x8/extract_lane_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i16x8/max/max_s.wat b/tests/disas/winch/x64/i16x8/max/max_s.wat
index 2e683e8aff..98a6a28ee6 100644
--- a/tests/disas/winch/x64/i16x8/max/max_s.wat
+++ b/tests/disas/winch/x64/i16x8/max/max_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i16x8/max/max_u.wat b/tests/disas/winch/x64/i16x8/max/max_u.wat
index 2f1da2c506..ce262fdcf3 100644
--- a/tests/disas/winch/x64/i16x8/max/max_u.wat
+++ b/tests/disas/winch/x64/i16x8/max/max_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i16x8/min/min_s.wat b/tests/disas/winch/x64/i16x8/min/min_s.wat
index 75b66a46bb..d488c61004 100644
--- a/tests/disas/winch/x64/i16x8/min/min_s.wat
+++ b/tests/disas/winch/x64/i16x8/min/min_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i16x8/min/min_u.wat b/tests/disas/winch/x64/i16x8/min/min_u.wat
index b78994774e..fe986183c7 100644
--- a/tests/disas/winch/x64/i16x8/min/min_u.wat
+++ b/tests/disas/winch/x64/i16x8/min/min_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i16x8/mul/mul.wat b/tests/disas/winch/x64/i16x8/mul/mul.wat
index 429ed61fa1..25f55dcb6b 100644
--- a/tests/disas/winch/x64/i16x8/mul/mul.wat
+++ b/tests/disas/winch/x64/i16x8/mul/mul.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8/neg/neg.wat b/tests/disas/winch/x64/i16x8/neg/neg.wat
index 232817ec91..0a0add13d0 100644
--- a/tests/disas/winch/x64/i16x8/neg/neg.wat
+++ b/tests/disas/winch/x64/i16x8/neg/neg.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i16x8/replace_lane/const_avx.wat b/tests/disas/winch/x64/i16x8/replace_lane/const_avx.wat
index a8328fea8e..97fc0a9fed 100644
--- a/tests/disas/winch/x64/i16x8/replace_lane/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8/replace_lane/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i16x8/replace_lane/param_avx.wat b/tests/disas/winch/x64/i16x8/replace_lane/param_avx.wat
index dab733d3eb..98b944a045 100644
--- a/tests/disas/winch/x64/i16x8/replace_lane/param_avx.wat
+++ b/tests/disas/winch/x64/i16x8/replace_lane/param_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i16x8/shift/shl.wat b/tests/disas/winch/x64/i16x8/shift/shl.wat
index eb1ece3b62..8cb8450cd0 100644
--- a/tests/disas/winch/x64/i16x8/shift/shl.wat
+++ b/tests/disas/winch/x64/i16x8/shift/shl.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i16x8/shift/shr_s.wat b/tests/disas/winch/x64/i16x8/shift/shr_s.wat
index 41222193a7..90c25e2fdf 100644
--- a/tests/disas/winch/x64/i16x8/shift/shr_s.wat
+++ b/tests/disas/winch/x64/i16x8/shift/shr_s.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i16x8/shift/shr_u.wat b/tests/disas/winch/x64/i16x8/shift/shr_u.wat
index 521aabb6a2..2cbafdf3ef 100644
--- a/tests/disas/winch/x64/i16x8/shift/shr_u.wat
+++ b/tests/disas/winch/x64/i16x8/shift/shr_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i16x8/splat/const_avx2.wat b/tests/disas/winch/x64/i16x8/splat/const_avx2.wat
index 91c5cc9027..0ec91d7c12 100644
--- a/tests/disas/winch/x64/i16x8/splat/const_avx2.wat
+++ b/tests/disas/winch/x64/i16x8/splat/const_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i16x8/splat/param_avx2.wat b/tests/disas/winch/x64/i16x8/splat/param_avx2.wat
index 64a9df97e0..6b32b4a052 100644
--- a/tests/disas/winch/x64/i16x8/splat/param_avx2.wat
+++ b/tests/disas/winch/x64/i16x8/splat/param_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i16x8/sub/sub.wat b/tests/disas/winch/x64/i16x8/sub/sub.wat
index 99773655c3..e2543a1381 100644
--- a/tests/disas/winch/x64/i16x8/sub/sub.wat
+++ b/tests/disas/winch/x64/i16x8/sub/sub.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8/sub/sub_sat_s.wat b/tests/disas/winch/x64/i16x8/sub/sub_sat_s.wat
index 67e2ca7ffb..821920a430 100644
--- a/tests/disas/winch/x64/i16x8/sub/sub_sat_s.wat
+++ b/tests/disas/winch/x64/i16x8/sub/sub_sat_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8/sub/sub_sat_u.wat b/tests/disas/winch/x64/i16x8/sub/sub_sat_u.wat
index 3c9cda8e53..655a5c6c14 100644
--- a/tests/disas/winch/x64/i16x8/sub/sub_sat_u.wat
+++ b/tests/disas/winch/x64/i16x8/sub/sub_sat_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8_abs/const_avx.wat b/tests/disas/winch/x64/i16x8_abs/const_avx.wat
index 4dbfdd5d1a..9bd95bb8c6 100644
--- a/tests/disas/winch/x64/i16x8_abs/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_abs/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i16x8_all_true/const_avx.wat b/tests/disas/winch/x64/i16x8_all_true/const_avx.wat
index e3a45075df..ede6ec76c6 100644
--- a/tests/disas/winch/x64/i16x8_all_true/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_all_true/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i16x8_avgr_u/const_avx.wat b/tests/disas/winch/x64/i16x8_avgr_u/const_avx.wat
index 6acee2bc4d..5522afa37a 100644
--- a/tests/disas/winch/x64/i16x8_avgr_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_avgr_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8_bitmask/const_avx.wat b/tests/disas/winch/x64/i16x8_bitmask/const_avx.wat
index 0415831d9c..ad693012e2 100644
--- a/tests/disas/winch/x64/i16x8_bitmask/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_bitmask/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i16x8_eq/const_avx.wat b/tests/disas/winch/x64/i16x8_eq/const_avx.wat
index 351c7759f7..b5d17a4ab4 100644
--- a/tests/disas/winch/x64/i16x8_eq/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_eq/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8_extend_high_i8x16_s/const_avx.wat b/tests/disas/winch/x64/i16x8_extend_high_i8x16_s/const_avx.wat
index 1b2a05e839..28d4579af0 100644
--- a/tests/disas/winch/x64/i16x8_extend_high_i8x16_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_extend_high_i8x16_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i16x8_extend_high_i8x16_u/const_avx.wat b/tests/disas/winch/x64/i16x8_extend_high_i8x16_u/const_avx.wat
index ee744ed322..58a89f33ef 100644
--- a/tests/disas/winch/x64/i16x8_extend_high_i8x16_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_extend_high_i8x16_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i16x8_extend_low_i8x16_s/const_avx.wat b/tests/disas/winch/x64/i16x8_extend_low_i8x16_s/const_avx.wat
index 5f35bcd449..09e8947a16 100644
--- a/tests/disas/winch/x64/i16x8_extend_low_i8x16_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_extend_low_i8x16_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i16x8_extend_low_i8x16_u/const_avx.wat b/tests/disas/winch/x64/i16x8_extend_low_i8x16_u/const_avx.wat
index 61a2c5d0dc..3283ca0b07 100644
--- a/tests/disas/winch/x64/i16x8_extend_low_i8x16_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_extend_low_i8x16_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i16x8_ge_s/const_avx.wat b/tests/disas/winch/x64/i16x8_ge_s/const_avx.wat
index d0ab3179ab..d5b1539476 100644
--- a/tests/disas/winch/x64/i16x8_ge_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_ge_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/i16x8_ge_u/const_avx.wat b/tests/disas/winch/x64/i16x8_ge_u/const_avx.wat
index 6a59760350..1db6bdc259 100644
--- a/tests/disas/winch/x64/i16x8_ge_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_ge_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i16x8_gt_s/const_avx.wat b/tests/disas/winch/x64/i16x8_gt_s/const_avx.wat
index 60feeba0fd..84e4a0b508 100644
--- a/tests/disas/winch/x64/i16x8_gt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_gt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8_gt_u/const_avx.wat b/tests/disas/winch/x64/i16x8_gt_u/const_avx.wat
index 37c36fa0d5..3366aff6fb 100644
--- a/tests/disas/winch/x64/i16x8_gt_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_gt_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i16x8_le_s/const_avx.wat b/tests/disas/winch/x64/i16x8_le_s/const_avx.wat
index e724c08506..bae09fd603 100644
--- a/tests/disas/winch/x64/i16x8_le_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_le_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/i16x8_le_u/const_avx.wat b/tests/disas/winch/x64/i16x8_le_u/const_avx.wat
index 7a21686b73..146fb36706 100644
--- a/tests/disas/winch/x64/i16x8_le_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_le_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i16x8_lt_s/const_avx.wat b/tests/disas/winch/x64/i16x8_lt_s/const_avx.wat
index 86fd2f6783..fdbaa2ed86 100644
--- a/tests/disas/winch/x64/i16x8_lt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_lt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8_lt_u/const_avx.wat b/tests/disas/winch/x64/i16x8_lt_u/const_avx.wat
index 12bc552448..3483f73252 100644
--- a/tests/disas/winch/x64/i16x8_lt_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_lt_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i16x8_narrow_i32x4_s/const_avx.wat b/tests/disas/winch/x64/i16x8_narrow_i32x4_s/const_avx.wat
index 6b4d53e8d0..22b791885e 100644
--- a/tests/disas/winch/x64/i16x8_narrow_i32x4_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_narrow_i32x4_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i16x8_narrow_i32x4_u/const_avx.wat b/tests/disas/winch/x64/i16x8_narrow_i32x4_u/const_avx.wat
index c43bd3e60e..4e48f75769 100644
--- a/tests/disas/winch/x64/i16x8_narrow_i32x4_u/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_narrow_i32x4_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i16x8_ne/const_avx.wat b/tests/disas/winch/x64/i16x8_ne/const_avx.wat
index 89fe8f74d5..4b05fcdb73 100644
--- a/tests/disas/winch/x64/i16x8_ne/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_ne/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i16x8_q15mulr_sat_s/const_avx.wat b/tests/disas/winch/x64/i16x8_q15mulr_sat_s/const_avx.wat
index d61a90eb9e..5cb49c7575 100644
--- a/tests/disas/winch/x64/i16x8_q15mulr_sat_s/const_avx.wat
+++ b/tests/disas/winch/x64/i16x8_q15mulr_sat_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i32_add/const.wat b/tests/disas/winch/x64/i32_add/const.wat
index 27c16c8fbe..3935fa9a1a 100644
--- a/tests/disas/winch/x64/i32_add/const.wat
+++ b/tests/disas/winch/x64/i32_add/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_add/locals.wat b/tests/disas/winch/x64/i32_add/locals.wat
index 70e663194c..17d87810d7 100644
--- a/tests/disas/winch/x64/i32_add/locals.wat
+++ b/tests/disas/winch/x64/i32_add/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/i32_add/max.wat b/tests/disas/winch/x64/i32_add/max.wat
index 5456cc284a..f8025c1f8f 100644
--- a/tests/disas/winch/x64/i32_add/max.wat
+++ b/tests/disas/winch/x64/i32_add/max.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_add/max_one.wat b/tests/disas/winch/x64/i32_add/max_one.wat
index bb5a5f88f0..6addd7aa6e 100644
--- a/tests/disas/winch/x64/i32_add/max_one.wat
+++ b/tests/disas/winch/x64/i32_add/max_one.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_add/mixed.wat b/tests/disas/winch/x64/i32_add/mixed.wat
index 682f9646ec..99a2eea645 100644
--- a/tests/disas/winch/x64/i32_add/mixed.wat
+++ b/tests/disas/winch/x64/i32_add/mixed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_add/params.wat b/tests/disas/winch/x64/i32_add/params.wat
index e688be5d6a..24681bce6d 100644
--- a/tests/disas/winch/x64/i32_add/params.wat
+++ b/tests/disas/winch/x64/i32_add/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i32_add/signed.wat b/tests/disas/winch/x64/i32_add/signed.wat
index c8a064e08f..6150aa2191 100644
--- a/tests/disas/winch/x64/i32_add/signed.wat
+++ b/tests/disas/winch/x64/i32_add/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_add/unsigned_with_zero.wat b/tests/disas/winch/x64/i32_add/unsigned_with_zero.wat
index b6c615bc55..491cf2fcbf 100644
--- a/tests/disas/winch/x64/i32_add/unsigned_with_zero.wat
+++ b/tests/disas/winch/x64/i32_add/unsigned_with_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_and/const.wat b/tests/disas/winch/x64/i32_and/const.wat
index 7652678531..3a63093672 100644
--- a/tests/disas/winch/x64/i32_and/const.wat
+++ b/tests/disas/winch/x64/i32_and/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_and/locals.wat b/tests/disas/winch/x64/i32_and/locals.wat
index cd710a7bb1..8a36fb8be5 100644
--- a/tests/disas/winch/x64/i32_and/locals.wat
+++ b/tests/disas/winch/x64/i32_and/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/i32_and/params.wat b/tests/disas/winch/x64/i32_and/params.wat
index 2abf2b3f23..852a800fe1 100644
--- a/tests/disas/winch/x64/i32_and/params.wat
+++ b/tests/disas/winch/x64/i32_and/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i32_clz/lzcnt_const.wat b/tests/disas/winch/x64/i32_clz/lzcnt_const.wat
index cc2f0224a4..479728c7aa 100644
--- a/tests/disas/winch/x64/i32_clz/lzcnt_const.wat
+++ b/tests/disas/winch/x64/i32_clz/lzcnt_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i32_clz/lzcnt_local.wat b/tests/disas/winch/x64/i32_clz/lzcnt_local.wat
index f4096758a6..9d15ee2196 100644
--- a/tests/disas/winch/x64/i32_clz/lzcnt_local.wat
+++ b/tests/disas/winch/x64/i32_clz/lzcnt_local.wat
@@ -17,7 +17,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i32_clz/lzcnt_param.wat b/tests/disas/winch/x64/i32_clz/lzcnt_param.wat
index 8287e8383f..d5cc330a0e 100644
--- a/tests/disas/winch/x64/i32_clz/lzcnt_param.wat
+++ b/tests/disas/winch/x64/i32_clz/lzcnt_param.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i32_clz/no_lzcnt_const.wat b/tests/disas/winch/x64/i32_clz/no_lzcnt_const.wat
index 1293a6084c..1fd75c373c 100644
--- a/tests/disas/winch/x64/i32_clz/no_lzcnt_const.wat
+++ b/tests/disas/winch/x64/i32_clz/no_lzcnt_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/i32_clz/no_lzcnt_local.wat b/tests/disas/winch/x64/i32_clz/no_lzcnt_local.wat
index e49849674d..d371440707 100644
--- a/tests/disas/winch/x64/i32_clz/no_lzcnt_local.wat
+++ b/tests/disas/winch/x64/i32_clz/no_lzcnt_local.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/i32_clz/no_lzcnt_param.wat b/tests/disas/winch/x64/i32_clz/no_lzcnt_param.wat
index 1c7fd2f6b3..29c3ee3567 100644
--- a/tests/disas/winch/x64/i32_clz/no_lzcnt_param.wat
+++ b/tests/disas/winch/x64/i32_clz/no_lzcnt_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i32_ctz/bmi1_const.wat b/tests/disas/winch/x64/i32_ctz/bmi1_const.wat
index 475e25549f..6e552cba49 100644
--- a/tests/disas/winch/x64/i32_ctz/bmi1_const.wat
+++ b/tests/disas/winch/x64/i32_ctz/bmi1_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i32_ctz/bmi1_local.wat b/tests/disas/winch/x64/i32_ctz/bmi1_local.wat
index ef76e3d9c5..8893ba64ee 100644
--- a/tests/disas/winch/x64/i32_ctz/bmi1_local.wat
+++ b/tests/disas/winch/x64/i32_ctz/bmi1_local.wat
@@ -18,7 +18,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i32_ctz/bmi1_param.wat b/tests/disas/winch/x64/i32_ctz/bmi1_param.wat
index b3003d8fd4..796450faf9 100644
--- a/tests/disas/winch/x64/i32_ctz/bmi1_param.wat
+++ b/tests/disas/winch/x64/i32_ctz/bmi1_param.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i32_ctz/no_bmi1_const.wat b/tests/disas/winch/x64/i32_ctz/no_bmi1_const.wat
index 5edd4a569d..0ad37cddc0 100644
--- a/tests/disas/winch/x64/i32_ctz/no_bmi1_const.wat
+++ b/tests/disas/winch/x64/i32_ctz/no_bmi1_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i32_ctz/no_bmi1_local.wat b/tests/disas/winch/x64/i32_ctz/no_bmi1_local.wat
index e222bb37e4..42265ffa21 100644
--- a/tests/disas/winch/x64/i32_ctz/no_bmi1_local.wat
+++ b/tests/disas/winch/x64/i32_ctz/no_bmi1_local.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x63
diff --git a/tests/disas/winch/x64/i32_ctz/no_bmi1_param.wat b/tests/disas/winch/x64/i32_ctz/no_bmi1_param.wat
index 4383a8754a..7d3c5e5bde 100644
--- a/tests/disas/winch/x64/i32_ctz/no_bmi1_param.wat
+++ b/tests/disas/winch/x64/i32_ctz/no_bmi1_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_divs/const.wat b/tests/disas/winch/x64/i32_divs/const.wat
index 197d7117cd..ea1cd3c908 100644
--- a/tests/disas/winch/x64/i32_divs/const.wat
+++ b/tests/disas/winch/x64/i32_divs/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i32_divs/one_zero.wat b/tests/disas/winch/x64/i32_divs/one_zero.wat
index bf20c7d01a..e1741d1188 100644
--- a/tests/disas/winch/x64/i32_divs/one_zero.wat
+++ b/tests/disas/winch/x64/i32_divs/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i32_divs/overflow.wat b/tests/disas/winch/x64/i32_divs/overflow.wat
index 2c78016bfb..e64d52f806 100644
--- a/tests/disas/winch/x64/i32_divs/overflow.wat
+++ b/tests/disas/winch/x64/i32_divs/overflow.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i32_divs/params.wat b/tests/disas/winch/x64/i32_divs/params.wat
index 3874d1fe86..a026bbea74 100644
--- a/tests/disas/winch/x64/i32_divs/params.wat
+++ b/tests/disas/winch/x64/i32_divs/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_divs/zero_zero.wat b/tests/disas/winch/x64/i32_divs/zero_zero.wat
index 42f2620f80..1acf3bde7d 100644
--- a/tests/disas/winch/x64/i32_divs/zero_zero.wat
+++ b/tests/disas/winch/x64/i32_divs/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i32_divu/const.wat b/tests/disas/winch/x64/i32_divu/const.wat
index 917ca4954e..2a4da89f9d 100644
--- a/tests/disas/winch/x64/i32_divu/const.wat
+++ b/tests/disas/winch/x64/i32_divu/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i32_divu/one_zero.wat b/tests/disas/winch/x64/i32_divu/one_zero.wat
index 7810148931..34f86025ae 100644
--- a/tests/disas/winch/x64/i32_divu/one_zero.wat
+++ b/tests/disas/winch/x64/i32_divu/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i32_divu/params.wat b/tests/disas/winch/x64/i32_divu/params.wat
index fce622e218..c39b9e2d29 100644
--- a/tests/disas/winch/x64/i32_divu/params.wat
+++ b/tests/disas/winch/x64/i32_divu/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i32_divu/signed.wat b/tests/disas/winch/x64/i32_divu/signed.wat
index af749ccb70..774d19aacb 100644
--- a/tests/disas/winch/x64/i32_divu/signed.wat
+++ b/tests/disas/winch/x64/i32_divu/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i32_divu/zero_zero.wat b/tests/disas/winch/x64/i32_divu/zero_zero.wat
index ddfaf2213f..3c8bca61be 100644
--- a/tests/disas/winch/x64/i32_divu/zero_zero.wat
+++ b/tests/disas/winch/x64/i32_divu/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i32_eq/const.wat b/tests/disas/winch/x64/i32_eq/const.wat
index 70d87f041f..42828f9c53 100644
--- a/tests/disas/winch/x64/i32_eq/const.wat
+++ b/tests/disas/winch/x64/i32_eq/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_eq/locals.wat b/tests/disas/winch/x64/i32_eq/locals.wat
index 0e1bae8201..55392a9667 100644
--- a/tests/disas/winch/x64/i32_eq/locals.wat
+++ b/tests/disas/winch/x64/i32_eq/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_eq/params.wat b/tests/disas/winch/x64/i32_eq/params.wat
index f228035c3b..f765c1e0da 100644
--- a/tests/disas/winch/x64/i32_eq/params.wat
+++ b/tests/disas/winch/x64/i32_eq/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_eqz/const.wat b/tests/disas/winch/x64/i32_eqz/const.wat
index fa39d04c4e..238ddc937e 100644
--- a/tests/disas/winch/x64/i32_eqz/const.wat
+++ b/tests/disas/winch/x64/i32_eqz/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_eqz/local.wat b/tests/disas/winch/x64/i32_eqz/local.wat
index d3f11f29bd..d38112b5a4 100644
--- a/tests/disas/winch/x64/i32_eqz/local.wat
+++ b/tests/disas/winch/x64/i32_eqz/local.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i32_eqz/param.wat b/tests/disas/winch/x64/i32_eqz/param.wat
index 3514bffaf7..f722147335 100644
--- a/tests/disas/winch/x64/i32_eqz/param.wat
+++ b/tests/disas/winch/x64/i32_eqz/param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/i32_extend_16_s/const.wat b/tests/disas/winch/x64/i32_extend_16_s/const.wat
index 8e00d60116..3bf4b10210 100644
--- a/tests/disas/winch/x64/i32_extend_16_s/const.wat
+++ b/tests/disas/winch/x64/i32_extend_16_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_extend_16_s/locals.wat b/tests/disas/winch/x64/i32_extend_16_s/locals.wat
index dea5f90ee4..5cc32722ae 100644
--- a/tests/disas/winch/x64/i32_extend_16_s/locals.wat
+++ b/tests/disas/winch/x64/i32_extend_16_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i32_extend_16_s/params.wat b/tests/disas/winch/x64/i32_extend_16_s/params.wat
index bab0bdabe6..d99ba18e02 100644
--- a/tests/disas/winch/x64/i32_extend_16_s/params.wat
+++ b/tests/disas/winch/x64/i32_extend_16_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i32_extend_8_s/const.wat b/tests/disas/winch/x64/i32_extend_8_s/const.wat
index 864b603815..59a1dcb20e 100644
--- a/tests/disas/winch/x64/i32_extend_8_s/const.wat
+++ b/tests/disas/winch/x64/i32_extend_8_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_extend_8_s/locals.wat b/tests/disas/winch/x64/i32_extend_8_s/locals.wat
index 3496559783..9607874cbc 100644
--- a/tests/disas/winch/x64/i32_extend_8_s/locals.wat
+++ b/tests/disas/winch/x64/i32_extend_8_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i32_extend_8_s/params.wat b/tests/disas/winch/x64/i32_extend_8_s/params.wat
index 9eed1b54ac..34a7284c10 100644
--- a/tests/disas/winch/x64/i32_extend_8_s/params.wat
+++ b/tests/disas/winch/x64/i32_extend_8_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i32_ge_s/const.wat b/tests/disas/winch/x64/i32_ge_s/const.wat
index f785bdbea6..733b98b8c1 100644
--- a/tests/disas/winch/x64/i32_ge_s/const.wat
+++ b/tests/disas/winch/x64/i32_ge_s/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_ge_s/locals.wat b/tests/disas/winch/x64/i32_ge_s/locals.wat
index c4c94d3ecc..b6d7dcbf96 100644
--- a/tests/disas/winch/x64/i32_ge_s/locals.wat
+++ b/tests/disas/winch/x64/i32_ge_s/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_ge_s/params.wat b/tests/disas/winch/x64/i32_ge_s/params.wat
index f7ce2e9778..70bbd96d13 100644
--- a/tests/disas/winch/x64/i32_ge_s/params.wat
+++ b/tests/disas/winch/x64/i32_ge_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_ge_u/const.wat b/tests/disas/winch/x64/i32_ge_u/const.wat
index f484a249c9..284cc27e9b 100644
--- a/tests/disas/winch/x64/i32_ge_u/const.wat
+++ b/tests/disas/winch/x64/i32_ge_u/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_ge_u/locals.wat b/tests/disas/winch/x64/i32_ge_u/locals.wat
index f3183e001d..c04c8f736e 100644
--- a/tests/disas/winch/x64/i32_ge_u/locals.wat
+++ b/tests/disas/winch/x64/i32_ge_u/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_ge_u/params.wat b/tests/disas/winch/x64/i32_ge_u/params.wat
index 6838b5e3b2..e6b1675a8f 100644
--- a/tests/disas/winch/x64/i32_ge_u/params.wat
+++ b/tests/disas/winch/x64/i32_ge_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_gt_s/const.wat b/tests/disas/winch/x64/i32_gt_s/const.wat
index 642207834a..fc94862986 100644
--- a/tests/disas/winch/x64/i32_gt_s/const.wat
+++ b/tests/disas/winch/x64/i32_gt_s/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_gt_s/locals.wat b/tests/disas/winch/x64/i32_gt_s/locals.wat
index 7f1b313488..1b3dc6ebef 100644
--- a/tests/disas/winch/x64/i32_gt_s/locals.wat
+++ b/tests/disas/winch/x64/i32_gt_s/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_gt_s/params.wat b/tests/disas/winch/x64/i32_gt_s/params.wat
index 4ecd8fa67f..a183f5361a 100644
--- a/tests/disas/winch/x64/i32_gt_s/params.wat
+++ b/tests/disas/winch/x64/i32_gt_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_gt_u/const.wat b/tests/disas/winch/x64/i32_gt_u/const.wat
index efa80923bc..a06c71e048 100644
--- a/tests/disas/winch/x64/i32_gt_u/const.wat
+++ b/tests/disas/winch/x64/i32_gt_u/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_gt_u/locals.wat b/tests/disas/winch/x64/i32_gt_u/locals.wat
index 7e06da4ad1..872aeced66 100644
--- a/tests/disas/winch/x64/i32_gt_u/locals.wat
+++ b/tests/disas/winch/x64/i32_gt_u/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_gt_u/params.wat b/tests/disas/winch/x64/i32_gt_u/params.wat
index 37649f6df7..ee6807be15 100644
--- a/tests/disas/winch/x64/i32_gt_u/params.wat
+++ b/tests/disas/winch/x64/i32_gt_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_le_s/const.wat b/tests/disas/winch/x64/i32_le_s/const.wat
index 805000187a..e0729bef40 100644
--- a/tests/disas/winch/x64/i32_le_s/const.wat
+++ b/tests/disas/winch/x64/i32_le_s/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_le_s/locals.wat b/tests/disas/winch/x64/i32_le_s/locals.wat
index a5f82fc4c9..99ac4d92e0 100644
--- a/tests/disas/winch/x64/i32_le_s/locals.wat
+++ b/tests/disas/winch/x64/i32_le_s/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_le_s/params.wat b/tests/disas/winch/x64/i32_le_s/params.wat
index 9c152dc7b4..ad73b74810 100644
--- a/tests/disas/winch/x64/i32_le_s/params.wat
+++ b/tests/disas/winch/x64/i32_le_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_le_u/const.wat b/tests/disas/winch/x64/i32_le_u/const.wat
index 21e11d9f1a..a2fa84467c 100644
--- a/tests/disas/winch/x64/i32_le_u/const.wat
+++ b/tests/disas/winch/x64/i32_le_u/const.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_le_u/locals.wat b/tests/disas/winch/x64/i32_le_u/locals.wat
index 617770f0e4..c3a33fe02a 100644
--- a/tests/disas/winch/x64/i32_le_u/locals.wat
+++ b/tests/disas/winch/x64/i32_le_u/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_le_u/params.wat b/tests/disas/winch/x64/i32_le_u/params.wat
index 09097c169a..60c34d9c8b 100644
--- a/tests/disas/winch/x64/i32_le_u/params.wat
+++ b/tests/disas/winch/x64/i32_le_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_lt_s/const.wat b/tests/disas/winch/x64/i32_lt_s/const.wat
index 6b75491e8e..374f2f657b 100644
--- a/tests/disas/winch/x64/i32_lt_s/const.wat
+++ b/tests/disas/winch/x64/i32_lt_s/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_lt_s/locals.wat b/tests/disas/winch/x64/i32_lt_s/locals.wat
index 3b9bf9b9aa..fce7e51b16 100644
--- a/tests/disas/winch/x64/i32_lt_s/locals.wat
+++ b/tests/disas/winch/x64/i32_lt_s/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_lt_s/params.wat b/tests/disas/winch/x64/i32_lt_s/params.wat
index 11de2fc959..60938eb403 100644
--- a/tests/disas/winch/x64/i32_lt_s/params.wat
+++ b/tests/disas/winch/x64/i32_lt_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_lt_u/const.wat b/tests/disas/winch/x64/i32_lt_u/const.wat
index 9d24cff0ae..388c7d96ec 100644
--- a/tests/disas/winch/x64/i32_lt_u/const.wat
+++ b/tests/disas/winch/x64/i32_lt_u/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_lt_u/locals.wat b/tests/disas/winch/x64/i32_lt_u/locals.wat
index ea9707e517..b2f6e2feab 100644
--- a/tests/disas/winch/x64/i32_lt_u/locals.wat
+++ b/tests/disas/winch/x64/i32_lt_u/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_lt_u/params.wat b/tests/disas/winch/x64/i32_lt_u/params.wat
index 6eae171a40..4ecd8e556b 100644
--- a/tests/disas/winch/x64/i32_lt_u/params.wat
+++ b/tests/disas/winch/x64/i32_lt_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_mul/const.wat b/tests/disas/winch/x64/i32_mul/const.wat
index 76133ce4dc..fec18ab5d5 100644
--- a/tests/disas/winch/x64/i32_mul/const.wat
+++ b/tests/disas/winch/x64/i32_mul/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i32_mul/locals.wat b/tests/disas/winch/x64/i32_mul/locals.wat
index a5094a55b7..92abb03cac 100644
--- a/tests/disas/winch/x64/i32_mul/locals.wat
+++ b/tests/disas/winch/x64/i32_mul/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/i32_mul/max.wat b/tests/disas/winch/x64/i32_mul/max.wat
index 6696b007fe..bd8f6556e1 100644
--- a/tests/disas/winch/x64/i32_mul/max.wat
+++ b/tests/disas/winch/x64/i32_mul/max.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i32_mul/max_one.wat b/tests/disas/winch/x64/i32_mul/max_one.wat
index 725f0ccc95..985948293e 100644
--- a/tests/disas/winch/x64/i32_mul/max_one.wat
+++ b/tests/disas/winch/x64/i32_mul/max_one.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i32_mul/mixed.wat b/tests/disas/winch/x64/i32_mul/mixed.wat
index ff0cdf751a..895a0d4d17 100644
--- a/tests/disas/winch/x64/i32_mul/mixed.wat
+++ b/tests/disas/winch/x64/i32_mul/mixed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i32_mul/params.wat b/tests/disas/winch/x64/i32_mul/params.wat
index 016c5c22ff..69a3f0ada1 100644
--- a/tests/disas/winch/x64/i32_mul/params.wat
+++ b/tests/disas/winch/x64/i32_mul/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i32_mul/signed.wat b/tests/disas/winch/x64/i32_mul/signed.wat
index 25ac41c543..0d715c26c7 100644
--- a/tests/disas/winch/x64/i32_mul/signed.wat
+++ b/tests/disas/winch/x64/i32_mul/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i32_mul/unsigned_with_zero.wat b/tests/disas/winch/x64/i32_mul/unsigned_with_zero.wat
index c1bdcedaea..9f16328be2 100644
--- a/tests/disas/winch/x64/i32_mul/unsigned_with_zero.wat
+++ b/tests/disas/winch/x64/i32_mul/unsigned_with_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i32_ne/const.wat b/tests/disas/winch/x64/i32_ne/const.wat
index e9ddadbc0d..094e2a7649 100644
--- a/tests/disas/winch/x64/i32_ne/const.wat
+++ b/tests/disas/winch/x64/i32_ne/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_ne/locals.wat b/tests/disas/winch/x64/i32_ne/locals.wat
index bfb4b5f149..170bfb3067 100644
--- a/tests/disas/winch/x64/i32_ne/locals.wat
+++ b/tests/disas/winch/x64/i32_ne/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i32_ne/params.wat b/tests/disas/winch/x64/i32_ne/params.wat
index 1ebb2ddda9..56a791ec2d 100644
--- a/tests/disas/winch/x64/i32_ne/params.wat
+++ b/tests/disas/winch/x64/i32_ne/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32_or/const.wat b/tests/disas/winch/x64/i32_or/const.wat
index 11164a5d42..0a4d1ee993 100644
--- a/tests/disas/winch/x64/i32_or/const.wat
+++ b/tests/disas/winch/x64/i32_or/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_or/locals.wat b/tests/disas/winch/x64/i32_or/locals.wat
index 54238c28c2..476cd2cf5e 100644
--- a/tests/disas/winch/x64/i32_or/locals.wat
+++ b/tests/disas/winch/x64/i32_or/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/i32_or/params.wat b/tests/disas/winch/x64/i32_or/params.wat
index 01cb0a47f4..b8c21bff3d 100644
--- a/tests/disas/winch/x64/i32_or/params.wat
+++ b/tests/disas/winch/x64/i32_or/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i32_popcnt/const.wat b/tests/disas/winch/x64/i32_popcnt/const.wat
index 896be06e70..d803b4102e 100644
--- a/tests/disas/winch/x64/i32_popcnt/const.wat
+++ b/tests/disas/winch/x64/i32_popcnt/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i32_popcnt/fallback.wat b/tests/disas/winch/x64/i32_popcnt/fallback.wat
index 81fd3e9f6f..1c84993ff3 100644
--- a/tests/disas/winch/x64/i32_popcnt/fallback.wat
+++ b/tests/disas/winch/x64/i32_popcnt/fallback.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/i32_popcnt/no_sse42.wat b/tests/disas/winch/x64/i32_popcnt/no_sse42.wat
index 0ab1593844..336660a9ee 100644
--- a/tests/disas/winch/x64/i32_popcnt/no_sse42.wat
+++ b/tests/disas/winch/x64/i32_popcnt/no_sse42.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x71
diff --git a/tests/disas/winch/x64/i32_popcnt/reg.wat b/tests/disas/winch/x64/i32_popcnt/reg.wat
index 35653fb41b..90c1357173 100644
--- a/tests/disas/winch/x64/i32_popcnt/reg.wat
+++ b/tests/disas/winch/x64/i32_popcnt/reg.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i32_reinterpret_f32/const.wat b/tests/disas/winch/x64/i32_reinterpret_f32/const.wat
index 3abb92aa07..ff2323da4d 100644
--- a/tests/disas/winch/x64/i32_reinterpret_f32/const.wat
+++ b/tests/disas/winch/x64/i32_reinterpret_f32/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i32_reinterpret_f32/locals.wat b/tests/disas/winch/x64/i32_reinterpret_f32/locals.wat
index 3ae9084951..c76e1e9c89 100644
--- a/tests/disas/winch/x64/i32_reinterpret_f32/locals.wat
+++ b/tests/disas/winch/x64/i32_reinterpret_f32/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/i32_reinterpret_f32/params.wat b/tests/disas/winch/x64/i32_reinterpret_f32/params.wat
index 7966284ef2..17f2dc86d9 100644
--- a/tests/disas/winch/x64/i32_reinterpret_f32/params.wat
+++ b/tests/disas/winch/x64/i32_reinterpret_f32/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i32_reinterpret_f32/ret_float.wat b/tests/disas/winch/x64/i32_reinterpret_f32/ret_float.wat
index 16b6981728..7bdf2462eb 100644
--- a/tests/disas/winch/x64/i32_reinterpret_f32/ret_float.wat
+++ b/tests/disas/winch/x64/i32_reinterpret_f32/ret_float.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/i32_rems/const.wat b/tests/disas/winch/x64/i32_rems/const.wat
index 387a336c94..9d3729559a 100644
--- a/tests/disas/winch/x64/i32_rems/const.wat
+++ b/tests/disas/winch/x64/i32_rems/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i32_rems/one_zero.wat b/tests/disas/winch/x64/i32_rems/one_zero.wat
index ecf681b5c5..7cde89ac5d 100644
--- a/tests/disas/winch/x64/i32_rems/one_zero.wat
+++ b/tests/disas/winch/x64/i32_rems/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i32_rems/overflow.wat b/tests/disas/winch/x64/i32_rems/overflow.wat
index a86281c2fd..663e34e8b3 100644
--- a/tests/disas/winch/x64/i32_rems/overflow.wat
+++ b/tests/disas/winch/x64/i32_rems/overflow.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i32_rems/params.wat b/tests/disas/winch/x64/i32_rems/params.wat
index 8aef98dfab..452f5cc28a 100644
--- a/tests/disas/winch/x64/i32_rems/params.wat
+++ b/tests/disas/winch/x64/i32_rems/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/i32_rems/zero_zero.wat b/tests/disas/winch/x64/i32_rems/zero_zero.wat
index 899a747fd1..5614746b66 100644
--- a/tests/disas/winch/x64/i32_rems/zero_zero.wat
+++ b/tests/disas/winch/x64/i32_rems/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i32_remu/const.wat b/tests/disas/winch/x64/i32_remu/const.wat
index 39a56133b5..0d803daea9 100644
--- a/tests/disas/winch/x64/i32_remu/const.wat
+++ b/tests/disas/winch/x64/i32_remu/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_remu/one_zero.wat b/tests/disas/winch/x64/i32_remu/one_zero.wat
index c4553bf53a..8f14c8ad17 100644
--- a/tests/disas/winch/x64/i32_remu/one_zero.wat
+++ b/tests/disas/winch/x64/i32_remu/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_remu/params.wat b/tests/disas/winch/x64/i32_remu/params.wat
index dec509410e..6463563224 100644
--- a/tests/disas/winch/x64/i32_remu/params.wat
+++ b/tests/disas/winch/x64/i32_remu/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i32_remu/signed.wat b/tests/disas/winch/x64/i32_remu/signed.wat
index ae7d5be04f..3cad991f6d 100644
--- a/tests/disas/winch/x64/i32_remu/signed.wat
+++ b/tests/disas/winch/x64/i32_remu/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_remu/zero_zero.wat b/tests/disas/winch/x64/i32_remu/zero_zero.wat
index 7ce0b50af0..766e9734cf 100644
--- a/tests/disas/winch/x64/i32_remu/zero_zero.wat
+++ b/tests/disas/winch/x64/i32_remu/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i32_rotl/16_const.wat b/tests/disas/winch/x64/i32_rotl/16_const.wat
index 8f22033ce0..f419997fc0 100644
--- a/tests/disas/winch/x64/i32_rotl/16_const.wat
+++ b/tests/disas/winch/x64/i32_rotl/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_rotl/8_const.wat b/tests/disas/winch/x64/i32_rotl/8_const.wat
index 1d8528f7f9..d0446176e4 100644
--- a/tests/disas/winch/x64/i32_rotl/8_const.wat
+++ b/tests/disas/winch/x64/i32_rotl/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_rotl/locals.wat b/tests/disas/winch/x64/i32_rotl/locals.wat
index b01461b515..c267a361b4 100644
--- a/tests/disas/winch/x64/i32_rotl/locals.wat
+++ b/tests/disas/winch/x64/i32_rotl/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i32_rotl/params.wat b/tests/disas/winch/x64/i32_rotl/params.wat
index 3988e4c75f..a46607d341 100644
--- a/tests/disas/winch/x64/i32_rotl/params.wat
+++ b/tests/disas/winch/x64/i32_rotl/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i32_rotr/16_const.wat b/tests/disas/winch/x64/i32_rotr/16_const.wat
index 6f29edcd29..63ade0c037 100644
--- a/tests/disas/winch/x64/i32_rotr/16_const.wat
+++ b/tests/disas/winch/x64/i32_rotr/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_rotr/8_const.wat b/tests/disas/winch/x64/i32_rotr/8_const.wat
index d53ab875a0..e5ee90e211 100644
--- a/tests/disas/winch/x64/i32_rotr/8_const.wat
+++ b/tests/disas/winch/x64/i32_rotr/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_rotr/locals.wat b/tests/disas/winch/x64/i32_rotr/locals.wat
index 44e4cd10f0..af3ee83435 100644
--- a/tests/disas/winch/x64/i32_rotr/locals.wat
+++ b/tests/disas/winch/x64/i32_rotr/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i32_rotr/params.wat b/tests/disas/winch/x64/i32_rotr/params.wat
index d7f9f12e59..c96335bb00 100644
--- a/tests/disas/winch/x64/i32_rotr/params.wat
+++ b/tests/disas/winch/x64/i32_rotr/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i32_shl/16_const.wat b/tests/disas/winch/x64/i32_shl/16_const.wat
index 905704220f..d05d52cfb4 100644
--- a/tests/disas/winch/x64/i32_shl/16_const.wat
+++ b/tests/disas/winch/x64/i32_shl/16_const.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_shl/8_const.wat b/tests/disas/winch/x64/i32_shl/8_const.wat
index 2b0491235c..728507f9ab 100644
--- a/tests/disas/winch/x64/i32_shl/8_const.wat
+++ b/tests/disas/winch/x64/i32_shl/8_const.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_shl/locals.wat b/tests/disas/winch/x64/i32_shl/locals.wat
index 49eeaac076..dae1175731 100644
--- a/tests/disas/winch/x64/i32_shl/locals.wat
+++ b/tests/disas/winch/x64/i32_shl/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i32_shl/params.wat b/tests/disas/winch/x64/i32_shl/params.wat
index fd480c8a47..f5e91c8725 100644
--- a/tests/disas/winch/x64/i32_shl/params.wat
+++ b/tests/disas/winch/x64/i32_shl/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i32_shr_s/16_const.wat b/tests/disas/winch/x64/i32_shr_s/16_const.wat
index 0b7378c700..5b9249c9f5 100644
--- a/tests/disas/winch/x64/i32_shr_s/16_const.wat
+++ b/tests/disas/winch/x64/i32_shr_s/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_shr_s/8_const.wat b/tests/disas/winch/x64/i32_shr_s/8_const.wat
index 33885c0177..adc7532bcb 100644
--- a/tests/disas/winch/x64/i32_shr_s/8_const.wat
+++ b/tests/disas/winch/x64/i32_shr_s/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_shr_s/locals.wat b/tests/disas/winch/x64/i32_shr_s/locals.wat
index bdc937b5b6..9b2c5066f5 100644
--- a/tests/disas/winch/x64/i32_shr_s/locals.wat
+++ b/tests/disas/winch/x64/i32_shr_s/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i32_shr_s/params.wat b/tests/disas/winch/x64/i32_shr_s/params.wat
index 7c28766aca..89924f8cb8 100644
--- a/tests/disas/winch/x64/i32_shr_s/params.wat
+++ b/tests/disas/winch/x64/i32_shr_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i32_shr_u/16_const.wat b/tests/disas/winch/x64/i32_shr_u/16_const.wat
index 9076cb9bfa..a29aee648f 100644
--- a/tests/disas/winch/x64/i32_shr_u/16_const.wat
+++ b/tests/disas/winch/x64/i32_shr_u/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_shr_u/8_const.wat b/tests/disas/winch/x64/i32_shr_u/8_const.wat
index bd3ae21893..6099bd96f4 100644
--- a/tests/disas/winch/x64/i32_shr_u/8_const.wat
+++ b/tests/disas/winch/x64/i32_shr_u/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i32_shr_u/locals.wat b/tests/disas/winch/x64/i32_shr_u/locals.wat
index 5f04e561c3..7db57769b0 100644
--- a/tests/disas/winch/x64/i32_shr_u/locals.wat
+++ b/tests/disas/winch/x64/i32_shr_u/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i32_shr_u/params.wat b/tests/disas/winch/x64/i32_shr_u/params.wat
index d5c1571c83..0914f79bda 100644
--- a/tests/disas/winch/x64/i32_shr_u/params.wat
+++ b/tests/disas/winch/x64/i32_shr_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i32_sub/const.wat b/tests/disas/winch/x64/i32_sub/const.wat
index b7a5417827..bc6e67a2f3 100644
--- a/tests/disas/winch/x64/i32_sub/const.wat
+++ b/tests/disas/winch/x64/i32_sub/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_sub/locals.wat b/tests/disas/winch/x64/i32_sub/locals.wat
index 8b9d2535a3..563d9ddac6 100644
--- a/tests/disas/winch/x64/i32_sub/locals.wat
+++ b/tests/disas/winch/x64/i32_sub/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/i32_sub/max.wat b/tests/disas/winch/x64/i32_sub/max.wat
index 4bff5fa463..710dfe8d0f 100644
--- a/tests/disas/winch/x64/i32_sub/max.wat
+++ b/tests/disas/winch/x64/i32_sub/max.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_sub/max_one.wat b/tests/disas/winch/x64/i32_sub/max_one.wat
index e9d6d48f35..3b3ebe610e 100644
--- a/tests/disas/winch/x64/i32_sub/max_one.wat
+++ b/tests/disas/winch/x64/i32_sub/max_one.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_sub/mixed.wat b/tests/disas/winch/x64/i32_sub/mixed.wat
index 4e64e4e4d7..0f8ed9e3c6 100644
--- a/tests/disas/winch/x64/i32_sub/mixed.wat
+++ b/tests/disas/winch/x64/i32_sub/mixed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_sub/params.wat b/tests/disas/winch/x64/i32_sub/params.wat
index fd4584675a..c04824ed3d 100644
--- a/tests/disas/winch/x64/i32_sub/params.wat
+++ b/tests/disas/winch/x64/i32_sub/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i32_sub/signed.wat b/tests/disas/winch/x64/i32_sub/signed.wat
index 9aab2dc0c3..b74d55187d 100644
--- a/tests/disas/winch/x64/i32_sub/signed.wat
+++ b/tests/disas/winch/x64/i32_sub/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_sub/unsigned_with_zero.wat b/tests/disas/winch/x64/i32_sub/unsigned_with_zero.wat
index beadef235a..7eaa4ca330 100644
--- a/tests/disas/winch/x64/i32_sub/unsigned_with_zero.wat
+++ b/tests/disas/winch/x64/i32_sub/unsigned_with_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_trunc_f32_s/const.wat b/tests/disas/winch/x64/i32_trunc_f32_s/const.wat
index a6fd84eaa7..f1cec13a30 100644
--- a/tests/disas/winch/x64/i32_trunc_f32_s/const.wat
+++ b/tests/disas/winch/x64/i32_trunc_f32_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7a
diff --git a/tests/disas/winch/x64/i32_trunc_f32_s/locals.wat b/tests/disas/winch/x64/i32_trunc_f32_s/locals.wat
index 20c258ecd9..5116f4213c 100644
--- a/tests/disas/winch/x64/i32_trunc_f32_s/locals.wat
+++ b/tests/disas/winch/x64/i32_trunc_f32_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/i32_trunc_f32_s/params.wat b/tests/disas/winch/x64/i32_trunc_f32_s/params.wat
index f5312a90d3..2a446a7761 100644
--- a/tests/disas/winch/x64/i32_trunc_f32_s/params.wat
+++ b/tests/disas/winch/x64/i32_trunc_f32_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x7f
diff --git a/tests/disas/winch/x64/i32_trunc_f32_u/const.wat b/tests/disas/winch/x64/i32_trunc_f32_u/const.wat
index 3b7c79a663..e8dd165f76 100644
--- a/tests/disas/winch/x64/i32_trunc_f32_u/const.wat
+++ b/tests/disas/winch/x64/i32_trunc_f32_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x84
diff --git a/tests/disas/winch/x64/i32_trunc_f32_u/locals.wat b/tests/disas/winch/x64/i32_trunc_f32_u/locals.wat
index 1570bc8619..9625e490b0 100644
--- a/tests/disas/winch/x64/i32_trunc_f32_u/locals.wat
+++ b/tests/disas/winch/x64/i32_trunc_f32_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x8c
diff --git a/tests/disas/winch/x64/i32_trunc_f32_u/params.wat b/tests/disas/winch/x64/i32_trunc_f32_u/params.wat
index ad59c4962c..cf569b2ebf 100644
--- a/tests/disas/winch/x64/i32_trunc_f32_u/params.wat
+++ b/tests/disas/winch/x64/i32_trunc_f32_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x89
diff --git a/tests/disas/winch/x64/i32_trunc_f64_s/const.wat b/tests/disas/winch/x64/i32_trunc_f64_s/const.wat
index e161c6d462..915cc00f72 100644
--- a/tests/disas/winch/x64/i32_trunc_f64_s/const.wat
+++ b/tests/disas/winch/x64/i32_trunc_f64_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x81
diff --git a/tests/disas/winch/x64/i32_trunc_f64_s/locals.wat b/tests/disas/winch/x64/i32_trunc_f64_s/locals.wat
index d9947bd4b3..b5a1eff8e5 100644
--- a/tests/disas/winch/x64/i32_trunc_f64_s/locals.wat
+++ b/tests/disas/winch/x64/i32_trunc_f64_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x89
diff --git a/tests/disas/winch/x64/i32_trunc_f64_s/params.wat b/tests/disas/winch/x64/i32_trunc_f64_s/params.wat
index 803a7d9a08..9ce2d0584f 100644
--- a/tests/disas/winch/x64/i32_trunc_f64_s/params.wat
+++ b/tests/disas/winch/x64/i32_trunc_f64_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x86
diff --git a/tests/disas/winch/x64/i32_trunc_f64_u/const.wat b/tests/disas/winch/x64/i32_trunc_f64_u/const.wat
index 3533fe9730..dd5ef3833d 100644
--- a/tests/disas/winch/x64/i32_trunc_f64_u/const.wat
+++ b/tests/disas/winch/x64/i32_trunc_f64_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x89
diff --git a/tests/disas/winch/x64/i32_trunc_f64_u/locals.wat b/tests/disas/winch/x64/i32_trunc_f64_u/locals.wat
index 07d9c54dae..2633d3133e 100644
--- a/tests/disas/winch/x64/i32_trunc_f64_u/locals.wat
+++ b/tests/disas/winch/x64/i32_trunc_f64_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x91
diff --git a/tests/disas/winch/x64/i32_trunc_f64_u/params.wat b/tests/disas/winch/x64/i32_trunc_f64_u/params.wat
index eb3e50f9b9..302279a9ac 100644
--- a/tests/disas/winch/x64/i32_trunc_f64_u/params.wat
+++ b/tests/disas/winch/x64/i32_trunc_f64_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x8e
diff --git a/tests/disas/winch/x64/i32_wrap_i64/const.wat b/tests/disas/winch/x64/i32_wrap_i64/const.wat
index 4fd00e3ce2..fc8bece72a 100644
--- a/tests/disas/winch/x64/i32_wrap_i64/const.wat
+++ b/tests/disas/winch/x64/i32_wrap_i64/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3f
diff --git a/tests/disas/winch/x64/i32_wrap_i64/locals.wat b/tests/disas/winch/x64/i32_wrap_i64/locals.wat
index 87bc91523e..81fe7dbad2 100644
--- a/tests/disas/winch/x64/i32_wrap_i64/locals.wat
+++ b/tests/disas/winch/x64/i32_wrap_i64/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i32_wrap_i64/params.wat b/tests/disas/winch/x64/i32_wrap_i64/params.wat
index 10cd24dab0..a123b5f041 100644
--- a/tests/disas/winch/x64/i32_wrap_i64/params.wat
+++ b/tests/disas/winch/x64/i32_wrap_i64/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i32_wrap_i64/spilled.wat b/tests/disas/winch/x64/i32_wrap_i64/spilled.wat
index 738b2c5af8..f1255e8c1d 100644
--- a/tests/disas/winch/x64/i32_wrap_i64/spilled.wat
+++ b/tests/disas/winch/x64/i32_wrap_i64/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i32_xor/const.wat b/tests/disas/winch/x64/i32_xor/const.wat
index 80f0ec1929..fa2ded54e8 100644
--- a/tests/disas/winch/x64/i32_xor/const.wat
+++ b/tests/disas/winch/x64/i32_xor/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i32_xor/locals.wat b/tests/disas/winch/x64/i32_xor/locals.wat
index 1c3ca449a4..a1d41e80f9 100644
--- a/tests/disas/winch/x64/i32_xor/locals.wat
+++ b/tests/disas/winch/x64/i32_xor/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/i32_xor/params.wat b/tests/disas/winch/x64/i32_xor/params.wat
index 85b2c165ee..6374f4ccf2 100644
--- a/tests/disas/winch/x64/i32_xor/params.wat
+++ b/tests/disas/winch/x64/i32_xor/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i32x4/add/add.wat b/tests/disas/winch/x64/i32x4/add/add.wat
index 52e8da6021..a6613e9052 100644
--- a/tests/disas/winch/x64/i32x4/add/add.wat
+++ b/tests/disas/winch/x64/i32x4/add/add.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i32x4/extadd/extadd_s.wat b/tests/disas/winch/x64/i32x4/extadd/extadd_s.wat
index 1e6a048a65..69392a0ef5 100644
--- a/tests/disas/winch/x64/i32x4/extadd/extadd_s.wat
+++ b/tests/disas/winch/x64/i32x4/extadd/extadd_s.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i32x4/extadd/extadd_u.wat b/tests/disas/winch/x64/i32x4/extadd/extadd_u.wat
index 53d58bbd9e..31e54b337f 100644
--- a/tests/disas/winch/x64/i32x4/extadd/extadd_u.wat
+++ b/tests/disas/winch/x64/i32x4/extadd/extadd_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5b
diff --git a/tests/disas/winch/x64/i32x4/extmul/high_s.wat b/tests/disas/winch/x64/i32x4/extmul/high_s.wat
index 2edea500a1..fd8f93a850 100644
--- a/tests/disas/winch/x64/i32x4/extmul/high_s.wat
+++ b/tests/disas/winch/x64/i32x4/extmul/high_s.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i32x4/extmul/high_u.wat b/tests/disas/winch/x64/i32x4/extmul/high_u.wat
index 30de0b344f..93c355977b 100644
--- a/tests/disas/winch/x64/i32x4/extmul/high_u.wat
+++ b/tests/disas/winch/x64/i32x4/extmul/high_u.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x6c
diff --git a/tests/disas/winch/x64/i32x4/extmul/low_s.wat b/tests/disas/winch/x64/i32x4/extmul/low_s.wat
index 3fff15e8cb..036eeed554 100644
--- a/tests/disas/winch/x64/i32x4/extmul/low_s.wat
+++ b/tests/disas/winch/x64/i32x4/extmul/low_s.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x62
diff --git a/tests/disas/winch/x64/i32x4/extmul/low_u.wat b/tests/disas/winch/x64/i32x4/extmul/low_u.wat
index 9a5f5d40f5..5d02346ff0 100644
--- a/tests/disas/winch/x64/i32x4/extmul/low_u.wat
+++ b/tests/disas/winch/x64/i32x4/extmul/low_u.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x62
diff --git a/tests/disas/winch/x64/i32x4/extract_lane/const_avx.wat b/tests/disas/winch/x64/i32x4/extract_lane/const_avx.wat
index 3fab86518f..3c788179ed 100644
--- a/tests/disas/winch/x64/i32x4/extract_lane/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4/extract_lane/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i32x4/max/max_s.wat b/tests/disas/winch/x64/i32x4/max/max_s.wat
index 880a4af7b4..57c2c29de0 100644
--- a/tests/disas/winch/x64/i32x4/max/max_s.wat
+++ b/tests/disas/winch/x64/i32x4/max/max_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i32x4/max/max_u.wat b/tests/disas/winch/x64/i32x4/max/max_u.wat
index 32676e8fe0..025f7408f9 100644
--- a/tests/disas/winch/x64/i32x4/max/max_u.wat
+++ b/tests/disas/winch/x64/i32x4/max/max_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i32x4/min/min_s.wat b/tests/disas/winch/x64/i32x4/min/min_s.wat
index 28e9d1545a..aecad808a5 100644
--- a/tests/disas/winch/x64/i32x4/min/min_s.wat
+++ b/tests/disas/winch/x64/i32x4/min/min_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i32x4/min/min_u.wat b/tests/disas/winch/x64/i32x4/min/min_u.wat
index cc39e96097..248f0c4b5f 100644
--- a/tests/disas/winch/x64/i32x4/min/min_u.wat
+++ b/tests/disas/winch/x64/i32x4/min/min_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i32x4/mul/mul.wat b/tests/disas/winch/x64/i32x4/mul/mul.wat
index 7e5fcd2eb3..815d7a2321 100644
--- a/tests/disas/winch/x64/i32x4/mul/mul.wat
+++ b/tests/disas/winch/x64/i32x4/mul/mul.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i32x4/neg/neg.wat b/tests/disas/winch/x64/i32x4/neg/neg.wat
index 7fe1b36117..b5573258e8 100644
--- a/tests/disas/winch/x64/i32x4/neg/neg.wat
+++ b/tests/disas/winch/x64/i32x4/neg/neg.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i32x4/replace_lane/const_avx.wat b/tests/disas/winch/x64/i32x4/replace_lane/const_avx.wat
index 813f752027..10154e96e6 100644
--- a/tests/disas/winch/x64/i32x4/replace_lane/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4/replace_lane/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i32x4/replace_lane/param_avx.wat b/tests/disas/winch/x64/i32x4/replace_lane/param_avx.wat
index f94f57ae71..a1a74fefae 100644
--- a/tests/disas/winch/x64/i32x4/replace_lane/param_avx.wat
+++ b/tests/disas/winch/x64/i32x4/replace_lane/param_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i32x4/shift/shl.wat b/tests/disas/winch/x64/i32x4/shift/shl.wat
index 0133f6b125..19feb65cb2 100644
--- a/tests/disas/winch/x64/i32x4/shift/shl.wat
+++ b/tests/disas/winch/x64/i32x4/shift/shl.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i32x4/shift/shr_s.wat b/tests/disas/winch/x64/i32x4/shift/shr_s.wat
index 43fa1808bc..1e0781e834 100644
--- a/tests/disas/winch/x64/i32x4/shift/shr_s.wat
+++ b/tests/disas/winch/x64/i32x4/shift/shr_s.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i32x4/shift/shr_u.wat b/tests/disas/winch/x64/i32x4/shift/shr_u.wat
index f61b4814fe..70e96b19e4 100644
--- a/tests/disas/winch/x64/i32x4/shift/shr_u.wat
+++ b/tests/disas/winch/x64/i32x4/shift/shr_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i32x4/splat/const_avx2.wat b/tests/disas/winch/x64/i32x4/splat/const_avx2.wat
index c5fc2da0c6..ffa85722f9 100644
--- a/tests/disas/winch/x64/i32x4/splat/const_avx2.wat
+++ b/tests/disas/winch/x64/i32x4/splat/const_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i32x4/splat/param_avx2.wat b/tests/disas/winch/x64/i32x4/splat/param_avx2.wat
index e3851c76d1..74f042eb1f 100644
--- a/tests/disas/winch/x64/i32x4/splat/param_avx2.wat
+++ b/tests/disas/winch/x64/i32x4/splat/param_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i32x4/sub/sub.wat b/tests/disas/winch/x64/i32x4/sub/sub.wat
index 984daed49b..e5cd5c83e1 100644
--- a/tests/disas/winch/x64/i32x4/sub/sub.wat
+++ b/tests/disas/winch/x64/i32x4/sub/sub.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i32x4_abs/const_avx.wat b/tests/disas/winch/x64/i32x4_abs/const_avx.wat
index 6c94ceccd8..6946f85f0d 100644
--- a/tests/disas/winch/x64/i32x4_abs/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_abs/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i32x4_all_true/const_avx.wat b/tests/disas/winch/x64/i32x4_all_true/const_avx.wat
index 270402d801..b053b762aa 100644
--- a/tests/disas/winch/x64/i32x4_all_true/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_all_true/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i32x4_bitmask/const_avx.wat b/tests/disas/winch/x64/i32x4_bitmask/const_avx.wat
index 09ffac3924..ed63cb8011 100644
--- a/tests/disas/winch/x64/i32x4_bitmask/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_bitmask/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i32x4_dot_i16x8_s/const_avx.wat b/tests/disas/winch/x64/i32x4_dot_i16x8_s/const_avx.wat
index d1f9a1db67..e08c6d5325 100644
--- a/tests/disas/winch/x64/i32x4_dot_i16x8_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_dot_i16x8_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i32x4_eq/const_avx.wat b/tests/disas/winch/x64/i32x4_eq/const_avx.wat
index caaa22e44b..dd433bd806 100644
--- a/tests/disas/winch/x64/i32x4_eq/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_eq/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i32x4_extend_high_i16x8_s/const_avx.wat b/tests/disas/winch/x64/i32x4_extend_high_i16x8_s/const_avx.wat
index 944843f3c2..35f2ea1b86 100644
--- a/tests/disas/winch/x64/i32x4_extend_high_i16x8_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_extend_high_i16x8_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i32x4_extend_high_i16x8_u/const_avx.wat b/tests/disas/winch/x64/i32x4_extend_high_i16x8_u/const_avx.wat
index f47a79517c..1f3519c5e2 100644
--- a/tests/disas/winch/x64/i32x4_extend_high_i16x8_u/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_extend_high_i16x8_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i32x4_extend_low_i16x8_s/const_avx.wat b/tests/disas/winch/x64/i32x4_extend_low_i16x8_s/const_avx.wat
index 0ce4df4c29..1fa561cbdd 100644
--- a/tests/disas/winch/x64/i32x4_extend_low_i16x8_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_extend_low_i16x8_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i32x4_extend_low_i16x8_u/const_avx.wat b/tests/disas/winch/x64/i32x4_extend_low_i16x8_u/const_avx.wat
index 7b72ef1061..4b4584eac5 100644
--- a/tests/disas/winch/x64/i32x4_extend_low_i16x8_u/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_extend_low_i16x8_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i32x4_ge_s/const_avx.wat b/tests/disas/winch/x64/i32x4_ge_s/const_avx.wat
index a68670358c..714dd42f06 100644
--- a/tests/disas/winch/x64/i32x4_ge_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_ge_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32x4_ge_u/const_avx.wat b/tests/disas/winch/x64/i32x4_ge_u/const_avx.wat
index 22a3ebd7f6..43c9f49d28 100644
--- a/tests/disas/winch/x64/i32x4_ge_u/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_ge_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32x4_gt_s/const_avx.wat b/tests/disas/winch/x64/i32x4_gt_s/const_avx.wat
index a56518539f..413f5640b7 100644
--- a/tests/disas/winch/x64/i32x4_gt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_gt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i32x4_gt_u/const_avx.wat b/tests/disas/winch/x64/i32x4_gt_u/const_avx.wat
index ab74acfa02..9bc1b9b9c6 100644
--- a/tests/disas/winch/x64/i32x4_gt_u/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_gt_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i32x4_le_s/const_avx.wat b/tests/disas/winch/x64/i32x4_le_s/const_avx.wat
index a7dbeeb391..8458da457e 100644
--- a/tests/disas/winch/x64/i32x4_le_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_le_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32x4_le_u/const_avx.wat b/tests/disas/winch/x64/i32x4_le_u/const_avx.wat
index a3cb52eaba..dedfcd60e4 100644
--- a/tests/disas/winch/x64/i32x4_le_u/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_le_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i32x4_lt_s/const_avx.wat b/tests/disas/winch/x64/i32x4_lt_s/const_avx.wat
index 5d5b5476fd..2c474ec414 100644
--- a/tests/disas/winch/x64/i32x4_lt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_lt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i32x4_lt_u/const_avx.wat b/tests/disas/winch/x64/i32x4_lt_u/const_avx.wat
index f6f6951b1f..ab92731854 100644
--- a/tests/disas/winch/x64/i32x4_lt_u/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_lt_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i32x4_ne/const_avx.wat b/tests/disas/winch/x64/i32x4_ne/const_avx.wat
index 6255c3e20b..f5d019664d 100644
--- a/tests/disas/winch/x64/i32x4_ne/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_ne/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_s/const_avx.wat b/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_s/const_avx.wat
index 0e6fc18b50..755b0c63ff 100644
--- a/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_s/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x62
diff --git a/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_u/const_avx.wat b/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_u/const_avx.wat
index 6c07aa5569..2460918f66 100644
--- a/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_u/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_trunc_sat_f32x4_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_s_zero/const_avx.wat b/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_s_zero/const_avx.wat
index efc3800a30..618987242c 100644
--- a/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_s_zero/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_s_zero/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_u_zero/const_avx.wat b/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_u_zero/const_avx.wat
index 68c3638571..7a807c83e5 100644
--- a/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_u_zero/const_avx.wat
+++ b/tests/disas/winch/x64/i32x4_trunc_sat_f64x2_u_zero/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/i64_add/const.wat b/tests/disas/winch/x64/i64_add/const.wat
index 4e6780bd4b..98092f62c3 100644
--- a/tests/disas/winch/x64/i64_add/const.wat
+++ b/tests/disas/winch/x64/i64_add/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_add/locals.wat b/tests/disas/winch/x64/i64_add/locals.wat
index 437ddb2ba8..8895a57cd3 100644
--- a/tests/disas/winch/x64/i64_add/locals.wat
+++ b/tests/disas/winch/x64/i64_add/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i64_add/max.wat b/tests/disas/winch/x64/i64_add/max.wat
index a4266be1bf..28abbf7690 100644
--- a/tests/disas/winch/x64/i64_add/max.wat
+++ b/tests/disas/winch/x64/i64_add/max.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i64_add/max_one.wat b/tests/disas/winch/x64/i64_add/max_one.wat
index 99c505b9e9..f7e23a199a 100644
--- a/tests/disas/winch/x64/i64_add/max_one.wat
+++ b/tests/disas/winch/x64/i64_add/max_one.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_add/mixed.wat b/tests/disas/winch/x64/i64_add/mixed.wat
index b4f488d723..af74d76d8a 100644
--- a/tests/disas/winch/x64/i64_add/mixed.wat
+++ b/tests/disas/winch/x64/i64_add/mixed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i64_add/params.wat b/tests/disas/winch/x64/i64_add/params.wat
index 3a1b27ab93..6d472f0621 100644
--- a/tests/disas/winch/x64/i64_add/params.wat
+++ b/tests/disas/winch/x64/i64_add/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_add/signed.wat b/tests/disas/winch/x64/i64_add/signed.wat
index ce1da09615..5a05609e2b 100644
--- a/tests/disas/winch/x64/i64_add/signed.wat
+++ b/tests/disas/winch/x64/i64_add/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i64_add/unsigned_with_zero.wat b/tests/disas/winch/x64/i64_add/unsigned_with_zero.wat
index a8f4b0c032..32ccec9900 100644
--- a/tests/disas/winch/x64/i64_add/unsigned_with_zero.wat
+++ b/tests/disas/winch/x64/i64_add/unsigned_with_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_and/32_const.wat b/tests/disas/winch/x64/i64_and/32_const.wat
index eb92804d36..e9aab85c5e 100644
--- a/tests/disas/winch/x64/i64_and/32_const.wat
+++ b/tests/disas/winch/x64/i64_and/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_and/64_const.wat b/tests/disas/winch/x64/i64_and/64_const.wat
index ba634536a2..8c8ebd386b 100644
--- a/tests/disas/winch/x64/i64_and/64_const.wat
+++ b/tests/disas/winch/x64/i64_and/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i64_and/locals.wat b/tests/disas/winch/x64/i64_and/locals.wat
index 84258ff528..b1624a0ca5 100644
--- a/tests/disas/winch/x64/i64_and/locals.wat
+++ b/tests/disas/winch/x64/i64_and/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i64_and/params.wat b/tests/disas/winch/x64/i64_and/params.wat
index 0d492c9b4b..869641c7cd 100644
--- a/tests/disas/winch/x64/i64_and/params.wat
+++ b/tests/disas/winch/x64/i64_and/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_clz/lzcnt_const.wat b/tests/disas/winch/x64/i64_clz/lzcnt_const.wat
index d8fdfc3c0e..7862964ce9 100644
--- a/tests/disas/winch/x64/i64_clz/lzcnt_const.wat
+++ b/tests/disas/winch/x64/i64_clz/lzcnt_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i64_clz/lzcnt_local.wat b/tests/disas/winch/x64/i64_clz/lzcnt_local.wat
index 412a345331..0e098d6422 100644
--- a/tests/disas/winch/x64/i64_clz/lzcnt_local.wat
+++ b/tests/disas/winch/x64/i64_clz/lzcnt_local.wat
@@ -17,7 +17,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/i64_clz/lzcnt_param.wat b/tests/disas/winch/x64/i64_clz/lzcnt_param.wat
index 9ab06709c8..776f02f683 100644
--- a/tests/disas/winch/x64/i64_clz/lzcnt_param.wat
+++ b/tests/disas/winch/x64/i64_clz/lzcnt_param.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_clz/no_lzcnt_const.wat b/tests/disas/winch/x64/i64_clz/no_lzcnt_const.wat
index d14e31b13e..edea5ab8df 100644
--- a/tests/disas/winch/x64/i64_clz/no_lzcnt_const.wat
+++ b/tests/disas/winch/x64/i64_clz/no_lzcnt_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_clz/no_lzcnt_local.wat b/tests/disas/winch/x64/i64_clz/no_lzcnt_local.wat
index e8858203b2..6dfd97a817 100644
--- a/tests/disas/winch/x64/i64_clz/no_lzcnt_local.wat
+++ b/tests/disas/winch/x64/i64_clz/no_lzcnt_local.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
diff --git a/tests/disas/winch/x64/i64_clz/no_lzcnt_param.wat b/tests/disas/winch/x64/i64_clz/no_lzcnt_param.wat
index 8d3f526e02..3f1cd9d6ff 100644
--- a/tests/disas/winch/x64/i64_clz/no_lzcnt_param.wat
+++ b/tests/disas/winch/x64/i64_clz/no_lzcnt_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i64_ctz/bmi1_const.wat b/tests/disas/winch/x64/i64_ctz/bmi1_const.wat
index 8637ba92b0..219347f4fe 100644
--- a/tests/disas/winch/x64/i64_ctz/bmi1_const.wat
+++ b/tests/disas/winch/x64/i64_ctz/bmi1_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i64_ctz/bmi1_local.wat b/tests/disas/winch/x64/i64_ctz/bmi1_local.wat
index 86e0ebc78f..34aa2344a6 100644
--- a/tests/disas/winch/x64/i64_ctz/bmi1_local.wat
+++ b/tests/disas/winch/x64/i64_ctz/bmi1_local.wat
@@ -17,7 +17,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/i64_ctz/bmi1_param.wat b/tests/disas/winch/x64/i64_ctz/bmi1_param.wat
index 32ae6d2cfe..26ace5d9da 100644
--- a/tests/disas/winch/x64/i64_ctz/bmi1_param.wat
+++ b/tests/disas/winch/x64/i64_ctz/bmi1_param.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_ctz/no_bmi1_const.wat b/tests/disas/winch/x64/i64_ctz/no_bmi1_const.wat
index fc940f654e..da1ef98aab 100644
--- a/tests/disas/winch/x64/i64_ctz/no_bmi1_const.wat
+++ b/tests/disas/winch/x64/i64_ctz/no_bmi1_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/i64_ctz/no_bmi1_local.wat b/tests/disas/winch/x64/i64_ctz/no_bmi1_local.wat
index 188df7d303..da476e1d39 100644
--- a/tests/disas/winch/x64/i64_ctz/no_bmi1_local.wat
+++ b/tests/disas/winch/x64/i64_ctz/no_bmi1_local.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x66
diff --git a/tests/disas/winch/x64/i64_ctz/no_bmi1_param.wat b/tests/disas/winch/x64/i64_ctz/no_bmi1_param.wat
index a5f273f58e..631bbb36a8 100644
--- a/tests/disas/winch/x64/i64_ctz/no_bmi1_param.wat
+++ b/tests/disas/winch/x64/i64_ctz/no_bmi1_param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_divs/const.wat b/tests/disas/winch/x64/i64_divs/const.wat
index 73417a616b..4b0b92001c 100644
--- a/tests/disas/winch/x64/i64_divs/const.wat
+++ b/tests/disas/winch/x64/i64_divs/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_divs/one_zero.wat b/tests/disas/winch/x64/i64_divs/one_zero.wat
index 30f7d8e058..b9d23eaadb 100644
--- a/tests/disas/winch/x64/i64_divs/one_zero.wat
+++ b/tests/disas/winch/x64/i64_divs/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_divs/overflow.wat b/tests/disas/winch/x64/i64_divs/overflow.wat
index 54a23316f8..1da600fd20 100644
--- a/tests/disas/winch/x64/i64_divs/overflow.wat
+++ b/tests/disas/winch/x64/i64_divs/overflow.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_divs/params.wat b/tests/disas/winch/x64/i64_divs/params.wat
index 853201d230..6b005f79b8 100644
--- a/tests/disas/winch/x64/i64_divs/params.wat
+++ b/tests/disas/winch/x64/i64_divs/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i64_divs/zero_zero.wat b/tests/disas/winch/x64/i64_divs/zero_zero.wat
index 2ba9329825..85f27cc42b 100644
--- a/tests/disas/winch/x64/i64_divs/zero_zero.wat
+++ b/tests/disas/winch/x64/i64_divs/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_divu/const.wat b/tests/disas/winch/x64/i64_divu/const.wat
index 89969b6db1..0b07cc5718 100644
--- a/tests/disas/winch/x64/i64_divu/const.wat
+++ b/tests/disas/winch/x64/i64_divu/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_divu/one_zero.wat b/tests/disas/winch/x64/i64_divu/one_zero.wat
index 0b4f65ec84..95e41a496b 100644
--- a/tests/disas/winch/x64/i64_divu/one_zero.wat
+++ b/tests/disas/winch/x64/i64_divu/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_divu/params.wat b/tests/disas/winch/x64/i64_divu/params.wat
index 3144ca0e40..01d234ca1a 100644
--- a/tests/disas/winch/x64/i64_divu/params.wat
+++ b/tests/disas/winch/x64/i64_divu/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_divu/signed.wat b/tests/disas/winch/x64/i64_divu/signed.wat
index 88a1f46e4f..07549fe699 100644
--- a/tests/disas/winch/x64/i64_divu/signed.wat
+++ b/tests/disas/winch/x64/i64_divu/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/i64_divu/zero_zero.wat b/tests/disas/winch/x64/i64_divu/zero_zero.wat
index 530976035b..8aa9560ba7 100644
--- a/tests/disas/winch/x64/i64_divu/zero_zero.wat
+++ b/tests/disas/winch/x64/i64_divu/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_eq/32_const.wat b/tests/disas/winch/x64/i64_eq/32_const.wat
index 70949bcd35..d37416c8c1 100644
--- a/tests/disas/winch/x64/i64_eq/32_const.wat
+++ b/tests/disas/winch/x64/i64_eq/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_eq/64_const.wat b/tests/disas/winch/x64/i64_eq/64_const.wat
index dcda7ca45b..96f82e4eea 100644
--- a/tests/disas/winch/x64/i64_eq/64_const.wat
+++ b/tests/disas/winch/x64/i64_eq/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_eq/locals.wat b/tests/disas/winch/x64/i64_eq/locals.wat
index 91a3d065f5..c45e457da7 100644
--- a/tests/disas/winch/x64/i64_eq/locals.wat
+++ b/tests/disas/winch/x64/i64_eq/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_eq/params.wat b/tests/disas/winch/x64/i64_eq/params.wat
index 37a8c86b3c..5d610803fa 100644
--- a/tests/disas/winch/x64/i64_eq/params.wat
+++ b/tests/disas/winch/x64/i64_eq/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_eqz/32_const.wat b/tests/disas/winch/x64/i64_eqz/32_const.wat
index c822960fd2..41d200c8dc 100644
--- a/tests/disas/winch/x64/i64_eqz/32_const.wat
+++ b/tests/disas/winch/x64/i64_eqz/32_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_eqz/64_const.wat b/tests/disas/winch/x64/i64_eqz/64_const.wat
index 63f14a9fcc..651c9330d8 100644
--- a/tests/disas/winch/x64/i64_eqz/64_const.wat
+++ b/tests/disas/winch/x64/i64_eqz/64_const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64_eqz/local.wat b/tests/disas/winch/x64/i64_eqz/local.wat
index 6947a348a9..2d463af6d5 100644
--- a/tests/disas/winch/x64/i64_eqz/local.wat
+++ b/tests/disas/winch/x64/i64_eqz/local.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i64_eqz/param.wat b/tests/disas/winch/x64/i64_eqz/param.wat
index a16ac77089..5b978a64f0 100644
--- a/tests/disas/winch/x64/i64_eqz/param.wat
+++ b/tests/disas/winch/x64/i64_eqz/param.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i64_eqz/spilled.wat b/tests/disas/winch/x64/i64_eqz/spilled.wat
index b5842b6e9b..c65ef713f3 100644
--- a/tests/disas/winch/x64/i64_eqz/spilled.wat
+++ b/tests/disas/winch/x64/i64_eqz/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x14, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
diff --git a/tests/disas/winch/x64/i64_extend_16_s/const.wat b/tests/disas/winch/x64/i64_extend_16_s/const.wat
index 094d06f9cd..0395a494db 100644
--- a/tests/disas/winch/x64/i64_extend_16_s/const.wat
+++ b/tests/disas/winch/x64/i64_extend_16_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_extend_16_s/locals.wat b/tests/disas/winch/x64/i64_extend_16_s/locals.wat
index ee72d78ce3..c3754174b9 100644
--- a/tests/disas/winch/x64/i64_extend_16_s/locals.wat
+++ b/tests/disas/winch/x64/i64_extend_16_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i64_extend_16_s/params.wat b/tests/disas/winch/x64/i64_extend_16_s/params.wat
index 3f2eac9fae..80fe2548e5 100644
--- a/tests/disas/winch/x64/i64_extend_16_s/params.wat
+++ b/tests/disas/winch/x64/i64_extend_16_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x47
diff --git a/tests/disas/winch/x64/i64_extend_32_s/const.wat b/tests/disas/winch/x64/i64_extend_32_s/const.wat
index 39e043b389..a2224930c7 100644
--- a/tests/disas/winch/x64/i64_extend_32_s/const.wat
+++ b/tests/disas/winch/x64/i64_extend_32_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i64_extend_32_s/locals.wat b/tests/disas/winch/x64/i64_extend_32_s/locals.wat
index e966d0ec36..51c3d1227e 100644
--- a/tests/disas/winch/x64/i64_extend_32_s/locals.wat
+++ b/tests/disas/winch/x64/i64_extend_32_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i64_extend_32_s/params.wat b/tests/disas/winch/x64/i64_extend_32_s/params.wat
index 5ffc083d7e..3e942fffeb 100644
--- a/tests/disas/winch/x64/i64_extend_32_s/params.wat
+++ b/tests/disas/winch/x64/i64_extend_32_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i64_extend_8_s/const.wat b/tests/disas/winch/x64/i64_extend_8_s/const.wat
index c1bf474474..cc5183dfef 100644
--- a/tests/disas/winch/x64/i64_extend_8_s/const.wat
+++ b/tests/disas/winch/x64/i64_extend_8_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_extend_8_s/locals.wat b/tests/disas/winch/x64/i64_extend_8_s/locals.wat
index 922e73a8d9..383bb10fa0 100644
--- a/tests/disas/winch/x64/i64_extend_8_s/locals.wat
+++ b/tests/disas/winch/x64/i64_extend_8_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i64_extend_8_s/params.wat b/tests/disas/winch/x64/i64_extend_8_s/params.wat
index 33ce731996..59c49e649e 100644
--- a/tests/disas/winch/x64/i64_extend_8_s/params.wat
+++ b/tests/disas/winch/x64/i64_extend_8_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x47
diff --git a/tests/disas/winch/x64/i64_extend_i32_s/const.wat b/tests/disas/winch/x64/i64_extend_i32_s/const.wat
index fdc56eb949..270cd74a18 100644
--- a/tests/disas/winch/x64/i64_extend_i32_s/const.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x40
diff --git a/tests/disas/winch/x64/i64_extend_i32_s/locals.wat b/tests/disas/winch/x64/i64_extend_i32_s/locals.wat
index 38b27be44f..65694d020e 100644
--- a/tests/disas/winch/x64/i64_extend_i32_s/locals.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_extend_i32_s/params.wat b/tests/disas/winch/x64/i64_extend_i32_s/params.wat
index 5eea6a3216..82df12142b 100644
--- a/tests/disas/winch/x64/i64_extend_i32_s/params.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i64_extend_i32_s/spilled.wat b/tests/disas/winch/x64/i64_extend_i32_s/spilled.wat
index 8850283c62..95a1056847 100644
--- a/tests/disas/winch/x64/i64_extend_i32_s/spilled.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_s/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i64_extend_i32_u/const.wat b/tests/disas/winch/x64/i64_extend_i32_u/const.wat
index 2b41a4c44f..2c5547b96c 100644
--- a/tests/disas/winch/x64/i64_extend_i32_u/const.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3f
diff --git a/tests/disas/winch/x64/i64_extend_i32_u/locals.wat b/tests/disas/winch/x64/i64_extend_i32_u/locals.wat
index 387cd3c425..00a7dd0b76 100644
--- a/tests/disas/winch/x64/i64_extend_i32_u/locals.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_extend_i32_u/params.wat b/tests/disas/winch/x64/i64_extend_i32_u/params.wat
index e76901a249..6bf35f24ff 100644
--- a/tests/disas/winch/x64/i64_extend_i32_u/params.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_extend_i32_u/spilled.wat b/tests/disas/winch/x64/i64_extend_i32_u/spilled.wat
index 84e97c4b85..0a7280419f 100644
--- a/tests/disas/winch/x64/i64_extend_i32_u/spilled.wat
+++ b/tests/disas/winch/x64/i64_extend_i32_u/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x18, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_ge_s/32_const.wat b/tests/disas/winch/x64/i64_ge_s/32_const.wat
index 9eb6449b92..ef34894311 100644
--- a/tests/disas/winch/x64/i64_ge_s/32_const.wat
+++ b/tests/disas/winch/x64/i64_ge_s/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_ge_s/64_const.wat b/tests/disas/winch/x64/i64_ge_s/64_const.wat
index 3fcf724551..fbdb695a7a 100644
--- a/tests/disas/winch/x64/i64_ge_s/64_const.wat
+++ b/tests/disas/winch/x64/i64_ge_s/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_ge_s/locals.wat b/tests/disas/winch/x64/i64_ge_s/locals.wat
index 5c88d483a7..a58caa8abb 100644
--- a/tests/disas/winch/x64/i64_ge_s/locals.wat
+++ b/tests/disas/winch/x64/i64_ge_s/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_ge_s/params.wat b/tests/disas/winch/x64/i64_ge_s/params.wat
index 835e4fabc0..9b885c00c4 100644
--- a/tests/disas/winch/x64/i64_ge_s/params.wat
+++ b/tests/disas/winch/x64/i64_ge_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_ge_u/32_const.wat b/tests/disas/winch/x64/i64_ge_u/32_const.wat
index 3423070ed1..2c6320cd3b 100644
--- a/tests/disas/winch/x64/i64_ge_u/32_const.wat
+++ b/tests/disas/winch/x64/i64_ge_u/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_ge_u/64_const.wat b/tests/disas/winch/x64/i64_ge_u/64_const.wat
index 37aef24a0b..a121defe60 100644
--- a/tests/disas/winch/x64/i64_ge_u/64_const.wat
+++ b/tests/disas/winch/x64/i64_ge_u/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_ge_u/locals.wat b/tests/disas/winch/x64/i64_ge_u/locals.wat
index 75d0eefa3b..3b99c5212e 100644
--- a/tests/disas/winch/x64/i64_ge_u/locals.wat
+++ b/tests/disas/winch/x64/i64_ge_u/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_ge_u/params.wat b/tests/disas/winch/x64/i64_ge_u/params.wat
index 8bfcc8f598..1ff3f93fba 100644
--- a/tests/disas/winch/x64/i64_ge_u/params.wat
+++ b/tests/disas/winch/x64/i64_ge_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_gt_s/32_const.wat b/tests/disas/winch/x64/i64_gt_s/32_const.wat
index 4ccef3ac32..58a20a35ae 100644
--- a/tests/disas/winch/x64/i64_gt_s/32_const.wat
+++ b/tests/disas/winch/x64/i64_gt_s/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_gt_s/64_const.wat b/tests/disas/winch/x64/i64_gt_s/64_const.wat
index 5eae4517a0..01e380a185 100644
--- a/tests/disas/winch/x64/i64_gt_s/64_const.wat
+++ b/tests/disas/winch/x64/i64_gt_s/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_gt_s/locals.wat b/tests/disas/winch/x64/i64_gt_s/locals.wat
index 9aeb513ffd..a5a52c89cb 100644
--- a/tests/disas/winch/x64/i64_gt_s/locals.wat
+++ b/tests/disas/winch/x64/i64_gt_s/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_gt_s/params.wat b/tests/disas/winch/x64/i64_gt_s/params.wat
index 41f78d4f4c..42557f810b 100644
--- a/tests/disas/winch/x64/i64_gt_s/params.wat
+++ b/tests/disas/winch/x64/i64_gt_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_gt_u/32_const.wat b/tests/disas/winch/x64/i64_gt_u/32_const.wat
index fdc542eb30..43fb29541b 100644
--- a/tests/disas/winch/x64/i64_gt_u/32_const.wat
+++ b/tests/disas/winch/x64/i64_gt_u/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_gt_u/64_const.wat b/tests/disas/winch/x64/i64_gt_u/64_const.wat
index deaae517e9..70592a4b7f 100644
--- a/tests/disas/winch/x64/i64_gt_u/64_const.wat
+++ b/tests/disas/winch/x64/i64_gt_u/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_gt_u/locals.wat b/tests/disas/winch/x64/i64_gt_u/locals.wat
index 47466bcfc8..e80d1b42c9 100644
--- a/tests/disas/winch/x64/i64_gt_u/locals.wat
+++ b/tests/disas/winch/x64/i64_gt_u/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_gt_u/params.wat b/tests/disas/winch/x64/i64_gt_u/params.wat
index 75c3f29fb0..3fab63b49f 100644
--- a/tests/disas/winch/x64/i64_gt_u/params.wat
+++ b/tests/disas/winch/x64/i64_gt_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_le_s/32_const.wat b/tests/disas/winch/x64/i64_le_s/32_const.wat
index 842fc74497..98d10504f6 100644
--- a/tests/disas/winch/x64/i64_le_s/32_const.wat
+++ b/tests/disas/winch/x64/i64_le_s/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_le_s/64_const.wat b/tests/disas/winch/x64/i64_le_s/64_const.wat
index e0f1da2593..2fc4cb3c38 100644
--- a/tests/disas/winch/x64/i64_le_s/64_const.wat
+++ b/tests/disas/winch/x64/i64_le_s/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_le_s/locals.wat b/tests/disas/winch/x64/i64_le_s/locals.wat
index 3785e86faa..cde03b7aa8 100644
--- a/tests/disas/winch/x64/i64_le_s/locals.wat
+++ b/tests/disas/winch/x64/i64_le_s/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_le_s/params.wat b/tests/disas/winch/x64/i64_le_s/params.wat
index f24da43032..44cbe8664e 100644
--- a/tests/disas/winch/x64/i64_le_s/params.wat
+++ b/tests/disas/winch/x64/i64_le_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_le_u/32_const.wat b/tests/disas/winch/x64/i64_le_u/32_const.wat
index 50ef7baa94..1b610b485f 100644
--- a/tests/disas/winch/x64/i64_le_u/32_const.wat
+++ b/tests/disas/winch/x64/i64_le_u/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_le_u/64_const.wat b/tests/disas/winch/x64/i64_le_u/64_const.wat
index 92d5430f15..b8b24f5ef4 100644
--- a/tests/disas/winch/x64/i64_le_u/64_const.wat
+++ b/tests/disas/winch/x64/i64_le_u/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_le_u/locals.wat b/tests/disas/winch/x64/i64_le_u/locals.wat
index ca66aab8f8..743799ab06 100644
--- a/tests/disas/winch/x64/i64_le_u/locals.wat
+++ b/tests/disas/winch/x64/i64_le_u/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_le_u/params.wat b/tests/disas/winch/x64/i64_le_u/params.wat
index c2a2988b44..2d2ac085b8 100644
--- a/tests/disas/winch/x64/i64_le_u/params.wat
+++ b/tests/disas/winch/x64/i64_le_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_lt_s/32_const.wat b/tests/disas/winch/x64/i64_lt_s/32_const.wat
index 6614aa2099..a1cd3f122e 100644
--- a/tests/disas/winch/x64/i64_lt_s/32_const.wat
+++ b/tests/disas/winch/x64/i64_lt_s/32_const.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_lt_s/64_const.wat b/tests/disas/winch/x64/i64_lt_s/64_const.wat
index 0b61982721..6060c37c08 100644
--- a/tests/disas/winch/x64/i64_lt_s/64_const.wat
+++ b/tests/disas/winch/x64/i64_lt_s/64_const.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_lt_s/locals.wat b/tests/disas/winch/x64/i64_lt_s/locals.wat
index d75e088a83..086ad452c6 100644
--- a/tests/disas/winch/x64/i64_lt_s/locals.wat
+++ b/tests/disas/winch/x64/i64_lt_s/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_lt_s/params.wat b/tests/disas/winch/x64/i64_lt_s/params.wat
index fe2ccbeb11..f8a6158e3c 100644
--- a/tests/disas/winch/x64/i64_lt_s/params.wat
+++ b/tests/disas/winch/x64/i64_lt_s/params.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_lt_u/32_const.wat b/tests/disas/winch/x64/i64_lt_u/32_const.wat
index bd5517baba..c33b531fc8 100644
--- a/tests/disas/winch/x64/i64_lt_u/32_const.wat
+++ b/tests/disas/winch/x64/i64_lt_u/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_lt_u/64_const.wat b/tests/disas/winch/x64/i64_lt_u/64_const.wat
index 94a68805e2..3ef1fe0e86 100644
--- a/tests/disas/winch/x64/i64_lt_u/64_const.wat
+++ b/tests/disas/winch/x64/i64_lt_u/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_lt_u/locals.wat b/tests/disas/winch/x64/i64_lt_u/locals.wat
index 16ef5ae0f4..aacf4f4ca2 100644
--- a/tests/disas/winch/x64/i64_lt_u/locals.wat
+++ b/tests/disas/winch/x64/i64_lt_u/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_lt_u/params.wat b/tests/disas/winch/x64/i64_lt_u/params.wat
index 360247327d..33e4c2de80 100644
--- a/tests/disas/winch/x64/i64_lt_u/params.wat
+++ b/tests/disas/winch/x64/i64_lt_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_mul/const.wat b/tests/disas/winch/x64/i64_mul/const.wat
index 3c7d069907..c95fe6395f 100644
--- a/tests/disas/winch/x64/i64_mul/const.wat
+++ b/tests/disas/winch/x64/i64_mul/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i64_mul/locals.wat b/tests/disas/winch/x64/i64_mul/locals.wat
index 734ba9b03e..17924cceab 100644
--- a/tests/disas/winch/x64/i64_mul/locals.wat
+++ b/tests/disas/winch/x64/i64_mul/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i64_mul/max.wat b/tests/disas/winch/x64/i64_mul/max.wat
index a24c3956e8..cb74c554ea 100644
--- a/tests/disas/winch/x64/i64_mul/max.wat
+++ b/tests/disas/winch/x64/i64_mul/max.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_mul/max_one.wat b/tests/disas/winch/x64/i64_mul/max_one.wat
index 165f02bbdf..34ac62aaf9 100644
--- a/tests/disas/winch/x64/i64_mul/max_one.wat
+++ b/tests/disas/winch/x64/i64_mul/max_one.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_mul/mixed.wat b/tests/disas/winch/x64/i64_mul/mixed.wat
index eeecef325c..96e307bf83 100644
--- a/tests/disas/winch/x64/i64_mul/mixed.wat
+++ b/tests/disas/winch/x64/i64_mul/mixed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i64_mul/params.wat b/tests/disas/winch/x64/i64_mul/params.wat
index a968bf5182..bd8a8ea294 100644
--- a/tests/disas/winch/x64/i64_mul/params.wat
+++ b/tests/disas/winch/x64/i64_mul/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/i64_mul/signed.wat b/tests/disas/winch/x64/i64_mul/signed.wat
index 15348f1440..9828bc44b7 100644
--- a/tests/disas/winch/x64/i64_mul/signed.wat
+++ b/tests/disas/winch/x64/i64_mul/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i64_mul/unsigned_with_zero.wat b/tests/disas/winch/x64/i64_mul/unsigned_with_zero.wat
index 3750bdbb4a..4d69968238 100644
--- a/tests/disas/winch/x64/i64_mul/unsigned_with_zero.wat
+++ b/tests/disas/winch/x64/i64_mul/unsigned_with_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i64_ne/32_const.wat b/tests/disas/winch/x64/i64_ne/32_const.wat
index b59cb963b7..041ed83ad0 100644
--- a/tests/disas/winch/x64/i64_ne/32_const.wat
+++ b/tests/disas/winch/x64/i64_ne/32_const.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64_ne/64_const.wat b/tests/disas/winch/x64/i64_ne/64_const.wat
index 11509d0f94..f789945a6f 100644
--- a/tests/disas/winch/x64/i64_ne/64_const.wat
+++ b/tests/disas/winch/x64/i64_ne/64_const.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64_ne/locals.wat b/tests/disas/winch/x64/i64_ne/locals.wat
index 2f23edbd43..6b6c424937 100644
--- a/tests/disas/winch/x64/i64_ne/locals.wat
+++ b/tests/disas/winch/x64/i64_ne/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6e
diff --git a/tests/disas/winch/x64/i64_ne/params.wat b/tests/disas/winch/x64/i64_ne/params.wat
index e9568c00a7..36d6607599 100644
--- a/tests/disas/winch/x64/i64_ne/params.wat
+++ b/tests/disas/winch/x64/i64_ne/params.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i64_or/32_const.wat b/tests/disas/winch/x64/i64_or/32_const.wat
index 1d0d5ec49b..bd87367444 100644
--- a/tests/disas/winch/x64/i64_or/32_const.wat
+++ b/tests/disas/winch/x64/i64_or/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_or/64_const.wat b/tests/disas/winch/x64/i64_or/64_const.wat
index e4d2ecd300..395d52d452 100644
--- a/tests/disas/winch/x64/i64_or/64_const.wat
+++ b/tests/disas/winch/x64/i64_or/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i64_or/locals.wat b/tests/disas/winch/x64/i64_or/locals.wat
index 79ffc72964..a1977bb5ae 100644
--- a/tests/disas/winch/x64/i64_or/locals.wat
+++ b/tests/disas/winch/x64/i64_or/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i64_or/params.wat b/tests/disas/winch/x64/i64_or/params.wat
index 585f035cfe..ca5a2f6e39 100644
--- a/tests/disas/winch/x64/i64_or/params.wat
+++ b/tests/disas/winch/x64/i64_or/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_popcnt/const.wat b/tests/disas/winch/x64/i64_popcnt/const.wat
index 08b821f953..5f23f9ebe3 100644
--- a/tests/disas/winch/x64/i64_popcnt/const.wat
+++ b/tests/disas/winch/x64/i64_popcnt/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x42
diff --git a/tests/disas/winch/x64/i64_popcnt/fallback.wat b/tests/disas/winch/x64/i64_popcnt/fallback.wat
index f95b80c594..62f52f55f9 100644
--- a/tests/disas/winch/x64/i64_popcnt/fallback.wat
+++ b/tests/disas/winch/x64/i64_popcnt/fallback.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x97
diff --git a/tests/disas/winch/x64/i64_popcnt/no_sse42.wat b/tests/disas/winch/x64/i64_popcnt/no_sse42.wat
index 60ce60caa1..6b728ab08d 100644
--- a/tests/disas/winch/x64/i64_popcnt/no_sse42.wat
+++ b/tests/disas/winch/x64/i64_popcnt/no_sse42.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x97
diff --git a/tests/disas/winch/x64/i64_popcnt/reg.wat b/tests/disas/winch/x64/i64_popcnt/reg.wat
index 158be1b08a..9b588ae42c 100644
--- a/tests/disas/winch/x64/i64_popcnt/reg.wat
+++ b/tests/disas/winch/x64/i64_popcnt/reg.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_reinterpret_f64/const.wat b/tests/disas/winch/x64/i64_reinterpret_f64/const.wat
index f6c68a779b..b413f2c23b 100644
--- a/tests/disas/winch/x64/i64_reinterpret_f64/const.wat
+++ b/tests/disas/winch/x64/i64_reinterpret_f64/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i64_reinterpret_f64/locals.wat b/tests/disas/winch/x64/i64_reinterpret_f64/locals.wat
index b553870dc3..5aa995737a 100644
--- a/tests/disas/winch/x64/i64_reinterpret_f64/locals.wat
+++ b/tests/disas/winch/x64/i64_reinterpret_f64/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i64_reinterpret_f64/params.wat b/tests/disas/winch/x64/i64_reinterpret_f64/params.wat
index fba6834b6d..12cfb91c92 100644
--- a/tests/disas/winch/x64/i64_reinterpret_f64/params.wat
+++ b/tests/disas/winch/x64/i64_reinterpret_f64/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i64_reinterpret_f64/ret_float.wat b/tests/disas/winch/x64/i64_reinterpret_f64/ret_float.wat
index f5c598ca0a..e3984b0734 100644
--- a/tests/disas/winch/x64/i64_reinterpret_f64/ret_float.wat
+++ b/tests/disas/winch/x64/i64_reinterpret_f64/ret_float.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i64_rems/const.wat b/tests/disas/winch/x64/i64_rems/const.wat
index e134591ab5..6de324f87f 100644
--- a/tests/disas/winch/x64/i64_rems/const.wat
+++ b/tests/disas/winch/x64/i64_rems/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i64_rems/one_zero.wat b/tests/disas/winch/x64/i64_rems/one_zero.wat
index 432379810f..0844eaafd6 100644
--- a/tests/disas/winch/x64/i64_rems/one_zero.wat
+++ b/tests/disas/winch/x64/i64_rems/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i64_rems/overflow.wat b/tests/disas/winch/x64/i64_rems/overflow.wat
index 791101a633..22eec60ed5 100644
--- a/tests/disas/winch/x64/i64_rems/overflow.wat
+++ b/tests/disas/winch/x64/i64_rems/overflow.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/i64_rems/params.wat b/tests/disas/winch/x64/i64_rems/params.wat
index de46c4cfd1..ff05c0cc9b 100644
--- a/tests/disas/winch/x64/i64_rems/params.wat
+++ b/tests/disas/winch/x64/i64_rems/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i64_rems/zero_zero.wat b/tests/disas/winch/x64/i64_rems/zero_zero.wat
index 42b0eb75c2..16ccfa1c93 100644
--- a/tests/disas/winch/x64/i64_rems/zero_zero.wat
+++ b/tests/disas/winch/x64/i64_rems/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5e
diff --git a/tests/disas/winch/x64/i64_remu/const.wat b/tests/disas/winch/x64/i64_remu/const.wat
index 9a9bdaca6b..67a9e210ca 100644
--- a/tests/disas/winch/x64/i64_remu/const.wat
+++ b/tests/disas/winch/x64/i64_remu/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i64_remu/one_zero.wat b/tests/disas/winch/x64/i64_remu/one_zero.wat
index 81dfedfe08..785c0c5174 100644
--- a/tests/disas/winch/x64/i64_remu/one_zero.wat
+++ b/tests/disas/winch/x64/i64_remu/one_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i64_remu/params.wat b/tests/disas/winch/x64/i64_remu/params.wat
index 2448c09e81..f36d3c961c 100644
--- a/tests/disas/winch/x64/i64_remu/params.wat
+++ b/tests/disas/winch/x64/i64_remu/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/i64_remu/signed.wat b/tests/disas/winch/x64/i64_remu/signed.wat
index 1f324c9450..687f57d5c1 100644
--- a/tests/disas/winch/x64/i64_remu/signed.wat
+++ b/tests/disas/winch/x64/i64_remu/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i64_remu/zero_zero.wat b/tests/disas/winch/x64/i64_remu/zero_zero.wat
index 6665c1461b..eab91679ed 100644
--- a/tests/disas/winch/x64/i64_remu/zero_zero.wat
+++ b/tests/disas/winch/x64/i64_remu/zero_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/i64_rotl/16_const.wat b/tests/disas/winch/x64/i64_rotl/16_const.wat
index 096aa543b9..048e818a18 100644
--- a/tests/disas/winch/x64/i64_rotl/16_const.wat
+++ b/tests/disas/winch/x64/i64_rotl/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_rotl/8_const.wat b/tests/disas/winch/x64/i64_rotl/8_const.wat
index 7e6b7c1f1e..ab273ea660 100644
--- a/tests/disas/winch/x64/i64_rotl/8_const.wat
+++ b/tests/disas/winch/x64/i64_rotl/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_rotl/locals.wat b/tests/disas/winch/x64/i64_rotl/locals.wat
index 49f690091e..2fa1e1b1f0 100644
--- a/tests/disas/winch/x64/i64_rotl/locals.wat
+++ b/tests/disas/winch/x64/i64_rotl/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/i64_rotl/params.wat b/tests/disas/winch/x64/i64_rotl/params.wat
index da7f88809b..297410732d 100644
--- a/tests/disas/winch/x64/i64_rotl/params.wat
+++ b/tests/disas/winch/x64/i64_rotl/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64_rotr/16_const.wat b/tests/disas/winch/x64/i64_rotr/16_const.wat
index 781eaed4ff..74206ba7ca 100644
--- a/tests/disas/winch/x64/i64_rotr/16_const.wat
+++ b/tests/disas/winch/x64/i64_rotr/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_rotr/8_const.wat b/tests/disas/winch/x64/i64_rotr/8_const.wat
index 1aa204f1fb..5fdcb0f84a 100644
--- a/tests/disas/winch/x64/i64_rotr/8_const.wat
+++ b/tests/disas/winch/x64/i64_rotr/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_rotr/locals.wat b/tests/disas/winch/x64/i64_rotr/locals.wat
index c0fb77bc01..20198c7fd0 100644
--- a/tests/disas/winch/x64/i64_rotr/locals.wat
+++ b/tests/disas/winch/x64/i64_rotr/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/i64_rotr/params.wat b/tests/disas/winch/x64/i64_rotr/params.wat
index 24828193f6..807a107e1b 100644
--- a/tests/disas/winch/x64/i64_rotr/params.wat
+++ b/tests/disas/winch/x64/i64_rotr/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64_shl/16_const.wat b/tests/disas/winch/x64/i64_shl/16_const.wat
index 3b27223143..f63abc23b1 100644
--- a/tests/disas/winch/x64/i64_shl/16_const.wat
+++ b/tests/disas/winch/x64/i64_shl/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_shl/8_const.wat b/tests/disas/winch/x64/i64_shl/8_const.wat
index a04e5e908b..529ae5d6d9 100644
--- a/tests/disas/winch/x64/i64_shl/8_const.wat
+++ b/tests/disas/winch/x64/i64_shl/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_shl/locals.wat b/tests/disas/winch/x64/i64_shl/locals.wat
index 2ee569c65e..6cc85ce6fd 100644
--- a/tests/disas/winch/x64/i64_shl/locals.wat
+++ b/tests/disas/winch/x64/i64_shl/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/i64_shl/params.wat b/tests/disas/winch/x64/i64_shl/params.wat
index fc5cd2e00e..d3a5daa21d 100644
--- a/tests/disas/winch/x64/i64_shl/params.wat
+++ b/tests/disas/winch/x64/i64_shl/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64_shr_s/16_const.wat b/tests/disas/winch/x64/i64_shr_s/16_const.wat
index 08e00ef07b..8f1471a145 100644
--- a/tests/disas/winch/x64/i64_shr_s/16_const.wat
+++ b/tests/disas/winch/x64/i64_shr_s/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_shr_s/8_const.wat b/tests/disas/winch/x64/i64_shr_s/8_const.wat
index 48010b64f3..691677552f 100644
--- a/tests/disas/winch/x64/i64_shr_s/8_const.wat
+++ b/tests/disas/winch/x64/i64_shr_s/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_shr_s/locals.wat b/tests/disas/winch/x64/i64_shr_s/locals.wat
index fc0a817124..fe1951c237 100644
--- a/tests/disas/winch/x64/i64_shr_s/locals.wat
+++ b/tests/disas/winch/x64/i64_shr_s/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/i64_shr_s/params.wat b/tests/disas/winch/x64/i64_shr_s/params.wat
index 68adf90b26..5d48228720 100644
--- a/tests/disas/winch/x64/i64_shr_s/params.wat
+++ b/tests/disas/winch/x64/i64_shr_s/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64_shr_u/16_const.wat b/tests/disas/winch/x64/i64_shr_u/16_const.wat
index 8e651946b4..afc7602b84 100644
--- a/tests/disas/winch/x64/i64_shr_u/16_const.wat
+++ b/tests/disas/winch/x64/i64_shr_u/16_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_shr_u/8_const.wat b/tests/disas/winch/x64/i64_shr_u/8_const.wat
index 72f69696b7..bb04a4b2c2 100644
--- a/tests/disas/winch/x64/i64_shr_u/8_const.wat
+++ b/tests/disas/winch/x64/i64_shr_u/8_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64_shr_u/locals.wat b/tests/disas/winch/x64/i64_shr_u/locals.wat
index c00905d956..04547ee620 100644
--- a/tests/disas/winch/x64/i64_shr_u/locals.wat
+++ b/tests/disas/winch/x64/i64_shr_u/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/i64_shr_u/params.wat b/tests/disas/winch/x64/i64_shr_u/params.wat
index 3e185c7def..914fb19498 100644
--- a/tests/disas/winch/x64/i64_shr_u/params.wat
+++ b/tests/disas/winch/x64/i64_shr_u/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64_sub/const.wat b/tests/disas/winch/x64/i64_sub/const.wat
index 1ae65d7d64..e98556642f 100644
--- a/tests/disas/winch/x64/i64_sub/const.wat
+++ b/tests/disas/winch/x64/i64_sub/const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_sub/locals.wat b/tests/disas/winch/x64/i64_sub/locals.wat
index 5c0a02b164..bae58f1cc0 100644
--- a/tests/disas/winch/x64/i64_sub/locals.wat
+++ b/tests/disas/winch/x64/i64_sub/locals.wat
@@ -21,7 +21,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i64_sub/max.wat b/tests/disas/winch/x64/i64_sub/max.wat
index e31d52fad1..e9fb9ecc61 100644
--- a/tests/disas/winch/x64/i64_sub/max.wat
+++ b/tests/disas/winch/x64/i64_sub/max.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_sub/max_one.wat b/tests/disas/winch/x64/i64_sub/max_one.wat
index c8e8d7af6f..07ff8b53cc 100644
--- a/tests/disas/winch/x64/i64_sub/max_one.wat
+++ b/tests/disas/winch/x64/i64_sub/max_one.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/i64_sub/mixed.wat b/tests/disas/winch/x64/i64_sub/mixed.wat
index 4e91549efb..48ff37666a 100644
--- a/tests/disas/winch/x64/i64_sub/mixed.wat
+++ b/tests/disas/winch/x64/i64_sub/mixed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i64_sub/params.wat b/tests/disas/winch/x64/i64_sub/params.wat
index f255eb2dd5..216b18556c 100644
--- a/tests/disas/winch/x64/i64_sub/params.wat
+++ b/tests/disas/winch/x64/i64_sub/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64_sub/signed.wat b/tests/disas/winch/x64/i64_sub/signed.wat
index ca7138c9e3..0fb4d459ff 100644
--- a/tests/disas/winch/x64/i64_sub/signed.wat
+++ b/tests/disas/winch/x64/i64_sub/signed.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i64_sub/unsigned_with_zero.wat b/tests/disas/winch/x64/i64_sub/unsigned_with_zero.wat
index 303d3ffe6d..f52fefcf2d 100644
--- a/tests/disas/winch/x64/i64_sub/unsigned_with_zero.wat
+++ b/tests/disas/winch/x64/i64_sub/unsigned_with_zero.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_trunc_f32_s/const.wat b/tests/disas/winch/x64/i64_trunc_f32_s/const.wat
index dcc1ccac15..e1bcccba3b 100644
--- a/tests/disas/winch/x64/i64_trunc_f32_s/const.wat
+++ b/tests/disas/winch/x64/i64_trunc_f32_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7c
diff --git a/tests/disas/winch/x64/i64_trunc_f32_s/locals.wat b/tests/disas/winch/x64/i64_trunc_f32_s/locals.wat
index 6aadd970f5..b695bafc68 100644
--- a/tests/disas/winch/x64/i64_trunc_f32_s/locals.wat
+++ b/tests/disas/winch/x64/i64_trunc_f32_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x84
diff --git a/tests/disas/winch/x64/i64_trunc_f32_s/params.wat b/tests/disas/winch/x64/i64_trunc_f32_s/params.wat
index 5b5cca6041..2ee810c5f3 100644
--- a/tests/disas/winch/x64/i64_trunc_f32_s/params.wat
+++ b/tests/disas/winch/x64/i64_trunc_f32_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x81
diff --git a/tests/disas/winch/x64/i64_trunc_f32_u/const.wat b/tests/disas/winch/x64/i64_trunc_f32_u/const.wat
index 41e10d0357..c9c5c416b3 100644
--- a/tests/disas/winch/x64/i64_trunc_f32_u/const.wat
+++ b/tests/disas/winch/x64/i64_trunc_f32_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x90
diff --git a/tests/disas/winch/x64/i64_trunc_f32_u/locals.wat b/tests/disas/winch/x64/i64_trunc_f32_u/locals.wat
index 618152b051..3a1edf2502 100644
--- a/tests/disas/winch/x64/i64_trunc_f32_u/locals.wat
+++ b/tests/disas/winch/x64/i64_trunc_f32_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x98
diff --git a/tests/disas/winch/x64/i64_trunc_f32_u/params.wat b/tests/disas/winch/x64/i64_trunc_f32_u/params.wat
index 9ed757980b..65a2d29a2f 100644
--- a/tests/disas/winch/x64/i64_trunc_f32_u/params.wat
+++ b/tests/disas/winch/x64/i64_trunc_f32_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x95
diff --git a/tests/disas/winch/x64/i64_trunc_f64_s/const.wat b/tests/disas/winch/x64/i64_trunc_f64_s/const.wat
index 6088bfed70..931d56f31a 100644
--- a/tests/disas/winch/x64/i64_trunc_f64_s/const.wat
+++ b/tests/disas/winch/x64/i64_trunc_f64_s/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x83
diff --git a/tests/disas/winch/x64/i64_trunc_f64_s/locals.wat b/tests/disas/winch/x64/i64_trunc_f64_s/locals.wat
index 0eafddedfd..152240d61b 100644
--- a/tests/disas/winch/x64/i64_trunc_f64_s/locals.wat
+++ b/tests/disas/winch/x64/i64_trunc_f64_s/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x8b
diff --git a/tests/disas/winch/x64/i64_trunc_f64_s/params.wat b/tests/disas/winch/x64/i64_trunc_f64_s/params.wat
index 855a48122d..1f02fb59bc 100644
--- a/tests/disas/winch/x64/i64_trunc_f64_s/params.wat
+++ b/tests/disas/winch/x64/i64_trunc_f64_s/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x88
diff --git a/tests/disas/winch/x64/i64_trunc_f64_u/const.wat b/tests/disas/winch/x64/i64_trunc_f64_u/const.wat
index 0dc63cfcee..fd8fd17de5 100644
--- a/tests/disas/winch/x64/i64_trunc_f64_u/const.wat
+++ b/tests/disas/winch/x64/i64_trunc_f64_u/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x95
diff --git a/tests/disas/winch/x64/i64_trunc_f64_u/locals.wat b/tests/disas/winch/x64/i64_trunc_f64_u/locals.wat
index 6dab089cef..f924bbdc01 100644
--- a/tests/disas/winch/x64/i64_trunc_f64_u/locals.wat
+++ b/tests/disas/winch/x64/i64_trunc_f64_u/locals.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x9d
diff --git a/tests/disas/winch/x64/i64_trunc_f64_u/params.wat b/tests/disas/winch/x64/i64_trunc_f64_u/params.wat
index 6d16fe0e4b..03c4c2f91b 100644
--- a/tests/disas/winch/x64/i64_trunc_f64_u/params.wat
+++ b/tests/disas/winch/x64/i64_trunc_f64_u/params.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x9a
diff --git a/tests/disas/winch/x64/i64_xor/32_const.wat b/tests/disas/winch/x64/i64_xor/32_const.wat
index 5f8ad62c9a..3c31a18ffd 100644
--- a/tests/disas/winch/x64/i64_xor/32_const.wat
+++ b/tests/disas/winch/x64/i64_xor/32_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/i64_xor/64_const.wat b/tests/disas/winch/x64/i64_xor/64_const.wat
index 82996618f9..d66523564a 100644
--- a/tests/disas/winch/x64/i64_xor/64_const.wat
+++ b/tests/disas/winch/x64/i64_xor/64_const.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i64_xor/locals.wat b/tests/disas/winch/x64/i64_xor/locals.wat
index e7bb553681..c3ca50d871 100644
--- a/tests/disas/winch/x64/i64_xor/locals.wat
+++ b/tests/disas/winch/x64/i64_xor/locals.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i64_xor/params.wat b/tests/disas/winch/x64/i64_xor/params.wat
index dc416b0bd5..98871f2fda 100644
--- a/tests/disas/winch/x64/i64_xor/params.wat
+++ b/tests/disas/winch/x64/i64_xor/params.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64x2/add/add.wat b/tests/disas/winch/x64/i64x2/add/add.wat
index 23e8463728..984165e998 100644
--- a/tests/disas/winch/x64/i64x2/add/add.wat
+++ b/tests/disas/winch/x64/i64x2/add/add.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64x2/extmul/high_s.wat b/tests/disas/winch/x64/i64x2/extmul/high_s.wat
index b530e4e840..2fa08a87e6 100644
--- a/tests/disas/winch/x64/i64x2/extmul/high_s.wat
+++ b/tests/disas/winch/x64/i64x2/extmul/high_s.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x8c
diff --git a/tests/disas/winch/x64/i64x2/extmul/high_u.wat b/tests/disas/winch/x64/i64x2/extmul/high_u.wat
index 9a1d5fa766..52197868d6 100644
--- a/tests/disas/winch/x64/i64x2/extmul/high_u.wat
+++ b/tests/disas/winch/x64/i64x2/extmul/high_u.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x8c
diff --git a/tests/disas/winch/x64/i64x2/extmul/low_s.wat b/tests/disas/winch/x64/i64x2/extmul/low_s.wat
index 8fd96bcf96..fa647d8580 100644
--- a/tests/disas/winch/x64/i64x2/extmul/low_s.wat
+++ b/tests/disas/winch/x64/i64x2/extmul/low_s.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/i64x2/extmul/low_u.wat b/tests/disas/winch/x64/i64x2/extmul/low_u.wat
index 3b448d90c3..3a72ea0838 100644
--- a/tests/disas/winch/x64/i64x2/extmul/low_u.wat
+++ b/tests/disas/winch/x64/i64x2/extmul/low_u.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x82
diff --git a/tests/disas/winch/x64/i64x2/extract_lane/const.wat b/tests/disas/winch/x64/i64x2/extract_lane/const.wat
index 6b93d1e7dc..1c2d05c324 100644
--- a/tests/disas/winch/x64/i64x2/extract_lane/const.wat
+++ b/tests/disas/winch/x64/i64x2/extract_lane/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i64x2/mul/mul.wat b/tests/disas/winch/x64/i64x2/mul/mul.wat
index 1d11da252e..f89344034d 100644
--- a/tests/disas/winch/x64/i64x2/mul/mul.wat
+++ b/tests/disas/winch/x64/i64x2/mul/mul.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i64x2/mul/mul_fallback.wat b/tests/disas/winch/x64/i64x2/mul/mul_fallback.wat
index 9fcc30ae97..ea83816220 100644
--- a/tests/disas/winch/x64/i64x2/mul/mul_fallback.wat
+++ b/tests/disas/winch/x64/i64x2/mul/mul_fallback.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/i64x2/neg/neg.wat b/tests/disas/winch/x64/i64x2/neg/neg.wat
index 5acd419c31..42117bc8bd 100644
--- a/tests/disas/winch/x64/i64x2/neg/neg.wat
+++ b/tests/disas/winch/x64/i64x2/neg/neg.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i64x2/replace_lane/const_avx.wat b/tests/disas/winch/x64/i64x2/replace_lane/const_avx.wat
index a9b181de50..18f326053f 100644
--- a/tests/disas/winch/x64/i64x2/replace_lane/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2/replace_lane/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i64x2/replace_lane/param_avx.wat b/tests/disas/winch/x64/i64x2/replace_lane/param_avx.wat
index 3facc25a8b..2f5c4f3295 100644
--- a/tests/disas/winch/x64/i64x2/replace_lane/param_avx.wat
+++ b/tests/disas/winch/x64/i64x2/replace_lane/param_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64x2/shift/shl.wat b/tests/disas/winch/x64/i64x2/shift/shl.wat
index 3a900ce6c6..3d0eeea216 100644
--- a/tests/disas/winch/x64/i64x2/shift/shl.wat
+++ b/tests/disas/winch/x64/i64x2/shift/shl.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i64x2/shift/shr_s.wat b/tests/disas/winch/x64/i64x2/shift/shr_s.wat
index c5ea11318c..41a2995fb3 100644
--- a/tests/disas/winch/x64/i64x2/shift/shr_s.wat
+++ b/tests/disas/winch/x64/i64x2/shift/shr_s.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x68
diff --git a/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_float_local.wat b/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_float_local.wat
index 22bba722da..f41c490870 100644
--- a/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_float_local.wat
+++ b/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_float_local.wat
@@ -45,7 +45,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x98, %r11
;; cmpq %rsp, %r11
;; ja 0x2c2
diff --git a/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_int_local.wat b/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_int_local.wat
index 676bce8247..ddd4acfd0f 100644
--- a/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_int_local.wat
+++ b/tests/disas/winch/x64/i64x2/shift/shr_s_all_fprs_int_local.wat
@@ -45,7 +45,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x98, %r11
;; cmpq %rsp, %r11
;; ja 0x2b4
diff --git a/tests/disas/winch/x64/i64x2/shift/shr_u.wat b/tests/disas/winch/x64/i64x2/shift/shr_u.wat
index 605fcace37..b36a181ff4 100644
--- a/tests/disas/winch/x64/i64x2/shift/shr_u.wat
+++ b/tests/disas/winch/x64/i64x2/shift/shr_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/i64x2/splat/const_avx.wat b/tests/disas/winch/x64/i64x2/splat/const_avx.wat
index f2b982275b..6a13027f27 100644
--- a/tests/disas/winch/x64/i64x2/splat/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2/splat/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i64x2/splat/param_avx.wat b/tests/disas/winch/x64/i64x2/splat/param_avx.wat
index 1102b60434..2a95f7bc1a 100644
--- a/tests/disas/winch/x64/i64x2/splat/param_avx.wat
+++ b/tests/disas/winch/x64/i64x2/splat/param_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/i64x2/sub/sub.wat b/tests/disas/winch/x64/i64x2/sub/sub.wat
index fa2b825dde..ca8d8b9fee 100644
--- a/tests/disas/winch/x64/i64x2/sub/sub.wat
+++ b/tests/disas/winch/x64/i64x2/sub/sub.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4e
diff --git a/tests/disas/winch/x64/i64x2_abs/const_avx.wat b/tests/disas/winch/x64/i64x2_abs/const_avx.wat
index 965fc13232..49fbb47f07 100644
--- a/tests/disas/winch/x64/i64x2_abs/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_abs/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i64x2_all_true/const_avx.wat b/tests/disas/winch/x64/i64x2_all_true/const_avx.wat
index f45a00bd55..b6f672b937 100644
--- a/tests/disas/winch/x64/i64x2_all_true/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_all_true/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i64x2_bitmask/const_avx.wat b/tests/disas/winch/x64/i64x2_bitmask/const_avx.wat
index c672279a79..2310817f27 100644
--- a/tests/disas/winch/x64/i64x2_bitmask/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_bitmask/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i64x2_eq/const.wat b/tests/disas/winch/x64/i64x2_eq/const.wat
index d83f420e01..a5e08623f5 100644
--- a/tests/disas/winch/x64/i64x2_eq/const.wat
+++ b/tests/disas/winch/x64/i64x2_eq/const.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64x2_extend_high_i32x4_s/const_avx.wat b/tests/disas/winch/x64/i64x2_extend_high_i32x4_s/const_avx.wat
index b2b885f486..196b208f23 100644
--- a/tests/disas/winch/x64/i64x2_extend_high_i32x4_s/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_extend_high_i32x4_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i64x2_extend_high_i32x4_u/const_avx.wat b/tests/disas/winch/x64/i64x2_extend_high_i32x4_u/const_avx.wat
index f94991f15b..1b1c57862b 100644
--- a/tests/disas/winch/x64/i64x2_extend_high_i32x4_u/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_extend_high_i32x4_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i64x2_extend_low_i32x4_s/const_avx.wat b/tests/disas/winch/x64/i64x2_extend_low_i32x4_s/const_avx.wat
index b8889f7b1b..fee6f0a1a9 100644
--- a/tests/disas/winch/x64/i64x2_extend_low_i32x4_s/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_extend_low_i32x4_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i64x2_extend_low_i32x4_u/const_avx.wat b/tests/disas/winch/x64/i64x2_extend_low_i32x4_u/const_avx.wat
index 247a27be7b..887843e43d 100644
--- a/tests/disas/winch/x64/i64x2_extend_low_i32x4_u/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_extend_low_i32x4_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i64x2_ge_s/const_avx.wat b/tests/disas/winch/x64/i64x2_ge_s/const_avx.wat
index 597f710b44..9d862a7741 100644
--- a/tests/disas/winch/x64/i64x2_ge_s/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_ge_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i64x2_gt_s/const_avx.wat b/tests/disas/winch/x64/i64x2_gt_s/const_avx.wat
index 84c1448be3..e8538d0d1f 100644
--- a/tests/disas/winch/x64/i64x2_gt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_gt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64x2_le_s/const_avx.wat b/tests/disas/winch/x64/i64x2_le_s/const_avx.wat
index 134402acff..3443adfbf0 100644
--- a/tests/disas/winch/x64/i64x2_le_s/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_le_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i64x2_lt_s/const_avx.wat b/tests/disas/winch/x64/i64x2_lt_s/const_avx.wat
index c07dd99ab7..4383b12517 100644
--- a/tests/disas/winch/x64/i64x2_lt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_lt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
diff --git a/tests/disas/winch/x64/i64x2_ne/const_avx.wat b/tests/disas/winch/x64/i64x2_ne/const_avx.wat
index bdccac57aa..754af59b35 100644
--- a/tests/disas/winch/x64/i64x2_ne/const_avx.wat
+++ b/tests/disas/winch/x64/i64x2_ne/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/i8x16/add/add.wat b/tests/disas/winch/x64/i8x16/add/add.wat
index a185a8e27d..0710708c5f 100644
--- a/tests/disas/winch/x64/i8x16/add/add.wat
+++ b/tests/disas/winch/x64/i8x16/add/add.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16/add/add_sat_s.wat b/tests/disas/winch/x64/i8x16/add/add_sat_s.wat
index 38994c1448..60f81e8291 100644
--- a/tests/disas/winch/x64/i8x16/add/add_sat_s.wat
+++ b/tests/disas/winch/x64/i8x16/add/add_sat_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16/add/add_sat_u.wat b/tests/disas/winch/x64/i8x16/add/add_sat_u.wat
index db99a42255..9215e5043f 100644
--- a/tests/disas/winch/x64/i8x16/add/add_sat_u.wat
+++ b/tests/disas/winch/x64/i8x16/add/add_sat_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16/extract_lane_s/const_avx.wat b/tests/disas/winch/x64/i8x16/extract_lane_s/const_avx.wat
index 4d082e6e61..e37c96bfec 100644
--- a/tests/disas/winch/x64/i8x16/extract_lane_s/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16/extract_lane_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i8x16/extract_lane_u/const_avx.wat b/tests/disas/winch/x64/i8x16/extract_lane_u/const_avx.wat
index 720542b67a..442d7317e5 100644
--- a/tests/disas/winch/x64/i8x16/extract_lane_u/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16/extract_lane_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/i8x16/max/max_s.wat b/tests/disas/winch/x64/i8x16/max/max_s.wat
index af292b68d1..81b4390002 100644
--- a/tests/disas/winch/x64/i8x16/max/max_s.wat
+++ b/tests/disas/winch/x64/i8x16/max/max_s.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i8x16/max/max_u.wat b/tests/disas/winch/x64/i8x16/max/max_u.wat
index 277914055a..b0e2ae713c 100644
--- a/tests/disas/winch/x64/i8x16/max/max_u.wat
+++ b/tests/disas/winch/x64/i8x16/max/max_u.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i8x16/min/min_s.wat b/tests/disas/winch/x64/i8x16/min/min_s.wat
index 2dc0d9be89..7d54919fc7 100644
--- a/tests/disas/winch/x64/i8x16/min/min_s.wat
+++ b/tests/disas/winch/x64/i8x16/min/min_s.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i8x16/min/min_u.wat b/tests/disas/winch/x64/i8x16/min/min_u.wat
index 749d507d86..81fc5eb5f0 100644
--- a/tests/disas/winch/x64/i8x16/min/min_u.wat
+++ b/tests/disas/winch/x64/i8x16/min/min_u.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i8x16/neg/neg.wat b/tests/disas/winch/x64/i8x16/neg/neg.wat
index c21b07eefb..f64cb3007a 100644
--- a/tests/disas/winch/x64/i8x16/neg/neg.wat
+++ b/tests/disas/winch/x64/i8x16/neg/neg.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/i8x16/replace_lane/const_avx.wat b/tests/disas/winch/x64/i8x16/replace_lane/const_avx.wat
index b666b82c0b..25f7a63ac2 100644
--- a/tests/disas/winch/x64/i8x16/replace_lane/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16/replace_lane/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i8x16/replace_lane/param_avx.wat b/tests/disas/winch/x64/i8x16/replace_lane/param_avx.wat
index c5c920000a..5d13beb9f9 100644
--- a/tests/disas/winch/x64/i8x16/replace_lane/param_avx.wat
+++ b/tests/disas/winch/x64/i8x16/replace_lane/param_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/i8x16/shift/shl.wat b/tests/disas/winch/x64/i8x16/shift/shl.wat
index b15d4efe2d..6476cbe16c 100644
--- a/tests/disas/winch/x64/i8x16/shift/shl.wat
+++ b/tests/disas/winch/x64/i8x16/shift/shl.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i8x16/shift/shr_s.wat b/tests/disas/winch/x64/i8x16/shift/shr_s.wat
index 45f5a72049..ae6691db9a 100644
--- a/tests/disas/winch/x64/i8x16/shift/shr_s.wat
+++ b/tests/disas/winch/x64/i8x16/shift/shr_s.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x69
diff --git a/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_float_local.wat b/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_float_local.wat
index ea54587c34..b0cd184458 100644
--- a/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_float_local.wat
+++ b/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_float_local.wat
@@ -45,7 +45,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x98, %r11
;; cmpq %rsp, %r11
;; ja 0x2c5
diff --git a/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_int_local.wat b/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_int_local.wat
index 040b8dad3e..ca7e38ceb5 100644
--- a/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_int_local.wat
+++ b/tests/disas/winch/x64/i8x16/shift/shr_s_all_fprs_int_local.wat
@@ -45,7 +45,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x98, %r11
;; cmpq %rsp, %r11
;; ja 0x2b7
diff --git a/tests/disas/winch/x64/i8x16/shift/shr_u.wat b/tests/disas/winch/x64/i8x16/shift/shr_u.wat
index 73999122fb..d85dbb31cf 100644
--- a/tests/disas/winch/x64/i8x16/shift/shr_u.wat
+++ b/tests/disas/winch/x64/i8x16/shift/shr_u.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/i8x16/shuffle/const_avx.wat b/tests/disas/winch/x64/i8x16/shuffle/const_avx.wat
index 8d74e84735..6411b17996 100644
--- a/tests/disas/winch/x64/i8x16/shuffle/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16/shuffle/const_avx.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x63
diff --git a/tests/disas/winch/x64/i8x16/splat/const_avx2.wat b/tests/disas/winch/x64/i8x16/splat/const_avx2.wat
index 519a9bff18..99453f6936 100644
--- a/tests/disas/winch/x64/i8x16/splat/const_avx2.wat
+++ b/tests/disas/winch/x64/i8x16/splat/const_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x41
diff --git a/tests/disas/winch/x64/i8x16/splat/param_avx2.wat b/tests/disas/winch/x64/i8x16/splat/param_avx2.wat
index 0355cae1b9..1fe18b7e51 100644
--- a/tests/disas/winch/x64/i8x16/splat/param_avx2.wat
+++ b/tests/disas/winch/x64/i8x16/splat/param_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/i8x16/sub/sub.wat b/tests/disas/winch/x64/i8x16/sub/sub.wat
index 07f7f381ab..2a3abcddf4 100644
--- a/tests/disas/winch/x64/i8x16/sub/sub.wat
+++ b/tests/disas/winch/x64/i8x16/sub/sub.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16/sub/sub_sat_s.wat b/tests/disas/winch/x64/i8x16/sub/sub_sat_s.wat
index c30df0cdbf..e2e7cd230b 100644
--- a/tests/disas/winch/x64/i8x16/sub/sub_sat_s.wat
+++ b/tests/disas/winch/x64/i8x16/sub/sub_sat_s.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16/sub/sub_sat_u.wat b/tests/disas/winch/x64/i8x16/sub/sub_sat_u.wat
index 16be56c0a1..c92f87ea51 100644
--- a/tests/disas/winch/x64/i8x16/sub/sub_sat_u.wat
+++ b/tests/disas/winch/x64/i8x16/sub/sub_sat_u.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16/swizzle/const_avx.wat b/tests/disas/winch/x64/i8x16/swizzle/const_avx.wat
index cdbb1ba16b..5bd4baeb2a 100644
--- a/tests/disas/winch/x64/i8x16/swizzle/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16/swizzle/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x59
diff --git a/tests/disas/winch/x64/i8x16_abs/const_avx.wat b/tests/disas/winch/x64/i8x16_abs/const_avx.wat
index 78063e7eab..4e9da3ca12 100644
--- a/tests/disas/winch/x64/i8x16_abs/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_abs/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/i8x16_all_true/const_avx.wat b/tests/disas/winch/x64/i8x16_all_true/const_avx.wat
index dec1e7af57..67be65b732 100644
--- a/tests/disas/winch/x64/i8x16_all_true/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_all_true/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
diff --git a/tests/disas/winch/x64/i8x16_avgr_u/const_avx.wat b/tests/disas/winch/x64/i8x16_avgr_u/const_avx.wat
index daabef4b94..4868d2e349 100644
--- a/tests/disas/winch/x64/i8x16_avgr_u/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_avgr_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16_bitmask/const_avx.wat b/tests/disas/winch/x64/i8x16_bitmask/const_avx.wat
index f52a7e087c..e1ad2ecd36 100644
--- a/tests/disas/winch/x64/i8x16_bitmask/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_bitmask/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x44
diff --git a/tests/disas/winch/x64/i8x16_eq/const_avx.wat b/tests/disas/winch/x64/i8x16_eq/const_avx.wat
index 77b60d5c9e..ebef0568dc 100644
--- a/tests/disas/winch/x64/i8x16_eq/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_eq/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16_ge_s/const_avx.wat b/tests/disas/winch/x64/i8x16_ge_s/const_avx.wat
index 30485e57b8..a46acc7e7e 100644
--- a/tests/disas/winch/x64/i8x16_ge_s/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_ge_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i8x16_ge_u/const_avx.wat b/tests/disas/winch/x64/i8x16_ge_u/const_avx.wat
index d6865d0b9c..fc349af3f6 100644
--- a/tests/disas/winch/x64/i8x16_ge_u/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_ge_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/i8x16_gt_s/const_avx.wat b/tests/disas/winch/x64/i8x16_gt_s/const_avx.wat
index 2c4319f14c..11267dcec3 100644
--- a/tests/disas/winch/x64/i8x16_gt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_gt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16_gt_u/const_avx.wat b/tests/disas/winch/x64/i8x16_gt_u/const_avx.wat
index f9ec4fa11c..cdd3f914ac 100644
--- a/tests/disas/winch/x64/i8x16_gt_u/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_gt_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5c
diff --git a/tests/disas/winch/x64/i8x16_le_s/const_avx.wat b/tests/disas/winch/x64/i8x16_le_s/const_avx.wat
index 345653bda4..2f77728c05 100644
--- a/tests/disas/winch/x64/i8x16_le_s/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_le_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/i8x16_le_u/const_avx.wat b/tests/disas/winch/x64/i8x16_le_u/const_avx.wat
index a33edf0cba..fa16cabf37 100644
--- a/tests/disas/winch/x64/i8x16_le_u/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_le_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/i8x16_lt_s/const_avx.wat b/tests/disas/winch/x64/i8x16_lt_s/const_avx.wat
index 25e5a2df8d..48f14e0ff1 100644
--- a/tests/disas/winch/x64/i8x16_lt_s/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_lt_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16_lt_u/const_avx.wat b/tests/disas/winch/x64/i8x16_lt_u/const_avx.wat
index 562a9b50ba..90aafd171f 100644
--- a/tests/disas/winch/x64/i8x16_lt_u/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_lt_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x5c
diff --git a/tests/disas/winch/x64/i8x16_narrow_i16x8_s/const_avx.wat b/tests/disas/winch/x64/i8x16_narrow_i16x8_s/const_avx.wat
index 3c0543d45f..445555a7ad 100644
--- a/tests/disas/winch/x64/i8x16_narrow_i16x8_s/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_narrow_i16x8_s/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16_narrow_i16x8_u/const_avx.wat b/tests/disas/winch/x64/i8x16_narrow_i16x8_u/const_avx.wat
index 50bad7aaf9..03fe106cc6 100644
--- a/tests/disas/winch/x64/i8x16_narrow_i16x8_u/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_narrow_i16x8_u/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/i8x16_ne/const_avx.wat b/tests/disas/winch/x64/i8x16_ne/const_avx.wat
index 0800b6b89c..02e91fa28f 100644
--- a/tests/disas/winch/x64/i8x16_ne/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_ne/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/i8x16_popcnt/const_avx.wat b/tests/disas/winch/x64/i8x16_popcnt/const_avx.wat
index 5031ae9c4c..f2060d7826 100644
--- a/tests/disas/winch/x64/i8x16_popcnt/const_avx.wat
+++ b/tests/disas/winch/x64/i8x16_popcnt/const_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x6c
diff --git a/tests/disas/winch/x64/i8x16_popcnt/multiple.wat b/tests/disas/winch/x64/i8x16_popcnt/multiple.wat
index 09769f7835..63c8787065 100644
--- a/tests/disas/winch/x64/i8x16_popcnt/multiple.wat
+++ b/tests/disas/winch/x64/i8x16_popcnt/multiple.wat
@@ -34,7 +34,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x8c, %r11
;; cmpq %rsp, %r11
;; ja 0x1c5
diff --git a/tests/disas/winch/x64/if/as_binop.wat b/tests/disas/winch/x64/if/as_binop.wat
index 443a77f301..7aaab86331 100644
--- a/tests/disas/winch/x64/if/as_binop.wat
+++ b/tests/disas/winch/x64/if/as_binop.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -37,7 +37,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x12c
diff --git a/tests/disas/winch/x64/if/as_br_if_last.wat b/tests/disas/winch/x64/if/as_br_if_last.wat
index 171db82d1a..c5d4431d85 100644
--- a/tests/disas/winch/x64/if/as_br_if_last.wat
+++ b/tests/disas/winch/x64/if/as_br_if_last.wat
@@ -19,7 +19,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -36,7 +36,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0xef
diff --git a/tests/disas/winch/x64/if/as_if_cond.wat b/tests/disas/winch/x64/if/as_if_cond.wat
index c5ead5c967..e80f9740a4 100644
--- a/tests/disas/winch/x64/if/as_if_cond.wat
+++ b/tests/disas/winch/x64/if/as_if_cond.wat
@@ -17,7 +17,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -34,7 +34,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xcf
diff --git a/tests/disas/winch/x64/if/as_testop.wat b/tests/disas/winch/x64/if/as_testop.wat
index 8448156ea9..aca192beef 100644
--- a/tests/disas/winch/x64/if/as_testop.wat
+++ b/tests/disas/winch/x64/if/as_testop.wat
@@ -15,7 +15,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -32,7 +32,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xc3
diff --git a/tests/disas/winch/x64/if/break_value.wat b/tests/disas/winch/x64/if/break_value.wat
index 2ccf0c2f22..86b51e73e5 100644
--- a/tests/disas/winch/x64/if/break_value.wat
+++ b/tests/disas/winch/x64/if/break_value.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/if/nested.wat b/tests/disas/winch/x64/if/nested.wat
index b0156c11ad..6262f768c2 100644
--- a/tests/disas/winch/x64/if/nested.wat
+++ b/tests/disas/winch/x64/if/nested.wat
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -44,7 +44,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x182
diff --git a/tests/disas/winch/x64/if/reachability.wat b/tests/disas/winch/x64/if/reachability.wat
index ed404b7aee..de8b8c0946 100644
--- a/tests/disas/winch/x64/if/reachability.wat
+++ b/tests/disas/winch/x64/if/reachability.wat
@@ -18,7 +18,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/if/singular.wat b/tests/disas/winch/x64/if/singular.wat
index c9a208d5d0..a46cab96f8 100644
--- a/tests/disas/winch/x64/if/singular.wat
+++ b/tests/disas/winch/x64/if/singular.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xb0
diff --git a/tests/disas/winch/x64/load/f32.wat b/tests/disas/winch/x64/load/f32.wat
index aaac349a78..b8f518b9a7 100644
--- a/tests/disas/winch/x64/load/f32.wat
+++ b/tests/disas/winch/x64/load/f32.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/load/f64.wat b/tests/disas/winch/x64/load/f64.wat
index 39b3310a0d..175b91e048 100644
--- a/tests/disas/winch/x64/load/f64.wat
+++ b/tests/disas/winch/x64/load/f64.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/load/grow_load.wat b/tests/disas/winch/x64/load/grow_load.wat
index f3ed3d2d78..09b0702923 100644
--- a/tests/disas/winch/x64/load/grow_load.wat
+++ b/tests/disas/winch/x64/load/grow_load.wat
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x70, %r11
;; cmpq %rsp, %r11
;; ja 0x134
diff --git a/tests/disas/winch/x64/load/i32.wat b/tests/disas/winch/x64/load/i32.wat
index 9aa53ad2cf..437421af67 100644
--- a/tests/disas/winch/x64/load/i32.wat
+++ b/tests/disas/winch/x64/load/i32.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x46
diff --git a/tests/disas/winch/x64/load/i64.wat b/tests/disas/winch/x64/load/i64.wat
index c822e10662..510e9f3932 100644
--- a/tests/disas/winch/x64/load/i64.wat
+++ b/tests/disas/winch/x64/load/i64.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/load/v128.wat b/tests/disas/winch/x64/load/v128.wat
index cac9f05050..7bdfebed68 100644
--- a/tests/disas/winch/x64/load/v128.wat
+++ b/tests/disas/winch/x64/load/v128.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x48
diff --git a/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat b/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat
index 463e7a0f3b..a74f5160e0 100644
--- a/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat
+++ b/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat b/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat
index b187558864..40cb24794f 100644
--- a/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat b/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat
index c5c7e1652d..0ccb8a98ea 100644
--- a/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat b/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat
index dcfcce8dbb..00fa17aa47 100644
--- a/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat
+++ b/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load32_zero_avx.wat b/tests/disas/winch/x64/load/v128_load32_zero_avx.wat
index ce9c38dfc4..3591b14e3e 100644
--- a/tests/disas/winch/x64/load/v128_load32_zero_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load32_zero_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat
index bfa7387548..e01996df75 100644
--- a/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.wat
index 5b55d34585..d34f49b482 100644
--- a/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat
index c5c73c6294..911b0b0973 100644
--- a/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.wat
index 645a318e3f..ba0c46d8b5 100644
--- a/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x64
diff --git a/tests/disas/winch/x64/load/v128_load64_splat_avx.wat b/tests/disas/winch/x64/load/v128_load64_splat_avx.wat
index aa58527750..5c64a8da91 100644
--- a/tests/disas/winch/x64/load/v128_load64_splat_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load64_splat_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/load/v128_load64_zero_avx.wat b/tests/disas/winch/x64/load/v128_load64_zero_avx.wat
index ba32ddefce..2d555b2990 100644
--- a/tests/disas/winch/x64/load/v128_load64_zero_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load64_zero_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4c
diff --git a/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat b/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat
index 5cb3c16ab8..6ca90831c9 100644
--- a/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat
+++ b/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat b/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat
index 42ea45aa42..4df70e0ef0 100644
--- a/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat b/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat
index bd87f60534..7959ba3716 100644
--- a/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat
+++ b/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/local/latent.wat b/tests/disas/winch/x64/local/latent.wat
index 9185fa4da1..d4a3519be8 100644
--- a/tests/disas/winch/x64/local/latent.wat
+++ b/tests/disas/winch/x64/local/latent.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/local/materialized.wat b/tests/disas/winch/x64/local/materialized.wat
index 9417f19857..99e1a59e6a 100644
--- a/tests/disas/winch/x64/local/materialized.wat
+++ b/tests/disas/winch/x64/local/materialized.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x45
diff --git a/tests/disas/winch/x64/local/v128_multivalue.wat b/tests/disas/winch/x64/local/v128_multivalue.wat
index d348b0e622..2d48e08c69 100644
--- a/tests/disas/winch/x64/local/v128_multivalue.wat
+++ b/tests/disas/winch/x64/local/v128_multivalue.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x48, %r11
;; cmpq %rsp, %r11
;; ja 0x9d
diff --git a/tests/disas/winch/x64/loop/as_binary_operand.wat b/tests/disas/winch/x64/loop/as_binary_operand.wat
index e7f2b6c011..1788ec16e9 100644
--- a/tests/disas/winch/x64/loop/as_binary_operand.wat
+++ b/tests/disas/winch/x64/loop/as_binary_operand.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xa3
diff --git a/tests/disas/winch/x64/loop/as_br_if_first.wat b/tests/disas/winch/x64/loop/as_br_if_first.wat
index 7488fb4bea..7692c10dbe 100644
--- a/tests/disas/winch/x64/loop/as_br_if_first.wat
+++ b/tests/disas/winch/x64/loop/as_br_if_first.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/loop/as_br_if_last.wat b/tests/disas/winch/x64/loop/as_br_if_last.wat
index 49759d00a2..ab7bc581b0 100644
--- a/tests/disas/winch/x64/loop/as_br_if_last.wat
+++ b/tests/disas/winch/x64/loop/as_br_if_last.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4a
diff --git a/tests/disas/winch/x64/loop/as_br_value.wat b/tests/disas/winch/x64/loop/as_br_value.wat
index 653a8cc45f..6f5a061a42 100644
--- a/tests/disas/winch/x64/loop/as_br_value.wat
+++ b/tests/disas/winch/x64/loop/as_br_value.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
diff --git a/tests/disas/winch/x64/loop/as_call_value.wat b/tests/disas/winch/x64/loop/as_call_value.wat
index 9f702ebe1b..80591e3f8e 100644
--- a/tests/disas/winch/x64/loop/as_call_value.wat
+++ b/tests/disas/winch/x64/loop/as_call_value.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x41
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x9d
diff --git a/tests/disas/winch/x64/loop/as_if_condition.wat b/tests/disas/winch/x64/loop/as_if_condition.wat
index 6369b2b714..2eba7483b1 100644
--- a/tests/disas/winch/x64/loop/as_if_condition.wat
+++ b/tests/disas/winch/x64/loop/as_if_condition.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x95
diff --git a/tests/disas/winch/x64/loop/as_if_else.wat b/tests/disas/winch/x64/loop/as_if_else.wat
index 2a6c3e6b94..8a78696938 100644
--- a/tests/disas/winch/x64/loop/as_if_else.wat
+++ b/tests/disas/winch/x64/loop/as_if_else.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/loop/as_if_then.wat b/tests/disas/winch/x64/loop/as_if_then.wat
index 0940d45700..7744c6b732 100644
--- a/tests/disas/winch/x64/loop/as_if_then.wat
+++ b/tests/disas/winch/x64/loop/as_if_then.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/loop/as_local_set_value.wat b/tests/disas/winch/x64/loop/as_local_set_value.wat
index e3941c97d4..a5b314cd78 100644
--- a/tests/disas/winch/x64/loop/as_local_set_value.wat
+++ b/tests/disas/winch/x64/loop/as_local_set_value.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4f
diff --git a/tests/disas/winch/x64/loop/as_test_operand.wat b/tests/disas/winch/x64/loop/as_test_operand.wat
index 179c7a8f94..61d743c116 100644
--- a/tests/disas/winch/x64/loop/as_test_operand.wat
+++ b/tests/disas/winch/x64/loop/as_test_operand.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x98
diff --git a/tests/disas/winch/x64/loop/as_unary_operand.wat b/tests/disas/winch/x64/loop/as_unary_operand.wat
index 8521fe27b7..847017e590 100644
--- a/tests/disas/winch/x64/loop/as_unary_operand.wat
+++ b/tests/disas/winch/x64/loop/as_unary_operand.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xa1
diff --git a/tests/disas/winch/x64/loop/break_inner.wat b/tests/disas/winch/x64/loop/break_inner.wat
index 38f7072b83..8baf553a61 100644
--- a/tests/disas/winch/x64/loop/break_inner.wat
+++ b/tests/disas/winch/x64/loop/break_inner.wat
@@ -16,7 +16,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x108
diff --git a/tests/disas/winch/x64/loop/cont_inner.wat b/tests/disas/winch/x64/loop/cont_inner.wat
index bf784cbb79..d60466c79c 100644
--- a/tests/disas/winch/x64/loop/cont_inner.wat
+++ b/tests/disas/winch/x64/loop/cont_inner.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/loop/deep.wat b/tests/disas/winch/x64/loop/deep.wat
index 79066ffa1d..2640d5149d 100644
--- a/tests/disas/winch/x64/loop/deep.wat
+++ b/tests/disas/winch/x64/loop/deep.wat
@@ -51,7 +51,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -68,7 +68,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/loop/effects.wat b/tests/disas/winch/x64/loop/effects.wat
index 401c8a8406..eadcbf71f2 100644
--- a/tests/disas/winch/x64/loop/effects.wat
+++ b/tests/disas/winch/x64/loop/effects.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x83
diff --git a/tests/disas/winch/x64/loop/empty.wat b/tests/disas/winch/x64/loop/empty.wat
index 23e175c0d9..dbf7734a1e 100644
--- a/tests/disas/winch/x64/loop/empty.wat
+++ b/tests/disas/winch/x64/loop/empty.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
diff --git a/tests/disas/winch/x64/loop/for.wat b/tests/disas/winch/x64/loop/for.wat
index 6baffee0ac..f441a7150e 100644
--- a/tests/disas/winch/x64/loop/for.wat
+++ b/tests/disas/winch/x64/loop/for.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0xa9
diff --git a/tests/disas/winch/x64/loop/multi.wat b/tests/disas/winch/x64/loop/multi.wat
index 93f5af2354..b80f98fa24 100644
--- a/tests/disas/winch/x64/loop/multi.wat
+++ b/tests/disas/winch/x64/loop/multi.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xed
diff --git a/tests/disas/winch/x64/loop/nested.wat b/tests/disas/winch/x64/loop/nested.wat
index 72f04f3289..2ce4084b60 100644
--- a/tests/disas/winch/x64/loop/nested.wat
+++ b/tests/disas/winch/x64/loop/nested.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x9d
diff --git a/tests/disas/winch/x64/loop/singular.wat b/tests/disas/winch/x64/loop/singular.wat
index 73f17a766a..c212754496 100644
--- a/tests/disas/winch/x64/loop/singular.wat
+++ b/tests/disas/winch/x64/loop/singular.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
diff --git a/tests/disas/winch/x64/loop/while.wat b/tests/disas/winch/x64/loop/while.wat
index 75ed881496..1d242ab7f7 100644
--- a/tests/disas/winch/x64/loop/while.wat
+++ b/tests/disas/winch/x64/loop/while.wat
@@ -19,7 +19,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x92
diff --git a/tests/disas/winch/x64/nop/nop.wat b/tests/disas/winch/x64/nop/nop.wat
index 661d14a80c..7e1c61f977 100644
--- a/tests/disas/winch/x64/nop/nop.wat
+++ b/tests/disas/winch/x64/nop/nop.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
diff --git a/tests/disas/winch/x64/return/as_block_first.wat b/tests/disas/winch/x64/return/as_block_first.wat
index ce7eceb311..8beda35529 100644
--- a/tests/disas/winch/x64/return/as_block_first.wat
+++ b/tests/disas/winch/x64/return/as_block_first.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/return/as_block_last.wat b/tests/disas/winch/x64/return/as_block_last.wat
index 76c2d24582..6a33af2eed 100644
--- a/tests/disas/winch/x64/return/as_block_last.wat
+++ b/tests/disas/winch/x64/return/as_block_last.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x88
diff --git a/tests/disas/winch/x64/return/as_block_mid.wat b/tests/disas/winch/x64/return/as_block_mid.wat
index ec8346b794..c4f2a909a5 100644
--- a/tests/disas/winch/x64/return/as_block_mid.wat
+++ b/tests/disas/winch/x64/return/as_block_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x88
diff --git a/tests/disas/winch/x64/return/as_block_value.wat b/tests/disas/winch/x64/return/as_block_value.wat
index 4546770d49..002a67a2cd 100644
--- a/tests/disas/winch/x64/return/as_block_value.wat
+++ b/tests/disas/winch/x64/return/as_block_value.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_br_if_cond.wat b/tests/disas/winch/x64/return/as_br_if_cond.wat
index 8b04d96cc9..b88ee661ca 100644
--- a/tests/disas/winch/x64/return/as_br_if_cond.wat
+++ b/tests/disas/winch/x64/return/as_br_if_cond.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/return/as_br_value.wat b/tests/disas/winch/x64/return/as_br_value.wat
index a5adb2427b..6d62d3483f 100644
--- a/tests/disas/winch/x64/return/as_br_value.wat
+++ b/tests/disas/winch/x64/return/as_br_value.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/return/as_call_fist.wat b/tests/disas/winch/x64/return/as_call_fist.wat
index 7c6bfa5aaa..96cc8edfe1 100644
--- a/tests/disas/winch/x64/return/as_call_fist.wat
+++ b/tests/disas/winch/x64/return/as_call_fist.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -32,7 +32,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_call_last.wat b/tests/disas/winch/x64/return/as_call_last.wat
index 911c6c7684..3233cb0989 100644
--- a/tests/disas/winch/x64/return/as_call_last.wat
+++ b/tests/disas/winch/x64/return/as_call_last.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -32,7 +32,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_call_mid.wat b/tests/disas/winch/x64/return/as_call_mid.wat
index d9b354a50a..cfd82420fd 100644
--- a/tests/disas/winch/x64/return/as_call_mid.wat
+++ b/tests/disas/winch/x64/return/as_call_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
@@ -32,7 +32,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_func_first.wat b/tests/disas/winch/x64/return/as_func_first.wat
index 5c7a7f638a..807ad91ff6 100644
--- a/tests/disas/winch/x64/return/as_func_first.wat
+++ b/tests/disas/winch/x64/return/as_func_first.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/return/as_func_last.wat b/tests/disas/winch/x64/return/as_func_last.wat
index 01ffd8616a..353eb3dbd9 100644
--- a/tests/disas/winch/x64/return/as_func_last.wat
+++ b/tests/disas/winch/x64/return/as_func_last.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
diff --git a/tests/disas/winch/x64/return/as_func_mid.wat b/tests/disas/winch/x64/return/as_func_mid.wat
index 18b2931da3..fd16144e4c 100644
--- a/tests/disas/winch/x64/return/as_func_mid.wat
+++ b/tests/disas/winch/x64/return/as_func_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_func_value.wat b/tests/disas/winch/x64/return/as_func_value.wat
index 6855425ad9..c8bf6a0343 100644
--- a/tests/disas/winch/x64/return/as_func_value.wat
+++ b/tests/disas/winch/x64/return/as_func_value.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_if_cond.wat b/tests/disas/winch/x64/return/as_if_cond.wat
index 2305ae926a..9a2a81f860 100644
--- a/tests/disas/winch/x64/return/as_if_cond.wat
+++ b/tests/disas/winch/x64/return/as_if_cond.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/return/as_if_else.wat b/tests/disas/winch/x64/return/as_if_else.wat
index 851a4538e3..6e30f729ef 100644
--- a/tests/disas/winch/x64/return/as_if_else.wat
+++ b/tests/disas/winch/x64/return/as_if_else.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x9b
diff --git a/tests/disas/winch/x64/return/as_if_then.wat b/tests/disas/winch/x64/return/as_if_then.wat
index 3013685d18..ecbb879039 100644
--- a/tests/disas/winch/x64/return/as_if_then.wat
+++ b/tests/disas/winch/x64/return/as_if_then.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x9b
diff --git a/tests/disas/winch/x64/return/as_loop_first.wat b/tests/disas/winch/x64/return/as_loop_first.wat
index 15dd710f0c..cceabfa3f5 100644
--- a/tests/disas/winch/x64/return/as_loop_first.wat
+++ b/tests/disas/winch/x64/return/as_loop_first.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/return/as_loop_last.wat b/tests/disas/winch/x64/return/as_loop_last.wat
index 74044c2ab2..0b191cdc6c 100644
--- a/tests/disas/winch/x64/return/as_loop_last.wat
+++ b/tests/disas/winch/x64/return/as_loop_last.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_loop_mid.wat b/tests/disas/winch/x64/return/as_loop_mid.wat
index b0fa9743c4..f000cf9eb8 100644
--- a/tests/disas/winch/x64/return/as_loop_mid.wat
+++ b/tests/disas/winch/x64/return/as_loop_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/return/as_return_value.wat b/tests/disas/winch/x64/return/as_return_value.wat
index 412df32d77..b165f4bfe5 100644
--- a/tests/disas/winch/x64/return/as_return_value.wat
+++ b/tests/disas/winch/x64/return/as_return_value.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/return/nullary.wat b/tests/disas/winch/x64/return/nullary.wat
index fc8cfba1c5..40cf3b740a 100644
--- a/tests/disas/winch/x64/return/nullary.wat
+++ b/tests/disas/winch/x64/return/nullary.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -26,7 +26,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x78
diff --git a/tests/disas/winch/x64/return/type_i32.wat b/tests/disas/winch/x64/return/type_i32.wat
index 8db6dde3db..3572aa404a 100644
--- a/tests/disas/winch/x64/return/type_i32.wat
+++ b/tests/disas/winch/x64/return/type_i32.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/return/type_i64_value.wat b/tests/disas/winch/x64/return/type_i64_value.wat
index 210e439600..17687fa938 100644
--- a/tests/disas/winch/x64/return/type_i64_value.wat
+++ b/tests/disas/winch/x64/return/type_i64_value.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
diff --git a/tests/disas/winch/x64/select/f32.wat b/tests/disas/winch/x64/select/f32.wat
index 7c36aae021..2b22404a38 100644
--- a/tests/disas/winch/x64/select/f32.wat
+++ b/tests/disas/winch/x64/select/f32.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/select/f64.wat b/tests/disas/winch/x64/select/f64.wat
index 6668601bad..e243beb476 100644
--- a/tests/disas/winch/x64/select/f64.wat
+++ b/tests/disas/winch/x64/select/f64.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x65
diff --git a/tests/disas/winch/x64/select/i32.wat b/tests/disas/winch/x64/select/i32.wat
index 6abef0a041..5b3188faaf 100644
--- a/tests/disas/winch/x64/select/i32.wat
+++ b/tests/disas/winch/x64/select/i32.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5a
diff --git a/tests/disas/winch/x64/select/i64.wat b/tests/disas/winch/x64/select/i64.wat
index 8fa36b5cb1..f40cedca48 100644
--- a/tests/disas/winch/x64/select/i64.wat
+++ b/tests/disas/winch/x64/select/i64.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/store/f32.wat b/tests/disas/winch/x64/store/f32.wat
index a88265df07..542b3f784a 100644
--- a/tests/disas/winch/x64/store/f32.wat
+++ b/tests/disas/winch/x64/store/f32.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/store/f64.wat b/tests/disas/winch/x64/store/f64.wat
index fdf2f5b5ab..e3c936e58b 100644
--- a/tests/disas/winch/x64/store/f64.wat
+++ b/tests/disas/winch/x64/store/f64.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/store/i32.wat b/tests/disas/winch/x64/store/i32.wat
index 212ec4bf4a..c27f5a08f6 100644
--- a/tests/disas/winch/x64/store/i32.wat
+++ b/tests/disas/winch/x64/store/i32.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4b
diff --git a/tests/disas/winch/x64/store/i64.wat b/tests/disas/winch/x64/store/i64.wat
index 73b0d035b6..b6b94abbaf 100644
--- a/tests/disas/winch/x64/store/i64.wat
+++ b/tests/disas/winch/x64/store/i64.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
diff --git a/tests/disas/winch/x64/store/oob.wat b/tests/disas/winch/x64/store/oob.wat
index 7d43257ee1..22ff78b52c 100644
--- a/tests/disas/winch/x64/store/oob.wat
+++ b/tests/disas/winch/x64/store/oob.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x86
diff --git a/tests/disas/winch/x64/store/v128.wat b/tests/disas/winch/x64/store/v128.wat
index 6fd72ece2b..665e81f482 100644
--- a/tests/disas/winch/x64/store/v128.wat
+++ b/tests/disas/winch/x64/store/v128.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/table/fill.wat b/tests/disas/winch/x64/table/fill.wat
index a58d41451a..b5b703fd3a 100644
--- a/tests/disas/winch/x64/table/fill.wat
+++ b/tests/disas/winch/x64/table/fill.wat
@@ -24,7 +24,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -41,7 +41,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x78
@@ -58,7 +58,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xb8
@@ -75,7 +75,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x40, %r11
;; cmpq %rsp, %r11
;; ja 0x1f9
diff --git a/tests/disas/winch/x64/table/get.wat b/tests/disas/winch/x64/table/get.wat
index 03febe2ed8..72fb93d290 100644
--- a/tests/disas/winch/x64/table/get.wat
+++ b/tests/disas/winch/x64/table/get.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x10d
diff --git a/tests/disas/winch/x64/table/grow.wat b/tests/disas/winch/x64/table/grow.wat
index a6dfa4e1a5..4d2d538c55 100644
--- a/tests/disas/winch/x64/table/grow.wat
+++ b/tests/disas/winch/x64/table/grow.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x76
diff --git a/tests/disas/winch/x64/table/init_copy_drop.wat b/tests/disas/winch/x64/table/init_copy_drop.wat
index 097277f5cf..fdbe15349b 100644
--- a/tests/disas/winch/x64/table/init_copy_drop.wat
+++ b/tests/disas/winch/x64/table/init_copy_drop.wat
@@ -38,7 +38,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3d
@@ -56,7 +56,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7d
@@ -74,7 +74,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xbd
@@ -92,7 +92,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xfd
@@ -110,7 +110,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x13d
@@ -128,7 +128,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x2b4
@@ -209,7 +209,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x3c5
diff --git a/tests/disas/winch/x64/table/set.wat b/tests/disas/winch/x64/table/set.wat
index 2ae1255aee..3f40480a5b 100644
--- a/tests/disas/winch/x64/table/set.wat
+++ b/tests/disas/winch/x64/table/set.wat
@@ -19,7 +19,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -36,7 +36,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0xbc
@@ -71,7 +71,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x1de
diff --git a/tests/disas/winch/x64/table/size.wat b/tests/disas/winch/x64/table/size.wat
index 4e97fe0832..85fc71dab9 100644
--- a/tests/disas/winch/x64/table/size.wat
+++ b/tests/disas/winch/x64/table/size.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3f
diff --git a/tests/disas/winch/x64/unreachable/as_block_broke.wat b/tests/disas/winch/x64/unreachable/as_block_broke.wat
index a8495ddab4..1b9ae63e70 100644
--- a/tests/disas/winch/x64/unreachable/as_block_broke.wat
+++ b/tests/disas/winch/x64/unreachable/as_block_broke.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/unreachable/as_block_first.wat b/tests/disas/winch/x64/unreachable/as_block_first.wat
index 20675b5164..ae9c2f4687 100644
--- a/tests/disas/winch/x64/unreachable/as_block_first.wat
+++ b/tests/disas/winch/x64/unreachable/as_block_first.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/as_block_last.wat b/tests/disas/winch/x64/unreachable/as_block_last.wat
index cb1e1bb990..ef61feaf1b 100644
--- a/tests/disas/winch/x64/unreachable/as_block_last.wat
+++ b/tests/disas/winch/x64/unreachable/as_block_last.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_block_mid.wat b/tests/disas/winch/x64/unreachable/as_block_mid.wat
index 33f7755174..4ebf285bae 100644
--- a/tests/disas/winch/x64/unreachable/as_block_mid.wat
+++ b/tests/disas/winch/x64/unreachable/as_block_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_block_value.wat b/tests/disas/winch/x64/unreachable/as_block_value.wat
index 0f40cdfb9f..d3c8cd33a5 100644
--- a/tests/disas/winch/x64/unreachable/as_block_value.wat
+++ b/tests/disas/winch/x64/unreachable/as_block_value.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_br_if_cond.wat b/tests/disas/winch/x64/unreachable/as_br_if_cond.wat
index 2b4c08f252..87433cada6 100644
--- a/tests/disas/winch/x64/unreachable/as_br_if_cond.wat
+++ b/tests/disas/winch/x64/unreachable/as_br_if_cond.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/as_br_value.wat b/tests/disas/winch/x64/unreachable/as_br_value.wat
index 34d4a97bb5..6424835941 100644
--- a/tests/disas/winch/x64/unreachable/as_br_value.wat
+++ b/tests/disas/winch/x64/unreachable/as_br_value.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/as_call_first.wat b/tests/disas/winch/x64/unreachable/as_call_first.wat
index 0a2a847c14..fac71ad4f7 100644
--- a/tests/disas/winch/x64/unreachable/as_call_first.wat
+++ b/tests/disas/winch/x64/unreachable/as_call_first.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x46
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_call_last.wat b/tests/disas/winch/x64/unreachable/as_call_last.wat
index a1b5799199..e7d9bb7394 100644
--- a/tests/disas/winch/x64/unreachable/as_call_last.wat
+++ b/tests/disas/winch/x64/unreachable/as_call_last.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x46
@@ -32,7 +32,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_call_mid.wat b/tests/disas/winch/x64/unreachable/as_call_mid.wat
index 31718dad6d..03dc9b9767 100644
--- a/tests/disas/winch/x64/unreachable/as_call_mid.wat
+++ b/tests/disas/winch/x64/unreachable/as_call_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x46
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_func_first.wat b/tests/disas/winch/x64/unreachable/as_func_first.wat
index f860976b0a..5264a4d07d 100644
--- a/tests/disas/winch/x64/unreachable/as_func_first.wat
+++ b/tests/disas/winch/x64/unreachable/as_func_first.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x7a
diff --git a/tests/disas/winch/x64/unreachable/as_func_last.wat b/tests/disas/winch/x64/unreachable/as_func_last.wat
index 48aa9b7b34..d601c6b857 100644
--- a/tests/disas/winch/x64/unreachable/as_func_last.wat
+++ b/tests/disas/winch/x64/unreachable/as_func_last.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -27,7 +27,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_func_mid.wat b/tests/disas/winch/x64/unreachable/as_func_mid.wat
index f3fca531c0..706c999cd3 100644
--- a/tests/disas/winch/x64/unreachable/as_func_mid.wat
+++ b/tests/disas/winch/x64/unreachable/as_func_mid.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_func_value.wat b/tests/disas/winch/x64/unreachable/as_func_value.wat
index a7910fe305..a2ec39a645 100644
--- a/tests/disas/winch/x64/unreachable/as_func_value.wat
+++ b/tests/disas/winch/x64/unreachable/as_func_value.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -28,7 +28,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_if_cond.wat b/tests/disas/winch/x64/unreachable/as_if_cond.wat
index 1993b1bf85..f87bf77345 100644
--- a/tests/disas/winch/x64/unreachable/as_if_cond.wat
+++ b/tests/disas/winch/x64/unreachable/as_if_cond.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/as_if_else.wat b/tests/disas/winch/x64/unreachable/as_if_else.wat
index 6607663ebd..ed30617563 100644
--- a/tests/disas/winch/x64/unreachable/as_if_else.wat
+++ b/tests/disas/winch/x64/unreachable/as_if_else.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/unreachable/as_if_then.wat b/tests/disas/winch/x64/unreachable/as_if_then.wat
index 020aef43ab..705802baf5 100644
--- a/tests/disas/winch/x64/unreachable/as_if_then.wat
+++ b/tests/disas/winch/x64/unreachable/as_if_then.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/unreachable/as_if_then_no_else.wat b/tests/disas/winch/x64/unreachable/as_if_then_no_else.wat
index b88d92d4b8..95dd7e0cdc 100644
--- a/tests/disas/winch/x64/unreachable/as_if_then_no_else.wat
+++ b/tests/disas/winch/x64/unreachable/as_if_then_no_else.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x53
diff --git a/tests/disas/winch/x64/unreachable/as_loop_broke.wat b/tests/disas/winch/x64/unreachable/as_loop_broke.wat
index 0805b0a8c1..0a93f94e4e 100644
--- a/tests/disas/winch/x64/unreachable/as_loop_broke.wat
+++ b/tests/disas/winch/x64/unreachable/as_loop_broke.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -30,7 +30,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8d
diff --git a/tests/disas/winch/x64/unreachable/as_loop_first.wat b/tests/disas/winch/x64/unreachable/as_loop_first.wat
index c64d45ff54..d414ec61d4 100644
--- a/tests/disas/winch/x64/unreachable/as_loop_first.wat
+++ b/tests/disas/winch/x64/unreachable/as_loop_first.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/as_loop_last.wat b/tests/disas/winch/x64/unreachable/as_loop_last.wat
index bf3dcc70ad..abffcabe87 100644
--- a/tests/disas/winch/x64/unreachable/as_loop_last.wat
+++ b/tests/disas/winch/x64/unreachable/as_loop_last.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_loop_mid.wat b/tests/disas/winch/x64/unreachable/as_loop_mid.wat
index b7f649b23d..9f8a05823d 100644
--- a/tests/disas/winch/x64/unreachable/as_loop_mid.wat
+++ b/tests/disas/winch/x64/unreachable/as_loop_mid.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x38
@@ -29,7 +29,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x8a
diff --git a/tests/disas/winch/x64/unreachable/as_return_value.wat b/tests/disas/winch/x64/unreachable/as_return_value.wat
index 865c3da597..e62c96dc3b 100644
--- a/tests/disas/winch/x64/unreachable/as_return_value.wat
+++ b/tests/disas/winch/x64/unreachable/as_return_value.wat
@@ -10,7 +10,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/type_i32.wat b/tests/disas/winch/x64/unreachable/type_i32.wat
index e688099406..e3cdc94917 100644
--- a/tests/disas/winch/x64/unreachable/type_i32.wat
+++ b/tests/disas/winch/x64/unreachable/type_i32.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/type_i64.wat b/tests/disas/winch/x64/unreachable/type_i64.wat
index cfb1c31407..1d35fcf64d 100644
--- a/tests/disas/winch/x64/unreachable/type_i64.wat
+++ b/tests/disas/winch/x64/unreachable/type_i64.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x3a
diff --git a/tests/disas/winch/x64/unreachable/with_spilled_local.wat b/tests/disas/winch/x64/unreachable/with_spilled_local.wat
index 35db137c9f..be14cd2bcc 100644
--- a/tests/disas/winch/x64/unreachable/with_spilled_local.wat
+++ b/tests/disas/winch/x64/unreachable/with_spilled_local.wat
@@ -14,7 +14,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x54
diff --git a/tests/disas/winch/x64/unreachable/with_spilled_local_in_if.wat b/tests/disas/winch/x64/unreachable/with_spilled_local_in_if.wat
index 724bebbf8d..d0e74bfb1c 100644
--- a/tests/disas/winch/x64/unreachable/with_spilled_local_in_if.wat
+++ b/tests/disas/winch/x64/unreachable/with_spilled_local_in_if.wat
@@ -19,7 +19,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x24, %r11
;; cmpq %rsp, %r11
;; ja 0x60
diff --git a/tests/disas/winch/x64/v128_const/call_id.wat b/tests/disas/winch/x64/v128_const/call_id.wat
index 42145bd3bd..01e2abe426 100644
--- a/tests/disas/winch/x64/v128_const/call_id.wat
+++ b/tests/disas/winch/x64/v128_const/call_id.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x43
@@ -31,7 +31,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xa0
diff --git a/tests/disas/winch/x64/v128_const/id.wat b/tests/disas/winch/x64/v128_const/id.wat
index 2b30af0fc4..93aa35c837 100644
--- a/tests/disas/winch/x64/v128_const/id.wat
+++ b/tests/disas/winch/x64/v128_const/id.wat
@@ -8,7 +8,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x43
diff --git a/tests/disas/winch/x64/v128_const/multivalue.wat b/tests/disas/winch/x64/v128_const/multivalue.wat
index 677da30e18..3902b4e272 100644
--- a/tests/disas/winch/x64/v128_const/multivalue.wat
+++ b/tests/disas/winch/x64/v128_const/multivalue.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rsi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x73
diff --git a/tests/disas/winch/x64/v128_const/spilled.wat b/tests/disas/winch/x64/v128_const/spilled.wat
index c4f3082432..e98a011352 100644
--- a/tests/disas/winch/x64/v128_const/spilled.wat
+++ b/tests/disas/winch/x64/v128_const/spilled.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x58
diff --git a/tests/disas/winch/x64/v128_mixed_sig.wat b/tests/disas/winch/x64/v128_mixed_sig.wat
index 69cadbb5c1..e389d8b7aa 100644
--- a/tests/disas/winch/x64/v128_mixed_sig.wat
+++ b/tests/disas/winch/x64/v128_mixed_sig.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x30, %r11
;; cmpq %rsp, %r11
;; ja 0x6d
diff --git a/tests/disas/winch/x64/v128_ops/and.wat b/tests/disas/winch/x64/v128_ops/and.wat
index 44b45c704d..fc89379a74 100644
--- a/tests/disas/winch/x64/v128_ops/and.wat
+++ b/tests/disas/winch/x64/v128_ops/and.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/v128_ops/andnot.wat b/tests/disas/winch/x64/v128_ops/andnot.wat
index b778c9c458..7399d792a7 100644
--- a/tests/disas/winch/x64/v128_ops/andnot.wat
+++ b/tests/disas/winch/x64/v128_ops/andnot.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/v128_ops/any_true.wat b/tests/disas/winch/x64/v128_ops/any_true.wat
index 9db2aa0f5f..24931796ab 100644
--- a/tests/disas/winch/x64/v128_ops/any_true.wat
+++ b/tests/disas/winch/x64/v128_ops/any_true.wat
@@ -11,7 +11,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x4d
diff --git a/tests/disas/winch/x64/v128_ops/bitselect.wat b/tests/disas/winch/x64/v128_ops/bitselect.wat
index e0f00a4298..980fa7aeda 100644
--- a/tests/disas/winch/x64/v128_ops/bitselect.wat
+++ b/tests/disas/winch/x64/v128_ops/bitselect.wat
@@ -13,7 +13,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x61
diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load16.wat b/tests/disas/winch/x64/v128_ops/load_lane/load16.wat
index 0377dff486..709de01ca2 100644
--- a/tests/disas/winch/x64/v128_ops/load_lane/load16.wat
+++ b/tests/disas/winch/x64/v128_ops/load_lane/load16.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load32.wat b/tests/disas/winch/x64/v128_ops/load_lane/load32.wat
index c85c54cf43..5865941aeb 100644
--- a/tests/disas/winch/x64/v128_ops/load_lane/load32.wat
+++ b/tests/disas/winch/x64/v128_ops/load_lane/load32.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load64.wat b/tests/disas/winch/x64/v128_ops/load_lane/load64.wat
index 20284735e5..1d06ec35c2 100644
--- a/tests/disas/winch/x64/v128_ops/load_lane/load64.wat
+++ b/tests/disas/winch/x64/v128_ops/load_lane/load64.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x55
diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load8.wat b/tests/disas/winch/x64/v128_ops/load_lane/load8.wat
index 7e5d247080..191a4bb314 100644
--- a/tests/disas/winch/x64/v128_ops/load_lane/load8.wat
+++ b/tests/disas/winch/x64/v128_ops/load_lane/load8.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x56
diff --git a/tests/disas/winch/x64/v128_ops/load_lane/zero_max_memory.wat b/tests/disas/winch/x64/v128_ops/load_lane/zero_max_memory.wat
index f1b8ea47bf..697e8b76b4 100644
--- a/tests/disas/winch/x64/v128_ops/load_lane/zero_max_memory.wat
+++ b/tests/disas/winch/x64/v128_ops/load_lane/zero_max_memory.wat
@@ -20,7 +20,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x67
diff --git a/tests/disas/winch/x64/v128_ops/not.wat b/tests/disas/winch/x64/v128_ops/not.wat
index c1472553d3..cd75bc835c 100644
--- a/tests/disas/winch/x64/v128_ops/not.wat
+++ b/tests/disas/winch/x64/v128_ops/not.wat
@@ -9,7 +9,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x49
diff --git a/tests/disas/winch/x64/v128_ops/or.wat b/tests/disas/winch/x64/v128_ops/or.wat
index 0f96650d23..de1a32165c 100644
--- a/tests/disas/winch/x64/v128_ops/or.wat
+++ b/tests/disas/winch/x64/v128_ops/or.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store16.wat b/tests/disas/winch/x64/v128_ops/store_lane/store16.wat
index ddd4a71d99..80d135641a 100644
--- a/tests/disas/winch/x64/v128_ops/store_lane/store16.wat
+++ b/tests/disas/winch/x64/v128_ops/store_lane/store16.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store32.wat b/tests/disas/winch/x64/v128_ops/store_lane/store32.wat
index d658fbcb10..a9d2dc1ef6 100644
--- a/tests/disas/winch/x64/v128_ops/store_lane/store32.wat
+++ b/tests/disas/winch/x64/v128_ops/store_lane/store32.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store64.wat b/tests/disas/winch/x64/v128_ops/store_lane/store64.wat
index 5077d8beb3..1b3849f7a3 100644
--- a/tests/disas/winch/x64/v128_ops/store_lane/store64.wat
+++ b/tests/disas/winch/x64/v128_ops/store_lane/store64.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store8.wat b/tests/disas/winch/x64/v128_ops/store_lane/store8.wat
index a25efb2568..6ae64d7886 100644
--- a/tests/disas/winch/x64/v128_ops/store_lane/store8.wat
+++ b/tests/disas/winch/x64/v128_ops/store_lane/store8.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
diff --git a/tests/disas/winch/x64/v128_ops/xor.wat b/tests/disas/winch/x64/v128_ops/xor.wat
index cf662f2618..e6ae442d06 100644
--- a/tests/disas/winch/x64/v128_ops/xor.wat
+++ b/tests/disas/winch/x64/v128_ops/xor.wat
@@ -12,7 +12,7 @@
;; pushq %rbp
;; movq %rsp, %rbp
;; movq 8(%rdi), %r11
-;; movq 0x10(%r11), %r11
+;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x50
diff --git a/tests/disas/x64-entry-trampoline.wat b/tests/disas/x64-entry-trampoline.wat
index e953f4e47c..7a55299771 100644
--- a/tests/disas/x64-entry-trampoline.wat
+++ b/tests/disas/x64-entry-trampoline.wat
@@ -15,11 +15,11 @@
;; movq %r15, 0x20(%rsp)
;; movq 8(%rdi), %rcx
;; movq %rbp, %rdx
-;; movq %rdx, 0x40(%rcx)
+;; movq %rdx, 0x48(%rcx)
;; movq %rsp, %rdx
-;; movq %rdx, 0x38(%rcx)
+;; movq %rdx, 0x40(%rcx)
;; leaq 0x2f(%rip), %r8
-;; movq %r8, 0x48(%rcx)
+;; movq %r8, 0x50(%rcx)
;; callq 0
;; ├─╼ exception frame offset: SP = FP - 0x30
;; ╰─╼ exception handler: default handler, no dynamic context, handler=0x71
diff --git a/tests/disas/x64-simd-round-without-sse41.wat b/tests/disas/x64-simd-round-without-sse41.wat
index 2473e6c325..259945d697 100644
--- a/tests/disas/x64-simd-round-without-sse41.wat
+++ b/tests/disas/x64-simd-round-without-sse41.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f32) -> f32 tail
;; fn0 = colocated u805306368:38 sig0
@@ -46,7 +46,7 @@
;; function u0:1(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f32) -> f32 tail
;; fn0 = colocated u805306368:40 sig0
@@ -78,7 +78,7 @@
;; function u0:2(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f32) -> f32 tail
;; fn0 = colocated u805306368:42 sig0
@@ -110,7 +110,7 @@
;; function u0:3(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f32) -> f32 tail
;; fn0 = colocated u805306368:44 sig0
@@ -142,7 +142,7 @@
;; function u0:4(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f64) -> f64 tail
;; fn0 = colocated u805306368:39 sig0
@@ -168,7 +168,7 @@
;; function u0:5(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f64) -> f64 tail
;; fn0 = colocated u805306368:41 sig0
@@ -194,7 +194,7 @@
;; function u0:6(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f64) -> f64 tail
;; fn0 = colocated u805306368:43 sig0
@@ -220,7 +220,7 @@
;; function u0:7(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; gv3 = vmctx
;; sig0 = (i64 vmctx, f64) -> f64 tail
;; fn0 = colocated u805306368:45 sig0
@@ -246,7 +246,7 @@
;; function u0:8(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly gv0+8
-;; gv2 = load.i64 notrap aligned gv1+16
+;; gv2 = load.i64 notrap aligned gv1+24
;; const0 = 0x00000000000000000000000000000000
;; stack_limit = gv2
;;