Skip to content

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

Limit alias regions in Wasm-to-CLIF translation to 256 (#14253)

Nick Fitzgeraldcb4c21527a6f
diff --git a/crates/cranelift/src/alias_region.rs b/crates/cranelift/src/alias_region.rs
index 2ced3eb928..3282f36ae2 100644
--- a/crates/cranelift/src/alias_region.rs
+++ b/crates/cranelift/src/alias_region.rs
@@ -24,6 +24,7 @@ use cranelift_codegen::{
cursor::FuncCursor,
ir::{self, InstBuilder as _},
};
+use std::hash::{Hash as _, Hasher};
use wasmtime_environ::{
BuiltinFunctionIndex, DefinedGlobalIndex, DefinedMemoryIndex, DefinedTableIndex, GetPtrSize,
ModuleInternedTypeIndex, NUM_COMPONENT_CONTEXT_SLOTS, PtrSize as _, RuntimeDataIndex,
@@ -85,9 +86,6 @@ enum VmType {
///
/// This is used to assign stable `user_id`s to `AliasRegionData` entries so
/// that alias regions can be deduplicated during inlining.
-///
-/// The key encodes into a single `u32` with the following layout:
-/// `[ 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`.
@@ -161,143 +159,109 @@ enum AliasRegionKey {
}
impl AliasRegionKey {
- 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;
+ /// Encode this key into a raw `u32` suitable for use as an
+ /// `AliasRegionData::user_id`.
+ ///
+ /// We lossily encode the key into a `user_id` via a single-byte hash, so
+ /// there are at most 256 alias regions. This avoids compile-time blowups
+ /// associated with many alias regions.
+ ///
+ /// Note that mapping multiple alias regions onto the same `user_id` is
+ /// always okay: by collapsing two logical regions into one actual region,
+ /// we are letting Cranelift believe they *might* alias even when they
+ /// actually cannot. At worst this prevents some optimization. The opposite,
+ /// however -- if we were to place accesses that *could* alias in two
+ /// different regions -- is not sound. That would let Cranelift optimize
+ /// based on a false premise, leading to misoptimizations and symptoms like
+ /// memory writes "disappearing".
+ ///
+ /// Simultaneously, this mapping is independent of the particular set of
+ /// `AliasRegionKey`s used in a particular Wasm-to-CLIF translation, which
+ /// is necessary for inlining. If we assigned `user_id = 1` to the first
+ /// `AliasRegionKey`, `user_id = 2` to the second, etc... then inlining one
+ /// function into another would mean that the `user_id`s for the same
+ /// `AliasRegionKey` could be inconsistent with each other, which also leads
+ /// to the miscompilation scenario described above.
+ pub(crate) fn into_raw(self) -> u32 {
+ /// A version of `rustc_hash::FxHasher` that is guaranteed to provide
+ /// deterministic hashing across Wasmtime builds and processes.
+ struct AliasRegionHasher {
+ hash: u64,
+ }
- const OFFSET_MASK: u32 = !Self::KIND_MASK;
+ impl AliasRegionHasher {
+ fn new(seed: u64) -> Self {
+ AliasRegionHasher { hash: seed }
+ }
- const MODULE_BITS: u32 = 8;
- const MODULE_OFFSET: u32 = Self::KIND_OFFSET - Self::MODULE_BITS;
- const MODULE_MASK: u32 = ((1 << Self::MODULE_BITS) - 1) << Self::MODULE_OFFSET;
+ fn add(&mut self, i: u64) {
+ const K: u64 = 0x517c_c1b7_2722_0a95;
+ self.hash = (self.hash.rotate_left(5) ^ i).wrapping_mul(K);
+ }
+ }
- const INDEX_MASK: u32 = !Self::KIND_MASK & !Self::MODULE_MASK;
+ impl Hasher for AliasRegionHasher {
+ fn finish(&self) -> u64 {
+ self.hash
+ }
- const fn new_kind(kind: u32) -> u32 {
- assert!(kind < (1 << Self::KIND_BITS));
- kind << Self::KIND_OFFSET
- }
+ fn write(&mut self, bytes: &[u8]) {
+ for b in bytes {
+ self.add((*b).into());
+ }
+ }
- 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);
- const VM_GLOBAL_DEFINITION_KIND: u32 = Self::new_kind(0b100001);
- const VM_TAG_DEFINITION_KIND: u32 = Self::new_kind(0b100010);
- const VM_LAZY_THREAD_KIND: u32 = Self::new_kind(0b100011);
- const VM_STACK_LIMITS_KIND: u32 = Self::new_kind(0b100100);
- const VM_COMMON_STACK_INFORMATION_KIND: u32 = Self::new_kind(0b100101);
- const VM_HOST_ARRAY_KIND: u32 = Self::new_kind(0b100110);
+ fn write_u8(&mut self, i: u8) {
+ self.add(i.into());
+ }
- /// Encode this key into a raw `u32` suitable for use as an
- /// `AliasRegionData::user_id`.
- pub(crate) fn into_raw(self) -> u32 {
- match self {
- AliasRegionKey::Vm { ty, offset } => {
- debug_assert_eq!(offset & Self::KIND_MASK, 0);
- let kind = match ty {
- VmType::VMContext => Self::VM_CONTEXT_KIND,
- VmType::VMStoreContext => Self::VM_STORE_CONTEXT_KIND,
- VmType::VMMemoryDefinition => Self::VM_MEMORY_DEFINITION_KIND,
- VmType::VMTableDefinition => Self::VM_TABLE_DEFINITION_KIND,
- VmType::VMGlobalDefinition => Self::VM_GLOBAL_DEFINITION_KIND,
- VmType::VMTagDefinition => Self::VM_TAG_DEFINITION_KIND,
- VmType::VMComponentContext => Self::VM_COMPONENT_CONTEXT_KIND,
- VmType::VMDrcHeapData => Self::VM_DRC_HEAP_DATA_KIND,
- VmType::VMCopyingHeapData => Self::VM_COPYING_HEAP_DATA_KIND,
- VmType::VMNullHeapData => Self::VM_NULL_HEAP_DATA_KIND,
- VmType::VMDeferredThread => Self::VM_DEFERRED_THREAD_KIND,
- VmType::VMStackLimits => Self::VM_STACK_LIMITS_KIND,
- VmType::VMLazyThread => Self::VM_LAZY_THREAD_KIND,
- VmType::VMContRef => Self::VM_CONTREF_KIND,
- VmType::VMCommonStackInformation => Self::VM_COMMON_STACK_INFORMATION_KIND,
- VmType::VMHostArray => Self::VM_HOST_ARRAY_KIND,
- VmType::ContinuationStackMemory => Self::CONTINUATION_STACK_MEMORY_KIND,
- VmType::VMFunctionImport => Self::VM_FUNCTION_IMPORT_KIND,
- VmType::VMMemoryImport => Self::VM_MEMORY_IMPORT_KIND,
- VmType::VMTableImport => Self::VM_TABLE_IMPORT_KIND,
- VmType::VMTagImport => Self::VM_TAG_IMPORT_KIND,
- VmType::VMGlobalImport => Self::VM_GLOBAL_IMPORT_KIND,
- VmType::VMFuncRef => Self::VM_FUNC_REF_KIND,
- VmType::TypeIdsArray => Self::TYPE_IDS_ARRAY_KIND,
- VmType::EpochCounter => Self::EPOCH_COUNTER_KIND,
- VmType::BuiltinFunctionsArray => Self::BUILTIN_FUNCTIONS_KIND,
- VmType::ComponentBuiltinFunctionsArray => {
- Self::COMPONENT_BUILTIN_FUNCTIONS_KIND
- }
- VmType::HostValRaw => Self::HOST_VAL_RAW_KIND,
- };
- kind | (offset & Self::OFFSET_MASK)
+ fn write_u16(&mut self, i: u16) {
+ self.add(i.into());
}
- AliasRegionKey::PublicMemory => Self::IMPORTED_MEMORY_KIND,
- AliasRegionKey::DefinedMemory { module, index } => {
- debug_assert_eq!(
- module.as_u32() & !(Self::MODULE_MASK >> Self::MODULE_OFFSET),
- 0
- );
- debug_assert_eq!(index.as_u32() & !Self::INDEX_MASK, 0);
- Self::DEFINED_MEMORY_KIND
- | (module.as_u32() << Self::MODULE_OFFSET)
- | index.as_u32()
+
+ fn write_u32(&mut self, i: u32) {
+ self.add(i.into());
}
- AliasRegionKey::PublicTable => Self::IMPORTED_TABLE_KIND,
- AliasRegionKey::DefinedTable { module, index } => {
- debug_assert_eq!(
- module.as_u32() & !(Self::MODULE_MASK >> Self::MODULE_OFFSET),
- 0
- );
- debug_assert_eq!(index.as_u32() & !Self::INDEX_MASK, 0);
- Self::DEFINED_TABLE_KIND | (module.as_u32() << Self::MODULE_OFFSET) | index.as_u32()
+
+ fn write_u64(&mut self, i: u64) {
+ self.add(i);
}
- AliasRegionKey::PublicGlobal => Self::IMPORTED_GLOBAL_KIND,
- AliasRegionKey::DefinedGlobal { module, index } => {
- debug_assert_eq!(
- module.as_u32() & !(Self::MODULE_MASK >> Self::MODULE_OFFSET),
- 0
- );
- debug_assert_eq!(index.as_u32() & !Self::INDEX_MASK, 0);
- Self::DEFINED_GLOBAL_KIND
- | (module.as_u32() << Self::MODULE_OFFSET)
- | index.as_u32()
+
+ fn write_u128(&mut self, i: u128) {
+ self.add(u64::try_from(i & u128::from(u64::MAX)).unwrap());
+ self.add(u64::try_from(i >> 64).unwrap());
}
- AliasRegionKey::GcHeap => Self::GC_HEAP_KIND,
- AliasRegionKey::Stack { slot } => {
- debug_assert_eq!(slot.as_u32() & Self::KIND_MASK, 0);
- Self::STACK_KIND | (slot.as_u32() & Self::OFFSET_MASK)
+
+ fn write_usize(&mut self, i: usize) {
+ self.add(u64::try_from(i).unwrap());
}
- AliasRegionKey::UnsafeIntrinsicMemory => Self::UNSAFE_INTRINSIC_MEMORY_KIND,
- AliasRegionKey::ElementSegment => Self::ELEMENT_SEGMENT_KIND,
- AliasRegionKey::DataSegment => Self::DATA_SEGMENT_KIND,
}
+
+ /// The `AliasRegionHasher` seed, chosen to shift which keys collide
+ /// with which.
+ ///
+ /// Collisions are inevitable because we are lossily mapping our
+ /// ~"infinite" keys onto only 256 actual alias regions. However, not
+ /// all collisions are equal. The cost of a pair of globals colliding is
+ /// marginal. A collision between `VMContext::store_context` and the
+ /// first defined memory's base pointer, two of the most-frequently used
+ /// regions in essentially every function, would be expensive.
+ ///
+ /// This value was picked by brute-force search as one for which none
+ /// of the following collide with each other: the fixed, non-indexed
+ /// keys appearing anywhere in `tests/disas`, and the first five defined
+ /// memories, tables, and globals of the first module. If a new `VM*`
+ /// field or `AliasRegionKey` variant introduces such a collision later,
+ /// the `tests/disas` expectations will show it as two regions merging
+ /// into one, and a new seed can be searched for in the same way.
+ const SEED: u64 = 15912981;
+
+ let mut hasher = AliasRegionHasher::new(SEED);
+ self.hash(&mut hasher);
+ let hash = hasher.finish();
+
+ // `xor`-fold the hash down to a single byte.
+ hash.to_le_bytes().into_iter().fold(0, |a, b| a ^ b).into()
}
}
@@ -326,25 +290,14 @@ impl fmt::Debug for AliasRegionKey {
}
}
-impl From<AliasRegionKey> for ir::AliasRegionData {
- fn from(key: AliasRegionKey) -> ir::AliasRegionData {
- ir::AliasRegionData {
- user_id: key.into_raw(),
- description: format!("{key:?}").into(),
- }
- }
-}
-
-/// Alias region cache and load/store helper type.
+/// Alias region bookkeeping and load/store helper type.
+///
+/// This is scoped to a single function: it hands out `ir::AliasRegion`s, which
+/// are indices into one function's `ir::AliasRegionSet`, so a given
+/// `AliasRegions` must not be reused across functions.
pub struct AliasRegions<Offsets> {
pointer_type: ir::Type,
offsets: Offsets,
-
- /// Cached alias regions for alias analysis.
- ///
- /// Avoids allocating a string for the debug formatting of `AliasRegionKey`
- /// as the `ir::AliasRegionData::description` string repeatedly.
- cache: std::collections::HashMap<AliasRegionKey, ir::AliasRegion>,
}
impl<Offsets> AliasRegions<Offsets> {
@@ -360,13 +313,7 @@ impl<Offsets> AliasRegions<Offsets> {
slot: ir::StackSlot,
_offset: u32,
) -> Option<ir::AliasRegion> {
- let key = AliasRegionKey::Stack { slot };
- let id = key.into_raw();
- if let Some(region) = regions.get(id) {
- Some(region)
- } else {
- Some(regions.insert(key.into()))
- }
+ Some(Self::insert_region(regions, AliasRegionKey::Stack { slot }))
}
/// Get the alias region for a stack slot.
@@ -380,10 +327,18 @@ impl<Offsets> AliasRegions<Offsets> {
/// Get the alias region for the given key.
fn region(&mut self, func: &mut ir::Function, key: AliasRegionKey) -> ir::AliasRegion {
- *self
- .cache
- .entry(key)
- .or_insert_with(|| func.dfg.alias_regions.insert(key.into()))
+ Self::insert_region(&mut func.dfg.alias_regions, key)
+ }
+
+ /// Get or create the alias region for the given key.
+ fn insert_region(regions: &mut ir::AliasRegionSet, key: AliasRegionKey) -> ir::AliasRegion {
+ let user_id = key.into_raw();
+ let region = regions.insert(ir::AliasRegionData {
+ user_id,
+ description: "".into(),
+ });
+ log::trace!("alias region: {key:?} => {region} (user_id = {user_id})");
+ region
}
}
@@ -1177,7 +1132,6 @@ where
pointer_type: ir::Type::int_with_byte_size(offsets.get_ptr_size().size().into())
.unwrap(),
offsets,
- cache: std::collections::HashMap::default(),
}
}
diff --git a/tests/disas/alias-region-globals.wat b/tests/disas/alias-region-globals.wat
index 9d5b7d4fb9..93d45af832 100644
--- a/tests/disas/alias-region-globals.wat
+++ b/tests/disas/alias-region-globals.wat
@@ -15,11 +15,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 402653184 "PublicGlobal"
-;; region4 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 87 ""
+;; region4 = 250 ""
;; gv0 = vmctx
;; 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-limit.wat b/tests/disas/alias-region-limit.wat
new file mode 100644
index 0000000000..92c149d498
--- /dev/null
+++ b/tests/disas/alias-region-limit.wat
@@ -0,0 +1,852 @@
+;;! target = "x86_64"
+
+;; Wasmtime hands every defined, non-exported global its own alias region, so
+;; the function below asks for 257 global regions on top of the handful of `VM*`
+;; regions its prologue needs. Alias regions are hashed down into a single byte,
+;; however, so we emit at most 256 of them no matter how many are asked for: the
+;; region table in the expectation below is well short of 259 entries, and
+;; several globals share a region as a result.
+
+(module
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0)) (global (mut i32) (i32.const 0))
+ (global (mut i32) (i32.const 0))
+
+ (func (export "sum") (result i32)
+ global.get 0 global.get 1 i32.add global.get 2 i32.add global.get 3
+ i32.add global.get 4 i32.add global.get 5 i32.add global.get 6
+ i32.add global.get 7 i32.add global.get 8 i32.add global.get 9
+ i32.add global.get 10 i32.add global.get 11 i32.add global.get 12
+ i32.add global.get 13 i32.add global.get 14 i32.add global.get 15
+ i32.add global.get 16 i32.add global.get 17 i32.add global.get 18
+ i32.add global.get 19 i32.add global.get 20 i32.add global.get 21
+ i32.add global.get 22 i32.add global.get 23 i32.add global.get 24
+ i32.add global.get 25 i32.add global.get 26 i32.add global.get 27
+ i32.add global.get 28 i32.add global.get 29 i32.add global.get 30
+ i32.add global.get 31 i32.add global.get 32 i32.add global.get 33
+ i32.add global.get 34 i32.add global.get 35 i32.add global.get 36
+ i32.add global.get 37 i32.add global.get 38 i32.add global.get 39
+ i32.add global.get 40 i32.add global.get 41 i32.add global.get 42
+ i32.add global.get 43 i32.add global.get 44 i32.add global.get 45
+ i32.add global.get 46 i32.add global.get 47 i32.add global.get 48
+ i32.add global.get 49 i32.add global.get 50 i32.add global.get 51
+ i32.add global.get 52 i32.add global.get 53 i32.add global.get 54
+ i32.add global.get 55 i32.add global.get 56 i32.add global.get 57
+ i32.add global.get 58 i32.add global.get 59 i32.add global.get 60
+ i32.add global.get 61 i32.add global.get 62 i32.add global.get 63
+ i32.add global.get 64 i32.add global.get 65 i32.add global.get 66
+ i32.add global.get 67 i32.add global.get 68 i32.add global.get 69
+ i32.add global.get 70 i32.add global.get 71 i32.add global.get 72
+ i32.add global.get 73 i32.add global.get 74 i32.add global.get 75
+ i32.add global.get 76 i32.add global.get 77 i32.add global.get 78
+ i32.add global.get 79 i32.add global.get 80 i32.add global.get 81
+ i32.add global.get 82 i32.add global.get 83 i32.add global.get 84
+ i32.add global.get 85 i32.add global.get 86 i32.add global.get 87
+ i32.add global.get 88 i32.add global.get 89 i32.add global.get 90
+ i32.add global.get 91 i32.add global.get 92 i32.add global.get 93
+ i32.add global.get 94 i32.add global.get 95 i32.add global.get 96
+ i32.add global.get 97 i32.add global.get 98 i32.add global.get 99
+ i32.add global.get 100 i32.add global.get 101 i32.add global.get 102
+ i32.add global.get 103 i32.add global.get 104 i32.add global.get 105
+ i32.add global.get 106 i32.add global.get 107 i32.add global.get 108
+ i32.add global.get 109 i32.add global.get 110 i32.add global.get 111
+ i32.add global.get 112 i32.add global.get 113 i32.add global.get 114
+ i32.add global.get 115 i32.add global.get 116 i32.add global.get 117
+ i32.add global.get 118 i32.add global.get 119 i32.add global.get 120
+ i32.add global.get 121 i32.add global.get 122 i32.add global.get 123
+ i32.add global.get 124 i32.add global.get 125 i32.add global.get 126
+ i32.add global.get 127 i32.add global.get 128 i32.add global.get 129
+ i32.add global.get 130 i32.add global.get 131 i32.add global.get 132
+ i32.add global.get 133 i32.add global.get 134 i32.add global.get 135
+ i32.add global.get 136 i32.add global.get 137 i32.add global.get 138
+ i32.add global.get 139 i32.add global.get 140 i32.add global.get 141
+ i32.add global.get 142 i32.add global.get 143 i32.add global.get 144
+ i32.add global.get 145 i32.add global.get 146 i32.add global.get 147
+ i32.add global.get 148 i32.add global.get 149 i32.add global.get 150
+ i32.add global.get 151 i32.add global.get 152 i32.add global.get 153
+ i32.add global.get 154 i32.add global.get 155 i32.add global.get 156
+ i32.add global.get 157 i32.add global.get 158 i32.add global.get 159
+ i32.add global.get 160 i32.add global.get 161 i32.add global.get 162
+ i32.add global.get 163 i32.add global.get 164 i32.add global.get 165
+ i32.add global.get 166 i32.add global.get 167 i32.add global.get 168
+ i32.add global.get 169 i32.add global.get 170 i32.add global.get 171
+ i32.add global.get 172 i32.add global.get 173 i32.add global.get 174
+ i32.add global.get 175 i32.add global.get 176 i32.add global.get 177
+ i32.add global.get 178 i32.add global.get 179 i32.add global.get 180
+ i32.add global.get 181 i32.add global.get 182 i32.add global.get 183
+ i32.add global.get 184 i32.add global.get 185 i32.add global.get 186
+ i32.add global.get 187 i32.add global.get 188 i32.add global.get 189
+ i32.add global.get 190 i32.add global.get 191 i32.add global.get 192
+ i32.add global.get 193 i32.add global.get 194 i32.add global.get 195
+ i32.add global.get 196 i32.add global.get 197 i32.add global.get 198
+ i32.add global.get 199 i32.add global.get 200 i32.add global.get 201
+ i32.add global.get 202 i32.add global.get 203 i32.add global.get 204
+ i32.add global.get 205 i32.add global.get 206 i32.add global.get 207
+ i32.add global.get 208 i32.add global.get 209 i32.add global.get 210
+ i32.add global.get 211 i32.add global.get 212 i32.add global.get 213
+ i32.add global.get 214 i32.add global.get 215 i32.add global.get 216
+ i32.add global.get 217 i32.add global.get 218 i32.add global.get 219
+ i32.add global.get 220 i32.add global.get 221 i32.add global.get 222
+ i32.add global.get 223 i32.add global.get 224 i32.add global.get 225
+ i32.add global.get 226 i32.add global.get 227 i32.add global.get 228
+ i32.add global.get 229 i32.add global.get 230 i32.add global.get 231
+ i32.add global.get 232 i32.add global.get 233 i32.add global.get 234
+ i32.add global.get 235 i32.add global.get 236 i32.add global.get 237
+ i32.add global.get 238 i32.add global.get 239 i32.add global.get 240
+ i32.add global.get 241 i32.add global.get 242 i32.add global.get 243
+ i32.add global.get 244 i32.add global.get 245 i32.add global.get 246
+ i32.add global.get 247 i32.add global.get 248 i32.add global.get 249
+ i32.add global.get 250 i32.add global.get 251 i32.add global.get 252
+ i32.add global.get 253 i32.add global.get 254 i32.add global.get 255
+ i32.add global.get 256 i32.add
+ )
+)
+;; function u0:0(i64 vmctx, i64) -> i32 tail {
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
+;; region3 = 135 ""
+;; region4 = 76 ""
+;; region5 = 208 ""
+;; region6 = 152 ""
+;; region7 = 52 ""
+;; region8 = 113 ""
+;; region9 = 185 ""
+;; region10 = 251 ""
+;; region11 = 60 ""
+;; region12 = 100 ""
+;; region13 = 167 ""
+;; region14 = 71 ""
+;; region15 = 197 ""
+;; region16 = 236 ""
+;; region17 = 155 ""
+;; region18 = 124 ""
+;; region19 = 2 ""
+;; region20 = 242 ""
+;; region21 = 195 ""
+;; region22 = 212 ""
+;; region23 = 117 ""
+;; region24 = 194 ""
+;; region25 = 57 ""
+;; region26 = 47 ""
+;; region27 = 138 ""
+;; region28 = 129 ""
+;; region29 = 29 ""
+;; region30 = 174 ""
+;; region31 = 112 ""
+;; region32 = 15 ""
+;; region33 = 150 ""
+;; region34 = 36 ""
+;; region35 = 133 ""
+;; region36 = 63 ""
+;; region37 = 175 ""
+;; region38 = 40 ""
+;; region39 = 222 ""
+;; region40 = 178 ""
+;; region41 = 240 ""
+;; region42 = 187 ""
+;; region43 = 196 ""
+;; region44 = 81 ""
+;; region45 = 99 ""
+;; region46 = 192 ""
+;; region47 = 20 ""
+;; region48 = 118 ""
+;; region49 = 58 ""
+;; region50 = 249 ""
+;; region51 = 98 ""
+;; region52 = 173 ""
+;; region53 = 86 ""
+;; region54 = 110 ""
+;; region55 = 17 ""
+;; region56 = 35 ""
+;; region57 = 127 ""
+;; region58 = 146 ""
+;; region59 = 38 ""
+;; region60 = 128 ""
+;; region61 = 37 ""
+;; region62 = 50 ""
+;; region63 = 39 ""
+;; region64 = 3 ""
+;; region65 = 169 ""
+;; region66 = 31 ""
+;; region67 = 27 ""
+;; region68 = 156 ""
+;; region69 = 121 ""
+;; region70 = 69 ""
+;; region71 = 14 ""
+;; region72 = 79 ""
+;; region73 = 171 ""
+;; region74 = 48 ""
+;; region75 = 219 ""
+;; region76 = 8 ""
+;; region77 = 126 ""
+;; region78 = 77 ""
+;; region79 = 149 ""
+;; region80 = 209 ""
+;; region81 = 188 ""
+;; region82 = 46 ""
+;; region83 = 28 ""
+;; region84 = 244 ""
+;; region85 = 241 ""
+;; region86 = 87 ""
+;; region87 = 25 ""
+;; region88 = 137 ""
+;; region89 = 225 ""
+;; region90 = 193 ""
+;; region91 = 12 ""
+;; region92 = 216 ""
+;; region93 = 11 ""
+;; region94 = 181 ""
+;; region95 = 148 ""
+;; region96 = 213 ""
+;; region97 = 239 ""
+;; region98 = 42 ""
+;; region99 = 154 ""
+;; region100 = 254 ""
+;; region101 = 218 ""
+;; region102 = 78 ""
+;; region103 = 145 ""
+;; region104 = 246 ""
+;; region105 = 88 ""
+;; region106 = 217 ""
+;; region107 = 54 ""
+;; region108 = 162 ""
+;; region109 = 102 ""
+;; region110 = 108 ""
+;; region111 = 142 ""
+;; region112 = 115 ""
+;; region113 = 5 ""
+;; region114 = 157 ""
+;; region115 = 139 ""
+;; region116 = 64 ""
+;; region117 = 55 ""
+;; region118 = 105 ""
+;; region119 = 94 ""
+;; region120 = 70 ""
+;; region121 = 101 ""
+;; region122 = 73 ""
+;; region123 = 75 ""
+;; region124 = 59 ""
+;; region125 = 7 ""
+;; region126 = 179 ""
+;; region127 = 199 ""
+;; region128 = 131 ""
+;; region129 = 30 ""
+;; region130 = 253 ""
+;; region131 = 143 ""
+;; region132 = 97 ""
+;; region133 = 90 ""
+;; region134 = 166 ""
+;; region135 = 24 ""
+;; region136 = 205 ""
+;; region137 = 234 ""
+;; region138 = 61 ""
+;; region139 = 233 ""
+;; region140 = 116 ""
+;; region141 = 132 ""
+;; region142 = 229 ""
+;; region143 = 227 ""
+;; region144 = 238 ""
+;; region145 = 18 ""
+;; region146 = 210 ""
+;; region147 = 147 ""
+;; region148 = 159 ""
+;; region149 = 191 ""
+;; region150 = 214 ""
+;; region151 = 165 ""
+;; region152 = 224 ""
+;; region153 = 45 ""
+;; region154 = 177 ""
+;; region155 = 215 ""
+;; region156 = 109 ""
+;; region157 = 92 ""
+;; region158 = 22 ""
+;; region159 = 220 ""
+;; region160 = 93 ""
+;; region161 = 74 ""
+;; gv0 = vmctx
+;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
+;; gv2 = load.i64 notrap aligned region1 gv1+24
+;; stack_limit = gv2
+;;
+;; block0(v0: i64, v1: i64):
+;; @052d v2 = load.i32 notrap aligned region2 v0+48
+;; @052f v3 = load.i32 notrap aligned region3 v0+64
+;; @0531 v4 = iadd v2, v3
+;; @0532 v5 = load.i32 notrap aligned region4 v0+80
+;; @0534 v6 = iadd v4, v5
+;; @0535 v7 = load.i32 notrap aligned region5 v0+96
+;; @0537 v8 = iadd v6, v7
+;; @0538 v9 = load.i32 notrap aligned region6 v0+112
+;; @053a v10 = iadd v8, v9
+;; @053b v11 = load.i32 notrap aligned region7 v0+128
+;; @053d v12 = iadd v10, v11
+;; @053e v13 = load.i32 notrap aligned region8 v0+144
+;; @0540 v14 = iadd v12, v13
+;; @0541 v15 = load.i32 notrap aligned region9 v0+160
+;; @0543 v16 = iadd v14, v15
+;; @0544 v17 = load.i32 notrap aligned region10 v0+176
+;; @0546 v18 = iadd v16, v17
+;; @0547 v19 = load.i32 notrap aligned region11 v0+192
+;; @0549 v20 = iadd v18, v19
+;; @054a v21 = load.i32 notrap aligned region12 v0+208
+;; @054c v22 = iadd v20, v21
+;; @054d v23 = load.i32 notrap aligned region13 v0+224
+;; @054f v24 = iadd v22, v23
+;; @0550 v25 = load.i32 notrap aligned region14 v0+240
+;; @0552 v26 = iadd v24, v25
+;; @0553 v27 = load.i32 notrap aligned region15 v0+256
+;; @0555 v28 = iadd v26, v27
+;; @0556 v29 = load.i32 notrap aligned region16 v0+272
+;; @0558 v30 = iadd v28, v29
+;; @0559 v31 = load.i32 notrap aligned region17 v0+288
+;; @055b v32 = iadd v30, v31
+;; @055c v33 = load.i32 notrap aligned region18 v0+304
+;; @055e v34 = iadd v32, v33
+;; @055f v35 = load.i32 notrap aligned region19 v0+320
+;; @0561 v36 = iadd v34, v35
+;; @0562 v37 = load.i32 notrap aligned region20 v0+336
+;; @0564 v38 = iadd v36, v37
+;; @0565 v39 = load.i32 notrap aligned region21 v0+352
+;; @0567 v40 = iadd v38, v39
+;; @0568 v41 = load.i32 notrap aligned region22 v0+368
+;; @056a v42 = iadd v40, v41
+;; @056b v43 = load.i32 notrap aligned region23 v0+384
+;; @056d v44 = iadd v42, v43
+;; @056e v45 = load.i32 notrap aligned region24 v0+400
+;; @0570 v46 = iadd v44, v45
+;; @0571 v47 = load.i32 notrap aligned region25 v0+416
+;; @0573 v48 = iadd v46, v47
+;; @0574 v49 = load.i32 notrap aligned region14 v0+432
+;; @0576 v50 = iadd v48, v49
+;; @0577 v51 = load.i32 notrap aligned region26 v0+448
+;; @0579 v52 = iadd v50, v51
+;; @057a v53 = load.i32 notrap aligned region27 v0+464
+;; @057c v54 = iadd v52, v53
+;; @057d v55 = load.i32 notrap aligned region28 v0+480
+;; @057f v56 = iadd v54, v55
+;; @0580 v57 = load.i32 notrap aligned region29 v0+496
+;; @0582 v58 = iadd v56, v57
+;; @0583 v59 = load.i32 notrap aligned region30 v0+512
+;; @0585 v60 = iadd v58, v59
+;; @0586 v61 = load.i32 notrap aligned region31 v0+528
+;; @0588 v62 = iadd v60, v61
+;; @0589 v63 = load.i32 notrap aligned region32 v0+544
+;; @058b v64 = iadd v62, v63
+;; @058c v65 = load.i32 notrap aligned region33 v0+560
+;; @058e v66 = iadd v64, v65
+;; @058f v67 = load.i32 notrap aligned region19 v0+576
+;; @0591 v68 = iadd v66, v67
+;; @0592 v69 = load.i32 notrap aligned region34 v0+592
+;; @0594 v70 = iadd v68, v69
+;; @0595 v71 = load.i32 notrap aligned region35 v0+608
+;; @0597 v72 = iadd v70, v71
+;; @0598 v73 = load.i32 notrap aligned region36 v0+624
+;; @059a v74 = iadd v72, v73
+;; @059b v75 = load.i32 notrap aligned region37 v0+640
+;; @059d v76 = iadd v74, v75
+;; @059e v77 = load.i32 notrap aligned region38 v0+656
+;; @05a0 v78 = iadd v76, v77
+;; @05a1 v79 = load.i32 notrap aligned region39 v0+672
+;; @05a3 v80 = iadd v78, v79
+;; @05a4 v81 = load.i32 notrap aligned region40 v0+688
+;; @05a6 v82 = iadd v80, v81
+;; @05a7 v83 = load.i32 notrap aligned region41 v0+704
+;; @05a9 v84 = iadd v82, v83
+;; @05aa v85 = load.i32 notrap aligned region42 v0+720
+;; @05ac v86 = iadd v84, v85
+;; @05ad v87 = load.i32 notrap aligned region43 v0+736
+;; @05af v88 = iadd v86, v87
+;; @05b0 v89 = load.i32 notrap aligned region44 v0+752
+;; @05b2 v90 = iadd v88, v89
+;; @05b3 v91 = load.i32 notrap aligned region45 v0+768
+;; @05b5 v92 = iadd v90, v91
+;; @05b6 v93 = load.i32 notrap aligned region46 v0+784
+;; @05b8 v94 = iadd v92, v93
+;; @05b9 v95 = load.i32 notrap aligned region27 v0+800
+;; @05bb v96 = iadd v94, v95
+;; @05bc v97 = load.i32 notrap aligned region44 v0+816
+;; @05be v98 = iadd v96, v97
+;; @05bf v99 = load.i32 notrap aligned region47 v0+832
+;; @05c1 v100 = iadd v98, v99
+;; @05c2 v101 = load.i32 notrap aligned region48 v0+848
+;; @05c4 v102 = iadd v100, v101
+;; @05c5 v103 = load.i32 notrap aligned region49 v0+864
+;; @05c7 v104 = iadd v102, v103
+;; @05c8 v105 = load.i32 notrap aligned region39 v0+880
+;; @05ca v106 = iadd v104, v105
+;; @05cb v107 = load.i32 notrap aligned region50 v0+896
+;; @05cd v108 = iadd v106, v107
+;; @05ce v109 = load.i32 notrap aligned region51 v0+912
+;; @05d0 v110 = iadd v108, v109
+;; @05d1 v111 = load.i32 notrap aligned region52 v0+928
+;; @05d3 v112 = iadd v110, v111
+;; @05d4 v113 = load.i32 notrap aligned region53 v0+944
+;; @05d6 v114 = iadd v112, v113
+;; @05d7 v115 = load.i32 notrap aligned region54 v0+960
+;; @05d9 v116 = iadd v114, v115
+;; @05da v117 = load.i32 notrap aligned region55 v0+976
+;; @05dc v118 = iadd v116, v117
+;; @05dd v119 = load.i32 notrap aligned region56 v0+992
+;; @05df v120 = iadd v118, v119
+;; @05e0 v121 = load.i32 notrap aligned region57 v0+1008
+;; @05e2 v122 = iadd v120, v121
+;; @05e3 v123 = load.i32 notrap aligned region45 v0+1024
+;; @05e5 v124 = iadd v122, v123
+;; @05e6 v125 = load.i32 notrap aligned region5 v0+1040
+;; @05e8 v126 = iadd v124, v125
+;; @05e9 v127 = load.i32 notrap aligned region28 v0+1056
+;; @05eb v128 = iadd v126, v127
+;; @05ec v129 = load.i32 notrap aligned region58 v0+1072
+;; @05ee v130 = iadd v128, v129
+;; @05ef v131 = load.i32 notrap aligned region59 v0+1088
+;; @05f1 v132 = iadd v130, v131
+;; @05f2 v133 = load.i32 notrap aligned region60 v0+1104
+;; @05f4 v134 = iadd v132, v133
+;; @05f5 v135 = load.i32 notrap aligned region61 v0+1120
+;; @05f7 v136 = iadd v134, v135
+;; @05f8 v137 = load.i32 notrap aligned region62 v0+1136
+;; @05fa v138 = iadd v136, v137
+;; @05fb v139 = load.i32 notrap aligned region63 v0+1152
+;; @05fd v140 = iadd v138, v139
+;; @05fe v141 = load.i32 notrap aligned region64 v0+1168
+;; @0600 v142 = iadd v140, v141
+;; @0601 v143 = load.i32 notrap aligned region43 v0+1184
+;; @0603 v144 = iadd v142, v143
+;; @0604 v145 = load.i32 notrap aligned region65 v0+1200
+;; @0606 v146 = iadd v144, v145
+;; @0607 v147 = load.i32 notrap aligned region66 v0+1216
+;; @0609 v148 = iadd v146, v147
+;; @060a v149 = load.i32 notrap aligned region67 v0+1232
+;; @060c v150 = iadd v148, v149
+;; @060d v151 = load.i32 notrap aligned region46 v0+1248
+;; @060f v152 = iadd v150, v151
+;; @0610 v153 = load.i32 notrap aligned region68 v0+1264
+;; @0612 v154 = iadd v152, v153
+;; @0613 v155 = load.i32 notrap aligned region34 v0+1280
+;; @0615 v156 = iadd v154, v155
+;; @0616 v157 = load.i32 notrap aligned region57 v0+1296
+;; @0618 v158 = iadd v156, v157
+;; @0619 v159 = load.i32 notrap aligned region69 v0+1312
+;; @061b v160 = iadd v158, v159
+;; @061c v161 = load.i32 notrap aligned region70 v0+1328
+;; @061e v162 = iadd v160, v161
+;; @061f v163 = load.i32 notrap aligned region71 v0+1344
+;; @0621 v164 = iadd v162, v163
+;; @0622 v165 = load.i32 notrap aligned region72 v0+1360
+;; @0624 v166 = iadd v164, v165
+;; @0625 v167 = load.i32 notrap aligned region16 v0+1376
+;; @0627 v168 = iadd v166, v167
+;; @0628 v169 = load.i32 notrap aligned region73 v0+1392
+;; @062a v170 = iadd v168, v169
+;; @062b v171 = load.i32 notrap aligned region74 v0+1408
+;; @062d v172 = iadd v170, v171
+;; @062e v173 = load.i32 notrap aligned region53 v0+1424
+;; @0630 v174 = iadd v172, v173
+;; @0631 v175 = load.i32 notrap aligned region75 v0+1440
+;; @0633 v176 = iadd v174, v175
+;; @0634 v177 = load.i32 notrap aligned region76 v0+1456
+;; @0636 v178 = iadd v176, v177
+;; @0637 v179 = load.i32 notrap aligned region77 v0+1472
+;; @0639 v180 = iadd v178, v179
+;; @063a v181 = load.i32 notrap aligned region35 v0+1488
+;; @063c v182 = iadd v180, v181
+;; @063d v183 = load.i32 notrap aligned region28 v0+1504
+;; @063f v184 = iadd v182, v183
+;; @0640 v185 = load.i32 notrap aligned region78 v0+1520
+;; @0642 v186 = iadd v184, v185
+;; @0643 v187 = load.i32 notrap aligned region79 v0+1536
+;; @0645 v188 = iadd v186, v187
+;; @0646 v189 = load.i32 notrap aligned region80 v0+1552
+;; @0648 v190 = iadd v188, v189
+;; @0649 v191 = load.i32 notrap aligned region81 v0+1568
+;; @064b v192 = iadd v190, v191
+;; @064c v193 = load.i32 notrap aligned region72 v0+1584
+;; @064e v194 = iadd v192, v193
+;; @064f v195 = load.i32 notrap aligned region27 v0+1600
+;; @0651 v196 = iadd v194, v195
+;; @0652 v197 = load.i32 notrap aligned region82 v0+1616
+;; @0654 v198 = iadd v196, v197
+;; @0655 v199 = load.i32 notrap aligned region83 v0+1632
+;; @0657 v200 = iadd v198, v199
+;; @0658 v201 = load.i32 notrap aligned region84 v0+1648
+;; @065a v202 = iadd v200, v201
+;; @065b v203 = load.i32 notrap aligned region85 v0+1664
+;; @065d v204 = iadd v202, v203
+;; @065e v205 = load.i32 notrap aligned region86 v0+1680
+;; @0660 v206 = iadd v204, v205
+;; @0661 v207 = load.i32 notrap aligned region77 v0+1696
+;; @0663 v208 = iadd v206, v207
+;; @0664 v209 = load.i32 notrap aligned region87 v0+1712
+;; @0666 v210 = iadd v208, v209
+;; @0667 v211 = load.i32 notrap aligned region88 v0+1728
+;; @0669 v212 = iadd v210, v211
+;; @066a v213 = load.i32 notrap aligned region15 v0+1744
+;; @066c v214 = iadd v212, v213
+;; @066d v215 = load.i32 notrap aligned region89 v0+1760
+;; @066f v216 = iadd v214, v215
+;; @0670 v217 = load.i32 notrap aligned region34 v0+1776
+;; @0672 v218 = iadd v216, v217
+;; @0673 v219 = load.i32 notrap aligned region90 v0+1792
+;; @0675 v220 = iadd v218, v219
+;; @0676 v221 = load.i32 notrap aligned region91 v0+1808
+;; @0678 v222 = iadd v220, v221
+;; @0679 v223 = load.i32 notrap aligned region88 v0+1824
+;; @067b v224 = iadd v222, v223
+;; @067c v225 = load.i32 notrap aligned region92 v0+1840
+;; @067e v226 = iadd v224, v225
+;; @067f v227 = load.i32 notrap aligned region53 v0+1856
+;; @0681 v228 = iadd v226, v227
+;; @0682 v229 = load.i32 notrap aligned region72 v0+1872
+;; @0684 v230 = iadd v228, v229
+;; @0685 v231 = load.i32 notrap aligned region69 v0+1888
+;; @0687 v232 = iadd v230, v231
+;; @0688 v233 = load.i32 notrap aligned region93 v0+1904
+;; @068a v234 = iadd v232, v233
+;; @068b v235 = load.i32 notrap aligned region77 v0+1920
+;; @068d v236 = iadd v234, v235
+;; @068e v237 = load.i32 notrap aligned region41 v0+1936
+;; @0690 v238 = iadd v236, v237
+;; @0691 v239 = load.i32 notrap aligned region61 v0+1952
+;; @0693 v240 = iadd v238, v239
+;; @0694 v241 = load.i32 notrap aligned region94 v0+1968
+;; @0696 v242 = iadd v240, v241
+;; @0697 v243 = load.i32 notrap aligned region95 v0+1984
+;; @0699 v244 = iadd v242, v243
+;; @069a v245 = load.i32 notrap aligned region96 v0+2000
+;; @069c v246 = iadd v244, v245
+;; @069d v247 = load.i32 notrap aligned region97 v0+2016
+;; @069f v248 = iadd v246, v247
+;; @06a0 v249 = load.i32 notrap aligned region41 v0+2032
+;; @06a2 v250 = iadd v248, v249
+;; @06a3 v251 = load.i32 notrap aligned region98 v0+2048
+;; @06a5 v252 = iadd v250, v251
+;; @06a6 v253 = load.i32 notrap aligned region11 v0+2064
+;; @06a8 v254 = iadd v252, v253
+;; @06a9 v255 = load.i32 notrap aligned region99 v0+2080
+;; @06ab v256 = iadd v254, v255
+;; @06ac v257 = load.i32 notrap aligned region100 v0+2096
+;; @06af v258 = iadd v256, v257
+;; @06b0 v259 = load.i32 notrap aligned region101 v0+2112
+;; @06b3 v260 = iadd v258, v259
+;; @06b4 v261 = load.i32 notrap aligned region75 v0+2128
+;; @06b7 v262 = iadd v260, v261
+;; @06b8 v263 = load.i32 notrap aligned region102 v0+2144
+;; @06bb v264 = iadd v262, v263
+;; @06bc v265 = load.i32 notrap aligned region103 v0+2160
+;; @06bf v266 = iadd v264, v265
+;; @06c0 v267 = load.i32 notrap aligned region104 v0+2176
+;; @06c3 v268 = iadd v266, v267
+;; @06c4 v269 = load.i32 notrap aligned region105 v0+2192
+;; @06c7 v270 = iadd v268, v269
+;; @06c8 v271 = load.i32 notrap aligned region106 v0+2208
+;; @06cb v272 = iadd v270, v271
+;; @06cc v273 = load.i32 notrap aligned region82 v0+2224
+;; @06cf v274 = iadd v272, v273
+;; @06d0 v275 = load.i32 notrap aligned region98 v0+2240
+;; @06d3 v276 = iadd v274, v275
+;; @06d4 v277 = load.i32 notrap aligned region107 v0+2256
+;; @06d7 v278 = iadd v276, v277
+;; @06d8 v279 = load.i32 notrap aligned region108 v0+2272
+;; @06db v280 = iadd v278, v279
+;; @06dc v281 = load.i32 notrap aligned region109 v0+2288
+;; @06df v282 = iadd v280, v281
+;; @06e0 v283 = load.i32 notrap aligned region110 v0+2304
+;; @06e3 v284 = iadd v282, v283
+;; @06e4 v285 = load.i32 notrap aligned region111 v0+2320
+;; @06e7 v286 = iadd v284, v285
+;; @06e8 v287 = load.i32 notrap aligned region112 v0+2336
+;; @06eb v288 = iadd v286, v287
+;; @06ec v289 = load.i32 notrap aligned region110 v0+2352
+;; @06ef v290 = iadd v288, v289
+;; @06f0 v291 = load.i32 notrap aligned region98 v0+2368
+;; @06f3 v292 = iadd v290, v291
+;; @06f4 v293 = load.i32 notrap aligned region113 v0+2384
+;; @06f7 v294 = iadd v292, v293
+;; @06f8 v295 = load.i32 notrap aligned region6 v0+2400
+;; @06fb v296 = iadd v294, v295
+;; @06fc v297 = load.i32 notrap aligned region32 v0+2416
+;; @06ff v298 = iadd v296, v297
+;; @0700 v299 = load.i32 notrap aligned region114 v0+2432
+;; @0703 v300 = iadd v298, v299
+;; @0704 v301 = load.i32 notrap aligned region27 v0+2448
+;; @0707 v302 = iadd v300, v301
+;; @0708 v303 = load.i32 notrap aligned region115 v0+2464
+;; @070b v304 = iadd v302, v303
+;; @070c v305 = load.i32 notrap aligned region80 v0+2480
+;; @070f v306 = iadd v304, v305
+;; @0710 v307 = load.i32 notrap aligned region116 v0+2496
+;; @0713 v308 = iadd v306, v307
+;; @0714 v309 = load.i32 notrap aligned region117 v0+2512
+;; @0717 v310 = iadd v308, v309
+;; @0718 v311 = load.i32 notrap aligned region45 v0+2528
+;; @071b v312 = iadd v310, v311
+;; @071c v313 = load.i32 notrap aligned region118 v0+2544
+;; @071f v314 = iadd v312, v313
+;; @0720 v315 = load.i32 notrap aligned region119 v0+2560
+;; @0723 v316 = iadd v314, v315
+;; @0724 v317 = load.i32 notrap aligned region113 v0+2576
+;; @0727 v318 = iadd v316, v317
+;; @0728 v319 = load.i32 notrap aligned region72 v0+2592
+;; @072b v320 = iadd v318, v319
+;; @072c v321 = load.i32 notrap aligned region120 v0+2608
+;; @072f v322 = iadd v320, v321
+;; @0730 v323 = load.i32 notrap aligned region121 v0+2624
+;; @0733 v324 = iadd v322, v323
+;; @0734 v325 = load.i32 notrap aligned region122 v0+2640
+;; @0737 v326 = iadd v324, v325
+;; @0738 v327 = load.i32 notrap aligned region28 v0+2656
+;; @073b v328 = iadd v326, v327
+;; @073c v329 = load.i32 notrap aligned region123 v0+2672
+;; @073f v330 = iadd v328, v329
+;; @0740 v331 = load.i32 notrap aligned region22 v0+2688
+;; @0743 v332 = iadd v330, v331
+;; @0744 v333 = load.i32 notrap aligned region124 v0+2704
+;; @0747 v334 = iadd v332, v333
+;; @0748 v335 = load.i32 notrap aligned region60 v0+2720
+;; @074b v336 = iadd v334, v335
+;; @074c v337 = load.i32 notrap aligned region125 v0+2736
+;; @074f v338 = iadd v336, v337
+;; @0750 v339 = load.i32 notrap aligned region30 v0+2752
+;; @0753 v340 = iadd v338, v339
+;; @0754 v341 = load.i32 notrap aligned region51 v0+2768
+;; @0757 v342 = iadd v340, v341
+;; @0758 v343 = load.i32 notrap aligned region27 v0+2784
+;; @075b v344 = iadd v342, v343
+;; @075c v345 = load.i32 notrap aligned region113 v0+2800
+;; @075f v346 = iadd v344, v345
+;; @0760 v347 = load.i32 notrap aligned region24 v0+2816
+;; @0763 v348 = iadd v346, v347
+;; @0764 v349 = load.i32 notrap aligned region126 v0+2832
+;; @0767 v350 = iadd v348, v349
+;; @0768 v351 = load.i32 notrap aligned region127 v0+2848
+;; @076b v352 = iadd v350, v351
+;; @076c v353 = load.i32 notrap aligned region16 v0+2864
+;; @076f v354 = iadd v352, v353
+;; @0770 v355 = load.i32 notrap aligned region81 v0+2880
+;; @0773 v356 = iadd v354, v355
+;; @0774 v357 = load.i32 notrap aligned region128 v0+2896
+;; @0777 v358 = iadd v356, v357
+;; @0778 v359 = load.i32 notrap aligned region129 v0+2912
+;; @077b v360 = iadd v358, v359
+;; @077c v361 = load.i32 notrap aligned region18 v0+2928
+;; @077f v362 = iadd v360, v361
+;; @0780 v363 = load.i32 notrap aligned region102 v0+2944
+;; @0783 v364 = iadd v362, v363
+;; @0784 v365 = load.i32 notrap aligned region107 v0+2960
+;; @0787 v366 = iadd v364, v365
+;; @0788 v367 = load.i32 notrap aligned region130 v0+2976
+;; @078b v368 = iadd v366, v367
+;; @078c v369 = load.i32 notrap aligned region18 v0+2992
+;; @078f v370 = iadd v368, v369
+;; @0790 v371 = load.i32 notrap aligned region131 v0+3008
+;; @0793 v372 = iadd v370, v371
+;; @0794 v373 = load.i32 notrap aligned region107 v0+3024
+;; @0797 v374 = iadd v372, v373
+;; @0798 v375 = load.i32 notrap aligned region84 v0+3040
+;; @079b v376 = iadd v374, v375
+;; @079c v377 = load.i32 notrap aligned region103 v0+3056
+;; @079f v378 = iadd v376, v377
+;; @07a0 v379 = load.i32 notrap aligned region9 v0+3072
+;; @07a3 v380 = iadd v378, v379
+;; @07a4 v381 = load.i32 notrap aligned region18 v0+3088
+;; @07a7 v382 = iadd v380, v381
+;; @07a8 v383 = load.i32 notrap aligned region17 v0+3104
+;; @07ab v384 = iadd v382, v383
+;; @07ac v385 = load.i32 notrap aligned region132 v0+3120
+;; @07af v386 = iadd v384, v385
+;; @07b0 v387 = load.i32 notrap aligned region73 v0+3136
+;; @07b3 v388 = iadd v386, v387
+;; @07b4 v389 = load.i32 notrap aligned region133 v0+3152
+;; @07b7 v390 = iadd v388, v389
+;; @07b8 v391 = load.i32 notrap aligned region84 v0+3168
+;; @07bb v392 = iadd v390, v391
+;; @07bc v393 = load.i32 notrap aligned region134 v0+3184
+;; @07bf v394 = iadd v392, v393
+;; @07c0 v395 = load.i32 notrap aligned region25 v0+3200
+;; @07c3 v396 = iadd v394, v395
+;; @07c4 v397 = load.i32 notrap aligned region25 v0+3216
+;; @07c7 v398 = iadd v396, v397
+;; @07c8 v399 = load.i32 notrap aligned region135 v0+3232
+;; @07cb v400 = iadd v398, v399
+;; @07cc v401 = load.i32 notrap aligned region136 v0+3248
+;; @07cf v402 = iadd v400, v401
+;; @07d0 v403 = load.i32 notrap aligned region137 v0+3264
+;; @07d3 v404 = iadd v402, v403
+;; @07d4 v405 = load.i32 notrap aligned region134 v0+3280
+;; @07d7 v406 = iadd v404, v405
+;; @07d8 v407 = load.i32 notrap aligned region138 v0+3296
+;; @07db v408 = iadd v406, v407
+;; @07dc v409 = load.i32 notrap aligned region74 v0+3312
+;; @07df v410 = iadd v408, v409
+;; @07e0 v411 = load.i32 notrap aligned region139 v0+3328
+;; @07e3 v412 = iadd v410, v411
+;; @07e4 v413 = load.i32 notrap aligned region140 v0+3344
+;; @07e7 v414 = iadd v412, v413
+;; @07e8 v415 = load.i32 notrap aligned region141 v0+3360
+;; @07eb v416 = iadd v414, v415
+;; @07ec v417 = load.i32 notrap aligned region52 v0+3376
+;; @07ef v418 = iadd v416, v417
+;; @07f0 v419 = load.i32 notrap aligned region97 v0+3392
+;; @07f3 v420 = iadd v418, v419
+;; @07f4 v421 = load.i32 notrap aligned region136 v0+3408
+;; @07f7 v422 = iadd v420, v421
+;; @07f8 v423 = load.i32 notrap aligned region142 v0+3424
+;; @07fb v424 = iadd v422, v423
+;; @07fc v425 = load.i32 notrap aligned region82 v0+3440
+;; @07ff v426 = iadd v424, v425
+;; @0800 v427 = load.i32 notrap aligned region143 v0+3456
+;; @0803 v428 = iadd v426, v427
+;; @0804 v429 = load.i32 notrap aligned region21 v0+3472
+;; @0807 v430 = iadd v428, v429
+;; @0808 v431 = load.i32 notrap aligned region104 v0+3488
+;; @080b v432 = iadd v430, v431
+;; @080c v433 = load.i32 notrap aligned region144 v0+3504
+;; @080f v434 = iadd v432, v433
+;; @0810 v435 = load.i32 notrap aligned region145 v0+3520
+;; @0813 v436 = iadd v434, v435
+;; @0814 v437 = load.i32 notrap aligned region73 v0+3536
+;; @0817 v438 = iadd v436, v437
+;; @0818 v439 = load.i32 notrap aligned region26 v0+3552
+;; @081b v440 = iadd v438, v439
+;; @081c v441 = load.i32 notrap aligned region146 v0+3568
+;; @081f v442 = iadd v440, v441
+;; @0820 v443 = load.i32 notrap aligned region96 v0+3584
+;; @0823 v444 = iadd v442, v443
+;; @0824 v445 = load.i32 notrap aligned region106 v0+3600
+;; @0827 v446 = iadd v444, v445
+;; @0828 v447 = load.i32 notrap aligned region147 v0+3616
+;; @082b v448 = iadd v446, v447
+;; @082c v449 = load.i32 notrap aligned region148 v0+3632
+;; @082f v450 = iadd v448, v449
+;; @0830 v451 = load.i32 notrap aligned region132 v0+3648
+;; @0833 v452 = iadd v450, v451
+;; @0834 v453 = load.i32 notrap aligned region52 v0+3664
+;; @0837 v454 = iadd v452, v453
+;; @0838 v455 = load.i32 notrap aligned region128 v0+3680
+;; @083b v456 = iadd v454, v455
+;; @083c v457 = load.i32 notrap aligned region141 v0+3696
+;; @083f v458 = iadd v456, v457
+;; @0840 v459 = load.i32 notrap aligned region131 v0+3712
+;; @0843 v460 = iadd v458, v459
+;; @0844 v461 = load.i32 notrap aligned region7 v0+3728
+;; @0847 v462 = iadd v460, v461
+;; @0848 v463 = load.i32 notrap aligned region149 v0+3744
+;; @084b v464 = iadd v462, v463
+;; @084c v465 = load.i32 notrap aligned region150 v0+3760
+;; @084f v466 = iadd v464, v465
+;; @0850 v467 = load.i32 notrap aligned region151 v0+3776
+;; @0853 v468 = iadd v466, v467
+;; @0854 v469 = load.i32 notrap aligned region131 v0+3792
+;; @0857 v470 = iadd v468, v469
+;; @0858 v471 = load.i32 notrap aligned region152 v0+3808
+;; @085b v472 = iadd v470, v471
+;; @085c v473 = load.i32 notrap aligned region42 v0+3824
+;; @085f v474 = iadd v472, v473
+;; @0860 v475 = load.i32 notrap aligned region24 v0+3840
+;; @0863 v476 = iadd v474, v475
+;; @0864 v477 = load.i32 notrap aligned region40 v0+3856
+;; @0867 v478 = iadd v476, v477
+;; @0868 v479 = load.i32 notrap aligned region44 v0+3872
+;; @086b v480 = iadd v478, v479
+;; @086c v481 = load.i32 notrap aligned region153 v0+3888
+;; @086f v482 = iadd v480, v481
+;; @0870 v483 = load.i32 notrap aligned region154 v0+3904
+;; @0873 v484 = iadd v482, v483
+;; @0874 v485 = load.i32 notrap aligned region155 v0+3920
+;; @0877 v486 = iadd v484, v485
+;; @0878 v487 = load.i32 notrap aligned region156 v0+3936
+;; @087b v488 = iadd v486, v487
+;; @087c v489 = load.i32 notrap aligned region157 v0+3952
+;; @087f v490 = iadd v488, v489
+;; @0880 v491 = load.i32 notrap aligned region20 v0+3968
+;; @0883 v492 = iadd v490, v491
+;; @0884 v493 = load.i32 notrap aligned region158 v0+3984
+;; @0887 v494 = iadd v492, v493
+;; @0888 v495 = load.i32 notrap aligned region50 v0+4000
+;; @088b v496 = iadd v494, v495
+;; @088c v497 = load.i32 notrap aligned region22 v0+4016
+;; @088f v498 = iadd v496, v497
+;; @0890 v499 = load.i32 notrap aligned region159 v0+4032
+;; @0893 v500 = iadd v498, v499
+;; @0894 v501 = load.i32 notrap aligned region90 v0+4048
+;; @0897 v502 = iadd v500, v501
+;; @0898 v503 = load.i32 notrap aligned region160 v0+4064
+;; @089b v504 = iadd v502, v503
+;; @089c v505 = load.i32 notrap aligned region99 v0+4080
+;; @089f v506 = iadd v504, v505
+;; @08a0 v507 = load.i32 notrap aligned region74 v0+4096
+;; @08a3 v508 = iadd v506, v507
+;; @08a4 v509 = load.i32 notrap aligned region161 v0+4112
+;; @08a7 v510 = iadd v508, v509
+;; @08a8 v511 = load.i32 notrap aligned region45 v0+4128
+;; @08ab v512 = iadd v510, v511
+;; @08ac v513 = load.i32 notrap aligned region95 v0+4144
+;; @08af v514 = iadd v512, v513
+;; @08b0 jump block1
+;;
+;; block1:
+;; @08b0 return v514
+;; }
diff --git a/tests/disas/alias-region-memories.wat b/tests/disas/alias-region-memories.wat
index 406af6ea83..f46feed529 100644
--- a/tests/disas/alias-region-memories.wat
+++ b/tests/disas/alias-region-memories.wat
@@ -15,13 +15,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; 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))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 61 ""
+;; region6 = 171 ""
;; gv0 = vmctx
;; 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 0e29ba737e..2dd3daa897 100644
--- a/tests/disas/alias-region-tables.wat
+++ b/tests/disas/alias-region-tables.wat
@@ -16,18 +16,18 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; 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 = 1677721600 "TypeIdsArray+0x0"
-;; region9 = 1610612752 "VMFuncRef+0x10"
-;; region10 = 1610612744 "VMFuncRef+0x8"
-;; region11 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
+;; region6 = 117 ""
+;; region7 = 130 ""
+;; region8 = 6 ""
+;; region9 = 106 ""
+;; region10 = 116 ""
+;; region11 = 60 ""
;; gv0 = vmctx
;; 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 dc3930d8ea..8b8c5dd1c6 100644
--- a/tests/disas/arith.wat
+++ b/tests/disas/arith.wat
@@ -15,8 +15,8 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 c8e6fef599..a4d20d0ff8 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 = 2013265920 "HostValRaw+0x0"
-;; region1 = 8 "VMContext+0x8"
-;; region2 = 67108936 "VMStoreContext+0x48"
-;; region3 = 67108928 "VMStoreContext+0x40"
-;; region4 = 67108944 "VMStoreContext+0x50"
-;; region5 = 67109000 "VMStoreContext+0x88"
+;; region0 = 21 ""
+;; region1 = 123 ""
+;; region2 = 231 ""
+;; region3 = 243 ""
+;; region4 = 209 ""
+;; region5 = 68 ""
;; 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 d744058b5f..374ecefc82 100644
--- a/tests/disas/array-copy-anyref.wat
+++ b/tests/disas/array-copy-anyref.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 961a841ddf..dc2a294e8c 100644
--- a/tests/disas/array-copy-i64.wat
+++ b/tests/disas/array-copy-i64.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 f63c6d9d80..3995f04f06 100644
--- a/tests/disas/array-copy-i8.wat
+++ b/tests/disas/array-copy-i8.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 cd74ca2fd4..be4dcc7a53 100644
--- a/tests/disas/array-copy-inline.wat
+++ b/tests/disas/array-copy-inline.wat
@@ -16,11 +16,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 7fea96be82..eb98ec7eee 100644
--- a/tests/disas/array-fill-anyref.wat
+++ b/tests/disas/array-fill-anyref.wat
@@ -18,11 +18,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -75,11 +75,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -134,11 +134,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 a634f7dd56..4c0f714072 100644
--- a/tests/disas/array-fill-externref.wat
+++ b/tests/disas/array-fill-externref.wat
@@ -14,11 +14,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,11 +71,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 34d23ff59b..a971cbbc20 100644
--- a/tests/disas/array-fill-f32.wat
+++ b/tests/disas/array-fill-f32.wat
@@ -18,11 +18,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, f32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -75,11 +75,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -122,11 +122,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 3bca39c798..a5139ede62 100644
--- a/tests/disas/array-fill-f64.wat
+++ b/tests/disas/array-fill-f64.wat
@@ -18,11 +18,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, f64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -75,11 +75,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -122,11 +122,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 49fc34cf78..8e8151c00e 100644
--- a/tests/disas/array-fill-funcref.wat
+++ b/tests/disas/array-fill-funcref.wat
@@ -21,11 +21,11 @@
(elem declare func $hi)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -82,11 +82,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -144,12 +144,12 @@
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
-;; region5 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
+;; region5 = 232 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -213,8 +213,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 145c04ad6c..c3ce7f4b39 100644
--- a/tests/disas/array-fill-i16.wat
+++ b/tests/disas/array-fill-i16.wat
@@ -22,11 +22,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -79,11 +79,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -126,11 +126,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -173,11 +173,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 5473f6b81d..a69e7bca64 100644
--- a/tests/disas/array-fill-i31ref.wat
+++ b/tests/disas/array-fill-i31ref.wat
@@ -18,11 +18,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -75,11 +75,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -134,11 +134,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 e001e1180f..a15eeb2903 100644
--- a/tests/disas/array-fill-i32.wat
+++ b/tests/disas/array-fill-i32.wat
@@ -22,11 +22,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -79,11 +79,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -126,11 +126,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -173,11 +173,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 001bd55c88..c2e58cf7b7 100644
--- a/tests/disas/array-fill-i64.wat
+++ b/tests/disas/array-fill-i64.wat
@@ -22,11 +22,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -79,11 +79,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -126,11 +126,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -173,11 +173,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 55ba224a6e..ebc16a6b84 100644
--- a/tests/disas/basic-wat-test.wat
+++ b/tests/disas/basic-wat-test.wat
@@ -10,11 +10,11 @@
i32.add))
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 878407abb1..690506b993 100644
--- a/tests/disas/block-params-br_if-single-pred.wat
+++ b/tests/disas/block-params-br_if-single-pred.wat
@@ -21,10 +21,10 @@
)
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 68 ""
;; gv0 = vmctx
;; 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 52d4fe6c1c..8699bf357c 100644
--- a/tests/disas/block-params-if-else-same-values.wat
+++ b/tests/disas/block-params-if-else-same-values.wat
@@ -21,10 +21,10 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 68 ""
;; gv0 = vmctx
;; 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 e6b86da63e..8583d62742 100644
--- a/tests/disas/block-params-loop-single-iteration.wat
+++ b/tests/disas/block-params-loop-single-iteration.wat
@@ -14,8 +14,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 8271ac7954..f161dd0e66 100644
--- a/tests/disas/bounds-check.wat
+++ b/tests/disas/bounds-check.wat
@@ -25,11 +25,11 @@
(export "store" (func $store))
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2d89f77662..7e90405cf5 100644
--- a/tests/disas/br_table.wat
+++ b/tests/disas/br_table.wat
@@ -32,8 +32,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,8 +70,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -108,8 +108,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -134,8 +134,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 21aefdd2c0..09618b98c3 100644
--- a/tests/disas/branch-hinting-disabled.wat
+++ b/tests/disas/branch-hinting-disabled.wat
@@ -28,8 +28,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -54,8 +54,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 8d9fa13504..94b18aa57a 100644
--- a/tests/disas/branch-hinting.wat
+++ b/tests/disas/branch-hinting.wat
@@ -73,8 +73,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -96,8 +96,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -119,8 +119,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -145,8 +145,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -171,9 +171,9 @@
;; }
;;
;; function u0:4(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; 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 9decd0d067..307d4d75cb 100644
--- a/tests/disas/byteswap.wat
+++ b/tests/disas/byteswap.wat
@@ -72,8 +72,8 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -88,8 +88,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 3476592e85..9996f77b52 100644
--- a/tests/disas/call-indirect-with-gc.wat
+++ b/tests/disas/call-indirect-with-gc.wat
@@ -10,16 +10,16 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721604 "TypeIdsArray+0x4"
-;; region7 = 1610612752 "VMFuncRef+0x10"
-;; region8 = 1610612744 "VMFuncRef+0x8"
-;; region9 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
+;; region5 = 130 ""
+;; region6 = 191 ""
+;; region7 = 106 ""
+;; region8 = 116 ""
+;; region9 = 60 ""
;; gv0 = vmctx
;; 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 aa0a2c6494..5094f77be1 100644
--- a/tests/disas/call-indirect-without-gc.wat
+++ b/tests/disas/call-indirect-without-gc.wat
@@ -10,16 +10,16 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721604 "TypeIdsArray+0x4"
-;; region7 = 1610612752 "VMFuncRef+0x10"
-;; region8 = 1610612744 "VMFuncRef+0x8"
-;; region9 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
+;; region5 = 130 ""
+;; region6 = 191 ""
+;; region7 = 106 ""
+;; region8 = 116 ""
+;; region9 = 60 ""
;; gv0 = vmctx
;; 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 f78277c080..b80c5a530e 100644
--- a/tests/disas/call-indirect.wat
+++ b/tests/disas/call-indirect.wat
@@ -8,16 +8,16 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721604 "TypeIdsArray+0x4"
-;; region7 = 1610612752 "VMFuncRef+0x10"
-;; region8 = 1610612744 "VMFuncRef+0x8"
-;; region9 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
+;; region5 = 130 ""
+;; region6 = 191 ""
+;; region7 = 106 ""
+;; region8 = 116 ""
+;; region9 = 60 ""
;; gv0 = vmctx
;; 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 8e1ad2a39a..4047579a1c 100644
--- a/tests/disas/call-simd.wat
+++ b/tests/disas/call-simd.wat
@@ -16,8 +16,8 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -37,8 +37,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i8x16, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 195074f8db..33a9335e61 100644
--- a/tests/disas/call.wat
+++ b/tests/disas/call.wat
@@ -12,8 +12,8 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -32,8 +32,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 c05d9b66d2..1d53a7e8a4 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
@@ -48,11 +48,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 67108968 "VMStoreContext+0x68"
-;; region4 = 1946157056 "UnsafeIntrinsicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 175 ""
+;; region4 = 35 ""
;; gv0 = vmctx
;; 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 b2ab799df2..98f35ac91e 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined.wat
@@ -49,11 +49,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 67108968 "VMStoreContext+0x68"
-;; region4 = 1946157056 "UnsafeIntrinsicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 175 ""
+;; region4 = 35 ""
;; gv0 = vmctx
;; 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 5ca393194a..7f7a1679bd 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 = 1946157056 "UnsafeIntrinsicMemory"
+;; region0 = 35 ""
;;
;; 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 = 1946157056 "UnsafeIntrinsicMemory"
+;; region0 = 35 ""
;;
;; 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 fa939ff31b..1c6113da1d 100644
--- a/tests/disas/component-model/direct-adapter-calls-inlining.wat
+++ b/tests/disas/component-model/direct-adapter-calls-inlining.wat
@@ -55,12 +55,12 @@
)
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1476395008 "VMGlobalImport+0x0"
-;; region4 = 738197568 "VMComponentContext+0x40"
-;; region5 = 738197552 "VMComponentContext+0x30"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 44 ""
+;; region4 = 78 ""
+;; region5 = 227 ""
;; gv0 = vmctx
;; 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 2e1bf09cf6..5e7261d697 100644
--- a/tests/disas/component-model/direct-adapter-calls.wat
+++ b/tests/disas/component-model/direct-adapter-calls.wat
@@ -58,8 +58,8 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -75,9 +75,9 @@
;; }
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -96,12 +96,12 @@
;; }
;;
;; function u2:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 738197568 "VMComponentContext+0x40"
-;; region4 = 1207959576 "VMFunctionImport+0x18"
-;; region5 = 738197552 "VMComponentContext+0x30"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 78 ""
+;; region4 = 25 ""
+;; region5 = 227 ""
;; gv0 = vmctx
;; 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 6bc331932a..5f7b7ed307 100644
--- a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
@@ -59,10 +59,10 @@
)
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 68 ""
;; gv0 = vmctx
;; 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 9bdd461592..865925b304 100644
--- a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
+++ b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
@@ -43,11 +43,11 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 67108968 "VMStoreContext+0x68"
-;; region4 = 1946157056 "UnsafeIntrinsicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 175 ""
+;; region4 = 35 ""
;; gv0 = vmctx
;; 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 d68cb6d69e..8be39abc80 100644
--- a/tests/disas/component-model/inlining-bug.wat
+++ b/tests/disas/component-model/inlining-bug.wat
@@ -35,9 +35,9 @@
)
;; function u2:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
;; gv0 = vmctx
;; 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 4216018571..1cb8eb06f0 100644
--- a/tests/disas/component-model/inlining-fuzz-bug.wat
+++ b/tests/disas/component-model/inlining-fuzz-bug.wat
@@ -38,9 +38,9 @@
)
;; function u2:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
;; gv0 = vmctx
;; 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 a238d86e88..8c8c2098f1 100644
--- a/tests/disas/component-model/issue-11458.wat
+++ b/tests/disas/component-model/issue-11458.wat
@@ -20,9 +20,9 @@
)
;; function u1:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
;; gv0 = vmctx
;; 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/known-imported-adapter-memory.wat b/tests/disas/component-model/known-imported-adapter-memory.wat
index cf81743609..13801169e8 100644
--- a/tests/disas/component-model/known-imported-adapter-memory.wat
+++ b/tests/disas/component-model/known-imported-adapter-memory.wat
@@ -60,8 +60,8 @@
(instance $b (instantiate $B (with "f" (func $a "f"))))
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,11 +76,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -102,8 +102,8 @@
;; }
;;
;; function u1:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -118,13 +118,13 @@
;; }
;;
;; function u2:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1275068416 "VMMemoryImport+0x0"
-;; region4 = 603979776 "VMMemoryDefinition+0x0"
-;; region5 = 603979784 "VMMemoryDefinition+0x8"
-;; region6 = 201588736 "DefinedMemory(StaticModuleIndex(1), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 13 ""
+;; region4 = 215 ""
+;; region5 = 105 ""
+;; region6 = 184 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -147,17 +147,17 @@
;; }
;;
;; function u3:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 738197568 "VMComponentContext+0x40"
-;; region4 = 1207959576 "VMFunctionImport+0x18"
-;; region5 = 738197552 "VMComponentContext+0x30"
-;; region6 = 1275068416 "VMMemoryImport+0x0"
-;; region7 = 603979776 "VMMemoryDefinition+0x0"
-;; region8 = 603979784 "VMMemoryDefinition+0x8"
-;; region9 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
-;; region10 = 201588736 "DefinedMemory(StaticModuleIndex(1), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 78 ""
+;; region4 = 25 ""
+;; region5 = 227 ""
+;; region6 = 13 ""
+;; region7 = 215 ""
+;; region8 = 105 ""
+;; region9 = 171 ""
+;; region10 = 184 ""
;; gv0 = vmctx
;; 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/known-imported-canonical-abi-memory.wat b/tests/disas/component-model/known-imported-canonical-abi-memory.wat
index 3cf1e1e84f..ccdbd9b03c 100644
--- a/tests/disas/component-model/known-imported-canonical-abi-memory.wat
+++ b/tests/disas/component-model/known-imported-canonical-abi-memory.wat
@@ -28,8 +28,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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/known-imported-entities.wat b/tests/disas/component-model/known-imported-entities.wat
index 0a3df05d83..35afc5b954 100644
--- a/tests/disas/component-model/known-imported-entities.wat
+++ b/tests/disas/component-model/known-imported-entities.wat
@@ -44,11 +44,11 @@
(core instance $n (instantiate $N (with "" (instance $m))))
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -64,9 +64,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -81,11 +81,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 117 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -120,12 +120,12 @@
;; }
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1275068416 "VMMemoryImport+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -142,10 +142,10 @@
;; }
;;
;; function u1:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -161,12 +161,12 @@
;; }
;;
;; function u1:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 117 ""
;; gv0 = vmctx
;; 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 8a18e93ae2..ae762b015f 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
@@ -65,10 +65,10 @@
)
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 68 ""
;; gv0 = vmctx
;; 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-imports-unknown.wat b/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
index 07f20f75e6..d4bb116842 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
@@ -66,11 +66,11 @@
(core instance $n2 (instantiate $N (with "" (instance $m2))))
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -86,9 +86,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -103,11 +103,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -142,11 +142,11 @@
;; }
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -162,9 +162,9 @@
;; }
;;
;; function u1:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -179,11 +179,11 @@
;; }
;;
;; function u1:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -218,12 +218,12 @@
;; }
;;
;; function u2:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1275068416 "VMMemoryImport+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -240,10 +240,10 @@
;; }
;;
;; function u2:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -259,12 +259,12 @@
;; }
;;
;; function u2:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
;; gv0 = vmctx
;; 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/reexported-ambiguous-entities.wat b/tests/disas/component-model/reexported-ambiguous-entities.wat
index 72f93efe2f..fdae163e64 100644
--- a/tests/disas/component-model/reexported-ambiguous-entities.wat
+++ b/tests/disas/component-model/reexported-ambiguous-entities.wat
@@ -89,11 +89,11 @@
(core instance $p2 (instantiate $P (with "" (instance $m2))))
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -109,9 +109,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -126,11 +126,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -165,11 +165,11 @@
;; }
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -185,9 +185,9 @@
;; }
;;
;; function u1:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -202,11 +202,11 @@
;; }
;;
;; function u1:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -241,12 +241,12 @@
;; }
;;
;; function u2:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1275068416 "VMMemoryImport+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -263,10 +263,10 @@
;; }
;;
;; function u2:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -282,12 +282,12 @@
;; }
;;
;; function u2:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -323,12 +323,12 @@
;; }
;;
;; function u3:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1275068416 "VMMemoryImport+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -345,10 +345,10 @@
;; }
;;
;; function u3:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -364,12 +364,12 @@
;; }
;;
;; function u3:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
;; gv0 = vmctx
;; 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/reexported-entities-to-imported-module.wat b/tests/disas/component-model/reexported-entities-to-imported-module.wat
index 911f73ac79..1c29f765dd 100644
--- a/tests/disas/component-model/reexported-entities-to-imported-module.wat
+++ b/tests/disas/component-model/reexported-entities-to-imported-module.wat
@@ -62,11 +62,11 @@
(core instance $d (instantiate $Dyn (with "" (instance $n))))
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -82,9 +82,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -99,11 +99,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -138,12 +138,12 @@
;; }
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1275068416 "VMMemoryImport+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -160,10 +160,10 @@
;; }
;;
;; function u1:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -179,12 +179,12 @@
;; }
;;
;; function u1:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
;; gv0 = vmctx
;; 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/reexported-known-entities.wat b/tests/disas/component-model/reexported-known-entities.wat
index 54b99dc4ac..d306ad76cd 100644
--- a/tests/disas/component-model/reexported-known-entities.wat
+++ b/tests/disas/component-model/reexported-known-entities.wat
@@ -68,11 +68,11 @@
(core instance $p (instantiate $P (with "" (instance $n))))
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -88,9 +88,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -105,11 +105,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 117 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -144,12 +144,12 @@
;; }
;;
;; function u1:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1275068416 "VMMemoryImport+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -166,10 +166,10 @@
;; }
;;
;; function u1:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -185,12 +185,12 @@
;; }
;;
;; function u1:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 117 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -226,12 +226,12 @@
;; }
;;
;; function u2:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1275068416 "VMMemoryImport+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 13 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -248,10 +248,10 @@
;; }
;;
;; function u2:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -267,12 +267,12 @@
;; }
;;
;; function u2:2(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 117 ""
;; gv0 = vmctx
;; 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 cb42b80d9e..6b8c2c0977 100644
--- a/tests/disas/component-model/sync-adapter-calls.wat
+++ b/tests/disas/component-model/sync-adapter-calls.wat
@@ -53,22 +53,21 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; ss0 = explicit_slot 32, align = 8
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1476395008 "VMGlobalImport+0x0"
-;; region4 = 738197568 "VMComponentContext+0x40"
-;; 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 = 738197552 "VMComponentContext+0x30"
-;; region15 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 44 ""
+;; region4 = 78 ""
+;; region5 = 68 ""
+;; region6 = 198 ""
+;; region7 = 100 ""
+;; region8 = 254 ""
+;; region9 = 176 ""
+;; region10 = 112 ""
+;; region11 = 224 ""
+;; region12 = 149 ""
+;; region13 = 62 ""
+;; region14 = 227 ""
;; gv0 = vmctx
;; 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 6958bd08d3..c22b40a6f0 100644
--- a/tests/disas/component-model/unsafe-intrinsics-used.wat
+++ b/tests/disas/component-model/unsafe-intrinsics-used.wat
@@ -35,8 +35,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108968 "VMStoreContext+0x68"
+;; region0 = 123 ""
+;; region1 = 175 ""
;;
;; 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 = 1946157056 "UnsafeIntrinsicMemory"
+;; region0 = 35 ""
;;
;; 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 7d80d8df06..441345a049 100644
--- a/tests/disas/conditional-traps.wat
+++ b/tests/disas/conditional-traps.wat
@@ -22,8 +22,8 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,8 +41,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 f34c462ff1..1ddc3cfa62 100644
--- a/tests/disas/dead-code.wat
+++ b/tests/disas/dead-code.wat
@@ -22,8 +22,8 @@
i32.const 42)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,8 +49,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -64,8 +64,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -79,8 +79,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 0220ec36d5..35a70889e8 100644
--- a/tests/disas/duplicate-function-types.wat
+++ b/tests/disas/duplicate-function-types.wat
@@ -17,17 +17,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 268435456 "PublicTable"
-;; region6 = 40 "VMContext+0x28"
-;; region7 = 1677721600 "TypeIdsArray+0x0"
-;; region8 = 1610612752 "VMFuncRef+0x10"
-;; region9 = 1610612744 "VMFuncRef+0x8"
-;; region10 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
+;; region6 = 130 ""
+;; region7 = 6 ""
+;; region8 = 106 ""
+;; region9 = 116 ""
+;; region10 = 60 ""
;; gv0 = vmctx
;; 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 9568c10830..3902c66a11 100644
--- a/tests/disas/duplicate-loads-dynamic-memory.wat
+++ b/tests/disas/duplicate-loads-dynamic-memory.wat
@@ -23,11 +23,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,11 +49,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; 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 31f33e3624..04f4c6dd09 100644
--- a/tests/disas/duplicate-loads-static-memory.wat
+++ b/tests/disas/duplicate-loads-static-memory.wat
@@ -18,11 +18,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -40,11 +40,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; 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 c4f45135ed..7bca9286eb 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
@@ -36,11 +36,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,11 +71,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; 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 eb58885e29..e99f41c389 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
@@ -32,11 +32,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -69,11 +69,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; 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 84782387e2..ecd96076ac 100644
--- a/tests/disas/elem-segment.wat
+++ b/tests/disas/elem-segment.wat
@@ -11,11 +11,11 @@
(elem func $f $f $f)
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108936 "VMStoreContext+0x48"
-;; region2 = 67108928 "VMStoreContext+0x40"
-;; region3 = 67108944 "VMStoreContext+0x50"
-;; region4 = 67109000 "VMStoreContext+0x88"
+;; region0 = 123 ""
+;; region1 = 231 ""
+;; region2 = 243 ""
+;; region3 = 209 ""
+;; region4 = 68 ""
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -44,7 +44,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 2080374784 "ElementSegment"
+;; region0 = 191 ""
;; 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 96b4046761..a0ac4895bc 100644
--- a/tests/disas/epoch-interruption.wat
+++ b/tests/disas/epoch-interruption.wat
@@ -5,11 +5,11 @@
(module (func (loop (br 0))))
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 24 "VMContext+0x18"
-;; region3 = 1744830464 "EpochCounter+0x0"
-;; region4 = 67108872 "VMStoreContext+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 235 ""
+;; region3 = 18 ""
+;; region4 = 109 ""
;; gv0 = vmctx
;; 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 0862970307..be03ac93ab 100644
--- a/tests/disas/f32-load.wat
+++ b/tests/disas/f32-load.wat
@@ -7,11 +7,11 @@
f32.load))
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 6fa5055682..7bf55bafe3 100644
--- a/tests/disas/f32-store.wat
+++ b/tests/disas/f32-store.wat
@@ -10,11 +10,11 @@
f32.store))
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 22d66bc94b..46f5a924bf 100644
--- a/tests/disas/f64-load.wat
+++ b/tests/disas/f64-load.wat
@@ -9,11 +9,11 @@
f64.load))
;; function u0:0(i64 vmctx, i64, i32) -> f64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 95fae42d5e..043ac478e7 100644
--- a/tests/disas/f64-store.wat
+++ b/tests/disas/f64-store.wat
@@ -10,11 +10,11 @@
f64.store))
;; function u0:0(i64 vmctx, i64, i32, f64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 1940dd553f..095ca73e19 100644
--- a/tests/disas/fac-multi-value.wat
+++ b/tests/disas/fac-multi-value.wat
@@ -21,8 +21,8 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -36,8 +36,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64, i64) -> i64, i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -51,8 +51,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 26d230b8d0..bce01a34e7 100644
--- a/tests/disas/fibonacci.wat
+++ b/tests/disas/fibonacci.wat
@@ -24,11 +24,11 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 b3f59e57d3..fec6ee9b6d 100644
--- a/tests/disas/fixed-size-memory.wat
+++ b/tests/disas/fixed-size-memory.wat
@@ -21,11 +21,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 0ed3d54684..7ad62a742e 100644
--- a/tests/disas/foo.wat
+++ b/tests/disas/foo.wat
@@ -15,20 +15,20 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; 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 = 1677721604 "TypeIdsArray+0x4"
-;; region11 = 1610612752 "VMFuncRef+0x10"
-;; region12 = 1610612744 "VMFuncRef+0x8"
-;; region13 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
+;; region5 = 21 ""
+;; region6 = 93 ""
+;; region7 = 211 ""
+;; region8 = 99 ""
+;; region9 = 130 ""
+;; region10 = 191 ""
+;; region11 = 106 ""
+;; region12 = 116 ""
+;; region13 = 60 ""
;; gv0 = vmctx
;; 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 40bc30174f..f787eb77e8 100644
--- a/tests/disas/gc/array-copy-with-fuel.wat
+++ b/tests/disas/gc/array-copy-with-fuel.wat
@@ -12,14 +12,14 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32) tail {
;; ss0 = explicit_slot 4, align = 4
;; ss1 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; 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)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 7 ""
+;; region3 = 196 ""
+;; region4 = 206 ""
+;; region5 = 108 ""
+;; region6 = 232 ""
+;; region7 = 240 ""
;; gv0 = vmctx
;; 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 2a562fc094..d251980d8a 100644
--- a/tests/disas/gc/array-fill-i8.wat
+++ b/tests/disas/gc/array-fill-i8.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 9ac2033622..5c0e1aa8e6 100644
--- a/tests/disas/gc/array-init-data.wat
+++ b/tests/disas/gc/array-init-data.wat
@@ -14,13 +14,13 @@
array.init_data $a $passive)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
-;; region5 = 56 "VMContext+0x38"
-;; region6 = 48 "VMContext+0x30"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
+;; region5 = 90 ""
+;; region6 = 136 ""
;; gv0 = vmctx
;; 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-data.wat b/tests/disas/gc/array-new-data.wat
index 3da18b18d8..392836ea2d 100644
--- a/tests/disas/gc/array-new-data.wat
+++ b/tests/disas/gc/array-new-data.wat
@@ -77,19 +77,19 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 56 "VMContext+0x38"
-;; region3 = 48 "VMContext+0x30"
-;; region4 = 32 "VMContext+0x20"
-;; region5 = 872415232 "VMCopyingHeapData+0x0"
-;; region6 = 872415236 "VMCopyingHeapData+0x4"
-;; region7 = 40 "VMContext+0x28"
-;; region8 = 1677721600 "TypeIdsArray+0x0"
-;; region9 = 67108896 "VMStoreContext+0x20"
-;; region10 = 536870912 "GcHeap"
-;; region11 = 67108904 "VMStoreContext+0x28"
-;; region12 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 90 ""
+;; region3 = 136 ""
+;; region4 = 65 ""
+;; region5 = 177 ""
+;; region6 = 98 ""
+;; region7 = 130 ""
+;; region8 = 6 ""
+;; region9 = 196 ""
+;; region10 = 108 ""
+;; region11 = 206 ""
+;; region12 = 232 ""
;; gv0 = vmctx
;; 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 4daa0f087b..bcc69bd24f 100644
--- a/tests/disas/gc/array-new-default-anyref.wat
+++ b/tests/disas/gc/array-new-default-anyref.wat
@@ -10,16 +10,16 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
;; gv0 = vmctx
;; 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 baeed321b8..0729defc09 100644
--- a/tests/disas/gc/array-new-default-exnref.wat
+++ b/tests/disas/gc/array-new-default-exnref.wat
@@ -10,16 +10,16 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
;; gv0 = vmctx
;; 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 78db3263ea..50256f62a1 100644
--- a/tests/disas/gc/array-new-default-externref.wat
+++ b/tests/disas/gc/array-new-default-externref.wat
@@ -10,16 +10,16 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
;; gv0 = vmctx
;; 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 0bb1fa00a0..2d9e8a8402 100644
--- a/tests/disas/gc/array-new-default-f32.wat
+++ b/tests/disas/gc/array-new-default-f32.wat
@@ -11,17 +11,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; 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 472da45f28..4a42102677 100644
--- a/tests/disas/gc/array-new-default-f64.wat
+++ b/tests/disas/gc/array-new-default-f64.wat
@@ -11,17 +11,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; 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 b5e2f4aea8..b32b30f634 100644
--- a/tests/disas/gc/array-new-default-funcref.wat
+++ b/tests/disas/gc/array-new-default-funcref.wat
@@ -11,17 +11,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; 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 a966b5d624..59f4c32ad9 100644
--- a/tests/disas/gc/array-new-default-i16.wat
+++ b/tests/disas/gc/array-new-default-i16.wat
@@ -11,17 +11,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; 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 25ecce0755..544024e0ed 100644
--- a/tests/disas/gc/array-new-default-i32.wat
+++ b/tests/disas/gc/array-new-default-i32.wat
@@ -11,17 +11,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; 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 65b9b91141..92d11bd05d 100644
--- a/tests/disas/gc/array-new-default-i64.wat
+++ b/tests/disas/gc/array-new-default-i64.wat
@@ -11,17 +11,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; 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 45f840d560..8993608de8 100644
--- a/tests/disas/gc/array-new-default-i8.wat
+++ b/tests/disas/gc/array-new-default-i8.wat
@@ -11,17 +11,17 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; 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 55449f05f0..852a5c8403 100644
--- a/tests/disas/gc/call-indirect-final-type.wat
+++ b/tests/disas/gc/call-indirect-final-type.wat
@@ -16,16 +16,16 @@
(return_call_indirect (type $f) (local.get 0) (local.get 1)))
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 1610612752 "VMFuncRef+0x10"
-;; region8 = 1610612744 "VMFuncRef+0x8"
-;; region9 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 117 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 106 ""
+;; region8 = 116 ""
+;; region9 = 60 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,16 +71,16 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 1610612752 "VMFuncRef+0x10"
-;; region8 = 1610612744 "VMFuncRef+0x8"
-;; region9 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 117 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 106 ""
+;; region8 = 116 ""
+;; region9 = 60 ""
;; gv0 = vmctx
;; 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 33b7e608b4..1932aa6b5f 100644
--- a/tests/disas/gc/copying/array-fill.wat
+++ b/tests/disas/gc/copying/array-fill.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 51ace936d0..7b7223cb30 100644
--- a/tests/disas/gc/copying/array-get-s.wat
+++ b/tests/disas/gc/copying/array-get-s.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 8c23838052..9d76df8483 100644
--- a/tests/disas/gc/copying/array-get-u.wat
+++ b/tests/disas/gc/copying/array-get-u.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 b41b3fc7b1..2abbd3a8ae 100644
--- a/tests/disas/gc/copying/array-get.wat
+++ b/tests/disas/gc/copying/array-get.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 e7b2f2b854..e542e0bfb1 100644
--- a/tests/disas/gc/copying/array-len.wat
+++ b/tests/disas/gc/copying/array-len.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 c5f20774d0..e4f7c700de 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
@@ -12,19 +12,19 @@
;; ss0 = explicit_slot 4, align = 4
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; 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)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
+;; region10 = 232 ""
+;; region11 = 240 ""
+;; region12 = 208 ""
;; gv0 = vmctx
;; 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 59c33d89e7..90f918f87b 100644
--- a/tests/disas/gc/copying/array-new-fixed.wat
+++ b/tests/disas/gc/copying/array-new-fixed.wat
@@ -9,16 +9,16 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
;; gv0 = vmctx
;; 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 ab880a95bf..d8052a2847 100644
--- a/tests/disas/gc/copying/array-new.wat
+++ b/tests/disas/gc/copying/array-new.wat
@@ -9,16 +9,16 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 206 ""
;; gv0 = vmctx
;; 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 67c4db384c..5ef884de7e 100644
--- a/tests/disas/gc/copying/array-set.wat
+++ b/tests/disas/gc/copying/array-set.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 149f585567..3daa16efff 100644
--- a/tests/disas/gc/copying/br-on-cast-fail.wat
+++ b/tests/disas/gc/copying/br-on-cast-fail.wat
@@ -16,15 +16,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
-;; region7 = 1207959576 "VMFunctionImport+0x18"
-;; region8 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
+;; region7 = 25 ""
+;; region8 = 68 ""
;; gv0 = vmctx
;; 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 955d88c839..f98c11f314 100644
--- a/tests/disas/gc/copying/br-on-cast.wat
+++ b/tests/disas/gc/copying/br-on-cast.wat
@@ -16,15 +16,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
-;; region7 = 1207959576 "VMFunctionImport+0x18"
-;; region8 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
+;; region7 = 25 ""
+;; region8 = 68 ""
;; gv0 = vmctx
;; 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 ba991cdd1f..355f7484fc 100644
--- a/tests/disas/gc/copying/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/copying/call-indirect-and-subtyping.wat
@@ -16,15 +16,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 491f4f7836..9f03f7b6a9 100644
--- a/tests/disas/gc/copying/externref-globals.wat
+++ b/tests/disas/gc/copying/externref-globals.wat
@@ -11,9 +11,9 @@
)
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -30,9 +30,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; 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 d2afc64072..84ac64d032 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-get.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 95345ad6a2..32340a8407 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
@@ -10,16 +10,16 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 232 ""
;; gv0 = vmctx
;; 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 992ae6ce47..657dabab52 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-set.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 1a5425e609..2b247bb208 100644
--- a/tests/disas/gc/copying/i31ref-globals.wat
+++ b/tests/disas/gc/copying/i31ref-globals.wat
@@ -11,9 +11,9 @@
)
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -30,9 +30,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; 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 a8fac30a24..493b490da3 100644
--- a/tests/disas/gc/copying/multiple-array-get.wat
+++ b/tests/disas/gc/copying/multiple-array-get.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 2e8ea0ae76..905a866932 100644
--- a/tests/disas/gc/copying/multiple-struct-get.wat
+++ b/tests/disas/gc/copying/multiple-struct-get.wat
@@ -11,11 +11,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 c5b1ccd899..38b814ee39 100644
--- a/tests/disas/gc/copying/ref-cast.wat
+++ b/tests/disas/gc/copying/ref-cast.wat
@@ -8,13 +8,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; 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 433930e511..052c49446d 100644
--- a/tests/disas/gc/copying/ref-is-null.wat
+++ b/tests/disas/gc/copying/ref-is-null.wat
@@ -10,8 +10,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -28,8 +28,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 f162813c65..da7096053d 100644
--- a/tests/disas/gc/copying/ref-test-any.wat
+++ b/tests/disas/gc/copying/ref-test-any.wat
@@ -10,8 +10,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -28,8 +28,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 005d4304d9..ff53f363b6 100644
--- a/tests/disas/gc/copying/ref-test-array.wat
+++ b/tests/disas/gc/copying/ref-test-array.wat
@@ -7,11 +7,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 61288a4aae..1543dbdb22 100644
--- a/tests/disas/gc/copying/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-func-type.wat
@@ -8,11 +8,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 1610612752 "VMFuncRef+0x10"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 106 ""
;; gv0 = vmctx
;; 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 ae712ec983..75b15f3747 100644
--- a/tests/disas/gc/copying/ref-test-concrete-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-type.wat
@@ -8,13 +8,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; 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 c98de5880a..ec727df48f 100644
--- a/tests/disas/gc/copying/ref-test-eq.wat
+++ b/tests/disas/gc/copying/ref-test-eq.wat
@@ -7,11 +7,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 5a90cace28..881e4c45c0 100644
--- a/tests/disas/gc/copying/ref-test-i31.wat
+++ b/tests/disas/gc/copying/ref-test-i31.wat
@@ -7,8 +7,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 af5be3dfb0..ed32d27f85 100644
--- a/tests/disas/gc/copying/ref-test-none.wat
+++ b/tests/disas/gc/copying/ref-test-none.wat
@@ -10,8 +10,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -26,8 +26,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 49b9c5378a..4cb4fb57c8 100644
--- a/tests/disas/gc/copying/ref-test-struct.wat
+++ b/tests/disas/gc/copying/ref-test-struct.wat
@@ -7,11 +7,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 b09ef1bac2..7ecce01ad8 100644
--- a/tests/disas/gc/copying/struct-get.wat
+++ b/tests/disas/gc/copying/struct-get.wat
@@ -23,11 +23,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,11 +49,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -76,11 +76,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -103,11 +103,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 4345e54f18..2acf7ec270 100644
--- a/tests/disas/gc/copying/struct-new-default.wat
+++ b/tests/disas/gc/copying/struct-new-default.wat
@@ -11,15 +11,15 @@
)
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
;; gv0 = vmctx
;; 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 5d3c503363..a329233a99 100644
--- a/tests/disas/gc/copying/struct-new.wat
+++ b/tests/disas/gc/copying/struct-new.wat
@@ -12,16 +12,16 @@
)
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 232 ""
;; gv0 = vmctx
;; 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 e04ddcf2b2..fb6ae9597f 100644
--- a/tests/disas/gc/copying/struct-set.wat
+++ b/tests/disas/gc/copying/struct-set.wat
@@ -19,11 +19,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,11 +71,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 6a361ff468..850f965d3c 100644
--- a/tests/disas/gc/copying/v128-fields.wat
+++ b/tests/disas/gc/copying/v128-fields.wat
@@ -11,11 +11,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 c2b063edd9..0d1325a5d4 100644
--- a/tests/disas/gc/drc/array-fill.wat
+++ b/tests/disas/gc/drc/array-fill.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 9408317aec..f076a9630e 100644
--- a/tests/disas/gc/drc/array-get-s.wat
+++ b/tests/disas/gc/drc/array-get-s.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 890de6e20d..131323b42c 100644
--- a/tests/disas/gc/drc/array-get-u.wat
+++ b/tests/disas/gc/drc/array-get-u.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 8a6b7e6bd5..7294e7d952 100644
--- a/tests/disas/gc/drc/array-get.wat
+++ b/tests/disas/gc/drc/array-get.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 18e8ba08c6..9c69b1e6d2 100644
--- a/tests/disas/gc/drc/array-len.wat
+++ b/tests/disas/gc/drc/array-len.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 7c8241cbe0..c4e68d26da 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
@@ -13,16 +13,16 @@
;; ss0 = explicit_slot 4, align = 4
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; 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)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 108 ""
+;; region6 = 206 ""
+;; region7 = 232 ""
+;; region8 = 240 ""
+;; region9 = 208 ""
;; gv0 = vmctx
;; 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 ab1bc04f63..49b43a06cf 100644
--- a/tests/disas/gc/drc/array-new-fixed.wat
+++ b/tests/disas/gc/drc/array-new-fixed.wat
@@ -10,13 +10,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 536870912 "GcHeap"
-;; region6 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 108 ""
+;; region6 = 206 ""
;; gv0 = vmctx
;; 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 540a676547..454539ecec 100644
--- a/tests/disas/gc/drc/array-new.wat
+++ b/tests/disas/gc/drc/array-new.wat
@@ -10,13 +10,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 536870912 "GcHeap"
-;; region6 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 108 ""
+;; region6 = 206 ""
;; gv0 = vmctx
;; 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 e217b319d1..bfd8b06b55 100644
--- a/tests/disas/gc/drc/array-set.wat
+++ b/tests/disas/gc/drc/array-set.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 7c7f75e265..9a05499227 100644
--- a/tests/disas/gc/drc/br-on-cast-fail.wat
+++ b/tests/disas/gc/drc/br-on-cast-fail.wat
@@ -17,15 +17,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
-;; region7 = 1207959576 "VMFunctionImport+0x18"
-;; region8 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
+;; region7 = 25 ""
+;; region8 = 68 ""
;; gv0 = vmctx
;; 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 1aec99d328..53db4c35f2 100644
--- a/tests/disas/gc/drc/br-on-cast.wat
+++ b/tests/disas/gc/drc/br-on-cast.wat
@@ -17,15 +17,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
-;; region7 = 1207959576 "VMFunctionImport+0x18"
-;; region8 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
+;; region7 = 25 ""
+;; region8 = 68 ""
;; gv0 = vmctx
;; 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 7e1d9260fe..07fadca7d4 100644
--- a/tests/disas/gc/drc/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
@@ -17,15 +17,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 51ae94c551..e727f6ba9a 100644
--- a/tests/disas/gc/drc/externref-globals.wat
+++ b/tests/disas/gc/drc/externref-globals.wat
@@ -14,17 +14,17 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; 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 = 805306368 "VMDrcHeapData+0x0"
-;; region8 = 805306372 "VMDrcHeapData+0x4"
-;; region9 = 805306376 "VMDrcHeapData+0x8"
-;; region10 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
+;; region3 = 196 ""
+;; region4 = 206 ""
+;; region5 = 108 ""
+;; region6 = 65 ""
+;; region7 = 210 ""
+;; region8 = 115 ""
+;; region9 = 137 ""
+;; region10 = 232 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -99,12 +99,12 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
-;; region3 = 67108896 "VMStoreContext+0x20"
-;; region4 = 67108904 "VMStoreContext+0x28"
-;; region5 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
+;; region3 = 196 ""
+;; region4 = 206 ""
+;; region5 = 108 ""
;; gv0 = vmctx
;; 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 81b77e00c8..c4e0b6ff71 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-get.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 38b5a83be3..4fe0d6552d 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
@@ -11,13 +11,13 @@
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 536870912 "GcHeap"
-;; region6 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 108 ""
+;; region6 = 232 ""
;; gv0 = vmctx
;; 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 5787a8bf95..c29ad8b26c 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-set.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 8e8cb8b235..6a4afcd3da 100644
--- a/tests/disas/gc/drc/i31ref-globals.wat
+++ b/tests/disas/gc/drc/i31ref-globals.wat
@@ -13,9 +13,9 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -32,9 +32,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; 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 e13d8cc119..bc9463649c 100644
--- a/tests/disas/gc/drc/multiple-array-get.wat
+++ b/tests/disas/gc/drc/multiple-array-get.wat
@@ -11,11 +11,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 525f9d01dc..1a4ee93694 100644
--- a/tests/disas/gc/drc/multiple-struct-get.wat
+++ b/tests/disas/gc/drc/multiple-struct-get.wat
@@ -12,11 +12,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 9ee28ff22e..bffe2a119c 100644
--- a/tests/disas/gc/drc/ref-cast.wat
+++ b/tests/disas/gc/drc/ref-cast.wat
@@ -9,13 +9,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; 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 0e7918fd2b..f176095a94 100644
--- a/tests/disas/gc/drc/ref-is-null.wat
+++ b/tests/disas/gc/drc/ref-is-null.wat
@@ -11,8 +11,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,8 +29,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 6180b722a0..3360f5e855 100644
--- a/tests/disas/gc/drc/ref-test-any.wat
+++ b/tests/disas/gc/drc/ref-test-any.wat
@@ -11,8 +11,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,8 +29,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 6bbd272425..521b1061bb 100644
--- a/tests/disas/gc/drc/ref-test-array.wat
+++ b/tests/disas/gc/drc/ref-test-array.wat
@@ -8,11 +8,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 e4a9abda4f..3897b1845d 100644
--- a/tests/disas/gc/drc/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-func-type.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 1610612752 "VMFuncRef+0x10"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 106 ""
;; gv0 = vmctx
;; 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 abba85535a..ff1cf1150d 100644
--- a/tests/disas/gc/drc/ref-test-concrete-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-type.wat
@@ -9,13 +9,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; 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 75c28f8000..28c36da5b5 100644
--- a/tests/disas/gc/drc/ref-test-eq.wat
+++ b/tests/disas/gc/drc/ref-test-eq.wat
@@ -8,11 +8,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 b7d018aa03..bb141266d8 100644
--- a/tests/disas/gc/drc/ref-test-i31.wat
+++ b/tests/disas/gc/drc/ref-test-i31.wat
@@ -8,8 +8,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 0e018bd5b5..0145b08f55 100644
--- a/tests/disas/gc/drc/ref-test-none.wat
+++ b/tests/disas/gc/drc/ref-test-none.wat
@@ -11,8 +11,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -27,8 +27,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 16c119a315..f8050ee939 100644
--- a/tests/disas/gc/drc/ref-test-struct.wat
+++ b/tests/disas/gc/drc/ref-test-struct.wat
@@ -8,11 +8,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 99b6552dcc..47c6e6d75f 100644
--- a/tests/disas/gc/drc/struct-get.wat
+++ b/tests/disas/gc/drc/struct-get.wat
@@ -24,11 +24,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,11 +50,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -77,11 +77,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -105,16 +105,16 @@
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
-;; region5 = 32 "VMContext+0x20"
-;; region6 = 805306368 "VMDrcHeapData+0x0"
-;; region7 = 805306372 "VMDrcHeapData+0x4"
-;; region8 = 805306376 "VMDrcHeapData+0x8"
-;; region9 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
+;; region5 = 65 ""
+;; region6 = 210 ""
+;; region7 = 115 ""
+;; region8 = 137 ""
+;; region9 = 232 ""
;; gv0 = vmctx
;; 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 913b5862d4..a11ac5f14b 100644
--- a/tests/disas/gc/drc/struct-new-default.wat
+++ b/tests/disas/gc/drc/struct-new-default.wat
@@ -12,13 +12,13 @@
)
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 536870912 "GcHeap"
-;; region6 = 67108904 "VMStoreContext+0x28"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 108 ""
+;; region6 = 206 ""
;; gv0 = vmctx
;; 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 5c83bed9c8..bc908530ad 100644
--- a/tests/disas/gc/drc/struct-new.wat
+++ b/tests/disas/gc/drc/struct-new.wat
@@ -13,14 +13,14 @@
)
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 536870912 "GcHeap"
-;; region6 = 67108904 "VMStoreContext+0x28"
-;; region7 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 108 ""
+;; region6 = 206 ""
+;; region7 = 232 ""
;; gv0 = vmctx
;; 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 425f5c6089..d931c8e02a 100644
--- a/tests/disas/gc/drc/struct-set.wat
+++ b/tests/disas/gc/drc/struct-set.wat
@@ -20,11 +20,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,11 +72,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 01c5466df0..74520b2156 100644
--- a/tests/disas/gc/null/array-fill.wat
+++ b/tests/disas/gc/null/array-fill.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 16e0904cdd..9091036b78 100644
--- a/tests/disas/gc/null/array-get-s.wat
+++ b/tests/disas/gc/null/array-get-s.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 f47608d6dd..e581086a75 100644
--- a/tests/disas/gc/null/array-get-u.wat
+++ b/tests/disas/gc/null/array-get-u.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 be3d91eb55..4b886ca567 100644
--- a/tests/disas/gc/null/array-get.wat
+++ b/tests/disas/gc/null/array-get.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 6de1e98f93..f9783770fd 100644
--- a/tests/disas/gc/null/array-len.wat
+++ b/tests/disas/gc/null/array-len.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 9a66faaa4a..b3fb1ed280 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
@@ -13,18 +13,18 @@
;; ss0 = explicit_slot 4, align = 4
;; ss1 = explicit_slot 4, align = 4
;; ss2 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 939524096 "VMNullHeapData+0x0"
-;; region4 = 67108904 "VMStoreContext+0x28"
-;; region5 = 67108896 "VMStoreContext+0x20"
-;; region6 = 40 "VMContext+0x28"
-;; region7 = 1677721600 "TypeIdsArray+0x0"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 1543503872 "Stack(ss0)"
-;; region10 = 1543503873 "Stack(ss1)"
-;; region11 = 1543503874 "Stack(ss2)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 237 ""
+;; region4 = 206 ""
+;; region5 = 196 ""
+;; region6 = 130 ""
+;; region7 = 6 ""
+;; region8 = 108 ""
+;; region9 = 232 ""
+;; region10 = 240 ""
+;; region11 = 208 ""
;; gv0 = vmctx
;; 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 7267cb4e02..5ca8f625f5 100644
--- a/tests/disas/gc/null/array-new-fixed.wat
+++ b/tests/disas/gc/null/array-new-fixed.wat
@@ -10,15 +10,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 939524096 "VMNullHeapData+0x0"
-;; region4 = 67108904 "VMStoreContext+0x28"
-;; region5 = 67108896 "VMStoreContext+0x20"
-;; region6 = 40 "VMContext+0x28"
-;; region7 = 1677721600 "TypeIdsArray+0x0"
-;; region8 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 237 ""
+;; region4 = 206 ""
+;; region5 = 196 ""
+;; region6 = 130 ""
+;; region7 = 6 ""
+;; region8 = 108 ""
;; gv0 = vmctx
;; 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 da830db795..3e5dd5d53f 100644
--- a/tests/disas/gc/null/array-new.wat
+++ b/tests/disas/gc/null/array-new.wat
@@ -10,15 +10,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 939524096 "VMNullHeapData+0x0"
-;; region4 = 67108904 "VMStoreContext+0x28"
-;; region5 = 67108896 "VMStoreContext+0x20"
-;; region6 = 40 "VMContext+0x28"
-;; region7 = 1677721600 "TypeIdsArray+0x0"
-;; region8 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 237 ""
+;; region4 = 206 ""
+;; region5 = 196 ""
+;; region6 = 130 ""
+;; region7 = 6 ""
+;; region8 = 108 ""
;; gv0 = vmctx
;; 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 a4f5bf3b3d..3667bcaeec 100644
--- a/tests/disas/gc/null/array-set.wat
+++ b/tests/disas/gc/null/array-set.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 b6bdc6798c..fc48f30b21 100644
--- a/tests/disas/gc/null/br-on-cast-fail.wat
+++ b/tests/disas/gc/null/br-on-cast-fail.wat
@@ -17,15 +17,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
-;; region7 = 1207959576 "VMFunctionImport+0x18"
-;; region8 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
+;; region7 = 25 ""
+;; region8 = 68 ""
;; gv0 = vmctx
;; 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 75d7e22083..9f6490aa96 100644
--- a/tests/disas/gc/null/br-on-cast.wat
+++ b/tests/disas/gc/null/br-on-cast.wat
@@ -17,15 +17,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
-;; region7 = 1207959576 "VMFunctionImport+0x18"
-;; region8 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
+;; region7 = 25 ""
+;; region8 = 68 ""
;; gv0 = vmctx
;; 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 b3144b10ad..1c1ccb392d 100644
--- a/tests/disas/gc/null/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/null/call-indirect-and-subtyping.wat
@@ -17,15 +17,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 65cb9d5906..08c3c39aab 100644
--- a/tests/disas/gc/null/externref-globals.wat
+++ b/tests/disas/gc/null/externref-globals.wat
@@ -13,9 +13,9 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -32,9 +32,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; 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 17d1d5dc3b..e5a7204e7c 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-get.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-get.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 5b48d29f8a..01bcc8a954 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
@@ -10,15 +10,15 @@
)
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 939524096 "VMNullHeapData+0x0"
-;; region4 = 67108904 "VMStoreContext+0x28"
-;; region5 = 67108896 "VMStoreContext+0x20"
-;; region6 = 40 "VMContext+0x28"
-;; region7 = 1677721600 "TypeIdsArray+0x0"
-;; region8 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 237 ""
+;; region4 = 206 ""
+;; region5 = 196 ""
+;; region6 = 130 ""
+;; region7 = 6 ""
+;; region8 = 108 ""
;; gv0 = vmctx
;; 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 a54911faed..5f9e97237e 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-set.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-set.wat
@@ -10,11 +10,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 d574e45de0..35319f04bc 100644
--- a/tests/disas/gc/null/i31ref-globals.wat
+++ b/tests/disas/gc/null/i31ref-globals.wat
@@ -13,9 +13,9 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -32,9 +32,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; 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 1e6f926469..10ac0fad86 100644
--- a/tests/disas/gc/null/multiple-array-get.wat
+++ b/tests/disas/gc/null/multiple-array-get.wat
@@ -11,11 +11,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 71ad809cd6..c9ba3c333b 100644
--- a/tests/disas/gc/null/multiple-struct-get.wat
+++ b/tests/disas/gc/null/multiple-struct-get.wat
@@ -12,11 +12,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32, i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 5ca5bb1fd7..beb055093f 100644
--- a/tests/disas/gc/null/ref-cast.wat
+++ b/tests/disas/gc/null/ref-cast.wat
@@ -9,13 +9,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; 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 64a0d2149a..3dbdfccab0 100644
--- a/tests/disas/gc/null/ref-is-null.wat
+++ b/tests/disas/gc/null/ref-is-null.wat
@@ -11,8 +11,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,8 +29,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 bceee0f2a5..5dfb2925e8 100644
--- a/tests/disas/gc/null/ref-test-any.wat
+++ b/tests/disas/gc/null/ref-test-any.wat
@@ -11,8 +11,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,8 +29,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 ac595109e6..8027edb31e 100644
--- a/tests/disas/gc/null/ref-test-array.wat
+++ b/tests/disas/gc/null/ref-test-array.wat
@@ -8,11 +8,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 9216535a96..0e37ba601c 100644
--- a/tests/disas/gc/null/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-func-type.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 1610612752 "VMFuncRef+0x10"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 106 ""
;; gv0 = vmctx
;; 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 04eb15fb05..ac3434bd71 100644
--- a/tests/disas/gc/null/ref-test-concrete-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-type.wat
@@ -9,13 +9,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; 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 804206c05d..3d24222cd6 100644
--- a/tests/disas/gc/null/ref-test-eq.wat
+++ b/tests/disas/gc/null/ref-test-eq.wat
@@ -8,11 +8,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 e0e3feb088..07fba03d64 100644
--- a/tests/disas/gc/null/ref-test-i31.wat
+++ b/tests/disas/gc/null/ref-test-i31.wat
@@ -8,8 +8,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 69f6aa9c65..4662117ae3 100644
--- a/tests/disas/gc/null/ref-test-none.wat
+++ b/tests/disas/gc/null/ref-test-none.wat
@@ -11,8 +11,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -27,8 +27,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 46d36d15fa..a5c6e00e0b 100644
--- a/tests/disas/gc/null/ref-test-struct.wat
+++ b/tests/disas/gc/null/ref-test-struct.wat
@@ -8,11 +8,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 06682ff9e4..2dd7fcbeee 100644
--- a/tests/disas/gc/null/struct-get-guard-pages.wat
+++ b/tests/disas/gc/null/struct-get-guard-pages.wat
@@ -24,11 +24,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,11 +50,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -77,11 +77,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -104,11 +104,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 52cd3e3f97..04355d77c2 100644
--- a/tests/disas/gc/null/struct-get-no-guard-pages.wat
+++ b/tests/disas/gc/null/struct-get-no-guard-pages.wat
@@ -24,11 +24,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -56,11 +56,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -89,11 +89,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -122,11 +122,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 9bb373d9d1..ac5ae2b066 100644
--- a/tests/disas/gc/null/struct-get.wat
+++ b/tests/disas/gc/null/struct-get.wat
@@ -24,11 +24,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> f32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,11 +50,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -77,11 +77,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -104,11 +104,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 d3b1a3612f..1a9ecc10e6 100644
--- a/tests/disas/gc/null/struct-new-default.wat
+++ b/tests/disas/gc/null/struct-new-default.wat
@@ -12,15 +12,15 @@
)
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 939524096 "VMNullHeapData+0x0"
-;; region4 = 67108904 "VMStoreContext+0x28"
-;; region5 = 67108896 "VMStoreContext+0x20"
-;; region6 = 40 "VMContext+0x28"
-;; region7 = 1677721600 "TypeIdsArray+0x0"
-;; region8 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 237 ""
+;; region4 = 206 ""
+;; region5 = 196 ""
+;; region6 = 130 ""
+;; region7 = 6 ""
+;; region8 = 108 ""
;; gv0 = vmctx
;; 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 6ea9bb70e9..ade114c649 100644
--- a/tests/disas/gc/null/struct-new.wat
+++ b/tests/disas/gc/null/struct-new.wat
@@ -13,16 +13,16 @@
)
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 939524096 "VMNullHeapData+0x0"
-;; region4 = 67108904 "VMStoreContext+0x28"
-;; region5 = 67108896 "VMStoreContext+0x20"
-;; region6 = 40 "VMContext+0x28"
-;; region7 = 1677721600 "TypeIdsArray+0x0"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 237 ""
+;; region4 = 206 ""
+;; region5 = 196 ""
+;; region6 = 130 ""
+;; region7 = 6 ""
+;; region8 = 108 ""
+;; region9 = 232 ""
;; gv0 = vmctx
;; 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 2731a51afa..6b04e0e7ab 100644
--- a/tests/disas/gc/null/struct-set.wat
+++ b/tests/disas/gc/null/struct-set.wat
@@ -20,11 +20,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, f32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,11 +72,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 966f6ef112..590b4e7ff9 100644
--- a/tests/disas/gc/null/v128-fields.wat
+++ b/tests/disas/gc/null/v128-fields.wat
@@ -12,11 +12,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108896 "VMStoreContext+0x20"
-;; region3 = 67108904 "VMStoreContext+0x28"
-;; region4 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 196 ""
+;; region3 = 206 ""
+;; region4 = 108 ""
;; gv0 = vmctx
;; 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 384cecc5e9..7c088bab9a 100644
--- a/tests/disas/gc/ref-test-cast-final-type.wat
+++ b/tests/disas/gc/ref-test-cast-final-type.wat
@@ -15,13 +15,13 @@
(ref.cast (ref $s) (local.get 0)))
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -60,13 +60,13 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 40 "VMContext+0x28"
-;; region3 = 1677721600 "TypeIdsArray+0x0"
-;; region4 = 67108896 "VMStoreContext+0x20"
-;; region5 = 67108904 "VMStoreContext+0x28"
-;; region6 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 130 ""
+;; region3 = 6 ""
+;; region4 = 196 ""
+;; region5 = 206 ""
+;; region6 = 108 ""
;; gv0 = vmctx
;; 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 da7731d544..34db67d9c1 100644
--- a/tests/disas/gc/struct-new-default.wat
+++ b/tests/disas/gc/struct-new-default.wat
@@ -13,15 +13,15 @@
)
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
;; gv0 = vmctx
;; 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 13979f7f80..9f2be42fb2 100644
--- a/tests/disas/gc/struct-new.wat
+++ b/tests/disas/gc/struct-new.wat
@@ -13,16 +13,16 @@
)
;; function u0:0(i64 vmctx, i64, f32, i32, i32) -> i32 tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 32 "VMContext+0x20"
-;; region3 = 872415232 "VMCopyingHeapData+0x0"
-;; region4 = 872415236 "VMCopyingHeapData+0x4"
-;; region5 = 40 "VMContext+0x28"
-;; region6 = 1677721600 "TypeIdsArray+0x0"
-;; region7 = 67108896 "VMStoreContext+0x20"
-;; region8 = 536870912 "GcHeap"
-;; region9 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 65 ""
+;; region3 = 177 ""
+;; region4 = 98 ""
+;; region5 = 130 ""
+;; region6 = 6 ""
+;; region7 = 196 ""
+;; region8 = 108 ""
+;; region9 = 232 ""
;; gv0 = vmctx
;; 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 ae5a983903..0bc9b4444c 100644
--- a/tests/disas/gc/typed-select-and-stack-maps.wat
+++ b/tests/disas/gc/typed-select-and-stack-maps.wat
@@ -41,11 +41,11 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
;; ss0 = explicit_slot 4, align = 4
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1207959560 "VMFunctionImport+0x8"
-;; region4 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 68 ""
+;; region4 = 232 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -71,10 +71,10 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1207959576 "VMFunctionImport+0x18"
-;; region3 = 1207959560 "VMFunctionImport+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 68 ""
;; gv0 = vmctx
;; 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 6776b51541..9d324da7b2 100644
--- a/tests/disas/global-get.wat
+++ b/tests/disas/global-get.wat
@@ -31,10 +31,10 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 87 ""
;; 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 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1476395008 "VMGlobalImport+0x0"
-;; region3 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 44 ""
+;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -69,8 +69,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -85,9 +85,9 @@
;; }
;;
;; function u0:3(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762049 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(1))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 135 ""
;; gv0 = vmctx
;; 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 b9ed85c5df..40cc8e6974 100644
--- a/tests/disas/globals.wat
+++ b/tests/disas/globals.wat
@@ -10,12 +10,12 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+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))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 171 ""
;; gv0 = vmctx
;; 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 5c269be556..7baf840142 100644
--- a/tests/disas/guest-debugging.wat
+++ b/tests/disas/guest-debugging.wat
@@ -20,9 +20,9 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; ss0 = explicit_slot 28, key = 0
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1543503872 "Stack(ss0)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 232 ""
;; 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 19fb142a4e..7147799b66 100644
--- a/tests/disas/i128-cmp.wat
+++ b/tests/disas/i128-cmp.wat
@@ -100,8 +100,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -119,8 +119,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -138,8 +138,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -157,8 +157,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -176,8 +176,8 @@
;; }
;;
;; function u0:4(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -195,8 +195,8 @@
;; }
;;
;; function u0:5(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -214,8 +214,8 @@
;; }
;;
;; function u0:6(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -233,8 +233,8 @@
;; }
;;
;; function u0:7(i64 vmctx, i64, i64, i64, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 22c56fe5e8..6f63ba49be 100644
--- a/tests/disas/i32-load.wat
+++ b/tests/disas/i32-load.wat
@@ -9,11 +9,11 @@
i32.load))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 e00f4e0c59..acbb9f3592 100644
--- a/tests/disas/i32-load16-s.wat
+++ b/tests/disas/i32-load16-s.wat
@@ -9,11 +9,11 @@
i32.load16_s))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 f0dffb1e7d..bf854f7545 100644
--- a/tests/disas/i32-load16-u.wat
+++ b/tests/disas/i32-load16-u.wat
@@ -9,11 +9,11 @@
i32.load16_u))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 28849cd154..d2192abb98 100644
--- a/tests/disas/i32-load8-s.wat
+++ b/tests/disas/i32-load8-s.wat
@@ -9,11 +9,11 @@
i32.load8_s))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 4764d4ddcf..2171a30d4f 100644
--- a/tests/disas/i32-load8-u.wat
+++ b/tests/disas/i32-load8-u.wat
@@ -9,11 +9,11 @@
i32.load8_u))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 d3ee06cf51..14a4d99910 100644
--- a/tests/disas/i32-store.wat
+++ b/tests/disas/i32-store.wat
@@ -10,11 +10,11 @@
i32.store))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 6c78b6ceae..f551076d54 100644
--- a/tests/disas/i32-store16.wat
+++ b/tests/disas/i32-store16.wat
@@ -10,11 +10,11 @@
i32.store16))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 52aac2f740..ba3d400bdd 100644
--- a/tests/disas/i32-store8.wat
+++ b/tests/disas/i32-store8.wat
@@ -10,11 +10,11 @@
i32.store8))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 4c79eb953c..a346630251 100644
--- a/tests/disas/i64-load.wat
+++ b/tests/disas/i64-load.wat
@@ -9,11 +9,11 @@
i64.load))
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2a8ce13168..da490a1631 100644
--- a/tests/disas/i64-load16-s.wat
+++ b/tests/disas/i64-load16-s.wat
@@ -9,11 +9,11 @@
i64.load16_s))
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 9170210cbd..3a3551e5f6 100644
--- a/tests/disas/i64-load16-u.wat
+++ b/tests/disas/i64-load16-u.wat
@@ -9,11 +9,11 @@
i64.load16_u))
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 9027f8d02c..da688611bd 100644
--- a/tests/disas/i64-load8-s.wat
+++ b/tests/disas/i64-load8-s.wat
@@ -9,11 +9,11 @@
i64.load8_s))
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3d028d97d7..bf6da7c253 100644
--- a/tests/disas/i64-load8-u.wat
+++ b/tests/disas/i64-load8-u.wat
@@ -9,11 +9,11 @@
i64.load8_u))
;; function u0:0(i64 vmctx, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 f534e27bf5..18e5790234 100644
--- a/tests/disas/i64-store.wat
+++ b/tests/disas/i64-store.wat
@@ -10,11 +10,11 @@
i64.store))
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 bc655f5c0e..3fa86346a0 100644
--- a/tests/disas/i64-store16.wat
+++ b/tests/disas/i64-store16.wat
@@ -10,11 +10,11 @@
i64.store16))
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 35b9943165..ef63c8f21c 100644
--- a/tests/disas/i64-store32.wat
+++ b/tests/disas/i64-store32.wat
@@ -10,11 +10,11 @@
i64.store32))
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 c6f784379b..39b40507a4 100644
--- a/tests/disas/i64-store8.wat
+++ b/tests/disas/i64-store8.wat
@@ -10,11 +10,11 @@
i64.store8))
;; function u0:0(i64 vmctx, i64, i32, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2a3ede41eb..7ce1f2ff8e 100644
--- a/tests/disas/icall-loop.wat
+++ b/tests/disas/icall-loop.wat
@@ -23,15 +23,15 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -78,15 +78,15 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 a3945b016e..c09643a28d 100644
--- a/tests/disas/icall-simd.wat
+++ b/tests/disas/icall-simd.wat
@@ -9,15 +9,15 @@
)
;; function u0:0(i64 vmctx, i64, i32, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 59e082f193..3fff7193e4 100644
--- a/tests/disas/icall.wat
+++ b/tests/disas/icall.wat
@@ -9,15 +9,15 @@
)
;; function u0:0(i64 vmctx, i64, i32, f32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 d93125dc68..a4e8b3fdbc 100644
--- a/tests/disas/idempotent-store.wat
+++ b/tests/disas/idempotent-store.wat
@@ -15,11 +15,11 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 65ffbe5984..f62fb0f7d6 100644
--- a/tests/disas/if-reachability-translation-0.wat
+++ b/tests/disas/if-reachability-translation-0.wat
@@ -14,8 +14,8 @@
i32.const 0))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 1ccdb967ff..925e926a6c 100644
--- a/tests/disas/if-reachability-translation-1.wat
+++ b/tests/disas/if-reachability-translation-1.wat
@@ -14,8 +14,8 @@
i32.const 0))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 0db7d85007..8f33c41964 100644
--- a/tests/disas/if-reachability-translation-2.wat
+++ b/tests/disas/if-reachability-translation-2.wat
@@ -14,8 +14,8 @@
i32.const 0))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 8612a7a235..2269916ac6 100644
--- a/tests/disas/if-reachability-translation-3.wat
+++ b/tests/disas/if-reachability-translation-3.wat
@@ -14,8 +14,8 @@
i32.const 0))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 1a9dc2d7a8..c42c5808b9 100644
--- a/tests/disas/if-reachability-translation-4.wat
+++ b/tests/disas/if-reachability-translation-4.wat
@@ -14,8 +14,8 @@
i32.const 0))
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 5787e178b6..e246b390f2 100644
--- a/tests/disas/if-reachability-translation-5.wat
+++ b/tests/disas/if-reachability-translation-5.wat
@@ -16,8 +16,8 @@
i32.const 0))
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 3841b6e040..bfc8d68c17 100644
--- a/tests/disas/if-reachability-translation-6.wat
+++ b/tests/disas/if-reachability-translation-6.wat
@@ -16,8 +16,8 @@
i32.const 0))
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 85dd980ea3..637bba8106 100644
--- a/tests/disas/if-unreachable-else-params-2.wat
+++ b/tests/disas/if-unreachable-else-params-2.wat
@@ -20,11 +20,11 @@
(export "memory" (memory 0)))
;; function u0:0(i64 vmctx, i64, i32, i32) -> f64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; 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 51e7fdc63c..c5443b9eb4 100644
--- a/tests/disas/if-unreachable-else-params.wat
+++ b/tests/disas/if-unreachable-else-params.wat
@@ -43,11 +43,11 @@
(export "memory" (memory 0)))
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; 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 d216ca74ab..83ff5f9e84 100644
--- a/tests/disas/indirect-call-no-caching.wat
+++ b/tests/disas/indirect-call-no-caching.wat
@@ -21,8 +21,8 @@
(elem (i32.const 1) func $f1 $f2 $f3))
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -37,8 +37,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -53,8 +53,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -69,15 +69,15 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 7ce3492d26..8498cf1b69 100644
--- a/tests/disas/intra-module-inlining.wat
+++ b/tests/disas/intra-module-inlining.wat
@@ -10,8 +10,8 @@
(call 0)))
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -26,8 +26,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 2d5a3645ae..8db47c76c5 100644
--- a/tests/disas/issue-10929-v128-icmp-egraphs.wat
+++ b/tests/disas/issue-10929-v128-icmp-egraphs.wat
@@ -11,8 +11,8 @@
i8x16.ne)
)
;; function u0:0(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 f62c4414a9..fce61775a0 100644
--- a/tests/disas/issue-5696.wat
+++ b/tests/disas/issue-5696.wat
@@ -10,8 +10,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i64) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 9c0044b028..2aa9d149d8 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8d7e52e515..9544bcb8f9 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 e4f3720e25..4e4f4203e3 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 4b2d8fa36c..a986aee945 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 790a376240..ccdd34fe9a 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 6162b34de4..6daaed1af5 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 a430bc0e33..92bd44e11a 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 667fbc2e2c..9ee7fe9323 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,11 +49,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 be83c3291f..2cc2e4f2dc 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,11 +49,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 307902c2fd..22f44d7664 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 984b8504c7..a152a14310 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,11 +49,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 7825e6dbc1..8163efc0c2 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,11 +49,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 73a21952af..5652b96ac4 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 f0e54c33ec..7d38a1ceb4 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 b56774e1bf..2a7affd8f9 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8f59f5d296..f672d999e4 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 246bbbd498..5d8dd50784 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3563721b32..626429833b 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 9eed6bfaea..2f5d2bc5e4 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 9a3303bdcb..5478f4603a 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2bb8f4f5cb..98ecbea6ef 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8398a318a6..29b37aa546 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 485ed12f61..0b20e908c4 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ebccfcc237..60fe986caa 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 dbf739b50e..28cbfd4896 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 921f32075c..5cb8538949 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 dca2b258b1..7a9b4201ae 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 a90dde2a9d..82980677b5 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 d0e7cda5bf..4e9db4a679 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 065be4b82f..272789bd40 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 d68ad81ac2..42c44bffc0 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2e9e6bce7b..5cef3b5a86 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 12a29fde10..ee99d1257d 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 bbaa198901..22edafd007 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 05f297b32b..b215358cc3 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ad0cb5594e..509f414f04 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -48,11 +48,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 eef14e79d3..bf9b0a7fad 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 025c21933f..87f208d42e 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 211bafd51e..8b1b3c5591 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3efd391cd2..68a7b0ad14 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 507ede1c3d..a7da9f24f3 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ce7779c48c..8f55a6248e 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 e77195d7b6..c4fa26fa70 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2495c786e5..c5ad7c739b 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 7d3cbab0ac..5a0d77fee8 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2f31540c44..4d186928b1 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8713c6e348..03827f2359 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ab05e756ad..0419923067 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 9aabcde409..531d369466 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 678847c153..a69400d8c2 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ea86bd149a..721bba01e5 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 0f94b01c78..829e46e698 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,11 +41,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 cb2a1f0d6b..d68dde733d 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 fcb393ad1b..3ceefb9202 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 5721a18586..e65acb1971 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 5172e05d9f..07aa0129d7 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 988a78c357..158d69e73f 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8c4aee640b..1b3bb19dc6 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,11 +41,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 a96c34c825..1f8ae22342 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 35d887fdca..aa0557d5b1 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2a1f36ddfd..abfacb7c7a 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,11 +41,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3f90d85270..036f984746 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3eb4620bf9..17daf9f6b2 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2e814f514d..80dd6e3e60 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,11 +41,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 7be8641bad..3e5d489185 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 17ed8a94b0..484e8a65de 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8044c78f79..6e8a3a48e5 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,11 +41,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 95df1bf1c5..e09a5c5f3e 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 e905a0b626..8eed8093e3 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 5edc9f61f3..b6b174d0c0 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -41,11 +41,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 2a60284153..055643265b 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3f00817b31..7aa328b13e 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 459299696b..10aef74548 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 7fd01d3945..225f7f1f81 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 e54675a931..7745edad8d 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 de8517a79e..7dac2f62ce 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 1aa7d20d51..8394df48c5 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 589727148e..5f90a9528d 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 d3cea23397..5503938bc0 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 876ff32fa5..289957d116 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 84884a0ecd..6e1a5e398b 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8696422787..7940be5912 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3c1efc83ad..7bd4b8be09 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 c5b9a07671..6e8a158078 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ea073317fc..47a000f58d 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 1a3fb048fb..f7cc573605 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 613d276457..de4b193d96 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 1ae5ed273b..a0ef159d5f 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -43,11 +43,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 dd668aace6..625e03f2f8 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 fc3ca45ece..6c96211385 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ccb7665ed1..ac28dbae43 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
@@ -19,11 +19,11 @@
i32.load offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 4f375f459e..a395555c57 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
@@ -19,11 +19,11 @@
i32.load offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 15b140e83b..00db59a122 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
@@ -19,11 +19,11 @@
i32.load offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 748ef00c7f..88f4fb7993 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -44,11 +44,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 ca8b58e580..ac0d0b9b19 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0x1000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 4956df8b43..b56308fe54 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
@@ -19,11 +19,11 @@
i32.load8_u offset=0xffff0000))
;; function u0:0(i64 vmctx, i64, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 81e78d5fbf..fcb83afe67 100644
--- a/tests/disas/memory-copy-epochs.wat
+++ b/tests/disas/memory-copy-epochs.wat
@@ -9,13 +9,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 24 "VMContext+0x18"
-;; region3 = 1744830464 "EpochCounter+0x0"
-;; region4 = 67108872 "VMStoreContext+0x8"
-;; region5 = 603979776 "VMMemoryDefinition+0x0"
-;; region6 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 235 ""
+;; region3 = 18 ""
+;; region4 = 109 ""
+;; region5 = 215 ""
+;; region6 = 105 ""
;; gv0 = vmctx
;; 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-const-len.wat b/tests/disas/memory-copy-fuel-const-len.wat
index c8cea81fb2..275a4dc9e7 100644
--- a/tests/disas/memory-copy-fuel-const-len.wat
+++ b/tests/disas/memory-copy-fuel-const-len.wat
@@ -15,12 +15,12 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108864 "VMStoreContext+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 7 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 171 ""
;; 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:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108864 "VMStoreContext+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 7 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -121,11 +121,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108864 "VMStoreContext+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 7 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
;; gv0 = vmctx
;; 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 624d063e22..fb711f1d7d 100644
--- a/tests/disas/memory-copy-fuel.wat
+++ b/tests/disas/memory-copy-fuel.wat
@@ -9,11 +9,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108864 "VMStoreContext+0x0"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 7 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
;; gv0 = vmctx
;; 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 1f1bf7efac..ac4030a06b 100644
--- a/tests/disas/memory-copy-inline.wat
+++ b/tests/disas/memory-copy-inline.wat
@@ -12,11 +12,11 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 1ddbca1186..439e68f586 100644
--- a/tests/disas/memory-min-max-same.wat
+++ b/tests/disas/memory-min-max-same.wat
@@ -34,13 +34,13 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; 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))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 25 ""
+;; region3 = 68 ""
+;; region4 = 215 ""
+;; region5 = 105 ""
+;; region6 = 171 ""
;; gv0 = vmctx
;; 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 d52b954d40..acaad40374 100644
--- a/tests/disas/memory.wat
+++ b/tests/disas/memory.wat
@@ -13,11 +13,11 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8b2dd7206d..ab6ada76d7 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 af4e249ade..cb369966d1 100644
--- a/tests/disas/memory_copy_host64.wat
+++ b/tests/disas/memory_copy_host64.wat
@@ -50,10 +50,10 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; 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 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -118,10 +118,10 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -152,10 +152,10 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i64, i64, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -182,10 +182,10 @@
;; }
;;
;; function u0:4(i64 vmctx, i64, i64, i64, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -214,10 +214,10 @@
;; }
;;
;; function u0:5(i64 vmctx, i64, i32, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; 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 9a3de66d73..87d7d8f38e 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 = 603979776 "VMMemoryDefinition+0x0"
-;; region1 = 603979780 "VMMemoryDefinition+0x4"
+;; region0 = 215 ""
+;; region1 = 153 ""
;; 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 48b7d9f600..272a199391 100644
--- a/tests/disas/memory_fill_host64.wat
+++ b/tests/disas/memory_fill_host64.wat
@@ -44,10 +44,10 @@
)
)
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; 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:1(i64 vmctx, i64, i64, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -100,10 +100,10 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -129,10 +129,10 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i64, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -156,10 +156,10 @@
;; }
;;
;; function u0:4(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
;; gv0 = vmctx
;; 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 9d081b8116..cb44c0d482 100644
--- a/tests/disas/multi-0.wat
+++ b/tests/disas/multi-0.wat
@@ -5,8 +5,8 @@
(local.get 0) (local.get 0)))
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 37914c4d49..0e6ea38b6f 100644
--- a/tests/disas/multi-1.wat
+++ b/tests/disas/multi-1.wat
@@ -8,8 +8,8 @@
(f64.const 1234.5))))
;; function u0:0(i64 vmctx, i64, i64, i32) -> i32, i64, f64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 01f6fe9537..a931be7087 100644
--- a/tests/disas/multi-10.wat
+++ b/tests/disas/multi-10.wat
@@ -12,8 +12,8 @@
(i64.const -2)))))
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 0bd4cb1cef..1e5b35ac12 100644
--- a/tests/disas/multi-11.wat
+++ b/tests/disas/multi-11.wat
@@ -9,8 +9,8 @@
return)))
;; function u0:0(i64 vmctx, i64, i64) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 67f5f6c5f6..a9575b4ab6 100644
--- a/tests/disas/multi-12.wat
+++ b/tests/disas/multi-12.wat
@@ -11,8 +11,8 @@
return)))
;; function u0:0(i64 vmctx, i64, i64, i64, i64) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 bb40c3ee70..76da964634 100644
--- a/tests/disas/multi-13.wat
+++ b/tests/disas/multi-13.wat
@@ -12,8 +12,8 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 a0e0f788f9..3801b6f6c6 100644
--- a/tests/disas/multi-14.wat
+++ b/tests/disas/multi-14.wat
@@ -12,8 +12,8 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 97caeb773d..97517c98f3 100644
--- a/tests/disas/multi-15.wat
+++ b/tests/disas/multi-15.wat
@@ -24,8 +24,8 @@
)
;; 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 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 7fa7cd8847..e618173d2f 100644
--- a/tests/disas/multi-16.wat
+++ b/tests/disas/multi-16.wat
@@ -11,8 +11,8 @@
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 e57e1de7bd..dd36cb9e7e 100644
--- a/tests/disas/multi-17.wat
+++ b/tests/disas/multi-17.wat
@@ -28,8 +28,8 @@
(export "main" (func $main)))
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 2022c2f994..447ce95bb2 100644
--- a/tests/disas/multi-2.wat
+++ b/tests/disas/multi-2.wat
@@ -8,8 +8,8 @@
return)))
;; function u0:0(i64 vmctx, i64, i64, i64) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 ed9c29c6b6..fb7c0d97ad 100644
--- a/tests/disas/multi-3.wat
+++ b/tests/disas/multi-3.wat
@@ -15,8 +15,8 @@
(i64.const 0)))))
;; function u0:0(i64 vmctx, i64, i32, i64, i64) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 31c54f3d77..7c48005625 100644
--- a/tests/disas/multi-4.wat
+++ b/tests/disas/multi-4.wat
@@ -15,8 +15,8 @@
i64.const 2))))
;; function u0:0(i64 vmctx, i64, i32, i64, i64) -> i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 a53e9b6894..a0ca54a097 100644
--- a/tests/disas/multi-5.wat
+++ b/tests/disas/multi-5.wat
@@ -13,8 +13,8 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 1a3a072ab9..2c0d30a919 100644
--- a/tests/disas/multi-6.wat
+++ b/tests/disas/multi-6.wat
@@ -13,8 +13,8 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 297215109b..0b5943b172 100644
--- a/tests/disas/multi-7.wat
+++ b/tests/disas/multi-7.wat
@@ -11,8 +11,8 @@
(i64.const -1)))))
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 d971947d4c..ddb92252bc 100644
--- a/tests/disas/multi-8.wat
+++ b/tests/disas/multi-8.wat
@@ -14,8 +14,8 @@
(i64.const -2)))))
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 55b992eaeb..7a9d61336e 100644
--- a/tests/disas/multi-9.wat
+++ b/tests/disas/multi-9.wat
@@ -17,8 +17,8 @@
(i64.const -2)))))
;; function u0:0(i64 vmctx, i64, i64, i32) -> i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 871c6a693e..ebf0ef9654 100644
--- a/tests/disas/non-fixed-size-memory.wat
+++ b/tests/disas/non-fixed-size-memory.wat
@@ -21,11 +21,11 @@
i32.load8_u offset=0))
;; function u0:0(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -46,11 +46,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 8f2ab7b1f3..7ed98aa563 100644
--- a/tests/disas/nullref.wat
+++ b/tests/disas/nullref.wat
@@ -13,8 +13,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,8 +29,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 0cd07c1e5a..c90e170954 100644
--- a/tests/disas/passive-data.wat
+++ b/tests/disas/passive-data.wat
@@ -14,12 +14,12 @@
data.drop $passive))
;; function u0:0(i64 vmctx, i64, i32, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 152 "VMContext+0x98"
-;; region5 = 144 "VMContext+0x90"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 124 ""
+;; region5 = 31 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -62,9 +62,9 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 152 "VMContext+0x98"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 124 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/pic.wat b/tests/disas/pic.wat
index 420514c066..c95162d5c1 100644
--- a/tests/disas/pic.wat
+++ b/tests/disas/pic.wat
@@ -48,11 +48,11 @@
)
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; 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:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+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"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 171 ""
+;; region6 = 25 ""
+;; region7 = 68 ""
;; gv0 = vmctx
;; 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 6a4e91f1cd..8b6e28452c 100644
--- a/tests/disas/pr2303.wat
+++ b/tests/disas/pr2303.wat
@@ -17,11 +17,11 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 134217728 "PublicMemory"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 61 ""
;; gv0 = vmctx
;; 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 abca108c8e..e1619ab0f8 100644
--- a/tests/disas/pr2559.wat
+++ b/tests/disas/pr2559.wat
@@ -53,8 +53,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -95,8 +95,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i8x16, i8x16, i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 bb9fc978a8..1eee75d24c 100644
--- a/tests/disas/readonly-funcrefs.wat
+++ b/tests/disas/readonly-funcrefs.wat
@@ -19,8 +19,8 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -34,15 +34,15 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 40 "VMContext+0x28"
-;; region5 = 1677721600 "TypeIdsArray+0x0"
-;; region6 = 1610612752 "VMFuncRef+0x10"
-;; region7 = 1610612744 "VMFuncRef+0x8"
-;; region8 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 130 ""
+;; region5 = 6 ""
+;; region6 = 106 ""
+;; region7 = 116 ""
+;; region8 = 60 ""
;; gv0 = vmctx
;; 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 4c7b3ff4e8..07f04c629d 100644
--- a/tests/disas/readonly-heap-base-pointer1.wat
+++ b/tests/disas/readonly-heap-base-pointer1.wat
@@ -8,11 +8,11 @@
(i32.load (local.get 0)))
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 f870bcd2ec..d90793f2a8 100644
--- a/tests/disas/readonly-heap-base-pointer2.wat
+++ b/tests/disas/readonly-heap-base-pointer2.wat
@@ -8,12 +8,12 @@
(i32.load (local.get 0)))
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 48 "VMContext+0x30"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
-;; region4 = 603979784 "VMMemoryDefinition+0x8"
-;; region5 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 136 ""
+;; region3 = 215 ""
+;; region4 = 105 ""
+;; region5 = 171 ""
;; gv0 = vmctx
;; 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 18f0e9a525..7528851504 100644
--- a/tests/disas/readonly-heap-base-pointer3.wat
+++ b/tests/disas/readonly-heap-base-pointer3.wat
@@ -8,11 +8,11 @@
(i32.load (local.get 0)))
)
;; function u0:0(i64 vmctx, i64, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 4e03d79ee7..dc4671e6ca 100644
--- a/tests/disas/ref-func-0.wat
+++ b/tests/disas/ref-func-0.wat
@@ -14,9 +14,9 @@
(global (export "funcref-local") funcref (ref.func $local)))
;; function u0:0(i64 vmctx, i64) -> i32, i32, i64, i64 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 402653184 "PublicGlobal"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 87 ""
;; gv0 = vmctx
;; 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 03db5c9558..4dec521ad3 100644
--- a/tests/disas/riscv64-component-builtins.wat
+++ b/tests/disas/riscv64-component-builtins.wat
@@ -11,14 +11,14 @@
)
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; 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 = 1811939656 "BuiltinFunctionsArray+0x148"
+;; region0 = 123 ""
+;; region1 = 85 ""
+;; region2 = 72 ""
+;; region3 = 38 ""
+;; region4 = 245 ""
+;; region5 = 117 ""
+;; region6 = 12 ""
+;; region7 = 184 ""
;; 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 ec9e0a157b..e074c5d58b 100644
--- a/tests/disas/select.wat
+++ b/tests/disas/select.wat
@@ -21,8 +21,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -40,8 +40,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -59,8 +59,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 ae9ed774cd..e16142eb36 100644
--- a/tests/disas/simd-store.wat
+++ b/tests/disas/simd-store.wat
@@ -85,11 +85,11 @@
)
;; function u0:0(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -109,11 +109,11 @@
;; }
;;
;; function u0:10(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -135,11 +135,11 @@
;; }
;;
;; function u0:11(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -161,11 +161,11 @@
;; }
;;
;; function u0:12(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -185,11 +185,11 @@
;; }
;;
;; function u0:13(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -211,11 +211,11 @@
;; }
;;
;; function u0:14(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -237,11 +237,11 @@
;; }
;;
;; function u0:15(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -261,11 +261,11 @@
;; }
;;
;; function u0:16(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -287,11 +287,11 @@
;; }
;;
;; function u0:17(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -313,11 +313,11 @@
;; }
;;
;; function u0:18(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -339,11 +339,11 @@
;; }
;;
;; function u0:19(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -363,11 +363,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -389,11 +389,11 @@
;; }
;;
;; function u0:20(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -415,11 +415,11 @@
;; }
;;
;; function u0:21(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -441,11 +441,11 @@
;; }
;;
;; function u0:22(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -467,11 +467,11 @@
;; }
;;
;; function u0:23(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -493,11 +493,11 @@
;; }
;;
;; function u0:24(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -519,11 +519,11 @@
;; }
;;
;; function u0:25(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -545,11 +545,11 @@
;; }
;;
;; function u0:26(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -571,11 +571,11 @@
;; }
;;
;; function u0:27(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -597,11 +597,11 @@
;; }
;;
;; function u0:28(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -623,11 +623,11 @@
;; }
;;
;; function u0:29(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -649,11 +649,11 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -675,11 +675,11 @@
;; }
;;
;; function u0:30(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -701,11 +701,11 @@
;; }
;;
;; function u0:31(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -727,11 +727,11 @@
;; }
;;
;; function u0:32(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -753,11 +753,11 @@
;; }
;;
;; function u0:33(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -779,11 +779,11 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -805,11 +805,11 @@
;; }
;;
;; function u0:4(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -829,11 +829,11 @@
;; }
;;
;; function u0:5(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -855,11 +855,11 @@
;; }
;;
;; function u0:6(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -881,11 +881,11 @@
;; }
;;
;; function u0:7(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -907,11 +907,11 @@
;; }
;;
;; function u0:8(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -931,11 +931,11 @@
;; }
;;
;; function u0:9(i64 vmctx, i64, i8x16) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 603979776 "VMMemoryDefinition+0x0"
-;; region3 = 603979784 "VMMemoryDefinition+0x8"
-;; region4 = 201326592 "DefinedMemory(StaticModuleIndex(0), DefinedMemoryIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 215 ""
+;; region3 = 105 ""
+;; region4 = 171 ""
;; gv0 = vmctx
;; 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 3eb80c5e81..bf37f3c0fe 100644
--- a/tests/disas/simd.wat
+++ b/tests/disas/simd.wat
@@ -31,8 +31,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -49,8 +49,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -70,8 +70,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -89,8 +89,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 c2b9233b42..68afacd070 100644
--- a/tests/disas/simple.wat
+++ b/tests/disas/simple.wat
@@ -19,8 +19,8 @@
)
)
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -36,8 +36,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,8 +50,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 340af188d2..2606be8d12 100644
--- a/tests/disas/stack-switching/resume-suspend-data-passing.wat
+++ b/tests/disas/stack-switching/resume-suspend-data-passing.wat
@@ -39,18 +39,18 @@
;; function u0:0(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 16, align = 65536
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108952 "VMStoreContext+0x58"
-;; region3 = 1073741888 "VMContRef+0x40"
-;; region4 = 2550136840 "VMHostArray+0x8"
-;; region5 = 2483028024 "VMCommonStackInformation+0x38"
-;; region6 = 1140850688 "ContinuationStackMemory+0x0"
-;; region7 = 1073741904 "VMContRef+0x50"
-;; region8 = 2550136836 "VMHostArray+0x4"
-;; region9 = 2550136832 "VMHostArray+0x0"
-;; region10 = 2483028000 "VMCommonStackInformation+0x20"
-;; region11 = 1073741920 "VMContRef+0x60"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 106 ""
+;; region3 = 225 ""
+;; region4 = 214 ""
+;; region5 = 13 ""
+;; region6 = 55 ""
+;; region7 = 153 ""
+;; region8 = 118 ""
+;; region9 = 82 ""
+;; region10 = 255 ""
+;; region11 = 211 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -180,26 +180,25 @@
;;
;; function u0:1(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1073741912 "VMContRef+0x58"
-;; region3 = 1073741904 "VMContRef+0x50"
-;; region4 = 67108952 "VMStoreContext+0x58"
-;; region5 = 1073741888 "VMContRef+0x40"
-;; region6 = 2483028000 "VMCommonStackInformation+0x20"
-;; region7 = 67108936 "VMStoreContext+0x48"
-;; region8 = 67108928 "VMStoreContext+0x40"
-;; region9 = 67108944 "VMStoreContext+0x50"
-;; region10 = 2415919112 "VMStackLimits+0x8"
-;; region11 = 2415919120 "VMStackLimits+0x10"
-;; region12 = 2415919128 "VMStackLimits+0x18"
-;; region13 = 2415919104 "VMStackLimits+0x0"
-;; region14 = 2550136836 "VMHostArray+0x4"
-;; region15 = 2550136840 "VMHostArray+0x8"
-;; region16 = 1140850688 "ContinuationStackMemory+0x0"
-;; region17 = 2550136832 "VMHostArray+0x0"
-;; region18 = 2483028024 "VMCommonStackInformation+0x38"
-;; region19 = 1073741920 "VMContRef+0x60"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 206 ""
+;; region3 = 153 ""
+;; region4 = 106 ""
+;; region5 = 225 ""
+;; region6 = 255 ""
+;; region7 = 231 ""
+;; region8 = 243 ""
+;; region9 = 209 ""
+;; region10 = 23 ""
+;; region11 = 224 ""
+;; region12 = 13 ""
+;; region13 = 179 ""
+;; region14 = 118 ""
+;; region15 = 214 ""
+;; region16 = 55 ""
+;; region17 = 82 ""
+;; region18 = 211 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -289,10 +288,10 @@
;; v155 = iadd.i64 v0, v52 ; v52 = 48
;; @0062 store notrap aligned region16 v155, v51
;; @0062 store notrap aligned region17 v151, v154 ; v151 = 1
-;; @0062 store notrap aligned region18 v151, v27+56 ; v151 = 1
+;; @0062 store notrap aligned region12 v151, v27+56 ; v151 = 1
;; v156 = iconst.i64 96
;; v157 = iadd v24, v156 ; v156 = 96
-;; @0062 v62 = load.i64 notrap aligned region19 v157
+;; @0062 v62 = load.i64 notrap aligned region18 v157
;; v158 = iconst.i64 -24
;; v159 = iadd v62, v158 ; v158 = -24
;; v160 = iconst.i64 0x0001_0000_0000
@@ -306,7 +305,7 @@
;; @0062 store notrap aligned region17 v161, v154 ; v161 = 0
;; @0062 store notrap aligned region14 v161, v154+4 ; v161 = 0
;; @0062 store notrap aligned region15 v149, v154+8 ; v149 = 0
-;; @0062 store notrap aligned region18 v149, v27+56 ; v149 = 0
+;; @0062 store notrap aligned region12 v149, v27+56 ; v149 = 0
;; @0062 brif v65, block9, block6
;;
;; block9:
diff --git a/tests/disas/stack-switching/resume-suspend.wat b/tests/disas/stack-switching/resume-suspend.wat
index 7f567d361b..bff2ab520a 100644
--- a/tests/disas/stack-switching/resume-suspend.wat
+++ b/tests/disas/stack-switching/resume-suspend.wat
@@ -24,18 +24,18 @@
;; function u0:0(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 16, align = 65536
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 67108952 "VMStoreContext+0x58"
-;; region3 = 1073741888 "VMContRef+0x40"
-;; region4 = 2550136840 "VMHostArray+0x8"
-;; region5 = 2483028024 "VMCommonStackInformation+0x38"
-;; region6 = 1140850688 "ContinuationStackMemory+0x0"
-;; region7 = 1073741904 "VMContRef+0x50"
-;; region8 = 2550136836 "VMHostArray+0x4"
-;; region9 = 2483028000 "VMCommonStackInformation+0x20"
-;; region10 = 1073741920 "VMContRef+0x60"
-;; region11 = 2550136832 "VMHostArray+0x0"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 106 ""
+;; region3 = 225 ""
+;; region4 = 214 ""
+;; region5 = 13 ""
+;; region6 = 55 ""
+;; region7 = 153 ""
+;; region8 = 118 ""
+;; region9 = 255 ""
+;; region10 = 211 ""
+;; region11 = 82 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -146,26 +146,25 @@
;;
;; function u0:1(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1073741912 "VMContRef+0x58"
-;; region3 = 1073741904 "VMContRef+0x50"
-;; region4 = 67108952 "VMStoreContext+0x58"
-;; region5 = 1073741888 "VMContRef+0x40"
-;; region6 = 2483028000 "VMCommonStackInformation+0x20"
-;; region7 = 67108936 "VMStoreContext+0x48"
-;; region8 = 67108928 "VMStoreContext+0x40"
-;; region9 = 67108944 "VMStoreContext+0x50"
-;; region10 = 2415919112 "VMStackLimits+0x8"
-;; region11 = 2415919120 "VMStackLimits+0x10"
-;; region12 = 2415919128 "VMStackLimits+0x18"
-;; region13 = 2415919104 "VMStackLimits+0x0"
-;; region14 = 2550136836 "VMHostArray+0x4"
-;; region15 = 2550136840 "VMHostArray+0x8"
-;; region16 = 1140850688 "ContinuationStackMemory+0x0"
-;; region17 = 2550136832 "VMHostArray+0x0"
-;; region18 = 2483028024 "VMCommonStackInformation+0x38"
-;; region19 = 1073741920 "VMContRef+0x60"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 206 ""
+;; region3 = 153 ""
+;; region4 = 106 ""
+;; region5 = 225 ""
+;; region6 = 255 ""
+;; region7 = 231 ""
+;; region8 = 243 ""
+;; region9 = 209 ""
+;; region10 = 23 ""
+;; region11 = 224 ""
+;; region12 = 13 ""
+;; region13 = 179 ""
+;; region14 = 118 ""
+;; region15 = 214 ""
+;; region16 = 55 ""
+;; region17 = 82 ""
+;; region18 = 211 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -242,10 +241,10 @@
;; @004e v59 = iadd.i64 v0, v58 ; v58 = 48
;; @004e store notrap aligned region16 v59, v57
;; @004e store notrap aligned region17 v39, v55 ; v39 = 1
-;; @004e store notrap aligned region18 v39, v33+56 ; v39 = 1
+;; @004e store notrap aligned region12 v39, v33+56 ; v39 = 1
;; @004e v66 = iconst.i64 96
;; @004e v67 = iadd v30, v66 ; v66 = 96
-;; @004e v68 = load.i64 notrap aligned region19 v67
+;; @004e v68 = load.i64 notrap aligned region18 v67
;; @004e v69 = iconst.i64 -24
;; @004e v70 = iadd v68, v69 ; v69 = -24
;; v161 = iconst.i64 0x0001_0000_0000
@@ -259,7 +258,7 @@
;; @004e store notrap aligned region17 v164, v55 ; v164 = 0
;; @004e store notrap aligned region14 v164, v55+4 ; v164 = 0
;; @004e store notrap aligned region15 v2, v55+8 ; v2 = 0
-;; @004e store notrap aligned region18 v2, v33+56 ; v2 = 0
+;; @004e store notrap aligned region12 v2, v33+56 ; v2 = 0
;; @004e brif v71, block7, block4
;;
;; block7:
diff --git a/tests/disas/stack-switching/symmetric-switch.wat b/tests/disas/stack-switching/symmetric-switch.wat
index eac04c9a81..8cc5e60c08 100644
--- a/tests/disas/stack-switching/symmetric-switch.wat
+++ b/tests/disas/stack-switching/symmetric-switch.wat
@@ -28,27 +28,26 @@
;; function u0:0(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 16, align = 65536
;; ss1 = explicit_slot 24, align = 256
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1073741912 "VMContRef+0x58"
-;; region3 = 67108952 "VMStoreContext+0x58"
-;; region4 = 1073741888 "VMContRef+0x40"
-;; region5 = 2550136840 "VMHostArray+0x8"
-;; region6 = 2483028024 "VMCommonStackInformation+0x38"
-;; region7 = 2550136832 "VMHostArray+0x0"
-;; region8 = 1140850688 "ContinuationStackMemory+0x0"
-;; region9 = 1073741904 "VMContRef+0x50"
-;; region10 = 2550136836 "VMHostArray+0x4"
-;; region11 = 2483028000 "VMCommonStackInformation+0x20"
-;; region12 = 67108936 "VMStoreContext+0x48"
-;; region13 = 67108928 "VMStoreContext+0x40"
-;; region14 = 67108944 "VMStoreContext+0x50"
-;; region15 = 2415919112 "VMStackLimits+0x8"
-;; region16 = 2415919120 "VMStackLimits+0x10"
-;; region17 = 2415919128 "VMStackLimits+0x18"
-;; region18 = 2415919104 "VMStackLimits+0x0"
-;; region19 = 1073741920 "VMContRef+0x60"
-;; region20 = 1543503873 "Stack(ss1)"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 206 ""
+;; region3 = 106 ""
+;; region4 = 225 ""
+;; region5 = 214 ""
+;; region6 = 13 ""
+;; region7 = 82 ""
+;; region8 = 55 ""
+;; region9 = 153 ""
+;; region10 = 118 ""
+;; region11 = 255 ""
+;; region12 = 231 ""
+;; region13 = 243 ""
+;; region14 = 209 ""
+;; region15 = 23 ""
+;; region16 = 224 ""
+;; region17 = 179 ""
+;; region18 = 211 ""
+;; region19 = 240 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -150,7 +149,7 @@
;; @003e v63 = load.i64 notrap aligned region14 v58+80
;; @003e store notrap aligned region15 v61, v60+8
;; @003e store notrap aligned region16 v62, v60+16
-;; @003e store notrap aligned region17 v63, v60+24
+;; @003e store notrap aligned region6 v63, v60+24
;; @003e v64 = load.i64 notrap aligned region2 v27+88
;; @003e v65 = uextend.i128 v27
;; @003e v66 = uextend.i128 v64
@@ -208,35 +207,35 @@
;; @003e store.i64 notrap aligned region3 v14, v102+96
;; @003e v103 = iconst.i64 0
;; @003e v104 = iadd v98, v103 ; v103 = 0
-;; @003e v105 = load.i64 notrap aligned region18 v104
+;; @003e v105 = load.i64 notrap aligned region17 v104
;; @003e store notrap aligned region1 v105, v58+24
;; @003e v106 = load.i64 notrap aligned region15 v104+8
;; @003e store notrap aligned region12 v106, v58+72
;; @003e v107 = load.i64 notrap aligned region16 v104+16
;; @003e store notrap aligned region13 v107, v58+64
-;; @003e v108 = load.i64 notrap aligned region17 v104+24
+;; @003e v108 = load.i64 notrap aligned region6 v104+24
;; @003e store notrap aligned region14 v108, v58+80
;; @003e v109 = iconst.i64 96
;; @003e v110 = iadd.i64 v29, v109 ; v109 = 96
-;; @003e v111 = load.i64 notrap aligned region19 v110
+;; @003e v111 = load.i64 notrap aligned region18 v110
;; @003e v112 = iconst.i64 -24
;; @003e v113 = iadd v111, v112 ; v112 = -24
;; @003e v114 = iconst.i64 96
;; @003e v115 = iadd v100, v114 ; v114 = 96
-;; @003e v116 = load.i64 notrap aligned region19 v115
+;; @003e v116 = load.i64 notrap aligned region18 v115
;; @003e v117 = iconst.i64 -24
;; @003e v118 = iadd v116, v117 ; v117 = -24
;; @003e v119 = stack_addr.i64 ss1
;; @003e v120 = load.i64 notrap aligned region8 v118
-;; @003e store notrap aligned region20 v120, v119
+;; @003e store notrap aligned region19 v120, v119
;; @003e v121 = load.i64 notrap aligned region8 v113
;; @003e store notrap aligned region8 v121, v118
;; @003e v122 = load.i64 notrap aligned region8 v118+8
-;; @003e store notrap aligned region20 v122, v119+8
+;; @003e store notrap aligned region19 v122, v119+8
;; @003e v123 = load.i64 notrap aligned region8 v113+8
;; @003e store notrap aligned region8 v123, v118+8
;; @003e v124 = load.i64 notrap aligned region8 v118+16
-;; @003e store notrap aligned region20 v124, v119+16
+;; @003e store notrap aligned region19 v124, v119+16
;; @003e v125 = load.i64 notrap aligned region8 v113+16
;; @003e store notrap aligned region8 v125, v118+16
;; @003e v126 = iconst.i64 3
@@ -282,8 +281,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i128) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -298,26 +297,25 @@
;;
;; function u0:2(i64 vmctx, i64) tail {
;; ss0 = explicit_slot 8, align = 256
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1073741912 "VMContRef+0x58"
-;; region3 = 1073741904 "VMContRef+0x50"
-;; region4 = 67108952 "VMStoreContext+0x58"
-;; region5 = 1073741888 "VMContRef+0x40"
-;; region6 = 2483028000 "VMCommonStackInformation+0x20"
-;; region7 = 67108936 "VMStoreContext+0x48"
-;; region8 = 67108928 "VMStoreContext+0x40"
-;; region9 = 67108944 "VMStoreContext+0x50"
-;; region10 = 2415919112 "VMStackLimits+0x8"
-;; region11 = 2415919120 "VMStackLimits+0x10"
-;; region12 = 2415919128 "VMStackLimits+0x18"
-;; region13 = 2415919104 "VMStackLimits+0x0"
-;; region14 = 2550136836 "VMHostArray+0x4"
-;; region15 = 2550136840 "VMHostArray+0x8"
-;; region16 = 1140850688 "ContinuationStackMemory+0x0"
-;; region17 = 2550136832 "VMHostArray+0x0"
-;; region18 = 2483028024 "VMCommonStackInformation+0x38"
-;; region19 = 1073741920 "VMContRef+0x60"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 206 ""
+;; region3 = 153 ""
+;; region4 = 106 ""
+;; region5 = 225 ""
+;; region6 = 255 ""
+;; region7 = 231 ""
+;; region8 = 243 ""
+;; region9 = 209 ""
+;; region10 = 23 ""
+;; region11 = 224 ""
+;; region12 = 13 ""
+;; region13 = 179 ""
+;; region14 = 118 ""
+;; region15 = 214 ""
+;; region16 = 55 ""
+;; region17 = 82 ""
+;; region18 = 211 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -410,13 +408,13 @@
;; @004b store notrap aligned region16 v52, v54
;; @004b store notrap aligned region17 v53, v48 ; v53 = 1
;; @004b v55 = iconst.i32 0
-;; @004b store notrap aligned region18 v55, v26+56 ; v55 = 0
+;; @004b store notrap aligned region12 v55, v26+56 ; v55 = 0
;; @004b v56 = iconst.i64 1
;; @004b v57 = iconst.i64 32
;; @004b v58 = ishl v56, v57 ; v56 = 1, v57 = 32
;; @004b v59 = iconst.i64 96
;; @004b v60 = iadd v23, v59 ; v59 = 96
-;; @004b v61 = load.i64 notrap aligned region19 v60
+;; @004b v61 = load.i64 notrap aligned region18 v60
;; @004b v62 = iconst.i64 -24
;; @004b v63 = iadd v61, v62 ; v62 = -24
;; @004b v64 = stack_switch v63, v63, v58
@@ -434,7 +432,7 @@
;; @004b store notrap aligned region14 v71, v48+4 ; v71 = 0
;; @004b v72 = iconst.i64 0
;; @004b store notrap aligned region15 v72, v48+8 ; v72 = 0
-;; @004b store notrap aligned region18 v27, v26+56 ; v27 = 0
+;; @004b store notrap aligned region12 v27, v26+56 ; v27 = 0
;; @004b brif v64, block6, block3
;;
;; block6:
diff --git a/tests/disas/startup-data-active.wat b/tests/disas/startup-data-active.wat
index 9f021ebcc8..d07e1612d9 100644
--- a/tests/disas/startup-data-active.wat
+++ b/tests/disas/startup-data-active.wat
@@ -9,11 +9,11 @@
(data (i32.const 1) "hi")
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108936 "VMStoreContext+0x48"
-;; region2 = 67108928 "VMStoreContext+0x40"
-;; region3 = 67108944 "VMStoreContext+0x50"
-;; region4 = 67109000 "VMStoreContext+0x88"
+;; region0 = 123 ""
+;; region1 = 231 ""
+;; region2 = 243 ""
+;; region3 = 209 ""
+;; region4 = 68 ""
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -42,10 +42,10 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 112 "VMContext+0x70"
-;; region1 = 120 "VMContext+0x78"
-;; region2 = 603979784 "VMMemoryDefinition+0x8"
-;; region3 = 603979776 "VMMemoryDefinition+0x0"
+;; region0 = 174 ""
+;; region1 = 10 ""
+;; region2 = 105 ""
+;; region3 = 215 ""
;; 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 4b802eee44..c6f17ae3d8 100644
--- a/tests/disas/startup-elem-active.wat
+++ b/tests/disas/startup-elem-active.wat
@@ -13,11 +13,11 @@
)
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108936 "VMStoreContext+0x48"
-;; region2 = 67108928 "VMStoreContext+0x40"
-;; region3 = 67108944 "VMStoreContext+0x50"
-;; region4 = 67109000 "VMStoreContext+0x88"
+;; region0 = 123 ""
+;; region1 = 231 ""
+;; region2 = 243 ""
+;; region3 = 209 ""
+;; region4 = 68 ""
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -46,9 +46,9 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 671088640 "VMTableDefinition+0x0"
-;; region1 = 671088648 "VMTableDefinition+0x8"
-;; region2 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 93 ""
+;; region1 = 211 ""
+;; region2 = 117 ""
;;
;; 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 b669c9874b..24e0a26a2f 100644
--- a/tests/disas/startup-global.wat
+++ b/tests/disas/startup-global.wat
@@ -6,11 +6,11 @@
(global i64 i64.const 0 i64.const 0 i64.add)
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108936 "VMStoreContext+0x48"
-;; region2 = 67108928 "VMStoreContext+0x40"
-;; region3 = 67108944 "VMStoreContext+0x50"
-;; region4 = 67109000 "VMStoreContext+0x88"
+;; region0 = 123 ""
+;; region1 = 231 ""
+;; region2 = 243 ""
+;; region3 = 209 ""
+;; region4 = 68 ""
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -39,7 +39,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 250 ""
;;
;; 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 e9921259cf..88c37ea6ba 100644
--- a/tests/disas/startup-passive-segment.wat
+++ b/tests/disas/startup-passive-segment.wat
@@ -7,11 +7,11 @@
(elem (ref i31) (item (ref.i31 (i32.const 0))) (item (ref.i31 (i32.const 1))))
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108936 "VMStoreContext+0x48"
-;; region2 = 67108928 "VMStoreContext+0x40"
-;; region3 = 67108944 "VMStoreContext+0x50"
-;; region4 = 67109000 "VMStoreContext+0x88"
+;; region0 = 123 ""
+;; region1 = 231 ""
+;; region2 = 243 ""
+;; region3 = 209 ""
+;; region4 = 68 ""
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -40,7 +40,7 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 2080374784 "ElementSegment"
+;; region0 = 191 ""
;; 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 b6aed467e0..7fedb1a17d 100644
--- a/tests/disas/startup-start.wat
+++ b/tests/disas/startup-start.wat
@@ -7,11 +7,11 @@
(start $f)
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108936 "VMStoreContext+0x48"
-;; region2 = 67108928 "VMStoreContext+0x40"
-;; region3 = 67108944 "VMStoreContext+0x50"
-;; region4 = 67109000 "VMStoreContext+0x88"
+;; region0 = 123 ""
+;; region1 = 231 ""
+;; region2 = 243 ""
+;; region3 = 209 ""
+;; region4 = 68 ""
;; 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 ce1050aa1e..c7e61fe2b9 100644
--- a/tests/disas/startup-table-initial-value.wat
+++ b/tests/disas/startup-table-initial-value.wat
@@ -7,11 +7,11 @@
(table 10 (ref i31) (ref.i31 (i32.const 0)))
)
;; function u2415919104:1(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108936 "VMStoreContext+0x48"
-;; region2 = 67108928 "VMStoreContext+0x40"
-;; region3 = 67108944 "VMStoreContext+0x50"
-;; region4 = 67109000 "VMStoreContext+0x88"
+;; region0 = 123 ""
+;; region1 = 231 ""
+;; region2 = 243 ""
+;; region3 = 209 ""
+;; region4 = 68 ""
;; sig0 = (i64 vmctx, i64) tail
;; fn0 = colocated u2415919104:0 sig0
;;
@@ -40,9 +40,9 @@
;; }
;;
;; function u2415919104:0(i64 vmctx, i64) tail {
-;; region0 = 671088640 "VMTableDefinition+0x0"
-;; region1 = 671088648 "VMTableDefinition+0x8"
-;; region2 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
+;; region0 = 93 ""
+;; region1 = 211 ""
+;; region2 = 117 ""
;;
;; 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 3f59df7596..52b447e2d0 100644
--- a/tests/disas/sub-global.wat
+++ b/tests/disas/sub-global.wat
@@ -13,9 +13,9 @@
)
;; function u0:0(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 469762048 "DefinedGlobal(StaticModuleIndex(0), DefinedGlobalIndex(0))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
;; gv0 = vmctx
;; 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 415701e481..589b13ff94 100644
--- a/tests/disas/table-copy.wat
+++ b/tests/disas/table-copy.wat
@@ -24,8 +24,8 @@
table.copy $u $t))
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -39,8 +39,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -54,8 +54,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -69,12 +69,12 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 1342177280 "VMTableImport+0x0"
-;; region3 = 671088640 "VMTableDefinition+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 21 ""
+;; region3 = 93 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -209,12 +209,12 @@
;; }
;;
;; function u0:4(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 1342177280 "VMTableImport+0x0"
-;; region4 = 671088648 "VMTableDefinition+0x8"
-;; region5 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 21 ""
+;; region4 = 211 ""
+;; region5 = 99 ""
;; gv0 = vmctx
;; 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 7435472237..4bb1b5a3c4 100644
--- a/tests/disas/table-get-fixed-size.wat
+++ b/tests/disas/table-get-fixed-size.wat
@@ -16,10 +16,10 @@
table.get 0))
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 99 ""
;; 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 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 99 ""
;; gv0 = vmctx
;; 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 968a1f7c5b..737ae283c8 100644
--- a/tests/disas/table-get.wat
+++ b/tests/disas/table-get.wat
@@ -15,11 +15,11 @@
table.get 0))
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,11 +45,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; 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 445c3dadc8..c05beeea1d 100644
--- a/tests/disas/table-set-fixed-size.wat
+++ b/tests/disas/table-set-fixed-size.wat
@@ -17,10 +17,10 @@
local.get 1
table.set 0))
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 99 ""
;; 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 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 99 ""
;; gv0 = vmctx
;; 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 bd5bbfa58e..e5a007c29e 100644
--- a/tests/disas/table-set.wat
+++ b/tests/disas/table-set.wat
@@ -17,11 +17,11 @@
table.set 0))
;; function u0:0(i64 vmctx, i64, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -47,11 +47,11 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 671088648 "VMTableDefinition+0x8"
-;; region4 = 268435456 "PublicTable"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 211 ""
+;; region4 = 99 ""
;; gv0 = vmctx
;; 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 3e50095a6f..ca91705e83 100644
--- a/tests/disas/typed-funcrefs-eager-init.wat
+++ b/tests/disas/typed-funcrefs-eager-init.wat
@@ -114,8 +114,8 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -129,12 +129,12 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 1610612744 "VMFuncRef+0x8"
-;; region5 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 116 ""
+;; region5 = 60 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -163,12 +163,12 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 1610612744 "VMFuncRef+0x8"
-;; region5 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 116 ""
+;; region5 = 60 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -197,12 +197,12 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; 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))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
+;; region3 = 116 ""
+;; region4 = 60 ""
+;; region5 = 135 ""
;; gv0 = vmctx
;; 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 9c5cee2932..1235c5de9f 100644
--- a/tests/disas/typed-funcrefs.wat
+++ b/tests/disas/typed-funcrefs.wat
@@ -114,8 +114,8 @@
)
;; function u0:0(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -129,12 +129,12 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 1610612744 "VMFuncRef+0x8"
-;; region5 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 116 ""
+;; region5 = 60 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -187,12 +187,12 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
-;; region2 = 671088640 "VMTableDefinition+0x0"
-;; region3 = 335544320 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))"
-;; region4 = 1610612744 "VMFuncRef+0x8"
-;; region5 = 1610612760 "VMFuncRef+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 93 ""
+;; region3 = 117 ""
+;; region4 = 116 ""
+;; region5 = 60 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -245,12 +245,12 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; 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))"
+;; region0 = 123 ""
+;; region1 = 160 ""
+;; region2 = 250 ""
+;; region3 = 116 ""
+;; region4 = 60 ""
+;; region5 = 135 ""
;; gv0 = vmctx
;; 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 1556f1cb68..cc79c8911f 100644
--- a/tests/disas/unreachable_code.wat
+++ b/tests/disas/unreachable_code.wat
@@ -79,8 +79,8 @@
)
;; function u0:0(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -91,8 +91,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -106,8 +106,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64) -> i32 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -140,8 +140,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64) tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; 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 fd2b51c303..d597b99277 100644
--- a/tests/disas/x64-simd-round-without-sse41.wat
+++ b/tests/disas/x64-simd-round-without-sse41.wat
@@ -12,8 +12,8 @@
(func $i32x4.trunc_sat_f64x2_u_zero (param v128) (result v128) (i32x4.trunc_sat_f64x2_u_zero (local.get 0)))
)
;; function u0:0(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -45,8 +45,8 @@
;; }
;;
;; function u0:1(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -78,8 +78,8 @@
;; }
;;
;; function u0:2(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -111,8 +111,8 @@
;; }
;;
;; function u0:3(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -144,8 +144,8 @@
;; }
;;
;; function u0:4(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -171,8 +171,8 @@
;; }
;;
;; function u0:5(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -198,8 +198,8 @@
;; }
;;
;; function u0:6(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -225,8 +225,8 @@
;; }
;;
;; function u0:7(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -252,8 +252,8 @@
;; }
;;
;; function u0:8(i64 vmctx, i64, i8x16) -> i8x16 tail {
-;; region0 = 8 "VMContext+0x8"
-;; region1 = 67108888 "VMStoreContext+0x18"
+;; region0 = 123 ""
+;; region1 = 160 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24