Skip to content

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

Tag `VMContRef` fields and continuation stack memory with alias regions (#13742)

Nick Fitzgeraldeb4f4b38fa05
diff --git a/crates/cranelift/src/alias_region.rs b/crates/cranelift/src/alias_region.rs
index b0bdc536d4..664c789a07 100644
--- a/crates/cranelift/src/alias_region.rs
+++ b/crates/cranelift/src/alias_region.rs
@@ -25,6 +25,8 @@ enum VmType {
VMCopyingHeapData,
VMNullHeapData,
VMDeferredThread,
+ VMContRef,
+ ContinuationStackMemory,
}
/// A key that uniquely identifies an alias region across an entire compilation.
@@ -86,7 +88,7 @@ enum AliasRegionKey {
}
impl AliasRegionKey {
- const KIND_BITS: u32 = 4;
+ const KIND_BITS: u32 = 5;
const KIND_OFFSET: u32 = 32 - Self::KIND_BITS;
const KIND_MASK: u32 = ((1 << Self::KIND_BITS) - 1) << Self::KIND_OFFSET;
@@ -103,22 +105,24 @@ impl AliasRegionKey {
kind << Self::KIND_OFFSET
}
- const VM_CONTEXT_KIND: u32 = Self::new_kind(0b0000);
- const VM_STORE_CONTEXT_KIND: u32 = Self::new_kind(0b0001);
- const IMPORTED_MEMORY_KIND: u32 = Self::new_kind(0b0010);
- const DEFINED_MEMORY_KIND: u32 = Self::new_kind(0b0011);
- const IMPORTED_TABLE_KIND: u32 = Self::new_kind(0b0100);
- const DEFINED_TABLE_KIND: u32 = Self::new_kind(0b0101);
- const IMPORTED_GLOBAL_KIND: u32 = Self::new_kind(0b0110);
- const DEFINED_GLOBAL_KIND: u32 = Self::new_kind(0b0111);
- const GC_HEAP_KIND: u32 = Self::new_kind(0b1000);
- const VM_MEMORY_DEFINITION_KIND: u32 = Self::new_kind(0b1001);
- const VM_TABLE_DEFINITION_KIND: u32 = Self::new_kind(0b1010);
- const VM_COMPONENT_CONTEXT_KIND: u32 = Self::new_kind(0b1011);
- const VM_DRC_HEAP_DATA_KIND: u32 = Self::new_kind(0b1100);
- const VM_COPYING_HEAP_DATA_KIND: u32 = Self::new_kind(0b1101);
- const VM_NULL_HEAP_DATA_KIND: u32 = Self::new_kind(0b1110);
- const VM_DEFERRED_THREAD_KIND: u32 = Self::new_kind(0b1111);
+ const VM_CONTEXT_KIND: u32 = Self::new_kind(0b00000);
+ const VM_STORE_CONTEXT_KIND: u32 = Self::new_kind(0b00001);
+ const IMPORTED_MEMORY_KIND: u32 = Self::new_kind(0b00010);
+ const DEFINED_MEMORY_KIND: u32 = Self::new_kind(0b00011);
+ const IMPORTED_TABLE_KIND: u32 = Self::new_kind(0b00100);
+ const DEFINED_TABLE_KIND: u32 = Self::new_kind(0b00101);
+ const IMPORTED_GLOBAL_KIND: u32 = Self::new_kind(0b00110);
+ const DEFINED_GLOBAL_KIND: u32 = Self::new_kind(0b00111);
+ const GC_HEAP_KIND: u32 = Self::new_kind(0b01000);
+ const VM_MEMORY_DEFINITION_KIND: u32 = Self::new_kind(0b01001);
+ const VM_TABLE_DEFINITION_KIND: u32 = Self::new_kind(0b01010);
+ const VM_COMPONENT_CONTEXT_KIND: u32 = Self::new_kind(0b01011);
+ const VM_DRC_HEAP_DATA_KIND: u32 = Self::new_kind(0b01100);
+ const VM_COPYING_HEAP_DATA_KIND: u32 = Self::new_kind(0b01101);
+ const VM_NULL_HEAP_DATA_KIND: u32 = Self::new_kind(0b01110);
+ const VM_DEFERRED_THREAD_KIND: u32 = Self::new_kind(0b01111);
+ const VM_CONTREF_KIND: u32 = Self::new_kind(0b10000);
+ const CONTINUATION_STACK_MEMORY_KIND: u32 = Self::new_kind(0b10001);
/// Encode this key into a raw `u32` suitable for use as an
/// `AliasRegionData::user_id`.
@@ -136,6 +140,8 @@ impl AliasRegionKey {
VmType::VMCopyingHeapData => Self::VM_COPYING_HEAP_DATA_KIND,
VmType::VMNullHeapData => Self::VM_NULL_HEAP_DATA_KIND,
VmType::VMDeferredThread => Self::VM_DEFERRED_THREAD_KIND,
+ VmType::VMContRef => Self::VM_CONTREF_KIND,
+ VmType::ContinuationStackMemory => Self::CONTINUATION_STACK_MEMORY_KIND,
};
kind | (offset & Self::OFFSET_MASK)
}
@@ -2115,3 +2121,45 @@ where
);
}
}
+
+/// Stack-switching and continuation-object methods.
+impl<Offsets> AliasRegions<Offsets>
+where
+ Offsets: GetPtrSize,
+{
+ /// Region for a continuation-reference object and its inline
+ /// sub-structures.
+ ///
+ /// A `VMContRef` (and its inline `VMCommonStackInformation` /
+ /// `VMStackLimits` / `VMHostArray` headers) is reached through a `*mut
+ /// VMContRef`.
+ ///
+ /// A single region covers the whole object: this is coarse but sound, and
+ /// keeps every field of the object disjoint from linear memory, the vmctx,
+ /// the store context, etc...
+ pub fn vmcontref_region(&mut self, func: &mut ir::Function) -> ir::AliasRegion {
+ self.region(
+ func,
+ AliasRegionKey::Vm {
+ ty: VmType::VMContRef,
+ offset: 0,
+ },
+ )
+ }
+
+ /// Region for a continuation's stack memory: its payload/handler data
+ /// buffers and the control-context records stored on the continuation
+ /// stack.
+ ///
+ /// These are distinct from the `VMContRef` object itself (which only holds
+ /// pointers to them).
+ pub fn continuation_stack_memory_region(&mut self, func: &mut ir::Function) -> ir::AliasRegion {
+ self.region(
+ func,
+ AliasRegionKey::Vm {
+ ty: VmType::ContinuationStackMemory,
+ offset: 0,
+ },
+ )
+ }
+}
diff --git a/crates/cranelift/src/func_environ/stack_switching/instructions.rs b/crates/cranelift/src/func_environ/stack_switching/instructions.rs
index 8432b7b416..a3dff16490 100644
--- a/crates/cranelift/src/func_environ/stack_switching/instructions.rs
+++ b/crates/cranelift/src/func_environ/stack_switching/instructions.rs
@@ -137,8 +137,8 @@ pub(crate) mod stack_switching_helpers {
new_stack_chain: &VMStackChain,
) {
let offset = env.offsets.ptr.vmcontref_parent_chain().into();
- // TODO: tag with the `VMContRef` alias region.
- new_stack_chain.store(env, builder, self.address, offset, None)
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ new_stack_chain.store(env, builder, self.address, offset, Some(region))
}
/// Loads the parent of this continuation, which may either be another
@@ -150,8 +150,15 @@ pub(crate) mod stack_switching_helpers {
builder: &mut FunctionBuilder,
) -> VMStackChain {
let offset = env.offsets.ptr.vmcontref_parent_chain().into();
- // TODO: tag with the `VMContRef` alias region.
- VMStackChain::load(env, builder, self.address, offset, env.pointer_type(), None)
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ VMStackChain::load(
+ env,
+ builder,
+ self.address,
+ offset,
+ env.pointer_type(),
+ Some(region),
+ )
}
pub fn set_last_ancestor<'a>(
@@ -161,7 +168,8 @@ pub(crate) mod stack_switching_helpers {
last_ancestor: ir::Value,
) {
let offset: i32 = env.offsets.ptr.vmcontref_last_ancestor().into();
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
builder
.ins()
.store(mem_flags, last_ancestor, self.address, offset);
@@ -173,7 +181,8 @@ pub(crate) mod stack_switching_helpers {
builder: &mut FunctionBuilder,
) -> ir::Value {
let offset: i32 = env.offsets.ptr.vmcontref_last_ancestor().into();
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
builder
.ins()
.load(env.pointer_type(), mem_flags, self.address, offset)
@@ -186,7 +195,8 @@ pub(crate) mod stack_switching_helpers {
env: &mut crate::func_environ::FuncEnvironment<'a>,
builder: &mut FunctionBuilder,
) -> ir::Value {
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let offset: i32 = env.offsets.ptr.vmcontref_revision().into();
let revision = builder.ins().load(I64, mem_flags, self.address, offset);
revision
@@ -201,7 +211,8 @@ pub(crate) mod stack_switching_helpers {
builder: &mut FunctionBuilder,
revision: ir::Value,
) -> ir::Value {
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let offset: i32 = env.offsets.ptr.vmcontref_revision().into();
let revision_plus1 = builder.ins().iadd_imm_s(revision, 1);
builder
@@ -230,18 +241,32 @@ pub(crate) mod stack_switching_helpers {
}
}
- fn get(&self, builder: &mut FunctionBuilder, ty: ir::Type, offset: i32) -> ir::Value {
- let mem_flags = ir::MemFlagsData::trusted();
+ fn get(
+ &self,
+ env: &mut crate::func_environ::FuncEnvironment<'_>,
+ builder: &mut FunctionBuilder,
+ ty: ir::Type,
+ offset: i32,
+ ) -> ir::Value {
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
builder.ins().load(ty, mem_flags, self.address, offset)
}
- fn set<U>(&self, builder: &mut FunctionBuilder, offset: i32, value: ir::Value) {
+ fn set<U>(
+ &self,
+ env: &mut crate::func_environ::FuncEnvironment<'_>,
+ builder: &mut FunctionBuilder,
+ offset: i32,
+ value: ir::Value,
+ ) {
debug_assert_eq!(
builder.func.dfg.value_type(value),
Type::int_with_byte_size(u16::try_from(core::mem::size_of::<U>()).unwrap())
.unwrap()
);
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
builder.ins().store(mem_flags, value, self.address, offset);
}
@@ -251,7 +276,8 @@ pub(crate) mod stack_switching_helpers {
builder: &mut FunctionBuilder,
) -> ir::Value {
let offset = env.offsets.ptr.vmhostarray_data().into();
- self.get(builder, env.pointer_type(), offset)
+ let pointer_type = env.pointer_type();
+ self.get(env, builder, pointer_type, offset)
}
pub fn get_length<'a>(
@@ -261,7 +287,7 @@ pub(crate) mod stack_switching_helpers {
) -> ir::Value {
// Array length is stored as u32.
let offset = env.offsets.ptr.vmhostarray_length().into();
- self.get(builder, I32, offset)
+ self.get(env, builder, I32, offset)
}
fn set_length<'a>(
@@ -272,7 +298,7 @@ pub(crate) mod stack_switching_helpers {
) {
// Array length is stored as u32.
let offset = env.offsets.ptr.vmhostarray_length().into();
- self.set::<u32>(builder, offset, length);
+ self.set::<u32>(env, builder, offset, length);
}
fn set_capacity<'a>(
@@ -283,7 +309,7 @@ pub(crate) mod stack_switching_helpers {
) {
// Array capacity is stored as u32.
let offset = env.offsets.ptr.vmhostarray_capacity().into();
- self.set::<u32>(builder, offset, capacity);
+ self.set::<u32>(env, builder, offset, capacity);
}
fn set_data<'a>(
@@ -294,7 +320,8 @@ pub(crate) mod stack_switching_helpers {
) {
debug_assert_eq!(builder.func.dfg.value_type(data), env.pointer_type());
let offset: i32 = env.offsets.ptr.vmhostarray_data().into();
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
builder.ins().store(mem_flags, data, self.address, offset);
}
@@ -373,7 +400,10 @@ pub(crate) mod stack_switching_helpers {
builder: &mut FunctionBuilder,
load_types: &[ir::Type],
) -> Vec<ir::Value> {
- let memflags = ir::MemFlagsData::trusted();
+ let region = env
+ .alias_regions
+ .continuation_stack_memory_region(builder.func);
+ let memflags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let data_start_pointer = self.get_data(env, builder);
let mut values = vec![];
@@ -411,7 +441,10 @@ pub(crate) mod stack_switching_helpers {
size <= entry_size
}));
- let memflags = ir::MemFlagsData::trusted();
+ let region = env
+ .alias_regions
+ .continuation_stack_memory_region(builder.func);
+ let memflags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let data_start_pointer = self.get_data(env, builder);
@@ -617,7 +650,8 @@ pub(crate) mod stack_switching_helpers {
env: &mut crate::func_environ::FuncEnvironment<'a>,
builder: &mut FunctionBuilder,
) -> ir::Value {
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let state_ptr = self.get_state_ptr(env, builder);
builder.ins().load(I32, mem_flags, state_ptr, 0)
@@ -630,7 +664,8 @@ pub(crate) mod stack_switching_helpers {
discriminant: u32,
) {
let discriminant = builder.ins().iconst(I32, i64::from(discriminant));
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let state_ptr = self.get_state_ptr(env, builder);
builder.ins().store(mem_flags, discriminant, state_ptr, 0);
@@ -702,7 +737,8 @@ pub(crate) mod stack_switching_helpers {
builder: &mut FunctionBuilder,
) -> ir::Value {
// Field first_switch_handler_index has type u32
- let memflags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let memflags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let offset: i32 = env
.offsets
.ptr
@@ -718,7 +754,8 @@ pub(crate) mod stack_switching_helpers {
value: ir::Value,
) {
// Field first_switch_handler_index has type u32
- let memflags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let memflags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let offset: i32 = env
.offsets
.ptr
@@ -742,9 +779,12 @@ pub(crate) mod stack_switching_helpers {
let stack_limit_offset = env.offsets.ptr.vmstack_limits_stack_limit();
let last_wasm_entry_fp_offset = env.offsets.ptr.vmstack_limits_last_wasm_entry_fp();
- // The load side reads this continuation's inline `VMStackLimits`;
- // the store side targets the `VMStoreContext`.
- let our_memflags = ir::MemFlagsData::trusted();
+ // The load side reads this continuation's inline `VMStackLimits`
+ // (the `VMContRef` region); the store side targets the
+ // `VMStoreContext`.
+ let vmcontref_region = env.alias_regions.vmcontref_region(builder.func);
+ let our_memflags =
+ ir::MemFlagsData::trusted().with_alias_region(Some(vmcontref_region));
let stack_limit = builder.ins().load(
pointer_type,
@@ -790,10 +830,14 @@ pub(crate) mod stack_switching_helpers {
let last_wasm_entry_fp = env
.alias_regions
.vmstore_context_last_wasm_entry_fp(&mut builder.cursor(), vmruntime_limits_ptr);
+
// ...and store to this continuation's inline `VMStackLimits`.
+ let vmcontref_region = env.alias_regions.vmcontref_region(builder.func);
+ let our_memflags =
+ ir::MemFlagsData::trusted().with_alias_region(Some(vmcontref_region));
let last_wasm_entry_fp_offset = env.offsets.ptr.vmstack_limits_last_wasm_entry_fp();
builder.ins().store(
- ir::MemFlagsData::trusted(),
+ our_memflags,
last_wasm_entry_fp,
stack_limits_ptr,
i32::from(last_wasm_entry_fp_offset),
@@ -807,7 +851,7 @@ pub(crate) mod stack_switching_helpers {
// ...and store to this continuation's inline `VMStackLimits`.
let stack_limit_offset = env.offsets.ptr.vmstack_limits_stack_limit();
builder.ins().store(
- ir::MemFlagsData::trusted(),
+ our_memflags,
stack_limit,
stack_limits_ptr,
i32::from(stack_limit_offset),
@@ -829,7 +873,8 @@ pub(crate) mod stack_switching_helpers {
env: &mut crate::func_environ::FuncEnvironment<'a>,
builder: &mut FunctionBuilder,
) -> ir::Value {
- let mem_flags = ir::MemFlagsData::trusted();
+ let region = env.alias_regions.vmcontref_region(builder.func);
+ let mem_flags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
builder
.ins()
.load(env.pointer_type(), mem_flags, self.tos_ptr, 0)
@@ -909,7 +954,10 @@ pub(crate) fn vmcontref_store_payloads<'a>(
let ptr = builder.block_params(store_data_block)[0];
// Store the values.
- let memflags = ir::MemFlagsData::trusted();
+ let region = env
+ .alias_regions
+ .continuation_stack_memory_region(builder.func);
+ let memflags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let mut offset = 0;
for value in values {
builder.ins().store(memflags, *value, ptr, offset);
@@ -1138,7 +1186,10 @@ fn search_handler<'a>(
let offset = builder.ins().uextend(I64, offset);
let entry_address = builder.ins().iadd(base, offset);
- let memflags = ir::MemFlagsData::trusted();
+ let region = env
+ .alias_regions
+ .continuation_stack_memory_region(builder.func);
+ let memflags = ir::MemFlagsData::trusted().with_alias_region(Some(region));
let handled_tag = builder
.ins()
@@ -1869,26 +1920,37 @@ pub(crate) fn translate_switch<'a>(
let slot = builder.create_sized_stack_slot(slot_size);
let tmp_control_context = builder.ins().stack_addr(env.pointer_type(), slot, 0);
- let flags = MemFlagsData::trusted();
+ // The `*_last_ancestor_cc` control contexts live on continuation
+ // stacks, but the temporary lives in a current-frame stack slot, so
+ // only the former get the continuation-stack-memory region.
+ let region = env
+ .alias_regions
+ .continuation_stack_memory_region(builder.func);
+ let cc_flags = MemFlagsData::trusted().with_alias_region(Some(region));
+ let tmp_flags = MemFlagsData::trusted();
let mut offset: i32 = 0;
while offset < i32::from(cctx_size) {
// switchee_last_ancestor_cc -> tmp control context
- let tmp1 =
- builder
- .ins()
- .load(env.pointer_type(), flags, switchee_last_ancestor_cc, offset);
+ let tmp1 = builder.ins().load(
+ env.pointer_type(),
+ cc_flags,
+ switchee_last_ancestor_cc,
+ offset,
+ );
builder
.ins()
- .store(flags, tmp1, tmp_control_context, offset);
+ .store(tmp_flags, tmp1, tmp_control_context, offset);
// switcher_last_ancestor_cc -> switchee_last_ancestor_cc
- let tmp2 =
- builder
- .ins()
- .load(env.pointer_type(), flags, switcher_last_ancestor_cc, offset);
+ let tmp2 = builder.ins().load(
+ env.pointer_type(),
+ cc_flags,
+ switcher_last_ancestor_cc,
+ offset,
+ );
builder
.ins()
- .store(flags, tmp2, switchee_last_ancestor_cc, offset);
+ .store(cc_flags, tmp2, switchee_last_ancestor_cc, offset);
offset += i32::try_from(env.pointer_type().bytes()).unwrap();
}
diff --git a/tests/disas/alias-region-globals.wat b/tests/disas/alias-region-globals.wat
index 6991348a88..c334cb8110 100644
--- a/tests/disas/alias-region-globals.wat
+++ b/tests/disas/alias-region-globals.wat
@@ -16,10 +16,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 1610612736 "PublicGlobal"
-;; region4 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 805306368 "PublicGlobal"
+;; region4 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/alias-region-memories.wat b/tests/disas/alias-region-memories.wat
index dacabc3658..f5cb223b99 100644
--- a/tests/disas/alias-region-memories.wat
+++ b/tests/disas/alias-region-memories.wat
@@ -16,12 +16,12 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 2415919104 "VMMemoryDefinition+0x0"
-;; region4 = 2415919112 "VMMemoryDefinition+0x8"
-;; region5 = 536870912 "PublicMemory"
-;; region6 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region3 = 1207959552 "VMMemoryDefinition+0x0"
+;; region4 = 1207959560 "VMMemoryDefinition+0x8"
+;; region5 = 268435456 "PublicMemory"
+;; region6 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/alias-region-tables.wat b/tests/disas/alias-region-tables.wat
index 89bdef84eb..fa5cb234ea 100644
--- a/tests/disas/alias-region-tables.wat
+++ b/tests/disas/alias-region-tables.wat
@@ -17,12 +17,12 @@
)
;; function u0:0(i64 vmctx, i64, i32, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 2684354560 "VMTableDefinition+0x0"
-;; region4 = 2684354568 "VMTableDefinition+0x8"
-;; region5 = 1073741824 "PublicTable"
-;; region6 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region3 = 1342177280 "VMTableDefinition+0x0"
+;; region4 = 1342177288 "VMTableDefinition+0x8"
+;; region5 = 536870912 "PublicTable"
+;; region6 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region7 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/arith.wat b/tests/disas/arith.wat
index dce925c702..7d010e317e 100644
--- a/tests/disas/arith.wat
+++ b/tests/disas/arith.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-copy-anyref.wat b/tests/disas/array-copy-anyref.wat
index a9088db487..927e79e18d 100644
--- a/tests/disas/array-copy-anyref.wat
+++ b/tests/disas/array-copy-anyref.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-copy-i64.wat b/tests/disas/array-copy-i64.wat
index ccb7083b75..c2fbc869d4 100644
--- a/tests/disas/array-copy-i64.wat
+++ b/tests/disas/array-copy-i64.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-copy-i8.wat b/tests/disas/array-copy-i8.wat
index 70edd5e222..b9d30124e6 100644
--- a/tests/disas/array-copy-i8.wat
+++ b/tests/disas/array-copy-i8.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-copy-inline.wat b/tests/disas/array-copy-inline.wat
index 58425cb58f..25ee8e00f9 100644
--- a/tests/disas/array-copy-inline.wat
+++ b/tests/disas/array-copy-inline.wat
@@ -17,10 +17,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-anyref.wat b/tests/disas/array-fill-anyref.wat
index 18cd364a2c..7d71212729 100644
--- a/tests/disas/array-fill-anyref.wat
+++ b/tests/disas/array-fill-anyref.wat
@@ -19,10 +19,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,10 +76,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -135,10 +135,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-externref.wat b/tests/disas/array-fill-externref.wat
index 056dde6715..a0810569a3 100644
--- a/tests/disas/array-fill-externref.wat
+++ b/tests/disas/array-fill-externref.wat
@@ -15,10 +15,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,10 +72,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-f32.wat b/tests/disas/array-fill-f32.wat
index 1be030dd7b..27793b0ab4 100644
--- a/tests/disas/array-fill-f32.wat
+++ b/tests/disas/array-fill-f32.wat
@@ -19,10 +19,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, f32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,10 +76,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -123,10 +123,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-f64.wat b/tests/disas/array-fill-f64.wat
index 8bc90b513c..166bf875c0 100644
--- a/tests/disas/array-fill-f64.wat
+++ b/tests/disas/array-fill-f64.wat
@@ -19,10 +19,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, f64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,10 +76,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -123,10 +123,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-funcref.wat b/tests/disas/array-fill-funcref.wat
index 834619a004..6e286a3bf7 100644
--- a/tests/disas/array-fill-funcref.wat
+++ b/tests/disas/array-fill-funcref.wat
@@ -22,10 +22,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -83,10 +83,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -145,10 +145,10 @@
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -213,7 +213,7 @@
;;
;; function u0:3(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-i16.wat b/tests/disas/array-fill-i16.wat
index c01710fdeb..14657bf06c 100644
--- a/tests/disas/array-fill-i16.wat
+++ b/tests/disas/array-fill-i16.wat
@@ -23,10 +23,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -80,10 +80,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -127,10 +127,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -174,10 +174,10 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-i31ref.wat b/tests/disas/array-fill-i31ref.wat
index 45531ab7dc..23fb3fe293 100644
--- a/tests/disas/array-fill-i31ref.wat
+++ b/tests/disas/array-fill-i31ref.wat
@@ -19,10 +19,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,10 +76,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -135,10 +135,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-i32.wat b/tests/disas/array-fill-i32.wat
index 88f21471e9..655a735dd3 100644
--- a/tests/disas/array-fill-i32.wat
+++ b/tests/disas/array-fill-i32.wat
@@ -23,10 +23,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -80,10 +80,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -127,10 +127,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -174,10 +174,10 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/array-fill-i64.wat b/tests/disas/array-fill-i64.wat
index 82bee75fc1..9ec4ac85c7 100644
--- a/tests/disas/array-fill-i64.wat
+++ b/tests/disas/array-fill-i64.wat
@@ -23,10 +23,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -80,10 +80,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -127,10 +127,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -174,10 +174,10 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/basic-wat-test.wat b/tests/disas/basic-wat-test.wat
index ddf00c5a56..59b306ab43 100644
--- a/tests/disas/basic-wat-test.wat
+++ b/tests/disas/basic-wat-test.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/block-params-br_if-single-pred.wat b/tests/disas/block-params-br_if-single-pred.wat
index 27175747ed..3fd3719e77 100644
--- a/tests/disas/block-params-br_if-single-pred.wat
+++ b/tests/disas/block-params-br_if-single-pred.wat
@@ -22,7 +22,7 @@
)
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 56 "VMContext+0x38"
;; region4 = 104 "VMContext+0x68"
diff --git a/tests/disas/block-params-if-else-same-values.wat b/tests/disas/block-params-if-else-same-values.wat
index 39089eebfa..21d7a85e80 100644
--- a/tests/disas/block-params-if-else-same-values.wat
+++ b/tests/disas/block-params-if-else-same-values.wat
@@ -22,7 +22,7 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 56 "VMContext+0x38"
;; region4 = 104 "VMContext+0x68"
diff --git a/tests/disas/block-params-loop-single-iteration.wat b/tests/disas/block-params-loop-single-iteration.wat
index 5ad02e6391..90191da232 100644
--- a/tests/disas/block-params-loop-single-iteration.wat
+++ b/tests/disas/block-params-loop-single-iteration.wat
@@ -15,7 +15,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/bounds-check.wat b/tests/disas/bounds-check.wat
index 7402e81116..e581cc16b3 100644
--- a/tests/disas/bounds-check.wat
+++ b/tests/disas/bounds-check.wat
@@ -26,10 +26,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/br_table.wat b/tests/disas/br_table.wat
index 99ac505a16..339ac929ce 100644
--- a/tests/disas/br_table.wat
+++ b/tests/disas/br_table.wat
@@ -33,7 +33,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,7 +71,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -109,7 +109,7 @@
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -135,7 +135,7 @@
;;
;; function u0:3(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/branch-hinting-disabled.wat b/tests/disas/branch-hinting-disabled.wat
index 59c89ca47b..e8394dc629 100644
--- a/tests/disas/branch-hinting-disabled.wat
+++ b/tests/disas/branch-hinting-disabled.wat
@@ -29,7 +29,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -55,7 +55,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/branch-hinting.wat b/tests/disas/branch-hinting.wat
index 6433224464..d43b257937 100644
--- a/tests/disas/branch-hinting.wat
+++ b/tests/disas/branch-hinting.wat
@@ -74,7 +74,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -97,7 +97,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -120,7 +120,7 @@
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -146,7 +146,7 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -172,8 +172,8 @@
;;
;; function u0:4(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/byteswap.wat b/tests/disas/byteswap.wat
index 7d7e87dae4..5b8799470e 100644
--- a/tests/disas/byteswap.wat
+++ b/tests/disas/byteswap.wat
@@ -73,7 +73,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -89,7 +89,7 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/call-indirect-with-gc.wat b/tests/disas/call-indirect-with-gc.wat
index e0a6408c1a..606ed67a2b 100644
--- a/tests/disas/call-indirect-with-gc.wat
+++ b/tests/disas/call-indirect-with-gc.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 536870912 "PublicTable"
;; region5 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/call-indirect-without-gc.wat b/tests/disas/call-indirect-without-gc.wat
index 8d091c1760..ce95538041 100644
--- a/tests/disas/call-indirect-without-gc.wat
+++ b/tests/disas/call-indirect-without-gc.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 536870912 "PublicTable"
;; region5 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/call-indirect.wat b/tests/disas/call-indirect.wat
index e6fb44cf95..fdd503eae9 100644
--- a/tests/disas/call-indirect.wat
+++ b/tests/disas/call-indirect.wat
@@ -9,10 +9,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 536870912 "PublicTable"
;; region5 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/call-simd.wat b/tests/disas/call-simd.wat
index f54335da37..78a7c0ded1 100644
--- a/tests/disas/call-simd.wat
+++ b/tests/disas/call-simd.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -38,7 +38,7 @@
;;
;; function u0:1(i64 vmctx, i64, i8x16, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/call.wat b/tests/disas/call.wat
index 6d86665ce8..185a4e9565 100644
--- a/tests/disas/call.wat
+++ b/tests/disas/call.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -33,7 +33,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat b/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
index 6d69cb93e0..f3cd853fc0 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
@@ -49,9 +49,9 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
-;; region3 = 268435560 "VMStoreContext+0x68"
+;; region3 = 134217832 "VMStoreContext+0x68"
;; region4 = 104 "VMContext+0x68"
;; region5 = 136 "VMContext+0x88"
;; gv0 = vmctx
diff --git a/tests/disas/component-model/checked-intrinsics-inlined.wat b/tests/disas/component-model/checked-intrinsics-inlined.wat
index a4a9bad83f..05b35cab44 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined.wat
@@ -50,9 +50,9 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
-;; region3 = 268435560 "VMStoreContext+0x68"
+;; region3 = 134217832 "VMStoreContext+0x68"
;; region4 = 104 "VMContext+0x68"
;; region5 = 136 "VMContext+0x88"
;; gv0 = vmctx
diff --git a/tests/disas/component-model/direct-adapter-calls-inlining.wat b/tests/disas/component-model/direct-adapter-calls-inlining.wat
index 9d10e2490b..9306b007d2 100644
--- a/tests/disas/component-model/direct-adapter-calls-inlining.wat
+++ b/tests/disas/component-model/direct-adapter-calls-inlining.wat
@@ -56,10 +56,10 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 136 "VMContext+0x88"
-;; region4 = 1610612736 "PublicGlobal"
+;; region4 = 805306368 "PublicGlobal"
;; region5 = 112 "VMContext+0x70"
;; region6 = 104 "VMContext+0x68"
;; region7 = 88 "VMContext+0x58"
diff --git a/tests/disas/component-model/direct-adapter-calls.wat b/tests/disas/component-model/direct-adapter-calls.wat
index ae4b07d4d9..ffea3edf70 100644
--- a/tests/disas/component-model/direct-adapter-calls.wat
+++ b/tests/disas/component-model/direct-adapter-calls.wat
@@ -59,7 +59,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,7 +76,7 @@
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -97,9 +97,9 @@
;;
;; function u2:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 136 "VMContext+0x88"
-;; region3 = 1610612736 "PublicGlobal"
+;; region3 = 805306368 "PublicGlobal"
;; region4 = 104 "VMContext+0x68"
;; region5 = 88 "VMContext+0x58"
;; region6 = 112 "VMContext+0x70"
diff --git a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
index 9cd5515d7d..161c19ab93 100644
--- a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
@@ -60,7 +60,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 56 "VMContext+0x38"
;; gv0 = vmctx
diff --git a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
index 19d21d1317..cc112e329f 100644
--- a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
+++ b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
@@ -44,9 +44,9 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
-;; region3 = 268435560 "VMStoreContext+0x68"
+;; region3 = 134217832 "VMStoreContext+0x68"
;; region4 = 104 "VMContext+0x68"
;; region5 = 136 "VMContext+0x88"
;; gv0 = vmctx
diff --git a/tests/disas/component-model/inlining-bug.wat b/tests/disas/component-model/inlining-bug.wat
index 6a9cf5df1d..a55b2cb40e 100644
--- a/tests/disas/component-model/inlining-bug.wat
+++ b/tests/disas/component-model/inlining-bug.wat
@@ -36,7 +36,7 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 104 "VMContext+0x68"
;; gv0 = vmctx
diff --git a/tests/disas/component-model/inlining-fuzz-bug.wat b/tests/disas/component-model/inlining-fuzz-bug.wat
index 88b8265d95..c573ba93ce 100644
--- a/tests/disas/component-model/inlining-fuzz-bug.wat
+++ b/tests/disas/component-model/inlining-fuzz-bug.wat
@@ -39,7 +39,7 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 104 "VMContext+0x68"
;; gv0 = vmctx
diff --git a/tests/disas/component-model/issue-11458.wat b/tests/disas/component-model/issue-11458.wat
index bb5e0505c7..04cb1bffc0 100644
--- a/tests/disas/component-model/issue-11458.wat
+++ b/tests/disas/component-model/issue-11458.wat
@@ -21,7 +21,7 @@
;; function u1:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
index 5a3979ceed..97bc6ebad0 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
@@ -66,7 +66,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 56 "VMContext+0x38"
;; gv0 = vmctx
diff --git a/tests/disas/component-model/sync-adapter-calls.wat b/tests/disas/component-model/sync-adapter-calls.wat
index f2a1058e82..272853d413 100644
--- a/tests/disas/component-model/sync-adapter-calls.wat
+++ b/tests/disas/component-model/sync-adapter-calls.wat
@@ -52,7 +52,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,21 +70,21 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; ss0 = explicit_slot 32, align = 8
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
;; region3 = 200 "VMContext+0xc8"
-;; region4 = 1610612736 "PublicGlobal"
+;; region4 = 805306368 "PublicGlobal"
;; region5 = 224 "VMContext+0xe0"
;; region6 = 136 "VMContext+0x88"
-;; region7 = 268435592 "VMStoreContext+0x88"
-;; region8 = 4026531840 "VMDeferredThread+0x0"
-;; region9 = 4026531848 "VMDeferredThread+0x8"
-;; region10 = 4026531852 "VMDeferredThread+0xc"
-;; region11 = 4026531856 "VMDeferredThread+0x10"
-;; region12 = 268435584 "VMStoreContext+0x80"
-;; region13 = 4026531860 "VMDeferredThread+0x14"
-;; region14 = 268435588 "VMStoreContext+0x84"
-;; region15 = 4026531864 "VMDeferredThread+0x18"
+;; region7 = 134217864 "VMStoreContext+0x88"
+;; region8 = 2013265920 "VMDeferredThread+0x0"
+;; region9 = 2013265928 "VMDeferredThread+0x8"
+;; region10 = 2013265932 "VMDeferredThread+0xc"
+;; region11 = 2013265936 "VMDeferredThread+0x10"
+;; region12 = 134217856 "VMStoreContext+0x80"
+;; region13 = 2013265940 "VMDeferredThread+0x14"
+;; region14 = 134217860 "VMStoreContext+0x84"
+;; region15 = 2013265944 "VMDeferredThread+0x18"
;; region16 = 176 "VMContext+0xb0"
;; region17 = 168 "VMContext+0xa8"
;; region18 = 152 "VMContext+0x98"
@@ -208,22 +208,22 @@
;; function u2:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 32, align = 8
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 200 "VMContext+0xc8"
-;; region3 = 1610612736 "PublicGlobal"
+;; region3 = 805306368 "PublicGlobal"
;; region4 = 104 "VMContext+0x68"
;; region5 = 88 "VMContext+0x58"
;; region6 = 224 "VMContext+0xe0"
;; region7 = 136 "VMContext+0x88"
-;; region8 = 268435592 "VMStoreContext+0x88"
-;; region9 = 4026531840 "VMDeferredThread+0x0"
-;; region10 = 4026531848 "VMDeferredThread+0x8"
-;; region11 = 4026531852 "VMDeferredThread+0xc"
-;; region12 = 4026531856 "VMDeferredThread+0x10"
-;; region13 = 268435584 "VMStoreContext+0x80"
-;; region14 = 4026531860 "VMDeferredThread+0x14"
-;; region15 = 268435588 "VMStoreContext+0x84"
-;; region16 = 4026531864 "VMDeferredThread+0x18"
+;; region8 = 134217864 "VMStoreContext+0x88"
+;; region9 = 2013265920 "VMDeferredThread+0x0"
+;; region10 = 2013265928 "VMDeferredThread+0x8"
+;; region11 = 2013265932 "VMDeferredThread+0xc"
+;; region12 = 2013265936 "VMDeferredThread+0x10"
+;; region13 = 134217856 "VMStoreContext+0x80"
+;; region14 = 2013265940 "VMDeferredThread+0x14"
+;; region15 = 134217860 "VMStoreContext+0x84"
+;; region16 = 2013265944 "VMDeferredThread+0x18"
;; region17 = 176 "VMContext+0xb0"
;; region18 = 72 "VMContext+0x48"
;; region19 = 168 "VMContext+0xa8"
diff --git a/tests/disas/component-model/unsafe-intrinsics-used.wat b/tests/disas/component-model/unsafe-intrinsics-used.wat
index fdc5a2808a..5d17a54bbb 100644
--- a/tests/disas/component-model/unsafe-intrinsics-used.wat
+++ b/tests/disas/component-model/unsafe-intrinsics-used.wat
@@ -36,7 +36,7 @@
;; function u0:0(i64 vmctx, i64) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435560 "VMStoreContext+0x68"
+;; region1 = 134217832 "VMStoreContext+0x68"
;;
;; block0(v0: i64, v1: i64):
;; v2 = load.i64 notrap aligned readonly can_move region0 v1+8
diff --git a/tests/disas/conditional-traps.wat b/tests/disas/conditional-traps.wat
index 6927686c71..a362515dec 100644
--- a/tests/disas/conditional-traps.wat
+++ b/tests/disas/conditional-traps.wat
@@ -23,7 +23,7 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -42,7 +42,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/dead-code.wat b/tests/disas/dead-code.wat
index f351c1708c..48ecf8e6de 100644
--- a/tests/disas/dead-code.wat
+++ b/tests/disas/dead-code.wat
@@ -23,7 +23,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,7 +50,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -65,7 +65,7 @@
;;
;; function u0:2(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -80,7 +80,7 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/duplicate-function-types.wat b/tests/disas/duplicate-function-types.wat
index ca96cd521d..de3c2c17f5 100644
--- a/tests/disas/duplicate-function-types.wat
+++ b/tests/disas/duplicate-function-types.wat
@@ -18,11 +18,11 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 2684354560 "VMTableDefinition+0x0"
-;; region4 = 2684354568 "VMTableDefinition+0x8"
-;; region5 = 1073741824 "PublicTable"
+;; region3 = 1342177280 "VMTableDefinition+0x0"
+;; region4 = 1342177288 "VMTableDefinition+0x8"
+;; region5 = 536870912 "PublicTable"
;; region6 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/duplicate-loads-dynamic-memory.wat b/tests/disas/duplicate-loads-dynamic-memory.wat
index 9044e1b73b..ab104e22e6 100644
--- a/tests/disas/duplicate-loads-dynamic-memory.wat
+++ b/tests/disas/duplicate-loads-dynamic-memory.wat
@@ -24,10 +24,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,10 +50,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/duplicate-loads-static-memory.wat b/tests/disas/duplicate-loads-static-memory.wat
index 685ffea824..2ae5554a2c 100644
--- a/tests/disas/duplicate-loads-static-memory.wat
+++ b/tests/disas/duplicate-loads-static-memory.wat
@@ -19,10 +19,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,10 +41,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 d5584ed510..94d5aae565 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
@@ -37,10 +37,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,10 +72,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 70cca70f84..8db401baef 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
@@ -33,10 +33,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,10 +70,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/epoch-interruption.wat b/tests/disas/epoch-interruption.wat
index 654a2a7a09..9adf9ca5cb 100644
--- a/tests/disas/epoch-interruption.wat
+++ b/tests/disas/epoch-interruption.wat
@@ -6,9 +6,9 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 24 "VMContext+0x18"
-;; region3 = 268435464 "VMStoreContext+0x8"
+;; region3 = 134217736 "VMStoreContext+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/f32-load.wat b/tests/disas/f32-load.wat
index a909b3ba15..f9ddcc08ee 100644
--- a/tests/disas/f32-load.wat
+++ b/tests/disas/f32-load.wat
@@ -8,10 +8,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/f32-store.wat b/tests/disas/f32-store.wat
index 769e10a98e..6228bce89e 100644
--- a/tests/disas/f32-store.wat
+++ b/tests/disas/f32-store.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/f64-load.wat b/tests/disas/f64-load.wat
index 3fe2092cd8..2a9ee082ef 100644
--- a/tests/disas/f64-load.wat
+++ b/tests/disas/f64-load.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> f64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/f64-store.wat b/tests/disas/f64-store.wat
index d65cc9fd38..7027a9b7a0 100644
--- a/tests/disas/f64-store.wat
+++ b/tests/disas/f64-store.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, f64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/fac-multi-value.wat b/tests/disas/fac-multi-value.wat
index 3b3de8eec5..f9ae2b8b16 100644
--- a/tests/disas/fac-multi-value.wat
+++ b/tests/disas/fac-multi-value.wat
@@ -22,7 +22,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -37,7 +37,7 @@
;;
;; function u0:1(i64 vmctx, i64, i64, i64) -> i64, i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -52,7 +52,7 @@
;;
;; function u0:2(i64 vmctx, i64, i64) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/fibonacci.wat b/tests/disas/fibonacci.wat
index 4f15880b7d..9e36eb4c4a 100644
--- a/tests/disas/fibonacci.wat
+++ b/tests/disas/fibonacci.wat
@@ -25,10 +25,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/fixed-size-memory.wat b/tests/disas/fixed-size-memory.wat
index f586433815..efc69e5cc9 100644
--- a/tests/disas/fixed-size-memory.wat
+++ b/tests/disas/fixed-size-memory.wat
@@ -22,10 +22,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/foo.wat b/tests/disas/foo.wat
index 9c5a2753c5..b089dc334c 100644
--- a/tests/disas/foo.wat
+++ b/tests/disas/foo.wat
@@ -16,14 +16,14 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; region5 = 72 "VMContext+0x48"
-;; region6 = 2684354560 "VMTableDefinition+0x0"
-;; region7 = 2684354568 "VMTableDefinition+0x8"
-;; region8 = 1073741824 "PublicTable"
+;; region6 = 1342177280 "VMTableDefinition+0x0"
+;; region7 = 1342177288 "VMTableDefinition+0x8"
+;; region8 = 536870912 "PublicTable"
;; region9 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/array-copy-with-fuel.wat b/tests/disas/gc/array-copy-with-fuel.wat
index af85dbb782..245689f03e 100644
--- a/tests/disas/gc/array-copy-with-fuel.wat
+++ b/tests/disas/gc/array-copy-with-fuel.wat
@@ -13,11 +13,11 @@
;; ss0 = explicit_slot 4, align = 4
;; ss1 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435456 "VMStoreContext+0x0"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217728 "VMStoreContext+0x0"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-fill-i8.wat b/tests/disas/gc/array-fill-i8.wat
index f6951bfcb6..6f1f97409f 100644
--- a/tests/disas/gc/array-fill-i8.wat
+++ b/tests/disas/gc/array-fill-i8.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-init-data.wat b/tests/disas/gc/array-init-data.wat
index cc1f0f5d97..816fdd3cd2 100644
--- a/tests/disas/gc/array-init-data.wat
+++ b/tests/disas/gc/array-init-data.wat
@@ -15,10 +15,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; region5 = 56 "VMContext+0x38"
;; region6 = 48 "VMContext+0x30"
;; gv0 = vmctx
diff --git a/tests/disas/gc/array-new-data.wat b/tests/disas/gc/array-new-data.wat
index 6b8cc218ed..0a0088eacf 100644
--- a/tests/disas/gc/array-new-data.wat
+++ b/tests/disas/gc/array-new-data.wat
@@ -78,16 +78,16 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 56 "VMContext+0x38"
;; region3 = 48 "VMContext+0x30"
;; region4 = 32 "VMContext+0x20"
-;; region5 = 3489660928 "VMCopyingHeapData+0x0"
-;; region6 = 3489660932 "VMCopyingHeapData+0x4"
+;; region5 = 1744830464 "VMCopyingHeapData+0x0"
+;; region6 = 1744830468 "VMCopyingHeapData+0x4"
;; region7 = 40 "VMContext+0x28"
-;; region8 = 268435488 "VMStoreContext+0x20"
-;; region9 = 2147483648 "GcHeap"
-;; region10 = 268435496 "VMStoreContext+0x28"
+;; region8 = 134217760 "VMStoreContext+0x20"
+;; region9 = 1073741824 "GcHeap"
+;; region10 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-anyref.wat b/tests/disas/gc/array-new-default-anyref.wat
index 360327b7bf..f0d2488bc2 100644
--- a/tests/disas/gc/array-new-default-anyref.wat
+++ b/tests/disas/gc/array-new-default-anyref.wat
@@ -11,14 +11,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-exnref.wat b/tests/disas/gc/array-new-default-exnref.wat
index 86751a5915..5b8e5d0159 100644
--- a/tests/disas/gc/array-new-default-exnref.wat
+++ b/tests/disas/gc/array-new-default-exnref.wat
@@ -11,14 +11,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-externref.wat b/tests/disas/gc/array-new-default-externref.wat
index 6ddbe1a6c9..7b968127a2 100644
--- a/tests/disas/gc/array-new-default-externref.wat
+++ b/tests/disas/gc/array-new-default-externref.wat
@@ -11,14 +11,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-f32.wat b/tests/disas/gc/array-new-default-f32.wat
index 0235bb86a3..e8f44f62f7 100644
--- a/tests/disas/gc/array-new-default-f32.wat
+++ b/tests/disas/gc/array-new-default-f32.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-f64.wat b/tests/disas/gc/array-new-default-f64.wat
index 1409d1e882..d0f0c595b0 100644
--- a/tests/disas/gc/array-new-default-f64.wat
+++ b/tests/disas/gc/array-new-default-f64.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-funcref.wat b/tests/disas/gc/array-new-default-funcref.wat
index a1d5714062..f395a8877a 100644
--- a/tests/disas/gc/array-new-default-funcref.wat
+++ b/tests/disas/gc/array-new-default-funcref.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-i16.wat b/tests/disas/gc/array-new-default-i16.wat
index 15dadf17ae..c74f3359f3 100644
--- a/tests/disas/gc/array-new-default-i16.wat
+++ b/tests/disas/gc/array-new-default-i16.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-i32.wat b/tests/disas/gc/array-new-default-i32.wat
index 192c2e1c59..c9516ce94b 100644
--- a/tests/disas/gc/array-new-default-i32.wat
+++ b/tests/disas/gc/array-new-default-i32.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-i64.wat b/tests/disas/gc/array-new-default-i64.wat
index 01b5c69ee8..fdf1bf747b 100644
--- a/tests/disas/gc/array-new-default-i64.wat
+++ b/tests/disas/gc/array-new-default-i64.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/array-new-default-i8.wat b/tests/disas/gc/array-new-default-i8.wat
index 630fe4e75c..bf17d2af28 100644
--- a/tests/disas/gc/array-new-default-i8.wat
+++ b/tests/disas/gc/array-new-default-i8.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/call-indirect-final-type.wat b/tests/disas/gc/call-indirect-final-type.wat
index 77b4b79f20..63daa50f7e 100644
--- a/tests/disas/gc/call-indirect-final-type.wat
+++ b/tests/disas/gc/call-indirect-final-type.wat
@@ -17,10 +17,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region5 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -68,10 +68,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region5 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/copying/array-fill.wat b/tests/disas/gc/copying/array-fill.wat
index 1074b3220a..ee29bbb352 100644
--- a/tests/disas/gc/copying/array-fill.wat
+++ b/tests/disas/gc/copying/array-fill.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-get-s.wat b/tests/disas/gc/copying/array-get-s.wat
index 36566081ef..387f9e4715 100644
--- a/tests/disas/gc/copying/array-get-s.wat
+++ b/tests/disas/gc/copying/array-get-s.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-get-u.wat b/tests/disas/gc/copying/array-get-u.wat
index c03bfaa2f1..11932c4f4c 100644
--- a/tests/disas/gc/copying/array-get-u.wat
+++ b/tests/disas/gc/copying/array-get-u.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-get.wat b/tests/disas/gc/copying/array-get.wat
index e2a0421900..731c1b3cb0 100644
--- a/tests/disas/gc/copying/array-get.wat
+++ b/tests/disas/gc/copying/array-get.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-len.wat b/tests/disas/gc/copying/array-len.wat
index 6ae63964e4..b3a4050842 100644
--- a/tests/disas/gc/copying/array-len.wat
+++ b/tests/disas/gc/copying/array-len.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
index 0d1c4c87fc..7e7f522af8 100644
--- a/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
@@ -13,14 +13,14 @@
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-new-fixed.wat b/tests/disas/gc/copying/array-new-fixed.wat
index fd13a9cb7d..3124d800cb 100644
--- a/tests/disas/gc/copying/array-new-fixed.wat
+++ b/tests/disas/gc/copying/array-new-fixed.wat
@@ -10,14 +10,14 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-new.wat b/tests/disas/gc/copying/array-new.wat
index f38bf4371d..0e1c2ee82b 100644
--- a/tests/disas/gc/copying/array-new.wat
+++ b/tests/disas/gc/copying/array-new.wat
@@ -10,14 +10,14 @@
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
-;; region8 = 268435496 "VMStoreContext+0x28"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
+;; region8 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/array-set.wat b/tests/disas/gc/copying/array-set.wat
index 4bc4be910f..7d7d800d94 100644
--- a/tests/disas/gc/copying/array-set.wat
+++ b/tests/disas/gc/copying/array-set.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/br-on-cast-fail.wat b/tests/disas/gc/copying/br-on-cast-fail.wat
index 630d4e76c0..a2b081955f 100644
--- a/tests/disas/gc/copying/br-on-cast-fail.wat
+++ b/tests/disas/gc/copying/br-on-cast-fail.wat
@@ -17,11 +17,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; region6 = 72 "VMContext+0x48"
;; region7 = 56 "VMContext+0x38"
;; region8 = 104 "VMContext+0x68"
diff --git a/tests/disas/gc/copying/br-on-cast.wat b/tests/disas/gc/copying/br-on-cast.wat
index 1248a092a5..4336e19d34 100644
--- a/tests/disas/gc/copying/br-on-cast.wat
+++ b/tests/disas/gc/copying/br-on-cast.wat
@@ -17,11 +17,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; region6 = 72 "VMContext+0x48"
;; region7 = 56 "VMContext+0x38"
;; region8 = 104 "VMContext+0x68"
diff --git a/tests/disas/gc/copying/call-indirect-and-subtyping.wat b/tests/disas/gc/copying/call-indirect-and-subtyping.wat
index 366eb33b3d..c7280fec57 100644
--- a/tests/disas/gc/copying/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/copying/call-indirect-and-subtyping.wat
@@ -17,9 +17,9 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/copying/externref-globals.wat b/tests/disas/gc/copying/externref-globals.wat
index 9f6fe427cd..dcb450edd7 100644
--- a/tests/disas/gc/copying/externref-globals.wat
+++ b/tests/disas/gc/copying/externref-globals.wat
@@ -12,8 +12,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -31,8 +31,8 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/funcref-in-gc-heap-get.wat b/tests/disas/gc/copying/funcref-in-gc-heap-get.wat
index f0643434aa..edaa15fcee 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-get.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
index bbffd2106a..2058afd32e 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
@@ -11,13 +11,13 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/funcref-in-gc-heap-set.wat b/tests/disas/gc/copying/funcref-in-gc-heap-set.wat
index 66541a4025..4a33ea169c 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-set.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/i31ref-globals.wat b/tests/disas/gc/copying/i31ref-globals.wat
index b951f3454f..9ebdfbfb37 100644
--- a/tests/disas/gc/copying/i31ref-globals.wat
+++ b/tests/disas/gc/copying/i31ref-globals.wat
@@ -12,8 +12,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -31,8 +31,8 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/multiple-array-get.wat b/tests/disas/gc/copying/multiple-array-get.wat
index 2ff375bc1e..cd661ef8b9 100644
--- a/tests/disas/gc/copying/multiple-array-get.wat
+++ b/tests/disas/gc/copying/multiple-array-get.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/multiple-struct-get.wat b/tests/disas/gc/copying/multiple-struct-get.wat
index b907cd60f4..85f54c62cf 100644
--- a/tests/disas/gc/copying/multiple-struct-get.wat
+++ b/tests/disas/gc/copying/multiple-struct-get.wat
@@ -12,10 +12,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-cast.wat b/tests/disas/gc/copying/ref-cast.wat
index b4caf74ac5..15f946cd3a 100644
--- a/tests/disas/gc/copying/ref-cast.wat
+++ b/tests/disas/gc/copying/ref-cast.wat
@@ -9,11 +9,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-is-null.wat b/tests/disas/gc/copying/ref-is-null.wat
index 613b41ab0b..570790772a 100644
--- a/tests/disas/gc/copying/ref-is-null.wat
+++ b/tests/disas/gc/copying/ref-is-null.wat
@@ -11,7 +11,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,7 +29,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-any.wat b/tests/disas/gc/copying/ref-test-any.wat
index d1523a359d..e276efcb5f 100644
--- a/tests/disas/gc/copying/ref-test-any.wat
+++ b/tests/disas/gc/copying/ref-test-any.wat
@@ -11,7 +11,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,7 +29,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-array.wat b/tests/disas/gc/copying/ref-test-array.wat
index 0faef58a75..7cbea15378 100644
--- a/tests/disas/gc/copying/ref-test-array.wat
+++ b/tests/disas/gc/copying/ref-test-array.wat
@@ -8,10 +8,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-concrete-func-type.wat b/tests/disas/gc/copying/ref-test-concrete-func-type.wat
index 08138e4275..2ccc798d53 100644
--- a/tests/disas/gc/copying/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-func-type.wat
@@ -9,9 +9,9 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 2147483648 "GcHeap"
+;; region3 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-concrete-type.wat b/tests/disas/gc/copying/ref-test-concrete-type.wat
index 01d40a1806..c2372d133a 100644
--- a/tests/disas/gc/copying/ref-test-concrete-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-type.wat
@@ -9,11 +9,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-eq.wat b/tests/disas/gc/copying/ref-test-eq.wat
index 4d87517ac5..edd3cffa59 100644
--- a/tests/disas/gc/copying/ref-test-eq.wat
+++ b/tests/disas/gc/copying/ref-test-eq.wat
@@ -8,10 +8,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-i31.wat b/tests/disas/gc/copying/ref-test-i31.wat
index fe1978754f..81632b1e42 100644
--- a/tests/disas/gc/copying/ref-test-i31.wat
+++ b/tests/disas/gc/copying/ref-test-i31.wat
@@ -8,7 +8,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-none.wat b/tests/disas/gc/copying/ref-test-none.wat
index a01b351929..2932b1f5af 100644
--- a/tests/disas/gc/copying/ref-test-none.wat
+++ b/tests/disas/gc/copying/ref-test-none.wat
@@ -11,7 +11,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -27,7 +27,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-struct.wat b/tests/disas/gc/copying/ref-test-struct.wat
index c974b5d221..cb6e36ca8e 100644
--- a/tests/disas/gc/copying/ref-test-struct.wat
+++ b/tests/disas/gc/copying/ref-test-struct.wat
@@ -8,10 +8,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/struct-get.wat b/tests/disas/gc/copying/struct-get.wat
index 8162fd4250..db19e83c04 100644
--- a/tests/disas/gc/copying/struct-get.wat
+++ b/tests/disas/gc/copying/struct-get.wat
@@ -24,10 +24,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,10 +50,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -77,10 +77,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -104,10 +104,10 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/struct-new-default.wat b/tests/disas/gc/copying/struct-new-default.wat
index a04e78d966..d2f5ec3cc9 100644
--- a/tests/disas/gc/copying/struct-new-default.wat
+++ b/tests/disas/gc/copying/struct-new-default.wat
@@ -12,13 +12,13 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/struct-new.wat b/tests/disas/gc/copying/struct-new.wat
index b120aab0fa..119e1c4717 100644
--- a/tests/disas/gc/copying/struct-new.wat
+++ b/tests/disas/gc/copying/struct-new.wat
@@ -13,13 +13,13 @@
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/struct-set.wat b/tests/disas/gc/copying/struct-set.wat
index 95dd9760b9..4681209baa 100644
--- a/tests/disas/gc/copying/struct-set.wat
+++ b/tests/disas/gc/copying/struct-set.wat
@@ -20,10 +20,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,10 +72,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/v128-fields.wat b/tests/disas/gc/copying/v128-fields.wat
index e43f9cc0b2..5ba836a571 100644
--- a/tests/disas/gc/copying/v128-fields.wat
+++ b/tests/disas/gc/copying/v128-fields.wat
@@ -12,10 +12,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-fill.wat b/tests/disas/gc/drc/array-fill.wat
index 4db7cf9f34..24351e5d0d 100644
--- a/tests/disas/gc/drc/array-fill.wat
+++ b/tests/disas/gc/drc/array-fill.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-get-s.wat b/tests/disas/gc/drc/array-get-s.wat
index 6b3b03e6d4..c248f03edb 100644
--- a/tests/disas/gc/drc/array-get-s.wat
+++ b/tests/disas/gc/drc/array-get-s.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-get-u.wat b/tests/disas/gc/drc/array-get-u.wat
index 2aaf832f34..2655a5ffe3 100644
--- a/tests/disas/gc/drc/array-get-u.wat
+++ b/tests/disas/gc/drc/array-get-u.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-get.wat b/tests/disas/gc/drc/array-get.wat
index 3e127bbf8f..74791ab408 100644
--- a/tests/disas/gc/drc/array-get.wat
+++ b/tests/disas/gc/drc/array-get.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-len.wat b/tests/disas/gc/drc/array-len.wat
index 60c59b095a..dc0db61450 100644
--- a/tests/disas/gc/drc/array-len.wat
+++ b/tests/disas/gc/drc/array-len.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
index cc2e2d7f85..8bf807747c 100644
--- a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
@@ -14,11 +14,11 @@
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 2147483648 "GcHeap"
-;; region5 = 268435496 "VMStoreContext+0x28"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 1073741824 "GcHeap"
+;; region5 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-new-fixed.wat b/tests/disas/gc/drc/array-new-fixed.wat
index d0a293e3e0..05a3bebec6 100644
--- a/tests/disas/gc/drc/array-new-fixed.wat
+++ b/tests/disas/gc/drc/array-new-fixed.wat
@@ -11,11 +11,11 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 2147483648 "GcHeap"
-;; region5 = 268435496 "VMStoreContext+0x28"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 1073741824 "GcHeap"
+;; region5 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-new.wat b/tests/disas/gc/drc/array-new.wat
index e734a1204d..739be6acf9 100644
--- a/tests/disas/gc/drc/array-new.wat
+++ b/tests/disas/gc/drc/array-new.wat
@@ -11,11 +11,11 @@
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 2147483648 "GcHeap"
-;; region5 = 268435496 "VMStoreContext+0x28"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 1073741824 "GcHeap"
+;; region5 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/array-set.wat b/tests/disas/gc/drc/array-set.wat
index 484edf9fbc..2cd3afa1eb 100644
--- a/tests/disas/gc/drc/array-set.wat
+++ b/tests/disas/gc/drc/array-set.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/br-on-cast-fail.wat b/tests/disas/gc/drc/br-on-cast-fail.wat
index e6763e9efc..0b1fd1a5df 100644
--- a/tests/disas/gc/drc/br-on-cast-fail.wat
+++ b/tests/disas/gc/drc/br-on-cast-fail.wat
@@ -18,11 +18,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; region6 = 72 "VMContext+0x48"
;; region7 = 56 "VMContext+0x38"
;; region8 = 104 "VMContext+0x68"
diff --git a/tests/disas/gc/drc/br-on-cast.wat b/tests/disas/gc/drc/br-on-cast.wat
index cd4ddcb5c4..037ce94c0c 100644
--- a/tests/disas/gc/drc/br-on-cast.wat
+++ b/tests/disas/gc/drc/br-on-cast.wat
@@ -18,11 +18,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; region6 = 72 "VMContext+0x48"
;; region7 = 56 "VMContext+0x38"
;; region8 = 104 "VMContext+0x68"
diff --git a/tests/disas/gc/drc/call-indirect-and-subtyping.wat b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
index 976cc66c8a..ce7d97c219 100644
--- a/tests/disas/gc/drc/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
@@ -18,9 +18,9 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/drc/externref-globals.wat b/tests/disas/gc/drc/externref-globals.wat
index 2b66e9f787..3617ade5e7 100644
--- a/tests/disas/gc/drc/externref-globals.wat
+++ b/tests/disas/gc/drc/externref-globals.wat
@@ -15,15 +15,15 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; region6 = 32 "VMContext+0x20"
-;; region7 = 3221225472 "VMDrcHeapData+0x0"
-;; region8 = 3221225476 "VMDrcHeapData+0x4"
-;; region9 = 3221225480 "VMDrcHeapData+0x8"
+;; region7 = 1610612736 "VMDrcHeapData+0x0"
+;; region8 = 1610612740 "VMDrcHeapData+0x4"
+;; region9 = 1610612744 "VMDrcHeapData+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -99,11 +99,11 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-get.wat b/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
index 7cf84a6c38..4f7f6d87b7 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
index a0fd7685f4..a7ec734b38 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
@@ -12,10 +12,10 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-set.wat b/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
index 97a5a6e3a1..697b62281a 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/i31ref-globals.wat b/tests/disas/gc/drc/i31ref-globals.wat
index 97d4e09930..a4b69bd0c0 100644
--- a/tests/disas/gc/drc/i31ref-globals.wat
+++ b/tests/disas/gc/drc/i31ref-globals.wat
@@ -14,8 +14,8 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -33,8 +33,8 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/multiple-array-get.wat b/tests/disas/gc/drc/multiple-array-get.wat
index 3c627e8d44..bac2a98f92 100644
--- a/tests/disas/gc/drc/multiple-array-get.wat
+++ b/tests/disas/gc/drc/multiple-array-get.wat
@@ -12,10 +12,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/multiple-struct-get.wat b/tests/disas/gc/drc/multiple-struct-get.wat
index c0e4433fd7..29f5fdf804 100644
--- a/tests/disas/gc/drc/multiple-struct-get.wat
+++ b/tests/disas/gc/drc/multiple-struct-get.wat
@@ -13,10 +13,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-cast.wat b/tests/disas/gc/drc/ref-cast.wat
index 798706685e..58cac4da81 100644
--- a/tests/disas/gc/drc/ref-cast.wat
+++ b/tests/disas/gc/drc/ref-cast.wat
@@ -10,11 +10,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-is-null.wat b/tests/disas/gc/drc/ref-is-null.wat
index aed940f089..3bd3efff90 100644
--- a/tests/disas/gc/drc/ref-is-null.wat
+++ b/tests/disas/gc/drc/ref-is-null.wat
@@ -12,7 +12,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -30,7 +30,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-any.wat b/tests/disas/gc/drc/ref-test-any.wat
index fd4a7c34d0..1bda6c3df7 100644
--- a/tests/disas/gc/drc/ref-test-any.wat
+++ b/tests/disas/gc/drc/ref-test-any.wat
@@ -12,7 +12,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -30,7 +30,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-array.wat b/tests/disas/gc/drc/ref-test-array.wat
index 6245804ebb..a0cd867ef8 100644
--- a/tests/disas/gc/drc/ref-test-array.wat
+++ b/tests/disas/gc/drc/ref-test-array.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 ed9319223d..2d6dda9002 100644
--- a/tests/disas/gc/drc/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-func-type.wat
@@ -10,9 +10,9 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 2147483648 "GcHeap"
+;; region3 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-concrete-type.wat b/tests/disas/gc/drc/ref-test-concrete-type.wat
index bd59272261..4c5873c417 100644
--- a/tests/disas/gc/drc/ref-test-concrete-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-type.wat
@@ -10,11 +10,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-eq.wat b/tests/disas/gc/drc/ref-test-eq.wat
index a1506a3725..a554c14ba7 100644
--- a/tests/disas/gc/drc/ref-test-eq.wat
+++ b/tests/disas/gc/drc/ref-test-eq.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-i31.wat b/tests/disas/gc/drc/ref-test-i31.wat
index 95a9855730..2a19633212 100644
--- a/tests/disas/gc/drc/ref-test-i31.wat
+++ b/tests/disas/gc/drc/ref-test-i31.wat
@@ -9,7 +9,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-none.wat b/tests/disas/gc/drc/ref-test-none.wat
index 87aff765d5..0650d12cc7 100644
--- a/tests/disas/gc/drc/ref-test-none.wat
+++ b/tests/disas/gc/drc/ref-test-none.wat
@@ -12,7 +12,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -28,7 +28,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-struct.wat b/tests/disas/gc/drc/ref-test-struct.wat
index fef6a2a8d6..656bc86e60 100644
--- a/tests/disas/gc/drc/ref-test-struct.wat
+++ b/tests/disas/gc/drc/ref-test-struct.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/struct-get.wat b/tests/disas/gc/drc/struct-get.wat
index 470d19c79d..a3d4b53082 100644
--- a/tests/disas/gc/drc/struct-get.wat
+++ b/tests/disas/gc/drc/struct-get.wat
@@ -25,10 +25,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -51,10 +51,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -78,10 +78,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -106,14 +106,14 @@
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; region5 = 32 "VMContext+0x20"
-;; region6 = 3221225472 "VMDrcHeapData+0x0"
-;; region7 = 3221225476 "VMDrcHeapData+0x4"
-;; region8 = 3221225480 "VMDrcHeapData+0x8"
+;; region6 = 1610612736 "VMDrcHeapData+0x0"
+;; region7 = 1610612740 "VMDrcHeapData+0x4"
+;; region8 = 1610612744 "VMDrcHeapData+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/struct-new-default.wat b/tests/disas/gc/drc/struct-new-default.wat
index 9409754ce3..b3e9470401 100644
--- a/tests/disas/gc/drc/struct-new-default.wat
+++ b/tests/disas/gc/drc/struct-new-default.wat
@@ -13,11 +13,11 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 2147483648 "GcHeap"
-;; region5 = 268435496 "VMStoreContext+0x28"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 1073741824 "GcHeap"
+;; region5 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/struct-new.wat b/tests/disas/gc/drc/struct-new.wat
index fb05a540af..b3811d718f 100644
--- a/tests/disas/gc/drc/struct-new.wat
+++ b/tests/disas/gc/drc/struct-new.wat
@@ -14,11 +14,11 @@
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 2147483648 "GcHeap"
-;; region5 = 268435496 "VMStoreContext+0x28"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 1073741824 "GcHeap"
+;; region5 = 134217768 "VMStoreContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/struct-set.wat b/tests/disas/gc/drc/struct-set.wat
index 9d5520efd2..13b0cb68ee 100644
--- a/tests/disas/gc/drc/struct-set.wat
+++ b/tests/disas/gc/drc/struct-set.wat
@@ -21,10 +21,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -73,10 +73,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-fill.wat b/tests/disas/gc/null/array-fill.wat
index 34149b0d22..4fc248fa40 100644
--- a/tests/disas/gc/null/array-fill.wat
+++ b/tests/disas/gc/null/array-fill.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-get-s.wat b/tests/disas/gc/null/array-get-s.wat
index f7a4d1769b..6bc12d26b1 100644
--- a/tests/disas/gc/null/array-get-s.wat
+++ b/tests/disas/gc/null/array-get-s.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-get-u.wat b/tests/disas/gc/null/array-get-u.wat
index 4bcdd6869c..0aa3e649c8 100644
--- a/tests/disas/gc/null/array-get-u.wat
+++ b/tests/disas/gc/null/array-get-u.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-get.wat b/tests/disas/gc/null/array-get.wat
index 06140890e7..7eb3404826 100644
--- a/tests/disas/gc/null/array-get.wat
+++ b/tests/disas/gc/null/array-get.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-len.wat b/tests/disas/gc/null/array-len.wat
index 56c30fb0ef..161283001c 100644
--- a/tests/disas/gc/null/array-len.wat
+++ b/tests/disas/gc/null/array-len.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
index 3b4cde22c2..fcb844fc17 100644
--- a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
@@ -14,13 +14,13 @@
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3758096384 "VMNullHeapData+0x0"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 268435488 "VMStoreContext+0x20"
+;; region3 = 1879048192 "VMNullHeapData+0x0"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 134217760 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 2147483648 "GcHeap"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-new-fixed.wat b/tests/disas/gc/null/array-new-fixed.wat
index cdd6be72d5..0732eaab81 100644
--- a/tests/disas/gc/null/array-new-fixed.wat
+++ b/tests/disas/gc/null/array-new-fixed.wat
@@ -11,13 +11,13 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3758096384 "VMNullHeapData+0x0"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 268435488 "VMStoreContext+0x20"
+;; region3 = 1879048192 "VMNullHeapData+0x0"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 134217760 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 2147483648 "GcHeap"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-new.wat b/tests/disas/gc/null/array-new.wat
index 0ca45e8d7e..91bcc42186 100644
--- a/tests/disas/gc/null/array-new.wat
+++ b/tests/disas/gc/null/array-new.wat
@@ -11,13 +11,13 @@
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3758096384 "VMNullHeapData+0x0"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 268435488 "VMStoreContext+0x20"
+;; region3 = 1879048192 "VMNullHeapData+0x0"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 134217760 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 2147483648 "GcHeap"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/array-set.wat b/tests/disas/gc/null/array-set.wat
index 33dae38110..1762bf71e1 100644
--- a/tests/disas/gc/null/array-set.wat
+++ b/tests/disas/gc/null/array-set.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/br-on-cast-fail.wat b/tests/disas/gc/null/br-on-cast-fail.wat
index 4647b112b0..51e56b142a 100644
--- a/tests/disas/gc/null/br-on-cast-fail.wat
+++ b/tests/disas/gc/null/br-on-cast-fail.wat
@@ -18,11 +18,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; region6 = 72 "VMContext+0x48"
;; region7 = 56 "VMContext+0x38"
;; region8 = 104 "VMContext+0x68"
diff --git a/tests/disas/gc/null/br-on-cast.wat b/tests/disas/gc/null/br-on-cast.wat
index 64b081b385..e7483afe65 100644
--- a/tests/disas/gc/null/br-on-cast.wat
+++ b/tests/disas/gc/null/br-on-cast.wat
@@ -18,11 +18,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; region6 = 72 "VMContext+0x48"
;; region7 = 56 "VMContext+0x38"
;; region8 = 104 "VMContext+0x68"
diff --git a/tests/disas/gc/null/call-indirect-and-subtyping.wat b/tests/disas/gc/null/call-indirect-and-subtyping.wat
index c4a4a25850..475f498540 100644
--- a/tests/disas/gc/null/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/null/call-indirect-and-subtyping.wat
@@ -18,9 +18,9 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/null/externref-globals.wat b/tests/disas/gc/null/externref-globals.wat
index ab39795001..a42e19b8f4 100644
--- a/tests/disas/gc/null/externref-globals.wat
+++ b/tests/disas/gc/null/externref-globals.wat
@@ -14,8 +14,8 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -33,8 +33,8 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/funcref-in-gc-heap-get.wat b/tests/disas/gc/null/funcref-in-gc-heap-get.wat
index 189d32632e..9e446629c6 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-get.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 1e1268aa46..9aefcd39bc 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
@@ -11,13 +11,13 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3758096384 "VMNullHeapData+0x0"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 268435488 "VMStoreContext+0x20"
+;; region3 = 1879048192 "VMNullHeapData+0x0"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 134217760 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 2147483648 "GcHeap"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/funcref-in-gc-heap-set.wat b/tests/disas/gc/null/funcref-in-gc-heap-set.wat
index bae34c5010..9d6ff58f78 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-set.wat
@@ -11,10 +11,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/i31ref-globals.wat b/tests/disas/gc/null/i31ref-globals.wat
index 35701aded9..7e06fe6067 100644
--- a/tests/disas/gc/null/i31ref-globals.wat
+++ b/tests/disas/gc/null/i31ref-globals.wat
@@ -14,8 +14,8 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -33,8 +33,8 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/multiple-array-get.wat b/tests/disas/gc/null/multiple-array-get.wat
index 9ebcc25260..8b2b1f3893 100644
--- a/tests/disas/gc/null/multiple-array-get.wat
+++ b/tests/disas/gc/null/multiple-array-get.wat
@@ -12,10 +12,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/multiple-struct-get.wat b/tests/disas/gc/null/multiple-struct-get.wat
index dc4e371311..3e6f14ef22 100644
--- a/tests/disas/gc/null/multiple-struct-get.wat
+++ b/tests/disas/gc/null/multiple-struct-get.wat
@@ -13,10 +13,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-cast.wat b/tests/disas/gc/null/ref-cast.wat
index 23744b2146..81d6ea93ed 100644
--- a/tests/disas/gc/null/ref-cast.wat
+++ b/tests/disas/gc/null/ref-cast.wat
@@ -10,11 +10,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-is-null.wat b/tests/disas/gc/null/ref-is-null.wat
index 1f9dd1f454..f52e531cfe 100644
--- a/tests/disas/gc/null/ref-is-null.wat
+++ b/tests/disas/gc/null/ref-is-null.wat
@@ -12,7 +12,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -30,7 +30,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-any.wat b/tests/disas/gc/null/ref-test-any.wat
index 06dd72c603..515f79a8a5 100644
--- a/tests/disas/gc/null/ref-test-any.wat
+++ b/tests/disas/gc/null/ref-test-any.wat
@@ -12,7 +12,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -30,7 +30,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-array.wat b/tests/disas/gc/null/ref-test-array.wat
index e8add45f16..a5f6ab0558 100644
--- a/tests/disas/gc/null/ref-test-array.wat
+++ b/tests/disas/gc/null/ref-test-array.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 d453491c0b..a2cc593ef1 100644
--- a/tests/disas/gc/null/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-func-type.wat
@@ -10,9 +10,9 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 2147483648 "GcHeap"
+;; region3 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-concrete-type.wat b/tests/disas/gc/null/ref-test-concrete-type.wat
index 1a357d8941..e49be09940 100644
--- a/tests/disas/gc/null/ref-test-concrete-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-type.wat
@@ -10,11 +10,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-eq.wat b/tests/disas/gc/null/ref-test-eq.wat
index 36e7359e43..10c14981f4 100644
--- a/tests/disas/gc/null/ref-test-eq.wat
+++ b/tests/disas/gc/null/ref-test-eq.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-i31.wat b/tests/disas/gc/null/ref-test-i31.wat
index 1e9325ae8f..203be3f69a 100644
--- a/tests/disas/gc/null/ref-test-i31.wat
+++ b/tests/disas/gc/null/ref-test-i31.wat
@@ -9,7 +9,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-none.wat b/tests/disas/gc/null/ref-test-none.wat
index 6032928d76..f2754c0419 100644
--- a/tests/disas/gc/null/ref-test-none.wat
+++ b/tests/disas/gc/null/ref-test-none.wat
@@ -12,7 +12,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -28,7 +28,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-struct.wat b/tests/disas/gc/null/ref-test-struct.wat
index b15a5b10d5..1f4db112e1 100644
--- a/tests/disas/gc/null/ref-test-struct.wat
+++ b/tests/disas/gc/null/ref-test-struct.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/struct-get-guard-pages.wat b/tests/disas/gc/null/struct-get-guard-pages.wat
index baeee69eb1..76b74f5aa7 100644
--- a/tests/disas/gc/null/struct-get-guard-pages.wat
+++ b/tests/disas/gc/null/struct-get-guard-pages.wat
@@ -25,10 +25,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -51,10 +51,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -78,10 +78,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -105,10 +105,10 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/struct-get-no-guard-pages.wat b/tests/disas/gc/null/struct-get-no-guard-pages.wat
index b461d59a50..d98258eb14 100644
--- a/tests/disas/gc/null/struct-get-no-guard-pages.wat
+++ b/tests/disas/gc/null/struct-get-no-guard-pages.wat
@@ -25,10 +25,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -57,10 +57,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -90,10 +90,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -123,10 +123,10 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/struct-get.wat b/tests/disas/gc/null/struct-get.wat
index 611c398dd0..1c71a13386 100644
--- a/tests/disas/gc/null/struct-get.wat
+++ b/tests/disas/gc/null/struct-get.wat
@@ -25,10 +25,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -51,10 +51,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -78,10 +78,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -105,10 +105,10 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/struct-new-default.wat b/tests/disas/gc/null/struct-new-default.wat
index 8b9284331c..1f7723a446 100644
--- a/tests/disas/gc/null/struct-new-default.wat
+++ b/tests/disas/gc/null/struct-new-default.wat
@@ -13,13 +13,13 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3758096384 "VMNullHeapData+0x0"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 268435488 "VMStoreContext+0x20"
+;; region3 = 1879048192 "VMNullHeapData+0x0"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 134217760 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 2147483648 "GcHeap"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/struct-new.wat b/tests/disas/gc/null/struct-new.wat
index 66624bc742..2d6efd4a4a 100644
--- a/tests/disas/gc/null/struct-new.wat
+++ b/tests/disas/gc/null/struct-new.wat
@@ -14,13 +14,13 @@
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3758096384 "VMNullHeapData+0x0"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 268435488 "VMStoreContext+0x20"
+;; region3 = 1879048192 "VMNullHeapData+0x0"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 134217760 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 2147483648 "GcHeap"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/struct-set.wat b/tests/disas/gc/null/struct-set.wat
index 549b01571c..3211308fe3 100644
--- a/tests/disas/gc/null/struct-set.wat
+++ b/tests/disas/gc/null/struct-set.wat
@@ -21,10 +21,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -73,10 +73,10 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/v128-fields.wat b/tests/disas/gc/null/v128-fields.wat
index 2796f5619d..21df18d18a 100644
--- a/tests/disas/gc/null/v128-fields.wat
+++ b/tests/disas/gc/null/v128-fields.wat
@@ -13,10 +13,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435488 "VMStoreContext+0x20"
-;; region3 = 268435496 "VMStoreContext+0x28"
-;; region4 = 2147483648 "GcHeap"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217760 "VMStoreContext+0x20"
+;; region3 = 134217768 "VMStoreContext+0x28"
+;; region4 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/ref-test-cast-final-type.wat b/tests/disas/gc/ref-test-cast-final-type.wat
index 4da044f508..d27fb41c75 100644
--- a/tests/disas/gc/ref-test-cast-final-type.wat
+++ b/tests/disas/gc/ref-test-cast-final-type.wat
@@ -16,11 +16,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -60,11 +60,11 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 268435488 "VMStoreContext+0x20"
-;; region4 = 268435496 "VMStoreContext+0x28"
-;; region5 = 2147483648 "GcHeap"
+;; region3 = 134217760 "VMStoreContext+0x20"
+;; region4 = 134217768 "VMStoreContext+0x28"
+;; region5 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/struct-new-default.wat b/tests/disas/gc/struct-new-default.wat
index 95ef6355ce..dcb1d775ec 100644
--- a/tests/disas/gc/struct-new-default.wat
+++ b/tests/disas/gc/struct-new-default.wat
@@ -14,13 +14,13 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/struct-new.wat b/tests/disas/gc/struct-new.wat
index 6fff923575..fc9f5a48a7 100644
--- a/tests/disas/gc/struct-new.wat
+++ b/tests/disas/gc/struct-new.wat
@@ -14,13 +14,13 @@
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 3489660928 "VMCopyingHeapData+0x0"
-;; region4 = 3489660932 "VMCopyingHeapData+0x4"
+;; region3 = 1744830464 "VMCopyingHeapData+0x0"
+;; region4 = 1744830468 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 268435488 "VMStoreContext+0x20"
-;; region7 = 2147483648 "GcHeap"
+;; region6 = 134217760 "VMStoreContext+0x20"
+;; region7 = 1073741824 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/typed-select-and-stack-maps.wat b/tests/disas/gc/typed-select-and-stack-maps.wat
index bf3fc5c00c..bf661c88db 100644
--- a/tests/disas/gc/typed-select-and-stack-maps.wat
+++ b/tests/disas/gc/typed-select-and-stack-maps.wat
@@ -42,7 +42,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 104 "VMContext+0x68"
;; region3 = 88 "VMContext+0x58"
;; region4 = 72 "VMContext+0x48"
@@ -73,7 +73,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 104 "VMContext+0x68"
;; region3 = 88 "VMContext+0x58"
;; region4 = 72 "VMContext+0x48"
diff --git a/tests/disas/global-get.wat b/tests/disas/global-get.wat
index a613c04224..40522b53da 100644
--- a/tests/disas/global-get.wat
+++ b/tests/disas/global-get.wat
@@ -32,9 +32,9 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 1610612736 "PublicGlobal"
+;; region3 = 805306368 "PublicGlobal"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -51,9 +51,9 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 72 "VMContext+0x48"
-;; region3 = 1610612736 "PublicGlobal"
+;; region3 = 805306368 "PublicGlobal"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,7 +70,7 @@
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -86,8 +86,8 @@
;;
;; function u0:3(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048193 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524097 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/globals.wat b/tests/disas/globals.wat
index 4b02848892..54d2602d6d 100644
--- a/tests/disas/globals.wat
+++ b/tests/disas/globals.wat
@@ -11,11 +11,11 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 2415919104 "VMMemoryDefinition+0x0"
-;; region4 = 2415919112 "VMMemoryDefinition+0x8"
-;; region5 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 1207959552 "VMMemoryDefinition+0x0"
+;; region4 = 1207959560 "VMMemoryDefinition+0x8"
+;; region5 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i128-cmp.wat b/tests/disas/i128-cmp.wat
index 7c5d8146ec..d90a80b7a7 100644
--- a/tests/disas/i128-cmp.wat
+++ b/tests/disas/i128-cmp.wat
@@ -101,7 +101,7 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -120,7 +120,7 @@
;;
;; function u0:1(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -139,7 +139,7 @@
;;
;; function u0:2(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -158,7 +158,7 @@
;;
;; function u0:3(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -177,7 +177,7 @@
;;
;; function u0:4(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -196,7 +196,7 @@
;;
;; function u0:5(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -215,7 +215,7 @@
;;
;; function u0:6(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -234,7 +234,7 @@
;;
;; function u0:7(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-load.wat b/tests/disas/i32-load.wat
index 0d49182ab0..c938e2d790 100644
--- a/tests/disas/i32-load.wat
+++ b/tests/disas/i32-load.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-load16-s.wat b/tests/disas/i32-load16-s.wat
index 58d5b542f9..303efc241e 100644
--- a/tests/disas/i32-load16-s.wat
+++ b/tests/disas/i32-load16-s.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-load16-u.wat b/tests/disas/i32-load16-u.wat
index b0676d60ee..ca3e5348cf 100644
--- a/tests/disas/i32-load16-u.wat
+++ b/tests/disas/i32-load16-u.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-load8-s.wat b/tests/disas/i32-load8-s.wat
index c44916cbc2..f2899aca2a 100644
--- a/tests/disas/i32-load8-s.wat
+++ b/tests/disas/i32-load8-s.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-load8-u.wat b/tests/disas/i32-load8-u.wat
index ed1124132b..11af3d6a43 100644
--- a/tests/disas/i32-load8-u.wat
+++ b/tests/disas/i32-load8-u.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-store.wat b/tests/disas/i32-store.wat
index ae7630ab80..3baba8ff78 100644
--- a/tests/disas/i32-store.wat
+++ b/tests/disas/i32-store.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-store16.wat b/tests/disas/i32-store16.wat
index 6872b46b4b..3d8015dc4d 100644
--- a/tests/disas/i32-store16.wat
+++ b/tests/disas/i32-store16.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i32-store8.wat b/tests/disas/i32-store8.wat
index 54f5ee17b1..97045d8208 100644
--- a/tests/disas/i32-store8.wat
+++ b/tests/disas/i32-store8.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-load.wat b/tests/disas/i64-load.wat
index 62933b55da..236a31161f 100644
--- a/tests/disas/i64-load.wat
+++ b/tests/disas/i64-load.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-load16-s.wat b/tests/disas/i64-load16-s.wat
index 0fe1dbaeb0..a0b84d95fb 100644
--- a/tests/disas/i64-load16-s.wat
+++ b/tests/disas/i64-load16-s.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-load16-u.wat b/tests/disas/i64-load16-u.wat
index d8fe9f5ece..b8998b5db9 100644
--- a/tests/disas/i64-load16-u.wat
+++ b/tests/disas/i64-load16-u.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-load8-s.wat b/tests/disas/i64-load8-s.wat
index 0826541632..78aa4c8435 100644
--- a/tests/disas/i64-load8-s.wat
+++ b/tests/disas/i64-load8-s.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-load8-u.wat b/tests/disas/i64-load8-u.wat
index b1e6d4a172..f43aa76706 100644
--- a/tests/disas/i64-load8-u.wat
+++ b/tests/disas/i64-load8-u.wat
@@ -10,10 +10,10 @@
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-store.wat b/tests/disas/i64-store.wat
index 1487648739..16b90e7793 100644
--- a/tests/disas/i64-store.wat
+++ b/tests/disas/i64-store.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-store16.wat b/tests/disas/i64-store16.wat
index d09568dc3b..8745407e5b 100644
--- a/tests/disas/i64-store16.wat
+++ b/tests/disas/i64-store16.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-store32.wat b/tests/disas/i64-store32.wat
index 6c3b00a277..46947fe2d1 100644
--- a/tests/disas/i64-store32.wat
+++ b/tests/disas/i64-store32.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/i64-store8.wat b/tests/disas/i64-store8.wat
index f8f4a8aefe..bbb6d092f5 100644
--- a/tests/disas/i64-store8.wat
+++ b/tests/disas/i64-store8.wat
@@ -11,10 +11,10 @@
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/icall-loop.wat b/tests/disas/icall-loop.wat
index 8ba5c47a1f..cab5c34fab 100644
--- a/tests/disas/icall-loop.wat
+++ b/tests/disas/icall-loop.wat
@@ -24,9 +24,9 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -75,9 +75,9 @@
;;
;; function u0:1(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/icall-simd.wat b/tests/disas/icall-simd.wat
index d9db0de933..bd665c711d 100644
--- a/tests/disas/icall-simd.wat
+++ b/tests/disas/icall-simd.wat
@@ -10,9 +10,9 @@
;; function u0:0(i64 vmctx, i64, i32, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/icall.wat b/tests/disas/icall.wat
index 9a3556df4e..4d1a153298 100644
--- a/tests/disas/icall.wat
+++ b/tests/disas/icall.wat
@@ -10,9 +10,9 @@
;; function u0:0(i64 vmctx, i64, i32, f32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/idempotent-store.wat b/tests/disas/idempotent-store.wat
index 28490137d2..c34d2cbf4c 100644
--- a/tests/disas/idempotent-store.wat
+++ b/tests/disas/idempotent-store.wat
@@ -16,10 +16,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-reachability-translation-0.wat b/tests/disas/if-reachability-translation-0.wat
index 3a905da450..3eba2e1554 100644
--- a/tests/disas/if-reachability-translation-0.wat
+++ b/tests/disas/if-reachability-translation-0.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-reachability-translation-1.wat b/tests/disas/if-reachability-translation-1.wat
index 20778eb791..18ed471303 100644
--- a/tests/disas/if-reachability-translation-1.wat
+++ b/tests/disas/if-reachability-translation-1.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-reachability-translation-2.wat b/tests/disas/if-reachability-translation-2.wat
index 4721d37e8b..7be14f531b 100644
--- a/tests/disas/if-reachability-translation-2.wat
+++ b/tests/disas/if-reachability-translation-2.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-reachability-translation-3.wat b/tests/disas/if-reachability-translation-3.wat
index b70b23bc93..bad004bbb2 100644
--- a/tests/disas/if-reachability-translation-3.wat
+++ b/tests/disas/if-reachability-translation-3.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-reachability-translation-4.wat b/tests/disas/if-reachability-translation-4.wat
index 4f3522c9aa..092f4c2f6d 100644
--- a/tests/disas/if-reachability-translation-4.wat
+++ b/tests/disas/if-reachability-translation-4.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-reachability-translation-5.wat b/tests/disas/if-reachability-translation-5.wat
index f669b4799b..e78fabfbae 100644
--- a/tests/disas/if-reachability-translation-5.wat
+++ b/tests/disas/if-reachability-translation-5.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-reachability-translation-6.wat b/tests/disas/if-reachability-translation-6.wat
index 81be356183..548f54c0c8 100644
--- a/tests/disas/if-reachability-translation-6.wat
+++ b/tests/disas/if-reachability-translation-6.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-unreachable-else-params-2.wat b/tests/disas/if-unreachable-else-params-2.wat
index 8862bbf643..46257589c4 100644
--- a/tests/disas/if-unreachable-else-params-2.wat
+++ b/tests/disas/if-unreachable-else-params-2.wat
@@ -21,10 +21,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> f64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/if-unreachable-else-params.wat b/tests/disas/if-unreachable-else-params.wat
index 9f6ebd830f..40ca177575 100644
--- a/tests/disas/if-unreachable-else-params.wat
+++ b/tests/disas/if-unreachable-else-params.wat
@@ -44,10 +44,10 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/indirect-call-no-caching.wat b/tests/disas/indirect-call-no-caching.wat
index 01d7d3f19d..98a9ee320b 100644
--- a/tests/disas/indirect-call-no-caching.wat
+++ b/tests/disas/indirect-call-no-caching.wat
@@ -22,7 +22,7 @@
(elem (i32.const 1) func $f1 $f2 $f3))
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -38,7 +38,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -54,7 +54,7 @@
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,9 +70,9 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/intra-module-inlining.wat b/tests/disas/intra-module-inlining.wat
index 8023c5281a..b7ab00f512 100644
--- a/tests/disas/intra-module-inlining.wat
+++ b/tests/disas/intra-module-inlining.wat
@@ -11,7 +11,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -27,7 +27,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/issue-10929-v128-icmp-egraphs.wat b/tests/disas/issue-10929-v128-icmp-egraphs.wat
index dab6c06c19..cff4304455 100644
--- a/tests/disas/issue-10929-v128-icmp-egraphs.wat
+++ b/tests/disas/issue-10929-v128-icmp-egraphs.wat
@@ -12,7 +12,7 @@
)
;; function u0:0(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/issue-5696.wat b/tests/disas/issue-5696.wat
index 9b937055d4..8b7aba8aeb 100644
--- a/tests/disas/issue-5696.wat
+++ b/tests/disas/issue-5696.wat
@@ -11,7 +11,7 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8a0a42dc13..6664e16eec 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 64da5e6824..65d9a4a1cd 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 904b2903f1..922415ce46 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 50469e3de6..5163d6a098 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 b9063f3a60..56d5d460e4 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 e3d204ea36..67b41e1372 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 80e92a0ce3..5ab278f2ac 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 fac9ebac2c..0477520beb 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,10 +50,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 7433a48cde..c9caeaddd7 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,10 +50,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 ccc9199224..b681941a59 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 2b606d0684..3c28c68fea 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,10 +50,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 0fd0093afe..4c9ea50795 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,10 +50,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 09488dc07b..bc749afe5a 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 5e0a76b480..3c6d4c7c97 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 df46ab7e94..5eb3b9771e 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 398bd76dac..521b8018db 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8b0d24833c..ce641603e9 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 cce2570fba..706a0003e4 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 fa2358668c..84c9da43df 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8980cc9176..bc53aa6be4 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 c7e5c3ae5a..63b9e53ce9 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 007fe0966b..2ba935da48 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 b9186bc4f4..37707c9106 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 2596cea6f8..6d66c59779 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 e88e3ebb78..c831ff9061 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 e93375e5a3..8167376d14 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 83cefdaa0a..59ad43b872 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 0bc5e82560..ea7b7468dd 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 03f3baef5d..10e449af5a 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 83cf29f6ad..7f88f557ea 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 97b104e4cb..164e212454 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 afa719133a..5b0104c1d9 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 0e327708b7..a98adfb439 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 e54ad4a9a5..97863acc9a 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 6d0894c29f..2224976f15 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 79d385514c..2e571cd130 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,10 +49,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8edb512080..2f25cb5a49 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 d62ede7011..63a5258399 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 0a04207acb..3b03a7f80f 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8ae6c482f2..6940664aed 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 71a1babca5..f43540f56d 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 e904fdbe7a..a58074e39c 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 3322051563..6b40012dcc 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 719b439704..2defaa2220 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 9adc1b732f..4c4059dd5f 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 95bcc96b05..aa4ab377de 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 5f9db40163..b75ef60df5 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 a36284823c..ddb0ba23b6 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 a1dca9c0e6..3b59cd8a6c 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 d675d7eeba..09ebaebe62 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 b15ee949a7..6c30d97d65 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 a7bc1aca91..4c526b6c4b 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -42,10 +42,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 40cfcf9954..e145eecd8e 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 387f7cabab..28cd0f3dbf 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 f3e7c71a22..c01e81e043 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 f51e908b06..7d84f0478d 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 eba601279a..c0b0c32472 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 2483b72d4e..4fb4306830 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -42,10 +42,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 dc384c3064..9fce9d657f 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 ef74d3ff40..d07e35993d 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 4ebcd4a5dc..20f8a9694c 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -42,10 +42,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 7e48a278c6..3beb1eb627 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 281c3d62bb..2b34342e35 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 4a3bcfaa89..abaf48a9fc 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -42,10 +42,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 2102ad4216..ad64a479ab 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 2a3086e175..c2f5cc0db8 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 09fc7ad06f..737172f09b 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -42,10 +42,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 b8c8d8212d..bd61c2eaa7 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 c3ac51fb01..c83ca71100 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 da994a2708..ea8f55ca53 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -42,10 +42,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 27ba0a7100..bbb983953f 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 3d818ca7cf..10718bd6c2 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 0ae0fe68d4..bd943face8 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 71e9874583..25a77a93dc 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 ebabeb4b2a..cd19475a6b 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8f250a6c8d..24572c849e 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 a975ae4b88..d6b5ffee63 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 a997cd2419..6998bff7a3 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 54e0a1c788..bc2be7f09c 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8565158773..f22862f4cb 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 8159ecdec2..da4f41c66d 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 83104f7922..b7ba7cd3e0 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 6ba2d27d2d..47daaebdb3 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 582fffaa01..bb8b76435b 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 007926dc49..16c59d3a81 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 d819f2857f..517e8b00da 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 625fb5507e..33e5563cd2 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 c5d934deb8..c7e7ed6fca 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,10 +44,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 f0b97bd211..e54d9a5f60 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 17835694ee..c677ee9876 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 29712bdeba..eaaab133f4 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 d0e0307171..5096448f4d 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 668bfadbbf..cd3dea003c 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 a028b37359..f1d7edfcd3 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,10 +45,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 fd5465fb18..bc7593bd3a 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
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 361d1f26d3..3b99f918d8 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
@@ -20,10 +20,10 @@
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/memory-copy-epochs.wat b/tests/disas/memory-copy-epochs.wat
index 3c321bb800..dd613a130e 100644
--- a/tests/disas/memory-copy-epochs.wat
+++ b/tests/disas/memory-copy-epochs.wat
@@ -10,11 +10,11 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 24 "VMContext+0x18"
-;; region3 = 268435464 "VMStoreContext+0x8"
-;; region4 = 2415919104 "VMMemoryDefinition+0x0"
-;; region5 = 2415919112 "VMMemoryDefinition+0x8"
+;; region3 = 134217736 "VMStoreContext+0x8"
+;; region4 = 1207959552 "VMMemoryDefinition+0x0"
+;; region5 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/memory-copy-fuel.wat b/tests/disas/memory-copy-fuel.wat
index 38e8b5eabf..ca96ae79d3 100644
--- a/tests/disas/memory-copy-fuel.wat
+++ b/tests/disas/memory-copy-fuel.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435456 "VMStoreContext+0x0"
-;; region3 = 2415919104 "VMMemoryDefinition+0x0"
-;; region4 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217728 "VMStoreContext+0x0"
+;; region3 = 1207959552 "VMMemoryDefinition+0x0"
+;; region4 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/memory-copy-inline.wat b/tests/disas/memory-copy-inline.wat
index 214a1f5321..41a5801edc 100644
--- a/tests/disas/memory-copy-inline.wat
+++ b/tests/disas/memory-copy-inline.wat
@@ -13,10 +13,10 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/memory-min-max-same.wat b/tests/disas/memory-min-max-same.wat
index 2df61541ae..b64c5460f3 100644
--- a/tests/disas/memory-min-max-same.wat
+++ b/tests/disas/memory-min-max-same.wat
@@ -35,12 +35,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 96 "VMContext+0x60"
;; region3 = 80 "VMContext+0x50"
-;; region4 = 2415919104 "VMMemoryDefinition+0x0"
-;; region5 = 2415919112 "VMMemoryDefinition+0x8"
-;; region6 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region4 = 1207959552 "VMMemoryDefinition+0x0"
+;; region5 = 1207959560 "VMMemoryDefinition+0x8"
+;; region6 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/memory.wat b/tests/disas/memory.wat
index e8da1b7a67..2f3e510dcc 100644
--- a/tests/disas/memory.wat
+++ b/tests/disas/memory.wat
@@ -14,10 +14,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/memory_copy_host32.wat b/tests/disas/memory_copy_host32.wat
index 1890e2af1f..a86ffbb78d 100644
--- a/tests/disas/memory_copy_host32.wat
+++ b/tests/disas/memory_copy_host32.wat
@@ -50,8 +50,8 @@
)
)
;; function u0:0(i32 vmctx, i32, i32, i32, i32) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:1 sig0
;;
@@ -78,8 +78,8 @@
;; }
;;
;; function u0:1(i32 vmctx, i32, i32, i32, i32) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:1 sig0
;;
@@ -109,8 +109,8 @@
;; }
;;
;; function u0:2(i32 vmctx, i32, i64, i32, i32) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:1 sig0
;;
@@ -140,8 +140,8 @@
;; }
;;
;; function u0:3(i32 vmctx, i32, i64, i64, i64) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:1 sig0
;;
@@ -168,8 +168,8 @@
;; }
;;
;; function u0:4(i32 vmctx, i32, i64, i64, i64) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:1 sig0
;;
@@ -199,8 +199,8 @@
;; }
;;
;; function u0:5(i32 vmctx, i32, i32, i64, i32) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:1 sig0
;;
diff --git a/tests/disas/memory_copy_host64.wat b/tests/disas/memory_copy_host64.wat
index 41e662717a..2b18f2724e 100644
--- a/tests/disas/memory_copy_host64.wat
+++ b/tests/disas/memory_copy_host64.wat
@@ -51,9 +51,9 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -84,9 +84,9 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -119,9 +119,9 @@
;;
;; function u0:2(i64 vmctx, i64, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -153,9 +153,9 @@
;;
;; function u0:3(i64 vmctx, i64, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -183,9 +183,9 @@
;;
;; function u0:4(i64 vmctx, i64, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -215,9 +215,9 @@
;;
;; function u0:5(i64 vmctx, i64, i32, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/memory_fill_host32.wat b/tests/disas/memory_fill_host32.wat
index 7a61bf8225..818ed0fdd0 100644
--- a/tests/disas/memory_fill_host32.wat
+++ b/tests/disas/memory_fill_host32.wat
@@ -47,8 +47,8 @@
)
)
;; function u0:0(i32 vmctx, i32, i32, i32) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:2 sig0
;;
@@ -71,8 +71,8 @@
;; }
;;
;; function u0:1(i32 vmctx, i32, i64, i64) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:2 sig0
;;
@@ -95,8 +95,8 @@
;; }
;;
;; function u0:2(i32 vmctx, i32, i32, i32) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:2 sig0
;;
@@ -119,8 +119,8 @@
;; }
;;
;; function u0:3(i32 vmctx, i32, i64, i64) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:2 sig0
;;
@@ -143,8 +143,8 @@
;; }
;;
;; function u0:4(i32 vmctx, i32, i32, i32) tail {
-;; region0 = 2415919104 "VMMemoryDefinition+0x0"
-;; region1 = 2415919108 "VMMemoryDefinition+0x4"
+;; region0 = 1207959552 "VMMemoryDefinition+0x0"
+;; region1 = 1207959556 "VMMemoryDefinition+0x4"
;; sig0 = (i32 vmctx, i32, i32, i32) tail
;; fn0 = colocated u805306368:2 sig0
;;
diff --git a/tests/disas/memory_fill_host64.wat b/tests/disas/memory_fill_host64.wat
index 4cb5d57b69..2b91d60208 100644
--- a/tests/disas/memory_fill_host64.wat
+++ b/tests/disas/memory_fill_host64.wat
@@ -45,9 +45,9 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -74,9 +74,9 @@
;;
;; function u0:1(i64 vmctx, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -101,9 +101,9 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -130,9 +130,9 @@
;;
;; function u0:3(i64 vmctx, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -157,9 +157,9 @@
;;
;; function u0:4(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-0.wat b/tests/disas/multi-0.wat
index 72f3de7f58..106e05e255 100644
--- a/tests/disas/multi-0.wat
+++ b/tests/disas/multi-0.wat
@@ -6,7 +6,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-1.wat b/tests/disas/multi-1.wat
index 30ca7374bb..089dec922f 100644
--- a/tests/disas/multi-1.wat
+++ b/tests/disas/multi-1.wat
@@ -9,7 +9,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32, i64, f64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-10.wat b/tests/disas/multi-10.wat
index 1927457f85..06113f2d68 100644
--- a/tests/disas/multi-10.wat
+++ b/tests/disas/multi-10.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-11.wat b/tests/disas/multi-11.wat
index 937cccbab7..034b14e96e 100644
--- a/tests/disas/multi-11.wat
+++ b/tests/disas/multi-11.wat
@@ -10,7 +10,7 @@
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-12.wat b/tests/disas/multi-12.wat
index 32ddc36603..10e899f1cc 100644
--- a/tests/disas/multi-12.wat
+++ b/tests/disas/multi-12.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-13.wat b/tests/disas/multi-13.wat
index 03444ee769..c2ec8ff841 100644
--- a/tests/disas/multi-13.wat
+++ b/tests/disas/multi-13.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-14.wat b/tests/disas/multi-14.wat
index 480f0530f5..fdafe997ed 100644
--- a/tests/disas/multi-14.wat
+++ b/tests/disas/multi-14.wat
@@ -13,7 +13,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-15.wat b/tests/disas/multi-15.wat
index 3e2791c924..f26c8e4f6c 100644
--- a/tests/disas/multi-15.wat
+++ b/tests/disas/multi-15.wat
@@ -25,7 +25,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64, f32, f32, i32, f64, f32, i32, i32, i32, f32, f64, f64, f64, i32, i32, f32) -> f64, f32, i32, i32, i32, i64, f32, i32, i32, f32, f64, f64, i32, f32, i32, f64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-16.wat b/tests/disas/multi-16.wat
index 23c348ac6b..893a587cb8 100644
--- a/tests/disas/multi-16.wat
+++ b/tests/disas/multi-16.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-17.wat b/tests/disas/multi-17.wat
index 2b2dc30f6f..967190aeec 100644
--- a/tests/disas/multi-17.wat
+++ b/tests/disas/multi-17.wat
@@ -29,7 +29,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-2.wat b/tests/disas/multi-2.wat
index 20db62db2b..140596c44f 100644
--- a/tests/disas/multi-2.wat
+++ b/tests/disas/multi-2.wat
@@ -9,7 +9,7 @@
;; function u0:0(i64 vmctx, i64, i64, i64) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-3.wat b/tests/disas/multi-3.wat
index e68f001ecb..f4d5428f65 100644
--- a/tests/disas/multi-3.wat
+++ b/tests/disas/multi-3.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64, i64) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-4.wat b/tests/disas/multi-4.wat
index 50a51d7027..59ae24f897 100644
--- a/tests/disas/multi-4.wat
+++ b/tests/disas/multi-4.wat
@@ -16,7 +16,7 @@
;; function u0:0(i64 vmctx, i64, i32, i64, i64) -> i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-5.wat b/tests/disas/multi-5.wat
index 3366c439b6..300e0262e8 100644
--- a/tests/disas/multi-5.wat
+++ b/tests/disas/multi-5.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-6.wat b/tests/disas/multi-6.wat
index f378d60dd5..d852d4f8a2 100644
--- a/tests/disas/multi-6.wat
+++ b/tests/disas/multi-6.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-7.wat b/tests/disas/multi-7.wat
index a58c414fa4..b7a9d00165 100644
--- a/tests/disas/multi-7.wat
+++ b/tests/disas/multi-7.wat
@@ -12,7 +12,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-8.wat b/tests/disas/multi-8.wat
index e875644cde..e533ec538d 100644
--- a/tests/disas/multi-8.wat
+++ b/tests/disas/multi-8.wat
@@ -15,7 +15,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/multi-9.wat b/tests/disas/multi-9.wat
index b5f3909bf4..68b0b39fec 100644
--- a/tests/disas/multi-9.wat
+++ b/tests/disas/multi-9.wat
@@ -18,7 +18,7 @@
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/non-fixed-size-memory.wat b/tests/disas/non-fixed-size-memory.wat
index cf49464d11..a90ae94f84 100644
--- a/tests/disas/non-fixed-size-memory.wat
+++ b/tests/disas/non-fixed-size-memory.wat
@@ -22,10 +22,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,10 +47,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/nullref.wat b/tests/disas/nullref.wat
index 64315a79b9..d39b394833 100644
--- a/tests/disas/nullref.wat
+++ b/tests/disas/nullref.wat
@@ -14,7 +14,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -30,7 +30,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/passive-data.wat b/tests/disas/passive-data.wat
index 00119da0bb..2fb896ddd9 100644
--- a/tests/disas/passive-data.wat
+++ b/tests/disas/passive-data.wat
@@ -15,9 +15,9 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
;; region4 = 152 "VMContext+0x98"
;; region5 = 144 "VMContext+0x90"
;; gv0 = vmctx
@@ -63,7 +63,7 @@
;;
;; function u0:1(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 152 "VMContext+0x98"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/pic.wat b/tests/disas/pic.wat
index db1d34acf3..cc0028ca55 100644
--- a/tests/disas/pic.wat
+++ b/tests/disas/pic.wat
@@ -49,10 +49,10 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,11 +71,11 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 2415919104 "VMMemoryDefinition+0x0"
-;; region4 = 2415919112 "VMMemoryDefinition+0x8"
-;; region5 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 1207959552 "VMMemoryDefinition+0x0"
+;; region4 = 1207959560 "VMMemoryDefinition+0x8"
+;; region5 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; region6 = 96 "VMContext+0x60"
;; region7 = 80 "VMContext+0x50"
;; gv0 = vmctx
diff --git a/tests/disas/pr2303.wat b/tests/disas/pr2303.wat
index ab5809db44..d91e387f91 100644
--- a/tests/disas/pr2303.wat
+++ b/tests/disas/pr2303.wat
@@ -18,10 +18,10 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 536870912 "PublicMemory"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 268435456 "PublicMemory"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/pr2559.wat b/tests/disas/pr2559.wat
index 5089b82c4c..7e20757e48 100644
--- a/tests/disas/pr2559.wat
+++ b/tests/disas/pr2559.wat
@@ -54,7 +54,7 @@
;; function u0:0(i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -96,7 +96,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/readonly-funcrefs.wat b/tests/disas/readonly-funcrefs.wat
index df2b6d4c83..eec980ea51 100644
--- a/tests/disas/readonly-funcrefs.wat
+++ b/tests/disas/readonly-funcrefs.wat
@@ -20,7 +20,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -35,9 +35,9 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/readonly-heap-base-pointer1.wat b/tests/disas/readonly-heap-base-pointer1.wat
index 78850876a0..e6c8feafff 100644
--- a/tests/disas/readonly-heap-base-pointer1.wat
+++ b/tests/disas/readonly-heap-base-pointer1.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/readonly-heap-base-pointer2.wat b/tests/disas/readonly-heap-base-pointer2.wat
index 0c63e2bb80..e7e6f298a6 100644
--- a/tests/disas/readonly-heap-base-pointer2.wat
+++ b/tests/disas/readonly-heap-base-pointer2.wat
@@ -9,11 +9,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 2415919104 "VMMemoryDefinition+0x0"
-;; region4 = 2415919112 "VMMemoryDefinition+0x8"
-;; region5 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region3 = 1207959552 "VMMemoryDefinition+0x0"
+;; region4 = 1207959560 "VMMemoryDefinition+0x8"
+;; region5 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/readonly-heap-base-pointer3.wat b/tests/disas/readonly-heap-base-pointer3.wat
index 09b29bc024..b2cf2accd1 100644
--- a/tests/disas/readonly-heap-base-pointer3.wat
+++ b/tests/disas/readonly-heap-base-pointer3.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/ref-func-0.wat b/tests/disas/ref-func-0.wat
index 5c99075f62..f13ca0d109 100644
--- a/tests/disas/ref-func-0.wat
+++ b/tests/disas/ref-func-0.wat
@@ -15,8 +15,8 @@
;; function u0:0(i64 vmctx, i64) -> i32, i32, i64, i64 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1610612736 "PublicGlobal"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 805306368 "PublicGlobal"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/riscv64-component-builtins.wat b/tests/disas/riscv64-component-builtins.wat
index 46b0e1fff2..4514493cd9 100644
--- a/tests/disas/riscv64-component-builtins.wat
+++ b/tests/disas/riscv64-component-builtins.wat
@@ -12,10 +12,10 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435504 "VMStoreContext+0x30"
-;; region2 = 268435512 "VMStoreContext+0x38"
-;; region3 = 2952790048 "VMComponentContext+0x20"
-;; region4 = 2952790024 "VMComponentContext+0x8"
+;; region1 = 134217776 "VMStoreContext+0x30"
+;; region2 = 134217784 "VMStoreContext+0x38"
+;; region3 = 1476395040 "VMComponentContext+0x20"
+;; region4 = 1476395016 "VMComponentContext+0x8"
;; region5 = 16 "VMContext+0x10"
;; sig0 = (i64 sext, i32 sext, i32 sext, i32 sext) -> i64 sext system_v
;; sig1 = (i64 sext vmctx) system_v
diff --git a/tests/disas/select.wat b/tests/disas/select.wat
index e1450eb34d..cd591ab2c7 100644
--- a/tests/disas/select.wat
+++ b/tests/disas/select.wat
@@ -22,7 +22,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,7 +41,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -60,7 +60,7 @@
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/simd-store.wat b/tests/disas/simd-store.wat
index c10863f810..43c3133769 100644
--- a/tests/disas/simd-store.wat
+++ b/tests/disas/simd-store.wat
@@ -86,10 +86,10 @@
;; function u0:0(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -110,10 +110,10 @@
;;
;; function u0:10(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -136,10 +136,10 @@
;;
;; function u0:11(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -162,10 +162,10 @@
;;
;; function u0:12(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -186,10 +186,10 @@
;;
;; function u0:13(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -212,10 +212,10 @@
;;
;; function u0:14(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -238,10 +238,10 @@
;;
;; function u0:15(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -262,10 +262,10 @@
;;
;; function u0:16(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -288,10 +288,10 @@
;;
;; function u0:17(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -314,10 +314,10 @@
;;
;; function u0:18(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -340,10 +340,10 @@
;;
;; function u0:19(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -364,10 +364,10 @@
;;
;; function u0:1(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -390,10 +390,10 @@
;;
;; function u0:20(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -416,10 +416,10 @@
;;
;; function u0:21(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -442,10 +442,10 @@
;;
;; function u0:22(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -468,10 +468,10 @@
;;
;; function u0:23(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -494,10 +494,10 @@
;;
;; function u0:24(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -520,10 +520,10 @@
;;
;; function u0:25(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -546,10 +546,10 @@
;;
;; function u0:26(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -572,10 +572,10 @@
;;
;; function u0:27(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -598,10 +598,10 @@
;;
;; function u0:28(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -624,10 +624,10 @@
;;
;; function u0:29(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -650,10 +650,10 @@
;;
;; function u0:2(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -676,10 +676,10 @@
;;
;; function u0:30(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -702,10 +702,10 @@
;;
;; function u0:31(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -728,10 +728,10 @@
;;
;; function u0:32(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -754,10 +754,10 @@
;;
;; function u0:33(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -780,10 +780,10 @@
;;
;; function u0:3(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -806,10 +806,10 @@
;;
;; function u0:4(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -830,10 +830,10 @@
;;
;; function u0:5(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -856,10 +856,10 @@
;;
;; function u0:6(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -882,10 +882,10 @@
;;
;; function u0:7(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -908,10 +908,10 @@
;;
;; function u0:8(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -932,10 +932,10 @@
;;
;; function u0:9(i64 vmctx, i64, i8x16) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2415919104 "VMMemoryDefinition+0x0"
-;; region3 = 2415919112 "VMMemoryDefinition+0x8"
-;; region4 = 805306368 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1207959552 "VMMemoryDefinition+0x0"
+;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/simd.wat b/tests/disas/simd.wat
index fbbf1262e1..92759a8910 100644
--- a/tests/disas/simd.wat
+++ b/tests/disas/simd.wat
@@ -32,7 +32,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,7 +50,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,7 +71,7 @@
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -90,7 +90,7 @@
;;
;; function u0:3(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/simple.wat b/tests/disas/simple.wat
index c7a5a89527..0fb2c3ea43 100644
--- a/tests/disas/simple.wat
+++ b/tests/disas/simple.wat
@@ -20,7 +20,7 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -37,7 +37,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -51,7 +51,7 @@
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/stack-switching/resume-suspend-data-passing.wat b/tests/disas/stack-switching/resume-suspend-data-passing.wat
index 2b6bab9010..2b77a20ef5 100644
--- a/tests/disas/stack-switching/resume-suspend-data-passing.wat
+++ b/tests/disas/stack-switching/resume-suspend-data-passing.wat
@@ -40,8 +40,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 16, align = 65536
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435544 "VMStoreContext+0x58"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217816 "VMStoreContext+0x58"
+;; region3 = 2147483648 "VMContRef+0x0"
+;; region4 = 2281701376 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -74,12 +76,12 @@
;; @0044 jump block5
;;
;; block5:
-;; @0044 v14 = load.i64 notrap aligned v11+48
-;; @0044 v15 = load.i64 notrap aligned v11+56
+;; @0044 v14 = load.i64 notrap aligned region3 v11+48
+;; @0044 v15 = load.i64 notrap aligned region3 v11+56
;; v73 = iconst.i64 24
;; v74 = iadd v15, v73 ; v73 = 24
-;; @0044 v18 = load.i64 notrap aligned v74+8
-;; @0044 v19 = load.i32 notrap aligned v15+40
+;; @0044 v18 = load.i64 notrap aligned region3 v74+8
+;; @0044 v19 = load.i32 notrap aligned region3 v15+40
;; v75 = iconst.i32 0
;; v65 = iconst.i32 3
;; @0044 v5 = iconst.i64 48
@@ -96,7 +98,7 @@
;; v77 = ishl.i32 v21, v76 ; v76 = 3
;; @0044 v25 = uextend.i64 v77
;; @0044 v26 = iadd.i64 v18, v25
-;; @0044 v27 = load.i64 notrap aligned v26
+;; @0044 v27 = load.i64 notrap aligned region4 v26
;; v78 = iadd.i64 v0, v5 ; v5 = 48
;; v79 = icmp eq v27, v78
;; v80 = iconst.i32 1
@@ -104,35 +106,35 @@
;; @0044 brif v79, block8, block6(v81)
;;
;; block8:
-;; @0044 store.i64 notrap aligned v11, v9+64
+;; @0044 store.i64 notrap aligned region3 v11, v9+64
;; v82 = iconst.i32 1
;; v83 = iconst.i64 120
;; v84 = iadd.i64 v9, v83 ; v83 = 120
-;; @0044 store notrap aligned v82, v84+4 ; v82 = 1
-;; @0044 store.i64 notrap aligned v34, v84+8
-;; @0044 store.i32 notrap aligned v4, v34
-;; @0044 store notrap aligned v82, v84 ; v82 = 1
+;; @0044 store notrap aligned region3 v82, v84+4 ; v82 = 1
+;; @0044 store.i64 notrap aligned region3 v34, v84+8
+;; @0044 store.i32 notrap aligned region4 v4, v34
+;; @0044 store notrap aligned region3 v82, v84 ; v82 = 1
;; v85 = iconst.i32 3
;; v86 = iconst.i64 16
;; v87 = iadd.i64 v9, v86 ; v86 = 16
-;; @0044 store notrap aligned v85, v87 ; v85 = 3
+;; @0044 store notrap aligned region3 v85, v87 ; v85 = 3
;; v88 = iconst.i64 0
-;; @0044 store notrap aligned v88, v11+48 ; v88 = 0
-;; @0044 store notrap aligned v88, v11+56 ; v88 = 0
+;; @0044 store notrap aligned region3 v88, v11+48 ; v88 = 0
+;; @0044 store notrap aligned region3 v88, v11+56 ; v88 = 0
;; v89 = iconst.i64 80
;; v90 = iadd.i64 v11, v89 ; v89 = 80
-;; @0044 v51 = load.i64 notrap aligned v90
+;; @0044 v51 = load.i64 notrap aligned region3 v90
;; v91 = iconst.i64 -24
;; v92 = iadd v51, v91 ; v91 = -24
;; @0044 v47 = uextend.i64 v21
;; v93 = iconst.i64 0x0002_0000_0000
;; v94 = bor v47, v93 ; v93 = 0x0002_0000_0000
;; @0044 v54 = stack_switch v92, v92, v94
-;; @0044 v57 = load.i64 notrap aligned v84+8
+;; @0044 v57 = load.i64 notrap aligned region3 v84+8
;; v95 = iconst.i32 0
-;; @0044 store notrap aligned v95, v84 ; v95 = 0
-;; @0044 store notrap aligned v95, v84+4 ; v95 = 0
-;; @0044 store notrap aligned v88, v84+8 ; v88 = 0
+;; @0044 store notrap aligned region3 v95, v84 ; v95 = 0
+;; @0044 store notrap aligned region3 v95, v84+4 ; v95 = 0
+;; @0044 store notrap aligned region3 v88, v84+8 ; v88 = 0
;; v96 = isub.i32 v62, v82 ; v82 = 1
;; @004d brif v96, block2(v96), block10
;;
@@ -149,9 +151,11 @@
;; function u0:1(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435544 "VMStoreContext+0x58"
-;; region3 = 268435528 "VMStoreContext+0x48"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 2147483648 "VMContRef+0x0"
+;; region3 = 134217816 "VMStoreContext+0x58"
+;; region4 = 134217800 "VMStoreContext+0x48"
+;; region5 = 2281701376 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -166,7 +170,7 @@
;; @0056 v3 = call fn0(v0, v2) ; v2 = 0
;; @0058 trapz v3, user16
;; @0058 v6 = call fn1(v0, v3, v2, v2) ; v2 = 0, v2 = 0
-;; @0058 v7 = load.i64 notrap aligned v6+72
+;; @0058 v7 = load.i64 notrap aligned region2 v6+72
;; @0058 v9 = uextend.i128 v7
;; @0058 v10 = iconst.i64 64
;; v115 = ishl v9, v10 ; v10 = 64
@@ -195,7 +199,7 @@
;; block5:
;; @0062 v15 = ireduce.i64 v14
;; @0062 trapz v15, user16
-;; @0062 v20 = load.i64 notrap aligned v15+72
+;; @0062 v20 = load.i64 notrap aligned region2 v15+72
;; v122 = iconst.i64 64
;; v123 = ushr.i128 v14, v122 ; v122 = 64
;; @0062 v19 = ireduce.i64 v123
@@ -203,69 +207,69 @@
;; @0062 trapz v21, user23
;; v124 = iconst.i64 1
;; v125 = iadd v20, v124 ; v124 = 1
-;; @0062 store notrap aligned v125, v15+72
-;; @0062 v24 = load.i64 notrap aligned v15+64
-;; @0062 v26 = load.i64 notrap aligned region2 v25+88
-;; @0062 v27 = load.i64 notrap aligned region2 v25+96
-;; @0062 store notrap aligned v26, v24+48
-;; @0062 store notrap aligned v27, v24+56
+;; @0062 store notrap aligned region2 v125, v15+72
+;; @0062 v24 = load.i64 notrap aligned region2 v15+64
+;; @0062 v26 = load.i64 notrap aligned region3 v25+88
+;; @0062 v27 = load.i64 notrap aligned region3 v25+96
+;; @0062 store notrap aligned region2 v26, v24+48
+;; @0062 store notrap aligned region2 v27, v24+56
;; v126 = iconst.i64 0
-;; @0062 store notrap aligned v126, v15+64 ; v126 = 0
+;; @0062 store notrap aligned region2 v126, v15+64 ; v126 = 0
;; v127 = iconst.i64 2
-;; @0062 store notrap aligned region2 v127, v25+88 ; v127 = 2
-;; @0062 store notrap aligned region2 v15, v25+96
+;; @0062 store notrap aligned region3 v127, v25+88 ; v127 = 2
+;; @0062 store notrap aligned region3 v15, v25+96
;; v128 = iconst.i32 1
;; v129 = iconst.i64 16
;; v130 = iadd v15, v129 ; v129 = 16
-;; @0062 store notrap aligned v128, v130 ; v128 = 1
+;; @0062 store notrap aligned region2 v128, v130 ; v128 = 1
;; v131 = iconst.i32 2
;; v132 = iadd v27, v129 ; v129 = 16
-;; @0062 store notrap aligned v131, v132 ; v131 = 2
-;; @0062 v42 = load.i64 notrap aligned region3 v25+72
-;; @0062 store notrap aligned v42, v27+8
+;; @0062 store notrap aligned region2 v131, v132 ; v131 = 2
+;; @0062 v42 = load.i64 notrap aligned region4 v25+72
+;; @0062 store notrap aligned region2 v42, v27+8
;; @0062 v43 = load.i64 notrap aligned region1 v25+24
-;; @0062 store notrap aligned v43, v27
-;; @0062 v46 = load.i64 notrap aligned v15
+;; @0062 store notrap aligned region2 v43, v27
+;; @0062 v46 = load.i64 notrap aligned region2 v15
;; @0062 store notrap aligned region1 v46, v25+24
-;; @0062 v47 = load.i64 notrap aligned v15+8
-;; @0062 store notrap aligned region3 v47, v25+72
+;; @0062 v47 = load.i64 notrap aligned region2 v15+8
+;; @0062 store notrap aligned region4 v47, v25+72
;; v133 = iconst.i64 24
;; v134 = iadd v27, v133 ; v133 = 24
-;; @0062 store notrap aligned v128, v134+4 ; v128 = 1
-;; @0062 store.i64 notrap aligned v51, v134+8
+;; @0062 store notrap aligned region2 v128, v134+4 ; v128 = 1
+;; @0062 store.i64 notrap aligned region2 v51, v134+8
;; v135 = iadd.i64 v0, v52 ; v52 = 48
-;; @0062 store notrap aligned v135, v51
-;; @0062 store notrap aligned v128, v134 ; v128 = 1
-;; @0062 store notrap aligned v128, v27+40 ; v128 = 1
+;; @0062 store notrap aligned region5 v135, v51
+;; @0062 store notrap aligned region2 v128, v134 ; v128 = 1
+;; @0062 store notrap aligned region2 v128, v27+40 ; v128 = 1
;; v136 = iconst.i64 80
;; v137 = iadd v24, v136 ; v136 = 80
-;; @0062 v62 = load.i64 notrap aligned v137
+;; @0062 v62 = load.i64 notrap aligned region2 v137
;; v138 = iconst.i64 -24
;; v139 = iadd v62, v138 ; v138 = -24
;; v140 = iconst.i64 0x0001_0000_0000
;; @0062 v65 = stack_switch v139, v139, v140 ; v140 = 0x0001_0000_0000
-;; @0062 v67 = load.i64 notrap aligned region2 v25+88
-;; @0062 v68 = load.i64 notrap aligned region2 v25+96
-;; @0062 store notrap aligned region2 v26, v25+88
-;; @0062 store notrap aligned region2 v27, v25+96
-;; @0062 store notrap aligned v128, v132 ; v128 = 1
+;; @0062 v67 = load.i64 notrap aligned region3 v25+88
+;; @0062 v68 = load.i64 notrap aligned region3 v25+96
+;; @0062 store notrap aligned region3 v26, v25+88
+;; @0062 store notrap aligned region3 v27, v25+96
+;; @0062 store notrap aligned region2 v128, v132 ; v128 = 1
;; v141 = iconst.i32 0
-;; @0062 store notrap aligned v141, v134 ; v141 = 0
-;; @0062 store notrap aligned v141, v134+4 ; v141 = 0
-;; @0062 store notrap aligned v126, v134+8 ; v126 = 0
-;; @0062 store notrap aligned v126, v27+40 ; v126 = 0
+;; @0062 store notrap aligned region2 v141, v134 ; v141 = 0
+;; @0062 store notrap aligned region2 v141, v134+4 ; v141 = 0
+;; @0062 store notrap aligned region2 v126, v134+8 ; v126 = 0
+;; @0062 store notrap aligned region2 v126, v27+40 ; v126 = 0
;; v142 = iconst.i64 32
;; v143 = ushr v65, v142 ; v142 = 32
;; @0062 brif v143, block7, block6
;;
;; block7:
-;; @0062 v82 = load.i64 notrap aligned region3 v25+72
-;; @0062 store notrap aligned v82, v68+8
-;; @0062 v85 = load.i64 notrap aligned v27
+;; @0062 v82 = load.i64 notrap aligned region4 v25+72
+;; @0062 store notrap aligned region2 v82, v68+8
+;; @0062 v85 = load.i64 notrap aligned region2 v27
;; @0062 store notrap aligned region1 v85, v25+24
-;; @0062 v86 = load.i64 notrap aligned v27+8
-;; @0062 store notrap aligned region3 v86, v25+72
-;; @0062 v88 = load.i64 notrap aligned v68+72
+;; @0062 v86 = load.i64 notrap aligned region2 v27+8
+;; @0062 store notrap aligned region4 v86, v25+72
+;; @0062 v88 = load.i64 notrap aligned region2 v68+72
;; @0062 jump block8
;;
;; block9 cold:
@@ -274,10 +278,10 @@
;; block10:
;; @0062 v95 = iconst.i64 120
;; @0062 v96 = iadd.i64 v68, v95 ; v95 = 120
-;; @0062 v97 = load.i64 notrap aligned v96+8
-;; @0062 v98 = load.i32 notrap aligned v97
+;; @0062 v97 = load.i64 notrap aligned region2 v96+8
+;; @0062 v98 = load.i32 notrap aligned region5 v97
;; v148 = iconst.i32 0
-;; @0062 store notrap aligned v148, v96 ; v148 = 0
+;; @0062 store notrap aligned region2 v148, v96 ; v148 = 0
;; @0062 jump block4
;;
;; block8:
@@ -285,22 +289,22 @@
;; @0062 br_table v87, block9, [block10]
;;
;; block6:
-;; @0062 v102 = load.i64 notrap aligned v27
+;; @0062 v102 = load.i64 notrap aligned region2 v27
;; @0062 store notrap aligned region1 v102, v25+24
-;; @0062 v103 = load.i64 notrap aligned v27+8
-;; @0062 store notrap aligned region3 v103, v25+72
+;; @0062 v103 = load.i64 notrap aligned region2 v27+8
+;; @0062 store notrap aligned region4 v103, v25+72
;; @0062 v106 = iconst.i32 4
;; v144 = iconst.i64 16
;; v145 = iadd.i64 v68, v144 ; v144 = 16
-;; @0062 store notrap aligned v106, v145 ; v106 = 4
+;; @0062 store notrap aligned region2 v106, v145 ; v106 = 4
;; @0062 v109 = iconst.i64 104
;; @0062 v110 = iadd.i64 v68, v109 ; v109 = 104
-;; @0062 v111 = load.i64 notrap aligned v110+8
+;; @0062 v111 = load.i64 notrap aligned region2 v110+8
;; v146 = iconst.i32 0
-;; @0062 store notrap aligned v146, v110 ; v146 = 0
-;; @0062 store notrap aligned v146, v110+4 ; v146 = 0
+;; @0062 store notrap aligned region2 v146, v110 ; v146 = 0
+;; @0062 store notrap aligned region2 v146, v110+4 ; v146 = 0
;; v147 = iconst.i64 0
-;; @0062 store notrap aligned v147, v110+8 ; v147 = 0
+;; @0062 store notrap aligned region2 v147, v110+8 ; v147 = 0
;; @0068 return
;;
;; block4:
diff --git a/tests/disas/stack-switching/resume-suspend.wat b/tests/disas/stack-switching/resume-suspend.wat
index c5eee27179..080783358e 100644
--- a/tests/disas/stack-switching/resume-suspend.wat
+++ b/tests/disas/stack-switching/resume-suspend.wat
@@ -24,8 +24,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435544 "VMStoreContext+0x58"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 134217816 "VMStoreContext+0x58"
+;; region3 = 2147483648 "VMContRef+0x0"
+;; region4 = 2281701376 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,12 +49,12 @@
;; @003b jump block3
;;
;; block3:
-;; @003b v11 = load.i64 notrap aligned v8+48
-;; @003b v12 = load.i64 notrap aligned v8+56
+;; @003b v11 = load.i64 notrap aligned region3 v8+48
+;; @003b v12 = load.i64 notrap aligned region3 v8+56
;; v62 = iconst.i64 24
;; v63 = iadd v12, v62 ; v62 = 24
-;; @003b v15 = load.i64 notrap aligned v63+8
-;; @003b v16 = load.i32 notrap aligned v12+40
+;; @003b v15 = load.i64 notrap aligned region3 v63+8
+;; @003b v16 = load.i32 notrap aligned region3 v12+40
;; v64 = iconst.i32 0
;; v54 = iconst.i32 3
;; @003b v2 = iconst.i64 48
@@ -69,7 +71,7 @@
;; v66 = ishl.i32 v18, v65 ; v65 = 3
;; @003b v22 = uextend.i64 v66
;; @003b v23 = iadd.i64 v15, v22
-;; @003b v24 = load.i64 notrap aligned v23
+;; @003b v24 = load.i64 notrap aligned region4 v23
;; v67 = iadd.i64 v0, v2 ; v2 = 48
;; v68 = icmp eq v24, v67
;; v69 = iconst.i32 1
@@ -77,17 +79,17 @@
;; @003b brif v68, block6, block4(v70)
;;
;; block6:
-;; @003b store.i64 notrap aligned v8, v6+64
+;; @003b store.i64 notrap aligned region3 v8, v6+64
;; v71 = iconst.i32 3
;; @003b v33 = iconst.i64 16
;; @003b v34 = iadd.i64 v6, v33 ; v33 = 16
-;; @003b store notrap aligned v71, v34 ; v71 = 3
+;; @003b store notrap aligned region3 v71, v34 ; v71 = 3
;; @003b v30 = iconst.i64 0
-;; @003b store notrap aligned v30, v8+48 ; v30 = 0
-;; @003b store notrap aligned v30, v8+56 ; v30 = 0
+;; @003b store notrap aligned region3 v30, v8+48 ; v30 = 0
+;; @003b store notrap aligned region3 v30, v8+56 ; v30 = 0
;; @003b v42 = iconst.i64 80
;; @003b v43 = iadd.i64 v8, v42 ; v42 = 80
-;; @003b v44 = load.i64 notrap aligned v43
+;; @003b v44 = load.i64 notrap aligned region3 v43
;; @003b v45 = iconst.i64 -24
;; @003b v46 = iadd v44, v45 ; v45 = -24
;; @003b v40 = uextend.i64 v18
@@ -96,11 +98,11 @@
;; @003b v47 = stack_switch v46, v46, v58
;; @003b v28 = iconst.i64 120
;; @003b v29 = iadd.i64 v6, v28 ; v28 = 120
-;; @003b v50 = load.i64 notrap aligned v29+8
+;; @003b v50 = load.i64 notrap aligned region3 v29+8
;; v72 = iconst.i32 0
-;; @003b store notrap aligned v72, v29 ; v72 = 0
-;; @003b store notrap aligned v72, v29+4 ; v72 = 0
-;; @003b store notrap aligned v30, v29+8 ; v30 = 0
+;; @003b store notrap aligned region3 v72, v29 ; v72 = 0
+;; @003b store notrap aligned region3 v72, v29+4 ; v72 = 0
+;; @003b store notrap aligned region3 v30, v29+8 ; v30 = 0
;; @003d jump block1
;;
;; block1:
@@ -110,9 +112,11 @@
;; function u0:1(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435544 "VMStoreContext+0x58"
-;; region3 = 268435528 "VMStoreContext+0x48"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 2147483648 "VMContRef+0x0"
+;; region3 = 134217816 "VMStoreContext+0x58"
+;; region4 = 134217800 "VMStoreContext+0x48"
+;; region5 = 2281701376 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -127,7 +131,7 @@
;; @0043 v10 = call fn0(v0, v9) ; v9 = 0
;; @0045 trapz v10, user16
;; @0045 v13 = call fn1(v0, v10, v9, v9) ; v9 = 0, v9 = 0
-;; @0045 v14 = load.i64 notrap aligned v13+72
+;; @0045 v14 = load.i64 notrap aligned region2 v13+72
;; @004e jump block3
;;
;; block3:
@@ -137,7 +141,7 @@
;; v132 = ireduce.i64 v130
;; v134 = bor v132, v13
;; @004e trapz v134, user16
-;; @004e v26 = load.i64 notrap aligned v134+72
+;; @004e v26 = load.i64 notrap aligned region2 v134+72
;; @0045 v15 = uextend.i128 v13
;; @0045 v20 = bor v130, v15
;; v136 = ushr v20, v5 ; v5 = 64
@@ -146,72 +150,72 @@
;; @004e trapz v27, user23
;; @004e v28 = iconst.i64 1
;; @004e v29 = iadd v26, v28 ; v28 = 1
-;; @004e store notrap aligned v29, v134+72
-;; @004e v30 = load.i64 notrap aligned v134+64
+;; @004e store notrap aligned region2 v29, v134+72
+;; @004e v30 = load.i64 notrap aligned region2 v134+64
;; @004e v31 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; @004e v32 = load.i64 notrap aligned region2 v31+88
-;; @004e v33 = load.i64 notrap aligned region2 v31+96
-;; @004e store notrap aligned v32, v30+48
-;; @004e store notrap aligned v33, v30+56
+;; @004e v32 = load.i64 notrap aligned region3 v31+88
+;; @004e v33 = load.i64 notrap aligned region3 v31+96
+;; @004e store notrap aligned region2 v32, v30+48
+;; @004e store notrap aligned region2 v33, v30+56
;; @0040 v2 = iconst.i64 0
-;; @004e store notrap aligned v2, v134+64 ; v2 = 0
+;; @004e store notrap aligned region2 v2, v134+64 ; v2 = 0
;; @004e v35 = iconst.i64 2
-;; @004e store notrap aligned region2 v35, v31+88 ; v35 = 2
-;; @004e store notrap aligned region2 v134, v31+96
+;; @004e store notrap aligned region3 v35, v31+88 ; v35 = 2
+;; @004e store notrap aligned region3 v134, v31+96
;; @004e v39 = iconst.i32 1
;; @004e v40 = iconst.i64 16
;; @004e v41 = iadd v134, v40 ; v40 = 16
-;; @004e store notrap aligned v39, v41 ; v39 = 1
+;; @004e store notrap aligned region2 v39, v41 ; v39 = 1
;; @004e v42 = iconst.i32 2
;; @004e v44 = iadd v33, v40 ; v40 = 16
-;; @004e store notrap aligned v42, v44 ; v42 = 2
-;; @004e v48 = load.i64 notrap aligned region3 v31+72
-;; @004e store notrap aligned v48, v33+8
+;; @004e store notrap aligned region2 v42, v44 ; v42 = 2
+;; @004e v48 = load.i64 notrap aligned region4 v31+72
+;; @004e store notrap aligned region2 v48, v33+8
;; @004e v49 = load.i64 notrap aligned region1 v31+24
-;; @004e store notrap aligned v49, v33
-;; @004e v52 = load.i64 notrap aligned v134
+;; @004e store notrap aligned region2 v49, v33
+;; @004e v52 = load.i64 notrap aligned region2 v134
;; @004e store notrap aligned region1 v52, v31+24
-;; @004e v53 = load.i64 notrap aligned v134+8
-;; @004e store notrap aligned region3 v53, v31+72
+;; @004e v53 = load.i64 notrap aligned region2 v134+8
+;; @004e store notrap aligned region4 v53, v31+72
;; @004e v54 = iconst.i64 24
;; @004e v55 = iadd v33, v54 ; v54 = 24
-;; @004e store notrap aligned v39, v55+4 ; v39 = 1
+;; @004e store notrap aligned region2 v39, v55+4 ; v39 = 1
;; @004e v57 = stack_addr.i64 ss0
-;; @004e store notrap aligned v57, v55+8
+;; @004e store notrap aligned region2 v57, v55+8
;; @004e v58 = iconst.i64 48
;; @004e v59 = iadd.i64 v0, v58 ; v58 = 48
-;; @004e store notrap aligned v59, v57
-;; @004e store notrap aligned v39, v55 ; v39 = 1
-;; @004e store notrap aligned v39, v33+40 ; v39 = 1
+;; @004e store notrap aligned region5 v59, v57
+;; @004e store notrap aligned region2 v39, v55 ; v39 = 1
+;; @004e store notrap aligned region2 v39, v33+40 ; v39 = 1
;; @004e v66 = iconst.i64 80
;; @004e v67 = iadd v30, v66 ; v66 = 80
-;; @004e v68 = load.i64 notrap aligned v67
+;; @004e v68 = load.i64 notrap aligned region2 v67
;; @004e v69 = iconst.i64 -24
;; @004e v70 = iadd v68, v69 ; v69 = -24
;; v138 = iconst.i64 0x0001_0000_0000
;; @004e v71 = stack_switch v70, v70, v138 ; v138 = 0x0001_0000_0000
-;; @004e v73 = load.i64 notrap aligned region2 v31+88
-;; @004e v74 = load.i64 notrap aligned region2 v31+96
-;; @004e store notrap aligned region2 v32, v31+88
-;; @004e store notrap aligned region2 v33, v31+96
-;; @004e store notrap aligned v39, v44 ; v39 = 1
+;; @004e v73 = load.i64 notrap aligned region3 v31+88
+;; @004e v74 = load.i64 notrap aligned region3 v31+96
+;; @004e store notrap aligned region3 v32, v31+88
+;; @004e store notrap aligned region3 v33, v31+96
+;; @004e store notrap aligned region2 v39, v44 ; v39 = 1
;; v141 = iconst.i32 0
-;; @004e store notrap aligned v141, v55 ; v141 = 0
-;; @004e store notrap aligned v141, v55+4 ; v141 = 0
-;; @004e store notrap aligned v2, v55+8 ; v2 = 0
-;; @004e store notrap aligned v2, v33+40 ; v2 = 0
+;; @004e store notrap aligned region2 v141, v55 ; v141 = 0
+;; @004e store notrap aligned region2 v141, v55+4 ; v141 = 0
+;; @004e store notrap aligned region2 v2, v55+8 ; v2 = 0
+;; @004e store notrap aligned region2 v2, v33+40 ; v2 = 0
;; @004e v64 = iconst.i64 32
;; @004e v83 = ushr v71, v64 ; v64 = 32
;; @004e brif v83, block5, block4
;;
;; block5:
-;; @004e v88 = load.i64 notrap aligned region3 v31+72
-;; @004e store notrap aligned v88, v74+8
-;; @004e v91 = load.i64 notrap aligned v33
+;; @004e v88 = load.i64 notrap aligned region4 v31+72
+;; @004e store notrap aligned region2 v88, v74+8
+;; @004e v91 = load.i64 notrap aligned region2 v33
;; @004e store notrap aligned region1 v91, v31+24
-;; @004e v92 = load.i64 notrap aligned v33+8
-;; @004e store notrap aligned region3 v92, v31+72
-;; @004e v94 = load.i64 notrap aligned v74+72
+;; @004e v92 = load.i64 notrap aligned region2 v33+8
+;; @004e store notrap aligned region4 v92, v31+72
+;; @004e v94 = load.i64 notrap aligned region2 v74+72
;; @004e jump block6
;;
;; block7 cold:
@@ -220,9 +224,9 @@
;; block8:
;; @004e v101 = iconst.i64 120
;; @004e v102 = iadd.i64 v74, v101 ; v101 = 120
-;; @004e v103 = load.i64 notrap aligned v102+8
+;; @004e v103 = load.i64 notrap aligned region2 v102+8
;; v149 = iconst.i32 0
-;; @004e store notrap aligned v149, v102 ; v149 = 0
+;; @004e store notrap aligned region2 v149, v102 ; v149 = 0
;; @004e v96 = uextend.i128 v94
;; v150 = iconst.i64 64
;; v151 = ishl v96, v150 ; v150 = 64
@@ -235,22 +239,22 @@
;; @004e br_table v93, block7, [block8]
;;
;; block4:
-;; @004e v107 = load.i64 notrap aligned v33
+;; @004e v107 = load.i64 notrap aligned region2 v33
;; @004e store notrap aligned region1 v107, v31+24
-;; @004e v108 = load.i64 notrap aligned v33+8
-;; @004e store notrap aligned region3 v108, v31+72
+;; @004e v108 = load.i64 notrap aligned region2 v33+8
+;; @004e store notrap aligned region4 v108, v31+72
;; @004e v111 = iconst.i32 4
;; v142 = iconst.i64 16
;; v143 = iadd.i64 v74, v142 ; v142 = 16
-;; @004e store notrap aligned v111, v143 ; v111 = 4
+;; @004e store notrap aligned region2 v111, v143 ; v111 = 4
;; @004e v114 = iconst.i64 104
;; @004e v115 = iadd.i64 v74, v114 ; v114 = 104
-;; @004e v116 = load.i64 notrap aligned v115+8
+;; @004e v116 = load.i64 notrap aligned region2 v115+8
;; v144 = iconst.i32 0
-;; @004e store notrap aligned v144, v115 ; v144 = 0
-;; @004e store notrap aligned v144, v115+4 ; v144 = 0
+;; @004e store notrap aligned region2 v144, v115 ; v144 = 0
+;; @004e store notrap aligned region2 v144, v115+4 ; v144 = 0
;; v145 = iconst.i64 0
-;; @004e store notrap aligned v145, v115+8 ; v145 = 0
+;; @004e store notrap aligned region2 v145, v115+8 ; v145 = 0
;; v146 = uextend.i128 v145 ; v145 = 0
;; v147 = iconst.i64 64
;; v148 = ishl v146, v147 ; v147 = 64
diff --git a/tests/disas/stack-switching/symmetric-switch.wat b/tests/disas/stack-switching/symmetric-switch.wat
index 06d2b6e585..5ce5dea80b 100644
--- a/tests/disas/stack-switching/symmetric-switch.wat
+++ b/tests/disas/stack-switching/symmetric-switch.wat
@@ -28,9 +28,11 @@
;; function u0:0(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 24, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435544 "VMStoreContext+0x58"
-;; region3 = 268435528 "VMStoreContext+0x48"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 2147483648 "VMContRef+0x0"
+;; region3 = 134217816 "VMStoreContext+0x58"
+;; region4 = 2281701376 "ContinuationStackMemory+0x0"
+;; region5 = 134217800 "VMStoreContext+0x48"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,7 +49,7 @@
;; @003c v4 = iconst.i32 1
;; @003c v5 = iconst.i32 0
;; @003c v6 = call fn1(v0, v3, v4, v5) ; v4 = 1, v5 = 0
-;; @003c v7 = load.i64 notrap aligned v6+72
+;; @003c v7 = load.i64 notrap aligned region2 v6+72
;; @003c v8 = uextend.i128 v6
;; @003c v9 = uextend.i128 v7
;; @003c v10 = iconst.i64 64
@@ -60,17 +62,17 @@
;; @003e v17 = ushr v13, v16
;; @003e v18 = ireduce.i64 v17
;; @003e trapz v14, user16
-;; @003e v19 = load.i64 notrap aligned v14+72
+;; @003e v19 = load.i64 notrap aligned region2 v14+72
;; @003e v20 = icmp eq v19, v18
;; @003e trapz v20, user23
;; @003e v21 = iconst.i64 1
;; @003e v22 = iadd v19, v21 ; v21 = 1
-;; @003e store notrap aligned v22, v14+72
+;; @003e store notrap aligned region2 v22, v14+72
;; @003e v23 = iconst.i64 48
;; @003e v24 = iadd v0, v23 ; v23 = 48
;; @003e v25 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; @003e v26 = load.i64 notrap aligned region2 v25+88
-;; @003e v27 = load.i64 notrap aligned region2 v25+96
+;; @003e v26 = load.i64 notrap aligned region3 v25+88
+;; @003e v27 = load.i64 notrap aligned region3 v25+96
;; @003e jump block2(v26, v27)
;;
;; block2(v28: i64, v29: i64):
@@ -79,13 +81,13 @@
;; @003e brif v31, block7, block3
;;
;; block3:
-;; @003e v32 = load.i64 notrap aligned v29+48
-;; @003e v33 = load.i64 notrap aligned v29+56
+;; @003e v32 = load.i64 notrap aligned region2 v29+48
+;; @003e v33 = load.i64 notrap aligned region2 v29+56
;; @003e v34 = iconst.i64 24
;; @003e v35 = iadd v33, v34 ; v34 = 24
-;; @003e v36 = load.i64 notrap aligned v35+8
-;; @003e v37 = load.i32 notrap aligned v33+40
-;; @003e v38 = load.i32 notrap aligned v35
+;; @003e v36 = load.i64 notrap aligned region2 v35+8
+;; @003e v37 = load.i32 notrap aligned region2 v33+40
+;; @003e v38 = load.i32 notrap aligned region2 v35
;; @003e jump block4(v37)
;;
;; block4(v39: i32):
@@ -97,7 +99,7 @@
;; @003e v42 = imul.i32 v39, v41 ; v41 = 8
;; @003e v43 = uextend.i64 v42
;; @003e v44 = iadd.i64 v36, v43
-;; @003e v45 = load.i64 notrap aligned v44
+;; @003e v45 = load.i64 notrap aligned region4 v44
;; @003e v46 = icmp eq v45, v24
;; @003e v47 = iconst.i32 1
;; @003e v48 = iadd.i32 v39, v47 ; v47 = 1
@@ -107,7 +109,7 @@
;; @003e trap user22
;;
;; block6:
-;; @003e store.i64 notrap aligned v29, v27+64
+;; @003e store.i64 notrap aligned region2 v29, v27+64
;; @003e v49 = iconst.i64 120
;; @003e v50 = iadd.i64 v27, v49 ; v49 = 120
;; @003e v51 = iconst.i64 0
@@ -115,17 +117,17 @@
;; @003e v53 = iconst.i32 3
;; @003e v54 = iconst.i64 16
;; @003e v55 = iadd v52, v54 ; v54 = 16
-;; @003e store notrap aligned v53, v55 ; v53 = 3
+;; @003e store notrap aligned region2 v53, v55 ; v53 = 3
;; @003e v56 = iconst.i64 0
;; @003e v57 = iconst.i64 0
-;; @003e store notrap aligned v56, v29+48 ; v56 = 0
-;; @003e store notrap aligned v57, v29+56 ; v57 = 0
+;; @003e store notrap aligned region2 v56, v29+48 ; v56 = 0
+;; @003e store notrap aligned region2 v57, v29+56 ; v57 = 0
;; @003e v58 = load.i64 notrap aligned readonly can_move region0 v0+8
;; @003e v59 = iconst.i64 0
;; @003e v60 = iadd v52, v59 ; v59 = 0
-;; @003e v61 = load.i64 notrap aligned region3 v58+72
-;; @003e store notrap aligned v61, v60+8
-;; @003e v62 = load.i64 notrap aligned v27+72
+;; @003e v61 = load.i64 notrap aligned region5 v58+72
+;; @003e store notrap aligned region2 v61, v60+8
+;; @003e v62 = load.i64 notrap aligned region2 v27+72
;; @003e v63 = uextend.i128 v27
;; @003e v64 = uextend.i128 v62
;; @003e v65 = iconst.i64 64
@@ -136,7 +138,7 @@
;; @003e v71 = iadd.i64 v14, v70 ; v70 = 0
;; @003e v72 = iconst.i64 16
;; @003e v73 = iadd v71, v72 ; v72 = 16
-;; @003e v74 = load.i32 notrap aligned v73
+;; @003e v74 = load.i32 notrap aligned region2 v73
;; @003e v75 = iconst.i32 0
;; @003e v76 = icmp ne v74, v75 ; v75 = 0
;; @003e brif v76, block9, block8
@@ -144,11 +146,11 @@
;; block8:
;; @003e v77 = iconst.i64 104
;; @003e v78 = iadd.i64 v14, v77 ; v77 = 104
-;; @003e v79 = load.i64 notrap aligned v78+8
-;; @003e v80 = load.i32 notrap aligned v78
+;; @003e v79 = load.i64 notrap aligned region2 v78+8
+;; @003e v80 = load.i32 notrap aligned region2 v78
;; @003e v81 = iconst.i32 1
;; @003e v82 = iadd v80, v81 ; v81 = 1
-;; @003e store notrap aligned v82, v78
+;; @003e store notrap aligned region2 v82, v78
;; @003e v83 = uextend.i64 v80
;; @003e v84 = iconst.i64 16
;; @003e v85 = imul v83, v84 ; v84 = 16
@@ -158,11 +160,11 @@
;; block9:
;; @003e v87 = iconst.i64 120
;; @003e v88 = iadd.i64 v14, v87 ; v87 = 120
-;; @003e v89 = load.i64 notrap aligned v88+8
-;; @003e v90 = load.i32 notrap aligned v88
+;; @003e v89 = load.i64 notrap aligned region2 v88+8
+;; @003e v90 = load.i32 notrap aligned region2 v88
;; @003e v91 = iconst.i32 1
;; @003e v92 = iadd v90, v91 ; v91 = 1
-;; @003e store notrap aligned v92, v88
+;; @003e store notrap aligned region2 v92, v88
;; @003e v93 = uextend.i64 v90
;; @003e v94 = iconst.i64 16
;; @003e v95 = imul v93, v94 ; v94 = 16
@@ -170,62 +172,62 @@
;; @003e jump block10(v96)
;;
;; block10(v69: i64):
-;; @003e store.i128 notrap aligned v68, v69
+;; @003e store.i128 notrap aligned region4 v68, v69
;; @003e v97 = iconst.i64 0
;; @003e v98 = iadd.i64 v14, v97 ; v97 = 0
;; @003e v99 = iconst.i32 1
;; @003e v100 = iconst.i64 16
;; @003e v101 = iadd v98, v100 ; v100 = 16
-;; @003e store notrap aligned v99, v101 ; v99 = 1
-;; @003e v102 = load.i64 notrap aligned v14+64
-;; @003e store.i64 notrap aligned v32, v102+48
-;; @003e store.i64 notrap aligned v33, v102+56
+;; @003e store notrap aligned region2 v99, v101 ; v99 = 1
+;; @003e v102 = load.i64 notrap aligned region2 v14+64
+;; @003e store.i64 notrap aligned region2 v32, v102+48
+;; @003e store.i64 notrap aligned region2 v33, v102+56
;; @003e v103 = iconst.i64 2
;; @003e v104 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; @003e store notrap aligned region2 v103, v104+88 ; v103 = 2
-;; @003e store.i64 notrap aligned region2 v14, v104+96
+;; @003e store notrap aligned region3 v103, v104+88 ; v103 = 2
+;; @003e store.i64 notrap aligned region3 v14, v104+96
;; @003e v105 = iconst.i64 0
;; @003e v106 = iadd v98, v105 ; v105 = 0
-;; @003e v107 = load.i64 notrap aligned v106
+;; @003e v107 = load.i64 notrap aligned region2 v106
;; @003e store notrap aligned region1 v107, v58+24
-;; @003e v108 = load.i64 notrap aligned v106+8
-;; @003e store notrap aligned region3 v108, v58+72
+;; @003e v108 = load.i64 notrap aligned region2 v106+8
+;; @003e store notrap aligned region5 v108, v58+72
;; @003e v109 = iconst.i64 80
;; @003e v110 = iadd.i64 v29, v109 ; v109 = 80
-;; @003e v111 = load.i64 notrap aligned v110
+;; @003e v111 = load.i64 notrap aligned region2 v110
;; @003e v112 = iconst.i64 -24
;; @003e v113 = iadd v111, v112 ; v112 = -24
;; @003e v114 = iconst.i64 80
;; @003e v115 = iadd v102, v114 ; v114 = 80
-;; @003e v116 = load.i64 notrap aligned v115
+;; @003e v116 = load.i64 notrap aligned region2 v115
;; @003e v117 = iconst.i64 -24
;; @003e v118 = iadd v116, v117 ; v117 = -24
;; @003e v119 = stack_addr.i64 ss0
-;; @003e v120 = load.i64 notrap aligned v118
+;; @003e v120 = load.i64 notrap aligned region4 v118
;; @003e store notrap aligned v120, v119
-;; @003e v121 = load.i64 notrap aligned v113
-;; @003e store notrap aligned v121, v118
-;; @003e v122 = load.i64 notrap aligned v118+8
+;; @003e v121 = load.i64 notrap aligned region4 v113
+;; @003e store notrap aligned region4 v121, v118
+;; @003e v122 = load.i64 notrap aligned region4 v118+8
;; @003e store notrap aligned v122, v119+8
-;; @003e v123 = load.i64 notrap aligned v113+8
-;; @003e store notrap aligned v123, v118+8
-;; @003e v124 = load.i64 notrap aligned v118+16
+;; @003e v123 = load.i64 notrap aligned region4 v113+8
+;; @003e store notrap aligned region4 v123, v118+8
+;; @003e v124 = load.i64 notrap aligned region4 v118+16
;; @003e store notrap aligned v124, v119+16
-;; @003e v125 = load.i64 notrap aligned v113+16
-;; @003e store notrap aligned v125, v118+16
+;; @003e v125 = load.i64 notrap aligned region4 v113+16
+;; @003e store notrap aligned region4 v125, v118+16
;; @003e v126 = iconst.i64 3
;; @003e v127 = iconst.i64 32
;; @003e v128 = ishl v126, v127 ; v126 = 3, v127 = 32
;; @003e v129 = stack_switch v113, v119, v128
;; @003e v130 = iconst.i64 120
;; @003e v131 = iadd.i64 v27, v130 ; v130 = 120
-;; @003e v132 = load.i64 notrap aligned v131+8
+;; @003e v132 = load.i64 notrap aligned region2 v131+8
;; @003e v133 = iconst.i32 0
-;; @003e store notrap aligned v133, v131 ; v133 = 0
+;; @003e store notrap aligned region2 v133, v131 ; v133 = 0
;; @003e v134 = iconst.i32 0
-;; @003e store notrap aligned v134, v131+4 ; v134 = 0
+;; @003e store notrap aligned region2 v134, v131+4 ; v134 = 0
;; @003e v135 = iconst.i64 0
-;; @003e store notrap aligned v135, v131+8 ; v135 = 0
+;; @003e store notrap aligned region2 v135, v131+8 ; v135 = 0
;; @0041 jump block1
;;
;; block1:
@@ -234,7 +236,7 @@
;;
;; function u0:1(i64 vmctx, i64, i128) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -250,9 +252,11 @@
;; function u0:2(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 268435544 "VMStoreContext+0x58"
-;; region3 = 268435528 "VMStoreContext+0x48"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 2147483648 "VMContRef+0x0"
+;; region3 = 134217816 "VMStoreContext+0x58"
+;; region4 = 134217800 "VMStoreContext+0x48"
+;; region5 = 2281701376 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -269,7 +273,7 @@
;; @0049 v4 = iconst.i32 0
;; @0049 v5 = iconst.i32 0
;; @0049 v6 = call fn1(v0, v3, v4, v5) ; v4 = 0, v5 = 0
-;; @0049 v7 = load.i64 notrap aligned v6+72
+;; @0049 v7 = load.i64 notrap aligned region2 v6+72
;; @0049 v8 = uextend.i128 v6
;; @0049 v9 = uextend.i128 v7
;; @0049 v10 = iconst.i64 64
@@ -285,87 +289,87 @@
;; @004b v17 = ushr.i128 v13, v16
;; @004b v18 = ireduce.i64 v17
;; @004b trapz v14, user16
-;; @004b v19 = load.i64 notrap aligned v14+72
+;; @004b v19 = load.i64 notrap aligned region2 v14+72
;; @004b v20 = icmp eq v19, v18
;; @004b trapz v20, user23
;; @004b v21 = iconst.i64 1
;; @004b v22 = iadd v19, v21 ; v21 = 1
-;; @004b store notrap aligned v22, v14+72
-;; @004b v23 = load.i64 notrap aligned v14+64
+;; @004b store notrap aligned region2 v22, v14+72
+;; @004b v23 = load.i64 notrap aligned region2 v14+64
;; @004b v24 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; @004b v25 = load.i64 notrap aligned region2 v24+88
-;; @004b v26 = load.i64 notrap aligned region2 v24+96
-;; @004b store notrap aligned v25, v23+48
-;; @004b store notrap aligned v26, v23+56
+;; @004b v25 = load.i64 notrap aligned region3 v24+88
+;; @004b v26 = load.i64 notrap aligned region3 v24+96
+;; @004b store notrap aligned region2 v25, v23+48
+;; @004b store notrap aligned region2 v26, v23+56
;; @004b v27 = iconst.i64 0
-;; @004b store notrap aligned v27, v14+64 ; v27 = 0
+;; @004b store notrap aligned region2 v27, v14+64 ; v27 = 0
;; @004b v28 = iconst.i64 2
;; @004b v29 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; @004b store notrap aligned region2 v28, v29+88 ; v28 = 2
-;; @004b store notrap aligned region2 v14, v29+96
+;; @004b store notrap aligned region3 v28, v29+88 ; v28 = 2
+;; @004b store notrap aligned region3 v14, v29+96
;; @004b v30 = iconst.i64 0
;; @004b v31 = iadd v14, v30 ; v30 = 0
;; @004b v32 = iconst.i32 1
;; @004b v33 = iconst.i64 16
;; @004b v34 = iadd v31, v33 ; v33 = 16
-;; @004b store notrap aligned v32, v34 ; v32 = 1
+;; @004b store notrap aligned region2 v32, v34 ; v32 = 1
;; @004b v35 = iconst.i32 2
;; @004b v36 = iconst.i64 16
;; @004b v37 = iadd v26, v36 ; v36 = 16
-;; @004b store notrap aligned v35, v37 ; v35 = 2
+;; @004b store notrap aligned region2 v35, v37 ; v35 = 2
;; @004b v38 = load.i64 notrap aligned readonly can_move region0 v0+8
;; @004b v39 = iconst.i64 0
;; @004b v40 = iadd v26, v39 ; v39 = 0
-;; @004b v41 = load.i64 notrap aligned region3 v38+72
-;; @004b store notrap aligned v41, v40+8
+;; @004b v41 = load.i64 notrap aligned region4 v38+72
+;; @004b store notrap aligned region2 v41, v40+8
;; @004b v42 = load.i64 notrap aligned region1 v38+24
-;; @004b store notrap aligned v42, v40
+;; @004b store notrap aligned region2 v42, v40
;; @004b v43 = iconst.i64 0
;; @004b v44 = iadd v31, v43 ; v43 = 0
-;; @004b v45 = load.i64 notrap aligned v44
+;; @004b v45 = load.i64 notrap aligned region2 v44
;; @004b store notrap aligned region1 v45, v38+24
-;; @004b v46 = load.i64 notrap aligned v44+8
-;; @004b store notrap aligned region3 v46, v38+72
+;; @004b v46 = load.i64 notrap aligned region2 v44+8
+;; @004b store notrap aligned region4 v46, v38+72
;; @004b v47 = iconst.i64 24
;; @004b v48 = iadd v26, v47 ; v47 = 24
;; @004b v49 = iconst.i32 1
;; @004b v50 = stack_addr.i64 ss0
-;; @004b store notrap aligned v49, v48+4 ; v49 = 1
-;; @004b store notrap aligned v50, v48+8
+;; @004b store notrap aligned region2 v49, v48+4 ; v49 = 1
+;; @004b store notrap aligned region2 v50, v48+8
;; @004b v51 = iconst.i64 48
;; @004b v52 = iadd.i64 v0, v51 ; v51 = 48
;; @004b v53 = iconst.i32 1
-;; @004b v54 = load.i64 notrap aligned v48+8
-;; @004b store notrap aligned v52, v54
-;; @004b store notrap aligned v53, v48 ; v53 = 1
+;; @004b v54 = load.i64 notrap aligned region2 v48+8
+;; @004b store notrap aligned region5 v52, v54
+;; @004b store notrap aligned region2 v53, v48 ; v53 = 1
;; @004b v55 = iconst.i32 0
-;; @004b store notrap aligned v55, v26+40 ; v55 = 0
+;; @004b store notrap aligned region2 v55, v26+40 ; v55 = 0
;; @004b v56 = iconst.i64 1
;; @004b v57 = iconst.i64 32
;; @004b v58 = ishl v56, v57 ; v56 = 1, v57 = 32
;; @004b v59 = iconst.i64 80
;; @004b v60 = iadd v23, v59 ; v59 = 80
-;; @004b v61 = load.i64 notrap aligned v60
+;; @004b v61 = load.i64 notrap aligned region2 v60
;; @004b v62 = iconst.i64 -24
;; @004b v63 = iadd v61, v62 ; v62 = -24
;; @004b v64 = stack_switch v63, v63, v58
;; @004b v65 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; @004b v66 = load.i64 notrap aligned region2 v65+88
-;; @004b v67 = load.i64 notrap aligned region2 v65+96
+;; @004b v66 = load.i64 notrap aligned region3 v65+88
+;; @004b v67 = load.i64 notrap aligned region3 v65+96
;; @004b v68 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; @004b store notrap aligned region2 v25, v68+88
-;; @004b store notrap aligned region2 v26, v68+96
+;; @004b store notrap aligned region3 v25, v68+88
+;; @004b store notrap aligned region3 v26, v68+96
;; @004b v69 = iconst.i32 1
;; @004b v70 = iconst.i64 16
;; @004b v71 = iadd v26, v70 ; v70 = 16
-;; @004b store notrap aligned v69, v71 ; v69 = 1
+;; @004b store notrap aligned region2 v69, v71 ; v69 = 1
;; @004b v72 = iconst.i32 0
-;; @004b store notrap aligned v72, v48 ; v72 = 0
+;; @004b store notrap aligned region2 v72, v48 ; v72 = 0
;; @004b v73 = iconst.i32 0
-;; @004b store notrap aligned v73, v48+4 ; v73 = 0
+;; @004b store notrap aligned region2 v73, v48+4 ; v73 = 0
;; @004b v74 = iconst.i64 0
-;; @004b store notrap aligned v74, v48+8 ; v74 = 0
-;; @004b store notrap aligned v27, v26+40 ; v27 = 0
+;; @004b store notrap aligned region2 v74, v48+8 ; v74 = 0
+;; @004b store notrap aligned region2 v27, v26+40 ; v27 = 0
;; @004b v75 = iconst.i64 32
;; @004b v76 = ushr v64, v75 ; v75 = 32
;; @004b brif v76, block4, block3
@@ -375,16 +379,16 @@
;; @004b v78 = iadd.i64 v67, v77 ; v77 = 0
;; @004b v79 = iconst.i64 0
;; @004b v80 = iadd v78, v79 ; v79 = 0
-;; @004b v81 = load.i64 notrap aligned region3 v38+72
-;; @004b store notrap aligned v81, v80+8
+;; @004b v81 = load.i64 notrap aligned region4 v38+72
+;; @004b store notrap aligned region2 v81, v80+8
;; @004b v82 = iconst.i64 0
;; @004b v83 = iadd.i64 v26, v82 ; v82 = 0
-;; @004b v84 = load.i64 notrap aligned v83
+;; @004b v84 = load.i64 notrap aligned region2 v83
;; @004b store notrap aligned region1 v84, v38+24
-;; @004b v85 = load.i64 notrap aligned v83+8
-;; @004b store notrap aligned region3 v85, v38+72
+;; @004b v85 = load.i64 notrap aligned region2 v83+8
+;; @004b store notrap aligned region4 v85, v38+72
;; @004b v86 = ireduce.i32 v64
-;; @004b v87 = load.i64 notrap aligned v67+72
+;; @004b v87 = load.i64 notrap aligned region2 v67+72
;; @004b v88 = uextend.i128 v67
;; @004b v89 = uextend.i128 v87
;; @004b v90 = iconst.i64 64
@@ -402,25 +406,25 @@
;; block3:
;; @004b v94 = iconst.i64 0
;; @004b v95 = iadd.i64 v26, v94 ; v94 = 0
-;; @004b v96 = load.i64 notrap aligned v95
+;; @004b v96 = load.i64 notrap aligned region2 v95
;; @004b store notrap aligned region1 v96, v38+24
-;; @004b v97 = load.i64 notrap aligned v95+8
-;; @004b store notrap aligned region3 v97, v38+72
+;; @004b v97 = load.i64 notrap aligned region2 v95+8
+;; @004b store notrap aligned region4 v97, v38+72
;; @004b v98 = iconst.i64 0
;; @004b v99 = iadd.i64 v67, v98 ; v98 = 0
;; @004b v100 = iconst.i32 4
;; @004b v101 = iconst.i64 16
;; @004b v102 = iadd v99, v101 ; v101 = 16
-;; @004b store notrap aligned v100, v102 ; v100 = 4
+;; @004b store notrap aligned region2 v100, v102 ; v100 = 4
;; @004b v103 = iconst.i64 104
;; @004b v104 = iadd.i64 v67, v103 ; v103 = 104
-;; @004b v105 = load.i64 notrap aligned v104+8
+;; @004b v105 = load.i64 notrap aligned region2 v104+8
;; @004b v106 = iconst.i32 0
-;; @004b store notrap aligned v106, v104 ; v106 = 0
+;; @004b store notrap aligned region2 v106, v104 ; v106 = 0
;; @004b v107 = iconst.i32 0
-;; @004b store notrap aligned v107, v104+4 ; v107 = 0
+;; @004b store notrap aligned region2 v107, v104+4 ; v107 = 0
;; @004b v108 = iconst.i64 0
-;; @004b store notrap aligned v108, v104+8 ; v108 = 0
+;; @004b store notrap aligned region2 v108, v104+8 ; v108 = 0
;; @0050 jump block1
;;
;; block1:
diff --git a/tests/disas/startup-data-active.wat b/tests/disas/startup-data-active.wat
index 449e32a58f..d5ffd4c8e3 100644
--- a/tests/disas/startup-data-active.wat
+++ b/tests/disas/startup-data-active.wat
@@ -10,10 +10,10 @@
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435528 "VMStoreContext+0x48"
-;; region2 = 268435520 "VMStoreContext+0x40"
-;; region3 = 268435536 "VMStoreContext+0x50"
-;; region4 = 268435592 "VMStoreContext+0x88"
+;; region1 = 134217800 "VMStoreContext+0x48"
+;; region2 = 134217792 "VMStoreContext+0x40"
+;; region3 = 134217808 "VMStoreContext+0x50"
+;; region4 = 134217864 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -44,8 +44,8 @@
;; function u2415919104:0(i64 vmctx, i64) tail {
;; region0 = 112 "VMContext+0x70"
;; region1 = 120 "VMContext+0x78"
-;; region2 = 2415919112 "VMMemoryDefinition+0x8"
-;; region3 = 2415919104 "VMMemoryDefinition+0x0"
+;; region2 = 1207959560 "VMMemoryDefinition+0x8"
+;; region3 = 1207959552 "VMMemoryDefinition+0x0"
;; sig0 = (i64 vmctx, i64, i64, i64) tail
;; fn0 = colocated u805306368:1 sig0
;;
diff --git a/tests/disas/startup-elem-active.wat b/tests/disas/startup-elem-active.wat
index 4fbd0f4a68..05dfbb23f3 100644
--- a/tests/disas/startup-elem-active.wat
+++ b/tests/disas/startup-elem-active.wat
@@ -14,10 +14,10 @@
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435528 "VMStoreContext+0x48"
-;; region2 = 268435520 "VMStoreContext+0x40"
-;; region3 = 268435536 "VMStoreContext+0x50"
-;; region4 = 268435592 "VMStoreContext+0x88"
+;; region1 = 134217800 "VMStoreContext+0x48"
+;; region2 = 134217792 "VMStoreContext+0x40"
+;; region3 = 134217808 "VMStoreContext+0x50"
+;; region4 = 134217864 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -46,9 +46,9 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 2684354560 "VMTableDefinition+0x0"
-;; region1 = 2684354568 "VMTableDefinition+0x8"
-;; region2 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 1342177280 "VMTableDefinition+0x0"
+;; region1 = 1342177288 "VMTableDefinition+0x8"
+;; region2 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;;
;; block0(v0: i64, v1: i64):
;; v4 = load.i64 notrap aligned region1 v0+56
diff --git a/tests/disas/startup-global.wat b/tests/disas/startup-global.wat
index a345c52e4a..95ebd20d99 100644
--- a/tests/disas/startup-global.wat
+++ b/tests/disas/startup-global.wat
@@ -7,10 +7,10 @@
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435528 "VMStoreContext+0x48"
-;; region2 = 268435520 "VMStoreContext+0x40"
-;; region3 = 268435536 "VMStoreContext+0x50"
-;; region4 = 268435592 "VMStoreContext+0x88"
+;; region1 = 134217800 "VMStoreContext+0x48"
+;; region2 = 134217792 "VMStoreContext+0x40"
+;; region3 = 134217808 "VMStoreContext+0x50"
+;; region4 = 134217864 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -39,7 +39,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;;
;; block0(v0: i64, v1: i64):
;; v2 = iconst.i64 0
diff --git a/tests/disas/startup-passive-segment.wat b/tests/disas/startup-passive-segment.wat
index 1e87184808..ee0f64d475 100644
--- a/tests/disas/startup-passive-segment.wat
+++ b/tests/disas/startup-passive-segment.wat
@@ -8,10 +8,10 @@
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435528 "VMStoreContext+0x48"
-;; region2 = 268435520 "VMStoreContext+0x40"
-;; region3 = 268435536 "VMStoreContext+0x50"
-;; region4 = 268435592 "VMStoreContext+0x88"
+;; region1 = 134217800 "VMStoreContext+0x48"
+;; region2 = 134217792 "VMStoreContext+0x40"
+;; region3 = 134217808 "VMStoreContext+0x50"
+;; region4 = 134217864 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -40,7 +40,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 2147483648 "GcHeap"
+;; region0 = 1073741824 "GcHeap"
;; sig0 = (i64 vmctx, i32) -> i64 tail
;; fn0 = colocated u805306368:4 sig0
;;
diff --git a/tests/disas/startup-start.wat b/tests/disas/startup-start.wat
index 520bdf2a64..033140def2 100644
--- a/tests/disas/startup-start.wat
+++ b/tests/disas/startup-start.wat
@@ -8,10 +8,10 @@
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435528 "VMStoreContext+0x48"
-;; region2 = 268435520 "VMStoreContext+0x40"
-;; region3 = 268435536 "VMStoreContext+0x50"
-;; region4 = 268435592 "VMStoreContext+0x88"
+;; region1 = 134217800 "VMStoreContext+0x48"
+;; region2 = 134217792 "VMStoreContext+0x40"
+;; region3 = 134217808 "VMStoreContext+0x50"
+;; region4 = 134217864 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
diff --git a/tests/disas/startup-table-initial-value.wat b/tests/disas/startup-table-initial-value.wat
index 2ea44c7e48..14c5e29256 100644
--- a/tests/disas/startup-table-initial-value.wat
+++ b/tests/disas/startup-table-initial-value.wat
@@ -8,10 +8,10 @@
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435528 "VMStoreContext+0x48"
-;; region2 = 268435520 "VMStoreContext+0x40"
-;; region3 = 268435536 "VMStoreContext+0x50"
-;; region4 = 268435592 "VMStoreContext+0x88"
+;; region1 = 134217800 "VMStoreContext+0x48"
+;; region2 = 134217792 "VMStoreContext+0x40"
+;; region3 = 134217808 "VMStoreContext+0x50"
+;; region4 = 134217864 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -40,9 +40,9 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 2684354560 "VMTableDefinition+0x0"
-;; region1 = 2684354568 "VMTableDefinition+0x8"
-;; region2 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 1342177280 "VMTableDefinition+0x0"
+;; region1 = 1342177288 "VMTableDefinition+0x8"
+;; region2 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;;
;; block0(v0: i64, v1: i64):
;; v9 = load.i64 notrap aligned region1 v0+56
diff --git a/tests/disas/sub-global.wat b/tests/disas/sub-global.wat
index eae5dbdf0e..bf7c186ab6 100644
--- a/tests/disas/sub-global.wat
+++ b/tests/disas/sub-global.wat
@@ -14,8 +14,8 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/table-copy.wat b/tests/disas/table-copy.wat
index 91ad6598d9..f7ffac128a 100644
--- a/tests/disas/table-copy.wat
+++ b/tests/disas/table-copy.wat
@@ -25,7 +25,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -40,7 +40,7 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -55,7 +55,7 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,11 +70,11 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 2684354560 "VMTableDefinition+0x0"
-;; region4 = 2684354568 "VMTableDefinition+0x8"
-;; region5 = 1073741824 "PublicTable"
+;; region3 = 1342177280 "VMTableDefinition+0x0"
+;; region4 = 1342177288 "VMTableDefinition+0x8"
+;; region5 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -210,11 +210,11 @@
;;
;; function u0:4(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
;; region3 = 48 "VMContext+0x30"
-;; region4 = 2684354568 "VMTableDefinition+0x8"
-;; region5 = 1073741824 "PublicTable"
+;; region4 = 1342177288 "VMTableDefinition+0x8"
+;; region5 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/table-get-fixed-size.wat b/tests/disas/table-get-fixed-size.wat
index 3f8de3fb4e..52449817bb 100644
--- a/tests/disas/table-get-fixed-size.wat
+++ b/tests/disas/table-get-fixed-size.wat
@@ -17,9 +17,9 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,9 +45,9 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/table-get.wat b/tests/disas/table-get.wat
index 8d9af03200..3998281842 100644
--- a/tests/disas/table-get.wat
+++ b/tests/disas/table-get.wat
@@ -16,10 +16,10 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,10 +46,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/table-set-fixed-size.wat b/tests/disas/table-set-fixed-size.wat
index 742b0a1838..a3bf45267c 100644
--- a/tests/disas/table-set-fixed-size.wat
+++ b/tests/disas/table-set-fixed-size.wat
@@ -18,9 +18,9 @@
table.set 0))
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,9 +46,9 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/table-set.wat b/tests/disas/table-set.wat
index 717e0482bf..b9a26f8f2b 100644
--- a/tests/disas/table-set.wat
+++ b/tests/disas/table-set.wat
@@ -18,10 +18,10 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,10 +48,10 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 2684354568 "VMTableDefinition+0x8"
-;; region4 = 1073741824 "PublicTable"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 1342177288 "VMTableDefinition+0x8"
+;; region4 = 536870912 "PublicTable"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/typed-funcrefs-eager-init.wat b/tests/disas/typed-funcrefs-eager-init.wat
index 6e04853f51..2029f017b4 100644
--- a/tests/disas/typed-funcrefs-eager-init.wat
+++ b/tests/disas/typed-funcrefs-eager-init.wat
@@ -115,7 +115,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -130,9 +130,9 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -162,9 +162,9 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -194,9 +194,9 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 1879048193 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 939524097 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/typed-funcrefs.wat b/tests/disas/typed-funcrefs.wat
index a09c448397..5bffe8f328 100644
--- a/tests/disas/typed-funcrefs.wat
+++ b/tests/disas/typed-funcrefs.wat
@@ -115,7 +115,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -130,9 +130,9 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -186,9 +186,9 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableDefinition+0x0"
+;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -242,9 +242,9 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
-;; region2 = 1879048192 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 1879048193 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
+;; region1 = 134217752 "VMStoreContext+0x18"
+;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 939524097 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/unreachable_code.wat b/tests/disas/unreachable_code.wat
index c674d76ce0..4afeab53b8 100644
--- a/tests/disas/unreachable_code.wat
+++ b/tests/disas/unreachable_code.wat
@@ -80,7 +80,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -92,7 +92,7 @@
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -107,7 +107,7 @@
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -141,7 +141,7 @@
;;
;; function u0:3(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/x64-simd-round-without-sse41.wat b/tests/disas/x64-simd-round-without-sse41.wat
index d17e34f458..e58ba2a63f 100644
--- a/tests/disas/x64-simd-round-without-sse41.wat
+++ b/tests/disas/x64-simd-round-without-sse41.wat
@@ -13,7 +13,7 @@
)
;; function u0:0(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,7 +46,7 @@
;;
;; function u0:1(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -79,7 +79,7 @@
;;
;; function u0:2(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -112,7 +112,7 @@
;;
;; function u0:3(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -145,7 +145,7 @@
;;
;; function u0:4(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -172,7 +172,7 @@
;;
;; function u0:5(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -199,7 +199,7 @@
;;
;; function u0:6(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -226,7 +226,7 @@
;;
;; function u0:7(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -253,7 +253,7 @@
;;
;; function u0:8(i64 vmctx, i64, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 268435480 "VMStoreContext+0x18"
+;; region1 = 134217752 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24