Skip to content

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

Add an alias region for data segments (#13811)

Nick Fitzgeraldf4a63b7e27ee
diff --git a/crates/cranelift/src/alias_region.rs b/crates/cranelift/src/alias_region.rs
index 43fff58379..5b8031db3e 100644
--- a/crates/cranelift/src/alias_region.rs
+++ b/crates/cranelift/src/alias_region.rs
@@ -47,7 +47,7 @@ enum VmType {
/// that alias regions can be deduplicated during inlining.
///
/// The key encodes into a single `u32` with the following layout:
-/// `[ kind: 5 bits | data: 27 bits ]`
+/// `[ kind: 6 bits | data: 26 bits ]`
#[derive(Clone, Copy, PartialEq, Eq, Hash)]
enum AliasRegionKey {
/// An access of a field within a VM data structure of type `ty`.
@@ -115,10 +115,13 @@ enum AliasRegionKey {
/// An access of a `ValRaw` inside a passive element segment.
ElementSegment,
+
+ /// An access of the bytes inside a data segment.
+ DataSegment,
}
impl AliasRegionKey {
- const KIND_BITS: u32 = 5;
+ const KIND_BITS: u32 = 6;
const KIND_OFFSET: u32 = 32 - Self::KIND_BITS;
const KIND_MASK: u32 = ((1 << Self::KIND_BITS) - 1) << Self::KIND_OFFSET;
@@ -135,38 +138,39 @@ impl AliasRegionKey {
kind << Self::KIND_OFFSET
}
- 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);
- const VM_FUNCTION_IMPORT_KIND: u32 = Self::new_kind(0b10010);
- const VM_MEMORY_IMPORT_KIND: u32 = Self::new_kind(0b10011);
- const VM_TABLE_IMPORT_KIND: u32 = Self::new_kind(0b10100);
- const VM_TAG_IMPORT_KIND: u32 = Self::new_kind(0b10101);
- const VM_GLOBAL_IMPORT_KIND: u32 = Self::new_kind(0b10110);
- const STACK_KIND: u32 = Self::new_kind(0b10111);
- const VM_FUNC_REF_KIND: u32 = Self::new_kind(0b11000);
- const TYPE_IDS_ARRAY_KIND: u32 = Self::new_kind(0b11001);
- const EPOCH_COUNTER_KIND: u32 = Self::new_kind(0b11010);
- const BUILTIN_FUNCTIONS_KIND: u32 = Self::new_kind(0b11011);
- const COMPONENT_BUILTIN_FUNCTIONS_KIND: u32 = Self::new_kind(0b11100);
- const UNSAFE_INTRINSIC_MEMORY_KIND: u32 = Self::new_kind(0b11101);
- const HOST_VAL_RAW_KIND: u32 = Self::new_kind(0b11110);
- const ELEMENT_SEGMENT_KIND: u32 = Self::new_kind(0b11111);
+ const VM_CONTEXT_KIND: u32 = Self::new_kind(0b000000);
+ const VM_STORE_CONTEXT_KIND: u32 = Self::new_kind(0b000001);
+ const IMPORTED_MEMORY_KIND: u32 = Self::new_kind(0b000010);
+ const DEFINED_MEMORY_KIND: u32 = Self::new_kind(0b000011);
+ const IMPORTED_TABLE_KIND: u32 = Self::new_kind(0b000100);
+ const DEFINED_TABLE_KIND: u32 = Self::new_kind(0b000101);
+ const IMPORTED_GLOBAL_KIND: u32 = Self::new_kind(0b000110);
+ const DEFINED_GLOBAL_KIND: u32 = Self::new_kind(0b000111);
+ const GC_HEAP_KIND: u32 = Self::new_kind(0b001000);
+ const VM_MEMORY_DEFINITION_KIND: u32 = Self::new_kind(0b001001);
+ const VM_TABLE_DEFINITION_KIND: u32 = Self::new_kind(0b001010);
+ const VM_COMPONENT_CONTEXT_KIND: u32 = Self::new_kind(0b001011);
+ const VM_DRC_HEAP_DATA_KIND: u32 = Self::new_kind(0b001100);
+ const VM_COPYING_HEAP_DATA_KIND: u32 = Self::new_kind(0b001101);
+ const VM_NULL_HEAP_DATA_KIND: u32 = Self::new_kind(0b001110);
+ const VM_DEFERRED_THREAD_KIND: u32 = Self::new_kind(0b001111);
+ const VM_CONTREF_KIND: u32 = Self::new_kind(0b010000);
+ const CONTINUATION_STACK_MEMORY_KIND: u32 = Self::new_kind(0b010001);
+ const VM_FUNCTION_IMPORT_KIND: u32 = Self::new_kind(0b010010);
+ const VM_MEMORY_IMPORT_KIND: u32 = Self::new_kind(0b010011);
+ const VM_TABLE_IMPORT_KIND: u32 = Self::new_kind(0b010100);
+ const VM_TAG_IMPORT_KIND: u32 = Self::new_kind(0b010101);
+ const VM_GLOBAL_IMPORT_KIND: u32 = Self::new_kind(0b010110);
+ const STACK_KIND: u32 = Self::new_kind(0b010111);
+ const VM_FUNC_REF_KIND: u32 = Self::new_kind(0b011000);
+ const TYPE_IDS_ARRAY_KIND: u32 = Self::new_kind(0b011001);
+ const EPOCH_COUNTER_KIND: u32 = Self::new_kind(0b011010);
+ const BUILTIN_FUNCTIONS_KIND: u32 = Self::new_kind(0b011011);
+ const COMPONENT_BUILTIN_FUNCTIONS_KIND: u32 = Self::new_kind(0b011100);
+ const UNSAFE_INTRINSIC_MEMORY_KIND: u32 = Self::new_kind(0b011101);
+ const HOST_VAL_RAW_KIND: u32 = Self::new_kind(0b011110);
+ const ELEMENT_SEGMENT_KIND: u32 = Self::new_kind(0b011111);
+ const DATA_SEGMENT_KIND: u32 = Self::new_kind(0b100000);
/// Encode this key into a raw `u32` suitable for use as an
/// `AliasRegionData::user_id`.
@@ -240,6 +244,7 @@ impl AliasRegionKey {
}
AliasRegionKey::UnsafeIntrinsicMemory => Self::UNSAFE_INTRINSIC_MEMORY_KIND,
AliasRegionKey::ElementSegment => Self::ELEMENT_SEGMENT_KIND,
+ AliasRegionKey::DataSegment => Self::DATA_SEGMENT_KIND,
}
}
}
@@ -264,6 +269,7 @@ impl fmt::Debug for AliasRegionKey {
AliasRegionKey::Stack { slot } => write!(f, "Stack({slot:?})"),
AliasRegionKey::UnsafeIntrinsicMemory => write!(f, "UnsafeIntrinsicMemory"),
AliasRegionKey::ElementSegment => write!(f, "ElementSegment"),
+ AliasRegionKey::DataSegment => write!(f, "DataSegment"),
}
}
}
@@ -2092,7 +2098,7 @@ where
}
}
-/// Passive element-related methods.
+/// Passive data and element segment-related methods.
impl<Offsets> AliasRegions<Offsets>
where
Offsets: GetPtrSize,
@@ -2103,6 +2109,12 @@ where
pub fn element_segment_region(&mut self, func: &mut ir::Function) -> ir::AliasRegion {
self.region(func, AliasRegionKey::ElementSegment)
}
+
+ /// Get the alias region for the bytes of data segments (read by
+ /// `memory.init` and `array.{new,init}_data`).
+ pub fn data_segment_region(&mut self, func: &mut ir::Function) -> ir::AliasRegion {
+ self.region(func, AliasRegionKey::DataSegment)
+ }
}
/// Unsafe intrinsic-related methods.
diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rs
index 22a346d7d0..f3967fd91a 100644
--- a/crates/cranelift/src/func_environ.rs
+++ b/crates/cranelift/src/func_environ.rs
@@ -414,13 +414,15 @@ impl<'module_environment> FuncEnvironment<'module_environment> {
&mut self,
func: &mut Function,
entity: CheckedEntity,
- ) -> Option<ir::AliasRegion> {
+ ) -> ir::AliasRegion {
match entity {
- CheckedEntity::Memory(index) => Some(self.memory_alias_region(func, index)),
- CheckedEntity::Table { table, .. } => Some(self.table_alias_region(func, table)),
- CheckedEntity::Array { .. } => Some(self.alias_regions.gc_heap_region(func)),
- CheckedEntity::Elem(_) => Some(self.alias_regions.element_segment_region(func)),
- CheckedEntity::Data { .. } | CheckedEntity::RuntimeData(_) => None,
+ CheckedEntity::Memory(index) => self.memory_alias_region(func, index),
+ CheckedEntity::Table { table, .. } => self.table_alias_region(func, table),
+ CheckedEntity::Array { .. } => self.alias_regions.gc_heap_region(func),
+ CheckedEntity::Elem(_) => self.alias_regions.element_segment_region(func),
+ CheckedEntity::Data { .. } | CheckedEntity::RuntimeData(_) => {
+ self.alias_regions.data_segment_region(func)
+ }
}
}
@@ -4723,8 +4725,8 @@ impl FuncEnvironment<'_> {
dst_addr: ir::Value,
src_addr: ir::Value,
bytes: u64,
- src_region: Option<ir::AliasRegion>,
- dst_region: Option<ir::AliasRegion>,
+ src_region: ir::AliasRegion,
+ dst_region: ir::AliasRegion,
) {
// `trusted()` (notrap + aligned) is sound: the range is already
// bounds-checked, and each load feeds only its paired store, so the
@@ -4740,10 +4742,10 @@ impl FuncEnvironment<'_> {
// region-tagged store to the same address.
let load_flags = ir::MemFlagsData::trusted()
.with_endianness(Endianness::Little)
- .with_alias_region(src_region);
+ .with_alias_region(Some(src_region));
let store_flags = ir::MemFlagsData::trusted()
.with_endianness(Endianness::Little)
- .with_alias_region(dst_region);
+ .with_alias_region(Some(dst_region));
const WIDTHS: &[(u64, ir::Type)] = &[
(16, ir::types::I8X16),
(8, ir::types::I64),
diff --git a/tests/disas/alias-region-globals.wat b/tests/disas/alias-region-globals.wat
index b93fbb2208..9d5b7d4fb9 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2952790016 "VMGlobalImport+0x0"
-;; region3 = 805306368 "PublicGlobal"
-;; region4 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1476395008 "VMGlobalImport+0x0"
+;; region3 = 402653184 "PublicGlobal"
+;; region4 = 469762048 "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 119c86b79d..406af6ea83 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2550136832 "VMMemoryImport+0x0"
-;; region3 = 1207959552 "VMMemoryDefinition+0x0"
-;; region4 = 1207959560 "VMMemoryDefinition+0x8"
-;; region5 = 268435456 "PublicMemory"
-;; region6 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1275068416 "VMMemoryImport+0x0"
+;; region3 = 603979776 "VMMemoryDefinition+0x0"
+;; region4 = 603979784 "VMMemoryDefinition+0x8"
+;; region5 = 134217728 "PublicMemory"
+;; region6 = 201326592 "DefinedMemory(StaticModuleIndex(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 3e486c1d23..0e29ba737e 100644
--- a/tests/disas/alias-region-tables.wat
+++ b/tests/disas/alias-region-tables.wat
@@ -17,17 +17,17 @@
)
;; function u0:0(i64 vmctx, i64, i32, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableImport+0x0"
-;; region3 = 1342177280 "VMTableDefinition+0x0"
-;; region4 = 1342177288 "VMTableDefinition+0x8"
-;; region5 = 536870912 "PublicTable"
-;; region6 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableImport+0x0"
+;; region3 = 671088640 "VMTableDefinition+0x0"
+;; region4 = 671088648 "VMTableDefinition+0x8"
+;; region5 = 268435456 "PublicTable"
+;; region6 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region7 = 40 "VMContext+0x28"
-;; region8 = 3355443200 "TypeIdsArray+0x0"
-;; region9 = 3221225488 "VMFuncRef+0x10"
-;; region10 = 3221225480 "VMFuncRef+0x8"
-;; region11 = 3221225496 "VMFuncRef+0x18"
+;; region8 = 1677721600 "TypeIdsArray+0x0"
+;; region9 = 1610612752 "VMFuncRef+0x10"
+;; region10 = 1610612744 "VMFuncRef+0x8"
+;; region11 = 1610612760 "VMFuncRef+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/arith.wat b/tests/disas/arith.wat
index 7d010e317e..dc3930d8ea 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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-call-trampoline.wat b/tests/disas/array-call-trampoline.wat
index 673642e702..c8e6fef599 100644
--- a/tests/disas/array-call-trampoline.wat
+++ b/tests/disas/array-call-trampoline.wat
@@ -9,12 +9,12 @@
)
)
;; function u268435456:0(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 4026531840 "HostValRaw+0x0"
+;; region0 = 2013265920 "HostValRaw+0x0"
;; region1 = 8 "VMContext+0x8"
-;; region2 = 134217800 "VMStoreContext+0x48"
-;; region3 = 134217792 "VMStoreContext+0x40"
-;; region4 = 134217808 "VMStoreContext+0x50"
-;; region5 = 134217864 "VMStoreContext+0x88"
+;; region2 = 67108936 "VMStoreContext+0x48"
+;; region3 = 67108928 "VMStoreContext+0x40"
+;; region4 = 67108944 "VMStoreContext+0x50"
+;; region5 = 67109000 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64, i32, i64) -> i32, i64 tail
;; fn0 = colocated u0:0 sig0
;;
diff --git a/tests/disas/array-copy-anyref.wat b/tests/disas/array-copy-anyref.wat
index 927e79e18d..d744058b5f 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 c2fbc869d4..961a841ddf 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 b9d30124e6..f63c6d9d80 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 25ee8e00f9..cd74ca2fd4 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 7d71212729..7fea96be82 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 a0810569a3..a634f7dd56 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 27793b0ab4..34d23ff59b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 166bf875c0..3bca39c798 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 413261c6a4..49fc34cf78 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -145,11 +145,11 @@
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
-;; region5 = 3087007744 "Stack(ss0)"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "GcHeap"
+;; region5 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -214,7 +214,7 @@
;;
;; function u0:3(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 14657bf06c..145c04ad6c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 23fb3fe293..5473f6b81d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 655a735dd3..e001e1180f 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 9ec4ac85c7..001bd55c88 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 59b306ab43..55ba224a6e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 ffe01ec0a2..878407abb1 100644
--- a/tests/disas/block-params-br_if-single-pred.wat
+++ b/tests/disas/block-params-br_if-single-pred.wat
@@ -22,9 +22,9 @@
)
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1207959560 "VMFunctionImport+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/block-params-if-else-same-values.wat b/tests/disas/block-params-if-else-same-values.wat
index 77b7f31080..52d4fe6c1c 100644
--- a/tests/disas/block-params-if-else-same-values.wat
+++ b/tests/disas/block-params-if-else-same-values.wat
@@ -22,9 +22,9 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1207959560 "VMFunctionImport+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/block-params-loop-single-iteration.wat b/tests/disas/block-params-loop-single-iteration.wat
index 90191da232..e6b86da63e 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 e581cc16b3..8271ac7954 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 339ac929ce..2d89f77662 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 e8394dc629..21aefdd2c0 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 d43b257937..8d9fa13504 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 5b8799470e..9decd0d067 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 f65c2c3765..3476592e85 100644
--- a/tests/disas/call-indirect-with-gc.wat
+++ b/tests/disas/call-indirect-with-gc.wat
@@ -11,15 +11,15 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 268435456 "PublicTable"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443204 "TypeIdsArray+0x4"
-;; region7 = 3221225488 "VMFuncRef+0x10"
-;; region8 = 3221225480 "VMFuncRef+0x8"
-;; region9 = 3221225496 "VMFuncRef+0x18"
+;; region6 = 1677721604 "TypeIdsArray+0x4"
+;; region7 = 1610612752 "VMFuncRef+0x10"
+;; region8 = 1610612744 "VMFuncRef+0x8"
+;; region9 = 1610612760 "VMFuncRef+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-without-gc.wat b/tests/disas/call-indirect-without-gc.wat
index 17d596e554..aa0a2c6494 100644
--- a/tests/disas/call-indirect-without-gc.wat
+++ b/tests/disas/call-indirect-without-gc.wat
@@ -11,15 +11,15 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 268435456 "PublicTable"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443204 "TypeIdsArray+0x4"
-;; region7 = 3221225488 "VMFuncRef+0x10"
-;; region8 = 3221225480 "VMFuncRef+0x8"
-;; region9 = 3221225496 "VMFuncRef+0x18"
+;; region6 = 1677721604 "TypeIdsArray+0x4"
+;; region7 = 1610612752 "VMFuncRef+0x10"
+;; region8 = 1610612744 "VMFuncRef+0x8"
+;; region9 = 1610612760 "VMFuncRef+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.wat b/tests/disas/call-indirect.wat
index 35b1bec3df..f78277c080 100644
--- a/tests/disas/call-indirect.wat
+++ b/tests/disas/call-indirect.wat
@@ -9,15 +9,15 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 268435456 "PublicTable"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443204 "TypeIdsArray+0x4"
-;; region7 = 3221225488 "VMFuncRef+0x10"
-;; region8 = 3221225480 "VMFuncRef+0x8"
-;; region9 = 3221225496 "VMFuncRef+0x18"
+;; region6 = 1677721604 "TypeIdsArray+0x4"
+;; region7 = 1610612752 "VMFuncRef+0x10"
+;; region8 = 1610612744 "VMFuncRef+0x8"
+;; region9 = 1610612760 "VMFuncRef+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-simd.wat b/tests/disas/call-simd.wat
index 78a7c0ded1..8e1ad2a39a 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 185a4e9565..195074f8db 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 a70d3413ef..c05d9b66d2 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
@@ -49,10 +49,10 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 134217832 "VMStoreContext+0x68"
-;; region4 = 3892314112 "UnsafeIntrinsicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 67108968 "VMStoreContext+0x68"
+;; region4 = 1946157056 "UnsafeIntrinsicMemory"
;; gv0 = vmctx
;; 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.wat b/tests/disas/component-model/checked-intrinsics-inlined.wat
index 0bba573ae9..b2ab799df2 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined.wat
@@ -50,10 +50,10 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 134217832 "VMStoreContext+0x68"
-;; region4 = 3892314112 "UnsafeIntrinsicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 67108968 "VMStoreContext+0x68"
+;; region4 = 1946157056 "UnsafeIntrinsicMemory"
;; gv0 = vmctx
;; 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-trampoline.wat b/tests/disas/component-model/checked-intrinsics-trampoline.wat
index 1daa742551..5ca393194a 100644
--- a/tests/disas/component-model/checked-intrinsics-trampoline.wat
+++ b/tests/disas/component-model/checked-intrinsics-trampoline.wat
@@ -32,7 +32,7 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 3892314112 "UnsafeIntrinsicMemory"
+;; region0 = 1946157056 "UnsafeIntrinsicMemory"
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64):
;; v5 = iconst.i64 4
@@ -48,7 +48,7 @@
;; }
;;
;; function u0:0(i64 vmctx, i64, i64, i64, i64, i32) tail {
-;; region0 = 3892314112 "UnsafeIntrinsicMemory"
+;; region0 = 1946157056 "UnsafeIntrinsicMemory"
;;
;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64, v5: i32):
;; v6 = iconst.i64 4
diff --git a/tests/disas/component-model/direct-adapter-calls-inlining.wat b/tests/disas/component-model/direct-adapter-calls-inlining.wat
index ec2ad0b022..b35c023e9c 100644
--- a/tests/disas/component-model/direct-adapter-calls-inlining.wat
+++ b/tests/disas/component-model/direct-adapter-calls-inlining.wat
@@ -56,11 +56,11 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2952790016 "VMGlobalImport+0x0"
-;; region4 = 805306368 "PublicGlobal"
-;; region5 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1476395008 "VMGlobalImport+0x0"
+;; region4 = 402653184 "PublicGlobal"
+;; region5 = 1207959560 "VMFunctionImport+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/component-model/direct-adapter-calls.wat b/tests/disas/component-model/direct-adapter-calls.wat
index efad7fb2b5..ba03b64117 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,8 +76,8 @@
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -97,11 +97,11 @@
;;
;; function u2:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2952790016 "VMGlobalImport+0x0"
-;; region3 = 805306368 "PublicGlobal"
-;; region4 = 2415919128 "VMFunctionImport+0x18"
-;; region5 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1476395008 "VMGlobalImport+0x0"
+;; region3 = 402653184 "PublicGlobal"
+;; region4 = 1207959576 "VMFunctionImport+0x18"
+;; region5 = 1207959560 "VMFunctionImport+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/component-model/exported-module-makes-adapters-indirect.wat b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
index 30fc645243..6bc331932a 100644
--- a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
@@ -60,9 +60,9 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1207959560 "VMFunctionImport+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/component-model/inlining-and-unsafe-intrinsics.wat b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
index a0bbb61c4b..9bdd461592 100644
--- a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
+++ b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
@@ -44,10 +44,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 134217832 "VMStoreContext+0x68"
-;; region4 = 3892314112 "UnsafeIntrinsicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 67108968 "VMStoreContext+0x68"
+;; region4 = 1946157056 "UnsafeIntrinsicMemory"
;; gv0 = vmctx
;; 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/inlining-bug.wat b/tests/disas/component-model/inlining-bug.wat
index 7e9dd0a826..d68cb6d69e 100644
--- a/tests/disas/component-model/inlining-bug.wat
+++ b/tests/disas/component-model/inlining-bug.wat
@@ -36,8 +36,8 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+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/inlining-fuzz-bug.wat b/tests/disas/component-model/inlining-fuzz-bug.wat
index 9d46ca3f12..4216018571 100644
--- a/tests/disas/component-model/inlining-fuzz-bug.wat
+++ b/tests/disas/component-model/inlining-fuzz-bug.wat
@@ -39,8 +39,8 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+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/issue-11458.wat b/tests/disas/component-model/issue-11458.wat
index 8bd6da45c1..a238d86e88 100644
--- a/tests/disas/component-model/issue-11458.wat
+++ b/tests/disas/component-model/issue-11458.wat
@@ -21,8 +21,8 @@
;; function u1:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+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/multiple-instantiations-makes-adapters-indirect.wat b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
index 1b312e60d4..8a18e93ae2 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
@@ -66,9 +66,9 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1207959560 "VMFunctionImport+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/component-model/sync-adapter-calls.wat b/tests/disas/component-model/sync-adapter-calls.wat
index 2b1898b1fa..520331c4dc 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,20 +70,20 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; ss0 = explicit_slot 32, align = 8
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2952790016 "VMGlobalImport+0x0"
-;; region4 = 805306368 "PublicGlobal"
-;; region5 = 134217864 "VMStoreContext+0x88"
-;; region6 = 2013265920 "VMDeferredThread+0x0"
-;; region7 = 2013265928 "VMDeferredThread+0x8"
-;; region8 = 2013265932 "VMDeferredThread+0xc"
-;; region9 = 2013265936 "VMDeferredThread+0x10"
-;; region10 = 134217856 "VMStoreContext+0x80"
-;; region11 = 2013265940 "VMDeferredThread+0x14"
-;; region12 = 134217860 "VMStoreContext+0x84"
-;; region13 = 2013265944 "VMDeferredThread+0x18"
-;; region14 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1476395008 "VMGlobalImport+0x0"
+;; region4 = 402653184 "PublicGlobal"
+;; region5 = 67109000 "VMStoreContext+0x88"
+;; region6 = 1006632960 "VMDeferredThread+0x0"
+;; region7 = 1006632968 "VMDeferredThread+0x8"
+;; region8 = 1006632972 "VMDeferredThread+0xc"
+;; region9 = 1006632976 "VMDeferredThread+0x10"
+;; region10 = 67108992 "VMStoreContext+0x80"
+;; region11 = 1006632980 "VMDeferredThread+0x14"
+;; region12 = 67108996 "VMStoreContext+0x84"
+;; region13 = 1006632984 "VMDeferredThread+0x18"
+;; region14 = 1207959560 "VMFunctionImport+0x8"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -202,20 +202,20 @@
;; function u2:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 32, align = 8
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2952790016 "VMGlobalImport+0x0"
-;; region3 = 805306368 "PublicGlobal"
-;; region4 = 2415919128 "VMFunctionImport+0x18"
-;; region5 = 2415919112 "VMFunctionImport+0x8"
-;; region6 = 134217864 "VMStoreContext+0x88"
-;; region7 = 2013265920 "VMDeferredThread+0x0"
-;; region8 = 2013265928 "VMDeferredThread+0x8"
-;; region9 = 2013265932 "VMDeferredThread+0xc"
-;; region10 = 2013265936 "VMDeferredThread+0x10"
-;; region11 = 134217856 "VMStoreContext+0x80"
-;; region12 = 2013265940 "VMDeferredThread+0x14"
-;; region13 = 134217860 "VMStoreContext+0x84"
-;; region14 = 2013265944 "VMDeferredThread+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1476395008 "VMGlobalImport+0x0"
+;; region3 = 402653184 "PublicGlobal"
+;; region4 = 1207959576 "VMFunctionImport+0x18"
+;; region5 = 1207959560 "VMFunctionImport+0x8"
+;; region6 = 67109000 "VMStoreContext+0x88"
+;; region7 = 1006632960 "VMDeferredThread+0x0"
+;; region8 = 1006632968 "VMDeferredThread+0x8"
+;; region9 = 1006632972 "VMDeferredThread+0xc"
+;; region10 = 1006632976 "VMDeferredThread+0x10"
+;; region11 = 67108992 "VMStoreContext+0x80"
+;; region12 = 1006632980 "VMDeferredThread+0x14"
+;; region13 = 67108996 "VMStoreContext+0x84"
+;; region14 = 1006632984 "VMDeferredThread+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/unsafe-intrinsics-used.wat b/tests/disas/component-model/unsafe-intrinsics-used.wat
index ffa7030174..6958bd08d3 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 = 134217832 "VMStoreContext+0x68"
+;; region1 = 67108968 "VMStoreContext+0x68"
;;
;; block0(v0: i64, v1: i64):
;; v2 = load.i64 notrap aligned readonly can_move region0 v1+8
@@ -45,7 +45,7 @@
;; }
;;
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 3892314112 "UnsafeIntrinsicMemory"
+;; region0 = 1946157056 "UnsafeIntrinsicMemory"
;;
;; block0(v0: i64, v1: i64, v2: i64):
;; v3 = load.i8 notrap aligned region0 v2
diff --git a/tests/disas/conditional-traps.wat b/tests/disas/conditional-traps.wat
index a362515dec..7d80d8df06 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 48ecf8e6de..f34c462ff1 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 5250f107ee..0220ec36d5 100644
--- a/tests/disas/duplicate-function-types.wat
+++ b/tests/disas/duplicate-function-types.wat
@@ -18,16 +18,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableImport+0x0"
-;; region3 = 1342177280 "VMTableDefinition+0x0"
-;; region4 = 1342177288 "VMTableDefinition+0x8"
-;; region5 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableImport+0x0"
+;; region3 = 671088640 "VMTableDefinition+0x0"
+;; region4 = 671088648 "VMTableDefinition+0x8"
+;; region5 = 268435456 "PublicTable"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 3355443200 "TypeIdsArray+0x0"
-;; region8 = 3221225488 "VMFuncRef+0x10"
-;; region9 = 3221225480 "VMFuncRef+0x8"
-;; region10 = 3221225496 "VMFuncRef+0x18"
+;; region7 = 1677721600 "TypeIdsArray+0x0"
+;; region8 = 1610612752 "VMFuncRef+0x10"
+;; region9 = 1610612744 "VMFuncRef+0x8"
+;; region10 = 1610612760 "VMFuncRef+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-loads-dynamic-memory.wat b/tests/disas/duplicate-loads-dynamic-memory.wat
index ab104e22e6..9568c10830 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 2ae5554a2c..31f33e3624 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 94d5aae565..c4f45135ed 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 8db401baef..eb58885e29 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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/elem-segment.wat b/tests/disas/elem-segment.wat
index 4c9094ba70..84782387e2 100644
--- a/tests/disas/elem-segment.wat
+++ b/tests/disas/elem-segment.wat
@@ -12,10 +12,10 @@
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217800 "VMStoreContext+0x48"
-;; region2 = 134217792 "VMStoreContext+0x40"
-;; region3 = 134217808 "VMStoreContext+0x50"
-;; region4 = 134217864 "VMStoreContext+0x88"
+;; region1 = 67108936 "VMStoreContext+0x48"
+;; region2 = 67108928 "VMStoreContext+0x40"
+;; region3 = 67108944 "VMStoreContext+0x50"
+;; region4 = 67109000 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -44,7 +44,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 4160749568 "ElementSegment"
+;; region0 = 2080374784 "ElementSegment"
;; sig0 = (i64 vmctx, i32) -> i64 tail
;; sig1 = (i64 vmctx, i32) -> i64 tail
;; fn0 = colocated u805306368:4 sig0
diff --git a/tests/disas/epoch-interruption.wat b/tests/disas/epoch-interruption.wat
index 0d446099db..96b4046761 100644
--- a/tests/disas/epoch-interruption.wat
+++ b/tests/disas/epoch-interruption.wat
@@ -6,10 +6,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 24 "VMContext+0x18"
-;; region3 = 3489660928 "EpochCounter+0x0"
-;; region4 = 134217736 "VMStoreContext+0x8"
+;; region3 = 1744830464 "EpochCounter+0x0"
+;; region4 = 67108872 "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 f9ddcc08ee..0862970307 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 6228bce89e..6fa5055682 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2a9ee082ef..22d66bc94b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 7027a9b7a0..95fae42d5e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 f9ae2b8b16..1940dd553f 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 9e36eb4c4a..26d230b8d0 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 efc69e5cc9..b3f59e57d3 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 9db1f4428a..0ed3d54684 100644
--- a/tests/disas/foo.wat
+++ b/tests/disas/foo.wat
@@ -16,19 +16,19 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32, i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
-;; region5 = 2684354560 "VMTableImport+0x0"
-;; region6 = 1342177280 "VMTableDefinition+0x0"
-;; region7 = 1342177288 "VMTableDefinition+0x8"
-;; region8 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region5 = 1342177280 "VMTableImport+0x0"
+;; region6 = 671088640 "VMTableDefinition+0x0"
+;; region7 = 671088648 "VMTableDefinition+0x8"
+;; region8 = 268435456 "PublicTable"
;; region9 = 40 "VMContext+0x28"
-;; region10 = 3355443204 "TypeIdsArray+0x4"
-;; region11 = 3221225488 "VMFuncRef+0x10"
-;; region12 = 3221225480 "VMFuncRef+0x8"
-;; region13 = 3221225496 "VMFuncRef+0x18"
+;; region10 = 1677721604 "TypeIdsArray+0x4"
+;; region11 = 1610612752 "VMFuncRef+0x10"
+;; region12 = 1610612744 "VMFuncRef+0x8"
+;; region13 = 1610612760 "VMFuncRef+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/array-copy-with-fuel.wat b/tests/disas/gc/array-copy-with-fuel.wat
index c75a387b8c..aeab1b17eb 100644
--- a/tests/disas/gc/array-copy-with-fuel.wat
+++ b/tests/disas/gc/array-copy-with-fuel.wat
@@ -13,13 +13,13 @@
;; ss0 = explicit_slot 4, align = 4
;; ss1 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217728 "VMStoreContext+0x0"
-;; region3 = 134217760 "VMStoreContext+0x20"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 1073741824 "GcHeap"
-;; region6 = 3087007744 "Stack(ss0)"
-;; region7 = 3087007745 "Stack(ss1)"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108864 "VMStoreContext+0x0"
+;; region3 = 67108896 "VMStoreContext+0x20"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 536870912 "GcHeap"
+;; region6 = 1543503872 "Stack(ss0)"
+;; region7 = 1543503873 "Stack(ss1)"
;; gv0 = vmctx
;; 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 6f1f97409f..2a562fc094 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 816fdd3cd2..9ac2033622 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 028119f1d5..3da18b18d8 100644
--- a/tests/disas/gc/array-new-data.wat
+++ b/tests/disas/gc/array-new-data.wat
@@ -78,18 +78,18 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 56 "VMContext+0x38"
;; region3 = 48 "VMContext+0x30"
;; region4 = 32 "VMContext+0x20"
-;; region5 = 1744830464 "VMCopyingHeapData+0x0"
-;; region6 = 1744830468 "VMCopyingHeapData+0x4"
+;; region5 = 872415232 "VMCopyingHeapData+0x0"
+;; region6 = 872415236 "VMCopyingHeapData+0x4"
;; region7 = 40 "VMContext+0x28"
-;; region8 = 3355443200 "TypeIdsArray+0x0"
-;; region9 = 134217760 "VMStoreContext+0x20"
-;; region10 = 1073741824 "GcHeap"
-;; region11 = 134217768 "VMStoreContext+0x28"
-;; region12 = 3087007744 "Stack(ss0)"
+;; region8 = 1677721600 "TypeIdsArray+0x0"
+;; region9 = 67108896 "VMStoreContext+0x20"
+;; region10 = 536870912 "GcHeap"
+;; region11 = 67108904 "VMStoreContext+0x28"
+;; region12 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 ae678e1c67..4daa0f087b 100644
--- a/tests/disas/gc/array-new-default-anyref.wat
+++ b/tests/disas/gc/array-new-default-anyref.wat
@@ -11,15 +11,15 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "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 7fb430c99a..baeed321b8 100644
--- a/tests/disas/gc/array-new-default-exnref.wat
+++ b/tests/disas/gc/array-new-default-exnref.wat
@@ -11,15 +11,15 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "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 cdcc2bf3b4..78db3263ea 100644
--- a/tests/disas/gc/array-new-default-externref.wat
+++ b/tests/disas/gc/array-new-default-externref.wat
@@ -11,15 +11,15 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "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 175df803fb..0bb1fa00a0 100644
--- a/tests/disas/gc/array-new-default-f32.wat
+++ b/tests/disas/gc/array-new-default-f32.wat
@@ -12,16 +12,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 fbd45cf56e..472da45f28 100644
--- a/tests/disas/gc/array-new-default-f64.wat
+++ b/tests/disas/gc/array-new-default-f64.wat
@@ -12,16 +12,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 5b955631f0..b5e2f4aea8 100644
--- a/tests/disas/gc/array-new-default-funcref.wat
+++ b/tests/disas/gc/array-new-default-funcref.wat
@@ -12,16 +12,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 aec58cbe1d..a966b5d624 100644
--- a/tests/disas/gc/array-new-default-i16.wat
+++ b/tests/disas/gc/array-new-default-i16.wat
@@ -12,16 +12,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 a5a31fcd3a..25ecce0755 100644
--- a/tests/disas/gc/array-new-default-i32.wat
+++ b/tests/disas/gc/array-new-default-i32.wat
@@ -12,16 +12,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 4aecad618a..65b9b91141 100644
--- a/tests/disas/gc/array-new-default-i64.wat
+++ b/tests/disas/gc/array-new-default-i64.wat
@@ -12,16 +12,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 f3554511d4..45f840d560 100644
--- a/tests/disas/gc/array-new-default-i8.wat
+++ b/tests/disas/gc/array-new-default-i8.wat
@@ -12,16 +12,16 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 b0213b3dc9..55449f05f0 100644
--- a/tests/disas/gc/call-indirect-final-type.wat
+++ b/tests/disas/gc/call-indirect-final-type.wat
@@ -17,15 +17,15 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 3221225488 "VMFuncRef+0x10"
-;; region8 = 3221225480 "VMFuncRef+0x8"
-;; region9 = 3221225496 "VMFuncRef+0x18"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 1610612752 "VMFuncRef+0x10"
+;; region8 = 1610612744 "VMFuncRef+0x8"
+;; region9 = 1610612760 "VMFuncRef+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,15 +72,15 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 3221225488 "VMFuncRef+0x10"
-;; region8 = 3221225480 "VMFuncRef+0x8"
-;; region9 = 3221225496 "VMFuncRef+0x18"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 1610612752 "VMFuncRef+0x10"
+;; region8 = 1610612744 "VMFuncRef+0x8"
+;; region9 = 1610612760 "VMFuncRef+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/array-fill.wat b/tests/disas/gc/copying/array-fill.wat
index ee29bbb352..33b7e608b4 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 387f9e4715..51ace936d0 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 11932c4f4c..8c23838052 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 9482b3045c..b41b3fc7b1 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 b3a4050842..e7b2f2b854 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 eabb456e7a..c5f20774d0 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,18 +13,18 @@
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
-;; region10 = 3087007744 "Stack(ss0)"
-;; region11 = 3087007745 "Stack(ss1)"
-;; region12 = 3087007746 "Stack(ss2)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "VMStoreContext+0x28"
+;; region10 = 1543503872 "Stack(ss0)"
+;; region11 = 1543503873 "Stack(ss1)"
+;; region12 = 1543503874 "Stack(ss2)"
;; gv0 = vmctx
;; 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 8d1079fb9c..59c33d89e7 100644
--- a/tests/disas/gc/copying/array-new-fixed.wat
+++ b/tests/disas/gc/copying/array-new-fixed.wat
@@ -10,15 +10,15 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "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 45aaf52d46..ab880a95bf 100644
--- a/tests/disas/gc/copying/array-new.wat
+++ b/tests/disas/gc/copying/array-new.wat
@@ -10,15 +10,15 @@
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 134217768 "VMStoreContext+0x28"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 67108904 "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 94e7eae88e..67c4db384c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 a7575388f7..149f585567 100644
--- a/tests/disas/gc/copying/br-on-cast-fail.wat
+++ b/tests/disas/gc/copying/br-on-cast-fail.wat
@@ -17,14 +17,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
-;; region7 = 2415919128 "VMFunctionImport+0x18"
-;; region8 = 2415919112 "VMFunctionImport+0x8"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "GcHeap"
+;; region7 = 1207959576 "VMFunctionImport+0x18"
+;; region8 = 1207959560 "VMFunctionImport+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/copying/br-on-cast.wat b/tests/disas/gc/copying/br-on-cast.wat
index cf9c98266e..955d88c839 100644
--- a/tests/disas/gc/copying/br-on-cast.wat
+++ b/tests/disas/gc/copying/br-on-cast.wat
@@ -17,14 +17,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
-;; region7 = 2415919128 "VMFunctionImport+0x18"
-;; region8 = 2415919112 "VMFunctionImport+0x8"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "GcHeap"
+;; region7 = 1207959576 "VMFunctionImport+0x18"
+;; region8 = 1207959560 "VMFunctionImport+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/copying/call-indirect-and-subtyping.wat b/tests/disas/gc/copying/call-indirect-and-subtyping.wat
index de3497996b..ba991cdd1f 100644
--- a/tests/disas/gc/copying/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/copying/call-indirect-and-subtyping.wat
@@ -17,14 +17,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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/externref-globals.wat b/tests/disas/gc/copying/externref-globals.wat
index dcb450edd7..491f4f7836 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 edaa15fcee..d2afc64072 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 21f2626cbc..95345ad6a2 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
@@ -11,15 +11,15 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 4a33ea169c..992ae6ce47 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 9ebdfbfb37..1a5425e609 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 c85d1b7cc9..a8fac30a24 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 85f54c62cf..2e8ea0ae76 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 9ec30967e2..c5b1ccd899 100644
--- a/tests/disas/gc/copying/ref-cast.wat
+++ b/tests/disas/gc/copying/ref-cast.wat
@@ -9,12 +9,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "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 570790772a..433930e511 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 e276efcb5f..f162813c65 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 7cbea15378..005d4304d9 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 0cf929f1db..61288a4aae 100644
--- a/tests/disas/gc/copying/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-func-type.wat
@@ -9,10 +9,10 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 3221225488 "VMFuncRef+0x10"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 1610612752 "VMFuncRef+0x10"
;; gv0 = vmctx
;; 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 dbf751b371..ae712ec983 100644
--- a/tests/disas/gc/copying/ref-test-concrete-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-type.wat
@@ -9,12 +9,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "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 edd3cffa59..c98de5880a 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 81632b1e42..5a90cace28 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 2932b1f5af..af5be3dfb0 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 cb6e36ca8e..49b9c5378a 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 db19e83c04..b09ef1bac2 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 7429b00c1c..4345e54f18 100644
--- a/tests/disas/gc/copying/struct-new-default.wat
+++ b/tests/disas/gc/copying/struct-new-default.wat
@@ -12,14 +12,14 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "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 53d3910baa..5d3c503363 100644
--- a/tests/disas/gc/copying/struct-new.wat
+++ b/tests/disas/gc/copying/struct-new.wat
@@ -13,15 +13,15 @@
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 4681209baa..e04ddcf2b2 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 5ba836a571..37172498c2 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 24351e5d0d..c2b063edd9 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 c248f03edb..9408317aec 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 2655a5ffe3..890de6e20d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 26c05013b3..8a6b7e6bd5 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 dc0db61450..18e8ba08c6 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 0c7bc775ce..9ea0e6bf35 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,15 +14,15 @@
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 1073741824 "GcHeap"
-;; region6 = 134217768 "VMStoreContext+0x28"
-;; region7 = 3087007744 "Stack(ss0)"
-;; region8 = 3087007745 "Stack(ss1)"
-;; region9 = 3087007746 "Stack(ss2)"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 536870912 "GcHeap"
+;; region6 = 67108904 "VMStoreContext+0x28"
+;; region7 = 1543503872 "Stack(ss0)"
+;; region8 = 1543503873 "Stack(ss1)"
+;; region9 = 1543503874 "Stack(ss2)"
;; gv0 = vmctx
;; 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 adcf009753..ab1bc04f63 100644
--- a/tests/disas/gc/drc/array-new-fixed.wat
+++ b/tests/disas/gc/drc/array-new-fixed.wat
@@ -11,12 +11,12 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 1073741824 "GcHeap"
-;; region6 = 134217768 "VMStoreContext+0x28"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 536870912 "GcHeap"
+;; region6 = 67108904 "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 95110692d3..540a676547 100644
--- a/tests/disas/gc/drc/array-new.wat
+++ b/tests/disas/gc/drc/array-new.wat
@@ -11,12 +11,12 @@
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 1073741824 "GcHeap"
-;; region6 = 134217768 "VMStoreContext+0x28"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 536870912 "GcHeap"
+;; region6 = 67108904 "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 f61c41e2c3..e217b319d1 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 6117191fd9..7c7f75e265 100644
--- a/tests/disas/gc/drc/br-on-cast-fail.wat
+++ b/tests/disas/gc/drc/br-on-cast-fail.wat
@@ -18,14 +18,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
-;; region7 = 2415919128 "VMFunctionImport+0x18"
-;; region8 = 2415919112 "VMFunctionImport+0x8"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "GcHeap"
+;; region7 = 1207959576 "VMFunctionImport+0x18"
+;; region8 = 1207959560 "VMFunctionImport+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/br-on-cast.wat b/tests/disas/gc/drc/br-on-cast.wat
index abe8528af5..1aec99d328 100644
--- a/tests/disas/gc/drc/br-on-cast.wat
+++ b/tests/disas/gc/drc/br-on-cast.wat
@@ -18,14 +18,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
-;; region7 = 2415919128 "VMFunctionImport+0x18"
-;; region8 = 2415919112 "VMFunctionImport+0x8"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "GcHeap"
+;; region7 = 1207959576 "VMFunctionImport+0x18"
+;; region8 = 1207959560 "VMFunctionImport+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/call-indirect-and-subtyping.wat b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
index 384a18c46e..7e1d9260fe 100644
--- a/tests/disas/gc/drc/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
@@ -18,14 +18,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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/externref-globals.wat b/tests/disas/gc/drc/externref-globals.wat
index 0940434063..6d240d68cb 100644
--- a/tests/disas/gc/drc/externref-globals.wat
+++ b/tests/disas/gc/drc/externref-globals.wat
@@ -15,16 +15,16 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 134217760 "VMStoreContext+0x20"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 67108896 "VMStoreContext+0x20"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 536870912 "GcHeap"
;; region6 = 32 "VMContext+0x20"
-;; region7 = 1610612736 "VMDrcHeapData+0x0"
-;; region8 = 1610612740 "VMDrcHeapData+0x4"
-;; region9 = 1610612744 "VMDrcHeapData+0x8"
-;; region10 = 3087007744 "Stack(ss0)"
+;; region7 = 805306368 "VMDrcHeapData+0x0"
+;; region8 = 805306372 "VMDrcHeapData+0x4"
+;; region9 = 805306376 "VMDrcHeapData+0x8"
+;; region10 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -100,11 +100,11 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 134217760 "VMStoreContext+0x20"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 67108896 "VMStoreContext+0x20"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 536870912 "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 4f7f6d87b7..81b77e00c8 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 6fcedcd5cd..38b5a83be3 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
@@ -12,12 +12,12 @@
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 1073741824 "GcHeap"
-;; region6 = 3087007744 "Stack(ss0)"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 536870912 "GcHeap"
+;; region6 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 697b62281a..5787a8bf95 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 a4b69bd0c0..8e8cb8b235 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 f2b1fb2f65..e13d8cc119 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 29f5fdf804..525f9d01dc 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 1d94bdf3a1..9ee28ff22e 100644
--- a/tests/disas/gc/drc/ref-cast.wat
+++ b/tests/disas/gc/drc/ref-cast.wat
@@ -10,12 +10,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "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 3bd3efff90..0e7918fd2b 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 1bda6c3df7..6180b722a0 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 a0cd867ef8..6bbd272425 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 f06ba52ee1..e4a9abda4f 100644
--- a/tests/disas/gc/drc/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-func-type.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 3221225488 "VMFuncRef+0x10"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 1610612752 "VMFuncRef+0x10"
;; gv0 = vmctx
;; 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 5b61739167..abba85535a 100644
--- a/tests/disas/gc/drc/ref-test-concrete-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-type.wat
@@ -10,12 +10,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "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 a554c14ba7..75c28f8000 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 2a19633212..b7d018aa03 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 0650d12cc7..0e018bd5b5 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 656bc86e60..16c119a315 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 0c7f7f6f41..99b6552dcc 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -106,15 +106,15 @@
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "GcHeap"
;; region5 = 32 "VMContext+0x20"
-;; region6 = 1610612736 "VMDrcHeapData+0x0"
-;; region7 = 1610612740 "VMDrcHeapData+0x4"
-;; region8 = 1610612744 "VMDrcHeapData+0x8"
-;; region9 = 3087007744 "Stack(ss0)"
+;; region6 = 805306368 "VMDrcHeapData+0x0"
+;; region7 = 805306372 "VMDrcHeapData+0x4"
+;; region8 = 805306376 "VMDrcHeapData+0x8"
+;; region9 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 6fe2e94b0a..913b5862d4 100644
--- a/tests/disas/gc/drc/struct-new-default.wat
+++ b/tests/disas/gc/drc/struct-new-default.wat
@@ -13,12 +13,12 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 1073741824 "GcHeap"
-;; region6 = 134217768 "VMStoreContext+0x28"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 536870912 "GcHeap"
+;; region6 = 67108904 "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 474da90c4c..5c83bed9c8 100644
--- a/tests/disas/gc/drc/struct-new.wat
+++ b/tests/disas/gc/drc/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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 1073741824 "GcHeap"
-;; region6 = 134217768 "VMStoreContext+0x28"
-;; region7 = 3087007744 "Stack(ss0)"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 536870912 "GcHeap"
+;; region6 = 67108904 "VMStoreContext+0x28"
+;; region7 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 13b0cb68ee..9835e23fb1 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 4fc248fa40..01c5466df0 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 6bc12d26b1..16e0904cdd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 0aa3e649c8..f47608d6dd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 30dd44f2e8..be3d91eb55 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 161283001c..6de1e98f93 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 57c0a814e0..9a66faaa4a 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,17 +14,17 @@
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1879048192 "VMNullHeapData+0x0"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 134217760 "VMStoreContext+0x20"
+;; region3 = 939524096 "VMNullHeapData+0x0"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 67108896 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 3355443200 "TypeIdsArray+0x0"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 3087007744 "Stack(ss0)"
-;; region10 = 3087007745 "Stack(ss1)"
-;; region11 = 3087007746 "Stack(ss2)"
+;; region7 = 1677721600 "TypeIdsArray+0x0"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 1543503872 "Stack(ss0)"
+;; region10 = 1543503873 "Stack(ss1)"
+;; region11 = 1543503874 "Stack(ss2)"
;; gv0 = vmctx
;; 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 052bacf093..7267cb4e02 100644
--- a/tests/disas/gc/null/array-new-fixed.wat
+++ b/tests/disas/gc/null/array-new-fixed.wat
@@ -11,14 +11,14 @@
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1879048192 "VMNullHeapData+0x0"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 134217760 "VMStoreContext+0x20"
+;; region3 = 939524096 "VMNullHeapData+0x0"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 67108896 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 3355443200 "TypeIdsArray+0x0"
-;; region8 = 1073741824 "GcHeap"
+;; region7 = 1677721600 "TypeIdsArray+0x0"
+;; region8 = 536870912 "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 e1c329171e..da830db795 100644
--- a/tests/disas/gc/null/array-new.wat
+++ b/tests/disas/gc/null/array-new.wat
@@ -11,14 +11,14 @@
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1879048192 "VMNullHeapData+0x0"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 134217760 "VMStoreContext+0x20"
+;; region3 = 939524096 "VMNullHeapData+0x0"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 67108896 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 3355443200 "TypeIdsArray+0x0"
-;; region8 = 1073741824 "GcHeap"
+;; region7 = 1677721600 "TypeIdsArray+0x0"
+;; region8 = 536870912 "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 2049a83a3d..a4f5bf3b3d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 de55365a1d..b6bdc6798c 100644
--- a/tests/disas/gc/null/br-on-cast-fail.wat
+++ b/tests/disas/gc/null/br-on-cast-fail.wat
@@ -18,14 +18,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
-;; region7 = 2415919128 "VMFunctionImport+0x18"
-;; region8 = 2415919112 "VMFunctionImport+0x8"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "GcHeap"
+;; region7 = 1207959576 "VMFunctionImport+0x18"
+;; region8 = 1207959560 "VMFunctionImport+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/null/br-on-cast.wat b/tests/disas/gc/null/br-on-cast.wat
index 1e73a0cdbb..75d7e22083 100644
--- a/tests/disas/gc/null/br-on-cast.wat
+++ b/tests/disas/gc/null/br-on-cast.wat
@@ -18,14 +18,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
-;; region7 = 2415919128 "VMFunctionImport+0x18"
-;; region8 = 2415919112 "VMFunctionImport+0x8"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "GcHeap"
+;; region7 = 1207959576 "VMFunctionImport+0x18"
+;; region8 = 1207959560 "VMFunctionImport+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/null/call-indirect-and-subtyping.wat b/tests/disas/gc/null/call-indirect-and-subtyping.wat
index 26785dbe46..b3144b10ad 100644
--- a/tests/disas/gc/null/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/null/call-indirect-and-subtyping.wat
@@ -18,14 +18,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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/externref-globals.wat b/tests/disas/gc/null/externref-globals.wat
index a42e19b8f4..65cb9d5906 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 9e446629c6..17d1d5dc3b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 22dbf0b0d3..5b48d29f8a 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
@@ -11,14 +11,14 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1879048192 "VMNullHeapData+0x0"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 134217760 "VMStoreContext+0x20"
+;; region3 = 939524096 "VMNullHeapData+0x0"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 67108896 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 3355443200 "TypeIdsArray+0x0"
-;; region8 = 1073741824 "GcHeap"
+;; region7 = 1677721600 "TypeIdsArray+0x0"
+;; region8 = 536870912 "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 9d6ff58f78..a54911faed 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 7e06fe6067..d574e45de0 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 d78beac572..1e6f926469 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 3e6f14ef22..71ad809cd6 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 1fd8d81517..5ca5bb1fd7 100644
--- a/tests/disas/gc/null/ref-cast.wat
+++ b/tests/disas/gc/null/ref-cast.wat
@@ -10,12 +10,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "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 f52e531cfe..64a0d2149a 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 515f79a8a5..bceee0f2a5 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 a5f6ab0558..ac595109e6 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 c6e2ec3166..9216535a96 100644
--- a/tests/disas/gc/null/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-func-type.wat
@@ -10,10 +10,10 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 3221225488 "VMFuncRef+0x10"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 1610612752 "VMFuncRef+0x10"
;; gv0 = vmctx
;; 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 0f77aef17c..04eb15fb05 100644
--- a/tests/disas/gc/null/ref-test-concrete-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-type.wat
@@ -10,12 +10,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "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 10c14981f4..804206c05d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 203be3f69a..e0e3feb088 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 f2754c0419..69f6aa9c65 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 1f4db112e1..46d36d15fa 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 76b74f5aa7..06682ff9e4 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 d98258eb14..52cd3e3f97 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 1c71a13386..9bb373d9d1 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 e4f4eaf630..d3b1a3612f 100644
--- a/tests/disas/gc/null/struct-new-default.wat
+++ b/tests/disas/gc/null/struct-new-default.wat
@@ -13,14 +13,14 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1879048192 "VMNullHeapData+0x0"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 134217760 "VMStoreContext+0x20"
+;; region3 = 939524096 "VMNullHeapData+0x0"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 67108896 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 3355443200 "TypeIdsArray+0x0"
-;; region8 = 1073741824 "GcHeap"
+;; region7 = 1677721600 "TypeIdsArray+0x0"
+;; region8 = 536870912 "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 be38ed1594..6ea9bb70e9 100644
--- a/tests/disas/gc/null/struct-new.wat
+++ b/tests/disas/gc/null/struct-new.wat
@@ -14,15 +14,15 @@
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1879048192 "VMNullHeapData+0x0"
-;; region4 = 134217768 "VMStoreContext+0x28"
-;; region5 = 134217760 "VMStoreContext+0x20"
+;; region3 = 939524096 "VMNullHeapData+0x0"
+;; region4 = 67108904 "VMStoreContext+0x28"
+;; region5 = 67108896 "VMStoreContext+0x20"
;; region6 = 40 "VMContext+0x28"
-;; region7 = 3355443200 "TypeIdsArray+0x0"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 3087007744 "Stack(ss0)"
+;; region7 = 1677721600 "TypeIdsArray+0x0"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 3211308fe3..2731a51afa 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 21df18d18a..99d385a682 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217760 "VMStoreContext+0x20"
-;; region3 = 134217768 "VMStoreContext+0x28"
-;; region4 = 1073741824 "GcHeap"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108896 "VMStoreContext+0x20"
+;; region3 = 67108904 "VMStoreContext+0x28"
+;; region4 = 536870912 "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 e96fe091be..384cecc5e9 100644
--- a/tests/disas/gc/ref-test-cast-final-type.wat
+++ b/tests/disas/gc/ref-test-cast-final-type.wat
@@ -16,12 +16,12 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "GcHeap"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -61,12 +61,12 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 40 "VMContext+0x28"
-;; region3 = 3355443200 "TypeIdsArray+0x0"
-;; region4 = 134217760 "VMStoreContext+0x20"
-;; region5 = 134217768 "VMStoreContext+0x28"
-;; region6 = 1073741824 "GcHeap"
+;; region3 = 1677721600 "TypeIdsArray+0x0"
+;; region4 = 67108896 "VMStoreContext+0x20"
+;; region5 = 67108904 "VMStoreContext+0x28"
+;; region6 = 536870912 "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 bdcc8576e5..da7731d544 100644
--- a/tests/disas/gc/struct-new-default.wat
+++ b/tests/disas/gc/struct-new-default.wat
@@ -14,14 +14,14 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "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 256353fd0e..13979f7f80 100644
--- a/tests/disas/gc/struct-new.wat
+++ b/tests/disas/gc/struct-new.wat
@@ -14,15 +14,15 @@
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 32 "VMContext+0x20"
-;; region3 = 1744830464 "VMCopyingHeapData+0x0"
-;; region4 = 1744830468 "VMCopyingHeapData+0x4"
+;; region3 = 872415232 "VMCopyingHeapData+0x0"
+;; region4 = 872415236 "VMCopyingHeapData+0x4"
;; region5 = 40 "VMContext+0x28"
-;; region6 = 3355443200 "TypeIdsArray+0x0"
-;; region7 = 134217760 "VMStoreContext+0x20"
-;; region8 = 1073741824 "GcHeap"
-;; region9 = 3087007744 "Stack(ss0)"
+;; region6 = 1677721600 "TypeIdsArray+0x0"
+;; region7 = 67108896 "VMStoreContext+0x20"
+;; region8 = 536870912 "GcHeap"
+;; region9 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; 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 ee5a16c378..ae5a983903 100644
--- a/tests/disas/gc/typed-select-and-stack-maps.wat
+++ b/tests/disas/gc/typed-select-and-stack-maps.wat
@@ -42,10 +42,10 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; ss0 = explicit_slot 4, align = 4
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2415919112 "VMFunctionImport+0x8"
-;; region4 = 3087007744 "Stack(ss0)"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1207959560 "VMFunctionImport+0x8"
+;; region4 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,9 +72,9 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1207959560 "VMFunctionImport+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/global-get.wat b/tests/disas/global-get.wat
index 881d30541c..6776b51541 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2952790016 "VMGlobalImport+0x0"
-;; region3 = 805306368 "PublicGlobal"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1476395008 "VMGlobalImport+0x0"
+;; region3 = 402653184 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2952790016 "VMGlobalImport+0x0"
-;; region3 = 805306368 "PublicGlobal"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1476395008 "VMGlobalImport+0x0"
+;; region3 = 402653184 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524097 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762049 "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 54d2602d6d..b9ed85c5df 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 = 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))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 603979776 "VMMemoryDefinition+0x0"
+;; region4 = 603979784 "VMMemoryDefinition+0x8"
+;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(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/guest-debugging.wat b/tests/disas/guest-debugging.wat
index 6f66d03319..5c269be556 100644
--- a/tests/disas/guest-debugging.wat
+++ b/tests/disas/guest-debugging.wat
@@ -21,8 +21,8 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 28, key = 0
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 3087007744 "Stack(ss0)"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1543503872 "Stack(ss0)"
;; sig0 = (i64 vmctx, i8) tail
;; sig1 = (i64 vmctx) tail
;; sig2 = (i64) preserve_all
diff --git a/tests/disas/i128-cmp.wat b/tests/disas/i128-cmp.wat
index d90a80b7a7..19fb142a4e 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 c938e2d790..22c56fe5e8 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 303efc241e..e00f4e0c59 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 ca3e5348cf..f0dffb1e7d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 f2899aca2a..28849cd154 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 11af3d6a43..4764d4ddcf 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3baba8ff78..d3ee06cf51 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3d8015dc4d..6c78b6ceae 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 97045d8208..52aac2f740 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 236a31161f..4c79eb953c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 a0b84d95fb..2a8ce13168 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 b8998b5db9..9170210cbd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 78aa4c8435..9027f8d02c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 f43aa76706..3d028d97d7 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 16b90e7793..f534e27bf5 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 8745407e5b..bc655f5c0e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 46947fe2d1..35b9943165 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bbb6d092f5..c6f784379b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 497f29cedc..2a3ede41eb 100644
--- a/tests/disas/icall-loop.wat
+++ b/tests/disas/icall-loop.wat
@@ -24,14 +24,14 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -79,14 +79,14 @@
;;
;; function u0:1(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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/icall-simd.wat b/tests/disas/icall-simd.wat
index e8db487873..a3945b016e 100644
--- a/tests/disas/icall-simd.wat
+++ b/tests/disas/icall-simd.wat
@@ -10,14 +10,14 @@
;; function u0:0(i64 vmctx, i64, i32, i8x16) -> i8x16 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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/icall.wat b/tests/disas/icall.wat
index bc57836365..59e082f193 100644
--- a/tests/disas/icall.wat
+++ b/tests/disas/icall.wat
@@ -10,14 +10,14 @@
;; function u0:0(i64 vmctx, i64, i32, f32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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/idempotent-store.wat b/tests/disas/idempotent-store.wat
index c34d2cbf4c..d780f65d02 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3eba2e1554..65ffbe5984 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 18ed471303..1ccdb967ff 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 7be14f531b..0db7d85007 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 bad004bbb2..8612a7a235 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 092f4c2f6d..1a9dc2d7a8 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 e78fabfbae..5787e178b6 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 548f54c0c8..3841b6e040 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 46257589c4..85dd980ea3 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 40ca177575..51e7fdc63c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 e6ff22cd77..d216ca74ab 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,14 +70,14 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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/intra-module-inlining.wat b/tests/disas/intra-module-inlining.wat
index b7ab00f512..7ce3492d26 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 cff4304455..2d5a3645ae 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 8b7aba8aeb..f62c4414a9 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 6664e16eec..9c0044b028 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 65d9a4a1cd..8d7e52e515 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 922415ce46..e4f3720e25 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 5163d6a098..4b2d8fa36c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 56d5d460e4..790a376240 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 67b41e1372..6162b34de4 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 5ab278f2ac..a430bc0e33 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 0477520beb..667fbc2e2c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c9caeaddd7..be83c3291f 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 b681941a59..307902c2fd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3c28c68fea..984b8504c7 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 4c9ea50795..7825e6dbc1 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bc749afe5a..73a21952af 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3c6d4c7c97..f0e54c33ec 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 5eb3b9771e..b56774e1bf 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 521b8018db..8f59f5d296 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 ce641603e9..246bbbd498 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 706a0003e4..3563721b32 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 84c9da43df..9eed6bfaea 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bc53aa6be4..9a3303bdcb 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 63b9e53ce9..2bb8f4f5cb 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2ba935da48..8398a318a6 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 37707c9106..485ed12f61 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 6d66c59779..ebccfcc237 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c831ff9061..dbf739b50e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 8167376d14..921f32075c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 59ad43b872..dca2b258b1 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 ea7b7468dd..a90dde2a9d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 10e449af5a..d0e7cda5bf 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 7f88f557ea..065be4b82f 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 164e212454..d68ad81ac2 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 5b0104c1d9..2e9e6bce7b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 a98adfb439..12a29fde10 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 97863acc9a..bbaa198901 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2224976f15..05f297b32b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2e571cd130..ad0cb5594e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2f25cb5a49..eef14e79d3 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 63a5258399..025c21933f 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3b03a7f80f..211bafd51e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 6940664aed..3efd391cd2 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 f43540f56d..507ede1c3d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 a58074e39c..ce7779c48c 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 6b40012dcc..e77195d7b6 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2defaa2220..2495c786e5 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 4c4059dd5f..7d3cbab0ac 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 aa4ab377de..2f31540c44 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 b75ef60df5..8713c6e348 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 ddb0ba23b6..ab05e756ad 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3b59cd8a6c..9aabcde409 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 09ebaebe62..678847c153 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 6c30d97d65..ea86bd149a 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 4c526b6c4b..0f94b01c78 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 e145eecd8e..cb2a1f0d6b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 28cd0f3dbf..fcb393ad1b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c01e81e043..5721a18586 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 7d84f0478d..5172e05d9f 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c0b0c32472..988a78c357 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 4fb4306830..8c4aee640b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 9fce9d657f..a96c34c825 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 d07e35993d..35d887fdca 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 20f8a9694c..2a1f36ddfd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3beb1eb627..3f90d85270 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2b34342e35..3eb4620bf9 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 abaf48a9fc..2e814f514d 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 ad64a479ab..7be8641bad 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c2f5cc0db8..17ed8a94b0 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 737172f09b..8044c78f79 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bd61c2eaa7..95df1bf1c5 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c83ca71100..e905a0b626 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 ea8f55ca53..5edc9f61f3 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bbb983953f..2a60284153 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 10718bd6c2..3f00817b31 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bd943face8..459299696b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 25a77a93dc..7fd01d3945 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 cd19475a6b..e54675a931 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 24572c849e..de8517a79e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 d6b5ffee63..1aa7d20d51 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 6998bff7a3..589727148e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bc2be7f09c..d3cea23397 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 f22862f4cb..876ff32fa5 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 da4f41c66d..84884a0ecd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 b7ba7cd3e0..8696422787 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 47daaebdb3..3c1efc83ad 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bb8b76435b..c5b9a07671 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 16c59d3a81..ea073317fc 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 517e8b00da..1a3fb048fb 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 33e5563cd2..613d276457 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c7e7ed6fca..1ae5ed273b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 e54d9a5f60..dd668aace6 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 c677ee9876..fc3ca45ece 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 eaaab133f4..ccb7665ed1 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 5096448f4d..4f375f459e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 cd3dea003c..15b140e83b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 f1d7edfcd3..748ef00c7f 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 bc7593bd3a..ca8b58e580 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 3b99f918d8..4956df8b43 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 2b38258bfb..f712972b87 100644
--- a/tests/disas/memory-copy-epochs.wat
+++ b/tests/disas/memory-copy-epochs.wat
@@ -10,12 +10,12 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 24 "VMContext+0x18"
-;; region3 = 3489660928 "EpochCounter+0x0"
-;; region4 = 134217736 "VMStoreContext+0x8"
-;; region5 = 1207959552 "VMMemoryDefinition+0x0"
-;; region6 = 1207959560 "VMMemoryDefinition+0x8"
+;; region3 = 1744830464 "EpochCounter+0x0"
+;; region4 = 67108872 "VMStoreContext+0x8"
+;; region5 = 603979776 "VMMemoryDefinition+0x0"
+;; region6 = 603979784 "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 ca96ae79d3..45e72b7043 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217728 "VMStoreContext+0x0"
-;; region3 = 1207959552 "VMMemoryDefinition+0x0"
-;; region4 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108864 "VMStoreContext+0x0"
+;; region3 = 603979776 "VMMemoryDefinition+0x0"
+;; region4 = 603979784 "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 41a5801edc..1f1bf7efac 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 5d79a11606..1ddbca1186 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2415919128 "VMFunctionImport+0x18"
-;; region3 = 2415919112 "VMFunctionImport+0x8"
-;; region4 = 1207959552 "VMMemoryDefinition+0x0"
-;; region5 = 1207959560 "VMMemoryDefinition+0x8"
-;; region6 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region3 = 1207959560 "VMFunctionImport+0x8"
+;; region4 = 603979776 "VMMemoryDefinition+0x0"
+;; region5 = 603979784 "VMMemoryDefinition+0x8"
+;; region6 = 201326592 "DefinedMemory(StaticModuleIndex(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 2f3e510dcc..d52b954d40 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 a86ffbb78d..8b2dd7206d 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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 2b18f2724e..af4e249ade 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 818ed0fdd0..9a3de66d73 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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 = 1207959552 "VMMemoryDefinition+0x0"
-;; region1 = 1207959556 "VMMemoryDefinition+0x4"
+;; region0 = 603979776 "VMMemoryDefinition+0x0"
+;; region1 = 603979780 "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 2b91d60208..48b7d9f600 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 106e05e255..9d081b8116 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 089dec922f..37914c4d49 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 06113f2d68..01f6fe9537 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 034b14e96e..0bd4cb1cef 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 10e899f1cc..67f5f6c5f6 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 c2ec8ff841..bb40c3ee70 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 fdafe997ed..a0e0f788f9 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 f26c8e4f6c..97caeb773d 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 893a587cb8..7fa7cd8847 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 967190aeec..e57e1de7bd 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 140596c44f..2022c2f994 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 f4d5428f65..ed9c29c6b6 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 59ae24f897..31c54f3d77 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 300e0262e8..a53e9b6894 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 d852d4f8a2..1a3a072ab9 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 b7a9d00165..297215109b 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 e533ec538d..d971947d4c 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 68b0b39fec..55b992eaeb 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 a90ae94f84..871c6a693e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 d39b394833..8f2ab7b1f3 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 2fb896ddd9..0cd07c1e5a 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 e3fee9a5fa..420514c066 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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,13 +71,13 @@
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; 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 = 2415919128 "VMFunctionImport+0x18"
-;; region7 = 2415919112 "VMFunctionImport+0x8"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 603979776 "VMMemoryDefinition+0x0"
+;; region4 = 603979784 "VMMemoryDefinition+0x8"
+;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region6 = 1207959576 "VMFunctionImport+0x18"
+;; region7 = 1207959560 "VMFunctionImport+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/pr2303.wat b/tests/disas/pr2303.wat
index d91e387f91..6a4e91f1cd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 268435456 "PublicMemory"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 134217728 "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 7e20757e48..abca108c8e 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 ad1dcfb730..bb9fc978a8 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -35,14 +35,14 @@
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
;; region4 = 40 "VMContext+0x28"
-;; region5 = 3355443200 "TypeIdsArray+0x0"
-;; region6 = 3221225488 "VMFuncRef+0x10"
-;; region7 = 3221225480 "VMFuncRef+0x8"
-;; region8 = 3221225496 "VMFuncRef+0x18"
+;; region5 = 1677721600 "TypeIdsArray+0x0"
+;; region6 = 1610612752 "VMFuncRef+0x10"
+;; region7 = 1610612744 "VMFuncRef+0x8"
+;; region8 = 1610612760 "VMFuncRef+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-heap-base-pointer1.wat b/tests/disas/readonly-heap-base-pointer1.wat
index e6c8feafff..4c7b3ff4e8 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 e7e6f298a6..f870bcd2ec 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; region2 = 48 "VMContext+0x30"
-;; region3 = 1207959552 "VMMemoryDefinition+0x0"
-;; region4 = 1207959560 "VMMemoryDefinition+0x8"
-;; region5 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region3 = 603979776 "VMMemoryDefinition+0x0"
+;; region4 = 603979784 "VMMemoryDefinition+0x8"
+;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(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 b2cf2accd1..18f0e9a525 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 f13ca0d109..4e03d79ee7 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 805306368 "PublicGlobal"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 402653184 "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 99befc345c..03db5c9558 100644
--- a/tests/disas/riscv64-component-builtins.wat
+++ b/tests/disas/riscv64-component-builtins.wat
@@ -12,13 +12,13 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217776 "VMStoreContext+0x30"
-;; region2 = 134217784 "VMStoreContext+0x38"
-;; region3 = 1476395040 "VMComponentContext+0x20"
-;; region4 = 1476395016 "VMComponentContext+0x8"
-;; region5 = 3758096400 "ComponentBuiltinFunctionsArray+0x10"
+;; region1 = 67108912 "VMStoreContext+0x30"
+;; region2 = 67108920 "VMStoreContext+0x38"
+;; region3 = 738197536 "VMComponentContext+0x20"
+;; region4 = 738197512 "VMComponentContext+0x8"
+;; region5 = 1879048208 "ComponentBuiltinFunctionsArray+0x10"
;; region6 = 16 "VMContext+0x10"
-;; region7 = 3623878984 "BuiltinFunctionsArray+0x148"
+;; region7 = 1811939656 "BuiltinFunctionsArray+0x148"
;; 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 cd591ab2c7..ec9e0a157b 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 43c3133769..ae9ed774cd 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1207959552 "VMMemoryDefinition+0x0"
-;; region3 = 1207959560 "VMMemoryDefinition+0x8"
-;; region4 = 402653184 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 603979776 "VMMemoryDefinition+0x0"
+;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(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 92759a8910..3eb80c5e81 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 0fb2c3ea43..c2b9233b42 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 2b77a20ef5..711af71c7c 100644
--- a/tests/disas/stack-switching/resume-suspend-data-passing.wat
+++ b/tests/disas/stack-switching/resume-suspend-data-passing.wat
@@ -40,10 +40,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 16, align = 65536
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217816 "VMStoreContext+0x58"
-;; region3 = 2147483648 "VMContRef+0x0"
-;; region4 = 2281701376 "ContinuationStackMemory+0x0"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108952 "VMStoreContext+0x58"
+;; region3 = 1073741824 "VMContRef+0x0"
+;; region4 = 1140850688 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -151,11 +151,11 @@
;; function u0:1(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2147483648 "VMContRef+0x0"
-;; region3 = 134217816 "VMStoreContext+0x58"
-;; region4 = 134217800 "VMStoreContext+0x48"
-;; region5 = 2281701376 "ContinuationStackMemory+0x0"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1073741824 "VMContRef+0x0"
+;; region3 = 67108952 "VMStoreContext+0x58"
+;; region4 = 67108936 "VMStoreContext+0x48"
+;; region5 = 1140850688 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; 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.wat b/tests/disas/stack-switching/resume-suspend.wat
index 080783358e..e5b18c0926 100644
--- a/tests/disas/stack-switching/resume-suspend.wat
+++ b/tests/disas/stack-switching/resume-suspend.wat
@@ -24,10 +24,10 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 134217816 "VMStoreContext+0x58"
-;; region3 = 2147483648 "VMContRef+0x0"
-;; region4 = 2281701376 "ContinuationStackMemory+0x0"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 67108952 "VMStoreContext+0x58"
+;; region3 = 1073741824 "VMContRef+0x0"
+;; region4 = 1140850688 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -112,11 +112,11 @@
;; function u0:1(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2147483648 "VMContRef+0x0"
-;; region3 = 134217816 "VMStoreContext+0x58"
-;; region4 = 134217800 "VMStoreContext+0x48"
-;; region5 = 2281701376 "ContinuationStackMemory+0x0"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1073741824 "VMContRef+0x0"
+;; region3 = 67108952 "VMStoreContext+0x58"
+;; region4 = 67108936 "VMStoreContext+0x48"
+;; region5 = 1140850688 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; 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/symmetric-switch.wat b/tests/disas/stack-switching/symmetric-switch.wat
index fc53a3a107..9c8ed3408c 100644
--- a/tests/disas/stack-switching/symmetric-switch.wat
+++ b/tests/disas/stack-switching/symmetric-switch.wat
@@ -28,12 +28,12 @@
;; function u0:0(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 24, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2147483648 "VMContRef+0x0"
-;; region3 = 134217816 "VMStoreContext+0x58"
-;; region4 = 2281701376 "ContinuationStackMemory+0x0"
-;; region5 = 134217800 "VMStoreContext+0x48"
-;; region6 = 3087007744 "Stack(ss0)"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1073741824 "VMContRef+0x0"
+;; region3 = 67108952 "VMStoreContext+0x58"
+;; region4 = 1140850688 "ContinuationStackMemory+0x0"
+;; region5 = 67108936 "VMStoreContext+0x48"
+;; region6 = 1543503872 "Stack(ss0)"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -237,7 +237,7 @@
;;
;; function u0:1(i64 vmctx, i64, i128) tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -253,11 +253,11 @@
;; function u0:2(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2147483648 "VMContRef+0x0"
-;; region3 = 134217816 "VMStoreContext+0x58"
-;; region4 = 134217800 "VMStoreContext+0x48"
-;; region5 = 2281701376 "ContinuationStackMemory+0x0"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1073741824 "VMContRef+0x0"
+;; region3 = 67108952 "VMStoreContext+0x58"
+;; region4 = 67108936 "VMStoreContext+0x48"
+;; region5 = 1140850688 "ContinuationStackMemory+0x0"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/startup-data-active.wat b/tests/disas/startup-data-active.wat
index d5ffd4c8e3..9f021ebcc8 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 = 134217800 "VMStoreContext+0x48"
-;; region2 = 134217792 "VMStoreContext+0x40"
-;; region3 = 134217808 "VMStoreContext+0x50"
-;; region4 = 134217864 "VMStoreContext+0x88"
+;; region1 = 67108936 "VMStoreContext+0x48"
+;; region2 = 67108928 "VMStoreContext+0x40"
+;; region3 = 67108944 "VMStoreContext+0x50"
+;; region4 = 67109000 "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 = 1207959560 "VMMemoryDefinition+0x8"
-;; region3 = 1207959552 "VMMemoryDefinition+0x0"
+;; region2 = 603979784 "VMMemoryDefinition+0x8"
+;; region3 = 603979776 "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 05dfbb23f3..4b802eee44 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 = 134217800 "VMStoreContext+0x48"
-;; region2 = 134217792 "VMStoreContext+0x40"
-;; region3 = 134217808 "VMStoreContext+0x50"
-;; region4 = 134217864 "VMStoreContext+0x88"
+;; region1 = 67108936 "VMStoreContext+0x48"
+;; region2 = 67108928 "VMStoreContext+0x40"
+;; region3 = 67108944 "VMStoreContext+0x50"
+;; region4 = 67109000 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -46,9 +46,9 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 1342177280 "VMTableDefinition+0x0"
-;; region1 = 1342177288 "VMTableDefinition+0x8"
-;; region2 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 671088640 "VMTableDefinition+0x0"
+;; region1 = 671088648 "VMTableDefinition+0x8"
+;; region2 = 335544320 "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 95ebd20d99..b669c9874b 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 = 134217800 "VMStoreContext+0x48"
-;; region2 = 134217792 "VMStoreContext+0x40"
-;; region3 = 134217808 "VMStoreContext+0x50"
-;; region4 = 134217864 "VMStoreContext+0x88"
+;; region1 = 67108936 "VMStoreContext+0x48"
+;; region2 = 67108928 "VMStoreContext+0x40"
+;; region3 = 67108944 "VMStoreContext+0x50"
+;; region4 = 67109000 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -39,7 +39,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 469762048 "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 ee0f64d475..6c30327a12 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 = 134217800 "VMStoreContext+0x48"
-;; region2 = 134217792 "VMStoreContext+0x40"
-;; region3 = 134217808 "VMStoreContext+0x50"
-;; region4 = 134217864 "VMStoreContext+0x88"
+;; region1 = 67108936 "VMStoreContext+0x48"
+;; region2 = 67108928 "VMStoreContext+0x40"
+;; region3 = 67108944 "VMStoreContext+0x50"
+;; region4 = 67109000 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -40,7 +40,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 1073741824 "GcHeap"
+;; region0 = 536870912 "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 033140def2..b6aed467e0 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 = 134217800 "VMStoreContext+0x48"
-;; region2 = 134217792 "VMStoreContext+0x40"
-;; region3 = 134217808 "VMStoreContext+0x50"
-;; region4 = 134217864 "VMStoreContext+0x88"
+;; region1 = 67108936 "VMStoreContext+0x48"
+;; region2 = 67108928 "VMStoreContext+0x40"
+;; region3 = 67108944 "VMStoreContext+0x50"
+;; region4 = 67109000 "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 14c5e29256..3db39fac99 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 = 134217800 "VMStoreContext+0x48"
-;; region2 = 134217792 "VMStoreContext+0x40"
-;; region3 = 134217808 "VMStoreContext+0x50"
-;; region4 = 134217864 "VMStoreContext+0x88"
+;; region1 = 67108936 "VMStoreContext+0x48"
+;; region2 = 67108928 "VMStoreContext+0x40"
+;; region3 = 67108944 "VMStoreContext+0x50"
+;; region4 = 67109000 "VMStoreContext+0x88"
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -40,9 +40,9 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 1342177280 "VMTableDefinition+0x0"
-;; region1 = 1342177288 "VMTableDefinition+0x8"
-;; region2 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 671088640 "VMTableDefinition+0x0"
+;; region1 = 671088648 "VMTableDefinition+0x8"
+;; region2 = 335544320 "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 bf7c186ab6..3f59df7596 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "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 a55a984d1e..415701e481 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 2684354560 "VMTableImport+0x0"
-;; region3 = 1342177280 "VMTableDefinition+0x0"
-;; region4 = 1342177288 "VMTableDefinition+0x8"
-;; region5 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 1342177280 "VMTableImport+0x0"
+;; region3 = 671088640 "VMTableDefinition+0x0"
+;; region4 = 671088648 "VMTableDefinition+0x8"
+;; region5 = 268435456 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 2684354560 "VMTableImport+0x0"
-;; region4 = 1342177288 "VMTableDefinition+0x8"
-;; region5 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 1342177280 "VMTableImport+0x0"
+;; region4 = 671088648 "VMTableDefinition+0x8"
+;; region5 = 268435456 "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 52449817bb..7435472237 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 268435456 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 268435456 "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 3998281842..968a1f7c5b 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 268435456 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 268435456 "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 a3bf45267c..445c3dadc8 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 268435456 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 268435456 "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 b9a26f8f2b..bd5bbfa58e 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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 268435456 "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 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 1342177288 "VMTableDefinition+0x8"
-;; region4 = 536870912 "PublicTable"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 671088648 "VMTableDefinition+0x8"
+;; region4 = 268435456 "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 27f10d2021..3e50095a6f 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -130,11 +130,11 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 3221225480 "VMFuncRef+0x8"
-;; region5 = 3221225496 "VMFuncRef+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region4 = 1610612744 "VMFuncRef+0x8"
+;; region5 = 1610612760 "VMFuncRef+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -164,11 +164,11 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 3221225480 "VMFuncRef+0x8"
-;; region5 = 3221225496 "VMFuncRef+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region4 = 1610612744 "VMFuncRef+0x8"
+;; region5 = 1610612760 "VMFuncRef+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -198,11 +198,11 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 3221225480 "VMFuncRef+0x8"
-;; region4 = 3221225496 "VMFuncRef+0x18"
-;; region5 = 939524097 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 1610612744 "VMFuncRef+0x8"
+;; region4 = 1610612760 "VMFuncRef+0x18"
+;; region5 = 469762049 "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 28ad7d889f..9c5cee2932 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -130,11 +130,11 @@
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 3221225480 "VMFuncRef+0x8"
-;; region5 = 3221225496 "VMFuncRef+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region4 = 1610612744 "VMFuncRef+0x8"
+;; region5 = 1610612760 "VMFuncRef+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -188,11 +188,11 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableDefinition+0x0"
-;; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 3221225480 "VMFuncRef+0x8"
-;; region5 = 3221225496 "VMFuncRef+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 671088640 "VMTableDefinition+0x0"
+;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region4 = 1610612744 "VMFuncRef+0x8"
+;; region5 = 1610612760 "VMFuncRef+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -246,11 +246,11 @@
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 8 "VMContext+0x8"
-;; region1 = 134217752 "VMStoreContext+0x18"
-;; region2 = 939524096 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 3221225480 "VMFuncRef+0x8"
-;; region4 = 3221225496 "VMFuncRef+0x18"
-;; region5 = 939524097 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
+;; region1 = 67108888 "VMStoreContext+0x18"
+;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region3 = 1610612744 "VMFuncRef+0x8"
+;; region4 = 1610612760 "VMFuncRef+0x18"
+;; region5 = 469762049 "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 4afeab53b8..1556f1cb68 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 e58ba2a63f..fd2b51c303 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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "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 = 134217752 "VMStoreContext+0x18"
+;; region1 = 67108888 "VMStoreContext+0x18"
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24