diff --git a/crates/environ/src/component/vmcomponent_offsets.rs b/crates/environ/src/component/vmcomponent_offsets.rs index acb5ad55db9b..429a186cc689 100644 --- a/crates/environ/src/component/vmcomponent_offsets.rs +++ b/crates/environ/src/component/vmcomponent_offsets.rs @@ -3,7 +3,6 @@ // struct VMComponentContext { // magic: u32, // builtins: &'static VMComponentBuiltins, -// store: *mut dyn Store, // limits: *const VMRuntimeLimits, // flags: [VMGlobalDefinition; component.num_runtime_component_instances], // trampoline_func_refs: [VMFuncRef; component.num_trampolines], @@ -62,7 +61,6 @@ pub struct VMComponentOffsets

{ // precalculated offsets of various member fields magic: u32, builtins: u32, - store: u32, limits: u32, flags: u32, trampoline_func_refs: u32, @@ -100,7 +98,6 @@ impl VMComponentOffsets

{ num_resources: component.num_resources, magic: 0, builtins: 0, - store: 0, limits: 0, flags: 0, trampoline_func_refs: 0, @@ -141,7 +138,6 @@ impl VMComponentOffsets

{ size(magic) = 4u32, align(u32::from(ret.ptr.size())), size(builtins) = ret.ptr.size(), - size(store) = cmul(2, ret.ptr.size()), size(limits) = ret.ptr.size(), align(16), size(flags) = cmul(ret.num_runtime_component_instances, ret.ptr.size_of_vmglobal_definition()), @@ -190,12 +186,6 @@ impl VMComponentOffsets

{ self.flags + index.as_u32() * u32::from(self.ptr.size_of_vmglobal_definition()) } - /// The offset of the `store` field. - #[inline] - pub fn store(&self) -> u32 { - self.store - } - /// The offset of the `limits` field. #[inline] pub fn limits(&self) -> u32 { diff --git a/crates/environ/src/vmoffsets.rs b/crates/environ/src/vmoffsets.rs index d827478394b3..c797d7088acf 100644 --- a/crates/environ/src/vmoffsets.rs +++ b/crates/environ/src/vmoffsets.rs @@ -15,7 +15,6 @@ // gc_heap_base: *mut u8, // gc_heap_bound: *mut u8, // gc_heap_data: *mut T, // Collector-specific pointer -// store: *mut dyn Store, // type_ids: *const VMSharedTypeIndex, // // // Variable-width fields come after the fixed-width fields above. Place @@ -278,16 +277,10 @@ pub trait PtrSize { self.vmctx_gc_heap_bound() + self.size() } - /// The offset of the `*const dyn Store` member. - #[inline] - fn vmctx_store(&self) -> u8 { - self.vmctx_gc_heap_data() + self.size() - } - /// The offset of the `type_ids` array pointer. #[inline] fn vmctx_type_ids_array(&self) -> u8 { - self.vmctx_store() + 2 * self.size() + self.vmctx_gc_heap_data() + self.size() } /// The end of statically known offsets in `VMContext`. diff --git a/crates/wasmtime/src/runtime/store.rs b/crates/wasmtime/src/runtime/store.rs index bf3b2b329b17..28a88054cd63 100644 --- a/crates/wasmtime/src/runtime/store.rs +++ b/crates/wasmtime/src/runtime/store.rs @@ -103,6 +103,7 @@ use core::num::NonZeroU64; use core::ops::{Deref, DerefMut, Range}; use core::pin::Pin; use core::ptr; +use core::ptr::NonNull; use core::task::{Context, Poll}; use wasmtime_environ::TripleExt; @@ -628,9 +629,9 @@ impl Store { // maintain throughout Wasmtime. unsafe { let traitobj = mem::transmute::< - *mut (dyn crate::runtime::vm::VMStore + '_), - *mut (dyn crate::runtime::vm::VMStore + 'static), - >(&mut *inner); + NonNull, + NonNull, + >(NonNull::from(&mut *inner)); instance.set_store(traitobj); instance } @@ -1933,7 +1934,7 @@ impl StoreOpaque { } #[inline] - pub fn traitobj(&self) -> *mut dyn crate::runtime::vm::VMStore { + pub fn traitobj(&self) -> NonNull { self.default_caller.traitobj(self) } diff --git a/crates/wasmtime/src/runtime/vm.rs b/crates/wasmtime/src/runtime/vm.rs index f986a6348854..5b0cc20ab1f0 100644 --- a/crates/wasmtime/src/runtime/vm.rs +++ b/crates/wasmtime/src/runtime/vm.rs @@ -203,6 +203,29 @@ impl DerefMut for dyn VMStore + '_ { } } +/// A newtype wrapper around `NonNull` intended to be a +/// self-pointer back to the `Store` within raw data structures like +/// `VMContext`. +/// +/// This type exists to manually, and unsafely, implement `Send` and `Sync`. +/// The `VMStore` trait doesn't require `Send` or `Sync` which means this isn't +/// naturally either trait (e.g. with `SendSyncPtr` instead). Note that this +/// means that `Instance` is, for example, mistakenly considered +/// unconditionally `Send` and `Sync`. This is hopefully ok for now though +/// because from a user perspective the only type that matters is `Store`. +/// That type is `Send + Sync` if `T: Send + Sync` already so the internal +/// storage of `Instance` shouldn't matter as the final result is the same. +/// Note though that this means we need to be extra vigilant about cross-thread +/// usage of `Instance` and `ComponentInstance` for example. +#[derive(Copy, Clone)] +#[repr(transparent)] +struct VMStoreRawPtr(NonNull); + +// SAFETY: this is the purpose of `VMStoreRawPtr`, see docs above about safe +// usage. +unsafe impl Send for VMStoreRawPtr {} +unsafe impl Sync for VMStoreRawPtr {} + /// Functionality required by this crate for a particular module. This /// is chiefly needed for lazy initialization of various bits of /// instance state. diff --git a/crates/wasmtime/src/runtime/vm/component.rs b/crates/wasmtime/src/runtime/vm/component.rs index c3ba4655312b..869542af3ce2 100644 --- a/crates/wasmtime/src/runtime/vm/component.rs +++ b/crates/wasmtime/src/runtime/vm/component.rs @@ -9,7 +9,7 @@ use crate::prelude::*; use crate::runtime::vm::{ SendSyncPtr, VMArrayCallFunction, VMFuncRef, VMGlobalDefinition, VMMemoryDefinition, - VMOpaqueContext, VMStore, VMWasmCallFunction, ValRaw, + VMOpaqueContext, VMStore, VMStoreRawPtr, VMWasmCallFunction, ValRaw, }; use alloc::alloc::Layout; use alloc::sync::Arc; @@ -66,6 +66,9 @@ pub struct ComponentInstance { /// Any` is left as an exercise for a future refactoring. resource_types: Arc, + /// Self-pointer back to `Store` and its functions. + store: VMStoreRawPtr, + /// A zero-sized field which represents the end of the struct for the actual /// `VMComponentContext` to be allocated behind. vmctx: VMComponentContext, @@ -193,7 +196,7 @@ impl ComponentInstance { offsets: VMComponentOffsets, runtime_info: Arc, resource_types: Arc, - store: *mut dyn VMStore, + store: NonNull, ) { assert!(alloc_size >= Self::alloc_layout(&offsets).size()); @@ -218,13 +221,14 @@ impl ComponentInstance { component_resource_tables, runtime_info, resource_types, + store: VMStoreRawPtr(store), vmctx: VMComponentContext { _marker: marker::PhantomPinned, }, }, ); - (*ptr.as_ptr()).initialize_vmctx(store); + (*ptr.as_ptr()).initialize_vmctx(); } fn vmctx(&self) -> *mut VMComponentContext { @@ -258,11 +262,7 @@ impl ComponentInstance { /// Returns the store that this component was created with. pub fn store(&self) -> *mut dyn VMStore { - unsafe { - let ret = *self.vmctx_plus_offset::<*mut dyn VMStore>(self.offsets.store()); - assert!(!ret.is_null()); - ret - } + self.store.0.as_ptr() } /// Returns the runtime memory definition corresponding to the index of the @@ -439,11 +439,11 @@ impl ComponentInstance { } } - unsafe fn initialize_vmctx(&mut self, store: *mut dyn VMStore) { + unsafe fn initialize_vmctx(&mut self) { *self.vmctx_plus_offset_mut(self.offsets.magic()) = VMCOMPONENT_MAGIC; *self.vmctx_plus_offset_mut(self.offsets.builtins()) = &libcalls::VMComponentBuiltins::INIT; - *self.vmctx_plus_offset_mut(self.offsets.store()) = store; - *self.vmctx_plus_offset_mut(self.offsets.limits()) = (*store).vmruntime_limits(); + *self.vmctx_plus_offset_mut(self.offsets.limits()) = + self.store.0.as_ref().vmruntime_limits(); for i in 0..self.offsets.num_runtime_component_instances { let i = RuntimeComponentInstanceIndex::from_u32(i); @@ -662,7 +662,7 @@ impl OwnedComponentInstance { pub fn new( runtime_info: Arc, resource_types: Arc, - store: *mut dyn VMStore, + store: NonNull, ) -> OwnedComponentInstance { let component = runtime_info.component(); let offsets = VMComponentOffsets::new(HostPtr, component); diff --git a/crates/wasmtime/src/runtime/vm/instance.rs b/crates/wasmtime/src/runtime/vm/instance.rs index 347312fbde41..f5851bb6ff7b 100644 --- a/crates/wasmtime/src/runtime/vm/instance.rs +++ b/crates/wasmtime/src/runtime/vm/instance.rs @@ -13,7 +13,7 @@ use crate::runtime::vm::vmcontext::{ }; use crate::runtime::vm::{ ExportFunction, ExportGlobal, ExportMemory, ExportTable, GcStore, Imports, ModuleRuntimeInfo, - SendSyncPtr, VMFunctionBody, VMGcRef, VMStore, WasmFault, + SendSyncPtr, VMFunctionBody, VMGcRef, VMStore, VMStoreRawPtr, WasmFault, }; use crate::store::{StoreInner, StoreOpaque}; use crate::{prelude::*, StoreContextMut}; @@ -162,13 +162,7 @@ impl InstanceAndStore { /// store). #[inline] fn store_ptr(&self) -> *mut dyn VMStore { - let ptr = unsafe { - *self - .instance - .vmctx_plus_offset::<*mut dyn VMStore>(self.instance.offsets().ptr.vmctx_store()) - }; - debug_assert!(!ptr.is_null()); - ptr + self.instance.store.unwrap().0.as_ptr() } } @@ -281,6 +275,12 @@ pub struct Instance { #[cfg(feature = "wmemcheck")] pub(crate) wmemcheck_state: Option, + /// Self-pointer back to `Store` and its functions. Not present for + /// the brief time that `Store` is itself being created. Also not + /// present for some niche uses that are disconnected from stores (e.g. + /// cross-thread stuff used in `InstancePre`) + store: Option, + /// Additional context used by compiled wasm code. This field is last, and /// represents a dynamically-sized array that extends beyond the nominal /// end of the struct (similar to a flexible array member). @@ -341,6 +341,7 @@ impl Instance { None } }, + store: None, }, ); @@ -584,19 +585,14 @@ impl Instance { unsafe { self.vmctx_plus_offset_mut(self.offsets().ptr.vmctx_gc_heap_data()) } } - pub(crate) unsafe fn set_store(&mut self, store: Option<*mut dyn VMStore>) { - if let Some(store) = store { - *self.vmctx_plus_offset_mut(self.offsets().ptr.vmctx_store()) = store; - *self.runtime_limits() = (*store).vmruntime_limits(); - *self.epoch_ptr() = (*store).engine().epoch_counter(); - self.set_gc_heap((*store).gc_store_mut().ok()); + pub(crate) unsafe fn set_store(&mut self, store: Option>) { + self.store = store.map(VMStoreRawPtr); + if let Some(mut store) = store { + let store = store.as_mut(); + *self.runtime_limits() = store.vmruntime_limits(); + *self.epoch_ptr() = store.engine().epoch_counter(); + self.set_gc_heap(store.gc_store_mut().ok()); } else { - assert_eq!( - mem::size_of::<*mut dyn VMStore>(), - mem::size_of::<[*mut (); 2]>() - ); - *self.vmctx_plus_offset_mut::<[*mut (); 2]>(self.offsets().ptr.vmctx_store()) = - [ptr::null_mut(), ptr::null_mut()]; *self.runtime_limits() = ptr::null_mut(); *self.epoch_ptr() = ptr::null_mut(); self.set_gc_heap(None); @@ -1607,7 +1603,7 @@ impl InstanceHandle { /// This should only be used for initializing a vmctx's store pointer. It /// should never be used to access the store itself. Use `InstanceAndStore` /// for that instead. - pub fn traitobj(&self, store: &StoreOpaque) -> *mut dyn VMStore { + pub fn traitobj(&self, store: &StoreOpaque) -> NonNull { // By requiring a store argument, we are ensuring that callers aren't // getting this trait object in order to access the store, since they // already have access. See `InstanceAndStore` and its documentation for @@ -1615,20 +1611,14 @@ impl InstanceHandle { // to. let _ = store; - let ptr = unsafe { - *self - .instance() - .vmctx_plus_offset::<*mut dyn VMStore>(self.instance().offsets().ptr.vmctx_store()) - }; - debug_assert!(!ptr.is_null()); - ptr + self.instance().store.unwrap().0 } /// Configure the `*mut dyn Store` internal pointer after-the-fact. /// /// This is provided for the original `Store` itself to configure the first /// self-pointer after the original `Box` has been initialized. - pub unsafe fn set_store(&mut self, store: *mut dyn VMStore) { + pub unsafe fn set_store(&mut self, store: NonNull) { self.instance_mut().set_store(Some(store)); } diff --git a/crates/wasmtime/src/runtime/vm/instance/allocator.rs b/crates/wasmtime/src/runtime/vm/instance/allocator.rs index 1f3ee06ccfab..e7e2e369d1d7 100644 --- a/crates/wasmtime/src/runtime/vm/instance/allocator.rs +++ b/crates/wasmtime/src/runtime/vm/instance/allocator.rs @@ -85,7 +85,7 @@ pub struct InstanceAllocationRequest<'a> { /// InstanceAllocationRequest, rather than on a &mut InstanceAllocationRequest /// itself, because several use-sites require a split mut borrow on the /// InstanceAllocationRequest. -pub struct StorePtr(Option<*mut dyn VMStore>); +pub struct StorePtr(Option>); impl StorePtr { /// A pointer to no Store. @@ -94,12 +94,12 @@ impl StorePtr { } /// A pointer to a Store. - pub fn new(ptr: *mut dyn VMStore) -> Self { + pub fn new(ptr: NonNull) -> Self { Self(Some(ptr)) } /// The raw contents of this struct - pub fn as_raw(&self) -> Option<*mut dyn VMStore> { + pub fn as_raw(&self) -> Option> { self.0 } @@ -107,10 +107,8 @@ impl StorePtr { /// /// Safety: must not be used outside the original lifetime of the borrow. pub(crate) unsafe fn get(&mut self) -> Option<&mut dyn VMStore> { - match self.0 { - Some(ptr) => Some(&mut *ptr), - None => None, - } + let ptr = self.0?.as_mut(); + Some(ptr) } } diff --git a/tests/all/pooling_allocator.rs b/tests/all/pooling_allocator.rs index 6d3b73fa33a2..18c7af93ca84 100644 --- a/tests/all/pooling_allocator.rs +++ b/tests/all/pooling_allocator.rs @@ -639,16 +639,16 @@ fn instance_too_large() -> Result<()> { instance allocation for this module requires 336 bytes which exceeds the \ configured maximum of 16 bytes; breakdown of allocation requirement: - * 71.43% - 240 bytes - instance state management - * 26.19% - 88 bytes - static vmctx data + * 76.19% - 256 bytes - instance state management + * 21.43% - 72 bytes - static vmctx data " } else { "\ instance allocation for this module requires 240 bytes which exceeds the \ configured maximum of 16 bytes; breakdown of allocation requirement: - * 60.00% - 144 bytes - instance state management - * 36.67% - 88 bytes - static vmctx data + * 66.67% - 160 bytes - instance state management + * 30.00% - 72 bytes - static vmctx data " }; match Module::new(&engine, "(module)") { @@ -667,7 +667,7 @@ configured maximum of 16 bytes; breakdown of allocation requirement: instance allocation for this module requires 1936 bytes which exceeds the \ configured maximum of 16 bytes; breakdown of allocation requirement: - * 12.40% - 240 bytes - instance state management + * 13.22% - 256 bytes - instance state management * 82.64% - 1600 bytes - defined globals " } else { @@ -675,7 +675,7 @@ configured maximum of 16 bytes; breakdown of allocation requirement: instance allocation for this module requires 1840 bytes which exceeds the \ configured maximum of 16 bytes; breakdown of allocation requirement: - * 7.83% - 144 bytes - instance state management + * 8.70% - 160 bytes - instance state management * 86.96% - 1600 bytes - defined globals " }; @@ -881,7 +881,7 @@ fn component_instance_size_limit() -> Result<()> { Ok(_) => panic!("should have hit limit"), Err(e) => assert_eq!( e.to_string(), - "instance allocation for this component requires 64 bytes of `VMComponentContext` space \ + "instance allocation for this component requires 48 bytes of `VMComponentContext` space \ which exceeds the configured maximum of 1 bytes" ), } diff --git a/tests/disas/basic-wat-test.wat b/tests/disas/basic-wat-test.wat index a2b9eeb37984..a42e29100bb9 100644 --- a/tests/disas/basic-wat-test.wat +++ b/tests/disas/basic-wat-test.wat @@ -14,17 +14,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0021 v5 = uextend.i64 v2 -;; @0021 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0021 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0021 v7 = iadd v6, v5 ;; @0021 v8 = load.i32 little heap v7 ;; @0026 v9 = uextend.i64 v3 -;; @0026 v10 = load.i64 notrap aligned readonly checked v0+96 +;; @0026 v10 = load.i64 notrap aligned readonly checked v0+80 ;; @0026 v11 = iadd v10, v9 ;; @0026 v12 = load.i32 little heap v11 ;; @0029 v13 = iadd v8, v12 diff --git a/tests/disas/duplicate-loads-dynamic-memory.wat b/tests/disas/duplicate-loads-dynamic-memory.wat index d3188313d149..a3fc657d8fe7 100644 --- a/tests/disas/duplicate-loads-dynamic-memory.wat +++ b/tests/disas/duplicate-loads-dynamic-memory.wat @@ -27,13 +27,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; @0057 v6 = load.i64 notrap aligned v0+104 -;; @0057 v8 = load.i64 notrap aligned checked v0+96 +;; @0057 v6 = load.i64 notrap aligned v0+88 +;; @0057 v8 = load.i64 notrap aligned checked v0+80 ;; @0057 v5 = uextend.i64 v2 ;; @0057 v7 = icmp ugt v5, v6 ;; @0057 v10 = iconst.i64 0 @@ -51,13 +51,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; @0064 v6 = load.i64 notrap aligned v0+104 -;; @0064 v8 = load.i64 notrap aligned checked v0+96 +;; @0064 v6 = load.i64 notrap aligned v0+88 +;; @0064 v8 = load.i64 notrap aligned checked v0+80 ;; @0064 v5 = uextend.i64 v2 ;; @0064 v7 = icmp ugt v5, v6 ;; @0064 v12 = iconst.i64 0 diff --git a/tests/disas/duplicate-loads-static-memory.wat b/tests/disas/duplicate-loads-static-memory.wat index 3c9c4bcd2af1..17607e3c3102 100644 --- a/tests/disas/duplicate-loads-static-memory.wat +++ b/tests/disas/duplicate-loads-static-memory.wat @@ -22,12 +22,12 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; @0057 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0057 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0057 v5 = uextend.i64 v2 ;; @0057 v7 = iadd v6, v5 ;; @0057 v8 = load.i32 little heap v7 @@ -42,12 +42,12 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; @0064 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0064 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0064 v5 = uextend.i64 v2 ;; @0064 v7 = iadd v6, v5 ;; @0064 v8 = iconst.i64 1234 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 5436a6483ff4..9016fb886146 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 @@ -40,16 +40,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; @0047 v7 = load.i64 notrap aligned v0+104 +;; @0047 v7 = load.i64 notrap aligned v0+88 ;; @0047 v6 = uextend.i64 v2 ;; @0047 v8 = icmp ugt v6, v7 ;; @0047 trapnz v8, heap_oob -;; @0047 v9 = load.i64 notrap aligned checked v0+96 +;; @0047 v9 = load.i64 notrap aligned checked v0+80 ;; @0047 v10 = iadd v9, v6 ;; @0047 v11 = load.i32 little heap v10 ;; @004c v17 = iconst.i64 4 @@ -73,16 +73,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @005d v7 = load.i64 notrap aligned v0+104 +;; @005d v7 = load.i64 notrap aligned v0+88 ;; @005d v6 = uextend.i64 v2 ;; @005d v8 = icmp ugt v6, v7 ;; @005d trapnz v8, heap_oob -;; @005d v9 = load.i64 notrap aligned checked v0+96 +;; @005d v9 = load.i64 notrap aligned checked v0+80 ;; @005d v10 = iadd v9, v6 ;; @005d store little heap v3, v10 ;; @0064 v16 = iconst.i64 4 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 e2825b1b8058..191b2513daee 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 @@ -36,13 +36,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; @0047 v7 = load.i64 notrap aligned v0+104 -;; @0047 v9 = load.i64 notrap aligned checked v0+96 +;; @0047 v7 = load.i64 notrap aligned v0+88 +;; @0047 v9 = load.i64 notrap aligned checked v0+80 ;; @0047 v6 = uextend.i64 v2 ;; @0047 v8 = icmp ugt v6, v7 ;; @0047 v11 = iconst.i64 0 @@ -71,13 +71,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @005d v7 = load.i64 notrap aligned v0+104 -;; @005d v9 = load.i64 notrap aligned checked v0+96 +;; @005d v7 = load.i64 notrap aligned v0+88 +;; @005d v9 = load.i64 notrap aligned checked v0+80 ;; @005d v6 = uextend.i64 v2 ;; @005d v8 = icmp ugt v6, v7 ;; @005d v11 = iconst.i64 0 diff --git a/tests/disas/f32-load.wat b/tests/disas/f32-load.wat index 683925f5ab77..bf0a61b2122a 100644 --- a/tests/disas/f32-load.wat +++ b/tests/disas/f32-load.wat @@ -11,13 +11,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = load.i64 notrap aligned readonly checked v0+96 +;; @002e v5 = load.i64 notrap aligned readonly checked v0+80 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.f32 little heap v6 ;; @0031 jump block1 diff --git a/tests/disas/f32-store.wat b/tests/disas/f32-store.wat index 8a6a711ea48e..8b976abe6044 100644 --- a/tests/disas/f32-store.wat +++ b/tests/disas/f32-store.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: f32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/f64-load.wat b/tests/disas/f64-load.wat index f8fb6d2e779f..e2419324da62 100644 --- a/tests/disas/f64-load.wat +++ b/tests/disas/f64-load.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = load.i64 notrap aligned readonly checked v0+96 +;; @002e v5 = load.i64 notrap aligned readonly checked v0+80 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.f64 little heap v6 ;; @0031 jump block1 diff --git a/tests/disas/f64-store.wat b/tests/disas/f64-store.wat index 568355974047..d0668c47f717 100644 --- a/tests/disas/f64-store.wat +++ b/tests/disas/f64-store.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: f64): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/fibonacci.wat b/tests/disas/fibonacci.wat index 03e6ec76b94a..c88d840d5db1 100644 --- a/tests/disas/fibonacci.wat +++ b/tests/disas/fibonacci.wat @@ -28,8 +28,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): @@ -55,7 +55,7 @@ ;; block2: ;; @0056 v16 = iconst.i32 0 ;; @005a v17 = uextend.i64 v16 ; v16 = 0 -;; @005a v18 = load.i64 notrap aligned readonly checked v0+96 +;; @005a v18 = load.i64 notrap aligned readonly checked v0+80 ;; @005a v19 = iadd v18, v17 ;; @005a store.i32 little heap v11, v19 ;; @005d jump block1 diff --git a/tests/disas/fixed-size-memory.wat b/tests/disas/fixed-size-memory.wat index 9c13457c8643..227c323a24a3 100644 --- a/tests/disas/fixed-size-memory.wat +++ b/tests/disas/fixed-size-memory.wat @@ -25,8 +25,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -34,7 +34,7 @@ ;; @0041 v5 = iconst.i64 0x0001_0000 ;; @0041 v6 = icmp uge v4, v5 ; v5 = 0x0001_0000 ;; @0041 trapnz v6, heap_oob -;; @0041 v7 = load.i64 notrap aligned checked v0+96 +;; @0041 v7 = load.i64 notrap aligned checked v0+80 ;; @0041 v8 = iadd v7, v4 ;; @0041 istore8 little heap v3, v8 ;; @0044 jump block1 @@ -48,8 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -57,7 +57,7 @@ ;; @0049 v5 = iconst.i64 0x0001_0000 ;; @0049 v6 = icmp uge v4, v5 ; v5 = 0x0001_0000 ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = load.i64 notrap aligned checked v0+96 +;; @0049 v7 = load.i64 notrap aligned checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = uload8.i32 little heap v8 ;; @004c jump block1 diff --git a/tests/disas/gc/drc/br-on-cast-fail.wat b/tests/disas/gc/drc/br-on-cast-fail.wat index c0dea454497f..16c109e9a464 100644 --- a/tests/disas/gc/drc/br-on-cast-fail.wat +++ b/tests/disas/gc/drc/br-on-cast-fail.wat @@ -59,7 +59,7 @@ ;; @002e v18 = load.i64 notrap aligned readonly v0+40 ;; @002e v27 = iadd v18, v23 ;; @002e v28 = load.i32 notrap aligned readonly v27 -;; @002e v15 = load.i64 notrap aligned readonly v0+80 +;; @002e v15 = load.i64 notrap aligned readonly v0+64 ;; @002e v16 = load.i32 notrap aligned readonly v15 ;; @002e v29 = icmp eq v28, v16 ;; @002e v30 = uextend.i32 v29 @@ -77,14 +77,14 @@ ;; @002e brif v34, block8, block2 ;; ;; block8: -;; @0034 v36 = load.i64 notrap aligned readonly v0+88 -;; @0034 v37 = load.i64 notrap aligned readonly v0+104 +;; @0034 v36 = load.i64 notrap aligned readonly v0+72 +;; @0034 v37 = load.i64 notrap aligned readonly v0+88 ;; @0034 call_indirect sig1, v36(v37, v0) ;; @0036 return ;; ;; block2: -;; @0038 v39 = load.i64 notrap aligned readonly v0+112 -;; @0038 v40 = load.i64 notrap aligned readonly v0+128 +;; @0038 v39 = load.i64 notrap aligned readonly v0+96 +;; @0038 v40 = load.i64 notrap aligned readonly v0+112 ;; @0038 call_indirect sig2, v39(v40, v0) ;; @003a return ;; } diff --git a/tests/disas/gc/drc/br-on-cast.wat b/tests/disas/gc/drc/br-on-cast.wat index 05ef807358c5..61be2ad9dd42 100644 --- a/tests/disas/gc/drc/br-on-cast.wat +++ b/tests/disas/gc/drc/br-on-cast.wat @@ -59,7 +59,7 @@ ;; @002f v18 = load.i64 notrap aligned readonly v0+40 ;; @002f v27 = iadd v18, v23 ;; @002f v28 = load.i32 notrap aligned readonly v27 -;; @002f v15 = load.i64 notrap aligned readonly v0+80 +;; @002f v15 = load.i64 notrap aligned readonly v0+64 ;; @002f v16 = load.i32 notrap aligned readonly v15 ;; @002f v29 = icmp eq v28, v16 ;; @002f v30 = uextend.i32 v29 @@ -77,14 +77,14 @@ ;; @002f brif v34, block2, block8 ;; ;; block8: -;; @0035 v36 = load.i64 notrap aligned readonly v0+88 -;; @0035 v37 = load.i64 notrap aligned readonly v0+104 +;; @0035 v36 = load.i64 notrap aligned readonly v0+72 +;; @0035 v37 = load.i64 notrap aligned readonly v0+88 ;; @0035 call_indirect sig1, v36(v37, v0) ;; @0037 return ;; ;; block2: -;; @0039 v39 = load.i64 notrap aligned readonly v0+112 -;; @0039 v40 = load.i64 notrap aligned readonly v0+128 +;; @0039 v39 = load.i64 notrap aligned readonly v0+96 +;; @0039 v40 = load.i64 notrap aligned readonly v0+112 ;; @0039 call_indirect sig2, v39(v40, v0) ;; @003b return ;; } diff --git a/tests/disas/gc/drc/call-indirect-and-subtyping.wat b/tests/disas/gc/drc/call-indirect-and-subtyping.wat index aa065934a07e..2d4234788906 100644 --- a/tests/disas/gc/drc/call-indirect-and-subtyping.wat +++ b/tests/disas/gc/drc/call-indirect-and-subtyping.wat @@ -21,7 +21,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+136 +;; gv4 = load.i64 notrap aligned readonly gv3+120 ;; sig0 = (i64 vmctx, i64) tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; sig2 = (i64 vmctx, i32, i32) -> i32 tail @@ -33,7 +33,7 @@ ;; @005c v3 = iconst.i32 2 ;; @005c v4 = icmp uge v2, v3 ; v3 = 2 ;; @005c v9 = iconst.i64 0 -;; @005c v6 = load.i64 notrap aligned readonly v0+136 +;; @005c v6 = load.i64 notrap aligned readonly v0+120 ;; @005c v5 = uextend.i64 v2 ;; v30 = iconst.i64 3 ;; @005c v7 = ishl v5, v30 ; v30 = 3 @@ -51,7 +51,7 @@ ;; ;; block3(v13: i64): ;; @005c v21 = load.i32 user6 aligned readonly v13+16 -;; @005c v19 = load.i64 notrap aligned readonly v0+80 +;; @005c v19 = load.i64 notrap aligned readonly v0+64 ;; @005c v20 = load.i32 notrap aligned readonly v19 ;; @005c v22 = icmp eq v21, v20 ;; @005c v23 = uextend.i32 v22 diff --git a/tests/disas/gc/drc/externref-globals.wat b/tests/disas/gc/drc/externref-globals.wat index 6c506ba88a92..d055c43a1171 100644 --- a/tests/disas/gc/drc/externref-globals.wat +++ b/tests/disas/gc/drc/externref-globals.wat @@ -23,8 +23,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): -;; v45 = iconst.i64 96 -;; @0034 v4 = iadd v0, v45 ; v45 = 96 +;; v45 = iconst.i64 80 +;; @0034 v4 = iadd v0, v45 ; v45 = 80 ;; @0034 v5 = load.i32 notrap aligned v4 ;; v46 = stack_addr.i64 ss0 ;; store notrap v5, v46 @@ -82,8 +82,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; v58 = iconst.i64 96 -;; @003b v4 = iadd v0, v58 ; v58 = 96 +;; v58 = iconst.i64 80 +;; @003b v4 = iadd v0, v58 ; v58 = 80 ;; @003b v5 = load.i32 notrap aligned v4 ;; v59 = iconst.i32 0 ;; @003b v6 = icmp eq v2, v59 ; v59 = 0 @@ -106,7 +106,7 @@ ;; @003b jump block3 ;; ;; block3: -;; v64 = iadd.i64 v0, v58 ; v58 = 96 +;; v64 = iadd.i64 v0, v58 ; v58 = 80 ;; @003b store.i32 notrap aligned v2, v64 ;; v65 = iconst.i32 0 ;; v66 = icmp.i32 eq v5, v65 ; v65 = 0 diff --git a/tests/disas/gc/drc/i31ref-globals.wat b/tests/disas/gc/drc/i31ref-globals.wat index cd3d9e703e7a..d9b6dbb95391 100644 --- a/tests/disas/gc/drc/i31ref-globals.wat +++ b/tests/disas/gc/drc/i31ref-globals.wat @@ -20,8 +20,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): -;; v6 = iconst.i64 96 -;; @0036 v4 = iadd v0, v6 ; v6 = 96 +;; v6 = iconst.i64 80 +;; @0036 v4 = iadd v0, v6 ; v6 = 80 ;; @0036 v5 = load.i32 notrap aligned v4 ;; @0038 jump block1 ;; @@ -37,8 +37,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; v5 = iconst.i64 96 -;; @003d v4 = iadd v0, v5 ; v5 = 96 +;; v5 = iconst.i64 80 +;; @003d v4 = iadd v0, v5 ; v5 = 80 ;; @003d store notrap aligned v2, v4 ;; @003f jump block1 ;; diff --git a/tests/disas/gc/drc/ref-cast.wat b/tests/disas/gc/drc/ref-cast.wat index b88c855ca180..902e6ead9d11 100644 --- a/tests/disas/gc/drc/ref-cast.wat +++ b/tests/disas/gc/drc/ref-cast.wat @@ -47,7 +47,7 @@ ;; @001e v18 = load.i64 notrap aligned readonly v0+40 ;; @001e v27 = iadd v18, v23 ;; @001e v28 = load.i32 notrap aligned readonly v27 -;; @001e v15 = load.i64 notrap aligned readonly v0+80 +;; @001e v15 = load.i64 notrap aligned readonly v0+64 ;; @001e v16 = load.i32 notrap aligned readonly v15 ;; @001e v29 = icmp eq v28, v16 ;; @001e v30 = uextend.i32 v29 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 4afd507bed3d..2e5325759a18 100644 --- a/tests/disas/gc/drc/ref-test-concrete-func-type.wat +++ b/tests/disas/gc/drc/ref-test-concrete-func-type.wat @@ -31,7 +31,7 @@ ;; ;; block3: ;; @0020 v12 = load.i32 notrap aligned readonly v2+16 -;; @0020 v10 = load.i64 notrap aligned readonly v0+80 +;; @0020 v10 = load.i64 notrap aligned readonly v0+64 ;; @0020 v11 = load.i32 notrap aligned readonly v10 ;; @0020 v13 = icmp eq v12, v11 ;; @0020 v14 = uextend.i32 v13 diff --git a/tests/disas/gc/drc/ref-test-concrete-type.wat b/tests/disas/gc/drc/ref-test-concrete-type.wat index 43c2681de090..a454dd2bd590 100644 --- a/tests/disas/gc/drc/ref-test-concrete-type.wat +++ b/tests/disas/gc/drc/ref-test-concrete-type.wat @@ -44,7 +44,7 @@ ;; @001d v18 = load.i64 notrap aligned readonly v0+40 ;; @001d v27 = iadd v18, v23 ;; @001d v28 = load.i32 notrap aligned readonly v27 -;; @001d v15 = load.i64 notrap aligned readonly v0+80 +;; @001d v15 = load.i64 notrap aligned readonly v0+64 ;; @001d v16 = load.i32 notrap aligned readonly v15 ;; @001d v29 = icmp eq v28, v16 ;; @001d v30 = uextend.i32 v29 diff --git a/tests/disas/gc/null/array-new-fixed.wat b/tests/disas/gc/null/array-new-fixed.wat index a1facbd38c46..0be5bad675dc 100644 --- a/tests/disas/gc/null/array-new-fixed.wat +++ b/tests/disas/gc/null/array-new-fixed.wat @@ -42,7 +42,7 @@ ;; @0025 v31 = uextend.i64 v23 ;; @0025 v32 = iadd v27, v31 ;; @0025 store notrap aligned v68, v32 -;; @0025 v36 = load.i64 notrap aligned readonly v0+80 +;; @0025 v36 = load.i64 notrap aligned readonly v0+64 ;; @0025 v37 = load.i32 notrap aligned readonly v36 ;; @0025 store notrap aligned v37, v32+4 ;; @0025 store notrap aligned v24, v17 diff --git a/tests/disas/gc/null/array-new.wat b/tests/disas/gc/null/array-new.wat index 36e5a5e2bef3..20c4bebae8a8 100644 --- a/tests/disas/gc/null/array-new.wat +++ b/tests/disas/gc/null/array-new.wat @@ -47,7 +47,7 @@ ;; @0022 v29 = uextend.i64 v21 ;; @0022 v30 = iadd v25, v29 ;; @0022 store notrap aligned v69, v30 -;; @0022 v34 = load.i64 notrap aligned readonly v0+80 +;; @0022 v34 = load.i64 notrap aligned readonly v0+64 ;; @0022 v35 = load.i32 notrap aligned readonly v34 ;; @0022 store notrap aligned v35, v30+4 ;; @0022 store notrap aligned v22, v15 diff --git a/tests/disas/gc/null/br-on-cast-fail.wat b/tests/disas/gc/null/br-on-cast-fail.wat index a7a2171363b3..f0195eed6f1c 100644 --- a/tests/disas/gc/null/br-on-cast-fail.wat +++ b/tests/disas/gc/null/br-on-cast-fail.wat @@ -59,7 +59,7 @@ ;; @002e v18 = load.i64 notrap aligned readonly v0+40 ;; @002e v27 = iadd v18, v23 ;; @002e v28 = load.i32 notrap aligned readonly v27 -;; @002e v15 = load.i64 notrap aligned readonly v0+80 +;; @002e v15 = load.i64 notrap aligned readonly v0+64 ;; @002e v16 = load.i32 notrap aligned readonly v15 ;; @002e v29 = icmp eq v28, v16 ;; @002e v30 = uextend.i32 v29 @@ -77,14 +77,14 @@ ;; @002e brif v34, block8, block2 ;; ;; block8: -;; @0034 v36 = load.i64 notrap aligned readonly v0+88 -;; @0034 v37 = load.i64 notrap aligned readonly v0+104 +;; @0034 v36 = load.i64 notrap aligned readonly v0+72 +;; @0034 v37 = load.i64 notrap aligned readonly v0+88 ;; @0034 call_indirect sig1, v36(v37, v0) ;; @0036 return ;; ;; block2: -;; @0038 v39 = load.i64 notrap aligned readonly v0+112 -;; @0038 v40 = load.i64 notrap aligned readonly v0+128 +;; @0038 v39 = load.i64 notrap aligned readonly v0+96 +;; @0038 v40 = load.i64 notrap aligned readonly v0+112 ;; @0038 call_indirect sig2, v39(v40, v0) ;; @003a return ;; } diff --git a/tests/disas/gc/null/br-on-cast.wat b/tests/disas/gc/null/br-on-cast.wat index 214293943410..0a186ad107b9 100644 --- a/tests/disas/gc/null/br-on-cast.wat +++ b/tests/disas/gc/null/br-on-cast.wat @@ -59,7 +59,7 @@ ;; @002f v18 = load.i64 notrap aligned readonly v0+40 ;; @002f v27 = iadd v18, v23 ;; @002f v28 = load.i32 notrap aligned readonly v27 -;; @002f v15 = load.i64 notrap aligned readonly v0+80 +;; @002f v15 = load.i64 notrap aligned readonly v0+64 ;; @002f v16 = load.i32 notrap aligned readonly v15 ;; @002f v29 = icmp eq v28, v16 ;; @002f v30 = uextend.i32 v29 @@ -77,14 +77,14 @@ ;; @002f brif v34, block2, block8 ;; ;; block8: -;; @0035 v36 = load.i64 notrap aligned readonly v0+88 -;; @0035 v37 = load.i64 notrap aligned readonly v0+104 +;; @0035 v36 = load.i64 notrap aligned readonly v0+72 +;; @0035 v37 = load.i64 notrap aligned readonly v0+88 ;; @0035 call_indirect sig1, v36(v37, v0) ;; @0037 return ;; ;; block2: -;; @0039 v39 = load.i64 notrap aligned readonly v0+112 -;; @0039 v40 = load.i64 notrap aligned readonly v0+128 +;; @0039 v39 = load.i64 notrap aligned readonly v0+96 +;; @0039 v40 = load.i64 notrap aligned readonly v0+112 ;; @0039 call_indirect sig2, v39(v40, v0) ;; @003b return ;; } diff --git a/tests/disas/gc/null/call-indirect-and-subtyping.wat b/tests/disas/gc/null/call-indirect-and-subtyping.wat index a27302b837e5..e38540a1aa90 100644 --- a/tests/disas/gc/null/call-indirect-and-subtyping.wat +++ b/tests/disas/gc/null/call-indirect-and-subtyping.wat @@ -21,7 +21,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+136 +;; gv4 = load.i64 notrap aligned readonly gv3+120 ;; sig0 = (i64 vmctx, i64) tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; sig2 = (i64 vmctx, i32, i32) -> i32 tail @@ -33,7 +33,7 @@ ;; @005c v3 = iconst.i32 2 ;; @005c v4 = icmp uge v2, v3 ; v3 = 2 ;; @005c v9 = iconst.i64 0 -;; @005c v6 = load.i64 notrap aligned readonly v0+136 +;; @005c v6 = load.i64 notrap aligned readonly v0+120 ;; @005c v5 = uextend.i64 v2 ;; v30 = iconst.i64 3 ;; @005c v7 = ishl v5, v30 ; v30 = 3 @@ -51,7 +51,7 @@ ;; ;; block3(v13: i64): ;; @005c v21 = load.i32 user6 aligned readonly v13+16 -;; @005c v19 = load.i64 notrap aligned readonly v0+80 +;; @005c v19 = load.i64 notrap aligned readonly v0+64 ;; @005c v20 = load.i32 notrap aligned readonly v19 ;; @005c v22 = icmp eq v21, v20 ;; @005c v23 = uextend.i32 v22 diff --git a/tests/disas/gc/null/externref-globals.wat b/tests/disas/gc/null/externref-globals.wat index 36ab6a7ae8d8..451f464f209f 100644 --- a/tests/disas/gc/null/externref-globals.wat +++ b/tests/disas/gc/null/externref-globals.wat @@ -20,8 +20,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): -;; v6 = iconst.i64 96 -;; @0034 v4 = iadd v0, v6 ; v6 = 96 +;; v6 = iconst.i64 80 +;; @0034 v4 = iadd v0, v6 ; v6 = 80 ;; @0034 v5 = load.i32 notrap aligned v4 ;; @0036 jump block1 ;; @@ -37,8 +37,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; v5 = iconst.i64 96 -;; @003b v4 = iadd v0, v5 ; v5 = 96 +;; v5 = iconst.i64 80 +;; @003b v4 = iadd v0, v5 ; v5 = 80 ;; @003b store notrap aligned v2, v4 ;; @003d jump block1 ;; 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 ae551c8ee075..19576ca989ac 100644 --- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat +++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat @@ -38,7 +38,7 @@ ;; @0020 v23 = uextend.i64 v15 ;; @0020 v24 = iadd v19, v23 ;; @0020 store notrap aligned v50, v24 ; v50 = -1342177264 -;; @0020 v28 = load.i64 notrap aligned readonly v0+80 +;; @0020 v28 = load.i64 notrap aligned readonly v0+64 ;; @0020 v29 = load.i32 notrap aligned readonly v28 ;; @0020 store notrap aligned v29, v24+4 ;; @0020 store notrap aligned v16, v9 diff --git a/tests/disas/gc/null/i31ref-globals.wat b/tests/disas/gc/null/i31ref-globals.wat index 28e9751928db..a7c4c7db8aba 100644 --- a/tests/disas/gc/null/i31ref-globals.wat +++ b/tests/disas/gc/null/i31ref-globals.wat @@ -20,8 +20,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): -;; v6 = iconst.i64 96 -;; @0036 v4 = iadd v0, v6 ; v6 = 96 +;; v6 = iconst.i64 80 +;; @0036 v4 = iadd v0, v6 ; v6 = 80 ;; @0036 v5 = load.i32 notrap aligned v4 ;; @0038 jump block1 ;; @@ -37,8 +37,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; v5 = iconst.i64 96 -;; @003d v4 = iadd v0, v5 ; v5 = 96 +;; v5 = iconst.i64 80 +;; @003d v4 = iadd v0, v5 ; v5 = 80 ;; @003d store notrap aligned v2, v4 ;; @003f jump block1 ;; diff --git a/tests/disas/gc/null/ref-cast.wat b/tests/disas/gc/null/ref-cast.wat index 7629a6f01307..efbe194d61fa 100644 --- a/tests/disas/gc/null/ref-cast.wat +++ b/tests/disas/gc/null/ref-cast.wat @@ -47,7 +47,7 @@ ;; @001e v18 = load.i64 notrap aligned readonly v0+40 ;; @001e v27 = iadd v18, v23 ;; @001e v28 = load.i32 notrap aligned readonly v27 -;; @001e v15 = load.i64 notrap aligned readonly v0+80 +;; @001e v15 = load.i64 notrap aligned readonly v0+64 ;; @001e v16 = load.i32 notrap aligned readonly v15 ;; @001e v29 = icmp eq v28, v16 ;; @001e v30 = uextend.i32 v29 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 488f41868cfb..2f062ebef173 100644 --- a/tests/disas/gc/null/ref-test-concrete-func-type.wat +++ b/tests/disas/gc/null/ref-test-concrete-func-type.wat @@ -31,7 +31,7 @@ ;; ;; block3: ;; @0020 v12 = load.i32 notrap aligned readonly v2+16 -;; @0020 v10 = load.i64 notrap aligned readonly v0+80 +;; @0020 v10 = load.i64 notrap aligned readonly v0+64 ;; @0020 v11 = load.i32 notrap aligned readonly v10 ;; @0020 v13 = icmp eq v12, v11 ;; @0020 v14 = uextend.i32 v13 diff --git a/tests/disas/gc/null/ref-test-concrete-type.wat b/tests/disas/gc/null/ref-test-concrete-type.wat index 4cf7d5064ae8..4139d34c612b 100644 --- a/tests/disas/gc/null/ref-test-concrete-type.wat +++ b/tests/disas/gc/null/ref-test-concrete-type.wat @@ -44,7 +44,7 @@ ;; @001d v18 = load.i64 notrap aligned readonly v0+40 ;; @001d v27 = iadd v18, v23 ;; @001d v28 = load.i32 notrap aligned readonly v27 -;; @001d v15 = load.i64 notrap aligned readonly v0+80 +;; @001d v15 = load.i64 notrap aligned readonly v0+64 ;; @001d v16 = load.i32 notrap aligned readonly v15 ;; @001d v29 = icmp eq v28, v16 ;; @001d v30 = uextend.i32 v29 diff --git a/tests/disas/gc/null/struct-new-default.wat b/tests/disas/gc/null/struct-new-default.wat index 7eeea63ceb79..c1343f41917b 100644 --- a/tests/disas/gc/null/struct-new-default.wat +++ b/tests/disas/gc/null/struct-new-default.wat @@ -38,7 +38,7 @@ ;; @0021 v25 = uextend.i64 v17 ;; @0021 v26 = iadd v21, v25 ;; @0021 store notrap aligned v52, v26 ; v52 = -1342177256 -;; @0021 v30 = load.i64 notrap aligned readonly v0+80 +;; @0021 v30 = load.i64 notrap aligned readonly v0+64 ;; @0021 v31 = load.i32 notrap aligned readonly v30 ;; @0021 store notrap aligned v31, v26+4 ;; @0021 store notrap aligned v18, v11 diff --git a/tests/disas/gc/null/struct-new.wat b/tests/disas/gc/null/struct-new.wat index 9da11aebff0d..9da345f938d4 100644 --- a/tests/disas/gc/null/struct-new.wat +++ b/tests/disas/gc/null/struct-new.wat @@ -38,7 +38,7 @@ ;; @002a v25 = uextend.i64 v17 ;; @002a v26 = iadd v21, v25 ;; @002a store notrap aligned v53, v26 ; v53 = -1342177256 -;; @002a v30 = load.i64 notrap aligned readonly v0+80 +;; @002a v30 = load.i64 notrap aligned readonly v0+64 ;; @002a v31 = load.i32 notrap aligned readonly v30 ;; @002a store notrap aligned v31, v26+4 ;; @002a store notrap aligned v18, v11 diff --git a/tests/disas/globals.wat b/tests/disas/globals.wat index 47da9a0e00f0..61af91badd77 100644 --- a/tests/disas/globals.wat +++ b/tests/disas/globals.wat @@ -14,16 +14,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): ;; @0027 v2 = iconst.i32 0 ;; @0029 v3 = iconst.i32 0 -;; @002b v5 = load.i32 notrap aligned table v0+112 +;; @002b v5 = load.i32 notrap aligned table v0+96 ;; @002d v6 = uextend.i64 v3 ; v3 = 0 -;; @002d v7 = load.i64 notrap aligned readonly checked v0+96 +;; @002d v7 = load.i64 notrap aligned readonly checked v0+80 ;; @002d v8 = iadd v7, v6 ;; @002d store little heap v5, v8 ;; @0030 jump block1 diff --git a/tests/disas/i32-load.wat b/tests/disas/i32-load.wat index fa6846cd71f4..bcd8d1a8c341 100644 --- a/tests/disas/i32-load.wat +++ b/tests/disas/i32-load.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = load.i64 notrap aligned readonly checked v0+96 +;; @002e v5 = load.i64 notrap aligned readonly checked v0+80 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.i32 little heap v6 ;; @0031 jump block1 diff --git a/tests/disas/i32-load16-s.wat b/tests/disas/i32-load16-s.wat index 647902ada200..f67a8f7084ff 100644 --- a/tests/disas/i32-load16-s.wat +++ b/tests/disas/i32-load16-s.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0032 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = sload16.i32 little heap v6 ;; @0035 jump block1 diff --git a/tests/disas/i32-load16-u.wat b/tests/disas/i32-load16-u.wat index 56939d26f73f..adcc30bd22fc 100644 --- a/tests/disas/i32-load16-u.wat +++ b/tests/disas/i32-load16-u.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0032 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = uload16.i32 little heap v6 ;; @0035 jump block1 diff --git a/tests/disas/i32-load8-s.wat b/tests/disas/i32-load8-s.wat index 3063cf9e84e3..868350b76310 100644 --- a/tests/disas/i32-load8-s.wat +++ b/tests/disas/i32-load8-s.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = sload8.i32 little heap v6 ;; @0034 jump block1 diff --git a/tests/disas/i32-load8-u.wat b/tests/disas/i32-load8-u.wat index 392745579c89..979e1b56a7b7 100644 --- a/tests/disas/i32-load8-u.wat +++ b/tests/disas/i32-load8-u.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = uload8.i32 little heap v6 ;; @0034 jump block1 diff --git a/tests/disas/i32-store.wat b/tests/disas/i32-store.wat index a09cb59a1920..3492c7e9d2bc 100644 --- a/tests/disas/i32-store.wat +++ b/tests/disas/i32-store.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/i32-store16.wat b/tests/disas/i32-store16.wat index 6ad8ec69e2ed..3c09f4aef1e7 100644 --- a/tests/disas/i32-store16.wat +++ b/tests/disas/i32-store16.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0033 v4 = uextend.i64 v2 -;; @0033 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0033 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0033 v6 = iadd v5, v4 ;; @0033 istore16 little heap v3, v6 ;; @0036 jump block1 diff --git a/tests/disas/i32-store8.wat b/tests/disas/i32-store8.wat index f53a21258122..7b62ecddb35f 100644 --- a/tests/disas/i32-store8.wat +++ b/tests/disas/i32-store8.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0032 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0032 v6 = iadd v5, v4 ;; @0032 istore8 little heap v3, v6 ;; @0035 jump block1 diff --git a/tests/disas/i64-load.wat b/tests/disas/i64-load.wat index 562e293585df..de9f9740e157 100644 --- a/tests/disas/i64-load.wat +++ b/tests/disas/i64-load.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = load.i64 notrap aligned readonly checked v0+96 +;; @002e v5 = load.i64 notrap aligned readonly checked v0+80 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.i64 little heap v6 ;; @0031 jump block1 diff --git a/tests/disas/i64-load16-s.wat b/tests/disas/i64-load16-s.wat index b0b05a223e42..2a0a9e1a703e 100644 --- a/tests/disas/i64-load16-s.wat +++ b/tests/disas/i64-load16-s.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0032 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = sload16.i64 little heap v6 ;; @0035 jump block1 diff --git a/tests/disas/i64-load16-u.wat b/tests/disas/i64-load16-u.wat index d0879b68ad20..324054945f86 100644 --- a/tests/disas/i64-load16-u.wat +++ b/tests/disas/i64-load16-u.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0032 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = uload16.i64 little heap v6 ;; @0035 jump block1 diff --git a/tests/disas/i64-load8-s.wat b/tests/disas/i64-load8-s.wat index 80baf1a0a776..ce7235c2a0c6 100644 --- a/tests/disas/i64-load8-s.wat +++ b/tests/disas/i64-load8-s.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = sload8.i64 little heap v6 ;; @0034 jump block1 diff --git a/tests/disas/i64-load8-u.wat b/tests/disas/i64-load8-u.wat index 6f0e3894de0b..1e92e4de27b5 100644 --- a/tests/disas/i64-load8-u.wat +++ b/tests/disas/i64-load8-u.wat @@ -13,13 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = uload8.i64 little heap v6 ;; @0034 jump block1 diff --git a/tests/disas/i64-store.wat b/tests/disas/i64-store.wat index d013f741e08f..bb8779ff20ac 100644 --- a/tests/disas/i64-store.wat +++ b/tests/disas/i64-store.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0031 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/i64-store16.wat b/tests/disas/i64-store16.wat index 41f24840175c..1dea0723c0f6 100644 --- a/tests/disas/i64-store16.wat +++ b/tests/disas/i64-store16.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0033 v4 = uextend.i64 v2 -;; @0033 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0033 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0033 v6 = iadd v5, v4 ;; @0033 istore16 little heap v3, v6 ;; @0036 jump block1 diff --git a/tests/disas/i64-store32.wat b/tests/disas/i64-store32.wat index 697d3b854f0f..965a971e5dab 100644 --- a/tests/disas/i64-store32.wat +++ b/tests/disas/i64-store32.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0033 v4 = uextend.i64 v2 -;; @0033 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0033 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0033 v6 = iadd v5, v4 ;; @0033 istore32 little heap v3, v6 ;; @0036 jump block1 diff --git a/tests/disas/i64-store8.wat b/tests/disas/i64-store8.wat index e5cba2671777..127dc6dcd4a2 100644 --- a/tests/disas/i64-store8.wat +++ b/tests/disas/i64-store8.wat @@ -14,13 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0032 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0032 v6 = iadd v5, v4 ;; @0032 istore8 little heap v3, v6 ;; @0035 jump block1 diff --git a/tests/disas/icall-loop.wat b/tests/disas/icall-loop.wat index 90406506c485..9bfe6566bcb8 100644 --- a/tests/disas/icall-loop.wat +++ b/tests/disas/icall-loop.wat @@ -27,7 +27,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64) -> i32 tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; fn0 = colocated u1:9 sig1 @@ -37,7 +37,7 @@ ;; @002b v4 = iconst.i32 2 ;; @002b v5 = icmp uge v2, v4 ; v4 = 2 ;; @002b v10 = iconst.i64 0 -;; @002b v7 = load.i64 notrap aligned readonly v0+88 +;; @002b v7 = load.i64 notrap aligned readonly v0+72 ;; @002b v6 = uextend.i64 v2 ;; v29 = iconst.i64 3 ;; @002b v8 = ishl v6, v29 ; v29 = 3 @@ -45,7 +45,7 @@ ;; @002b v11 = select_spectre_guard v5, v10, v9 ; v10 = 0 ;; v30 = iconst.i64 -2 ;; @002b v15 = iconst.i32 0 -;; @002b v20 = load.i64 notrap aligned readonly v0+80 +;; @002b v20 = load.i64 notrap aligned readonly v0+64 ;; @002b v21 = load.i32 notrap aligned readonly v20 ;; @0027 jump block2 ;; @@ -75,20 +75,20 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64) -> i32 tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; fn0 = colocated u1:9 sig1 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): -;; @0038 v6 = load.i64 notrap aligned readonly v0+88 +;; @0038 v6 = load.i64 notrap aligned readonly v0+72 ;; v37 = iconst.i64 8 ;; @0038 v8 = iadd v6, v37 ; v37 = 8 ;; v28 = iconst.i64 -2 ;; @0038 v14 = iconst.i32 0 ;; v36 = iconst.i64 1 -;; @0038 v19 = load.i64 notrap aligned readonly v0+80 +;; @0038 v19 = load.i64 notrap aligned readonly v0+64 ;; @0038 v20 = load.i32 notrap aligned readonly v19 ;; @0034 jump block2 ;; diff --git a/tests/disas/icall-simd.wat b/tests/disas/icall-simd.wat index e74bf286a078..2f4e64f45b5f 100644 --- a/tests/disas/icall-simd.wat +++ b/tests/disas/icall-simd.wat @@ -13,7 +13,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64, i8x16) -> i8x16 tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; fn0 = colocated u1:9 sig1 @@ -23,7 +23,7 @@ ;; @0033 v5 = iconst.i32 23 ;; @0033 v6 = icmp uge v2, v5 ; v5 = 23 ;; @0033 v7 = uextend.i64 v2 -;; @0033 v8 = load.i64 notrap aligned readonly v0+88 +;; @0033 v8 = load.i64 notrap aligned readonly v0+72 ;; v29 = iconst.i64 3 ;; @0033 v9 = ishl v7, v29 ; v29 = 3 ;; @0033 v10 = iadd v8, v9 @@ -41,7 +41,7 @@ ;; @0033 jump block3(v19) ;; ;; block3(v15: i64): -;; @0033 v21 = load.i64 notrap aligned readonly v0+80 +;; @0033 v21 = load.i64 notrap aligned readonly v0+64 ;; @0033 v22 = load.i32 notrap aligned readonly v21 ;; @0033 v23 = load.i32 user6 aligned readonly v15+16 ;; @0033 v24 = icmp eq v23, v22 diff --git a/tests/disas/icall.wat b/tests/disas/icall.wat index 89acca10975f..3b1b030e4c5f 100644 --- a/tests/disas/icall.wat +++ b/tests/disas/icall.wat @@ -13,7 +13,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64, f32) -> i32 tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; fn0 = colocated u1:9 sig1 @@ -23,7 +23,7 @@ ;; @0033 v5 = iconst.i32 23 ;; @0033 v6 = icmp uge v2, v5 ; v5 = 23 ;; @0033 v7 = uextend.i64 v2 -;; @0033 v8 = load.i64 notrap aligned readonly v0+88 +;; @0033 v8 = load.i64 notrap aligned readonly v0+72 ;; v29 = iconst.i64 3 ;; @0033 v9 = ishl v7, v29 ; v29 = 3 ;; @0033 v10 = iadd v8, v9 @@ -41,7 +41,7 @@ ;; @0033 jump block3(v19) ;; ;; block3(v15: i64): -;; @0033 v21 = load.i64 notrap aligned readonly v0+80 +;; @0033 v21 = load.i64 notrap aligned readonly v0+64 ;; @0033 v22 = load.i32 notrap aligned readonly v21 ;; @0033 v23 = load.i32 user6 aligned readonly v15+16 ;; @0033 v24 = icmp eq v23, v22 diff --git a/tests/disas/if-unreachable-else-params-2.wat b/tests/disas/if-unreachable-else-params-2.wat index 94d806e8fcc8..5b56c3726179 100644 --- a/tests/disas/if-unreachable-else-params-2.wat +++ b/tests/disas/if-unreachable-else-params-2.wat @@ -24,8 +24,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -34,7 +34,7 @@ ;; ;; block2: ;; @0058 v7 = uextend.i64 v2 -;; @0058 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0058 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0058 v9 = iadd v8, v7 ;; @0058 v10 = sload16.i64 little heap v9 ;; @005c jump block3 diff --git a/tests/disas/if-unreachable-else-params.wat b/tests/disas/if-unreachable-else-params.wat index 65f2e5ecd235..7f72be48ad24 100644 --- a/tests/disas/if-unreachable-else-params.wat +++ b/tests/disas/if-unreachable-else-params.wat @@ -47,8 +47,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -60,7 +60,7 @@ ;; ;; block4: ;; @004b v7 = uextend.i64 v3 ; v3 = 35 -;; @004b v8 = load.i64 notrap aligned readonly checked v0+96 +;; @004b v8 = load.i64 notrap aligned readonly checked v0+80 ;; @004b v9 = iadd v8, v7 ;; @004b v10 = sload16.i64 little heap v9 ;; @004e trap user11 diff --git a/tests/disas/indirect-call-no-caching.wat b/tests/disas/indirect-call-no-caching.wat index 79aa7fa8831e..16b0a85ea2de 100644 --- a/tests/disas/indirect-call-no-caching.wat +++ b/tests/disas/indirect-call-no-caching.wat @@ -67,7 +67,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64) -> i32 tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; fn0 = colocated u1:9 sig1 @@ -77,7 +77,7 @@ ;; @0050 v4 = iconst.i32 10 ;; @0050 v5 = icmp uge v2, v4 ; v4 = 10 ;; @0050 v6 = uextend.i64 v2 -;; @0050 v7 = load.i64 notrap aligned readonly v0+88 +;; @0050 v7 = load.i64 notrap aligned readonly v0+72 ;; v28 = iconst.i64 3 ;; @0050 v8 = ishl v6, v28 ; v28 = 3 ;; @0050 v9 = iadd v7, v8 @@ -95,7 +95,7 @@ ;; @0050 jump block3(v18) ;; ;; block3(v14: i64): -;; @0050 v20 = load.i64 notrap aligned readonly v0+80 +;; @0050 v20 = load.i64 notrap aligned readonly v0+64 ;; @0050 v21 = load.i32 notrap aligned readonly v20 ;; @0050 v22 = load.i32 user6 aligned readonly v14+16 ;; @0050 v23 = icmp eq v22, v21 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat index 5bc92c047b28..817e1ce518e7 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -21,14 +21,14 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; mov w10, w4 ;; sub x9, x9, #4 ;; cmp x10, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x34 -;; 24: ldr x11, [x2, #0x60] +;; 24: ldr x11, [x2, #0x50] ;; str w5, [x11, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -37,14 +37,14 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; mov w10, w4 ;; sub x9, x9, #4 ;; cmp x10, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x74 -;; 64: ldr x11, [x2, #0x60] +;; 64: ldr x11, [x2, #0x50] ;; ldr w2, [x11, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index c95b1d317863..b1c7f1ee795f 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] +;; ldr x11, [x2, #0x58] ;; mov w12, w4 ;; mov x13, #0x1004 ;; sub x11, x11, x13 @@ -29,7 +29,7 @@ ;; cset x12, hi ;; uxtb w12, w12 ;; cbnz x12, #0x3c -;; 28: ldr x13, [x2, #0x60] +;; 28: ldr x13, [x2, #0x50] ;; add x13, x13, #1, lsl #12 ;; str w5, [x13, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -39,7 +39,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] +;; ldr x11, [x2, #0x58] ;; mov w12, w4 ;; mov x13, #0x1004 ;; sub x11, x11, x13 @@ -47,7 +47,7 @@ ;; cset x12, hi ;; uxtb w12, w12 ;; cbnz x12, #0x7c -;; 68: ldr x13, [x2, #0x60] +;; 68: ldr x13, [x2, #0x50] ;; add x12, x13, #1, lsl #12 ;; ldr w2, [x12, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 764beed77266..d5685f063469 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -25,12 +25,12 @@ ;; mov w13, #-0xfffc ;; adds x12, x12, x13 ;; b.hs #0x44 -;; 18: ldr x13, [x2, #0x68] +;; 18: ldr x13, [x2, #0x58] ;; cmp x12, x13 ;; cset x14, hi ;; uxtb w14, w14 ;; cbnz x14, #0x48 -;; 2c: ldr x15, [x2, #0x60] +;; 2c: ldr x15, [x2, #0x50] ;; add x15, x15, w4, uxtw ;; mov x0, #0xffff0000 ;; str w5, [x15, x0] @@ -46,12 +46,12 @@ ;; mov w13, #-0xfffc ;; adds x12, x12, x13 ;; b.hs #0xa4 -;; 78: ldr x13, [x2, #0x68] +;; 78: ldr x13, [x2, #0x58] ;; cmp x12, x13 ;; cset x14, hi ;; uxtb w14, w14 ;; cbnz x14, #0xa8 -;; 8c: ldr x15, [x2, #0x60] +;; 8c: ldr x15, [x2, #0x50] ;; add x15, x15, w4, uxtw ;; mov x0, #0xffff0000 ;; ldr w2, [x15, x0] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat index 8c4a83eeb05c..78cb57b3ff1a 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; mov w9, w4 ;; cmp x9, x8 ;; cset x9, hs ;; uxtb w9, w9 ;; cbnz x9, #0x30 -;; 20: ldr x10, [x2, #0x60] +;; 20: ldr x10, [x2, #0x50] ;; strb w5, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -36,13 +36,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; mov w9, w4 ;; cmp x9, x8 ;; cset x9, hs ;; uxtb w9, w9 ;; cbnz x9, #0x70 -;; 60: ldr x10, [x2, #0x60] +;; 60: ldr x10, [x2, #0x50] ;; ldrb w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index c26945126e66..927539ca363a 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] +;; ldr x11, [x2, #0x58] ;; mov w12, w4 ;; mov x13, #0x1001 ;; sub x11, x11, x13 @@ -29,7 +29,7 @@ ;; cset x12, hi ;; uxtb w12, w12 ;; cbnz x12, #0x3c -;; 28: ldr x13, [x2, #0x60] +;; 28: ldr x13, [x2, #0x50] ;; add x13, x13, #1, lsl #12 ;; strb w5, [x13, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -39,7 +39,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] +;; ldr x11, [x2, #0x58] ;; mov w12, w4 ;; mov x13, #0x1001 ;; sub x11, x11, x13 @@ -47,7 +47,7 @@ ;; cset x12, hi ;; uxtb w12, w12 ;; cbnz x12, #0x7c -;; 68: ldr x13, [x2, #0x60] +;; 68: ldr x13, [x2, #0x50] ;; add x12, x13, #1, lsl #12 ;; ldrb w2, [x12, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 893da217e6b0..4aabc3097d38 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -25,12 +25,12 @@ ;; mov w13, #-0xffff ;; adds x12, x12, x13 ;; b.hs #0x44 -;; 18: ldr x13, [x2, #0x68] +;; 18: ldr x13, [x2, #0x58] ;; cmp x12, x13 ;; cset x14, hi ;; uxtb w14, w14 ;; cbnz x14, #0x48 -;; 2c: ldr x15, [x2, #0x60] +;; 2c: ldr x15, [x2, #0x50] ;; add x15, x15, w4, uxtw ;; mov x0, #0xffff0000 ;; strb w5, [x15, x0] @@ -46,12 +46,12 @@ ;; mov w13, #-0xffff ;; adds x12, x12, x13 ;; b.hs #0xa4 -;; 78: ldr x13, [x2, #0x68] +;; 78: ldr x13, [x2, #0x58] ;; cmp x12, x13 ;; cset x14, hi ;; uxtb w14, w14 ;; cbnz x14, #0xa8 -;; 8c: ldr x15, [x2, #0x60] +;; 8c: ldr x15, [x2, #0x50] ;; add x15, x15, w4, uxtw ;; mov x0, #0xffff0000 ;; ldrb w2, [x15, x0] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat index 0c2d8d5c4656..5ed905975a10 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x12, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x12, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; sub x12, x12, #4 ;; mov x13, #0 @@ -37,8 +37,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x12, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x12, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; sub x12, x12, #4 ;; mov x13, #0 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 8f67fc90c312..b467bacfa8a3 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x14, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x14, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w12, w4 ;; mov x15, #0x1004 ;; sub x14, x14, x15 @@ -39,8 +39,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x14, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x14, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w12, w4 ;; mov x15, #0x1004 ;; sub x14, x14, x15 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index a85f305440f7..a96943f499e4 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -25,8 +25,8 @@ ;; mov w14, #-0xfffc ;; adds x13, x13, x14 ;; b.hs #0x48 -;; 18: ldr x14, [x2, #0x68] -;; ldr x0, [x2, #0x60] +;; 18: ldr x14, [x2, #0x58] +;; ldr x0, [x2, #0x50] ;; mov x15, #0 ;; add x0, x0, w4, uxtw ;; mov x1, #0xffff0000 @@ -46,8 +46,8 @@ ;; mov w14, #-0xfffc ;; adds x13, x13, x14 ;; b.hs #0xa8 -;; 78: ldr x14, [x2, #0x68] -;; ldr x0, [x2, #0x60] +;; 78: ldr x14, [x2, #0x58] +;; ldr x0, [x2, #0x50] ;; mov x15, #0 ;; add x0, x0, w4, uxtw ;; mov x1, #0xffff0000 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat index 298b807e54ad..d477949d5f19 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x10, x10, w4, uxtw @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x10, x10, w4, uxtw diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 1b56a34567e7..80d721c7ca6b 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x14, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x14, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w12, w4 ;; mov x15, #0x1001 ;; sub x14, x14, x15 @@ -39,8 +39,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x14, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x14, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w12, w4 ;; mov x15, #0x1001 ;; sub x14, x14, x15 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 5e741a7e7ee1..5c0bb1ae6ad6 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -25,8 +25,8 @@ ;; mov w14, #-0xffff ;; adds x13, x13, x14 ;; b.hs #0x48 -;; 18: ldr x14, [x2, #0x68] -;; ldr x0, [x2, #0x60] +;; 18: ldr x14, [x2, #0x58] +;; ldr x0, [x2, #0x50] ;; mov x15, #0 ;; add x0, x0, w4, uxtw ;; mov x1, #0xffff0000 @@ -46,8 +46,8 @@ ;; mov w14, #-0xffff ;; adds x13, x13, x14 ;; b.hs #0xa8 -;; 78: ldr x14, [x2, #0x68] -;; ldr x0, [x2, #0x60] +;; 78: ldr x14, [x2, #0x58] +;; ldr x0, [x2, #0x50] ;; mov x15, #0 ;; add x0, x0, w4, uxtw ;; mov x1, #0xffff0000 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 6ec30168b498..8f0609d056ec 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; mov w9, w4 ;; cmp x9, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x30 -;; 20: ldr x10, [x2, #0x60] +;; 20: ldr x10, [x2, #0x50] ;; str w5, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -36,13 +36,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; mov w9, w4 ;; cmp x9, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x70 -;; 60: ldr x10, [x2, #0x60] +;; 60: ldr x10, [x2, #0x50] ;; ldr w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 2f47418efd82..d1a15294d378 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; mov w10, w4 ;; cmp x10, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x34 -;; 20: ldr x11, [x2, #0x60] +;; 20: ldr x11, [x2, #0x50] ;; add x11, x11, #1, lsl #12 ;; str w5, [x11, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -37,13 +37,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; mov w10, w4 ;; cmp x10, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x74 -;; 60: ldr x11, [x2, #0x60] +;; 60: ldr x11, [x2, #0x50] ;; add x10, x11, #1, lsl #12 ;; ldr w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 794d8023da00..20cd562e670c 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov w11, w4 ;; cmp x11, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x38 -;; 20: ldr x12, [x2, #0x60] +;; 20: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; str w5, [x12, x13] @@ -38,13 +38,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov w11, w4 ;; cmp x11, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x78 -;; 60: ldr x12, [x2, #0x60] +;; 60: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; ldr w2, [x12, x13] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 8c44b5e0926b..3c41eef8c201 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; mov w9, w4 ;; cmp x9, x8 ;; cset x9, hs ;; uxtb w9, w9 ;; cbnz x9, #0x30 -;; 20: ldr x10, [x2, #0x60] +;; 20: ldr x10, [x2, #0x50] ;; strb w5, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -36,13 +36,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; mov w9, w4 ;; cmp x9, x8 ;; cset x9, hs ;; uxtb w9, w9 ;; cbnz x9, #0x70 -;; 60: ldr x10, [x2, #0x60] +;; 60: ldr x10, [x2, #0x50] ;; ldrb w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 096dc99979f3..03cf61a3b5e0 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; mov w10, w4 ;; cmp x10, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x34 -;; 20: ldr x11, [x2, #0x60] +;; 20: ldr x11, [x2, #0x50] ;; add x11, x11, #1, lsl #12 ;; strb w5, [x11, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -37,13 +37,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; mov w10, w4 ;; cmp x10, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x74 -;; 60: ldr x11, [x2, #0x60] +;; 60: ldr x11, [x2, #0x50] ;; add x10, x11, #1, lsl #12 ;; ldrb w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 6151554c704b..a7e2b77f99e5 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov w11, w4 ;; cmp x11, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x38 -;; 20: ldr x12, [x2, #0x60] +;; 20: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; strb w5, [x12, x13] @@ -38,13 +38,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov w11, w4 ;; cmp x11, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x78 -;; 60: ldr x12, [x2, #0x60] +;; 60: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; ldrb w2, [x12, x13] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index f3903541f550..973d9307a835 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x10, x10, w4, uxtw @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x10, x10, w4, uxtw diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 9686f819ac41..feb9575d5a25 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x13, x13, w4, uxtw @@ -37,8 +37,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x13, x13, w4, uxtw diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 754ce447cec7..74355c4979b4 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] -;; ldr x14, [x2, #0x60] +;; ldr x11, [x2, #0x58] +;; ldr x14, [x2, #0x50] ;; mov w12, w4 ;; mov x13, #0 ;; add x14, x14, w4, uxtw @@ -38,8 +38,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] -;; ldr x14, [x2, #0x60] +;; ldr x11, [x2, #0x58] +;; ldr x14, [x2, #0x50] ;; mov w12, w4 ;; mov x13, #0 ;; add x14, x14, w4, uxtw diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 721814701f2d..cdcc81a01512 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x10, x10, w4, uxtw @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x10, x10, w4, uxtw diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index d309f16cf7df..2c9b85eec2ea 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x13, x13, w4, uxtw @@ -37,8 +37,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x13, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x13, [x2, #0x50] ;; mov w11, w4 ;; mov x12, #0 ;; add x13, x13, w4, uxtw diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 9446be12e395..933e9d2643b1 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] -;; ldr x14, [x2, #0x60] +;; ldr x11, [x2, #0x58] +;; ldr x14, [x2, #0x50] ;; mov w12, w4 ;; mov x13, #0 ;; add x14, x14, w4, uxtw @@ -38,8 +38,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x11, [x2, #0x68] -;; ldr x14, [x2, #0x60] +;; ldr x11, [x2, #0x58] +;; ldr x14, [x2, #0x50] ;; mov w12, w4 ;; mov x13, #0 ;; add x14, x14, w4, uxtw diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat index de413f00db87..0164b4c05408 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -21,13 +21,13 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; sub x8, x8, #4 ;; cmp x4, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x30 -;; 20: ldr x10, [x2, #0x60] +;; 20: ldr x10, [x2, #0x50] ;; str w5, [x10, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -36,13 +36,13 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; sub x8, x8, #4 ;; cmp x4, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x70 -;; 60: ldr x10, [x2, #0x60] +;; 60: ldr x10, [x2, #0x50] ;; ldr w2, [x10, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 890701a5dbc9..981d7086271c 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,14 +21,14 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov x11, #0x1004 ;; sub x10, x10, x11 ;; cmp x4, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x38 -;; 24: ldr x12, [x2, #0x60] +;; 24: ldr x12, [x2, #0x50] ;; add x12, x12, #1, lsl #12 ;; str w5, [x12, x4] ;; ldp x29, x30, [sp], #0x10 @@ -38,14 +38,14 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov x11, #0x1004 ;; sub x10, x10, x11 ;; cmp x4, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x78 -;; 64: ldr x12, [x2, #0x60] +;; 64: ldr x12, [x2, #0x50] ;; add x11, x12, #1, lsl #12 ;; ldr w2, [x11, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 9426c4c7a5b9..8ebec048ad16 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -24,12 +24,12 @@ ;; mov w11, #-0xfffc ;; adds x11, x4, x11 ;; b.hs #0x40 -;; 14: ldr x12, [x2, #0x68] +;; 14: ldr x12, [x2, #0x58] ;; cmp x11, x12 ;; cset x13, hi ;; uxtb w13, w13 ;; cbnz x13, #0x44 -;; 28: ldr x14, [x2, #0x60] +;; 28: ldr x14, [x2, #0x50] ;; add x14, x14, x4 ;; mov x15, #0xffff0000 ;; str w5, [x14, x15] @@ -44,12 +44,12 @@ ;; mov w11, #-0xfffc ;; adds x11, x4, x11 ;; b.hs #0xa0 -;; 74: ldr x12, [x2, #0x68] +;; 74: ldr x12, [x2, #0x58] ;; cmp x11, x12 ;; cset x13, hi ;; uxtb w13, w13 ;; cbnz x13, #0xa4 -;; 88: ldr x14, [x2, #0x60] +;; 88: ldr x14, [x2, #0x50] ;; add x14, x14, x4 ;; mov x15, #0xffff0000 ;; ldr w2, [x14, x15] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat index c65633018e0a..5f1c8b34332c 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x7, [x2, #0x68] +;; ldr x7, [x2, #0x58] ;; cmp x4, x7 ;; cset x8, hs ;; uxtb w8, w8 ;; cbnz x8, #0x2c -;; 1c: ldr x9, [x2, #0x60] +;; 1c: ldr x9, [x2, #0x50] ;; strb w5, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -35,12 +35,12 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x7, [x2, #0x68] +;; ldr x7, [x2, #0x58] ;; cmp x4, x7 ;; cset x8, hs ;; uxtb w8, w8 ;; cbnz x8, #0x6c -;; 5c: ldr x9, [x2, #0x60] +;; 5c: ldr x9, [x2, #0x50] ;; ldrb w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index 4d5f3ec2c05c..a5161f055b0d 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,14 +21,14 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov x11, #0x1001 ;; sub x10, x10, x11 ;; cmp x4, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x38 -;; 24: ldr x12, [x2, #0x60] +;; 24: ldr x12, [x2, #0x50] ;; add x12, x12, #1, lsl #12 ;; strb w5, [x12, x4] ;; ldp x29, x30, [sp], #0x10 @@ -38,14 +38,14 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] +;; ldr x10, [x2, #0x58] ;; mov x11, #0x1001 ;; sub x10, x10, x11 ;; cmp x4, x10 ;; cset x11, hi ;; uxtb w11, w11 ;; cbnz x11, #0x78 -;; 64: ldr x12, [x2, #0x60] +;; 64: ldr x12, [x2, #0x50] ;; add x11, x12, #1, lsl #12 ;; ldrb w2, [x11, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 6b6d1e1b6459..ec14abf6571c 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -24,12 +24,12 @@ ;; mov w11, #-0xffff ;; adds x11, x4, x11 ;; b.hs #0x40 -;; 14: ldr x12, [x2, #0x68] +;; 14: ldr x12, [x2, #0x58] ;; cmp x11, x12 ;; cset x13, hi ;; uxtb w13, w13 ;; cbnz x13, #0x44 -;; 28: ldr x14, [x2, #0x60] +;; 28: ldr x14, [x2, #0x50] ;; add x14, x14, x4 ;; mov x15, #0xffff0000 ;; strb w5, [x14, x15] @@ -44,12 +44,12 @@ ;; mov w11, #-0xffff ;; adds x11, x4, x11 ;; b.hs #0xa0 -;; 74: ldr x12, [x2, #0x68] +;; 74: ldr x12, [x2, #0x58] ;; cmp x11, x12 ;; cset x13, hi ;; uxtb w13, w13 ;; cbnz x13, #0xa4 -;; 88: ldr x14, [x2, #0x60] +;; 88: ldr x14, [x2, #0x50] ;; add x14, x14, x4 ;; mov x15, #0xffff0000 ;; ldrb w2, [x14, x15] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat index b80fd679d465..4ca51df4236a 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x9, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x9, [x2, #0x50] ;; sub x10, x10, #4 ;; mov x11, #0 ;; add x9, x9, x4 @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x9, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x9, [x2, #0x50] ;; sub x10, x10, #4 ;; mov x11, #0 ;; add x9, x9, x4 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index b138a1099b35..b5e0cea10a4f 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x12, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x12, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x13, #0x1004 ;; sub x12, x12, x13 ;; mov x13, #0 @@ -38,8 +38,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x12, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x12, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x13, #0x1004 ;; sub x12, x12, x13 ;; mov x13, #0 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 2d1c0ef7e1f9..46d323d9df9b 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -24,8 +24,8 @@ ;; mov w12, #-0xfffc ;; adds x12, x4, x12 ;; b.hs #0x44 -;; 14: ldr x13, [x2, #0x68] -;; ldr x15, [x2, #0x60] +;; 14: ldr x13, [x2, #0x58] +;; ldr x15, [x2, #0x50] ;; mov x14, #0 ;; add x15, x15, x4 ;; mov x0, #0xffff0000 @@ -44,8 +44,8 @@ ;; mov w12, #-0xfffc ;; adds x12, x4, x12 ;; b.hs #0xa4 -;; 74: ldr x13, [x2, #0x68] -;; ldr x15, [x2, #0x60] +;; 74: ldr x13, [x2, #0x58] +;; ldr x15, [x2, #0x50] ;; mov x14, #0 ;; add x15, x15, x4 ;; mov x0, #0xffff0000 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat index 9dd106e73189..297e3d2c6839 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x8, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov x9, #0 ;; add x10, x10, x4 ;; cmp x4, x8 @@ -35,8 +35,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x8, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov x9, #0 ;; add x10, x10, x4 ;; cmp x4, x8 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 4f4cb67b89d8..dbb4767670b8 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x12, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x12, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x13, #0x1001 ;; sub x12, x12, x13 ;; mov x13, #0 @@ -38,8 +38,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x12, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x12, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x13, #0x1001 ;; sub x12, x12, x13 ;; mov x13, #0 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index bbbe7259652e..e3631568f2c7 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -24,8 +24,8 @@ ;; mov w12, #-0xffff ;; adds x12, x4, x12 ;; b.hs #0x44 -;; 14: ldr x13, [x2, #0x68] -;; ldr x15, [x2, #0x60] +;; 14: ldr x13, [x2, #0x58] +;; ldr x15, [x2, #0x50] ;; mov x14, #0 ;; add x15, x15, x4 ;; mov x0, #0xffff0000 @@ -44,8 +44,8 @@ ;; mov w12, #-0xffff ;; adds x12, x4, x12 ;; b.hs #0xa4 -;; 74: ldr x13, [x2, #0x68] -;; ldr x15, [x2, #0x60] +;; 74: ldr x13, [x2, #0x58] +;; ldr x15, [x2, #0x50] ;; mov x14, #0 ;; add x15, x15, x4 ;; mov x0, #0xffff0000 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 8d92a58a3edb..e0069345e8da 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x7, [x2, #0x68] +;; ldr x7, [x2, #0x58] ;; cmp x4, x7 ;; cset x8, hi ;; uxtb w8, w8 ;; cbnz x8, #0x2c -;; 1c: ldr x9, [x2, #0x60] +;; 1c: ldr x9, [x2, #0x50] ;; str w5, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -35,12 +35,12 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x7, [x2, #0x68] +;; ldr x7, [x2, #0x58] ;; cmp x4, x7 ;; cset x8, hi ;; uxtb w8, w8 ;; cbnz x8, #0x6c -;; 5c: ldr x9, [x2, #0x60] +;; 5c: ldr x9, [x2, #0x50] ;; ldr w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index fb66bb7cfd35..f2b1a1e2d6e7 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; cmp x4, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x30 -;; 1c: ldr x10, [x2, #0x60] +;; 1c: ldr x10, [x2, #0x50] ;; add x10, x10, #1, lsl #12 ;; str w5, [x10, x4] ;; ldp x29, x30, [sp], #0x10 @@ -36,12 +36,12 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; cmp x4, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x70 -;; 5c: ldr x10, [x2, #0x60] +;; 5c: ldr x10, [x2, #0x50] ;; add x9, x10, #1, lsl #12 ;; ldr w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 678049652b3c..0296335777ec 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; cmp x4, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x34 -;; 1c: ldr x11, [x2, #0x60] +;; 1c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; str w5, [x11, x12] @@ -37,12 +37,12 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; cmp x4, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x74 -;; 5c: ldr x11, [x2, #0x60] +;; 5c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; ldr w2, [x11, x12] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 80d5bdebaf71..f183e5c035fa 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x7, [x2, #0x68] +;; ldr x7, [x2, #0x58] ;; cmp x4, x7 ;; cset x8, hs ;; uxtb w8, w8 ;; cbnz x8, #0x2c -;; 1c: ldr x9, [x2, #0x60] +;; 1c: ldr x9, [x2, #0x50] ;; strb w5, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -35,12 +35,12 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x7, [x2, #0x68] +;; ldr x7, [x2, #0x58] ;; cmp x4, x7 ;; cset x8, hs ;; uxtb w8, w8 ;; cbnz x8, #0x6c -;; 5c: ldr x9, [x2, #0x60] +;; 5c: ldr x9, [x2, #0x50] ;; ldrb w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 8aeca10ce6a3..4ca9c94255ff 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; cmp x4, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x30 -;; 1c: ldr x10, [x2, #0x60] +;; 1c: ldr x10, [x2, #0x50] ;; add x10, x10, #1, lsl #12 ;; strb w5, [x10, x4] ;; ldp x29, x30, [sp], #0x10 @@ -36,12 +36,12 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] +;; ldr x8, [x2, #0x58] ;; cmp x4, x8 ;; cset x9, hi ;; uxtb w9, w9 ;; cbnz x9, #0x70 -;; 5c: ldr x10, [x2, #0x60] +;; 5c: ldr x10, [x2, #0x50] ;; add x9, x10, #1, lsl #12 ;; ldrb w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 966282eee04e..884fabff6f0c 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; cmp x4, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x34 -;; 1c: ldr x11, [x2, #0x60] +;; 1c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; strb w5, [x11, x12] @@ -37,12 +37,12 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] +;; ldr x9, [x2, #0x58] ;; cmp x4, x9 ;; cset x10, hi ;; uxtb w10, w10 ;; cbnz x10, #0x74 -;; 5c: ldr x11, [x2, #0x60] +;; 5c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; ldrb w2, [x11, x12] diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 490d79313b09..2f649ebfd334 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x8, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov x9, #0 ;; add x10, x10, x4 ;; cmp x4, x8 @@ -35,8 +35,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x8, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov x9, #0 ;; add x10, x10, x4 ;; cmp x4, x8 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 5b3596475a7b..17d3a018a1ae 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x10, #0 ;; add x11, x11, x4 ;; add x11, x11, #1, lsl #12 @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x10, #0 ;; add x11, x11, x4 ;; add x11, x11, #1, lsl #12 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 531779ba6151..b5d8c250ecf3 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x12, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x12, [x2, #0x50] ;; mov x11, #0 ;; add x12, x12, x4 ;; mov x13, #0xffff0000 @@ -37,8 +37,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x12, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x12, [x2, #0x50] ;; mov x11, #0 ;; add x12, x12, x4 ;; mov x13, #0xffff0000 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 8ca435057a07..99f8ead12cef 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x8, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov x9, #0 ;; add x10, x10, x4 ;; cmp x4, x8 @@ -35,8 +35,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x8, [x2, #0x68] -;; ldr x10, [x2, #0x60] +;; ldr x8, [x2, #0x58] +;; ldr x10, [x2, #0x50] ;; mov x9, #0 ;; add x10, x10, x4 ;; cmp x4, x8 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 6860cd7a43ef..9c885b54febd 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x10, #0 ;; add x11, x11, x4 ;; add x11, x11, #1, lsl #12 @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x9, [x2, #0x68] -;; ldr x11, [x2, #0x60] +;; ldr x9, [x2, #0x58] +;; ldr x11, [x2, #0x50] ;; mov x10, #0 ;; add x11, x11, x4 ;; add x11, x11, #1, lsl #12 diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 1d6ace91cb87..15cdf18b455f 100644 --- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x12, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x12, [x2, #0x50] ;; mov x11, #0 ;; add x12, x12, x4 ;; mov x13, #0xffff0000 @@ -37,8 +37,8 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x10, [x2, #0x68] -;; ldr x12, [x2, #0x60] +;; ldr x10, [x2, #0x58] +;; ldr x12, [x2, #0x50] ;; mov x11, #0 ;; add x12, x12, x4 ;; mov x13, #0xffff0000 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat index 21722e005990..a960ad0d06c8 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -27,7 +27,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x30 -;; 20: ldr x10, [x2, #0x60] +;; 20: ldr x10, [x2, #0x50] ;; str w5, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -42,7 +42,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x70 -;; 60: ldr x10, [x2, #0x60] +;; 60: ldr x10, [x2, #0x50] ;; ldr w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 23df9b6d1752..fba2eb8f2728 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -27,7 +27,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x34 -;; 20: ldr x11, [x2, #0x60] +;; 20: ldr x11, [x2, #0x50] ;; add x11, x11, #1, lsl #12 ;; str w5, [x11, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -43,7 +43,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x74 -;; 60: ldr x11, [x2, #0x60] +;; 60: ldr x11, [x2, #0x50] ;; add x10, x11, #1, lsl #12 ;; ldr w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 04c28460e6ae..ec70e4699c39 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -27,7 +27,7 @@ ;; cset x12, hi ;; uxtb w11, w12 ;; cbnz x11, #0x38 -;; 20: ldr x12, [x2, #0x60] +;; 20: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; str w5, [x12, x13] @@ -44,7 +44,7 @@ ;; cset x12, hi ;; uxtb w11, w12 ;; cbnz x11, #0x78 -;; 60: ldr x12, [x2, #0x60] +;; 60: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; ldr w2, [x12, x13] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat index bdf65c50b524..a93b915c14a8 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; strb w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -29,7 +29,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; ldrb w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index 841b0d0abad5..a7490b99b02f 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -27,7 +27,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x34 -;; 20: ldr x11, [x2, #0x60] +;; 20: ldr x11, [x2, #0x50] ;; add x11, x11, #1, lsl #12 ;; strb w5, [x11, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -43,7 +43,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x74 -;; 60: ldr x11, [x2, #0x60] +;; 60: ldr x11, [x2, #0x50] ;; add x10, x11, #1, lsl #12 ;; ldrb w2, [x10, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 4d409796c166..5cfa11aecce6 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -27,7 +27,7 @@ ;; cset x12, hi ;; uxtb w11, w12 ;; cbnz x11, #0x38 -;; 20: ldr x12, [x2, #0x60] +;; 20: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; strb w5, [x12, x13] @@ -44,7 +44,7 @@ ;; cset x12, hi ;; uxtb w11, w12 ;; cbnz x11, #0x78 -;; 60: ldr x12, [x2, #0x60] +;; 60: ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; mov x13, #0xffff0000 ;; ldrb w2, [x12, x13] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat index 2a2f42d13f2e..5110d57d3f86 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -23,7 +23,7 @@ ;; mov x29, sp ;; mov w9, w4 ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, w4, uxtw ;; orr x8, xzr, #0xfffffffc ;; cmp x9, x8 @@ -38,7 +38,7 @@ ;; mov x29, sp ;; mov w9, w4 ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, w4, uxtw ;; orr x8, xzr, #0xfffffffc ;; cmp x9, x8 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 1ad46aa95d77..0afd47b181c3 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; mov x29, sp ;; mov w10, w4 ;; mov x11, #0 -;; ldr x12, [x2, #0x60] +;; ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; add x12, x12, #1, lsl #12 ;; mov w9, #-0x1004 @@ -39,7 +39,7 @@ ;; mov x29, sp ;; mov w10, w4 ;; mov x11, #0 -;; ldr x12, [x2, #0x60] +;; ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; add x12, x12, #1, lsl #12 ;; mov w9, #-0x1004 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index a99f48bbd7a3..5caac4fd1421 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; mov x29, sp ;; mov w11, w4 ;; mov x12, #0 -;; ldr x13, [x2, #0x60] +;; ldr x13, [x2, #0x50] ;; add x13, x13, w4, uxtw ;; mov x14, #0xffff0000 ;; add x13, x13, x14 @@ -40,7 +40,7 @@ ;; mov x29, sp ;; mov w11, w4 ;; mov x12, #0 -;; ldr x13, [x2, #0x60] +;; ldr x13, [x2, #0x50] ;; add x13, x13, w4, uxtw ;; mov x14, #0xffff0000 ;; add x13, x13, x14 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat index 947cd23f62b3..88f223951c00 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; strb w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -29,7 +29,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; ldrb w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index f559890ec540..d5f8d469825a 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; mov x29, sp ;; mov w10, w4 ;; mov x11, #0 -;; ldr x12, [x2, #0x60] +;; ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; add x12, x12, #1, lsl #12 ;; mov w9, #-0x1001 @@ -39,7 +39,7 @@ ;; mov x29, sp ;; mov w10, w4 ;; mov x11, #0 -;; ldr x12, [x2, #0x60] +;; ldr x12, [x2, #0x50] ;; add x12, x12, w4, uxtw ;; add x12, x12, #1, lsl #12 ;; mov w9, #-0x1001 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 01af96a488b6..eb2cff27e9e0 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; mov x29, sp ;; mov w11, w4 ;; mov x12, #0 -;; ldr x13, [x2, #0x60] +;; ldr x13, [x2, #0x50] ;; add x13, x13, w4, uxtw ;; mov x14, #0xffff0000 ;; add x13, x13, x14 @@ -40,7 +40,7 @@ ;; mov x29, sp ;; mov w11, w4 ;; mov x12, #0 -;; ldr x13, [x2, #0x60] +;; ldr x13, [x2, #0x50] ;; add x13, x13, w4, uxtw ;; mov x14, #0xffff0000 ;; add x13, x13, x14 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 52666478fc49..300c7f5ad2c7 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; str w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -29,7 +29,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; ldr w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index a858346ba573..d0cf5c4931bb 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, #1, lsl #12 ;; str w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -30,7 +30,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; add x5, x5, #1, lsl #12 ;; ldr w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 7f62a9cd3614..dc26c5878b94 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; str w5, [x6, x7] @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; ldr w2, [x6, x7] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 87ff7c870f3a..54e404241387 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; strb w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -29,7 +29,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; ldrb w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 8aeab764d10e..384be4eeca81 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, #1, lsl #12 ;; strb w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -30,7 +30,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; add x5, x5, #1, lsl #12 ;; ldrb w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 759f4302dea5..4b8cb6eaa0df 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; strb w5, [x6, x7] @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; ldrb w2, [x6, x7] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 60743158f12e..5c6943ab38aa 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; str w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -29,7 +29,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; ldr w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index f9e85fe699c7..4bef1824152b 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, #1, lsl #12 ;; str w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -30,7 +30,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; add x5, x5, #1, lsl #12 ;; ldr w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 45f6d856cfc8..71e7f6c59313 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; str w5, [x6, x7] @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; ldr w2, [x6, x7] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 43d6cf4d10a9..f461845f88f0 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; strb w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -29,7 +29,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; ldrb w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 23787e0a51d1..2beef7a42d75 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, #1, lsl #12 ;; strb w5, [x6, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 @@ -30,7 +30,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x5, [x2, #0x60] +;; ldr x5, [x2, #0x50] ;; add x5, x5, #1, lsl #12 ;; ldrb w2, [x5, w4, uxtw] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 5c317ff30e0f..29b1eb212bf8 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; strb w5, [x6, x7] @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp -;; ldr x6, [x2, #0x60] +;; ldr x6, [x2, #0x50] ;; add x6, x6, w4, uxtw ;; mov x7, #0xffff0000 ;; ldrb w2, [x6, x7] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat index 103c1801450e..aa6fddd775e8 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -26,7 +26,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x2c -;; 1c: ldr x9, [x2, #0x60] +;; 1c: ldr x9, [x2, #0x50] ;; str w5, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -40,7 +40,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x6c -;; 5c: ldr x9, [x2, #0x60] +;; 5c: ldr x9, [x2, #0x50] ;; ldr w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 812eea2c61e2..97c92b0943cf 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -26,7 +26,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x30 -;; 1c: ldr x10, [x2, #0x60] +;; 1c: ldr x10, [x2, #0x50] ;; add x10, x10, #1, lsl #12 ;; str w5, [x10, x4] ;; ldp x29, x30, [sp], #0x10 @@ -41,7 +41,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x70 -;; 5c: ldr x10, [x2, #0x60] +;; 5c: ldr x10, [x2, #0x50] ;; add x9, x10, #1, lsl #12 ;; ldr w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index caffde1f0018..a9a609238d71 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x34 -;; 1c: ldr x11, [x2, #0x60] +;; 1c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; str w5, [x11, x12] @@ -42,7 +42,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x74 -;; 5c: ldr x11, [x2, #0x60] +;; 5c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; ldr w2, [x11, x12] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat index 4a12d1fff1bb..7e386a447608 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -26,7 +26,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x2c -;; 1c: ldr x9, [x2, #0x60] +;; 1c: ldr x9, [x2, #0x50] ;; strb w5, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -40,7 +40,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x6c -;; 5c: ldr x9, [x2, #0x60] +;; 5c: ldr x9, [x2, #0x50] ;; ldrb w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index aee222f0cfc9..fe5be61f1072 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -26,7 +26,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x30 -;; 1c: ldr x10, [x2, #0x60] +;; 1c: ldr x10, [x2, #0x50] ;; add x10, x10, #1, lsl #12 ;; strb w5, [x10, x4] ;; ldp x29, x30, [sp], #0x10 @@ -41,7 +41,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x70 -;; 5c: ldr x10, [x2, #0x60] +;; 5c: ldr x10, [x2, #0x50] ;; add x9, x10, #1, lsl #12 ;; ldrb w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index a0e1ff8c200c..ccba09698958 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x34 -;; 1c: ldr x11, [x2, #0x60] +;; 1c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; strb w5, [x11, x12] @@ -42,7 +42,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x74 -;; 5c: ldr x11, [x2, #0x60] +;; 5c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; ldrb w2, [x11, x12] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat index e17df6ffa803..ab432e030050 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xfffffffc ;; cmp x4, x7 @@ -36,7 +36,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xfffffffc ;; cmp x4, x7 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index f187c41f8d9e..533d750aa867 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1004 @@ -37,7 +37,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1004 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 0cb2e2f96e40..0b942d0f7485 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 @@ -38,7 +38,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat index f656c7e15176..e155a3f82d63 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xffffffff ;; cmp x4, x7 @@ -36,7 +36,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xffffffff ;; cmp x4, x7 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 0dab697bc75d..5a07a9bc0a25 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1001 @@ -37,7 +37,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1001 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 9710e552d1f4..1cebeb777120 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 @@ -38,7 +38,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 1c2cef991ce9..360d1b0cd500 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -26,7 +26,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x2c -;; 1c: ldr x9, [x2, #0x60] +;; 1c: ldr x9, [x2, #0x50] ;; str w5, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -40,7 +40,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x6c -;; 5c: ldr x9, [x2, #0x60] +;; 5c: ldr x9, [x2, #0x50] ;; ldr w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 150c2e0843c2..a69c88dfbd96 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -26,7 +26,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x30 -;; 1c: ldr x10, [x2, #0x60] +;; 1c: ldr x10, [x2, #0x50] ;; add x10, x10, #1, lsl #12 ;; str w5, [x10, x4] ;; ldp x29, x30, [sp], #0x10 @@ -41,7 +41,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x70 -;; 5c: ldr x10, [x2, #0x60] +;; 5c: ldr x10, [x2, #0x50] ;; add x9, x10, #1, lsl #12 ;; ldr w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 49588433e044..211c65bdf9f2 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x34 -;; 1c: ldr x11, [x2, #0x60] +;; 1c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; str w5, [x11, x12] @@ -42,7 +42,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x74 -;; 5c: ldr x11, [x2, #0x60] +;; 5c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; ldr w2, [x11, x12] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 766a97cbec5f..ea45fcc7980c 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -26,7 +26,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x2c -;; 1c: ldr x9, [x2, #0x60] +;; 1c: ldr x9, [x2, #0x50] ;; strb w5, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret @@ -40,7 +40,7 @@ ;; cset x9, hi ;; uxtb w8, w9 ;; cbnz x8, #0x6c -;; 5c: ldr x9, [x2, #0x60] +;; 5c: ldr x9, [x2, #0x50] ;; ldrb w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 ;; ret diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 5496a05dfaa0..80e1bd2b641b 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -26,7 +26,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x30 -;; 1c: ldr x10, [x2, #0x60] +;; 1c: ldr x10, [x2, #0x50] ;; add x10, x10, #1, lsl #12 ;; strb w5, [x10, x4] ;; ldp x29, x30, [sp], #0x10 @@ -41,7 +41,7 @@ ;; cset x10, hi ;; uxtb w9, w10 ;; cbnz x9, #0x70 -;; 5c: ldr x10, [x2, #0x60] +;; 5c: ldr x10, [x2, #0x50] ;; add x9, x10, #1, lsl #12 ;; ldrb w2, [x9, x4] ;; ldp x29, x30, [sp], #0x10 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 71bebf1e9a21..f07ed2fb01c2 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x34 -;; 1c: ldr x11, [x2, #0x60] +;; 1c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; strb w5, [x11, x12] @@ -42,7 +42,7 @@ ;; cset x11, hi ;; uxtb w10, w11 ;; cbnz x10, #0x74 -;; 5c: ldr x11, [x2, #0x60] +;; 5c: ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; ldrb w2, [x11, x12] diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index a379138cade4..1d4d46fe44e1 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xfffffffc ;; cmp x4, x7 @@ -36,7 +36,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xfffffffc ;; cmp x4, x7 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index dc3c83021c0c..c5987c2d7d0e 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1004 @@ -37,7 +37,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1004 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index a948473cb26f..f135dbff39c9 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 @@ -38,7 +38,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 3f286f6a28b1..39ea614580bb 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xffffffff ;; cmp x4, x7 @@ -36,7 +36,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x8, #0 -;; ldr x9, [x2, #0x60] +;; ldr x9, [x2, #0x50] ;; add x9, x9, x4 ;; orr x7, xzr, #0xffffffff ;; cmp x4, x7 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 218823a1d585..379863feabea 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1001 @@ -37,7 +37,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x9, #0 -;; ldr x10, [x2, #0x60] +;; ldr x10, [x2, #0x50] ;; add x10, x10, x4 ;; add x10, x10, #1, lsl #12 ;; mov w8, #-0x1001 diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index e2773393ad44..0bdc7b259af5 100644 --- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 @@ -38,7 +38,7 @@ ;; stp x29, x30, [sp, #-0x10]! ;; mov x29, sp ;; mov x10, #0 -;; ldr x11, [x2, #0x60] +;; ldr x11, [x2, #0x50] ;; add x11, x11, x4 ;; mov x12, #0xffff0000 ;; add x11, x11, x12 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 7e3e1a9d333b..f0ac3b7cdfa3 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 @@ -23,18 +23,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = iconst.i64 4 ;; @0040 v7 = isub v5, v6 ; v6 = 4 ;; @0040 v8 = icmp ugt v4, v7 ;; @0040 trapnz v8, heap_oob -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 store little heap v3, v10 ;; @0043 jump block1 @@ -48,18 +48,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = iconst.i64 4 ;; @0048 v7 = isub v5, v6 ; v6 = 4 ;; @0048 v8 = icmp ugt v4, v7 ;; @0048 trapnz v8, heap_oob -;; @0048 v9 = load.i64 notrap aligned checked v0+96 +;; @0048 v9 = load.i64 notrap aligned checked v0+80 ;; @0048 v10 = iadd v9, v4 ;; @0048 v11 = load.i32 little heap v10 ;; @004b jump block1 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 fec91239db54..c26249a821cc 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 @@ -23,18 +23,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = iconst.i64 4100 ;; @0040 v7 = isub v5, v6 ; v6 = 4100 ;; @0040 v8 = icmp ugt v4, v7 ;; @0040 trapnz v8, heap_oob -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 4096 ;; @0040 v12 = iadd v10, v11 ; v11 = 4096 @@ -50,18 +50,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = iconst.i64 4100 ;; @0049 v7 = isub v5, v6 ; v6 = 4100 ;; @0049 v8 = icmp ugt v4, v7 ;; @0049 trapnz v8, heap_oob -;; @0049 v9 = load.i64 notrap aligned checked v0+96 +;; @0049 v9 = load.i64 notrap aligned checked v0+80 ;; @0049 v10 = iadd v9, v4 ;; @0049 v11 = iconst.i64 4096 ;; @0049 v12 = iadd v10, v11 ; v11 = 4096 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 0fec8068a8d7..062c2b460f80 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 @@ -23,18 +23,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_0004 ;; @0040 v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0004 -;; @0040 v7 = load.i64 notrap aligned v0+104 +;; @0040 v7 = load.i64 notrap aligned v0+88 ;; @0040 v8 = icmp ugt v6, v7 ;; @0040 trapnz v8, heap_oob -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 0xffff_0000 ;; @0040 v12 = iadd v10, v11 ; v11 = 0xffff_0000 @@ -50,18 +50,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xffff_0004 ;; @004c v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0004 -;; @004c v7 = load.i64 notrap aligned v0+104 +;; @004c v7 = load.i64 notrap aligned v0+88 ;; @004c v8 = icmp ugt v6, v7 ;; @004c trapnz v8, heap_oob -;; @004c v9 = load.i64 notrap aligned checked v0+96 +;; @004c v9 = load.i64 notrap aligned checked v0+80 ;; @004c v10 = iadd v9, v4 ;; @004c v11 = iconst.i64 0xffff_0000 ;; @004c v12 = iadd v10, v11 ; v11 = 0xffff_0000 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 68170bce3fba..08d37ad83fb9 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp uge v4, v5 ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 istore8 little heap v3, v8 ;; @0043 jump block1 @@ -46,16 +46,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = icmp uge v4, v5 ;; @0048 trapnz v6, heap_oob -;; @0048 v7 = load.i64 notrap aligned checked v0+96 +;; @0048 v7 = load.i64 notrap aligned checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = uload8.i32 little heap v8 ;; @004b jump block1 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 d0bad0edaaa7..6b42302a04e2 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 @@ -23,18 +23,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = iconst.i64 4097 ;; @0040 v7 = isub v5, v6 ; v6 = 4097 ;; @0040 v8 = icmp ugt v4, v7 ;; @0040 trapnz v8, heap_oob -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 4096 ;; @0040 v12 = iadd v10, v11 ; v11 = 4096 @@ -50,18 +50,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = iconst.i64 4097 ;; @0049 v7 = isub v5, v6 ; v6 = 4097 ;; @0049 v8 = icmp ugt v4, v7 ;; @0049 trapnz v8, heap_oob -;; @0049 v9 = load.i64 notrap aligned checked v0+96 +;; @0049 v9 = load.i64 notrap aligned checked v0+80 ;; @0049 v10 = iadd v9, v4 ;; @0049 v11 = iconst.i64 4096 ;; @0049 v12 = iadd v10, v11 ; v11 = 4096 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 0c6988d00913..d6b60815f251 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 @@ -23,18 +23,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_0001 ;; @0040 v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0001 -;; @0040 v7 = load.i64 notrap aligned v0+104 +;; @0040 v7 = load.i64 notrap aligned v0+88 ;; @0040 v8 = icmp ugt v6, v7 ;; @0040 trapnz v8, heap_oob -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 0xffff_0000 ;; @0040 v12 = iadd v10, v11 ; v11 = 0xffff_0000 @@ -50,18 +50,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xffff_0001 ;; @004c v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0001 -;; @004c v7 = load.i64 notrap aligned v0+104 +;; @004c v7 = load.i64 notrap aligned v0+88 ;; @004c v8 = icmp ugt v6, v7 ;; @004c trapnz v8, heap_oob -;; @004c v9 = load.i64 notrap aligned checked v0+96 +;; @004c v9 = load.i64 notrap aligned checked v0+80 ;; @004c v10 = iadd v9, v4 ;; @004c v11 = iconst.i64 0xffff_0000 ;; @004c v12 = iadd v10, v11 ; v11 = 0xffff_0000 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 9b74aa354a61..55de201bda82 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = iconst.i64 4 ;; @0040 v7 = isub v5, v6 ; v6 = 4 ;; @0040 v8 = icmp ugt v4, v7 -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 0 ;; @0040 v12 = select_spectre_guard v8, v11, v10 ; v11 = 0 @@ -49,17 +49,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = iconst.i64 4 ;; @0048 v7 = isub v5, v6 ; v6 = 4 ;; @0048 v8 = icmp ugt v4, v7 -;; @0048 v9 = load.i64 notrap aligned checked v0+96 +;; @0048 v9 = load.i64 notrap aligned checked v0+80 ;; @0048 v10 = iadd v9, v4 ;; @0048 v11 = iconst.i64 0 ;; @0048 v12 = select_spectre_guard v8, v11, v10 ; v11 = 0 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 3049de017a94..45e0d0888c3b 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = iconst.i64 4100 ;; @0040 v7 = isub v5, v6 ; v6 = 4100 ;; @0040 v8 = icmp ugt v4, v7 -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 4096 ;; @0040 v12 = iadd v10, v11 ; v11 = 4096 @@ -51,17 +51,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = iconst.i64 4100 ;; @0049 v7 = isub v5, v6 ; v6 = 4100 ;; @0049 v8 = icmp ugt v4, v7 -;; @0049 v9 = load.i64 notrap aligned checked v0+96 +;; @0049 v9 = load.i64 notrap aligned checked v0+80 ;; @0049 v10 = iadd v9, v4 ;; @0049 v11 = iconst.i64 4096 ;; @0049 v12 = iadd v10, v11 ; v11 = 4096 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 d64295bf49de..bda35d9cefa7 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_0004 ;; @0040 v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0004 -;; @0040 v7 = load.i64 notrap aligned v0+104 +;; @0040 v7 = load.i64 notrap aligned v0+88 ;; @0040 v8 = icmp ugt v6, v7 -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 0xffff_0000 ;; @0040 v12 = iadd v10, v11 ; v11 = 0xffff_0000 @@ -51,17 +51,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xffff_0004 ;; @004c v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0004 -;; @004c v7 = load.i64 notrap aligned v0+104 +;; @004c v7 = load.i64 notrap aligned v0+88 ;; @004c v8 = icmp ugt v6, v7 -;; @004c v9 = load.i64 notrap aligned checked v0+96 +;; @004c v9 = load.i64 notrap aligned checked v0+80 ;; @004c v10 = iadd v9, v4 ;; @004c v11 = iconst.i64 0xffff_0000 ;; @004c v12 = iadd v10, v11 ; v11 = 0xffff_0000 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 acacbae3b264..92d657c2e7b2 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp uge v4, v5 -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0 ;; @0040 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = icmp uge v4, v5 -;; @0048 v7 = load.i64 notrap aligned checked v0+96 +;; @0048 v7 = load.i64 notrap aligned checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = iconst.i64 0 ;; @0048 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 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 7524f8163733..9e49da7e296f 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = iconst.i64 4097 ;; @0040 v7 = isub v5, v6 ; v6 = 4097 ;; @0040 v8 = icmp ugt v4, v7 -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 4096 ;; @0040 v12 = iadd v10, v11 ; v11 = 4096 @@ -51,17 +51,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = iconst.i64 4097 ;; @0049 v7 = isub v5, v6 ; v6 = 4097 ;; @0049 v8 = icmp ugt v4, v7 -;; @0049 v9 = load.i64 notrap aligned checked v0+96 +;; @0049 v9 = load.i64 notrap aligned checked v0+80 ;; @0049 v10 = iadd v9, v4 ;; @0049 v11 = iconst.i64 4096 ;; @0049 v12 = iadd v10, v11 ; v11 = 4096 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 2a68f53cac9a..075df4b60688 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_0001 ;; @0040 v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0001 -;; @0040 v7 = load.i64 notrap aligned v0+104 +;; @0040 v7 = load.i64 notrap aligned v0+88 ;; @0040 v8 = icmp ugt v6, v7 -;; @0040 v9 = load.i64 notrap aligned checked v0+96 +;; @0040 v9 = load.i64 notrap aligned checked v0+80 ;; @0040 v10 = iadd v9, v4 ;; @0040 v11 = iconst.i64 0xffff_0000 ;; @0040 v12 = iadd v10, v11 ; v11 = 0xffff_0000 @@ -51,17 +51,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xffff_0001 ;; @004c v6 = uadd_overflow_trap v4, v5, heap_oob ; v5 = 0xffff_0001 -;; @004c v7 = load.i64 notrap aligned v0+104 +;; @004c v7 = load.i64 notrap aligned v0+88 ;; @004c v8 = icmp ugt v6, v7 -;; @004c v9 = load.i64 notrap aligned checked v0+96 +;; @004c v9 = load.i64 notrap aligned checked v0+80 ;; @004c v10 = iadd v9, v4 ;; @004c v11 = iconst.i64 0xffff_0000 ;; @004c v12 = iadd v10, v11 ; v11 = 0xffff_0000 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 be0a37f732ee..230995c637e2 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 store little heap v3, v8 ;; @0043 jump block1 @@ -46,16 +46,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = icmp ugt v4, v5 ;; @0048 trapnz v6, heap_oob -;; @0048 v7 = load.i64 notrap aligned checked v0+96 +;; @0048 v7 = load.i64 notrap aligned checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = load.i32 little heap v8 ;; @004b jump block1 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 bcca5c3b3fa6..dd24c9ca73e3 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -48,16 +48,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = icmp ugt v4, v5 ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = load.i64 notrap aligned checked v0+96 +;; @0049 v7 = load.i64 notrap aligned checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 224f833dd96f..928e2ce4a797 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -48,16 +48,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned v0+104 +;; @004c v5 = load.i64 notrap aligned v0+88 ;; @004c v6 = icmp ugt v4, v5 ;; @004c trapnz v6, heap_oob -;; @004c v7 = load.i64 notrap aligned checked v0+96 +;; @004c v7 = load.i64 notrap aligned checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 179e3bd2f1a7..397cf6668370 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp uge v4, v5 ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 istore8 little heap v3, v8 ;; @0043 jump block1 @@ -46,16 +46,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = icmp uge v4, v5 ;; @0048 trapnz v6, heap_oob -;; @0048 v7 = load.i64 notrap aligned checked v0+96 +;; @0048 v7 = load.i64 notrap aligned checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = uload8.i32 little heap v8 ;; @004b jump block1 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 b9597d415a49..7be457843e10 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -48,16 +48,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = icmp ugt v4, v5 ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = load.i64 notrap aligned checked v0+96 +;; @0049 v7 = load.i64 notrap aligned checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 a9ceb7445871..5ebc54f7d63f 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -48,16 +48,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned v0+104 +;; @004c v5 = load.i64 notrap aligned v0+88 ;; @004c v6 = icmp ugt v4, v5 ;; @004c trapnz v6, heap_oob -;; @004c v7 = load.i64 notrap aligned checked v0+96 +;; @004c v7 = load.i64 notrap aligned checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 04da21a428ea..7b1c16f67a19 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0 ;; @0040 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = icmp ugt v4, v5 -;; @0048 v7 = load.i64 notrap aligned checked v0+96 +;; @0048 v7 = load.i64 notrap aligned checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = iconst.i64 0 ;; @0048 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 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 61135567756a..e1cf9cdc5ded 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = icmp ugt v4, v5 -;; @0049 v7 = load.i64 notrap aligned checked v0+96 +;; @0049 v7 = load.i64 notrap aligned checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 3a2b62cfe8a9..6f48f0d3ef8d 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned v0+104 +;; @004c v5 = load.i64 notrap aligned v0+88 ;; @004c v6 = icmp ugt v4, v5 -;; @004c v7 = load.i64 notrap aligned checked v0+96 +;; @004c v7 = load.i64 notrap aligned checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 b6e92aeacd1f..b7c2e6f6e11c 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp uge v4, v5 -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0 ;; @0040 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned v0+104 +;; @0048 v5 = load.i64 notrap aligned v0+88 ;; @0048 v6 = icmp uge v4, v5 -;; @0048 v7 = load.i64 notrap aligned checked v0+96 +;; @0048 v7 = load.i64 notrap aligned checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = iconst.i64 0 ;; @0048 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 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 c83194e199cb..e58206ce58b1 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = icmp ugt v4, v5 -;; @0049 v7 = load.i64 notrap aligned checked v0+96 +;; @0049 v7 = load.i64 notrap aligned checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 8623d8b53dff..7e77e0d39983 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned v0+104 +;; @0040 v5 = load.i64 notrap aligned v0+88 ;; @0040 v6 = icmp ugt v4, v5 -;; @0040 v7 = load.i64 notrap aligned checked v0+96 +;; @0040 v7 = load.i64 notrap aligned checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned v0+104 +;; @004c v5 = load.i64 notrap aligned v0+88 ;; @004c v6 = icmp ugt v4, v5 -;; @004c v7 = load.i64 notrap aligned checked v0+96 +;; @004c v7 = load.i64 notrap aligned checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 6a3b1900cc5e..ca84a598dfc4 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = iconst.i64 4 ;; @0040 v6 = isub v4, v5 ; v5 = 4 ;; @0040 v7 = icmp ugt v2, v6 ;; @0040 trapnz v7, heap_oob -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 store little heap v3, v9 ;; @0043 jump block1 @@ -47,17 +47,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = iconst.i64 4 ;; @0048 v6 = isub v4, v5 ; v5 = 4 ;; @0048 v7 = icmp ugt v2, v6 ;; @0048 trapnz v7, heap_oob -;; @0048 v8 = load.i64 notrap aligned checked v0+96 +;; @0048 v8 = load.i64 notrap aligned checked v0+80 ;; @0048 v9 = iadd v8, v2 ;; @0048 v10 = load.i32 little heap v9 ;; @004b jump block1 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 92930cdd7f77..4c70b9141218 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = iconst.i64 4100 ;; @0040 v6 = isub v4, v5 ; v5 = 4100 ;; @0040 v7 = icmp ugt v2, v6 ;; @0040 trapnz v7, heap_oob -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 4096 ;; @0040 v11 = iadd v9, v10 ; v10 = 4096 @@ -49,17 +49,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = iconst.i64 4100 ;; @0049 v6 = isub v4, v5 ; v5 = 4100 ;; @0049 v7 = icmp ugt v2, v6 ;; @0049 trapnz v7, heap_oob -;; @0049 v8 = load.i64 notrap aligned checked v0+96 +;; @0049 v8 = load.i64 notrap aligned checked v0+80 ;; @0049 v9 = iadd v8, v2 ;; @0049 v10 = iconst.i64 4096 ;; @0049 v11 = iadd v9, v10 ; v10 = 4096 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 afbc37569a6a..08fdfecdda6a 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_0004 ;; @0040 v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0004 -;; @0040 v6 = load.i64 notrap aligned v0+104 +;; @0040 v6 = load.i64 notrap aligned v0+88 ;; @0040 v7 = icmp ugt v5, v6 ;; @0040 trapnz v7, heap_oob -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 0xffff_0000 ;; @0040 v11 = iadd v9, v10 ; v10 = 0xffff_0000 @@ -49,17 +49,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff_0004 ;; @004c v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0004 -;; @004c v6 = load.i64 notrap aligned v0+104 +;; @004c v6 = load.i64 notrap aligned v0+88 ;; @004c v7 = icmp ugt v5, v6 ;; @004c trapnz v7, heap_oob -;; @004c v8 = load.i64 notrap aligned checked v0+96 +;; @004c v8 = load.i64 notrap aligned checked v0+80 ;; @004c v9 = iadd v8, v2 ;; @004c v10 = iconst.i64 0xffff_0000 ;; @004c v11 = iadd v9, v10 ; v10 = 0xffff_0000 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 b5f4c489b7d8..23057f955665 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp uge v2, v4 ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 istore8 little heap v3, v7 ;; @0043 jump block1 @@ -45,15 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = icmp uge v2, v4 ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = load.i64 notrap aligned checked v0+96 +;; @0048 v6 = load.i64 notrap aligned checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = uload8.i32 little heap v7 ;; @004b jump block1 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 e5aedaa2e79c..f327fa0cca12 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = iconst.i64 4097 ;; @0040 v6 = isub v4, v5 ; v5 = 4097 ;; @0040 v7 = icmp ugt v2, v6 ;; @0040 trapnz v7, heap_oob -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 4096 ;; @0040 v11 = iadd v9, v10 ; v10 = 4096 @@ -49,17 +49,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = iconst.i64 4097 ;; @0049 v6 = isub v4, v5 ; v5 = 4097 ;; @0049 v7 = icmp ugt v2, v6 ;; @0049 trapnz v7, heap_oob -;; @0049 v8 = load.i64 notrap aligned checked v0+96 +;; @0049 v8 = load.i64 notrap aligned checked v0+80 ;; @0049 v9 = iadd v8, v2 ;; @0049 v10 = iconst.i64 4096 ;; @0049 v11 = iadd v9, v10 ; v10 = 4096 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 8594642ed780..64262f35660b 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 @@ -23,17 +23,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_0001 ;; @0040 v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0001 -;; @0040 v6 = load.i64 notrap aligned v0+104 +;; @0040 v6 = load.i64 notrap aligned v0+88 ;; @0040 v7 = icmp ugt v5, v6 ;; @0040 trapnz v7, heap_oob -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 0xffff_0000 ;; @0040 v11 = iadd v9, v10 ; v10 = 0xffff_0000 @@ -49,17 +49,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff_0001 ;; @004c v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0001 -;; @004c v6 = load.i64 notrap aligned v0+104 +;; @004c v6 = load.i64 notrap aligned v0+88 ;; @004c v7 = icmp ugt v5, v6 ;; @004c trapnz v7, heap_oob -;; @004c v8 = load.i64 notrap aligned checked v0+96 +;; @004c v8 = load.i64 notrap aligned checked v0+80 ;; @004c v9 = iadd v8, v2 ;; @004c v10 = iconst.i64 0xffff_0000 ;; @004c v11 = iadd v9, v10 ; v10 = 0xffff_0000 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 f9d7c996ae77..9020752d0e51 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = iconst.i64 4 ;; @0040 v6 = isub v4, v5 ; v5 = 4 ;; @0040 v7 = icmp ugt v2, v6 -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 0 ;; @0040 v11 = select_spectre_guard v7, v10, v9 ; v10 = 0 @@ -48,16 +48,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = iconst.i64 4 ;; @0048 v6 = isub v4, v5 ; v5 = 4 ;; @0048 v7 = icmp ugt v2, v6 -;; @0048 v8 = load.i64 notrap aligned checked v0+96 +;; @0048 v8 = load.i64 notrap aligned checked v0+80 ;; @0048 v9 = iadd v8, v2 ;; @0048 v10 = iconst.i64 0 ;; @0048 v11 = select_spectre_guard v7, v10, v9 ; v10 = 0 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 969b87e710ef..2567776be240 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = iconst.i64 4100 ;; @0040 v6 = isub v4, v5 ; v5 = 4100 ;; @0040 v7 = icmp ugt v2, v6 -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 4096 ;; @0040 v11 = iadd v9, v10 ; v10 = 4096 @@ -50,16 +50,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = iconst.i64 4100 ;; @0049 v6 = isub v4, v5 ; v5 = 4100 ;; @0049 v7 = icmp ugt v2, v6 -;; @0049 v8 = load.i64 notrap aligned checked v0+96 +;; @0049 v8 = load.i64 notrap aligned checked v0+80 ;; @0049 v9 = iadd v8, v2 ;; @0049 v10 = iconst.i64 4096 ;; @0049 v11 = iadd v9, v10 ; v10 = 4096 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 23f992843f19..60f3a75c83b7 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_0004 ;; @0040 v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0004 -;; @0040 v6 = load.i64 notrap aligned v0+104 +;; @0040 v6 = load.i64 notrap aligned v0+88 ;; @0040 v7 = icmp ugt v5, v6 -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 0xffff_0000 ;; @0040 v11 = iadd v9, v10 ; v10 = 0xffff_0000 @@ -50,16 +50,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff_0004 ;; @004c v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0004 -;; @004c v6 = load.i64 notrap aligned v0+104 +;; @004c v6 = load.i64 notrap aligned v0+88 ;; @004c v7 = icmp ugt v5, v6 -;; @004c v8 = load.i64 notrap aligned checked v0+96 +;; @004c v8 = load.i64 notrap aligned checked v0+80 ;; @004c v9 = iadd v8, v2 ;; @004c v10 = iconst.i64 0xffff_0000 ;; @004c v11 = iadd v9, v10 ; v10 = 0xffff_0000 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 345dc7a94aa8..8b669226a268 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp uge v2, v4 -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -46,14 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = icmp uge v2, v4 -;; @0048 v6 = load.i64 notrap aligned checked v0+96 +;; @0048 v6 = load.i64 notrap aligned checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 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 cbc0b22603b8..16b1e8c6f440 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = iconst.i64 4097 ;; @0040 v6 = isub v4, v5 ; v5 = 4097 ;; @0040 v7 = icmp ugt v2, v6 -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 4096 ;; @0040 v11 = iadd v9, v10 ; v10 = 4096 @@ -50,16 +50,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = iconst.i64 4097 ;; @0049 v6 = isub v4, v5 ; v5 = 4097 ;; @0049 v7 = icmp ugt v2, v6 -;; @0049 v8 = load.i64 notrap aligned checked v0+96 +;; @0049 v8 = load.i64 notrap aligned checked v0+80 ;; @0049 v9 = iadd v8, v2 ;; @0049 v10 = iconst.i64 4096 ;; @0049 v11 = iadd v9, v10 ; v10 = 4096 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 20cd380e6962..98a169fe239e 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 @@ -23,16 +23,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_0001 ;; @0040 v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0001 -;; @0040 v6 = load.i64 notrap aligned v0+104 +;; @0040 v6 = load.i64 notrap aligned v0+88 ;; @0040 v7 = icmp ugt v5, v6 -;; @0040 v8 = load.i64 notrap aligned checked v0+96 +;; @0040 v8 = load.i64 notrap aligned checked v0+80 ;; @0040 v9 = iadd v8, v2 ;; @0040 v10 = iconst.i64 0xffff_0000 ;; @0040 v11 = iadd v9, v10 ; v10 = 0xffff_0000 @@ -50,16 +50,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff_0001 ;; @004c v5 = uadd_overflow_trap v2, v4, heap_oob ; v4 = 0xffff_0001 -;; @004c v6 = load.i64 notrap aligned v0+104 +;; @004c v6 = load.i64 notrap aligned v0+88 ;; @004c v7 = icmp ugt v5, v6 -;; @004c v8 = load.i64 notrap aligned checked v0+96 +;; @004c v8 = load.i64 notrap aligned checked v0+80 ;; @004c v9 = iadd v8, v2 ;; @004c v10 = iconst.i64 0xffff_0000 ;; @004c v11 = iadd v9, v10 ; v10 = 0xffff_0000 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 4ade9d327c11..5c93624eed0b 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 store little heap v3, v7 ;; @0043 jump block1 @@ -45,15 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = icmp ugt v2, v4 ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = load.i64 notrap aligned checked v0+96 +;; @0048 v6 = load.i64 notrap aligned checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = load.i32 little heap v7 ;; @004b jump block1 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 af6cd5a2c9f6..f6b86c073c01 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = icmp ugt v2, v4 ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = load.i64 notrap aligned checked v0+96 +;; @0049 v6 = load.i64 notrap aligned checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 b160b2eb81b6..b70ff7d88a9e 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @004c v4 = load.i64 notrap aligned v0+104 +;; @004c v4 = load.i64 notrap aligned v0+88 ;; @004c v5 = icmp ugt v2, v4 ;; @004c trapnz v5, heap_oob -;; @004c v6 = load.i64 notrap aligned checked v0+96 +;; @004c v6 = load.i64 notrap aligned checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 96cb970a19bb..5fc2aff0f0a8 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp uge v2, v4 ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 istore8 little heap v3, v7 ;; @0043 jump block1 @@ -45,15 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = icmp uge v2, v4 ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = load.i64 notrap aligned checked v0+96 +;; @0048 v6 = load.i64 notrap aligned checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = uload8.i32 little heap v7 ;; @004b jump block1 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 8447a1430521..4145fd8f9c91 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = icmp ugt v2, v4 ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = load.i64 notrap aligned checked v0+96 +;; @0049 v6 = load.i64 notrap aligned checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 06681e0c2bed..c1fd08eac94f 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @004c v4 = load.i64 notrap aligned v0+104 +;; @004c v4 = load.i64 notrap aligned v0+88 ;; @004c v5 = icmp ugt v2, v4 ;; @004c trapnz v5, heap_oob -;; @004c v6 = load.i64 notrap aligned checked v0+96 +;; @004c v6 = load.i64 notrap aligned checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 5dd1453edcae..330d92a70ae7 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -46,14 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = icmp ugt v2, v4 -;; @0048 v6 = load.i64 notrap aligned checked v0+96 +;; @0048 v6 = load.i64 notrap aligned checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 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 335ec6b43a87..744b1e08b86b 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = icmp ugt v2, v4 -;; @0049 v6 = load.i64 notrap aligned checked v0+96 +;; @0049 v6 = load.i64 notrap aligned checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 89b0709a61ec..a215fe6c61cc 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @004c v4 = load.i64 notrap aligned v0+104 +;; @004c v4 = load.i64 notrap aligned v0+88 ;; @004c v5 = icmp ugt v2, v4 -;; @004c v6 = load.i64 notrap aligned checked v0+96 +;; @004c v6 = load.i64 notrap aligned checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 15234ea3c82b..fe87d2b1a697 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp uge v2, v4 -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -46,14 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0048 v4 = load.i64 notrap aligned v0+104 +;; @0048 v4 = load.i64 notrap aligned v0+88 ;; @0048 v5 = icmp uge v2, v4 -;; @0048 v6 = load.i64 notrap aligned checked v0+96 +;; @0048 v6 = load.i64 notrap aligned checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 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 9fe0e88d27d5..063ecb19db6c 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @0049 v4 = load.i64 notrap aligned v0+104 +;; @0049 v4 = load.i64 notrap aligned v0+88 ;; @0049 v5 = icmp ugt v2, v4 -;; @0049 v6 = load.i64 notrap aligned checked v0+96 +;; @0049 v6 = load.i64 notrap aligned checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 e0ef90fccc67..627197ebcd17 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): -;; @0040 v4 = load.i64 notrap aligned v0+104 +;; @0040 v4 = load.i64 notrap aligned v0+88 ;; @0040 v5 = icmp ugt v2, v4 -;; @0040 v6 = load.i64 notrap aligned checked v0+96 +;; @0040 v6 = load.i64 notrap aligned checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): -;; @004c v4 = load.i64 notrap aligned v0+104 +;; @004c v4 = load.i64 notrap aligned v0+88 ;; @004c v5 = icmp ugt v2, v4 -;; @004c v6 = load.i64 notrap aligned checked v0+96 +;; @004c v6 = load.i64 notrap aligned checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 a8e56320314a..daeaab3418ce 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 @@ -23,8 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -32,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff_fffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 store little heap v3, v8 ;; @0043 jump block1 @@ -46,8 +46,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -55,7 +55,7 @@ ;; @0048 v5 = iconst.i64 0xffff_fffc ;; @0048 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc ;; @0048 trapnz v6, heap_oob -;; @0048 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = load.i32 little heap v8 ;; @004b jump block1 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 83f305d946db..9531520a37c1 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 @@ -23,8 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -32,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff_effc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -48,8 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -57,7 +57,7 @@ ;; @0049 v5 = iconst.i64 0xffff_effc ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 5be08a22532c..40f9a9cb031c 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 @@ -23,8 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -32,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xfffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xfffc ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -48,8 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -57,7 +57,7 @@ ;; @004c v5 = iconst.i64 0xfffc ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xfffc ;; @004c trapnz v6, heap_oob -;; @004c v7 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v7 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 1f38f06e2baa..28ed07d1301d 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -43,13 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1 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 07563d7c9c5f..b40a90469d78 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 @@ -23,8 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -32,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff_efff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -48,8 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -57,7 +57,7 @@ ;; @0049 v5 = iconst.i64 0xffff_efff ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 e96dadc51948..678526caf072 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 @@ -23,8 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -32,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -48,8 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -57,7 +57,7 @@ ;; @004c v5 = iconst.i64 0xffff ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xffff ;; @004c trapnz v6, heap_oob -;; @004c v7 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v7 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 8f11c90a36bf..9603993d3eea 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_fffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0 ;; @0040 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 ;; @0048 v5 = iconst.i64 0xffff_fffc ;; @0048 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc -;; @0048 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = iconst.i64 0 ;; @0048 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 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 11356cc16a48..3296fa08f24e 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_effc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 ;; @0049 v5 = iconst.i64 0xffff_effc ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc -;; @0049 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 651211809b7d..5a96f5544025 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xfffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xfffc -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xfffc ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xfffc -;; @004c v7 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v7 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 74a185c69df4..67219094774c 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -43,13 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1 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 fb4e2ead4d6b..f47557fa696a 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_efff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 ;; @0049 v5 = iconst.i64 0xffff_efff ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff -;; @0049 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 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 4e7489863ad2..620a0bf74b2c 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff -;; @0040 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -49,15 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xffff ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xffff -;; @004c v7 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v7 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 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 c6cda5d9bdc3..2ce706f994a8 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 store little heap v3, v6 ;; @0043 jump block1 @@ -43,13 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = load.i32 little heap v6 ;; @004b jump block1 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 a62f34e87fb6..8b6a26b67de7 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 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 c2bce1ba7511..370e8a06d3a4 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v5 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 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 cf847f90d1dd..1fb5b14a9eae 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -43,13 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1 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 d7cd7dcbb299..a14548892082 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 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 2451944e5c1e..5c6eb057505d 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v5 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 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 71340d251fd1..da18e003ca17 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 store little heap v3, v6 ;; @0043 jump block1 @@ -43,13 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = load.i32 little heap v6 ;; @004b jump block1 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 6bd489ef86c5..7bd91bf7fca9 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 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 103b2aa57e41..5cb026deeffa 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v5 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 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 76b52f4298a7..a8ce400edc1e 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -43,13 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1 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 74b528e99d8e..4dd2d8d445a3 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 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 e12471c5f901..04684de47c15 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 @@ -23,13 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v5 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -45,13 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v5 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 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 71d40b84a10b..ef9a6bd25cfe 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 store little heap v3, v7 ;; @0043 jump block1 @@ -45,15 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = load.i32 little heap v7 ;; @004b jump block1 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 3f66483c5760..8806443792b5 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 ea78ba19ce3f..90e3821f8701 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @004c trapnz v5, heap_oob -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 28c39a23ed7f..b3502be6285d 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 istore8 little heap v3, v7 ;; @0043 jump block1 @@ -45,15 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = uload8.i32 little heap v7 ;; @004b jump block1 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 68905053ca13..08c35643ad2d 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 7a98dd74f404..cb51dd5fdb24 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @004c trapnz v5, heap_oob -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 c4f7b99ddc1f..6fb18d08db30 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -46,14 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 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 cbbb97d58192..e11848405b37 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 70379e617787..31735367b8a5 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 a23d5e472272..8444b3ab8461 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -46,14 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 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 f03820d0dda3..96ffeb6048aa 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 84654486b076..e169248ca763 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 0398419df5b4..cf1c3152ce35 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 store little heap v3, v7 ;; @0043 jump block1 @@ -45,15 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = load.i32 little heap v7 ;; @004b jump block1 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 a974db77ed74..895174acdefb 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 6524bafce661..94f7fa9e97cd 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @004c trapnz v5, heap_oob -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 6576ebc7c384..1e05301e741b 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 istore8 little heap v3, v7 ;; @0043 jump block1 @@ -45,15 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = uload8.i32 little heap v7 ;; @004b jump block1 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 28891ac5619d..61e17d34c903 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 0ee70b028dcc..a7f7c5d1ab22 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 @@ -23,15 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,15 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @004c trapnz v5, heap_oob -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 6c96b93efa36..f178547bc2eb 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -46,14 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 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 491a8f8e5805..48d9fef72c9c 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 4b60996d6b1f..1cc3d692329a 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 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 5391b4868b33..461533aa66ba 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -46,14 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0048 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0048 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 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 e64f963623ba..3990c41eb8bc 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0049 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0049 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 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 e48e2ef6d6f4..85e6f2611dd5 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 @@ -23,14 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @0040 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -48,14 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @004c v6 = load.i64 notrap aligned readonly checked v0+96 +;; @004c v6 = load.i64 notrap aligned readonly checked v0+80 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat index 4a71ab081fb9..28a0695c778f 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -23,13 +23,13 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a2, a2, 0x20 ;; srli a4, a2, 0x20 ;; addi a5, a5, -4 ;; bgeu a5, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; sw a3, 0(a4) ;; ld ra, 8(sp) @@ -42,13 +42,13 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) +;; ld a3, 0x58(a0) ;; slli a2, a2, 0x20 ;; srli a4, a2, 0x20 ;; addi a3, a3, -4 ;; bgeu a3, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; lw a0, 0(a4) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 65ee01b0d550..be0c5c0c0b1b 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; lui a4, 1 @@ -31,7 +31,7 @@ ;; sub a5, a5, a2 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui t6, 1 ;; add t6, t6, a0 @@ -46,7 +46,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; lui a4, 1 @@ -54,7 +54,7 @@ ;; sub a5, a5, a2 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui t6, 1 ;; add t6, t6, a0 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index c5a6e288d77d..3d3a94985a13 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -31,10 +31,10 @@ ;; add a5, a4, a5 ;; bgeu a5, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a4 ;; lui a4, 0xffff ;; slli a0, a4, 4 @@ -58,10 +58,10 @@ ;; add a3, a4, a5 ;; bgeu a3, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; bgeu a5, a3, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a4 ;; lui a4, 0xffff ;; slli a0, a4, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat index 57058b9e2e3a..b5b0b938d3cc 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -23,12 +23,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a4, a1, 0x20 ;; bltu a4, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; sb a3, 0(a4) ;; ld ra, 8(sp) @@ -41,12 +41,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a3, a1, 0x20 ;; bltu a3, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; lbu a0, 0(a3) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index 91f328a08a70..9e33a52297ee 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; lui a4, 1 @@ -31,7 +31,7 @@ ;; sub a5, a5, a2 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui t6, 1 ;; add t6, t6, a0 @@ -46,7 +46,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; lui a4, 1 @@ -54,7 +54,7 @@ ;; sub a5, a5, a2 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui t6, 1 ;; add t6, t6, a0 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index d7934f060f5d..312ea204e930 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -30,10 +30,10 @@ ;; add a1, a2, a1 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; bgeu a4, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui a2, 0xffff ;; slli a5, a2, 4 @@ -58,10 +58,10 @@ ;; add a1, a2, a1 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x68(a0) +;; ld a3, 0x58(a0) ;; bgeu a3, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x60(a0) +;; ld a3, 0x50(a0) ;; add a3, a3, a2 ;; lui a2, 0xffff ;; slli a4, a2, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat index 1b8081d102af..1e3f52c14a41 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a4, a0, 0x20 ;; addi a2, a5, -4 @@ -44,8 +44,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a3, a0, 0x20 ;; addi a2, a4, -4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 7ce194786d3c..26f665004a19 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a1, a0, 0x20 ;; lui a0, 1 @@ -48,8 +48,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a5, 0x50(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; lui a4, 1 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index ab45a00f16e1..af0d33cda58b 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -31,8 +31,8 @@ ;; add a1, a2, a4 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a4, a4, a1 ;; add a2, a5, a2 ;; lui a1, 0xffff @@ -60,8 +60,8 @@ ;; add a1, a2, a3 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a4, 0x50(a0) ;; sltu a3, a3, a1 ;; add a2, a4, a2 ;; lui a1, 0xffff diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat index 0dc87a643aeb..8e94652a062a 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a4, a0, 0x20 ;; sltu a0, a4, a5 @@ -44,8 +44,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a3, a0, 0x20 ;; sltu a0, a3, a4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 200c4d13312c..17cc9550994f 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a1, a0, 0x20 ;; lui a0, 1 @@ -48,8 +48,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a5, 0x50(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; lui a4, 1 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 2a54231215f3..fbd126157398 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -32,8 +32,8 @@ ;; bgeu a5, a0, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 ;; mv a2, a1 -;; ld a1, 0x68(a2) -;; ld a2, 0x60(a2) +;; ld a1, 0x58(a2) +;; ld a2, 0x50(a2) ;; sltu a1, a1, a5 ;; add a0, a2, a0 ;; lui a5, 0xffff @@ -64,8 +64,8 @@ ;; bgeu a5, a0, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 ;; mv a2, a1 -;; ld a1, 0x68(a2) -;; ld a2, 0x60(a2) +;; ld a1, 0x58(a2) +;; ld a2, 0x50(a2) ;; sltu a1, a1, a5 ;; add a0, a2, a0 ;; lui a5, 0xffff diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 995fae558b62..3509d5ab1043 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -23,12 +23,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a4, a1, 0x20 ;; bgeu a5, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; sw a3, 0(a4) ;; ld ra, 8(sp) @@ -41,12 +41,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a3, a1, 0x20 ;; bgeu a4, a3, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; lw a0, 0(a3) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 7bcf608931f7..fd47d830f58d 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,12 +23,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a4, a1, 0x20 ;; bgeu a5, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; lui t6, 1 ;; add t6, t6, a4 @@ -43,12 +43,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a3, a1, 0x20 ;; bgeu a4, a3, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; lui t6, 1 ;; add t6, t6, a3 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 405962f8afe4..3800ed0aeb96 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,12 +23,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui a5, 0xffff ;; slli a1, a5, 4 @@ -44,12 +44,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui a5, 0xffff ;; slli a1, a5, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index b3be698bc738..fb9d886092bc 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -23,12 +23,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a4, a1, 0x20 ;; bltu a4, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; sb a3, 0(a4) ;; ld ra, 8(sp) @@ -41,12 +41,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a3, a1, 0x20 ;; bltu a3, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; lbu a0, 0(a3) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 9e8152b49b8b..155e8ce13240 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,12 +23,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a4, a1, 0x20 ;; bgeu a5, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; lui t6, 1 ;; add t6, t6, a4 @@ -43,12 +43,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; slli a1, a2, 0x20 ;; srli a3, a1, 0x20 ;; bgeu a4, a3, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; lui t6, 1 ;; add t6, t6, a3 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index e249fe5ba31e..2524d4488ed3 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,12 +23,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui a5, 0xffff ;; slli a1, a5, 4 @@ -44,12 +44,12 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) +;; ld a5, 0x58(a0) ;; slli a4, a2, 0x20 ;; srli a1, a4, 0x20 ;; bgeu a5, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a1 ;; lui a5, 0xffff ;; slli a1, a5, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index d76a8eb4c916..e06e9bc78711 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a5, a2, 0x20 ;; srli a2, a5, 0x20 ;; sltu a4, a4, a2 @@ -43,8 +43,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a5, a2, 0x20 ;; srli a2, a5, 0x20 ;; sltu a3, a3, a2 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 91c6c80ce620..3a76c91cda43 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a4, 0x50(a0) ;; slli a1, a2, 0x20 ;; srli a0, a1, 0x20 ;; sltu a2, a5, a0 @@ -45,8 +45,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a3, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a3, 0x50(a0) ;; slli a1, a2, 0x20 ;; srli a5, a1, 0x20 ;; sltu a2, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 1eb8ed65abab..8907f45bc9ab 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; slli a2, a2, 0x20 ;; srli a0, a2, 0x20 ;; sltu a4, a4, a0 @@ -46,8 +46,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a4, 0x50(a0) ;; slli a2, a2, 0x20 ;; srli a5, a2, 0x20 ;; sltu a3, a3, a5 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 84168df87edd..944b2e3bd0d6 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a4, a0, 0x20 ;; sltu a0, a4, a5 @@ -44,8 +44,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a3, a0, 0x20 ;; sltu a0, a3, a4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 01269284adf7..68e25ef5f2b5 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a4, 0x50(a0) ;; slli a1, a2, 0x20 ;; srli a0, a1, 0x20 ;; sltu a2, a5, a0 @@ -45,8 +45,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a3, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a3, 0x50(a0) ;; slli a1, a2, 0x20 ;; srli a5, a1, 0x20 ;; sltu a2, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 43e39e778e8e..3daa5edcccbc 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; slli a2, a2, 0x20 ;; srli a0, a2, 0x20 ;; sltu a4, a4, a0 @@ -46,8 +46,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a4, 0x50(a0) ;; slli a2, a2, 0x20 ;; srli a5, a2, 0x20 ;; sltu a3, a3, a5 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat index 56ae496b339b..d3b07276f05f 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -23,11 +23,11 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; addi a1, a1, -4 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a2, a4, a2 ;; sw a3, 0(a2) ;; ld ra, 8(sp) @@ -40,11 +40,11 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; addi a1, a1, -4 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x60(a0) +;; ld a3, 0x50(a0) ;; add a2, a3, a2 ;; lw a0, 0(a2) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 956bb84beeb2..52b129b3d360 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,13 +23,13 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; lui a5, 1 ;; addi a5, a5, 4 ;; sub a4, a4, a5 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui t6, 1 ;; add t6, t6, a4 @@ -44,13 +44,13 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) +;; ld a3, 0x58(a0) ;; lui a4, 1 ;; addi a4, a4, 4 ;; sub a3, a3, a4 ;; bgeu a3, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui t6, 1 ;; add t6, t6, a4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 0b7a26988ca5..da766020de33 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -29,10 +29,10 @@ ;; add a1, a2, a4 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; bgeu a4, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui a2, 0xffff ;; slli a5, a2, 4 @@ -54,10 +54,10 @@ ;; add a1, a2, a3 ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x68(a0) +;; ld a3, 0x58(a0) ;; bgeu a3, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x60(a0) +;; ld a3, 0x50(a0) ;; add a3, a3, a2 ;; lui a2, 0xffff ;; slli a4, a2, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat index 8f5b966187b4..96b6bbf465e1 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -23,10 +23,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bltu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; sb a3, 0(a1) ;; ld ra, 8(sp) @@ -39,10 +39,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bltu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lbu a0, 0(a1) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index 4d59ea67ad18..c041c91a6810 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,13 +23,13 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; lui a5, 1 ;; addi a5, a5, 1 ;; sub a4, a4, a5 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui t6, 1 ;; add t6, t6, a4 @@ -44,13 +44,13 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) +;; ld a3, 0x58(a0) ;; lui a4, 1 ;; addi a4, a4, 1 ;; sub a3, a3, a4 ;; bgeu a3, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui t6, 1 ;; add t6, t6, a4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 05499cc1bc00..93a28c098bf8 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -28,10 +28,10 @@ ;; add a5, a2, a5 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui a0, 0xffff ;; slli a2, a0, 4 @@ -54,10 +54,10 @@ ;; add a5, a2, a5 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui a0, 0xffff ;; slli a2, a0, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat index e7554d6aa4f4..2088e8116057 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a5, 0x50(a0) ;; addi a0, a1, -4 ;; sltu a0, a0, a2 ;; add a5, a5, a2 @@ -42,8 +42,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a5, 0x50(a0) ;; addi a0, a1, -4 ;; sltu a0, a0, a2 ;; add a5, a5, a2 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 4dcc45bac03d..8e31e42a56d6 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a4, 0x50(a0) ;; lui a0, 1 ;; addi a0, a0, 4 ;; sub a5, a5, a0 @@ -46,8 +46,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a3, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a3, 0x50(a0) ;; lui a5, 1 ;; addi a5, a5, 4 ;; sub a4, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index b7f47a785a81..7db51d2367b8 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -29,8 +29,8 @@ ;; add a5, a2, a1 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a4, 0x50(a0) ;; sltu a0, a1, a5 ;; add a1, a4, a2 ;; lui a5, 0xffff @@ -56,8 +56,8 @@ ;; add a5, a2, a1 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x68(a0) -;; ld a3, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a3, 0x50(a0) ;; sltu a0, a1, a5 ;; add a1, a3, a2 ;; lui a5, 0xffff diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat index 97236a0d80b2..67c247d6f652 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a4, a2, a1 ;; xori a0, a4, 1 ;; add a5, a5, a2 @@ -42,8 +42,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a4, a2, a1 ;; xori a0, a4, 1 ;; add a5, a5, a2 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 1c6c61ee05b4..eb3984a49059 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a5, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a4, 0x50(a0) ;; lui a0, 1 ;; addi a0, a0, 1 ;; sub a5, a5, a0 @@ -46,8 +46,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a3, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a3, 0x50(a0) ;; lui a5, 1 ;; addi a5, a5, 1 ;; sub a4, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 323626ddae04..db74d5f6ad6c 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -28,8 +28,8 @@ ;; add a4, a2, a4 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x68(a0) -;; ld a0, 0x60(a0) +;; ld a5, 0x58(a0) +;; ld a0, 0x50(a0) ;; sltu a4, a5, a4 ;; add a5, a0, a2 ;; lui a0, 0xffff @@ -56,8 +56,8 @@ ;; add a3, a2, a3 ;; bgeu a3, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a4, a4, a3 ;; add a5, a5, a2 ;; lui a3, 0xffff diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index c086f2c53c79..179c447f9ccb 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -23,10 +23,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; sw a3, 0(a1) ;; ld ra, 8(sp) @@ -39,10 +39,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lw a0, 0(a1) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 25308e36e8f0..748def8edfe7 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,10 +23,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 @@ -41,10 +41,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 60b2fd055a22..b033e0c56ce3 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,10 +23,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui a5, 0xffff ;; slli a5, a5, 4 @@ -42,10 +42,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) +;; ld a3, 0x58(a0) ;; bgeu a3, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui a3, 0xffff ;; slli a5, a3, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index b1ef3002e521..15f16421e859 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -23,10 +23,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bltu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; sb a3, 0(a1) ;; ld ra, 8(sp) @@ -39,10 +39,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bltu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lbu a0, 0(a1) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 5b1281ba106e..972007780760 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,10 +23,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 @@ -41,10 +41,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) +;; ld a1, 0x58(a0) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index a3d57f9f096e..5a81f368cf55 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,10 +23,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) +;; ld a4, 0x58(a0) ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui a5, 0xffff ;; slli a5, a5, 4 @@ -42,10 +42,10 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) +;; ld a3, 0x58(a0) ;; bgeu a3, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui a3, 0xffff ;; slli a5, a3, 4 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index eeca2add1495..16319efc242e 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a0, a4, a2 ;; add a4, a5, a2 ;; neg a2, a0 @@ -41,8 +41,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a0, a4, a2 ;; add a4, a5, a2 ;; neg a2, a0 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 2a5b76471165..1f48692837ad 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a1, 0x50(a0) ;; sltu a0, a4, a2 ;; add a1, a1, a2 ;; lui a2, 1 @@ -43,8 +43,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a1, 0x50(a0) ;; sltu a0, a3, a2 ;; add a1, a1, a2 ;; lui a2, 1 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 752474ac45fe..ea4f1d9f57ad 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a4, 0x50(a0) ;; sltu a1, a1, a2 ;; add a2, a4, a2 ;; lui a0, 0xffff @@ -44,8 +44,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a3, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a3, 0x50(a0) ;; sltu a1, a1, a2 ;; add a2, a3, a2 ;; lui a0, 0xffff diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index a3db45b2da6c..aa5b739ebba3 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a4, a2, a1 ;; xori a0, a4, 1 ;; add a5, a5, a2 @@ -42,8 +42,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a5, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a5, 0x50(a0) ;; sltu a4, a2, a1 ;; xori a0, a4, 1 ;; add a5, a5, a2 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 82785a1f0a1f..b120e3670402 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a4, 0x58(a0) +;; ld a1, 0x50(a0) ;; sltu a0, a4, a2 ;; add a1, a1, a2 ;; lui a2, 1 @@ -43,8 +43,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a3, 0x68(a0) -;; ld a1, 0x60(a0) +;; ld a3, 0x58(a0) +;; ld a1, 0x50(a0) ;; sltu a0, a3, a2 ;; add a1, a1, a2 ;; lui a2, 1 diff --git a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 62e2e2ea7a9a..cde26c1de105 100644 --- a/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,8 +23,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a4, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a4, 0x50(a0) ;; sltu a1, a1, a2 ;; add a2, a4, a2 ;; lui a0, 0xffff @@ -44,8 +44,8 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x68(a0) -;; ld a3, 0x60(a0) +;; ld a1, 0x58(a0) +;; ld a3, 0x50(a0) ;; sltu a1, a1, a2 ;; add a2, a3, a2 ;; lui a0, 0xffff diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat index f629b3636fee..fead57247a05 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -30,7 +30,7 @@ ;; slli a1, a4, 2 ;; bgeu a1, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; sw a3, 0(a5) ;; ld ra, 8(sp) @@ -50,7 +50,7 @@ ;; slli a1, a4, 2 ;; bgeu a1, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lw a0, 0(a5) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index a29755731155..6a4491451811 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -30,7 +30,7 @@ ;; slli a1, a4, 2 ;; bgeu a1, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui t6, 1 ;; add t6, t6, a5 @@ -52,7 +52,7 @@ ;; slli a1, a4, 2 ;; bgeu a1, a5, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui t6, 1 ;; add t6, t6, a5 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 7c9ea0b2ce6f..81d53b9a4731 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -29,7 +29,7 @@ ;; addi a2, a5, -4 ;; bgeu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a2, 0x60(a0) +;; ld a2, 0x50(a0) ;; add a1, a2, a1 ;; lui a0, 0xffff ;; slli a2, a0, 4 @@ -51,7 +51,7 @@ ;; addi a2, a5, -4 ;; bgeu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a2, 0x60(a0) +;; ld a2, 0x50(a0) ;; add a1, a2, a1 ;; lui a0, 0xffff ;; slli a2, a0, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat index c927e909f9fd..be68fe9ae378 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -38,7 +38,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index d848f8cb8835..0331b7d4d08e 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -29,7 +29,7 @@ ;; ld a2, 0x38(a2) ;; bgeu a2, a4, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; lui t6, 1 ;; add t6, t6, a4 @@ -53,7 +53,7 @@ ;; ld a2, 0x38(a2) ;; bgeu a2, a3, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; lui t6, 1 ;; add t6, t6, a3 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 6c3ec9791151..2a3033b5db7a 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -29,7 +29,7 @@ ;; addi a2, a5, -1 ;; bgeu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a2, 0x60(a0) +;; ld a2, 0x50(a0) ;; add a1, a2, a1 ;; lui a0, 0xffff ;; slli a2, a0, 4 @@ -51,7 +51,7 @@ ;; addi a2, a5, -1 ;; bgeu a2, a1, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a2, 0x60(a0) +;; ld a2, 0x50(a0) ;; add a1, a2, a1 ;; lui a0, 0xffff ;; slli a2, a0, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat index 6b615f558d2b..4fe1622428cd 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -29,7 +29,7 @@ ;; addi a2, a1, -1 ;; slli a5, a2, 2 ;; sltu a2, a5, a4 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; neg a0, a2 ;; not a2, a0 @@ -51,7 +51,7 @@ ;; addi a2, a1, -1 ;; slli a4, a2, 2 ;; sltu a2, a4, a3 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; neg a0, a2 ;; not a2, a0 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 6f5efbb61e43..9a4c3da3d5d5 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -29,7 +29,7 @@ ;; addi a4, a2, -0x401 ;; slli a1, a4, 2 ;; sltu a4, a1, a5 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui a0, 1 ;; add a5, a5, a0 @@ -53,7 +53,7 @@ ;; addi a4, a2, -0x401 ;; slli a1, a4, 2 ;; sltu a4, a1, a5 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui a0, 1 ;; add a5, a5, a0 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index a00b13b89977..50f23512e5e9 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -28,7 +28,7 @@ ;; lui a4, 0x10 ;; addi a1, a4, -4 ;; sltu a4, a1, a5 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui a0, 0xffff ;; slli a0, a0, 4 @@ -52,7 +52,7 @@ ;; lui a3, 0x10 ;; addi a1, a3, -4 ;; sltu a4, a1, a5 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui a3, 0xffff ;; slli a0, a3, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat index 9924e63e1328..41173152c82a 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -38,7 +38,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 9974f44aba34..c48202878645 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -28,7 +28,7 @@ ;; auipc a2, 0 ;; ld a2, 0x40(a2) ;; sltu a2, a2, a4 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a4, a5, a4 ;; lui a5, 1 ;; add a4, a4, a5 @@ -54,7 +54,7 @@ ;; auipc a2, 0 ;; ld a2, 0x40(a2) ;; sltu a2, a2, a3 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a3, a4, a3 ;; lui a4, 1 ;; add a3, a3, a4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 48bb4518e484..7a71a64bb766 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -28,7 +28,7 @@ ;; lui a4, 0x10 ;; addi a1, a4, -1 ;; sltu a4, a1, a5 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui a0, 0xffff ;; slli a0, a0, 4 @@ -52,7 +52,7 @@ ;; lui a3, 0x10 ;; addi a1, a3, -1 ;; sltu a4, a1, a5 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a5, a0, a5 ;; lui a3, 0xffff ;; slli a0, a3, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index d56561f6b267..e897a6fc1a1f 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -38,7 +38,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 337497a5ed3b..29d1cf80bdc6 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -40,7 +40,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 816b48888f47..3a43c27a484b 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a5, a2, 0x20 ;; srli a5, a5, 0x20 ;; add a4, a4, a5 @@ -41,7 +41,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a3, a2, 0x20 ;; srli a5, a3, 0x20 ;; add a4, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 74732dd284c4..d4fe772d04f4 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -38,7 +38,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index f24783aa6471..2b40b8f94e26 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -40,7 +40,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 5634077bd436..1fd42bc96ba4 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a5, a2, 0x20 ;; srli a5, a5, 0x20 ;; add a4, a4, a5 @@ -41,7 +41,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a3, a2, 0x20 ;; srli a5, a3, 0x20 ;; add a4, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 874d04aacb72..accd5dfa1dd2 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -38,7 +38,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 618466d83329..e2ed29c4ad87 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -40,7 +40,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index a10b0ae6eb88..4c973e80e95d 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a5, a2, 0x20 ;; srli a5, a5, 0x20 ;; add a4, a4, a5 @@ -41,7 +41,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a3, a2, 0x20 ;; srli a5, a3, 0x20 ;; add a4, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 7ac732954dab..816a9bdd0701 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -38,7 +38,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index d9a703654a3c..73ff5da028ba 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 @@ -40,7 +40,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; slli a0, a2, 0x20 ;; srli a2, a0, 0x20 ;; add a1, a1, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 162cbe7770c8..6016304e8996 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a5, a2, 0x20 ;; srli a5, a5, 0x20 ;; add a4, a4, a5 @@ -41,7 +41,7 @@ ;; sd ra, 8(sp) ;; sd s0, 0(sp) ;; mv s0, sp -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; slli a3, a2, 0x20 ;; srli a5, a3, 0x20 ;; add a4, a4, a5 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat index b33cbda92b30..342c38025b62 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -28,7 +28,7 @@ ;; slli a4, a4, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; sw a3, 0(a4) ;; ld ra, 8(sp) @@ -46,7 +46,7 @@ ;; slli a4, a3, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x60(a0) +;; ld a3, 0x50(a0) ;; add a3, a3, a2 ;; lw a0, 0(a3) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 0a3c16a03e82..b0cd2786ccbc 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -28,7 +28,7 @@ ;; slli a4, a4, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui t6, 1 ;; add t6, t6, a4 @@ -48,7 +48,7 @@ ;; slli a4, a3, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x60(a0) +;; ld a3, 0x50(a0) ;; add a3, a3, a2 ;; lui t6, 1 ;; add t6, t6, a3 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 41c38211bed9..cf80abd9e30f 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -27,7 +27,7 @@ ;; addi a5, a4, -4 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 @@ -47,7 +47,7 @@ ;; addi a5, a3, -4 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat index 46baccf1fa37..b6edc090f0eb 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -27,7 +27,7 @@ ;; ld a1, 0x30(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; sb a3, 0(a1) ;; ld ra, 8(sp) @@ -47,7 +47,7 @@ ;; ld a1, 0x30(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lbu a0, 0(a1) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index b375e5a4b00e..88e57562b5a9 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -27,7 +27,7 @@ ;; ld a1, 0x38(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 @@ -49,7 +49,7 @@ ;; ld a1, 0x38(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 901389a63154..00c75325bcd4 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -27,7 +27,7 @@ ;; addi a5, a4, -1 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 @@ -47,7 +47,7 @@ ;; addi a5, a3, -1 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat index 0c2c47461dab..bb8d15d6afe3 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -27,7 +27,7 @@ ;; addi a1, a4, -1 ;; slli a4, a1, 2 ;; sltu a1, a4, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; neg a4, a1 ;; not a1, a4 @@ -47,7 +47,7 @@ ;; addi a1, a4, -1 ;; slli a3, a1, 2 ;; sltu a1, a3, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; neg a4, a1 ;; not a1, a4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 26eb6b645f8e..0db1987d5456 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -27,7 +27,7 @@ ;; addi a4, a1, -0x401 ;; slli a4, a4, 2 ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a2, a5, a2 ;; lui a5, 1 ;; add a2, a2, a5 @@ -49,7 +49,7 @@ ;; addi a3, a1, -0x401 ;; slli a4, a3, 2 ;; sltu a3, a4, a2 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a2, a4, a2 ;; lui a4, 1 ;; add a2, a2, a4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 39f2edf81046..72db7393c551 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; lui a1, 0x10 ;; addi a4, a1, -4 ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a2, a5, a2 ;; lui a1, 0xffff ;; slli a5, a1, 4 @@ -48,7 +48,7 @@ ;; lui a1, 0x10 ;; addi a3, a1, -4 ;; sltu a3, a3, a2 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a2, a4, a2 ;; lui a1, 0xffff ;; slli a4, a1, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat index db3edf38668b..35c669a3457b 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -26,7 +26,7 @@ ;; auipc a4, 0 ;; ld a4, 0x38(a4) ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; neg a2, a4 ;; not a4, a2 @@ -48,7 +48,7 @@ ;; auipc a4, 0 ;; ld a4, 0x38(a4) ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; neg a2, a4 ;; not a4, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 77e05429ceae..888a5d6af2e4 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -26,7 +26,7 @@ ;; auipc a1, 0 ;; ld a1, 0x40(a1) ;; sltu a4, a1, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; lui a1, 1 ;; add a1, a0, a1 @@ -50,7 +50,7 @@ ;; auipc a1, 0 ;; ld a1, 0x40(a1) ;; sltu a3, a1, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; lui a1, 1 ;; add a1, a0, a1 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index f5ecd2332706..83dcf13ef914 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; lui a1, 0x10 ;; addi a4, a1, -1 ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a2, a5, a2 ;; lui a1, 0xffff ;; slli a5, a1, 4 @@ -48,7 +48,7 @@ ;; lui a1, 0x10 ;; addi a3, a1, -1 ;; sltu a3, a3, a2 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a2, a4, a2 ;; lui a1, 0xffff ;; slli a4, a1, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index af7b20016412..4f1b466f89ed 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -28,7 +28,7 @@ ;; slli a4, a4, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; sw a3, 0(a4) ;; ld ra, 8(sp) @@ -46,7 +46,7 @@ ;; slli a4, a3, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x60(a0) +;; ld a3, 0x50(a0) ;; add a3, a3, a2 ;; lw a0, 0(a3) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 9359593c282b..27ebb60d9a35 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -28,7 +28,7 @@ ;; slli a4, a4, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a4, a4, a2 ;; lui t6, 1 ;; add t6, t6, a4 @@ -48,7 +48,7 @@ ;; slli a4, a3, 2 ;; bgeu a4, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a3, 0x60(a0) +;; ld a3, 0x50(a0) ;; add a3, a3, a2 ;; lui t6, 1 ;; add t6, t6, a3 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index fbd457c8b639..d5629d49fe44 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -27,7 +27,7 @@ ;; addi a5, a4, -4 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 @@ -47,7 +47,7 @@ ;; addi a5, a3, -4 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 538aa6388d73..79db9fb173cd 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -27,7 +27,7 @@ ;; ld a1, 0x30(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; sb a3, 0(a1) ;; ld ra, 8(sp) @@ -47,7 +47,7 @@ ;; ld a1, 0x30(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lbu a0, 0(a1) ;; ld ra, 8(sp) diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index d82448bcbe15..0a014409ed78 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -27,7 +27,7 @@ ;; ld a1, 0x38(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 @@ -49,7 +49,7 @@ ;; ld a1, 0x38(a1) ;; bgeu a1, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a1, 0x60(a0) +;; ld a1, 0x50(a0) ;; add a1, a1, a2 ;; lui t6, 1 ;; add t6, t6, a1 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index f26d030f08ff..ca6798bf25d0 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -27,7 +27,7 @@ ;; addi a5, a4, -1 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 @@ -47,7 +47,7 @@ ;; addi a5, a3, -1 ;; bgeu a5, a2, 8 ;; .byte 0x00, 0x00, 0x00, 0x00 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; lui a4, 0xffff ;; slli a0, a4, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 89b6ce2b9a08..97a1c15c7d34 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -27,7 +27,7 @@ ;; addi a1, a4, -1 ;; slli a4, a1, 2 ;; sltu a1, a4, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; neg a4, a1 ;; not a1, a4 @@ -47,7 +47,7 @@ ;; addi a1, a4, -1 ;; slli a3, a1, 2 ;; sltu a1, a3, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; neg a4, a1 ;; not a1, a4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 080c265181da..e045f66cfdc2 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -27,7 +27,7 @@ ;; addi a4, a1, -0x401 ;; slli a4, a4, 2 ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a2, a5, a2 ;; lui a5, 1 ;; add a2, a2, a5 @@ -49,7 +49,7 @@ ;; addi a3, a1, -0x401 ;; slli a4, a3, 2 ;; sltu a3, a4, a2 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a2, a4, a2 ;; lui a4, 1 ;; add a2, a2, a4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 630be0970290..25de228ada0e 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; lui a1, 0x10 ;; addi a4, a1, -4 ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a2, a5, a2 ;; lui a1, 0xffff ;; slli a5, a1, 4 @@ -48,7 +48,7 @@ ;; lui a1, 0x10 ;; addi a3, a1, -4 ;; sltu a3, a3, a2 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a2, a4, a2 ;; lui a1, 0xffff ;; slli a4, a1, 4 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 21dac8f8eca5..323f300d541b 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -26,7 +26,7 @@ ;; auipc a4, 0 ;; ld a4, 0x38(a4) ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; neg a2, a4 ;; not a4, a2 @@ -48,7 +48,7 @@ ;; auipc a4, 0 ;; ld a4, 0x38(a4) ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a5, a5, a2 ;; neg a2, a4 ;; not a4, a2 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 80489270b510..0938b80d43b2 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -26,7 +26,7 @@ ;; auipc a1, 0 ;; ld a1, 0x40(a1) ;; sltu a4, a1, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; lui a1, 1 ;; add a1, a0, a1 @@ -50,7 +50,7 @@ ;; auipc a1, 0 ;; ld a1, 0x40(a1) ;; sltu a3, a1, a2 -;; ld a0, 0x60(a0) +;; ld a0, 0x50(a0) ;; add a0, a0, a2 ;; lui a1, 1 ;; add a1, a0, a1 diff --git a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 147f94856b8a..ab72894678ef 100644 --- a/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/riscv64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; lui a1, 0x10 ;; addi a4, a1, -1 ;; sltu a4, a4, a2 -;; ld a5, 0x60(a0) +;; ld a5, 0x50(a0) ;; add a2, a5, a2 ;; lui a1, 0xffff ;; slli a5, a1, 4 @@ -48,7 +48,7 @@ ;; lui a1, 0x10 ;; addi a3, a1, -1 ;; sltu a3, a3, a2 -;; ld a4, 0x60(a0) +;; ld a4, 0x50(a0) ;; add a2, a4, a2 ;; lui a1, 0xffff ;; slli a4, a1, 4 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 0e12c57813b6..00f701be2b6c 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 @@ -28,12 +28,12 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; aghi %r4, -4 ;; clgr %r3, %r4 ;; jgh 0x40 -;; lg %r6, 0x60(%r2) +;; lg %r6, 0x50(%r2) ;; strv %r5, 0(%r3, %r6) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -48,12 +48,12 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; aghi %r4, -4 ;; clgr %r3, %r4 ;; jgh 0x98 -;; lg %r5, 0x60(%r2) +;; lg %r5, 0x50(%r2) ;; lrv %r2, 0(%r3, %r5) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 7cff0ac0f2ae..f084a71e9674 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 @@ -28,12 +28,12 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; aghi %r4, -0x1004 ;; clgr %r3, %r4 ;; jgh 0x40 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r6, 0x1000 ;; strv %r5, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%r15) @@ -49,12 +49,12 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; aghi %r4, -0x1004 ;; clgr %r3, %r4 ;; jgh 0x9c -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r6, 0x1000 ;; lrv %r2, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%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 0224d0f3f954..434bd3019e02 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 @@ -32,10 +32,10 @@ ;; llilf %r4, 0xffff0004 ;; algfr %r4, %r3 ;; jgnle 0x3c -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; clgr %r4, %r6 ;; jgh 0x4c -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; strv %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -55,10 +55,10 @@ ;; llilf %r4, 0xffff0004 ;; algfr %r4, %r3 ;; jgnle 0xa4 -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; clgr %r4, %r6 ;; jgh 0xb4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; lrv %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 b5f7bbd5af6d..25e8fb29380e 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 @@ -28,11 +28,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; clgr %r3, %r4 ;; jghe 0x3c -;; lg %r4, 0x60(%r2) +;; lg %r4, 0x50(%r2) ;; stc %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -47,11 +47,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; clgr %r3, %r4 ;; jghe 0x90 -;; lg %r4, 0x60(%r2) +;; lg %r4, 0x50(%r2) ;; llc %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 83dc48e25d03..cbc372495ecc 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 @@ -28,12 +28,12 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; aghi %r4, -0x1001 ;; clgr %r3, %r4 ;; jgh 0x40 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r6, 0x1000 ;; stc %r5, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%r15) @@ -49,12 +49,12 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; aghi %r4, -0x1001 ;; clgr %r3, %r4 ;; jgh 0x9c -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r6, 0x1000 ;; llc %r2, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%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 c07a545f5f9e..246a43206ced 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 @@ -32,10 +32,10 @@ ;; llilf %r4, 0xffff0001 ;; algfr %r4, %r3 ;; jgnle 0x3c -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; clgr %r4, %r6 ;; jgh 0x4c -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -55,10 +55,10 @@ ;; llilf %r4, 0xffff0001 ;; algfr %r4, %r3 ;; jgnle 0xa4 -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; clgr %r4, %r6 ;; jgh 0xb4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 f0d040dfde27..e3d41fffca81 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 @@ -27,12 +27,12 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; aghik %r3, %r7, -4 ;; lghi %r7, 0 ;; lgr %r4, %r6 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; clgr %r6, %r3 ;; locgrh %r4, %r7 ;; strv %r5, 0(%r4) @@ -48,12 +48,12 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; llgfr %r5, %r4 ;; aghik %r7, %r6, -4 ;; lghi %r6, 0 ;; lgr %r4, %r5 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; clgr %r5, %r7 ;; locgrh %r4, %r6 ;; lrv %r2, 0(%r4) 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 8c858b3d698c..4403b74b703d 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 @@ -27,12 +27,12 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; aghik %r3, %r7, -0x1004 ;; lghi %r7, 0 ;; lgr %r4, %r6 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; aghik %r2, %r4, 0x1000 ;; clgr %r6, %r3 ;; locgrh %r2, %r7 @@ -49,12 +49,12 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; aghik %r3, %r7, -0x1004 ;; lghi %r7, 0 ;; lgr %r4, %r6 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; aghik %r5, %r4, 0x1000 ;; clgr %r6, %r3 ;; locgrh %r5, %r7 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 85c62b191fbd..aa553008e8d5 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 @@ -31,9 +31,9 @@ ;; llilf %r7, 0xffff0004 ;; algfr %r7, %r4 ;; jgnle 0x38 -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r4, 0 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r3, %r2 ;; clgr %r7, %r6 @@ -55,9 +55,9 @@ ;; llilf %r7, 0xffff0004 ;; algfr %r7, %r4 ;; jgnle 0xa4 -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; lghi %r4, 0 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r6, 0xffff ;; agrk %r2, %r3, %r6 ;; clgr %r7, %r5 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 dbf42917402e..48bded156bb5 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r9, 0x68(%r2) +;; lg %r9, 0x58(%r2) ;; llgfr %r7, %r4 ;; lghi %r6, 0 ;; lgr %r3, %r7 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r7, %r9 ;; locgrhe %r3, %r6 ;; stc %r5, 0(%r3) @@ -47,11 +47,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; lghi %r5, 0 ;; lgr %r3, %r6 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r6, %r7 ;; locgrhe %r3, %r5 ;; llc %r2, 0(%r3) 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 996ffb499715..dad3b03c8f94 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 @@ -27,12 +27,12 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; aghik %r3, %r7, -0x1001 ;; lghi %r7, 0 ;; lgr %r4, %r6 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; aghik %r2, %r4, 0x1000 ;; clgr %r6, %r3 ;; locgrh %r2, %r7 @@ -49,12 +49,12 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; aghik %r3, %r7, -0x1001 ;; lghi %r7, 0 ;; lgr %r4, %r6 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; aghik %r5, %r4, 0x1000 ;; clgr %r6, %r3 ;; locgrh %r5, %r7 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 04809b5ed8a1..39834a459e76 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 @@ -31,9 +31,9 @@ ;; llilf %r7, 0xffff0001 ;; algfr %r7, %r4 ;; jgnle 0x38 -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r4, 0 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r3, %r2 ;; clgr %r7, %r6 @@ -55,9 +55,9 @@ ;; llilf %r7, 0xffff0001 ;; algfr %r7, %r4 ;; jgnle 0xa0 -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; lghi %r4, 0 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r6, 0xffff ;; agrk %r2, %r3, %r6 ;; clgr %r7, %r5 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 8fd68607b8f0..0743631f86a0 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 @@ -28,11 +28,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; clgr %r3, %r4 ;; jgh 0x3c -;; lg %r4, 0x60(%r2) +;; lg %r4, 0x50(%r2) ;; strv %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -47,11 +47,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; clgr %r3, %r4 ;; jgh 0x90 -;; lg %r4, 0x60(%r2) +;; lg %r4, 0x50(%r2) ;; lrv %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 a54e14de4204..2cf6765737e9 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 @@ -28,11 +28,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; clgr %r3, %r4 ;; jgh 0x3c -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r6, 0x1000 ;; strv %r5, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,11 +48,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; clgr %r3, %r4 ;; jgh 0x94 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r5, 0x1000 ;; lrv %r2, 0(%r5, %r3) ;; lmg %r14, %r15, 0x110(%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 01f446e69df1..6c6700ae72a0 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 @@ -28,11 +28,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; clgr %r3, %r4 ;; jgh 0x3c -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r6, 0xffff ;; strv %r5, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,11 +48,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; clgr %r3, %r4 ;; jgh 0x94 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r5, 0xffff ;; lrv %r2, 0(%r5, %r3) ;; lmg %r14, %r15, 0x110(%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 0a630756fefc..151f71c3d72f 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 @@ -28,11 +28,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; clgr %r3, %r4 ;; jghe 0x3c -;; lg %r4, 0x60(%r2) +;; lg %r4, 0x50(%r2) ;; stc %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -47,11 +47,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; clgr %r3, %r4 ;; jghe 0x90 -;; lg %r4, 0x60(%r2) +;; lg %r4, 0x50(%r2) ;; llc %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 32ff69c7e3e8..612fb8f5093f 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 @@ -28,11 +28,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; clgr %r3, %r4 ;; jgh 0x3c -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r6, 0x1000 ;; stc %r5, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,11 +48,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; clgr %r3, %r4 ;; jgh 0x94 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; lghi %r5, 0x1000 ;; llc %r2, 0(%r5, %r3) ;; lmg %r14, %r15, 0x110(%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 558a88b316c7..d08cca1d9d9f 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 @@ -28,11 +28,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r6, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r6 ;; clgr %r3, %r4 ;; jgh 0x3c -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r6, 0xffff ;; stc %r5, 0(%r6, %r3) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,11 +48,11 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; lgr %r5, %r4 -;; lg %r4, 0x68(%r2) +;; lg %r4, 0x58(%r2) ;; llgfr %r3, %r5 ;; clgr %r3, %r4 ;; jgh 0x94 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r5, 0xffff ;; llc %r2, 0(%r5, %r3) ;; lmg %r14, %r15, 0x110(%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 e8839076aefc..4e73aff19049 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r9, 0x68(%r2) +;; lg %r9, 0x58(%r2) ;; llgfr %r7, %r4 ;; lghi %r6, 0 ;; lgr %r3, %r7 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r7, %r9 ;; locgrh %r3, %r6 ;; strv %r5, 0(%r3) @@ -47,11 +47,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; lghi %r5, 0 ;; lgr %r3, %r6 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r6, %r7 ;; locgrh %r3, %r5 ;; lrv %r2, 0(%r3) 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 7585e4a892ab..2b435c6c4df6 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; llgfr %r3, %r4 ;; lghi %r7, 0 ;; lgr %r4, %r3 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; aghi %r4, 0x1000 ;; clgr %r3, %r6 ;; locgrh %r4, %r7 @@ -48,11 +48,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; llgfr %r7, %r4 ;; lghi %r6, 0 ;; lgr %r3, %r7 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; aghik %r4, %r3, 0x1000 ;; clgr %r7, %r5 ;; locgrh %r4, %r6 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 111846ed91cc..b50b5b1e84db 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 @@ -27,13 +27,13 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lgr %r3, %r2 ;; llgfr %r2, %r4 ;; lghi %r7, 0 ;; lgr %r4, %r3 ;; lgr %r3, %r2 -;; ag %r3, 0x60(%r4) +;; ag %r3, 0x50(%r4) ;; llilh %r4, 0xffff ;; agr %r3, %r4 ;; clgr %r2, %r6 @@ -51,13 +51,13 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lgr %r3, %r2 ;; llgfr %r2, %r4 ;; lghi %r7, 0 ;; lgr %r4, %r3 ;; lgr %r3, %r2 -;; ag %r3, 0x60(%r4) +;; ag %r3, 0x50(%r4) ;; llilh %r4, 0xffff ;; agrk %r5, %r3, %r4 ;; clgr %r2, %r6 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 1f9b34db26b0..d04cd2cdf8e6 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r9, 0x68(%r2) +;; lg %r9, 0x58(%r2) ;; llgfr %r7, %r4 ;; lghi %r6, 0 ;; lgr %r3, %r7 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r7, %r9 ;; locgrhe %r3, %r6 ;; stc %r5, 0(%r3) @@ -47,11 +47,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; llgfr %r6, %r4 ;; lghi %r5, 0 ;; lgr %r3, %r6 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r6, %r7 ;; locgrhe %r3, %r5 ;; llc %r2, 0(%r3) 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 0690012d0a7e..2252d3d214e2 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; llgfr %r3, %r4 ;; lghi %r7, 0 ;; lgr %r4, %r3 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; aghi %r4, 0x1000 ;; clgr %r3, %r6 ;; locgrh %r4, %r7 @@ -48,11 +48,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; llgfr %r7, %r4 ;; lghi %r6, 0 ;; lgr %r3, %r7 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; aghik %r4, %r3, 0x1000 ;; clgr %r7, %r5 ;; locgrh %r4, %r6 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 2b0e20d249fa..9b8a8af43af3 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 @@ -27,13 +27,13 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lgr %r3, %r2 ;; llgfr %r2, %r4 ;; lghi %r7, 0 ;; lgr %r4, %r3 ;; lgr %r3, %r2 -;; ag %r3, 0x60(%r4) +;; ag %r3, 0x50(%r4) ;; llilh %r4, 0xffff ;; agr %r3, %r4 ;; clgr %r2, %r6 @@ -51,13 +51,13 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lgr %r3, %r2 ;; llgfr %r2, %r4 ;; lghi %r7, 0 ;; lgr %r4, %r3 ;; lgr %r3, %r2 -;; ag %r3, 0x60(%r4) +;; ag %r3, 0x50(%r4) ;; llilh %r4, 0xffff ;; agrk %r5, %r3, %r4 ;; clgr %r2, %r6 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 68ac1b9ec94b..57c7286e198a 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; aghi %r3, -4 ;; clgr %r4, %r3 ;; jgh 0x38 -;; lg %r6, 0x60(%r2) +;; lg %r6, 0x50(%r2) ;; strv %r5, 0(%r4, %r6) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -45,11 +45,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; aghi %r3, -4 ;; clgr %r4, %r3 ;; jgh 0x88 -;; lg %r5, 0x60(%r2) +;; lg %r5, 0x50(%r2) ;; lrv %r2, 0(%r4, %r5) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 afd35408de5f..70d3e80f1395 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; aghi %r3, -0x1004 ;; clgr %r4, %r3 ;; jgh 0x38 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r6, 0x1000 ;; strv %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,11 +46,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; aghi %r3, -0x1004 ;; clgr %r4, %r3 ;; jgh 0x8c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r5, 0x1000 ;; lrv %r2, 0(%r5, %r4) ;; lmg %r14, %r15, 0x110(%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 1d0ba33b2aa9..8cd45d30d1df 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 @@ -30,10 +30,10 @@ ;; lgr %r3, %r4 ;; algfi %r3, 0xffff0004 ;; jgnle 0x34 -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; clgr %r3, %r6 ;; jgh 0x44 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r6, 0xffff ;; strv %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -51,10 +51,10 @@ ;; lgr %r3, %r4 ;; algfi %r3, 0xffff0004 ;; jgnle 0x94 -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; clgr %r3, %r5 ;; jgh 0xa4 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r6, 0xffff ;; lrv %r2, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%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 75a2aef7d030..e4f1465749a6 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; clgr %r4, %r7 ;; jghe 0x34 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; stc %r5, 0(%r4, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -44,10 +44,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; clgr %r4, %r7 ;; jghe 0x80 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; llc %r2, 0(%r4, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 c824c4d726c3..25cb9fd5fefd 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; aghi %r3, -0x1001 ;; clgr %r4, %r3 ;; jgh 0x38 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r6, 0x1000 ;; stc %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,11 +46,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; aghi %r3, -0x1001 ;; clgr %r4, %r3 ;; jgh 0x8c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r5, 0x1000 ;; llc %r2, 0(%r5, %r4) ;; lmg %r14, %r15, 0x110(%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 23e287172d96..71b6436c2732 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 @@ -30,10 +30,10 @@ ;; lgr %r3, %r4 ;; algfi %r3, 0xffff0001 ;; jgnle 0x34 -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; clgr %r3, %r6 ;; jgh 0x44 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r6, 0xffff ;; stc %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -51,10 +51,10 @@ ;; lgr %r3, %r4 ;; algfi %r3, 0xffff0001 ;; jgnle 0x94 -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; clgr %r3, %r5 ;; jgh 0xa4 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r6, 0xffff ;; llc %r2, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%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 5eb708cb6d4a..dba7b079452f 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; aghik %r7, %r6, -4 ;; lghi %r6, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r4, %r7 ;; locgrh %r3, %r6 ;; strv %r5, 0(%r3) @@ -47,11 +47,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; aghik %r6, %r5, -4 ;; lghi %r5, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; clgr %r4, %r6 ;; locgrh %r3, %r5 ;; lrv %r2, 0(%r3) 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 3d4938edf148..e9fb2836a431 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; aghik %r7, %r6, -0x1004 ;; lghi %r6, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; aghik %r2, %r3, 0x1000 ;; clgr %r4, %r7 ;; locgrh %r2, %r6 @@ -48,11 +48,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; aghik %r6, %r5, -0x1004 ;; lghi %r5, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; aghi %r7, 0x1000 ;; clgr %r4, %r6 ;; locgrh %r7, %r5 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 0e1ceb12cd8c..bde6232fb52d 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 @@ -30,9 +30,9 @@ ;; lgr %r6, %r4 ;; algfi %r6, 0xffff0004 ;; jgnle 0x34 -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; lghi %r7, 0 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r4, %r2 ;; clgr %r6, %r3 @@ -53,9 +53,9 @@ ;; lgr %r6, %r4 ;; algfi %r6, 0xffff0004 ;; jgnle 0x9c -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; lghi %r7, 0 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r4, %r2 ;; clgr %r6, %r3 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 498997078320..e7a317fddc8e 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgr %r4, %r6 ;; locgrhe %r7, %r3 ;; stc %r5, 0(%r7) @@ -46,10 +46,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; clgr %r4, %r5 ;; locgrhe %r6, %r3 ;; llc %r2, 0(%r6) 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 7eee2d8d27d5..06188274b595 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 @@ -27,11 +27,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; aghik %r7, %r6, -0x1001 ;; lghi %r6, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; aghik %r2, %r3, 0x1000 ;; clgr %r4, %r7 ;; locgrh %r2, %r6 @@ -48,11 +48,11 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; aghik %r6, %r5, -0x1001 ;; lghi %r5, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; aghi %r7, 0x1000 ;; clgr %r4, %r6 ;; locgrh %r7, %r5 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 b1d8f837bb45..0167501f3de8 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 @@ -30,9 +30,9 @@ ;; lgr %r6, %r4 ;; algfi %r6, 0xffff0001 ;; jgnle 0x34 -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; lghi %r7, 0 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r4, %r2 ;; clgr %r6, %r3 @@ -53,9 +53,9 @@ ;; lgr %r6, %r4 ;; algfi %r6, 0xffff0001 ;; jgnle 0x98 -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; lghi %r7, 0 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r4, %r2 ;; clgr %r6, %r3 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 b3d1503f46f0..fce055ac36ef 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; clgr %r4, %r7 ;; jgh 0x34 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; strv %r5, 0(%r4, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -44,10 +44,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; clgr %r4, %r7 ;; jgh 0x80 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; lrv %r2, 0(%r4, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 fa54fdfb3891..b218c633037c 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x34 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r6, 0x1000 ;; strv %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -45,10 +45,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x84 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r5, 0x1000 ;; lrv %r2, 0(%r5, %r4) ;; lmg %r14, %r15, 0x110(%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 9d09f7a2e12e..822f9a221190 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x34 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r6, 0xffff ;; strv %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -45,10 +45,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x84 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r5, 0xffff ;; lrv %r2, 0(%r5, %r4) ;; lmg %r14, %r15, 0x110(%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 cb73bd6ade9f..5b1537ac48f5 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; clgr %r4, %r7 ;; jghe 0x34 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; stc %r5, 0(%r4, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -44,10 +44,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; clgr %r4, %r7 ;; jghe 0x80 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; llc %r2, 0(%r4, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 183e9362f204..ba7dd0f2a754 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x34 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r6, 0x1000 ;; stc %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -45,10 +45,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x84 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r5, 0x1000 ;; llc %r2, 0(%r5, %r4) ;; lmg %r14, %r15, 0x110(%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 4679f6b697df..22f23dc056e5 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x34 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r6, 0xffff ;; stc %r5, 0(%r6, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -45,10 +45,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r3, 0x68(%r2) +;; lg %r3, 0x58(%r2) ;; clgr %r4, %r3 ;; jgh 0x84 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r5, 0xffff ;; llc %r2, 0(%r5, %r4) ;; lmg %r14, %r15, 0x110(%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 4513f003da1d..9f158f9feb4a 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgr %r4, %r6 ;; locgrh %r7, %r3 ;; strv %r5, 0(%r7) @@ -46,10 +46,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; clgr %r4, %r5 ;; locgrh %r6, %r3 ;; lrv %r2, 0(%r6) 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 109c049aa225..e739c0dde7fd 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; lghi %r6, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; aghi %r3, 0x1000 ;; clgr %r4, %r7 ;; locgrh %r3, %r6 @@ -47,10 +47,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r5, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; aghik %r3, %r7, 0x1000 ;; clgr %r4, %r6 ;; locgrh %r3, %r5 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 1906123bf4d2..8912fae74ae9 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; lghi %r6, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r3, %r2 ;; clgr %r4, %r7 @@ -48,10 +48,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r5, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agr %r7, %r2 ;; clgr %r4, %r6 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 a959d4bb997f..e3c9f8f7d28d 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgr %r4, %r6 ;; locgrhe %r7, %r3 ;; stc %r5, 0(%r7) @@ -46,10 +46,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r5, 0x68(%r2) +;; lg %r5, 0x58(%r2) ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; clgr %r4, %r5 ;; locgrhe %r6, %r3 ;; llc %r2, 0(%r6) 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 f7c8483cd532..c70a7bbb63cd 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; lghi %r6, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; aghi %r3, 0x1000 ;; clgr %r4, %r7 ;; locgrh %r3, %r6 @@ -47,10 +47,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r5, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; aghik %r3, %r7, 0x1000 ;; clgr %r4, %r6 ;; locgrh %r3, %r5 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 2c50d7ce4c7a..b5d0345cb842 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 @@ -27,10 +27,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x68(%r2) +;; lg %r7, 0x58(%r2) ;; lghi %r6, 0 ;; lgr %r3, %r4 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r2, %r3, %r2 ;; clgr %r4, %r7 @@ -48,10 +48,10 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r6, 0x68(%r2) +;; lg %r6, 0x58(%r2) ;; lghi %r5, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agr %r7, %r2 ;; clgr %r4, %r6 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 fe05505482d0..e79633d33888 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 @@ -30,7 +30,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xfffffffc ;; jgh 0x34 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; strv %r5, 0(%r7, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -47,7 +47,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xfffffffc ;; jgh 0x80 -;; lg %r3, 0x60(%r2) +;; lg %r3, 0x50(%r2) ;; lrv %r2, 0(%r7, %r3) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 db8ff0a1f56d..cd9b81990a26 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 @@ -30,7 +30,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xffffeffc ;; jgh 0x34 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r4, 0x1000 ;; strv %r5, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,7 +48,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xffffeffc ;; jgh 0x84 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r4, 0x1000 ;; lrv %r2, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%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 6bd5a860febc..e984a7f08d22 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 @@ -30,7 +30,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xfffc ;; jgh 0x34 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r4, 0xffff ;; strv %r5, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,7 +48,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xfffc ;; jgh 0x84 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r4, 0xffff ;; lrv %r2, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%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 aadad6431564..339cb8e31a8d 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 @@ -27,7 +27,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -42,7 +42,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 05be43f0776a..fdd8e21c02bc 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 @@ -30,7 +30,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xffffefff ;; jgh 0x34 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r4, 0x1000 ;; stc %r5, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,7 +48,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xffffefff ;; jgh 0x84 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r4, 0x1000 ;; llc %r2, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%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 1db78522596f..65fe839e4ddb 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 @@ -30,7 +30,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xffff ;; jgh 0x34 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r4, 0xffff ;; stc %r5, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -48,7 +48,7 @@ ;; llgfr %r7, %r4 ;; clgfi %r7, 0xffff ;; jgh 0x84 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r4, 0xffff ;; llc %r2, 0(%r4, %r7) ;; lmg %r14, %r15, 0x110(%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 85b46393bd7f..bb5b9a9d2e2a 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 @@ -30,7 +30,7 @@ ;; llgfr %r4, %r4 ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; clgfi %r4, 0xfffffffc ;; locgrh %r6, %r3 ;; strv %r5, 0(%r6) @@ -49,7 +49,7 @@ ;; llgfr %r4, %r4 ;; lghi %r3, 0 ;; lgr %r5, %r4 -;; ag %r5, 0x60(%r2) +;; ag %r5, 0x50(%r2) ;; clgfi %r4, 0xfffffffc ;; locgrh %r5, %r3 ;; lrv %r2, 0(%r5) 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 9a8c7948d2e8..2415af1f7d1b 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 @@ -30,7 +30,7 @@ ;; llgfr %r6, %r4 ;; lghi %r4, 0 ;; lgr %r7, %r6 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; aghik %r3, %r7, 0x1000 ;; clgfi %r6, 0xffffeffc ;; locgrh %r3, %r4 @@ -50,7 +50,7 @@ ;; llgfr %r5, %r4 ;; lghi %r4, 0 ;; lgr %r6, %r5 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; aghik %r3, %r6, 0x1000 ;; clgfi %r5, 0xffffeffc ;; locgrh %r3, %r4 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 a23188269f9a..2b47b7fea25f 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 @@ -30,7 +30,7 @@ ;; llgfr %r7, %r4 ;; lghi %r6, 0 ;; lgr %r3, %r7 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r4, %r3, %r2 ;; clgfi %r7, 0xfffc @@ -51,7 +51,7 @@ ;; llgfr %r6, %r4 ;; lghi %r5, 0 ;; lgr %r7, %r6 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r4, %r7, %r2 ;; clgfi %r6, 0xfffc 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 48fff73b889e..9b678687dc8b 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 @@ -27,7 +27,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -42,7 +42,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 0d68da9b5030..4df6454b8933 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 @@ -30,7 +30,7 @@ ;; llgfr %r6, %r4 ;; lghi %r4, 0 ;; lgr %r7, %r6 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; aghik %r3, %r7, 0x1000 ;; clgfi %r6, 0xffffefff ;; locgrh %r3, %r4 @@ -50,7 +50,7 @@ ;; llgfr %r5, %r4 ;; lghi %r4, 0 ;; lgr %r6, %r5 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; aghik %r3, %r6, 0x1000 ;; clgfi %r5, 0xffffefff ;; locgrh %r3, %r4 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 d1a523ca8dcc..72b3ccf7577f 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 @@ -30,7 +30,7 @@ ;; llgfr %r7, %r4 ;; lghi %r6, 0 ;; lgr %r3, %r7 -;; ag %r3, 0x60(%r2) +;; ag %r3, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r4, %r3, %r2 ;; clgfi %r7, 0xffff @@ -51,7 +51,7 @@ ;; llgfr %r6, %r4 ;; lghi %r5, 0 ;; lgr %r7, %r6 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r4, %r7, %r2 ;; clgfi %r6, 0xffff 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 676fce36588c..c16343b0297f 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 @@ -27,7 +27,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; strv %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -42,7 +42,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; lrv %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 b7eccc555667..e34ed16f941d 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; strv %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; lrv %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 273f8552a9eb..a6b5eeebc55a 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; strv %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; lrv %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 5e2ad936ef6f..9319023b5050 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 @@ -27,7 +27,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -42,7 +42,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 4edd6c212ac5..5c161126b858 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 805ee374b6fe..8401eb0518cd 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 bb72f7668719..3cef7630412b 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 @@ -27,7 +27,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; strv %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -42,7 +42,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; lrv %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 79f596eaae69..e7e45ba7f007 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; strv %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; lrv %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 3fefa54fddcd..91e179f225bf 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; strv %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; lrv %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 7b7d8796f91b..8cdbbbdff915 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 @@ -27,7 +27,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -42,7 +42,7 @@ ;; lgr %r1, %r15 ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) -;; lg %r7, 0x60(%r2) +;; lg %r7, 0x50(%r2) ;; llgfr %r2, %r4 ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 4eb7ffcb539e..2f92015c50b5 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; lghi %r2, 0x1000 ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 67bffa489c59..af1b2108af16 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 @@ -28,7 +28,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; stc %r5, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%r15) @@ -44,7 +44,7 @@ ;; aghi %r15, -0xa0 ;; stg %r1, 0(%r15) ;; llgfr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; llc %r2, 0(%r2, %r7) ;; lmg %r14, %r15, 0x110(%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 248cbb65b8b2..a71ae2f82feb 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffffffc ;; jgh 0x30 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; strv %r5, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -45,7 +45,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffffffc ;; jgh 0x78 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; lrv %r2, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 56ea32e142b7..ae4e4cf60749 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffeffc ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; strv %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffeffc ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; lrv %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 7f82f03940e4..b2e2e55bf3f0 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffc ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; strv %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffc ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; lrv %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 d95fd0ddcbb8..9f02b270cdab 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffffff ;; jgh 0x30 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; stc %r5, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -45,7 +45,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffffff ;; jgh 0x78 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; llc %r2, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 e294d49d4f4f..6ef8e71bc593 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffefff ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; stc %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffefff ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; llc %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 efe1cedd9f2f..993279f360e2 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffff ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; stc %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffff ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; llc %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 5f338c2e5efc..7b2e104303b6 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xfffffffc ;; locgrh %r7, %r3 ;; strv %r5, 0(%r7) @@ -47,7 +47,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xfffffffc ;; locgrh %r7, %r3 ;; lrv %r2, 0(%r7) 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 5b4b80d27b1b..bc6ac871ee3c 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; aghik %r2, %r6, 0x1000 ;; clgfi %r4, 0xffffeffc ;; locgrh %r2, %r3 @@ -48,7 +48,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r5, %r4 -;; ag %r5, 0x60(%r2) +;; ag %r5, 0x50(%r2) ;; aghik %r2, %r5, 0x1000 ;; clgfi %r4, 0xffffeffc ;; locgrh %r2, %r3 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 52c062cf01a5..fb42606fe574 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r6, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r3, %r7, %r2 ;; clgfi %r4, 0xfffc @@ -49,7 +49,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r5, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; llilh %r7, 0xffff ;; agrk %r3, %r6, %r7 ;; clgfi %r4, 0xfffc 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 477c0b45f311..f47b41ee6de9 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xffffffff ;; locgrh %r7, %r3 ;; stc %r5, 0(%r7) @@ -47,7 +47,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xffffffff ;; locgrh %r7, %r3 ;; llc %r2, 0(%r7) 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 d4d691bf54d1..11a8a30c4658 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; aghik %r2, %r6, 0x1000 ;; clgfi %r4, 0xffffefff ;; locgrh %r2, %r3 @@ -48,7 +48,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r5, %r4 -;; ag %r5, 0x60(%r2) +;; ag %r5, 0x50(%r2) ;; aghik %r2, %r5, 0x1000 ;; clgfi %r4, 0xffffefff ;; locgrh %r2, %r3 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 f5260d5da330..3ff04728233b 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r6, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r3, %r7, %r2 ;; clgfi %r4, 0xffff @@ -49,7 +49,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r5, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; llilh %r7, 0xffff ;; agrk %r3, %r6, %r7 ;; clgfi %r4, 0xffff 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 d55b9b7c9384..7bbe1314f8b3 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffffffc ;; jgh 0x30 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; strv %r5, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -45,7 +45,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffffffc ;; jgh 0x78 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; lrv %r2, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 a926a46f33f2..a741ba15fe3b 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffeffc ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; strv %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffeffc ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; lrv %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 d38199abe469..15719511150b 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffc ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; strv %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xfffc ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; lrv %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 7981b069d090..acde1a4bf24d 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffffff ;; jgh 0x30 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; stc %r5, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 @@ -45,7 +45,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffffff ;; jgh 0x78 -;; lg %r2, 0x60(%r2) +;; lg %r2, 0x50(%r2) ;; llc %r2, 0(%r4, %r2) ;; lmg %r14, %r15, 0x110(%r15) ;; br %r14 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 a17045dd8fcb..47bc839237fe 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffefff ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; stc %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffffefff ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; lghi %r3, 0x1000 ;; llc %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 f95df00ed247..eca922bbc74b 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffff ;; jgh 0x30 -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; stc %r5, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%r15) @@ -46,7 +46,7 @@ ;; stg %r1, 0(%r15) ;; clgfi %r4, 0xffff ;; jgh 0x7c -;; ag %r4, 0x60(%r2) +;; ag %r4, 0x50(%r2) ;; llilh %r3, 0xffff ;; llc %r2, 0(%r3, %r4) ;; lmg %r14, %r15, 0x110(%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 7221f2120662..d6ee4ae9fcd1 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xfffffffc ;; locgrh %r7, %r3 ;; strv %r5, 0(%r7) @@ -47,7 +47,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xfffffffc ;; locgrh %r7, %r3 ;; lrv %r2, 0(%r7) 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 78bbc495f578..ac83c7339aeb 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; aghik %r2, %r6, 0x1000 ;; clgfi %r4, 0xffffeffc ;; locgrh %r2, %r3 @@ -48,7 +48,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r5, %r4 -;; ag %r5, 0x60(%r2) +;; ag %r5, 0x50(%r2) ;; aghik %r2, %r5, 0x1000 ;; clgfi %r4, 0xffffeffc ;; locgrh %r2, %r3 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 d9b6e0275eda..93f0c0a9e7ea 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r6, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r3, %r7, %r2 ;; clgfi %r4, 0xfffc @@ -49,7 +49,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r5, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; llilh %r7, 0xffff ;; agrk %r3, %r6, %r7 ;; clgfi %r4, 0xfffc 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 cdea48f73e0b..76b19cf7b095 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xffffffff ;; locgrh %r7, %r3 ;; stc %r5, 0(%r7) @@ -47,7 +47,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; clgfi %r4, 0xffffffff ;; locgrh %r7, %r3 ;; llc %r2, 0(%r7) 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 86681452915c..64d335d614e0 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; aghik %r2, %r6, 0x1000 ;; clgfi %r4, 0xffffefff ;; locgrh %r2, %r3 @@ -48,7 +48,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r3, 0 ;; lgr %r5, %r4 -;; ag %r5, 0x60(%r2) +;; ag %r5, 0x50(%r2) ;; aghik %r2, %r5, 0x1000 ;; clgfi %r4, 0xffffefff ;; locgrh %r2, %r3 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 150c4c538231..9649f1957402 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 @@ -29,7 +29,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r6, 0 ;; lgr %r7, %r4 -;; ag %r7, 0x60(%r2) +;; ag %r7, 0x50(%r2) ;; llilh %r2, 0xffff ;; agrk %r3, %r7, %r2 ;; clgfi %r4, 0xffff @@ -49,7 +49,7 @@ ;; stg %r1, 0(%r15) ;; lghi %r5, 0 ;; lgr %r6, %r4 -;; ag %r6, 0x60(%r2) +;; ag %r6, 0x50(%r2) ;; llilh %r7, 0xffff ;; agrk %r3, %r6, %r7 ;; clgfi %r4, 0xffff diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat index 5da0bbc76ca5..483d2de92cda 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %r10d ;; subq $4, %r8 ;; cmpq %r8, %r10 ;; ja 0x25 -;; 18: movq 0x60(%rdi), %rsi +;; 18: movq 0x50(%rdi), %rsi ;; movl %ecx, (%rsi, %r10) ;; movq %rbp, %rsp ;; popq %rbp @@ -36,12 +36,12 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %r10d ;; subq $4, %r8 ;; cmpq %r8, %r10 ;; ja 0x65 -;; 58: movq 0x60(%rdi), %rsi +;; 58: movq 0x50(%rdi), %rsi ;; movl (%rsi, %r10), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 9f07e9a6f462..848c4b5afe66 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %r10d ;; subq $0x1004, %r8 ;; cmpq %r8, %r10 ;; ja 0x2c -;; 1b: movq 0x60(%rdi), %rsi +;; 1b: movq 0x50(%rdi), %rsi ;; movl %ecx, 0x1000(%rsi, %r10) ;; movq %rbp, %rsp ;; popq %rbp @@ -36,12 +36,12 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %r10d ;; subq $0x1004, %r8 ;; cmpq %r8, %r10 ;; ja 0x6c -;; 5b: movq 0x60(%rdi), %rsi +;; 5b: movq 0x50(%rdi), %rsi ;; movl 0x1000(%rsi, %r10), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 453683390127..0010a0581d77 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -25,9 +25,9 @@ ;; movq %r8, %r10 ;; addq 0x27(%rip), %r10 ;; jb 0x33 -;; 17: cmpq 0x68(%rdi), %r10 +;; 17: cmpq 0x58(%rdi), %r10 ;; ja 0x35 -;; 21: addq 0x60(%rdi), %r8 +;; 21: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; movl %ecx, (%r8, %rdi) ;; movq %rbp, %rsp @@ -44,9 +44,9 @@ ;; movq %r8, %r10 ;; addq 0x27(%rip), %r10 ;; jb 0x73 -;; 57: cmpq 0x68(%rdi), %r10 +;; 57: cmpq 0x58(%rdi), %r10 ;; ja 0x75 -;; 61: addq 0x60(%rdi), %r8 +;; 61: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; movl (%r8, %rdi), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat index 3a26a4abac58..1156bd36f4ff 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -22,9 +22,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; jae 0x1e -;; 11: movq 0x60(%rdi), %r10 +;; 11: movq 0x50(%rdi), %r10 ;; movb %cl, (%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,9 +35,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; jae 0x3f -;; 31: movq 0x60(%rdi), %r10 +;; 31: movq 0x50(%rdi), %r10 ;; movzbq (%r10, %r8), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index e2bcf2d12a14..e46da3e928e8 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %r10d ;; subq $0x1001, %r8 ;; cmpq %r8, %r10 ;; ja 0x2c -;; 1b: movq 0x60(%rdi), %rsi +;; 1b: movq 0x50(%rdi), %rsi ;; movb %cl, 0x1000(%rsi, %r10) ;; movq %rbp, %rsp ;; popq %rbp @@ -36,12 +36,12 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %r10d ;; subq $0x1001, %r8 ;; cmpq %r8, %r10 ;; ja 0x6d -;; 5b: movq 0x60(%rdi), %rsi +;; 5b: movq 0x50(%rdi), %rsi ;; movzbq 0x1000(%rsi, %r10), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 180739db9256..51dea51d3453 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -25,9 +25,9 @@ ;; movq %r8, %r10 ;; addq 0x27(%rip), %r10 ;; jb 0x33 -;; 17: cmpq 0x68(%rdi), %r10 +;; 17: cmpq 0x58(%rdi), %r10 ;; ja 0x35 -;; 21: addq 0x60(%rdi), %r8 +;; 21: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; movb %cl, (%r8, %rdi) ;; movq %rbp, %rsp @@ -47,9 +47,9 @@ ;; movq %r8, %r10 ;; addq 0x27(%rip), %r10 ;; jb 0x74 -;; 57: cmpq 0x68(%rdi), %r10 +;; 57: cmpq 0x58(%rdi), %r10 ;; ja 0x76 -;; 61: addq 0x60(%rdi), %r8 +;; 61: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; movzbq (%r8, %rdi), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat index 8a12388ffc0d..1207ab943779 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -21,12 +21,12 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 +;; movq 0x58(%rdi), %r10 ;; movl %edx, %esi ;; subq $4, %r10 ;; xorq %rax, %rax ;; movq %rsi, %r11 -;; addq 0x60(%rdi), %r11 +;; addq 0x50(%rdi), %r11 ;; cmpq %r10, %rsi ;; cmovaq %rax, %r11 ;; movl %ecx, (%r11) @@ -37,12 +37,12 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 +;; movq 0x58(%rdi), %r10 ;; movl %edx, %esi ;; subq $4, %r10 ;; xorq %rax, %rax ;; movq %rsi, %r11 -;; addq 0x60(%rdi), %r11 +;; addq 0x50(%rdi), %r11 ;; cmpq %r10, %rsi ;; cmovaq %rax, %r11 ;; movl (%r11), %eax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 7346bca4259b..ce8ede7ce245 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; movl %edx, %eax ;; subq $0x1004, %r10 ;; xorq %rdx, %rdx @@ -37,8 +37,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; movl %edx, %eax ;; subq $0x1004, %r10 ;; xorq %rcx, %rcx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 1acefc22de0f..f0536bb80c88 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -25,9 +25,9 @@ ;; movq %r10, %rax ;; addq 0x2f(%rip), %rax ;; jb 0x3a -;; 17: movq 0x68(%rdi), %r8 +;; 17: movq 0x58(%rdi), %r8 ;; xorq %rdx, %rdx -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; movl $0xffff0000, %r9d ;; addq %r10, %r9 ;; cmpq %r8, %rax @@ -48,9 +48,9 @@ ;; movq %r10, %rax ;; addq 0x2f(%rip), %rax ;; jb 0x9a -;; 77: movq 0x68(%rdi), %rdx +;; 77: movq 0x58(%rdi), %rdx ;; xorq %rcx, %rcx -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; movl $0xffff0000, %r8d ;; addq %r10, %r8 ;; cmpq %rdx, %rax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat index af5f121d99d6..2c8ec765f034 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; movl %edx, %eax ;; xorq %rsi, %rsi ;; movq %rax, %r10 -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; cmpq %r11, %rax ;; cmovaeq %rsi, %r10 ;; movb %cl, (%r10) @@ -36,11 +36,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; movl %edx, %eax ;; xorq %rsi, %rsi ;; movq %rax, %r10 -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; cmpq %r11, %rax ;; cmovaeq %rsi, %r10 ;; movzbq (%r10), %rax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 57a59dc7b6e3..0097f73792d2 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; movl %edx, %eax ;; subq $0x1001, %r10 ;; xorq %rdx, %rdx @@ -37,8 +37,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; movl %edx, %eax ;; subq $0x1001, %r10 ;; xorq %rcx, %rcx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index ea8de970b5df..dc93b5e85e1f 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -25,9 +25,9 @@ ;; movq %r10, %rax ;; addq 0x2f(%rip), %rax ;; jb 0x3a -;; 17: movq 0x68(%rdi), %r8 +;; 17: movq 0x58(%rdi), %r8 ;; xorq %rdx, %rdx -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; movl $0xffff0000, %r9d ;; addq %r10, %r9 ;; cmpq %r8, %rax @@ -48,9 +48,9 @@ ;; movq %r10, %rax ;; addq 0x2f(%rip), %rax ;; jb 0x9b -;; 77: movq 0x68(%rdi), %rdx +;; 77: movq 0x58(%rdi), %rdx ;; xorq %rcx, %rcx -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; movl $0xffff0000, %r8d ;; addq %r10, %r8 ;; cmpq %rdx, %rax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index bf5ab3f9ac50..5dd416e73379 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -22,9 +22,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x1e -;; 11: movq 0x60(%rdi), %r10 +;; 11: movq 0x50(%rdi), %r10 ;; movl %ecx, (%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,9 +35,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x3e -;; 31: movq 0x60(%rdi), %r10 +;; 31: movq 0x50(%rdi), %r10 ;; movl (%r10, %r8), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 0ce1bc8537cb..246c44bd602c 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -22,9 +22,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x22 -;; 11: movq 0x60(%rdi), %r10 +;; 11: movq 0x50(%rdi), %r10 ;; movl %ecx, 0x1000(%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,9 +35,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x62 -;; 51: movq 0x60(%rdi), %r10 +;; 51: movq 0x50(%rdi), %r10 ;; movl 0x1000(%r10, %r8), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 44845b206454..07885ffe7d16 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -22,9 +22,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x24 -;; 11: addq 0x60(%rdi), %r8 +;; 11: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movl %ecx, (%r8, %r11) ;; movq %rbp, %rsp @@ -36,9 +36,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x64 -;; 51: addq 0x60(%rdi), %r8 +;; 51: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movl (%r8, %r11), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index d1ede280db71..3112e83e3d70 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -22,9 +22,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; jae 0x1e -;; 11: movq 0x60(%rdi), %r10 +;; 11: movq 0x50(%rdi), %r10 ;; movb %cl, (%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,9 +35,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; jae 0x3f -;; 31: movq 0x60(%rdi), %r10 +;; 31: movq 0x50(%rdi), %r10 ;; movzbq (%r10, %r8), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 231d5fb6f0e9..9e65a92e3003 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -22,9 +22,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x22 -;; 11: movq 0x60(%rdi), %r10 +;; 11: movq 0x50(%rdi), %r10 ;; movb %cl, 0x1000(%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,9 +35,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x63 -;; 51: movq 0x60(%rdi), %r10 +;; 51: movq 0x50(%rdi), %r10 ;; movzbq 0x1000(%r10, %r8), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index dc58373e8cf9..da2a8e4747b1 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -22,9 +22,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x24 -;; 11: addq 0x60(%rdi), %r8 +;; 11: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movb %cl, (%r8, %r11) ;; movq %rbp, %rsp @@ -36,9 +36,9 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; cmpq 0x68(%rdi), %r8 +;; cmpq 0x58(%rdi), %r8 ;; ja 0x65 -;; 51: addq 0x60(%rdi), %r8 +;; 51: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movzbq (%r8, %r11), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 438006449694..feff29a99286 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; movl %edx, %eax ;; xorq %rsi, %rsi ;; movq %rax, %r10 -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; cmpq %r11, %rax ;; cmovaq %rsi, %r10 ;; movl %ecx, (%r10) @@ -36,11 +36,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; movl %edx, %eax ;; xorq %rsi, %rsi ;; movq %rax, %r10 -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; cmpq %r11, %rax ;; cmovaq %rsi, %r10 ;; movl (%r10), %eax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 48be030254e4..27bbc97a548a 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rsi -;; movq 0x60(%rdi), %rax +;; movq 0x58(%rdi), %rsi +;; movq 0x50(%rdi), %rax ;; movl %edx, %edx ;; xorq %rdi, %rdi ;; leaq 0x1000(%rax, %rdx), %r11 @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rsi -;; movq 0x60(%rdi), %rax +;; movq 0x58(%rdi), %rsi +;; movq 0x50(%rdi), %rax ;; movl %edx, %ecx ;; xorq %rdi, %rdi ;; leaq 0x1000(%rax, %rcx), %r11 diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 9540ec4a922e..356a172c7eed 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %edx ;; xorq %rax, %rax ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; movl $0xffff0000, %edi ;; leaq (%r9, %rdi), %rsi ;; cmpq %r8, %rdx @@ -38,11 +38,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r9 +;; movq 0x58(%rdi), %r9 ;; movl %edx, %ecx ;; xorq %rax, %rax ;; movq %rcx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; leaq (%r8, %rdi), %rsi ;; cmpq %r9, %rcx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 7c48c64b549a..3226850a3d77 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; movl %edx, %eax ;; xorq %rsi, %rsi ;; movq %rax, %r10 -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; cmpq %r11, %rax ;; cmovaeq %rsi, %r10 ;; movb %cl, (%r10) @@ -36,11 +36,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; movl %edx, %eax ;; xorq %rsi, %rsi ;; movq %rax, %r10 -;; addq 0x60(%rdi), %r10 +;; addq 0x50(%rdi), %r10 ;; cmpq %r11, %rax ;; cmovaeq %rsi, %r10 ;; movzbq (%r10), %rax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index b90e22a09c94..493dce78bb2d 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rsi -;; movq 0x60(%rdi), %rax +;; movq 0x58(%rdi), %rsi +;; movq 0x50(%rdi), %rax ;; movl %edx, %edx ;; xorq %rdi, %rdi ;; leaq 0x1000(%rax, %rdx), %r11 @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rsi -;; movq 0x60(%rdi), %rax +;; movq 0x58(%rdi), %rsi +;; movq 0x50(%rdi), %rax ;; movl %edx, %ecx ;; xorq %rdi, %rdi ;; leaq 0x1000(%rax, %rcx), %r11 diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index a060373e4f4f..6fbc564cfa4d 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; movl %edx, %edx ;; xorq %rax, %rax ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; movl $0xffff0000, %edi ;; leaq (%r9, %rdi), %rsi ;; cmpq %r8, %rdx @@ -38,11 +38,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r9 +;; movq 0x58(%rdi), %r9 ;; movl %edx, %ecx ;; xorq %rax, %rax ;; movq %rcx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; leaq (%r8, %rdi), %rsi ;; cmpq %r9, %rcx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat index d2977ae41a7b..3caaed2d3f6e 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; subq $4, %r8 ;; cmpq %r8, %rdx ;; ja 0x22 -;; 15: movq 0x60(%rdi), %r11 +;; 15: movq 0x50(%rdi), %r11 ;; movl %ecx, (%r11, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,11 +35,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; subq $4, %r8 ;; cmpq %r8, %rdx ;; ja 0x62 -;; 55: movq 0x60(%rdi), %r11 +;; 55: movq 0x50(%rdi), %r11 ;; movl (%r11, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index b8f90a710d12..8f314283deff 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; subq $0x1004, %r8 ;; cmpq %r8, %rdx ;; ja 0x29 -;; 18: movq 0x60(%rdi), %r11 +;; 18: movq 0x50(%rdi), %r11 ;; movl %ecx, 0x1000(%r11, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,11 +35,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; subq $0x1004, %r8 ;; cmpq %r8, %rdx ;; ja 0x69 -;; 58: movq 0x60(%rdi), %r11 +;; 58: movq 0x50(%rdi), %r11 ;; movl 0x1000(%r11, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 53f1e2880e29..5713959fcb49 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -24,9 +24,9 @@ ;; movq %rdx, %r9 ;; addq 0x2a(%rip), %r9 ;; jb 0x2f -;; 14: cmpq 0x68(%rdi), %r9 +;; 14: cmpq 0x58(%rdi), %r9 ;; ja 0x31 -;; 1e: addq 0x60(%rdi), %rdx +;; 1e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %esi ;; movl %ecx, (%rdx, %rsi) ;; movq %rbp, %rsp @@ -44,9 +44,9 @@ ;; movq %rdx, %r9 ;; addq 0x2a(%rip), %r9 ;; jb 0x6f -;; 54: cmpq 0x68(%rdi), %r9 +;; 54: cmpq 0x58(%rdi), %r9 ;; ja 0x71 -;; 5e: addq 0x60(%rdi), %rdx +;; 5e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %esi ;; movl (%rdx, %rsi), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat index 7ccd3bb76a40..54b57b527da8 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -21,9 +21,9 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; jae 0x1b -;; e: movq 0x60(%rdi), %r9 +;; e: movq 0x50(%rdi), %r9 ;; movb %cl, (%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -33,9 +33,9 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; jae 0x3c -;; 2e: movq 0x60(%rdi), %r9 +;; 2e: movq 0x50(%rdi), %r9 ;; movzbq (%r9, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index b92422983012..90b633dbf44d 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; subq $0x1001, %r8 ;; cmpq %r8, %rdx ;; ja 0x29 -;; 18: movq 0x60(%rdi), %r11 +;; 18: movq 0x50(%rdi), %r11 ;; movb %cl, 0x1000(%r11, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,11 +35,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r8 +;; movq 0x58(%rdi), %r8 ;; subq $0x1001, %r8 ;; cmpq %r8, %rdx ;; ja 0x6a -;; 58: movq 0x60(%rdi), %r11 +;; 58: movq 0x50(%rdi), %r11 ;; movzbq 0x1000(%r11, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index e3b617f7ea74..0fc6269ac491 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -24,9 +24,9 @@ ;; movq %rdx, %r9 ;; addq 0x2a(%rip), %r9 ;; jb 0x2f -;; 14: cmpq 0x68(%rdi), %r9 +;; 14: cmpq 0x58(%rdi), %r9 ;; ja 0x31 -;; 1e: addq 0x60(%rdi), %rdx +;; 1e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %esi ;; movb %cl, (%rdx, %rsi) ;; movq %rbp, %rsp @@ -47,9 +47,9 @@ ;; movq %rdx, %r9 ;; addq 0x2a(%rip), %r9 ;; jb 0x71 -;; 54: cmpq 0x68(%rdi), %r9 +;; 54: cmpq 0x58(%rdi), %r9 ;; ja 0x73 -;; 5e: addq 0x60(%rdi), %rdx +;; 5e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %esi ;; movzbq (%rdx, %rsi), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat index 5164f66bd022..087b2324b3de 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -21,11 +21,11 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 +;; movq 0x58(%rdi), %r10 ;; subq $4, %r10 ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; cmpq %r10, %rdx ;; cmovaq %r11, %rsi ;; movl %ecx, (%rsi) @@ -36,11 +36,11 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 +;; movq 0x58(%rdi), %r10 ;; subq $4, %r10 ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; cmpq %r10, %rdx ;; cmovaq %r11, %rsi ;; movl (%rsi), %eax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 6c1608ad0e9f..6c7d0a1d5c9b 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; subq $0x1004, %r10 ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r11 @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; subq $0x1004, %r10 ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r11 diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 3b3311e7c753..1ea0ba6fab1a 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -24,9 +24,9 @@ ;; movq %rdx, %r8 ;; addq 0x32(%rip), %r8 ;; jb 0x37 -;; 14: movq 0x68(%rdi), %r9 +;; 14: movq 0x58(%rdi), %r9 ;; xorq %rax, %rax -;; addq 0x60(%rdi), %rdx +;; addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; leaq (%rdx, %r10), %rdi ;; cmpq %r9, %r8 @@ -47,9 +47,9 @@ ;; movq %rdx, %rcx ;; addq 0x32(%rip), %rcx ;; jb 0x97 -;; 74: movq 0x68(%rdi), %r8 +;; 74: movq 0x58(%rdi), %r8 ;; xorq %rax, %rax -;; addq 0x60(%rdi), %rdx +;; addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r9d ;; leaq (%rdx, %r9), %rdi ;; cmpq %r8, %rcx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat index cee7e6281ebd..cc8797643198 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -21,10 +21,10 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; xorq %r10, %r10 ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq %r11, %rdx ;; cmovaeq %r10, %r9 ;; movb %cl, (%r9) @@ -35,10 +35,10 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; xorq %r10, %r10 ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq %r11, %rdx ;; cmovaeq %r10, %r9 ;; movzbq (%r9), %rax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 162a098a1c51..753a34d58cdc 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; subq $0x1001, %r10 ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r11 @@ -36,8 +36,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r10 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r10 +;; movq 0x50(%rdi), %rdi ;; subq $0x1001, %r10 ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r11 diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 47a8518b70f5..975903bd9330 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -24,9 +24,9 @@ ;; movq %rdx, %r8 ;; addq 0x32(%rip), %r8 ;; jb 0x37 -;; 14: movq 0x68(%rdi), %r9 +;; 14: movq 0x58(%rdi), %r9 ;; xorq %rax, %rax -;; addq 0x60(%rdi), %rdx +;; addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; leaq (%rdx, %r10), %rdi ;; cmpq %r9, %r8 @@ -50,9 +50,9 @@ ;; movq %rdx, %rcx ;; addq 0x32(%rip), %rcx ;; jb 0x99 -;; 74: movq 0x68(%rdi), %r8 +;; 74: movq 0x58(%rdi), %r8 ;; xorq %rax, %rax -;; addq 0x60(%rdi), %rdx +;; addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r9d ;; leaq (%rdx, %r9), %rdi ;; cmpq %r8, %rcx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 842b676b6bdb..5c3b0510c186 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -21,9 +21,9 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x1b -;; e: movq 0x60(%rdi), %r9 +;; e: movq 0x50(%rdi), %r9 ;; movl %ecx, (%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -33,9 +33,9 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x3b -;; 2e: movq 0x60(%rdi), %r9 +;; 2e: movq 0x50(%rdi), %r9 ;; movl (%r9, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index c943d6854487..95a136307479 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,9 +21,9 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x1f -;; e: movq 0x60(%rdi), %r9 +;; e: movq 0x50(%rdi), %r9 ;; movl %ecx, 0x1000(%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -33,9 +33,9 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x5f -;; 4e: movq 0x60(%rdi), %r9 +;; 4e: movq 0x50(%rdi), %r9 ;; movl 0x1000(%r9, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index 6590c65f2419..e01dce7c0a32 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -21,9 +21,9 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x21 -;; e: addq 0x60(%rdi), %rdx +;; e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movl %ecx, (%rdx, %r10) ;; movq %rbp, %rsp @@ -34,9 +34,9 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x61 -;; 4e: addq 0x60(%rdi), %rdx +;; 4e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movl (%rdx, %r10), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index e3103a435e8d..23309d27954a 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -21,9 +21,9 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; jae 0x1b -;; e: movq 0x60(%rdi), %r9 +;; e: movq 0x50(%rdi), %r9 ;; movb %cl, (%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -33,9 +33,9 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; jae 0x3c -;; 2e: movq 0x60(%rdi), %r9 +;; 2e: movq 0x50(%rdi), %r9 ;; movzbq (%r9, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index e66fb9750d38..c33b4ac3aa2b 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,9 +21,9 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x1f -;; e: movq 0x60(%rdi), %r9 +;; e: movq 0x50(%rdi), %r9 ;; movb %cl, 0x1000(%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -33,9 +33,9 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x60 -;; 4e: movq 0x60(%rdi), %r9 +;; 4e: movq 0x50(%rdi), %r9 ;; movzbq 0x1000(%r9, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 94ff93a69335..39a739c927ad 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -21,9 +21,9 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x21 -;; e: addq 0x60(%rdi), %rdx +;; e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movb %cl, (%rdx, %r10) ;; movq %rbp, %rsp @@ -34,9 +34,9 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; cmpq 0x68(%rdi), %rdx +;; cmpq 0x58(%rdi), %rdx ;; ja 0x62 -;; 4e: addq 0x60(%rdi), %rdx +;; 4e: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movzbq (%rdx, %r10), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 7f519759d58d..2f631ada9a09 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -21,10 +21,10 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; xorq %r10, %r10 ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq %r11, %rdx ;; cmovaq %r10, %r9 ;; movl %ecx, (%r9) @@ -35,10 +35,10 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; xorq %r10, %r10 ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq %r11, %rdx ;; cmovaq %r10, %r9 ;; movl (%r9), %eax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 31ee2cb41064..e12b64325b35 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r11 +;; movq 0x50(%rdi), %rdi ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r10 ;; cmpq %r11, %rdx @@ -35,8 +35,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r11 +;; movq 0x50(%rdi), %rdi ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r10 ;; cmpq %r11, %rdx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index b4e0bfd742e1..d1cc333996a0 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -21,10 +21,10 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rax +;; movq 0x58(%rdi), %rax ;; xorq %rsi, %rsi ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; leaq (%r8, %rdi), %r11 ;; cmpq %rax, %rdx @@ -37,10 +37,10 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rax +;; movq 0x58(%rdi), %rax ;; xorq %rsi, %rsi ;; movq %rdx, %rcx -;; addq 0x60(%rdi), %rcx +;; addq 0x50(%rdi), %rcx ;; movl $0xffff0000, %edi ;; leaq (%rcx, %rdi), %r11 ;; cmpq %rax, %rdx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 5c023c883ebe..dae2e3a635b8 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -21,10 +21,10 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; xorq %r10, %r10 ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq %r11, %rdx ;; cmovaeq %r10, %r9 ;; movb %cl, (%r9) @@ -35,10 +35,10 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 +;; movq 0x58(%rdi), %r11 ;; xorq %r10, %r10 ;; movq %rdx, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq %r11, %rdx ;; cmovaeq %r10, %r9 ;; movzbq (%r9), %rax diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index f704da3202c0..db95ba4c73e2 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,8 +21,8 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r11 +;; movq 0x50(%rdi), %rdi ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r10 ;; cmpq %r11, %rdx @@ -35,8 +35,8 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x58(%rdi), %r11 +;; movq 0x50(%rdi), %rdi ;; xorq %rsi, %rsi ;; leaq 0x1000(%rdi, %rdx), %r10 ;; cmpq %r11, %rdx diff --git a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 4cf845349c34..44ae363548d4 100644 --- a/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -21,10 +21,10 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rax +;; movq 0x58(%rdi), %rax ;; xorq %rsi, %rsi ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %edi ;; leaq (%r8, %rdi), %r11 ;; cmpq %rax, %rdx @@ -37,10 +37,10 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x68(%rdi), %rax +;; movq 0x58(%rdi), %rax ;; xorq %rsi, %rsi ;; movq %rdx, %rcx -;; addq 0x60(%rdi), %rcx +;; addq 0x50(%rdi), %rcx ;; movl $0xffff0000, %edi ;; leaq (%rcx, %rdi), %r11 ;; cmpq %rax, %rdx diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat index bb673770a4f9..cab43e7f8512 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -24,7 +24,7 @@ ;; movl %edx, %r8d ;; cmpq 0x1a(%rip), %r8 ;; ja 0x21 -;; 14: movq 0x60(%rdi), %r10 +;; 14: movq 0x50(%rdi), %r10 ;; movl %ecx, (%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -40,7 +40,7 @@ ;; movl %edx, %r8d ;; cmpq 0x1a(%rip), %r8 ;; ja 0x61 -;; 54: movq 0x60(%rdi), %r10 +;; 54: movq 0x50(%rdi), %r10 ;; movl (%r10, %r8), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index f5a88f0c47dd..6bc8112cb5b6 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -24,7 +24,7 @@ ;; movl %edx, %r8d ;; cmpq 0x1a(%rip), %r8 ;; ja 0x25 -;; 14: movq 0x60(%rdi), %r10 +;; 14: movq 0x50(%rdi), %r10 ;; movl %ecx, 0x1000(%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -39,7 +39,7 @@ ;; movl %edx, %r8d ;; cmpq 0x1a(%rip), %r8 ;; ja 0x65 -;; 54: movq 0x60(%rdi), %r10 +;; 54: movq 0x50(%rdi), %r10 ;; movl 0x1000(%r10, %r8), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index c5ba9f5e0669..99f6e1cfa0da 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -24,7 +24,7 @@ ;; movl %edx, %r8d ;; cmpq $0xfffc, %r8 ;; ja 0x27 -;; 14: addq 0x60(%rdi), %r8 +;; 14: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movl %ecx, (%r8, %r11) ;; movq %rbp, %rsp @@ -38,7 +38,7 @@ ;; movl %edx, %r8d ;; cmpq $0xfffc, %r8 ;; ja 0x67 -;; 54: addq 0x60(%rdi), %r8 +;; 54: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movl (%r8, %r11), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat index 5712d826325f..f848fad3fe01 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movb %cl, (%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movzbq (%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index da12a01d60fa..958dc2c41458 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -24,7 +24,7 @@ ;; movl %edx, %r8d ;; cmpq 0x1a(%rip), %r8 ;; ja 0x25 -;; 14: movq 0x60(%rdi), %r10 +;; 14: movq 0x50(%rdi), %r10 ;; movb %cl, 0x1000(%r10, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -39,7 +39,7 @@ ;; movl %edx, %r8d ;; cmpq 0x1a(%rip), %r8 ;; ja 0x66 -;; 54: movq 0x60(%rdi), %r10 +;; 54: movq 0x50(%rdi), %r10 ;; movzbq 0x1000(%r10, %r8), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 2237b3d40a31..1708d31410ec 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -24,7 +24,7 @@ ;; movl %edx, %r8d ;; cmpq $0xffff, %r8 ;; ja 0x27 -;; 14: addq 0x60(%rdi), %r8 +;; 14: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movb %cl, (%r8, %r11) ;; movq %rbp, %rsp @@ -38,7 +38,7 @@ ;; movl %edx, %r8d ;; cmpq $0xffff, %r8 ;; ja 0x68 -;; 54: addq 0x60(%rdi), %r8 +;; 54: addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r11d ;; movzbq (%r8, %r11), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat index b6846ae71622..73eef2ee4f76 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -24,7 +24,7 @@ ;; movl %edx, %r11d ;; xorq %r10, %r10 ;; movq %r11, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq 0x10(%rip), %r11 ;; cmovaq %r10, %r9 ;; movl %ecx, (%r9) @@ -41,7 +41,7 @@ ;; movl %edx, %r11d ;; xorq %r10, %r10 ;; movq %r11, %r9 -;; addq 0x60(%rdi), %r9 +;; addq 0x50(%rdi), %r9 ;; cmpq 0x10(%rip), %r11 ;; cmovaq %r10, %r9 ;; movl (%r9), %eax diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 03ea375c31e1..27b5dab8c5fd 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; movl %edx, %esi ;; xorq %r11, %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x50(%rdi), %rdi ;; leaq 0x1000(%rdi, %rsi), %r10 ;; cmpq 0xc(%rip), %rsi ;; cmovaq %r11, %r10 @@ -39,7 +39,7 @@ ;; movq %rsp, %rbp ;; movl %edx, %esi ;; xorq %r11, %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x50(%rdi), %rdi ;; leaq 0x1000(%rdi, %rsi), %r10 ;; cmpq 0xc(%rip), %rsi ;; cmovaq %r11, %r10 diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 856b32fc43fd..e780ab9fcf0a 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; xorq %rsi, %rsi ;; movq %rax, %rdx ;; movq %rdi, %rax -;; addq 0x60(%rdx), %rax +;; addq 0x50(%rdx), %rax ;; movl $0xffff0000, %edx ;; leaq (%rax, %rdx), %r11 ;; cmpq $0xfffc, %rdi @@ -44,7 +44,7 @@ ;; xorq %rsi, %rsi ;; movq %rax, %rcx ;; movq %rdi, %rax -;; addq 0x60(%rcx), %rax +;; addq 0x50(%rcx), %rax ;; movl $0xffff0000, %ecx ;; leaq (%rax, %rcx), %r11 ;; cmpq $0xfffc, %rdi diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat index 48fe91f2704c..a5a655211d17 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movb %cl, (%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movzbq (%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 459e9494fce5..01297e7f826b 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; movl %edx, %esi ;; xorq %r11, %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x50(%rdi), %rdi ;; leaq 0x1000(%rdi, %rsi), %r10 ;; cmpq 0xc(%rip), %rsi ;; cmovaq %r11, %r10 @@ -37,7 +37,7 @@ ;; movq %rsp, %rbp ;; movl %edx, %esi ;; xorq %r11, %r11 -;; movq 0x60(%rdi), %rdi +;; movq 0x50(%rdi), %rdi ;; leaq 0x1000(%rdi, %rsi), %r10 ;; cmpq 0x14(%rip), %rsi ;; cmovaq %r11, %r10 diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 51cd3cc1945f..2b7401210296 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -26,7 +26,7 @@ ;; xorq %rsi, %rsi ;; movq %rax, %rdx ;; movq %rdi, %rax -;; addq 0x60(%rdx), %rax +;; addq 0x50(%rdx), %rax ;; movl $0xffff0000, %edx ;; leaq (%rax, %rdx), %r11 ;; cmpq $0xffff, %rdi @@ -44,7 +44,7 @@ ;; xorq %rsi, %rsi ;; movq %rax, %rcx ;; movq %rdi, %rax -;; addq 0x60(%rcx), %rax +;; addq 0x50(%rcx), %rax ;; movl $0xffff0000, %ecx ;; leaq (%rax, %rcx), %r11 ;; cmpq $0xffff, %rdi diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index aca51c94c07d..c0778d3b38ae 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl %ecx, (%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl (%r8, %r9), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index bc57084458af..20da19085186 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl %ecx, 0x1000(%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl 0x1000(%r8, %r9), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index deef00268665..ba34e56c326c 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movl %ecx, (%r8, %r9) ;; movq %rbp, %rsp @@ -33,7 +33,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movl (%r8, %r9), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 6de3fa29acea..fce394753817 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movb %cl, (%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movzbq (%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 87ed65e6152e..7bd5e40f62ba 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movb %cl, 0x1000(%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movzbq 0x1000(%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index a81364b402ef..2e494545028b 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movb %cl, (%r8, %r9) ;; movq %rbp, %rsp @@ -33,7 +33,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movzbq (%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 093142268a91..096e50c9ac96 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl %ecx, (%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl (%r8, %r9), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 210d32e74585..e0589dd4261b 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl %ecx, 0x1000(%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movl 0x1000(%r8, %r9), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index ed9ca45988bf..87c83c2ec88c 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movl %ecx, (%r8, %r9) ;; movq %rbp, %rsp @@ -33,7 +33,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movl (%r8, %r9), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 3a1948e413f4..93e6756e91f4 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movb %cl, (%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movzbq (%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 9ba899575d77..efd78329c776 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movb %cl, 0x1000(%r8, %r9) ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movzbq 0x1000(%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index ac3ff9a33731..0f3b8c80930e 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movb %cl, (%r8, %r9) ;; movq %rbp, %rsp @@ -33,7 +33,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; movl $0xffff0000, %r9d ;; movzbq (%r8, %r9), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat index f8122487e822..aa8e543eb1c8 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x15(%rip), %rdx ;; ja 0x1e -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movl %ecx, (%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -36,7 +36,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x15(%rip), %rdx ;; ja 0x5e -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movl (%r9, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 1a52ad746b3b..10a83fe11db3 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x22 -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movl %ecx, 0x1000(%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -39,7 +39,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x62 -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movl 0x1000(%r9, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 8f70d5375c35..596dae2be2d6 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xfffc, %rdx ;; ja 0x24 -;; 11: addq 0x60(%rdi), %rdx +;; 11: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movl %ecx, (%rdx, %r10) ;; movq %rbp, %rsp @@ -36,7 +36,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xfffc, %rdx ;; ja 0x64 -;; 51: addq 0x60(%rdi), %rdx +;; 51: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movl (%rdx, %r10), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat index 31b44b07cd75..6dd3cfe9c96b 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x15(%rip), %rdx ;; ja 0x1e -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movb %cl, (%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,7 +35,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x5f -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movzbq (%r9, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index e9b29d3660f9..430b16cbdcea 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x22 -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movb %cl, 0x1000(%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -37,7 +37,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x63 -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movzbq 0x1000(%r9, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index c1840a1b1356..6bcdb8ee03de 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xffff, %rdx ;; ja 0x24 -;; 11: addq 0x60(%rdi), %rdx +;; 11: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movb %cl, (%rdx, %r10) ;; movq %rbp, %rsp @@ -36,7 +36,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xffff, %rdx ;; ja 0x65 -;; 51: addq 0x60(%rdi), %rdx +;; 51: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movzbq (%rdx, %r10), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat index 321f0552670e..c1c1960e3c09 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movl %ecx, (%r8) @@ -40,7 +40,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movl (%r8), %eax diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index 788c55ecec2c..6b3228e2592f 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 @@ -38,7 +38,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 56b11420f564..b96ab62935da 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xfffc, %rdx @@ -38,7 +38,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xfffc, %rdx diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat index 084a1f9c5d8f..a669bbdcbb7a 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movb %cl, (%r8) @@ -40,7 +40,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movzbq (%r8), %rax diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 84697b310e62..0d6a8b9aae20 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 @@ -36,7 +36,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 4ddc91eb0038..e3dd0d4ba39c 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xffff, %rdx @@ -38,7 +38,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xffff, %rdx diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index e375f5962dd8..9168bc3f659a 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x15(%rip), %rdx ;; ja 0x1e -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movl %ecx, (%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -36,7 +36,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x15(%rip), %rdx ;; ja 0x5e -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movl (%r9, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index a35dbc72b039..678928c6597d 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x22 -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movl %ecx, 0x1000(%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -39,7 +39,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x62 -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movl 0x1000(%r9, %rdx), %eax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index a08a798c3bc4..8cd18362988d 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xfffc, %rdx ;; ja 0x24 -;; 11: addq 0x60(%rdi), %rdx +;; 11: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movl %ecx, (%rdx, %r10) ;; movq %rbp, %rsp @@ -36,7 +36,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xfffc, %rdx ;; ja 0x64 -;; 51: addq 0x60(%rdi), %rdx +;; 51: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movl (%rdx, %r10), %eax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index a6edea0e59d1..cec5dd194ee4 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x15(%rip), %rdx ;; ja 0x1e -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movb %cl, (%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -35,7 +35,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x5f -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movzbq (%r9, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index ab3509ac1b74..3b6eb680ee41 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x22 -;; 11: movq 0x60(%rdi), %r9 +;; 11: movq 0x50(%rdi), %r9 ;; movb %cl, 0x1000(%r9, %rdx) ;; movq %rbp, %rsp ;; popq %rbp @@ -37,7 +37,7 @@ ;; movq %rsp, %rbp ;; cmpq 0x1d(%rip), %rdx ;; ja 0x63 -;; 51: movq 0x60(%rdi), %r9 +;; 51: movq 0x50(%rdi), %r9 ;; movzbq 0x1000(%r9, %rdx), %rax ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 713c662f50ad..6cbec50dd1ee 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xffff, %rdx ;; ja 0x24 -;; 11: addq 0x60(%rdi), %rdx +;; 11: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movb %cl, (%rdx, %r10) ;; movq %rbp, %rsp @@ -36,7 +36,7 @@ ;; movq %rsp, %rbp ;; cmpq $0xffff, %rdx ;; ja 0x65 -;; 51: addq 0x60(%rdi), %rdx +;; 51: addq 0x50(%rdi), %rdx ;; movl $0xffff0000, %r10d ;; movzbq (%rdx, %r10), %rax ;; movq %rbp, %rsp diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 27c0b2585867..2e65c2c1133f 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movl %ecx, (%r8) @@ -40,7 +40,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movl (%r8), %eax diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index e9ce3d55890d..5f864c4d2cea 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 @@ -38,7 +38,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index c94d42088bfb..531de739dcab 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xfffc, %rdx @@ -38,7 +38,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xfffc, %rdx diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index a886cda8c1ac..3363dcd57ab0 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movb %cl, (%r8) @@ -40,7 +40,7 @@ ;; movq %rsp, %rbp ;; xorq %r9, %r9 ;; movq %rdx, %r8 -;; addq 0x60(%rdi), %r8 +;; addq 0x50(%rdi), %r8 ;; cmpq 0x13(%rip), %rdx ;; cmovaq %r9, %r8 ;; movzbq (%r8), %rax diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 3075aa877a9f..bf674258c1ee 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -22,7 +22,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 @@ -36,7 +36,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; xorq %r10, %r10 -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; leaq 0x1000(%r11, %rdx), %r9 ;; cmpq 0xe(%rip), %rdx ;; cmovaq %r10, %r9 diff --git a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 344514b0980b..ef543b608a85 100644 --- a/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/x64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xffff, %rdx @@ -38,7 +38,7 @@ ;; movq %rsp, %rbp ;; xorq %r11, %r11 ;; movq %rdx, %rsi -;; addq 0x60(%rdi), %rsi +;; addq 0x50(%rdi), %rsi ;; movl $0xffff0000, %edi ;; leaq (%rsi, %rdi), %r10 ;; cmpq $0xffff, %rdx diff --git a/tests/disas/memory.wat b/tests/disas/memory.wat index 909c9c7ce538..e43553a5236f 100644 --- a/tests/disas/memory.wat +++ b/tests/disas/memory.wat @@ -17,8 +17,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): @@ -26,12 +26,12 @@ ;; @0021 v3 = iconst.i32 0 ;; @0023 v4 = iconst.i32 0 ;; @0025 v5 = uextend.i64 v3 ; v3 = 0 -;; @0025 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0025 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0025 v7 = iadd v6, v5 ;; @0025 store little heap v4, v7 ; v4 = 0 ;; @0028 v8 = iconst.i32 0 ;; @002a v9 = uextend.i64 v8 ; v8 = 0 -;; @002a v10 = load.i64 notrap aligned readonly checked v0+96 +;; @002a v10 = load.i64 notrap aligned readonly checked v0+80 ;; @002a v11 = iadd v10, v9 ;; @002a v12 = load.i32 little heap v11 ;; @002d brif v12, block2, block4 @@ -40,7 +40,7 @@ ;; @002f v13 = iconst.i32 0 ;; @0031 v14 = iconst.i32 10 ;; @0033 v15 = uextend.i64 v13 ; v13 = 0 -;; @0033 v16 = load.i64 notrap aligned readonly checked v0+96 +;; @0033 v16 = load.i64 notrap aligned readonly checked v0+80 ;; @0033 v17 = iadd v16, v15 ;; @0033 store little heap v14, v17 ; v14 = 10 ;; @0036 jump block3 @@ -49,7 +49,7 @@ ;; @0037 v18 = iconst.i32 0 ;; @0039 v19 = iconst.i32 11 ;; @003b v20 = uextend.i64 v18 ; v18 = 0 -;; @003b v21 = load.i64 notrap aligned readonly checked v0+96 +;; @003b v21 = load.i64 notrap aligned readonly checked v0+80 ;; @003b v22 = iadd v21, v20 ;; @003b store little heap v19, v22 ; v19 = 11 ;; @003e jump block3 diff --git a/tests/disas/non-fixed-size-memory.wat b/tests/disas/non-fixed-size-memory.wat index 6331e241964c..20186de10389 100644 --- a/tests/disas/non-fixed-size-memory.wat +++ b/tests/disas/non-fixed-size-memory.wat @@ -25,16 +25,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0041 v4 = uextend.i64 v2 -;; @0041 v5 = load.i64 notrap aligned v0+104 +;; @0041 v5 = load.i64 notrap aligned v0+88 ;; @0041 v6 = icmp uge v4, v5 ;; @0041 trapnz v6, heap_oob -;; @0041 v7 = load.i64 notrap aligned checked v0+96 +;; @0041 v7 = load.i64 notrap aligned checked v0+80 ;; @0041 v8 = iadd v7, v4 ;; @0041 istore8 little heap v3, v8 ;; @0044 jump block1 @@ -48,16 +48,16 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = load.i64 notrap aligned v0+104 +;; @0049 v5 = load.i64 notrap aligned v0+88 ;; @0049 v6 = icmp uge v4, v5 ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = load.i64 notrap aligned checked v0+96 +;; @0049 v7 = load.i64 notrap aligned checked v0+80 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = uload8.i32 little heap v8 ;; @004c jump block1 diff --git a/tests/disas/passive-data.wat b/tests/disas/passive-data.wat index dfe1fd5609df..839153e862c2 100644 --- a/tests/disas/passive-data.wat +++ b/tests/disas/passive-data.wat @@ -18,8 +18,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; sig0 = (i64 vmctx, i32, i32, i64, i32, i32) -> i8 tail ;; fn0 = colocated u1:6 sig0 ;; stack_limit = gv2 diff --git a/tests/disas/pcc-imported-memory.wat b/tests/disas/pcc-imported-memory.wat index 616cb5bc3e26..9d1bcad2c1f7 100644 --- a/tests/disas/pcc-imported-memory.wat +++ b/tests/disas/pcc-imported-memory.wat @@ -37,7 +37,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x58(%rdi), %rcx +;; movq 0x48(%rdi), %rcx ;; movq 8(%rcx), %rax ;; shrq $0x10, %rax ;; movq %rax, %rcx @@ -47,7 +47,7 @@ ;; jbe 0x3b ;; 21: testl %eax, %eax ;; jle 0x3b -;; 29: movq 0x58(%rdi), %rsi +;; 29: movq 0x48(%rdi), %rsi ;; movq (%rsi), %rsi ;; movl %eax, %edi ;; movl (%rsi, %rdi), %r10d diff --git a/tests/disas/pcc-insertlane-x64-avx.wat b/tests/disas/pcc-insertlane-x64-avx.wat index 7361cb01d32b..93699baf9c0e 100644 --- a/tests/disas/pcc-insertlane-x64-avx.wat +++ b/tests/disas/pcc-insertlane-x64-avx.wat @@ -70,7 +70,7 @@ ;; movq %rsp, %rbp ;; vmovdqu 0x14(%rip), %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vpinsrb $1, (%r10, %r9), %xmm6, %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -85,7 +85,7 @@ ;; movq %rsp, %rbp ;; vmovdqu 0x14(%rip), %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vpinsrw $1, (%r10, %r9), %xmm6, %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -100,7 +100,7 @@ ;; movq %rsp, %rbp ;; vmovdqu 0x14(%rip), %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vpinsrd $1, (%r10, %r9), %xmm6, %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -115,7 +115,7 @@ ;; movq %rsp, %rbp ;; vmovdqu 0x14(%rip), %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vpinsrq $1, (%r10, %r9), %xmm6, %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -129,7 +129,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vinsertps $0, (%r10, %r9), %xmm0, %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -139,7 +139,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vmovhps (%r10, %r9), %xmm0, %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -149,7 +149,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r10d -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; vmovsd (%r11, %r10), %xmm7 ;; vmovsd %xmm7, %xmm0, %xmm0 ;; movq %rbp, %rsp @@ -161,7 +161,7 @@ ;; movq %rsp, %rbp ;; vpshufd $0xee, %xmm0, %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vmovsd %xmm6, (%r10, %r9) ;; movq %rbp, %rsp ;; popq %rbp @@ -172,7 +172,7 @@ ;; movq %rsp, %rbp ;; vpshufd $1, %xmm0, %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; vmovss %xmm6, (%r10, %r9) ;; movq %rbp, %rsp ;; popq %rbp @@ -184,7 +184,7 @@ ;; vpextrb $1, %xmm0, %r10d ;; movsbl %r10b, %r10d ;; movl %edx, %r11d -;; movq 0x60(%rdi), %rsi +;; movq 0x50(%rdi), %rsi ;; movb %r10b, (%rsi, %r11) ;; movq %rbp, %rsp ;; popq %rbp @@ -196,7 +196,7 @@ ;; vpextrw $1, %xmm0, %r10d ;; movswl %r10w, %r10d ;; movl %edx, %r11d -;; movq 0x60(%rdi), %rsi +;; movq 0x50(%rdi), %rsi ;; movw %r10w, (%rsi, %r11) ;; movq %rbp, %rsp ;; popq %rbp @@ -206,7 +206,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; movq 0x60(%rdi), %r9 +;; movq 0x50(%rdi), %r9 ;; vpextrd $1, %xmm0, (%r9, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -216,7 +216,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; movq 0x60(%rdi), %r9 +;; movq 0x50(%rdi), %r9 ;; vpextrq $1, %xmm0, (%r9, %r8) ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/pcc-insertlane-x64.wat b/tests/disas/pcc-insertlane-x64.wat index b82db8486261..f621e024bee9 100644 --- a/tests/disas/pcc-insertlane-x64.wat +++ b/tests/disas/pcc-insertlane-x64.wat @@ -70,7 +70,7 @@ ;; movq %rsp, %rbp ;; movdqu 0x14(%rip), %xmm0 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; pinsrb $1, (%r10, %r9), %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -86,7 +86,7 @@ ;; movq %rsp, %rbp ;; movdqu 0x14(%rip), %xmm0 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; pinsrw $1, (%r10, %r9), %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -101,7 +101,7 @@ ;; movq %rsp, %rbp ;; movdqu 0x14(%rip), %xmm0 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; pinsrd $1, (%r10, %r9), %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -117,7 +117,7 @@ ;; movq %rsp, %rbp ;; movdqu 0x14(%rip), %xmm0 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; pinsrq $1, (%r10, %r9), %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -132,7 +132,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; insertps $0, (%r10, %r9), %xmm0 ;; movq %rbp, %rsp ;; popq %rbp @@ -142,7 +142,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r10d -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; movdqu (%r11, %r10), %xmm6 ;; movlhps %xmm6, %xmm0 ;; movq %rbp, %rsp @@ -153,7 +153,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r10d -;; movq 0x60(%rdi), %r11 +;; movq 0x50(%rdi), %r11 ;; movsd (%r11, %r10), %xmm7 ;; movsd %xmm7, %xmm0 ;; movq %rbp, %rsp @@ -165,7 +165,7 @@ ;; movq %rsp, %rbp ;; pshufd $0xee, %xmm0, %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; movsd %xmm6, (%r10, %r9) ;; movq %rbp, %rsp ;; popq %rbp @@ -176,7 +176,7 @@ ;; movq %rsp, %rbp ;; pshufd $1, %xmm0, %xmm6 ;; movl %edx, %r9d -;; movq 0x60(%rdi), %r10 +;; movq 0x50(%rdi), %r10 ;; movss %xmm6, (%r10, %r9) ;; movq %rbp, %rsp ;; popq %rbp @@ -188,7 +188,7 @@ ;; pextrb $1, %xmm0, %r10d ;; movsbl %r10b, %r10d ;; movl %edx, %r11d -;; movq 0x60(%rdi), %rsi +;; movq 0x50(%rdi), %rsi ;; movb %r10b, (%rsi, %r11) ;; movq %rbp, %rsp ;; popq %rbp @@ -200,7 +200,7 @@ ;; pextrw $1, %xmm0, %r10d ;; movswl %r10w, %r10d ;; movl %edx, %r11d -;; movq 0x60(%rdi), %rsi +;; movq 0x50(%rdi), %rsi ;; movw %r10w, (%rsi, %r11) ;; movq %rbp, %rsp ;; popq %rbp @@ -210,7 +210,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; movq 0x60(%rdi), %r9 +;; movq 0x50(%rdi), %r9 ;; pextrd $1, %xmm0, (%r9, %r8) ;; movq %rbp, %rsp ;; popq %rbp @@ -220,7 +220,7 @@ ;; pushq %rbp ;; movq %rsp, %rbp ;; movl %edx, %r8d -;; movq 0x60(%rdi), %r9 +;; movq 0x50(%rdi), %r9 ;; pextrq $1, %xmm0, (%r9, %r8) ;; movq %rbp, %rsp ;; popq %rbp diff --git a/tests/disas/pcc-loads-x64-avx.wat b/tests/disas/pcc-loads-x64-avx.wat index 94cf0413f64c..019cf70a86ef 100644 --- a/tests/disas/pcc-loads-x64-avx.wat +++ b/tests/disas/pcc-loads-x64-avx.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; vmovss (%r8, %r9), %xmm0 ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; vmovsd (%r8, %r9), %xmm0 ;; movq %rbp, %rsp @@ -41,7 +41,7 @@ ;; wasm[0]::function[2]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; vmovss %xmm0, (%r8, %r9) ;; movq %rbp, %rsp @@ -51,7 +51,7 @@ ;; wasm[0]::function[3]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; vmovsd %xmm0, (%r8, %r9) ;; movq %rbp, %rsp diff --git a/tests/disas/pcc-loads-x64.wat b/tests/disas/pcc-loads-x64.wat index 51fdaf1b9f7f..2b05a79e965c 100644 --- a/tests/disas/pcc-loads-x64.wat +++ b/tests/disas/pcc-loads-x64.wat @@ -21,7 +21,7 @@ ;; wasm[0]::function[0]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movss (%r8, %r9), %xmm0 ;; movq %rbp, %rsp @@ -31,7 +31,7 @@ ;; wasm[0]::function[1]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movsd (%r8, %r9), %xmm0 ;; movq %rbp, %rsp @@ -41,7 +41,7 @@ ;; wasm[0]::function[2]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movss %xmm0, (%r8, %r9) ;; movq %rbp, %rsp @@ -51,7 +51,7 @@ ;; wasm[0]::function[3]: ;; pushq %rbp ;; movq %rsp, %rbp -;; movq 0x60(%rdi), %r8 +;; movq 0x50(%rdi), %r8 ;; movl %edx, %r9d ;; movsd %xmm0, (%r8, %r9) ;; movq %rbp, %rsp diff --git a/tests/disas/pr2303.wat b/tests/disas/pr2303.wat index 9708b85b4de9..007642e45755 100644 --- a/tests/disas/pr2303.wat +++ b/tests/disas/pr2303.wat @@ -21,20 +21,20 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0036 v3 = iconst.i32 48 ;; @0038 v4 = iconst.i32 0 ;; @003a v5 = uextend.i64 v4 ; v4 = 0 -;; @003a v6 = load.i64 notrap aligned readonly checked v0+96 +;; @003a v6 = load.i64 notrap aligned readonly checked v0+80 ;; @003a v7 = iadd v6, v5 ;; @003a v8 = load.i8x16 little heap v7 ;; @003e v9 = iconst.i32 16 ;; @0040 v10 = uextend.i64 v9 ; v9 = 16 -;; @0040 v11 = load.i64 notrap aligned readonly checked v0+96 +;; @0040 v11 = load.i64 notrap aligned readonly checked v0+80 ;; @0040 v12 = iadd v11, v10 ;; @0040 v13 = load.i8x16 little heap v12 ;; @0046 brif v2, block2, block4 @@ -45,7 +45,7 @@ ;; @0048 v18 = iadd v16, v17 ;; @004b v19 = iconst.i32 32 ;; @004d v20 = uextend.i64 v19 ; v19 = 32 -;; @004d v21 = load.i64 notrap aligned readonly checked v0+96 +;; @004d v21 = load.i64 notrap aligned readonly checked v0+80 ;; @004d v22 = iadd v21, v20 ;; @004d v23 = load.i8x16 little heap v22 ;; @0051 v26 = bitcast.i8x16 little v18 @@ -57,7 +57,7 @@ ;; @0052 v29 = isub v27, v28 ;; @0055 v30 = iconst.i32 0 ;; @0057 v31 = uextend.i64 v30 ; v30 = 0 -;; @0057 v32 = load.i64 notrap aligned readonly checked v0+96 +;; @0057 v32 = load.i64 notrap aligned readonly checked v0+80 ;; @0057 v33 = iadd v32, v31 ;; @0057 v34 = load.i8x16 little heap v33 ;; @005b v35 = bitcast.i8x16 little v29 @@ -68,7 +68,7 @@ ;; @005c v37 = bitcast.i16x8 little v15 ;; @005c v38 = imul v36, v37 ;; @005f v39 = uextend.i64 v3 ; v3 = 48 -;; @005f v40 = load.i64 notrap aligned readonly checked v0+96 +;; @005f v40 = load.i64 notrap aligned readonly checked v0+80 ;; @005f v41 = iadd v40, v39 ;; @005f store little heap v38, v41 ;; @0063 jump block1 diff --git a/tests/disas/pulley/call.wat b/tests/disas/pulley/call.wat index 05340bd9d936..755d65f9f421 100644 --- a/tests/disas/pulley/call.wat +++ b/tests/disas/pulley/call.wat @@ -7,9 +7,9 @@ ) ;; wasm[0]::function[1]: ;; push_frame -;; xload32le_offset8 x3, x0, 44 +;; xload32le_offset8 x3, x0, 36 ;; xmov x6, x0 -;; xload32le_offset8 x0, x6, 52 +;; xload32le_offset8 x0, x6, 44 ;; xmov x1, x6 ;; call_indirect x3 ;; pop_frame diff --git a/tests/disas/pulley/memory-inbounds.wat b/tests/disas/pulley/memory-inbounds.wat index 63958055b535..0db01f04df01 100644 --- a/tests/disas/pulley/memory-inbounds.wat +++ b/tests/disas/pulley/memory-inbounds.wat @@ -20,38 +20,38 @@ ;; wasm[0]::function[0]::offset0: ;; push_frame -;; xload64le_offset8 x3, x0, 96 +;; xload64le_offset8 x3, x0, 80 ;; xload32le_offset8 x0, x3, 0 ;; pop_frame ;; ret ;; ;; wasm[0]::function[1]::offset100: ;; push_frame -;; xload64le_offset8 x3, x0, 96 +;; xload64le_offset8 x3, x0, 80 ;; xload32le_offset8 x0, x3, 100 ;; pop_frame ;; ret ;; ;; wasm[0]::function[2]::offset_mixed: ;; push_frame -;; xload64le_offset8 x3, x0, 96 +;; xload64le_offset8 x3, x0, 80 ;; xload32le_offset8 x0, x3, 200 ;; pop_frame ;; ret ;; ;; wasm[0]::function[3]::offset_just_ok: ;; push_frame -;; xload64le_offset8 x3, x0, 96 +;; xload64le_offset8 x3, x0, 80 ;; xload32le_offset32 x0, x3, 65532 ;; pop_frame ;; ret ;; ;; wasm[0]::function[4]::offset_just_bad: ;; push_frame -;; xload64le_offset8 x5, x0, 104 +;; xload64le_offset8 x5, x0, 88 ;; xsub64_u8 x5, x5, 4 ;; br_if_xult64_u32 x5, 65533, 0x17 // target = 0x20 -;; 13: xload64le_offset8 x6, x0, 96 +;; 13: xload64le_offset8 x6, x0, 80 ;; xload32le_offset32 x0, x6, 65533 ;; pop_frame ;; ret @@ -59,17 +59,17 @@ ;; ;; wasm[0]::function[5]::offset_just_ok_v2: ;; push_frame -;; xload64le_offset8 x3, x0, 96 +;; xload64le_offset8 x3, x0, 80 ;; xload32le_offset32 x0, x3, 65532 ;; pop_frame ;; ret ;; ;; wasm[0]::function[6]::offset_just_bad_v2: ;; push_frame -;; xload64le_offset8 x5, x0, 104 +;; xload64le_offset8 x5, x0, 88 ;; xsub64_u32 x5, x5, 65536 ;; br_if_xeq64_i8 x5, 0, 0x14 // target = 0x20 -;; 13: xload64le_offset8 x6, x0, 96 +;; 13: xload64le_offset8 x6, x0, 80 ;; xload32le_offset32 x0, x6, 65533 ;; pop_frame ;; ret @@ -77,10 +77,10 @@ ;; ;; wasm[0]::function[7]::maybe_inbounds: ;; push_frame -;; xload64le_offset8 x5, x0, 104 +;; xload64le_offset8 x5, x0, 88 ;; xsub64_u8 x5, x5, 4 ;; br_if_xult64_u32 x5, 131068, 0x17 // target = 0x20 -;; 13: xload64le_offset8 x6, x0, 96 +;; 13: xload64le_offset8 x6, x0, 80 ;; xload32le_offset32 x0, x6, 131068 ;; pop_frame ;; ret @@ -91,9 +91,9 @@ ;; xzero x7 ;; xconst32 x8, 131072 ;; xadd64_uoverflow_trap x7, x7, x8 -;; xload64le_offset8 x8, x0, 104 +;; xload64le_offset8 x8, x0, 88 ;; br_if_xult64 x8, x7, 0x14 // target = 0x26 -;; 19: xload64le_offset8 x8, x0, 96 +;; 19: xload64le_offset8 x8, x0, 80 ;; xload32le_offset32 x0, x8, 131068 ;; pop_frame ;; ret @@ -101,10 +101,10 @@ ;; ;; wasm[0]::function[9]::never_inbounds: ;; push_frame -;; xload64le_offset8 x5, x0, 104 +;; xload64le_offset8 x5, x0, 88 ;; xsub64_u8 x5, x5, 4 ;; br_if_xult64_u32 x5, 131069, 0x17 // target = 0x20 -;; 13: xload64le_offset8 x6, x0, 96 +;; 13: xload64le_offset8 x6, x0, 80 ;; xload32le_offset32 x0, x6, 131069 ;; pop_frame ;; ret diff --git a/tests/disas/pulley/pulley32_memory32.wat b/tests/disas/pulley/pulley32_memory32.wat index bf6ebdc5e80e..ac2960bbc96b 100644 --- a/tests/disas/pulley/pulley32_memory32.wat +++ b/tests/disas/pulley/pulley32_memory32.wat @@ -54,9 +54,9 @@ ) ;; wasm[0]::function[0]::load8: ;; push_frame -;; xload32le_offset8 x5, x0, 52 +;; xload32le_offset8 x5, x0, 44 ;; br_if_xulteq32 x5, x2, 0x12 // target = 0x17 -;; c: xload32le_offset8 x6, x0, 48 +;; c: xload32le_offset8 x6, x0, 40 ;; xload8_u32_g32 x0, x2, x6, 0 ;; pop_frame ;; ret @@ -64,33 +64,33 @@ ;; ;; wasm[0]::function[1]::load16: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 2 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 2 +;; xload32le_offset8 x5, x0, 40 ;; xload16le_u32_g32 x0, x2, x5, 0 ;; pop_frame ;; ret ;; ;; wasm[0]::function[2]::load32: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 4 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 4 +;; xload32le_offset8 x5, x0, 40 ;; xload32le_g32 x0, x2, x5, 0 ;; pop_frame ;; ret ;; ;; wasm[0]::function[3]::load64: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 8 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 8 +;; xload32le_offset8 x5, x0, 40 ;; xload64le_g32 x0, x2, x5, 0 ;; pop_frame ;; ret ;; ;; wasm[0]::function[4]::store8: ;; push_frame -;; xload32le_offset8 x5, x0, 52 +;; xload32le_offset8 x5, x0, 44 ;; br_if_xulteq32 x5, x2, 0x12 // target = 0x17 -;; c: xload32le_offset8 x6, x0, 48 +;; c: xload32le_offset8 x6, x0, 40 ;; xstore8_g32 x2, x6, 0, x3 ;; pop_frame ;; ret @@ -98,88 +98,88 @@ ;; ;; wasm[0]::function[5]::store16: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 2 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 2 +;; xload32le_offset8 x5, x0, 40 ;; xstore16le_g32 x2, x5, 0, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[6]::store32: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 4 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 4 +;; xload32le_offset8 x5, x0, 40 ;; xstore32le_g32 x2, x5, 0, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[7]::store64: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 8 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 8 +;; xload32le_offset8 x5, x0, 40 ;; xstore64le_g32 x2, x5, 0, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[8]::load8_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 33 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 33 +;; xload32le_offset8 x5, x0, 40 ;; xload8_u32_g32 x0, x2, x5, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[9]::load16_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 34 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 34 +;; xload32le_offset8 x5, x0, 40 ;; xload16le_u32_g32 x0, x2, x5, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[10]::load32_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 36 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 36 +;; xload32le_offset8 x5, x0, 40 ;; xload32le_g32 x0, x2, x5, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[11]::load64_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 40 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 40 +;; xload32le_offset8 x5, x0, 40 ;; xload64le_g32 x0, x2, x5, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[12]::store8_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 9 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 9 +;; xload32le_offset8 x5, x0, 40 ;; xstore8_g32 x2, x5, 8, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[13]::store16_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 10 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 10 +;; xload32le_offset8 x5, x0, 40 ;; xstore16le_g32 x2, x5, 8, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[14]::store32_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 12 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 12 +;; xload32le_offset8 x5, x0, 40 ;; xstore32le_g32 x2, x5, 8, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[15]::store64_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 52, 16 -;; xload32le_offset8 x5, x0, 48 +;; xbc32_boundne_trap x2, x0, 44, 16 +;; xload32le_offset8 x5, x0, 40 ;; xstore64le_g32 x2, x5, 8, x3 ;; pop_frame ;; ret diff --git a/tests/disas/pulley/pulley64_memory32.wat b/tests/disas/pulley/pulley64_memory32.wat index 5c1e2f1a2248..fb57560be5a9 100644 --- a/tests/disas/pulley/pulley64_memory32.wat +++ b/tests/disas/pulley/pulley64_memory32.wat @@ -58,10 +58,10 @@ ) ;; wasm[0]::function[0]::load8: ;; push_frame -;; xload64le_offset8 x6, x0, 104 +;; xload64le_offset8 x6, x0, 88 ;; zext32 x7, x2 ;; br_if_xulteq64 x6, x7, 0x12 // target = 0x1a -;; f: xload64le_offset8 x7, x0, 96 +;; f: xload64le_offset8 x7, x0, 80 ;; xload8_u32_g32 x0, x7, x2, 0 ;; pop_frame ;; ret @@ -69,34 +69,34 @@ ;; ;; wasm[0]::function[1]::load16: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 2 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 2 +;; xload64le_offset8 x5, x0, 80 ;; xload16le_u32_g32 x0, x5, x2, 0 ;; pop_frame ;; ret ;; ;; wasm[0]::function[2]::load32: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 4 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 4 +;; xload64le_offset8 x5, x0, 80 ;; xload32le_g32 x0, x5, x2, 0 ;; pop_frame ;; ret ;; ;; wasm[0]::function[3]::load64: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 8 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 8 +;; xload64le_offset8 x5, x0, 80 ;; xload64le_g32 x0, x5, x2, 0 ;; pop_frame ;; ret ;; ;; wasm[0]::function[4]::store8: ;; push_frame -;; xload64le_offset8 x6, x0, 104 +;; xload64le_offset8 x6, x0, 88 ;; zext32 x7, x2 ;; br_if_xulteq64 x6, x7, 0x12 // target = 0x1a -;; f: xload64le_offset8 x7, x0, 96 +;; f: xload64le_offset8 x7, x0, 80 ;; xstore8_g32 x7, x2, 0, x3 ;; pop_frame ;; ret @@ -104,97 +104,97 @@ ;; ;; wasm[0]::function[5]::store16: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 2 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 2 +;; xload64le_offset8 x5, x0, 80 ;; xstore16le_g32 x5, x2, 0, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[6]::store32: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 4 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 4 +;; xload64le_offset8 x5, x0, 80 ;; xstore32le_g32 x5, x2, 0, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[7]::store64: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 8 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 8 +;; xload64le_offset8 x5, x0, 80 ;; xstore64le_g32 x5, x2, 0, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[8]::load8_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 33 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 33 +;; xload64le_offset8 x5, x0, 80 ;; xload8_u32_g32 x0, x5, x2, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[9]::load16_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 34 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 34 +;; xload64le_offset8 x5, x0, 80 ;; xload16le_u32_g32 x0, x5, x2, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[10]::load32_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 36 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 36 +;; xload64le_offset8 x5, x0, 80 ;; xload32le_g32 x0, x5, x2, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[11]::load64_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 40 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 40 +;; xload64le_offset8 x5, x0, 80 ;; xload64le_g32 x0, x5, x2, 32 ;; pop_frame ;; ret ;; ;; wasm[0]::function[12]::store8_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 9 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 9 +;; xload64le_offset8 x5, x0, 80 ;; xstore8_g32 x5, x2, 8, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[13]::store16_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 10 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 10 +;; xload64le_offset8 x5, x0, 80 ;; xstore16le_g32 x5, x2, 8, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[14]::store32_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 12 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 12 +;; xload64le_offset8 x5, x0, 80 ;; xstore32le_g32 x5, x2, 8, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[15]::store64_offset: ;; push_frame -;; xbc32_boundne_trap x2, x0, 104, 16 -;; xload64le_offset8 x5, x0, 96 +;; xbc32_boundne_trap x2, x0, 88, 16 +;; xload64le_offset8 x5, x0, 80 ;; xstore64le_g32 x5, x2, 8, x3 ;; pop_frame ;; ret ;; ;; wasm[0]::function[16]::load16_two: ;; push_frame -;; xload64le_offset8 x7, x0, 104 +;; xload64le_offset8 x7, x0, 88 ;; xbc32_bound_trap x2, x7, 2 -;; xload64le_offset8 x8, x0, 96 +;; xload64le_offset8 x8, x0, 80 ;; xload16le_u32_g32 x0, x8, x2, 0 ;; xbc32_bound_trap x3, x7, 2 ;; xload16le_u32_g32 x1, x8, x3, 0 diff --git a/tests/disas/readonly-funcrefs.wat b/tests/disas/readonly-funcrefs.wat index e35264021f9a..37792a80c961 100644 --- a/tests/disas/readonly-funcrefs.wat +++ b/tests/disas/readonly-funcrefs.wat @@ -36,7 +36,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64) tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; fn0 = colocated u1:9 sig1 @@ -46,7 +46,7 @@ ;; @0031 v3 = iconst.i32 2 ;; @0031 v4 = icmp uge v2, v3 ; v3 = 2 ;; @0031 v9 = iconst.i64 0 -;; @0031 v6 = load.i64 notrap aligned readonly v0+88 +;; @0031 v6 = load.i64 notrap aligned readonly v0+72 ;; @0031 v5 = uextend.i64 v2 ;; v26 = iconst.i64 3 ;; @0031 v7 = ishl v5, v26 ; v26 = 3 @@ -64,7 +64,7 @@ ;; ;; block3(v13: i64): ;; @0031 v21 = load.i32 user6 aligned readonly v13+16 -;; @0031 v19 = load.i64 notrap aligned readonly v0+80 +;; @0031 v19 = load.i64 notrap aligned readonly v0+64 ;; @0031 v20 = load.i32 notrap aligned readonly v19 ;; @0031 v22 = icmp eq v21, v20 ;; @0031 trapz v22, user7 diff --git a/tests/disas/readonly-heap-base-pointer1.wat b/tests/disas/readonly-heap-base-pointer1.wat index a08c51b8621e..a245c1e6edfa 100644 --- a/tests/disas/readonly-heap-base-pointer1.wat +++ b/tests/disas/readonly-heap-base-pointer1.wat @@ -12,8 +12,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -21,7 +21,7 @@ ;; @0020 v5 = iconst.i64 0x0001_fffc ;; @0020 v6 = icmp ugt v4, v5 ; v5 = 0x0001_fffc ;; @0020 v9 = iconst.i64 0 -;; @0020 v7 = load.i64 notrap aligned readonly checked v0+96 +;; @0020 v7 = load.i64 notrap aligned readonly checked v0+80 ;; @0020 v8 = iadd v7, v4 ;; @0020 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 ;; @0020 v11 = load.i32 little heap v10 diff --git a/tests/disas/readonly-heap-base-pointer2.wat b/tests/disas/readonly-heap-base-pointer2.wat index 382de8db6b17..40cfc513b8b7 100644 --- a/tests/disas/readonly-heap-base-pointer2.wat +++ b/tests/disas/readonly-heap-base-pointer2.wat @@ -12,7 +12,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; gv5 = load.i64 notrap aligned gv4+8 ;; gv6 = load.i64 notrap aligned readonly checked gv4 ;; stack_limit = gv2 @@ -22,7 +22,7 @@ ;; @0022 v5 = iconst.i64 0x0001_fffc ;; @0022 v6 = icmp ugt v4, v5 ; v5 = 0x0001_fffc ;; @0022 v9 = iconst.i64 0 -;; @0022 v12 = load.i64 notrap aligned readonly v0+88 +;; @0022 v12 = load.i64 notrap aligned readonly v0+72 ;; @0022 v7 = load.i64 notrap aligned readonly checked v12 ;; @0022 v8 = iadd v7, v4 ;; @0022 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 diff --git a/tests/disas/readonly-heap-base-pointer3.wat b/tests/disas/readonly-heap-base-pointer3.wat index 090e48ebdca0..d0a3ecdac4c9 100644 --- a/tests/disas/readonly-heap-base-pointer3.wat +++ b/tests/disas/readonly-heap-base-pointer3.wat @@ -12,15 +12,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0020 v4 = iconst.i64 0xffff_fffc ;; @0020 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0020 v8 = iconst.i64 0 -;; @0020 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0020 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0020 v7 = iadd v6, v2 ;; @0020 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 ;; @0020 v10 = load.i32 little heap v9 diff --git a/tests/disas/ref-func-0.wat b/tests/disas/ref-func-0.wat index 5c347a1433be..3a916d1d7ef2 100644 --- a/tests/disas/ref-func-0.wat +++ b/tests/disas/ref-func-0.wat @@ -25,8 +25,8 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): -;; v94 = iconst.i64 112 -;; @008f v7 = iadd v0, v94 ; v94 = 112 +;; v94 = iconst.i64 96 +;; @008f v7 = iadd v0, v94 ; v94 = 96 ;; @008f v8 = load.i32 notrap aligned v7 ;; v95 = stack_addr.i64 ss0 ;; store notrap v8, v95 @@ -87,8 +87,8 @@ ;; @008f jump block5 ;; ;; block5: -;; v104 = iconst.i64 128 -;; @0091 v43 = iadd.i64 v0, v104 ; v104 = 128 +;; v104 = iconst.i64 112 +;; @0091 v43 = iadd.i64 v0, v104 ; v104 = 112 ;; @0091 v44 = load.i32 notrap aligned v43 ;; v105 = stack_addr.i64 ss1 ;; store notrap v44, v105 @@ -149,8 +149,8 @@ ;; @0091 jump block9 ;; ;; block9: -;; @0093 v79 = load.i64 notrap aligned table v0+144 -;; @0095 v81 = load.i64 notrap aligned table v0+160 +;; @0093 v79 = load.i64 notrap aligned table v0+128 +;; @0095 v81 = load.i64 notrap aligned table v0+144 ;; v114 = stack_addr.i64 ss0 ;; v82 = load.i32 notrap v114 ;; v115 = stack_addr.i64 ss1 diff --git a/tests/disas/simd-store.wat b/tests/disas/simd-store.wat index b15ead9b3909..eae979ef1c31 100644 --- a/tests/disas/simd-store.wat +++ b/tests/disas/simd-store.wat @@ -89,15 +89,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @003f v3 = iconst.i32 0 ;; @0045 v4 = icmp eq v2, v2 ;; @0047 v5 = uextend.i64 v3 ; v3 = 0 -;; @0047 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0047 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0047 v7 = iadd v6, v5 ;; @0047 store little heap v4, v7 ;; @004b jump block1 @@ -111,8 +111,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -121,7 +121,7 @@ ;; @0054 v5 = bitcast.i16x8 little v2 ;; @0054 v6 = icmp eq v4, v5 ;; @0056 v7 = uextend.i64 v3 ; v3 = 0 -;; @0056 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0056 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0056 v9 = iadd v8, v7 ;; @0056 store little heap v6, v9 ;; @005a jump block1 @@ -135,8 +135,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -145,7 +145,7 @@ ;; @0063 v5 = bitcast.i32x4 little v2 ;; @0063 v6 = icmp eq v4, v5 ;; @0065 v7 = uextend.i64 v3 ; v3 = 0 -;; @0065 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0065 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0065 v9 = iadd v8, v7 ;; @0065 store little heap v6, v9 ;; @0069 jump block1 @@ -159,8 +159,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -169,7 +169,7 @@ ;; @0072 v5 = bitcast.i64x2 little v2 ;; @0072 v6 = icmp eq v4, v5 ;; @0075 v7 = uextend.i64 v3 ; v3 = 0 -;; @0075 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0075 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0075 v9 = iadd v8, v7 ;; @0075 store little heap v6, v9 ;; @0079 jump block1 @@ -183,15 +183,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @007c v3 = iconst.i32 0 ;; @0082 v4 = icmp ne v2, v2 ;; @0084 v5 = uextend.i64 v3 ; v3 = 0 -;; @0084 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0084 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0084 v7 = iadd v6, v5 ;; @0084 store little heap v4, v7 ;; @0088 jump block1 @@ -205,8 +205,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -215,7 +215,7 @@ ;; @0091 v5 = bitcast.i16x8 little v2 ;; @0091 v6 = icmp ne v4, v5 ;; @0093 v7 = uextend.i64 v3 ; v3 = 0 -;; @0093 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0093 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0093 v9 = iadd v8, v7 ;; @0093 store little heap v6, v9 ;; @0097 jump block1 @@ -229,8 +229,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -239,7 +239,7 @@ ;; @00a0 v5 = bitcast.i32x4 little v2 ;; @00a0 v6 = icmp ne v4, v5 ;; @00a2 v7 = uextend.i64 v3 ; v3 = 0 -;; @00a2 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @00a2 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @00a2 v9 = iadd v8, v7 ;; @00a2 store little heap v6, v9 ;; @00a6 jump block1 @@ -253,8 +253,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -263,7 +263,7 @@ ;; @00af v5 = bitcast.i64x2 little v2 ;; @00af v6 = icmp ne v4, v5 ;; @00b2 v7 = uextend.i64 v3 ; v3 = 0 -;; @00b2 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @00b2 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @00b2 v9 = iadd v8, v7 ;; @00b2 store little heap v6, v9 ;; @00b6 jump block1 @@ -277,15 +277,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @00b9 v3 = iconst.i32 0 ;; @00bf v4 = icmp slt v2, v2 ;; @00c1 v5 = uextend.i64 v3 ; v3 = 0 -;; @00c1 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @00c1 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @00c1 v7 = iadd v6, v5 ;; @00c1 store little heap v4, v7 ;; @00c5 jump block1 @@ -299,8 +299,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -309,7 +309,7 @@ ;; @00ce v5 = bitcast.i16x8 little v2 ;; @00ce v6 = icmp slt v4, v5 ;; @00d0 v7 = uextend.i64 v3 ; v3 = 0 -;; @00d0 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @00d0 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @00d0 v9 = iadd v8, v7 ;; @00d0 store little heap v6, v9 ;; @00d4 jump block1 @@ -323,8 +323,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -333,7 +333,7 @@ ;; @00dd v5 = bitcast.i32x4 little v2 ;; @00dd v6 = icmp slt v4, v5 ;; @00df v7 = uextend.i64 v3 ; v3 = 0 -;; @00df v8 = load.i64 notrap aligned readonly checked v0+96 +;; @00df v8 = load.i64 notrap aligned readonly checked v0+80 ;; @00df v9 = iadd v8, v7 ;; @00df store little heap v6, v9 ;; @00e3 jump block1 @@ -347,8 +347,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -357,7 +357,7 @@ ;; @00ec v5 = bitcast.i64x2 little v2 ;; @00ec v6 = icmp slt v4, v5 ;; @00ef v7 = uextend.i64 v3 ; v3 = 0 -;; @00ef v8 = load.i64 notrap aligned readonly checked v0+96 +;; @00ef v8 = load.i64 notrap aligned readonly checked v0+80 ;; @00ef v9 = iadd v8, v7 ;; @00ef store little heap v6, v9 ;; @00f3 jump block1 @@ -371,15 +371,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @00f6 v3 = iconst.i32 0 ;; @00fc v4 = icmp ult v2, v2 ;; @00fe v5 = uextend.i64 v3 ; v3 = 0 -;; @00fe v6 = load.i64 notrap aligned readonly checked v0+96 +;; @00fe v6 = load.i64 notrap aligned readonly checked v0+80 ;; @00fe v7 = iadd v6, v5 ;; @00fe store little heap v4, v7 ;; @0102 jump block1 @@ -393,8 +393,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -403,7 +403,7 @@ ;; @010b v5 = bitcast.i16x8 little v2 ;; @010b v6 = icmp ult v4, v5 ;; @010d v7 = uextend.i64 v3 ; v3 = 0 -;; @010d v8 = load.i64 notrap aligned readonly checked v0+96 +;; @010d v8 = load.i64 notrap aligned readonly checked v0+80 ;; @010d v9 = iadd v8, v7 ;; @010d store little heap v6, v9 ;; @0111 jump block1 @@ -417,8 +417,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -427,7 +427,7 @@ ;; @011a v5 = bitcast.i32x4 little v2 ;; @011a v6 = icmp ult v4, v5 ;; @011c v7 = uextend.i64 v3 ; v3 = 0 -;; @011c v8 = load.i64 notrap aligned readonly checked v0+96 +;; @011c v8 = load.i64 notrap aligned readonly checked v0+80 ;; @011c v9 = iadd v8, v7 ;; @011c store little heap v6, v9 ;; @0120 jump block1 @@ -441,15 +441,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @0123 v3 = iconst.i32 0 ;; @0129 v4 = icmp sgt v2, v2 ;; @012b v5 = uextend.i64 v3 ; v3 = 0 -;; @012b v6 = load.i64 notrap aligned readonly checked v0+96 +;; @012b v6 = load.i64 notrap aligned readonly checked v0+80 ;; @012b v7 = iadd v6, v5 ;; @012b store little heap v4, v7 ;; @012f jump block1 @@ -463,8 +463,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -473,7 +473,7 @@ ;; @0138 v5 = bitcast.i16x8 little v2 ;; @0138 v6 = icmp sgt v4, v5 ;; @013a v7 = uextend.i64 v3 ; v3 = 0 -;; @013a v8 = load.i64 notrap aligned readonly checked v0+96 +;; @013a v8 = load.i64 notrap aligned readonly checked v0+80 ;; @013a v9 = iadd v8, v7 ;; @013a store little heap v6, v9 ;; @013e jump block1 @@ -487,8 +487,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -497,7 +497,7 @@ ;; @0147 v5 = bitcast.i32x4 little v2 ;; @0147 v6 = icmp sgt v4, v5 ;; @0149 v7 = uextend.i64 v3 ; v3 = 0 -;; @0149 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0149 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0149 v9 = iadd v8, v7 ;; @0149 store little heap v6, v9 ;; @014d jump block1 @@ -511,8 +511,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -521,7 +521,7 @@ ;; @0156 v5 = bitcast.i64x2 little v2 ;; @0156 v6 = icmp sgt v4, v5 ;; @0159 v7 = uextend.i64 v3 ; v3 = 0 -;; @0159 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0159 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0159 v9 = iadd v8, v7 ;; @0159 store little heap v6, v9 ;; @015d jump block1 @@ -535,15 +535,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @0160 v3 = iconst.i32 0 ;; @0166 v4 = icmp ugt v2, v2 ;; @0168 v5 = uextend.i64 v3 ; v3 = 0 -;; @0168 v6 = load.i64 notrap aligned readonly checked v0+96 +;; @0168 v6 = load.i64 notrap aligned readonly checked v0+80 ;; @0168 v7 = iadd v6, v5 ;; @0168 store little heap v4, v7 ;; @016c jump block1 @@ -557,8 +557,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -567,7 +567,7 @@ ;; @0175 v5 = bitcast.i16x8 little v2 ;; @0175 v6 = icmp ugt v4, v5 ;; @0177 v7 = uextend.i64 v3 ; v3 = 0 -;; @0177 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0177 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0177 v9 = iadd v8, v7 ;; @0177 store little heap v6, v9 ;; @017b jump block1 @@ -581,8 +581,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -591,7 +591,7 @@ ;; @0184 v5 = bitcast.i32x4 little v2 ;; @0184 v6 = icmp ugt v4, v5 ;; @0186 v7 = uextend.i64 v3 ; v3 = 0 -;; @0186 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0186 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0186 v9 = iadd v8, v7 ;; @0186 store little heap v6, v9 ;; @018a jump block1 @@ -605,8 +605,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -615,7 +615,7 @@ ;; @0193 v5 = bitcast.f32x4 little v2 ;; @0193 v6 = fcmp eq v4, v5 ;; @0195 v7 = uextend.i64 v3 ; v3 = 0 -;; @0195 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @0195 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @0195 v9 = iadd v8, v7 ;; @0195 store little heap v6, v9 ;; @0199 jump block1 @@ -629,8 +629,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -639,7 +639,7 @@ ;; @01a2 v5 = bitcast.f64x2 little v2 ;; @01a2 v6 = fcmp eq v4, v5 ;; @01a4 v7 = uextend.i64 v3 ; v3 = 0 -;; @01a4 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @01a4 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @01a4 v9 = iadd v8, v7 ;; @01a4 store little heap v6, v9 ;; @01a8 jump block1 @@ -653,8 +653,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -663,7 +663,7 @@ ;; @01b1 v5 = bitcast.f32x4 little v2 ;; @01b1 v6 = fcmp ne v4, v5 ;; @01b3 v7 = uextend.i64 v3 ; v3 = 0 -;; @01b3 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @01b3 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @01b3 v9 = iadd v8, v7 ;; @01b3 store little heap v6, v9 ;; @01b7 jump block1 @@ -677,8 +677,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -687,7 +687,7 @@ ;; @01c0 v5 = bitcast.f64x2 little v2 ;; @01c0 v6 = fcmp ne v4, v5 ;; @01c2 v7 = uextend.i64 v3 ; v3 = 0 -;; @01c2 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @01c2 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @01c2 v9 = iadd v8, v7 ;; @01c2 store little heap v6, v9 ;; @01c6 jump block1 @@ -701,8 +701,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -711,7 +711,7 @@ ;; @01cf v5 = bitcast.f32x4 little v2 ;; @01cf v6 = fcmp lt v4, v5 ;; @01d1 v7 = uextend.i64 v3 ; v3 = 0 -;; @01d1 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @01d1 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @01d1 v9 = iadd v8, v7 ;; @01d1 store little heap v6, v9 ;; @01d5 jump block1 @@ -725,8 +725,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -735,7 +735,7 @@ ;; @01de v5 = bitcast.f64x2 little v2 ;; @01de v6 = fcmp lt v4, v5 ;; @01e0 v7 = uextend.i64 v3 ; v3 = 0 -;; @01e0 v8 = load.i64 notrap aligned readonly checked v0+96 +;; @01e0 v8 = load.i64 notrap aligned readonly checked v0+80 ;; @01e0 v9 = iadd v8, v7 ;; @01e0 store little heap v6, v9 ;; @01e4 jump block1 @@ -749,8 +749,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -759,7 +759,7 @@ ;; @01ed v5 = bitcast.f32x4 little v2 ;; @01ed v6 = fcmp le v4, v5 ;; @01ef v7 = uextend.i64 v3 ; v3 = 0 -;; @01ef v8 = load.i64 notrap aligned readonly checked v0+96 +;; @01ef v8 = load.i64 notrap aligned readonly checked v0+80 ;; @01ef v9 = iadd v8, v7 ;; @01ef store little heap v6, v9 ;; @01f3 jump block1 @@ -773,8 +773,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -783,7 +783,7 @@ ;; @01fc v5 = bitcast.f64x2 little v2 ;; @01fc v6 = fcmp le v4, v5 ;; @01fe v7 = uextend.i64 v3 ; v3 = 0 -;; @01fe v8 = load.i64 notrap aligned readonly checked v0+96 +;; @01fe v8 = load.i64 notrap aligned readonly checked v0+80 ;; @01fe v9 = iadd v8, v7 ;; @01fe store little heap v6, v9 ;; @0202 jump block1 @@ -797,8 +797,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -807,7 +807,7 @@ ;; @020b v5 = bitcast.f32x4 little v2 ;; @020b v6 = fcmp gt v4, v5 ;; @020d v7 = uextend.i64 v3 ; v3 = 0 -;; @020d v8 = load.i64 notrap aligned readonly checked v0+96 +;; @020d v8 = load.i64 notrap aligned readonly checked v0+80 ;; @020d v9 = iadd v8, v7 ;; @020d store little heap v6, v9 ;; @0211 jump block1 @@ -821,8 +821,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -831,7 +831,7 @@ ;; @021a v5 = bitcast.f64x2 little v2 ;; @021a v6 = fcmp gt v4, v5 ;; @021c v7 = uextend.i64 v3 ; v3 = 0 -;; @021c v8 = load.i64 notrap aligned readonly checked v0+96 +;; @021c v8 = load.i64 notrap aligned readonly checked v0+80 ;; @021c v9 = iadd v8, v7 ;; @021c store little heap v6, v9 ;; @0220 jump block1 @@ -845,8 +845,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -855,7 +855,7 @@ ;; @0229 v5 = bitcast.f32x4 little v2 ;; @0229 v6 = fcmp ge v4, v5 ;; @022b v7 = uextend.i64 v3 ; v3 = 0 -;; @022b v8 = load.i64 notrap aligned readonly checked v0+96 +;; @022b v8 = load.i64 notrap aligned readonly checked v0+80 ;; @022b v9 = iadd v8, v7 ;; @022b store little heap v6, v9 ;; @022f jump block1 @@ -869,8 +869,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+104 -;; gv5 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+88 +;; gv5 = load.i64 notrap aligned readonly checked gv3+80 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -879,7 +879,7 @@ ;; @0238 v5 = bitcast.f64x2 little v2 ;; @0238 v6 = fcmp ge v4, v5 ;; @023a v7 = uextend.i64 v3 ; v3 = 0 -;; @023a v8 = load.i64 notrap aligned readonly checked v0+96 +;; @023a v8 = load.i64 notrap aligned readonly checked v0+80 ;; @023a v9 = iadd v8, v7 ;; @023a store little heap v6, v9 ;; @023e jump block1 diff --git a/tests/disas/table-get-fixed-size.wat b/tests/disas/table-get-fixed-size.wat index 658b6591cd5d..e832ad01ee3b 100644 --- a/tests/disas/table-get-fixed-size.wat +++ b/tests/disas/table-get-fixed-size.wat @@ -21,7 +21,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i32) -> i64 tail ;; fn0 = colocated u1:26 sig0 ;; stack_limit = gv2 @@ -31,7 +31,7 @@ ;; @0054 v4 = iconst.i32 7 ;; @0054 v5 = icmp uge v3, v4 ; v3 = 0, v4 = 7 ;; @0054 v6 = uextend.i64 v3 ; v3 = 0 -;; @0054 v7 = load.i64 notrap aligned readonly v0+88 +;; @0054 v7 = load.i64 notrap aligned readonly v0+72 ;; v53 = iconst.i64 2 ;; @0054 v8 = ishl v6, v53 ; v53 = 2 ;; @0054 v9 = iadd v7, v8 @@ -111,7 +111,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i32) -> i64 tail ;; fn0 = colocated u1:26 sig0 ;; stack_limit = gv2 @@ -120,7 +120,7 @@ ;; @005b v4 = iconst.i32 7 ;; @005b v5 = icmp uge v2, v4 ; v4 = 7 ;; @005b v6 = uextend.i64 v2 -;; @005b v7 = load.i64 notrap aligned readonly v0+88 +;; @005b v7 = load.i64 notrap aligned readonly v0+72 ;; v53 = iconst.i64 2 ;; @005b v8 = ishl v6, v53 ; v53 = 2 ;; @005b v9 = iadd v7, v8 diff --git a/tests/disas/table-get.wat b/tests/disas/table-get.wat index 27d745b702c9..0ee1ced544f8 100644 --- a/tests/disas/table-get.wat +++ b/tests/disas/table-get.wat @@ -20,19 +20,19 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+88 -;; gv5 = load.i64 notrap aligned gv3+96 +;; gv4 = load.i64 notrap aligned gv3+72 +;; gv5 = load.i64 notrap aligned gv3+80 ;; sig0 = (i64 vmctx, i32) -> i64 tail ;; fn0 = colocated u1:26 sig0 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): ;; @0051 v3 = iconst.i32 0 -;; @0053 v4 = load.i64 notrap aligned v0+96 +;; @0053 v4 = load.i64 notrap aligned v0+80 ;; @0053 v5 = ireduce.i32 v4 ;; @0053 v6 = icmp uge v3, v5 ; v3 = 0 ;; @0053 v7 = uextend.i64 v3 ; v3 = 0 -;; @0053 v8 = load.i64 notrap aligned v0+88 +;; @0053 v8 = load.i64 notrap aligned v0+72 ;; v55 = iconst.i64 2 ;; @0053 v9 = ishl v7, v55 ; v55 = 2 ;; @0053 v10 = iadd v8, v9 @@ -112,18 +112,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+88 -;; gv5 = load.i64 notrap aligned gv3+96 +;; gv4 = load.i64 notrap aligned gv3+72 +;; gv5 = load.i64 notrap aligned gv3+80 ;; sig0 = (i64 vmctx, i32) -> i64 tail ;; fn0 = colocated u1:26 sig0 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): -;; @005a v4 = load.i64 notrap aligned v0+96 +;; @005a v4 = load.i64 notrap aligned v0+80 ;; @005a v5 = ireduce.i32 v4 ;; @005a v6 = icmp uge v2, v5 ;; @005a v7 = uextend.i64 v2 -;; @005a v8 = load.i64 notrap aligned v0+88 +;; @005a v8 = load.i64 notrap aligned v0+72 ;; v55 = iconst.i64 2 ;; @005a v9 = ishl v7, v55 ; v55 = 2 ;; @005a v10 = iadd v8, v9 diff --git a/tests/disas/table-set-fixed-size.wat b/tests/disas/table-set-fixed-size.wat index 3db3542c2840..d7c54d2b4704 100644 --- a/tests/disas/table-set-fixed-size.wat +++ b/tests/disas/table-set-fixed-size.wat @@ -21,7 +21,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i32) tail ;; fn0 = colocated u1:25 sig0 ;; stack_limit = gv2 @@ -31,7 +31,7 @@ ;; @0056 v4 = iconst.i32 7 ;; @0056 v5 = icmp uge v3, v4 ; v3 = 0, v4 = 7 ;; @0056 v6 = uextend.i64 v3 ; v3 = 0 -;; @0056 v7 = load.i64 notrap aligned readonly v0+88 +;; @0056 v7 = load.i64 notrap aligned readonly v0+72 ;; v66 = iconst.i64 2 ;; @0056 v8 = ishl v6, v66 ; v66 = 2 ;; @0056 v9 = iadd v7, v8 @@ -123,7 +123,7 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i32) tail ;; fn0 = colocated u1:25 sig0 ;; stack_limit = gv2 @@ -132,7 +132,7 @@ ;; @005f v4 = iconst.i32 7 ;; @005f v5 = icmp uge v2, v4 ; v4 = 7 ;; @005f v6 = uextend.i64 v2 -;; @005f v7 = load.i64 notrap aligned readonly v0+88 +;; @005f v7 = load.i64 notrap aligned readonly v0+72 ;; v66 = iconst.i64 2 ;; @005f v8 = ishl v6, v66 ; v66 = 2 ;; @005f v9 = iadd v7, v8 diff --git a/tests/disas/table-set.wat b/tests/disas/table-set.wat index c5c1c0cf228c..a5d247c20ade 100644 --- a/tests/disas/table-set.wat +++ b/tests/disas/table-set.wat @@ -21,19 +21,19 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+88 -;; gv5 = load.i64 notrap aligned gv3+96 +;; gv4 = load.i64 notrap aligned gv3+72 +;; gv5 = load.i64 notrap aligned gv3+80 ;; sig0 = (i64 vmctx, i32) tail ;; fn0 = colocated u1:25 sig0 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0051 v3 = iconst.i32 0 -;; @0055 v4 = load.i64 notrap aligned v0+96 +;; @0055 v4 = load.i64 notrap aligned v0+80 ;; @0055 v5 = ireduce.i32 v4 ;; @0055 v6 = icmp uge v3, v5 ; v3 = 0 ;; @0055 v7 = uextend.i64 v3 ; v3 = 0 -;; @0055 v8 = load.i64 notrap aligned v0+88 +;; @0055 v8 = load.i64 notrap aligned v0+72 ;; v68 = iconst.i64 2 ;; @0055 v9 = ishl v7, v68 ; v68 = 2 ;; @0055 v10 = iadd v8, v9 @@ -125,18 +125,18 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned gv3+88 -;; gv5 = load.i64 notrap aligned gv3+96 +;; gv4 = load.i64 notrap aligned gv3+72 +;; gv5 = load.i64 notrap aligned gv3+80 ;; sig0 = (i64 vmctx, i32) tail ;; fn0 = colocated u1:25 sig0 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): -;; @005e v4 = load.i64 notrap aligned v0+96 +;; @005e v4 = load.i64 notrap aligned v0+80 ;; @005e v5 = ireduce.i32 v4 ;; @005e v6 = icmp uge v2, v5 ;; @005e v7 = uextend.i64 v2 -;; @005e v8 = load.i64 notrap aligned v0+88 +;; @005e v8 = load.i64 notrap aligned v0+72 ;; v68 = iconst.i64 2 ;; @005e v9 = ishl v7, v68 ; v68 = 2 ;; @005e v10 = iadd v8, v9 diff --git a/tests/disas/typed-funcrefs-eager-init.wat b/tests/disas/typed-funcrefs-eager-init.wat index db0707d0ebca..8b48503ecce4 100644 --- a/tests/disas/typed-funcrefs-eager-init.wat +++ b/tests/disas/typed-funcrefs-eager-init.wat @@ -131,12 +131,12 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @0048 v12 = load.i64 notrap aligned readonly v0+88 +;; @0048 v12 = load.i64 notrap aligned readonly v0+72 ;; v48 = iconst.i64 8 ;; @0048 v14 = iadd v12, v48 ; v48 = 8 ;; @0048 v17 = load.i64 user5 aligned table v14 @@ -161,12 +161,12 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @0075 v12 = load.i64 notrap aligned readonly v0+88 +;; @0075 v12 = load.i64 notrap aligned readonly v0+72 ;; v48 = iconst.i64 8 ;; @0075 v14 = iadd v12, v48 ; v48 = 8 ;; @0075 v17 = load.i64 user5 aligned table v14 @@ -195,11 +195,11 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @009e v9 = load.i64 notrap aligned table v0+112 +;; @009e v9 = load.i64 notrap aligned table v0+96 ;; @00a0 v10 = load.i64 user16 aligned readonly v9+8 ;; @00a0 v11 = load.i64 notrap aligned readonly v9+24 ;; @00a0 v12 = call_indirect sig0, v10(v11, v0, v2, v3, v4, v5) -;; @00af v15 = load.i64 notrap aligned table v0+128 +;; @00af v15 = load.i64 notrap aligned table v0+112 ;; @00b1 v16 = load.i64 user16 aligned readonly v15+8 ;; @00b1 v17 = load.i64 notrap aligned readonly v15+24 ;; @00b1 v18 = call_indirect sig0, v16(v17, v0, v2, v3, v4, v5) diff --git a/tests/disas/typed-funcrefs.wat b/tests/disas/typed-funcrefs.wat index 8c41d22b911e..8b78a6cca50d 100644 --- a/tests/disas/typed-funcrefs.wat +++ b/tests/disas/typed-funcrefs.wat @@ -131,14 +131,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i32, i64) -> i64 tail ;; sig1 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail ;; fn0 = colocated u1:9 sig0 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @0048 v12 = load.i64 notrap aligned readonly v0+88 +;; @0048 v12 = load.i64 notrap aligned readonly v0+72 ;; v68 = iconst.i64 8 ;; @0048 v14 = iadd v12, v68 ; v68 = 8 ;; @0048 v17 = load.i64 user5 aligned table v14 @@ -185,14 +185,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1+16 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly gv3+88 +;; gv4 = load.i64 notrap aligned readonly gv3+72 ;; sig0 = (i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail ;; sig1 = (i64 vmctx, i32, i64) -> i64 tail ;; fn0 = colocated u1:9 sig1 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @0075 v12 = load.i64 notrap aligned readonly v0+88 +;; @0075 v12 = load.i64 notrap aligned readonly v0+72 ;; v68 = iconst.i64 8 ;; @0075 v14 = iadd v12, v68 ; v68 = 8 ;; @0075 v17 = load.i64 user5 aligned table v14 @@ -243,11 +243,11 @@ ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32, v5: i32): -;; @009e v9 = load.i64 notrap aligned table v0+112 +;; @009e v9 = load.i64 notrap aligned table v0+96 ;; @00a0 v10 = load.i64 user16 aligned readonly v9+8 ;; @00a0 v11 = load.i64 notrap aligned readonly v9+24 ;; @00a0 v12 = call_indirect sig0, v10(v11, v0, v2, v3, v4, v5) -;; @00af v15 = load.i64 notrap aligned table v0+128 +;; @00af v15 = load.i64 notrap aligned table v0+112 ;; @00b1 v16 = load.i64 user16 aligned readonly v15+8 ;; @00b1 v17 = load.i64 notrap aligned readonly v15+24 ;; @00b1 v18 = call_indirect sig0, v16(v17, v0, v2, v3, v4, v5) diff --git a/tests/disas/winch/aarch64/call_indirect/call_indirect.wat b/tests/disas/winch/aarch64/call_indirect/call_indirect.wat index ad49c8180f86..2d3e416ebd75 100644 --- a/tests/disas/winch/aarch64/call_indirect/call_indirect.wat +++ b/tests/disas/winch/aarch64/call_indirect/call_indirect.wat @@ -56,13 +56,13 @@ ;; mov x16, #0 ;; mov w1, w16 ;; mov x2, x9 -;; ldur x3, [x2, #0x60] +;; ldur x3, [x2, #0x50] ;; cmp x1, x3, uxtx ;; b.hs #0x260 ;; 74: mov x16, x1 ;; mov x16, #8 ;; mul x16, x16, x16 -;; ldur x2, [x2, #0x58] +;; ldur x2, [x2, #0x48] ;; mov x4, x2 ;; add x2, x2, x16, uxtx ;; cmp w1, w3, uxtx @@ -85,7 +85,7 @@ ;; b #0xd8 ;; d4: and x0, x0, #0xfffffffffffffffe ;; cbz x0, #0x264 -;; dc: ldur x16, [x9, #0x50] +;; dc: ldur x16, [x9, #0x40] ;; ldur w1, [x16] ;; ldur w2, [x0, #0x10] ;; cmp w1, w2, uxtx @@ -120,13 +120,13 @@ ;; mov x16, #0 ;; mov w1, w16 ;; mov x2, x9 -;; ldur x3, [x2, #0x60] +;; ldur x3, [x2, #0x50] ;; cmp x1, x3, uxtx ;; b.hs #0x26c ;; 174: mov x16, x1 ;; mov x16, #8 ;; mul x16, x16, x16 -;; ldur x2, [x2, #0x58] +;; ldur x2, [x2, #0x48] ;; mov x4, x2 ;; add x2, x2, x16, uxtx ;; cmp w1, w3, uxtx @@ -153,7 +153,7 @@ ;; b #0x1e8 ;; 1e4: and x0, x0, #0xfffffffffffffffe ;; cbz x0, #0x270 -;; 1ec: ldur x16, [x9, #0x50] +;; 1ec: ldur x16, [x9, #0x40] ;; ldur w1, [x16] ;; ldur w2, [x0, #0x10] ;; cmp w1, w2, uxtx diff --git a/tests/disas/winch/aarch64/call_indirect/local_arg.wat b/tests/disas/winch/aarch64/call_indirect/local_arg.wat index 04ac33d90e05..133cf4f41009 100644 --- a/tests/disas/winch/aarch64/call_indirect/local_arg.wat +++ b/tests/disas/winch/aarch64/call_indirect/local_arg.wat @@ -50,13 +50,13 @@ ;; mov x16, #0 ;; mov w1, w16 ;; mov x2, x9 -;; ldur x3, [x2, #0x60] +;; ldur x3, [x2, #0x50] ;; cmp x1, x3, uxtx ;; b.hs #0x168 ;; 90: mov x16, x1 ;; mov x16, #8 ;; mul x16, x16, x16 -;; ldur x2, [x2, #0x58] +;; ldur x2, [x2, #0x48] ;; mov x4, x2 ;; add x2, x2, x16, uxtx ;; cmp w1, w3, uxtx @@ -79,7 +79,7 @@ ;; b #0xf4 ;; f0: and x0, x0, #0xfffffffffffffffe ;; cbz x0, #0x16c -;; f8: ldur x16, [x9, #0x50] +;; f8: ldur x16, [x9, #0x40] ;; ldur w1, [x16] ;; ldur w2, [x0, #0x10] ;; cmp w1, w2, uxtx diff --git a/tests/disas/winch/aarch64/load/dynamic_heap.wat b/tests/disas/winch/aarch64/load/dynamic_heap.wat index 27d639fd2499..1d671de479ad 100644 --- a/tests/disas/winch/aarch64/load/dynamic_heap.wat +++ b/tests/disas/winch/aarch64/load/dynamic_heap.wat @@ -31,13 +31,13 @@ ;; stur w3, [x28, #0xc] ;; stur x0, [x28] ;; ldur w0, [x28, #0xc] -;; ldur x1, [x9, #0x68] +;; ldur x1, [x9, #0x58] ;; mov w2, w0 ;; add x2, x2, #4 ;; b.hs #0x134 ;; 3c: cmp x2, x1, uxtx ;; b.hi #0x138 -;; 44: ldur x3, [x9, #0x60] +;; 44: ldur x3, [x9, #0x50] ;; add x3, x3, x0, uxtx ;; mov x16, #0 ;; mov x4, x16 @@ -45,13 +45,13 @@ ;; csel x3, x4, x4, hi ;; ldur w0, [x3] ;; ldur w1, [x28, #0xc] -;; ldur x2, [x9, #0x68] +;; ldur x2, [x9, #0x58] ;; mov w3, w1 ;; add x3, x3, #8 ;; b.hs #0x13c ;; 74: cmp x3, x2, uxtx ;; b.hi #0x140 -;; 7c: ldur x4, [x9, #0x60] +;; 7c: ldur x4, [x9, #0x50] ;; add x4, x4, x1, uxtx ;; add x4, x4, #4 ;; mov x16, #0 @@ -60,7 +60,7 @@ ;; csel x4, x5, x5, hi ;; ldur w1, [x4] ;; ldur w2, [x28, #0xc] -;; ldur x3, [x9, #0x68] +;; ldur x3, [x9, #0x58] ;; mov w4, w2 ;; mov w16, #3 ;; movk w16, #0x10, lsl #16 @@ -68,7 +68,7 @@ ;; b.hs #0x144 ;; b8: cmp x4, x3, uxtx ;; b.hi #0x148 -;; c0: ldur x5, [x9, #0x60] +;; c0: ldur x5, [x9, #0x50] ;; add x5, x5, x2, uxtx ;; orr x16, xzr, #0xfffff ;; add x5, x5, x16, uxtx diff --git a/tests/disas/winch/aarch64/load/f32.wat b/tests/disas/winch/aarch64/load/f32.wat index 71818bdd28d7..cae16246f368 100644 --- a/tests/disas/winch/aarch64/load/f32.wat +++ b/tests/disas/winch/aarch64/load/f32.wat @@ -17,7 +17,7 @@ ;; stur x1, [x28] ;; mov x16, #0 ;; mov w0, w16 -;; ldur x1, [x9, #0x60] +;; ldur x1, [x9, #0x50] ;; add x1, x1, x0, uxtx ;; ldur s0, [x1] ;; add sp, sp, #0x10 diff --git a/tests/disas/winch/aarch64/load/f64.wat b/tests/disas/winch/aarch64/load/f64.wat index 70a9b8d5cb14..c8c8ffc20b0c 100644 --- a/tests/disas/winch/aarch64/load/f64.wat +++ b/tests/disas/winch/aarch64/load/f64.wat @@ -16,7 +16,7 @@ ;; stur x1, [x28] ;; mov x16, #0 ;; mov w0, w16 -;; ldur x1, [x9, #0x60] +;; ldur x1, [x9, #0x50] ;; add x1, x1, x0, uxtx ;; ldur d0, [x1] ;; add sp, sp, #0x10 diff --git a/tests/disas/winch/aarch64/load/i32.wat b/tests/disas/winch/aarch64/load/i32.wat index 0b65bcec2abe..e95a104a080d 100644 --- a/tests/disas/winch/aarch64/load/i32.wat +++ b/tests/disas/winch/aarch64/load/i32.wat @@ -17,7 +17,7 @@ ;; stur x1, [x28] ;; mov x16, #0 ;; mov w0, w16 -;; ldur x1, [x9, #0x60] +;; ldur x1, [x9, #0x50] ;; add x1, x1, x0, uxtx ;; ldur w0, [x1] ;; add sp, sp, #0x10 diff --git a/tests/disas/winch/aarch64/load/i64.wat b/tests/disas/winch/aarch64/load/i64.wat index c361d92129fd..ecd29bb44802 100644 --- a/tests/disas/winch/aarch64/load/i64.wat +++ b/tests/disas/winch/aarch64/load/i64.wat @@ -20,12 +20,12 @@ ;; ldur x0, [x28] ;; mov x16, #8 ;; mov w1, w16 -;; ldur x2, [x9, #0x60] +;; ldur x2, [x9, #0x50] ;; add x2, x2, x1, uxtx ;; sturb w0, [x2] ;; mov x16, #8 ;; mov w0, w16 -;; ldur x1, [x9, #0x60] +;; ldur x1, [x9, #0x50] ;; add x1, x1, x0, uxtx ;; ldursb x0, [x1] ;; add sp, sp, #0x18 diff --git a/tests/disas/winch/aarch64/store/dynamic_heap.wat b/tests/disas/winch/aarch64/store/dynamic_heap.wat index e7d1722bb409..c8f49ae306b6 100644 --- a/tests/disas/winch/aarch64/store/dynamic_heap.wat +++ b/tests/disas/winch/aarch64/store/dynamic_heap.wat @@ -34,13 +34,13 @@ ;; stur w5, [x28] ;; ldur w0, [x28, #8] ;; ldur w1, [x28, #0xc] -;; ldur x2, [x9, #0x68] +;; ldur x2, [x9, #0x58] ;; mov w3, w1 ;; add x3, x3, #4 ;; b.hs #0x108 ;; 48: cmp x3, x2, uxtx ;; b.hi #0x10c -;; 50: ldur x4, [x9, #0x60] +;; 50: ldur x4, [x9, #0x50] ;; add x4, x4, x1, uxtx ;; mov x16, #0 ;; mov x5, x16 @@ -49,13 +49,13 @@ ;; stur w0, [x4] ;; ldur w0, [x28, #4] ;; ldur w1, [x28, #0xc] -;; ldur x2, [x9, #0x68] +;; ldur x2, [x9, #0x58] ;; mov w3, w1 ;; add x3, x3, #8 ;; b.hs #0x110 ;; 84: cmp x3, x2, uxtx ;; b.hi #0x114 -;; 8c: ldur x4, [x9, #0x60] +;; 8c: ldur x4, [x9, #0x50] ;; add x4, x4, x1, uxtx ;; add x4, x4, #4 ;; mov x16, #0 @@ -65,7 +65,7 @@ ;; stur w0, [x4] ;; ldur w0, [x28] ;; ldur w1, [x28, #0xc] -;; ldur x2, [x9, #0x68] +;; ldur x2, [x9, #0x58] ;; mov w3, w1 ;; mov w16, #3 ;; movk w16, #0x10, lsl #16 @@ -73,7 +73,7 @@ ;; b.hs #0x118 ;; cc: cmp x3, x2, uxtx ;; b.hi #0x11c -;; d4: ldur x4, [x9, #0x60] +;; d4: ldur x4, [x9, #0x50] ;; add x4, x4, x1, uxtx ;; orr x16, xzr, #0xfffff ;; add x4, x4, x16, uxtx diff --git a/tests/disas/winch/aarch64/store/f32.wat b/tests/disas/winch/aarch64/store/f32.wat index b3401532dea2..fcfc014bf3ee 100644 --- a/tests/disas/winch/aarch64/store/f32.wat +++ b/tests/disas/winch/aarch64/store/f32.wat @@ -18,7 +18,7 @@ ;; fmov s0, w16 ;; mov x16, #0 ;; mov w0, w16 -;; ldur x1, [x9, #0x60] +;; ldur x1, [x9, #0x50] ;; add x1, x1, x0, uxtx ;; stur s0, [x1] ;; add sp, sp, #0x10 diff --git a/tests/disas/winch/aarch64/store/f64.wat b/tests/disas/winch/aarch64/store/f64.wat index 84d030e85a9e..145caf294305 100644 --- a/tests/disas/winch/aarch64/store/f64.wat +++ b/tests/disas/winch/aarch64/store/f64.wat @@ -19,7 +19,7 @@ ;; fmov d0, x16 ;; mov x16, #0 ;; mov w0, w16 -;; ldur x1, [x9, #0x60] +;; ldur x1, [x9, #0x50] ;; add x1, x1, x0, uxtx ;; stur d0, [x1] ;; add sp, sp, #0x10 diff --git a/tests/disas/winch/aarch64/store/i32.wat b/tests/disas/winch/aarch64/store/i32.wat index 37a3f6dceeec..86f5ca1f4e30 100644 --- a/tests/disas/winch/aarch64/store/i32.wat +++ b/tests/disas/winch/aarch64/store/i32.wat @@ -20,7 +20,7 @@ ;; mov w0, w16 ;; mov x16, #0 ;; mov w1, w16 -;; ldur x2, [x9, #0x60] +;; ldur x2, [x9, #0x50] ;; add x2, x2, x1, uxtx ;; stur w0, [x2] ;; add sp, sp, #0x10 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 a671002d8a51..ee1a64623b9e 100644 --- a/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat +++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat @@ -24,7 +24,7 @@ ;; cmpl $0, %eax ;; jne 0x59 ;; 41: movl 0xc(%rsp), %eax -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rcx ;; addq %rax, %rcx ;; movl (%rcx), %eax 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 3c156158518b..1dec794a868a 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 @@ -24,7 +24,7 @@ ;; cmpw $0, %ax ;; jne 0x5d ;; 43: movl 0xc(%rsp), %eax -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rcx ;; addq %rax, %rcx ;; movzwq (%rcx), %rax 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 31157179c985..42d924572d7a 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 @@ -19,7 +19,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movzbq (%rcx), %rax ;; addq $0x10, %rsp 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 6d67f5534ba1..66fa01df46db 100644 --- a/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat +++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat @@ -24,7 +24,7 @@ ;; cmpq $0, %rax ;; jne 0x56 ;; 3f: movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movq (%rcx), %rax ;; addq $0x10, %rsp 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 dbd25c81996a..2aefd67650c0 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 @@ -24,7 +24,7 @@ ;; cmpw $0, %ax ;; jne 0x57 ;; 3f: movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movzwq (%rcx), %rax ;; addq $0x10, %rsp 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 a7ad511e0d37..6ef2558acc26 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 @@ -24,7 +24,7 @@ ;; cmpl $0, %eax ;; jne 0x53 ;; 3d: movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movl (%rcx), %eax ;; addq $0x10, %rsp 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 e922a0f48f77..5d6736dde91c 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 @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movzbq (%rcx), %rax ;; addq $0x10, %rsp 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 6735d39041a7..1eb502ce7218 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x63 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; lock xaddw %ax, (%rdx) 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 98fce27821b6..183162828691 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movl $0x2a, %eax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; lock xaddb %al, (%rdx) 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 d48d8393878a..ba2561f320d2 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x5d ;; 42: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; lock xaddl %eax, (%rdx) 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 d15ff26577fc..1b4c876e4b3f 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x66 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; lock xaddw %ax, (%rdx) 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 40d2bb6f5171..6bf37303e694 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x5f ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; lock xaddl %eax, (%rdx) 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 cd1bf54b829d..4114c725def8 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movq $0x2a, %rax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; lock xaddb %al, (%rdx) 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 53040f0bcca0..06715029b913 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 @@ -23,7 +23,7 @@ ;; cmpq $0, %rcx ;; jne 0x62 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; lock xaddq %rax, (%rdx) 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 d741af7232eb..72009052647d 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x82 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 1530f1590e7e..716b05cd2353 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movl $0x2a, %eax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 dc72c4624bab..7cc5bd58a59b 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x7a ;; 42: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 f472a991e11f..2883d7d0ddba 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x79 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 0ea7edadbd72..2d203408f0c2 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x70 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 929e9c5cd729..7e39abc2727a 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movq $0x2a, %rax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 f89677bc370e..3aa9810b00cb 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 @@ -23,7 +23,7 @@ ;; cmpq $0, %rcx ;; jne 0x73 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 968a175c1631..8d65a3b17a4a 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 @@ -24,7 +24,7 @@ ;; cmpw $0, %dx ;; jne 0x84 ;; 49: movl $0, %edx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rbx ;; addq %rdx, %rbx ;; subq $4, %rsp 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 d70743368e87..9bc0695ad6a1 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 @@ -20,7 +20,7 @@ ;; movl $0x539, %eax ;; movl $0x2a, %ecx ;; movl $0, %edx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rbx ;; addq %rdx, %rbx ;; subq $4, %rsp 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 e40c4a0c3576..813d23f96b7a 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 @@ -24,7 +24,7 @@ ;; cmpl $0, %edx ;; jne 0x7e ;; 47: movl $0, %edx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rbx ;; addq %rdx, %rbx ;; subq $4, %rsp 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 8f772dff3144..a5bdf40e4fad 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 @@ -24,7 +24,7 @@ ;; cmpw $0, %dx ;; jne 0x71 ;; 4d: movl $0, %edx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rbx ;; addq %rdx, %rbx ;; pushq %rcx 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 e4d52a25deed..9d1ed0f56f8e 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 @@ -24,7 +24,7 @@ ;; cmpl $0, %edx ;; jne 0x6a ;; 4b: movl $0, %edx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rbx ;; addq %rdx, %rbx ;; pushq %rcx 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 5379d2658778..05373f00d1dc 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 @@ -20,7 +20,7 @@ ;; movq $0x539, %rax ;; movq $0x2a, %rcx ;; movl $0, %edx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rbx ;; addq %rdx, %rbx ;; pushq %rcx 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 809439283b45..7351dbafc968 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 @@ -24,7 +24,7 @@ ;; cmpq $0, %rdx ;; jne 0x6d ;; 4d: movl $0, %edx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rbx ;; addq %rdx, %rbx ;; pushq %rcx 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 1dea6ca53f06..c4ea4860ffbd 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x82 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 2376eed4b515..9baa98b6ad47 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movl $0x2a, %eax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 2a32d5ed98e4..0493ddb5632d 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x7a ;; 42: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 21725c07066f..f55b5a1484fe 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x79 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 63c469f2c91b..6e2097ffac59 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x70 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 3685312587b0..81c370bc28b2 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movq $0x2a, %rax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 af01add2f99c..c620b579cf2a 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 @@ -23,7 +23,7 @@ ;; cmpq $0, %rcx ;; jne 0x73 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 0fca4fabd940..1be0cad1bafa 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x66 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; negw %ax 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 bed34de764ff..ed2f0b20fcf2 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movl $0x2a, %eax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; negb %al 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 7b81ea4132da..5707e5283f4b 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x5f ;; 42: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; negl %eax 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 cf70c1d5c4f1..e6965771dce0 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x69 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; negw %ax 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 f2b420a1999a..74a851ea626f 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x61 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; negl %eax 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 a52e4aea796d..ccff67da27ed 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movq $0x2a, %rax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; negb %al 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 ec5b9051046e..32e5cbfca0eb 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 @@ -23,7 +23,7 @@ ;; cmpq $0, %rcx ;; jne 0x65 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; negq %rax 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 eb183c017314..70d9be643675 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x61 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; xchgw %ax, (%rdx) 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 7d63f9633b9d..3646bbf2d194 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movl $0x2a, %eax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; xchgb %al, (%rdx) 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 60990feae396..c2ec1dd64937 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x5b ;; 42: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; xchgl %eax, (%rdx) 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 af19a7fd070f..c358a4074bcb 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x64 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; xchgw %ax, (%rdx) 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 a027d17380c4..f5ffe86daf87 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x5d ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; xchgl %eax, (%rdx) 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 ea8bc24cdd98..4bc2d9aacd95 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movq $0x2a, %rax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; xchgb %al, (%rdx) 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 eacb439a37c5..1be5c4ce740d 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 @@ -23,7 +23,7 @@ ;; cmpq $0, %rcx ;; jne 0x60 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; xchgq %rax, (%rdx) 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 960c94ba77ba..344f5df9b24a 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x82 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 2825964f1b1c..a402095bca5d 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movl $0x2a, %eax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 4aeb301db412..a39248aa111f 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x7a ;; 42: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; subq $4, %rsp 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 bfb623928a87..fb3527e67a86 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 @@ -23,7 +23,7 @@ ;; cmpw $0, %cx ;; jne 0x79 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 da26bfb7bc1b..7e836df45edb 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 @@ -23,7 +23,7 @@ ;; cmpl $0, %ecx ;; jne 0x70 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 738edc26804a..7f96452061d8 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 @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movq $0x2a, %rax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 d524762957ac..bfeeed2fc138 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 @@ -23,7 +23,7 @@ ;; cmpq $0, %rcx ;; jne 0x73 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; pushq %rax 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 b6f98ecffc96..9453ad26ed16 100644 --- a/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat +++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat @@ -22,7 +22,7 @@ ;; cmpl $0, %ecx ;; jne 0x5e ;; 42: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; movl %eax, (%rdx) 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 3b48acb6bcf6..8de305778177 100644 --- a/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat +++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat @@ -22,7 +22,7 @@ ;; cmpw $0, %cx ;; jne 0x61 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; movw %ax, (%rdx) 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 1626c3482856..ddf3f9d065ff 100644 --- a/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat +++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat @@ -18,7 +18,7 @@ ;; movq %rsi, (%rsp) ;; movl $0x2a, %eax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; movb %al, (%rdx) 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 9852a8983c31..0e7c5abd3671 100644 --- a/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat +++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat @@ -22,7 +22,7 @@ ;; cmpq $0, %rcx ;; jne 0x63 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; movq %rax, (%rdx) 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 c13d460fb61b..d9791862405b 100644 --- a/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat +++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat @@ -22,7 +22,7 @@ ;; cmpw $0, %cx ;; jne 0x63 ;; 46: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; movw %ax, (%rdx) 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 8a4d056aa004..909b10c625f0 100644 --- a/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat +++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat @@ -22,7 +22,7 @@ ;; cmpl $0, %ecx ;; jne 0x60 ;; 44: movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; movl %eax, (%rdx) 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 5aadfce63fac..28504d7e794e 100644 --- a/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat +++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat @@ -18,7 +18,7 @@ ;; movq %rsi, (%rsp) ;; movq $0x2a, %rax ;; movl $0, %ecx -;; movq 0x58(%r14), %r11 +;; movq 0x48(%r14), %r11 ;; movq (%r11), %rdx ;; addq %rcx, %rdx ;; movb %al, (%rdx) diff --git a/tests/disas/winch/x64/call_indirect/call_indirect.wat b/tests/disas/winch/x64/call_indirect/call_indirect.wat index 137c896c6246..15dcce1b4100 100644 --- a/tests/disas/winch/x64/call_indirect/call_indirect.wat +++ b/tests/disas/winch/x64/call_indirect/call_indirect.wat @@ -57,12 +57,12 @@ ;; movl %eax, (%rsp) ;; movl $0, %ecx ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0x1e1 ;; 76: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx @@ -84,7 +84,7 @@ ;; c7: andq $0xfffffffffffffffe, %rax ;; testq %rax, %rax ;; je 0x1e3 -;; d4: movq 0x50(%r14), %r11 +;; d4: movq 0x40(%r14), %r11 ;; movl (%r11), %ecx ;; movl 0x10(%rax), %edx ;; cmpl %edx, %ecx @@ -109,12 +109,12 @@ ;; movl %ecx, (%rsp) ;; movl $0, %ecx ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0x1e7 ;; 137: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx @@ -136,7 +136,7 @@ ;; 188: andq $0xfffffffffffffffe, %rax ;; testq %rax, %rax ;; je 0x1e9 -;; 195: movq 0x50(%r14), %r11 +;; 195: movq 0x40(%r14), %r11 ;; movl (%r11), %ecx ;; movl 0x10(%rax), %edx ;; cmpl %edx, %ecx diff --git a/tests/disas/winch/x64/call_indirect/local_arg.wat b/tests/disas/winch/x64/call_indirect/local_arg.wat index 617eeb45f9e4..e077145a56b3 100644 --- a/tests/disas/winch/x64/call_indirect/local_arg.wat +++ b/tests/disas/winch/x64/call_indirect/local_arg.wat @@ -53,12 +53,12 @@ ;; movl %r11d, (%rsp) ;; movl $0, %ecx ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0x135 ;; 98: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx @@ -80,7 +80,7 @@ ;; e9: andq $0xfffffffffffffffe, %rax ;; testq %rax, %rax ;; je 0x137 -;; f6: movq 0x50(%r14), %r11 +;; f6: movq 0x40(%r14), %r11 ;; movl (%r11), %ecx ;; movl 0x10(%rax), %edx ;; cmpl %edx, %ecx diff --git a/tests/disas/winch/x64/fuel/call.wat b/tests/disas/winch/x64/fuel/call.wat index 5a540270a001..ad2bfbcb1d61 100644 --- a/tests/disas/winch/x64/fuel/call.wat +++ b/tests/disas/winch/x64/fuel/call.wat @@ -30,8 +30,8 @@ ;; movq (%rax), %r11 ;; addq $2, %r11 ;; movq %r11, (%rax) -;; movq 0x68(%r14), %rcx -;; movq 0x58(%r14), %rax +;; movq 0x58(%r14), %rcx +;; movq 0x48(%r14), %rax ;; movq %rcx, %rdi ;; movq %r14, %rsi ;; callq *%rax diff --git a/tests/disas/winch/x64/load/f32.wat b/tests/disas/winch/x64/load/f32.wat index 0f0d396bf9d3..44cdd41be8a2 100644 --- a/tests/disas/winch/x64/load/f32.wat +++ b/tests/disas/winch/x64/load/f32.wat @@ -19,7 +19,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movss (%rcx), %xmm0 ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/load/f64.wat b/tests/disas/winch/x64/load/f64.wat index 5539ea8ade40..483fcd0d2c1d 100644 --- a/tests/disas/winch/x64/load/f64.wat +++ b/tests/disas/winch/x64/load/f64.wat @@ -18,7 +18,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movsd (%rcx), %xmm0 ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/load/grow_load.wat b/tests/disas/winch/x64/load/grow_load.wat index 78c847035829..4b0bada9f6cf 100644 --- a/tests/disas/winch/x64/load/grow_load.wat +++ b/tests/disas/winch/x64/load/grow_load.wat @@ -34,7 +34,7 @@ ;; movq 0x10(%r11), %r11 ;; addq $0x70, %r11 ;; cmpq %rsp, %r11 -;; ja 0x121 +;; ja 0x118 ;; 1c: movq %rsi, %r14 ;; subq $0x60, %rsp ;; movq %rsi, 0x58(%rsp) @@ -47,17 +47,17 @@ ;; movsd %xmm3, 0x20(%rsp) ;; movss %xmm4, 0x1c(%rsp) ;; movq %rdi, 8(%rsp) -;; movl 0x80(%r14), %eax +;; movl 0x70(%r14), %eax ;; cmpl $0, %eax ;; movl $0, %eax ;; sete %al ;; testl %eax, %eax -;; je 0x77 -;; 75: ud2 -;; movl 0x80(%r14), %eax +;; je 0x74 +;; 72: ud2 +;; movl 0x70(%r14), %eax ;; subl $1, %eax -;; movl %eax, 0x80(%r14) -;; movq 0x68(%r14), %rax +;; movl %eax, 0x70(%r14) +;; movq 0x58(%r14), %rax ;; shrl $0x10, %eax ;; subq $4, %rsp ;; movl %eax, (%rsp) @@ -65,20 +65,20 @@ ;; movq %r14, %rdi ;; movl 0xc(%rsp), %esi ;; movl $0, %edx -;; callq 0x2de +;; callq 0x2d6 ;; addq $0xc, %rsp ;; addq $4, %rsp ;; movq 0x58(%rsp), %r14 ;; movl %eax, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; addq $0x23024, %rcx ;; movsbq (%rcx), %rax -;; movss 0x54(%rip), %xmm0 +;; movss 0x55(%rip), %xmm0 ;; subq $0xc, %rsp -;; movsd 0x4f(%rip), %xmm15 +;; movsd 0x50(%rip), %xmm15 ;; movsd %xmm15, (%rsp) -;; movss 0x38(%rip), %xmm15 +;; movss 0x39(%rip), %xmm15 ;; movss %xmm15, 8(%rsp) ;; movq 0x14(%rsp), %rax ;; movsd (%rsp), %xmm15 @@ -90,14 +90,15 @@ ;; addq $0x60, %rsp ;; popq %rbp ;; retq -;; 121: ud2 -;; 123: addb %al, (%rax) -;; 125: addb %al, (%rax) -;; 127: addb %al, (%rax) -;; 129: addb %al, (%rax) -;; 12b: addb %al, (%rax) -;; 12d: addb %al, (%rax) -;; 12f: addb %al, (%rax) -;; 131: addb %al, (%rax) -;; 133: addb %al, (%rax) -;; 135: addb %al, (%rax) +;; 118: ud2 +;; 11a: addb %al, (%rax) +;; 11c: addb %al, (%rax) +;; 11e: addb %al, (%rax) +;; 120: addb %al, (%rax) +;; 122: addb %al, (%rax) +;; 124: addb %al, (%rax) +;; 126: addb %al, (%rax) +;; 128: addb %al, (%rax) +;; 12a: addb %al, (%rax) +;; 12c: addb %al, (%rax) +;; 12e: addb %al, (%rax) diff --git a/tests/disas/winch/x64/load/i32.wat b/tests/disas/winch/x64/load/i32.wat index b2ffa705664f..111b379a1aa3 100644 --- a/tests/disas/winch/x64/load/i32.wat +++ b/tests/disas/winch/x64/load/i32.wat @@ -19,7 +19,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movl (%rcx), %eax ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/load/i64.wat b/tests/disas/winch/x64/load/i64.wat index 3c1b5fafd464..05ac205de52d 100644 --- a/tests/disas/winch/x64/load/i64.wat +++ b/tests/disas/winch/x64/load/i64.wat @@ -22,11 +22,11 @@ ;; movq %rdx, 8(%rsp) ;; movq 8(%rsp), %rax ;; movl $8, %ecx -;; movq 0x60(%r14), %rdx +;; movq 0x50(%r14), %rdx ;; addq %rcx, %rdx ;; movb %al, (%rdx) ;; movl $8, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movsbq (%rcx), %rax ;; addq $0x20, %rsp diff --git a/tests/disas/winch/x64/load/v128.wat b/tests/disas/winch/x64/load/v128.wat index 50f3ae828de2..5bd073ca0a85 100644 --- a/tests/disas/winch/x64/load/v128.wat +++ b/tests/disas/winch/x64/load/v128.wat @@ -19,7 +19,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movdqu (%rcx), %xmm0 ;; addq $0x10, %rsp 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 5350689d30a8..68828a377bfc 100644 --- a/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat +++ b/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpbroadcastw (%rcx), %xmm0 ;; addq $0x10, %rsp 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 2e95463b2d7e..c39c1c27b6b7 100644 --- a/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat +++ b/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpmovsxwd (%rcx), %xmm0 ;; addq $0x10, %rsp 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 641275ac2e5d..a958ab77f2df 100644 --- a/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat +++ b/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpmovzxwd (%rcx), %xmm0 ;; addq $0x10, %rsp 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 a932a1e9e70a..6d7d4127ed1b 100644 --- a/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat +++ b/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpbroadcastd (%rcx), %xmm0 ;; addq $0x10, %rsp 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 ca2f20219f39..aa83f0ae2cf3 100644 --- a/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat +++ b/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpmovsxdq (%rcx), %xmm0 ;; addq $0x10, %rsp 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 b81f42c01b6b..0fa772703095 100644 --- a/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat +++ b/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpmovzxdq (%rcx), %xmm0 ;; addq $0x10, %rsp 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 4170e9ba1b67..2738a767abdb 100644 --- a/tests/disas/winch/x64/load/v128_load64_splat_avx.wat +++ b/tests/disas/winch/x64/load/v128_load64_splat_avx.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movsd (%rcx), %xmm0 ;; vpshufd $0x44, %xmm0, %xmm0 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 57dc051380df..3f5b45a04668 100644 --- a/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat +++ b/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpbroadcastb (%rcx), %xmm0 ;; addq $0x10, %rsp 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 58e8c44a3c90..438caacf85f2 100644 --- a/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat +++ b/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpmovsxbw (%rcx), %xmm0 ;; addq $0x10, %rsp 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 3611ca60ee0b..aa9a9287d143 100644 --- a/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat +++ b/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat @@ -20,7 +20,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; vpmovzxbw (%rcx), %xmm0 ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/store/f32.wat b/tests/disas/winch/x64/store/f32.wat index 6381b6dc7ff6..4d113acd7cab 100644 --- a/tests/disas/winch/x64/store/f32.wat +++ b/tests/disas/winch/x64/store/f32.wat @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movss 0x1c(%rip), %xmm0 ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movss %xmm0, (%rcx) ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/store/f64.wat b/tests/disas/winch/x64/store/f64.wat index c19f69323363..370c33822d6d 100644 --- a/tests/disas/winch/x64/store/f64.wat +++ b/tests/disas/winch/x64/store/f64.wat @@ -20,7 +20,7 @@ ;; movq %rsi, (%rsp) ;; movsd 0x1c(%rip), %xmm0 ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movsd %xmm0, (%rcx) ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/store/i32.wat b/tests/disas/winch/x64/store/i32.wat index 23a2b477a584..9529b71fac8a 100644 --- a/tests/disas/winch/x64/store/i32.wat +++ b/tests/disas/winch/x64/store/i32.wat @@ -21,7 +21,7 @@ ;; movq %rsi, (%rsp) ;; movl $1, %eax ;; movl $0, %ecx -;; movq 0x60(%r14), %rdx +;; movq 0x50(%r14), %rdx ;; addq %rcx, %rdx ;; movl %eax, (%rdx) ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/store/oob.wat b/tests/disas/winch/x64/store/oob.wat index 58a6dff51312..3cfee04e766d 100644 --- a/tests/disas/winch/x64/store/oob.wat +++ b/tests/disas/winch/x64/store/oob.wat @@ -25,14 +25,14 @@ ;; movl %edx, 0xc(%rsp) ;; movl 0xc(%rsp), %eax ;; movl $0, %ecx -;; movq 0x68(%r14), %rdx +;; movq 0x58(%r14), %rdx ;; movl %ecx, %ebx ;; movabsq $0x100000000, %r11 ;; addq %r11, %rbx ;; jb 0x88 ;; 53: cmpq %rdx, %rbx ;; ja 0x8a -;; 5c: movq 0x60(%r14), %rsi +;; 5c: movq 0x50(%r14), %rsi ;; addq %rcx, %rsi ;; movabsq $0xffffffff, %r11 ;; addq %r11, %rsi diff --git a/tests/disas/winch/x64/store/v128.wat b/tests/disas/winch/x64/store/v128.wat index 142e0fdc12f1..6359d0adefad 100644 --- a/tests/disas/winch/x64/store/v128.wat +++ b/tests/disas/winch/x64/store/v128.wat @@ -19,7 +19,7 @@ ;; movq %rsi, (%rsp) ;; movdqu 0x1c(%rip), %xmm0 ;; movl $0, %eax -;; movq 0x60(%r14), %rcx +;; movq 0x50(%r14), %rcx ;; addq %rax, %rcx ;; movdqu %xmm0, (%rcx) ;; addq $0x10, %rsp diff --git a/tests/disas/winch/x64/table/fill.wat b/tests/disas/winch/x64/table/fill.wat index 99107a880497..b11f603be344 100644 --- a/tests/disas/winch/x64/table/fill.wat +++ b/tests/disas/winch/x64/table/fill.wat @@ -94,12 +94,12 @@ ;; movl (%rsp), %ecx ;; addq $4, %rsp ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0x1d5 ;; 12f: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx diff --git a/tests/disas/winch/x64/table/get.wat b/tests/disas/winch/x64/table/get.wat index 6e598951d0cc..a39feed78e38 100644 --- a/tests/disas/winch/x64/table/get.wat +++ b/tests/disas/winch/x64/table/get.wat @@ -46,12 +46,12 @@ ;; movl (%rsp), %ecx ;; addq $4, %rsp ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0xf2 ;; 95: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx diff --git a/tests/disas/winch/x64/table/init_copy_drop.wat b/tests/disas/winch/x64/table/init_copy_drop.wat index 3809240160bc..385c60765dbc 100644 --- a/tests/disas/winch/x64/table/init_copy_drop.wat +++ b/tests/disas/winch/x64/table/init_copy_drop.wat @@ -224,12 +224,12 @@ ;; movl (%rsp), %ecx ;; addq $4, %rsp ;; movq %r14, %rdx -;; movq 0xd8(%rdx), %rbx +;; movq 0xc8(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0x39a ;; 308: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0xd0(%rdx), %rdx +;; movq 0xc0(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx @@ -251,7 +251,7 @@ ;; 35c: andq $0xfffffffffffffffe, %rax ;; testq %rax, %rax ;; je 0x39c -;; 369: movq 0x50(%r14), %r11 +;; 369: movq 0x40(%r14), %r11 ;; movl (%r11), %ecx ;; movl 0x10(%rax), %edx ;; cmpl %edx, %ecx diff --git a/tests/disas/winch/x64/table/set.wat b/tests/disas/winch/x64/table/set.wat index 88d3eb6de47f..a98a971e29b3 100644 --- a/tests/disas/winch/x64/table/set.wat +++ b/tests/disas/winch/x64/table/set.wat @@ -49,12 +49,12 @@ ;; movq (%rsp), %rax ;; movl 0xc(%rsp), %ecx ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0xb3 ;; 8d: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx @@ -90,12 +90,12 @@ ;; movl (%rsp), %ecx ;; addq $4, %rsp ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0x1b8 ;; 126: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx @@ -118,12 +118,12 @@ ;; movl (%rsp), %ecx ;; addq $4, %rsp ;; movq %r14, %rdx -;; movq 0x60(%rdx), %rbx +;; movq 0x50(%rdx), %rbx ;; cmpq %rbx, %rcx ;; jae 0x1ba ;; 192: movq %rcx, %r11 ;; imulq $8, %r11, %r11 -;; movq 0x58(%rdx), %rdx +;; movq 0x48(%rdx), %rdx ;; movq %rdx, %rsi ;; addq %r11, %rdx ;; cmpl %ebx, %ecx diff --git a/tests/disas/winch/x64/table/size.wat b/tests/disas/winch/x64/table/size.wat index 5749b86f37b6..39acd9f80dbf 100644 --- a/tests/disas/winch/x64/table/size.wat +++ b/tests/disas/winch/x64/table/size.wat @@ -18,7 +18,7 @@ ;; movq %rdi, 8(%rsp) ;; movq %rsi, (%rsp) ;; movq %r14, %r11 -;; movq 0x60(%r11), %rax +;; movq 0x50(%r11), %rax ;; addq $0x10, %rsp ;; popq %rbp ;; retq diff --git a/tests/disas/x64-store-imm.wat b/tests/disas/x64-store-imm.wat index 73ca4b9320bf..cc34e6c3e795 100644 --- a/tests/disas/x64-store-imm.wat +++ b/tests/disas/x64-store-imm.wat @@ -16,12 +16,12 @@ ;; wasm[0]::function[0]::foo: ;; pushq %rbp ;; movq %rsp, %rbp -;; movl $0, 0x60(%rdi) -;; movl $1, 0x60(%rdi) -;; movl $0xffffffff, 0x60(%rdi) -;; movl $0xfffffff6, 0x60(%rdi) -;; movl $0x186a0, 0x60(%rdi) -;; movl $0x8fffffff, 0x60(%rdi) +;; movl $0, 0x50(%rdi) +;; movl $1, 0x50(%rdi) +;; movl $0xffffffff, 0x50(%rdi) +;; movl $0xfffffff6, 0x50(%rdi) +;; movl $0x186a0, 0x50(%rdi) +;; movl $0x8fffffff, 0x50(%rdi) ;; movq %rbp, %rsp ;; popq %rbp ;; retq