A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Tag loads of the `[VMSharedTypeIndex]` array's elements with an alias region (#13776)
Nick Fitzgeraldb43a31e38010
diff --git a/crates/cranelift/src/alias_region.rs b/crates/cranelift/src/alias_region.rsindex e989d129fe..231b4af09c 100644--- a/crates/cranelift/src/alias_region.rs+++ b/crates/cranelift/src/alias_region.rs@@ -6,8 +6,8 @@ use cranelift_codegen::{};use wasmtime_environ::{DefinedGlobalIndex, DefinedMemoryIndex, DefinedTableIndex, FuncIndex, GetPtrSize, GlobalIndex,- MemoryIndex, OwnedMemoryIndex, PtrSize as _, RuntimeDataIndex, StaticModuleIndex, TableIndex,- TagIndex, VMOffsets,+ MemoryIndex, ModuleInternedTypeIndex, OwnedMemoryIndex, PtrSize as _, RuntimeDataIndex,+ StaticModuleIndex, TableIndex, TagIndex, VMOffsets,component::{LoweredIndex, ResourceIndex, RuntimeCallbackIndex, RuntimeComponentInstanceIndex,RuntimeMemoryIndex, RuntimePostReturnIndex, VMComponentOffsets,@@ -33,6 +33,7 @@ enum VmType {VMTagImport,VMGlobalImport,VMFuncRef,+ TypeIdsArray,}/// A key that uniquely identifies an alias region across an entire compilation.@@ -142,6 +143,7 @@ impl AliasRegionKey {const VM_GLOBAL_IMPORT_KIND: u32 = Self::new_kind(0b10110);const STACK_KIND: u32 = Self::new_kind(0b10111);const VM_FUNC_REF_KIND: u32 = Self::new_kind(0b11000);+ const TYPE_IDS_ARRAY_KIND: u32 = Self::new_kind(0b11001);/// Encode this key into a raw `u32` suitable for use as an/// `AliasRegionData::user_id`.@@ -167,6 +169,7 @@ impl AliasRegionKey {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,};kind | (offset & Self::OFFSET_MASK)}@@ -1867,6 +1870,48 @@ where}}+/// `[VMSharedTypeIndex]`-related methods.+impl<Offsets> AliasRegions<Offsets>+where+ Offsets: GetPtrSize,+{+ /// Load a `VMSharedTypeIndex` element out of the `[VMSharedTypeIndex]`+ /// array pointed at by the `VMContext::type_ids_array` field.+ pub fn type_ids_array_element(+ &mut self,+ cursor: &mut FuncCursor<'_>,+ array: ir::Value,+ ty: ModuleInternedTypeIndex,+ ) -> ir::Value {+ let load_ty = ir::Type::int_with_byte_size(+ self.offsets+ .get_ptr_size()+ .size_of_vmshared_type_index()+ .into(),+ )+ .unwrap();++ let offset = ty.as_u32().checked_mul(load_ty.bytes()).unwrap();+ let region = self.region(+ cursor.func,+ AliasRegionKey::Vm {+ ty: VmType::TypeIdsArray,+ offset,+ },+ );++ cursor.ins().load(+ load_ty,+ ir::MemFlagsData::trusted()+ .with_readonly()+ .with_can_move()+ .with_alias_region(Some(region)),+ array,+ i32::try_from(offset).unwrap(),+ )+ }+}+/// `VMComponentContext`-related methods, used when compiling component/// trampolines.impl AliasRegions<VMComponentOffsets<u8>> {diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rsindex afd6d8d488..dbf4c3874e 100644--- a/crates/cranelift/src/func_environ.rs+++ b/crates/cranelift/src/func_environ.rs@@ -1109,17 +1109,11 @@ impl<'module_environment> FuncEnvironment<'module_environment> {let shared_indices = self.alias_regions.vmctx_shared_type_ids_array(pos, vmctx);// Calculate the offset in that array for this type's entry.- let ty = self.vmshared_type_index_ty();- let offset = i32::try_from(interned_ty.as_u32().checked_mul(ty.bytes()).unwrap()).unwrap();// Load the`VMSharedTypeIndex` that this `ModuleInternedTypeIndex` is// associated with at runtime from the array.- pos.ins().load(- ty,- ir::MemFlagsData::trusted().with_readonly().with_can_move(),- shared_indices,- offset,- )+ self.alias_regions+ .type_ids_array_element(pos, shared_indices, interned_ty)}/// Does this function need a GC heap?diff --git a/tests/disas/alias-region-tables.wat b/tests/disas/alias-region-tables.watindex a3ff680485..3e486c1d23 100644--- a/tests/disas/alias-region-tables.wat+++ b/tests/disas/alias-region-tables.wat@@ -24,9 +24,10 @@;; region5 = 536870912 "PublicTable";; region6 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region7 = 40 "VMContext+0x28"-;; region8 = 3221225488 "VMFuncRef+0x10"-;; region9 = 3221225480 "VMFuncRef+0x8"-;; region10 = 3221225496 "VMFuncRef+0x18"+;; region8 = 3355443200 "TypeIdsArray+0x0"+;; region9 = 3221225488 "VMFuncRef+0x10"+;; region10 = 3221225480 "VMFuncRef+0x8"+;; region11 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -67,13 +68,13 @@;; @004d jump block3(v48);;;; block3(v45: i64):-;; @004d v51 = load.i32 user7 aligned readonly region8 v45+16+;; @004d v51 = load.i32 user7 aligned readonly region9 v45+16;; @004d v49 = load.i64 notrap aligned readonly can_move region7 v0+40-;; @004d v50 = load.i32 notrap aligned readonly can_move v49+;; @004d v50 = load.i32 notrap aligned readonly can_move region8 v49;; @004d v52 = icmp eq v51, v50;; @004d trapz v52, user8-;; @004d v54 = load.i64 notrap aligned readonly region9 v45+8-;; @004d v55 = load.i64 notrap aligned readonly region10 v45+24+;; @004d v54 = load.i64 notrap aligned readonly region10 v45+8+;; @004d v55 = load.i64 notrap aligned readonly region11 v45+24;; @004d v56 = call_indirect sig0, v54(v55, v0);; @0050 jump block1;;diff --git a/tests/disas/call-indirect-with-gc.wat b/tests/disas/call-indirect-with-gc.watindex b5c649eb43..f65c2c3765 100644--- a/tests/disas/call-indirect-with-gc.wat+++ b/tests/disas/call-indirect-with-gc.wat@@ -16,9 +16,10 @@;; region3 = 1342177288 "VMTableDefinition+0x8";; region4 = 536870912 "PublicTable";; region5 = 40 "VMContext+0x28"-;; region6 = 3221225488 "VMFuncRef+0x10"-;; region7 = 3221225480 "VMFuncRef+0x8"-;; region8 = 3221225496 "VMFuncRef+0x18"+;; region6 = 3355443204 "TypeIdsArray+0x4"+;; region7 = 3221225488 "VMFuncRef+0x10"+;; region8 = 3221225480 "VMFuncRef+0x8"+;; region9 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -49,13 +50,13 @@;; @0035 jump block3(v20);;;; block3(v17: i64):-;; @0035 v23 = load.i32 user7 aligned readonly region6 v17+16+;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0035 v22 = load.i32 notrap aligned readonly can_move v21+4+;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21+4;; @0035 v24 = icmp eq v23, v22;; @0035 trapz v24, user8-;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8-;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24+;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8+;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24;; @0035 v28 = call_indirect sig0, v26(v27, v0, v2);; @0038 jump block1;;diff --git a/tests/disas/call-indirect-without-gc.wat b/tests/disas/call-indirect-without-gc.watindex 7efd186502..17d596e554 100644--- a/tests/disas/call-indirect-without-gc.wat+++ b/tests/disas/call-indirect-without-gc.wat@@ -16,9 +16,10 @@;; region3 = 1342177288 "VMTableDefinition+0x8";; region4 = 536870912 "PublicTable";; region5 = 40 "VMContext+0x28"-;; region6 = 3221225488 "VMFuncRef+0x10"-;; region7 = 3221225480 "VMFuncRef+0x8"-;; region8 = 3221225496 "VMFuncRef+0x18"+;; region6 = 3355443204 "TypeIdsArray+0x4"+;; region7 = 3221225488 "VMFuncRef+0x10"+;; region8 = 3221225480 "VMFuncRef+0x8"+;; region9 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -49,13 +50,13 @@;; @0035 jump block3(v20);;;; block3(v17: i64):-;; @0035 v23 = load.i32 user7 aligned readonly region6 v17+16+;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0035 v22 = load.i32 notrap aligned readonly can_move v21+4+;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21+4;; @0035 v24 = icmp eq v23, v22;; @0035 trapz v24, user8-;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8-;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24+;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8+;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24;; @0035 v28 = call_indirect sig0, v26(v27, v0, v2);; @0038 jump block1;;diff --git a/tests/disas/call-indirect.wat b/tests/disas/call-indirect.watindex 89f7d03f3d..35b1bec3df 100644--- a/tests/disas/call-indirect.wat+++ b/tests/disas/call-indirect.wat@@ -14,9 +14,10 @@;; region3 = 1342177288 "VMTableDefinition+0x8";; region4 = 536870912 "PublicTable";; region5 = 40 "VMContext+0x28"-;; region6 = 3221225488 "VMFuncRef+0x10"-;; region7 = 3221225480 "VMFuncRef+0x8"-;; region8 = 3221225496 "VMFuncRef+0x18"+;; region6 = 3355443204 "TypeIdsArray+0x4"+;; region7 = 3221225488 "VMFuncRef+0x10"+;; region8 = 3221225480 "VMFuncRef+0x8"+;; region9 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -49,13 +50,13 @@;;;; block3(v17: i64):;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0035 v22 = load.i32 notrap aligned readonly can_move v21+4-;; @0035 v23 = load.i32 user7 aligned readonly region6 v17+16+;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21+4+;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16;; @0035 v24 = icmp eq v23, v22;; @0035 v25 = uextend.i32 v24;; @0035 trapz v25, user8-;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8-;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24+;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8+;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24;; @0035 v28 = call_indirect sig0, v26(v27, v0, v2);; @0038 jump block1;;diff --git a/tests/disas/duplicate-function-types.wat b/tests/disas/duplicate-function-types.watindex 979ceb5331..5250f107ee 100644--- a/tests/disas/duplicate-function-types.wat+++ b/tests/disas/duplicate-function-types.wat@@ -24,9 +24,10 @@;; region4 = 1342177288 "VMTableDefinition+0x8";; region5 = 536870912 "PublicTable";; region6 = 40 "VMContext+0x28"-;; region7 = 3221225488 "VMFuncRef+0x10"-;; region8 = 3221225480 "VMFuncRef+0x8"-;; region9 = 3221225496 "VMFuncRef+0x18"+;; region7 = 3355443200 "TypeIdsArray+0x0"+;; region8 = 3221225488 "VMFuncRef+0x10"+;; region9 = 3221225480 "VMFuncRef+0x8"+;; region10 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -61,13 +62,13 @@;;;; block3(v18: i64):;; @002d v22 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @002d v23 = load.i32 notrap aligned readonly can_move v22-;; @002d v24 = load.i32 user7 aligned readonly region7 v18+16+;; @002d v23 = load.i32 notrap aligned readonly can_move region7 v22+;; @002d v24 = load.i32 user7 aligned readonly region8 v18+16;; @002d v25 = icmp eq v24, v23;; @002d v26 = uextend.i32 v25;; @002d trapz v26, user8-;; @002d v27 = load.i64 notrap aligned readonly region8 v18+8-;; @002d v28 = load.i64 notrap aligned readonly region9 v18+24+;; @002d v27 = load.i64 notrap aligned readonly region9 v18+8+;; @002d v28 = load.i64 notrap aligned readonly region10 v18+24;; @002d v29 = call_indirect sig0, v27(v28, v0);; @0032 v31 = load.i64 notrap aligned readonly can_move region2 v0+48;; @0032 v32 = load.i64 notrap aligned region4 v31+8@@ -94,13 +95,13 @@;;;; block5(v46: i64):;; @0032 v50 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @0032 v51 = load.i32 notrap aligned readonly can_move v50-;; @0032 v52 = load.i32 user7 aligned readonly region7 v46+16+;; @0032 v51 = load.i32 notrap aligned readonly can_move region7 v50+;; @0032 v52 = load.i32 user7 aligned readonly region8 v46+16;; @0032 v53 = icmp eq v52, v51;; @0032 v54 = uextend.i32 v53;; @0032 trapz v54, user8-;; @0032 v55 = load.i64 notrap aligned readonly region8 v46+8-;; @0032 v56 = load.i64 notrap aligned readonly region9 v46+24+;; @0032 v55 = load.i64 notrap aligned readonly region9 v46+8+;; @0032 v56 = load.i64 notrap aligned readonly region10 v46+24;; @0032 v57 = call_indirect sig0, v55(v56, v0);; @0035 jump block1;;diff --git a/tests/disas/foo.wat b/tests/disas/foo.watindex 9e488c7283..9db1f4428a 100644--- a/tests/disas/foo.wat+++ b/tests/disas/foo.wat@@ -25,9 +25,10 @@;; region7 = 1342177288 "VMTableDefinition+0x8";; region8 = 536870912 "PublicTable";; region9 = 40 "VMContext+0x28"-;; region10 = 3221225488 "VMFuncRef+0x10"-;; region11 = 3221225480 "VMFuncRef+0x8"-;; region12 = 3221225496 "VMFuncRef+0x18"+;; region10 = 3355443204 "TypeIdsArray+0x4"+;; region11 = 3221225488 "VMFuncRef+0x10"+;; region12 = 3221225480 "VMFuncRef+0x8"+;; region13 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -63,13 +64,13 @@;; @0043 jump block3(v26);;;; block3(v23: i64):-;; @0043 v29 = load.i32 user7 aligned readonly region10 v23+16+;; @0043 v29 = load.i32 user7 aligned readonly region11 v23+16;; @0043 v27 = load.i64 notrap aligned readonly can_move region9 v0+40-;; @0043 v28 = load.i32 notrap aligned readonly can_move v27+4+;; @0043 v28 = load.i32 notrap aligned readonly can_move region10 v27+4;; @0043 v30 = icmp eq v29, v28;; @0043 trapz v30, user8-;; @0043 v32 = load.i64 notrap aligned readonly region11 v23+8-;; @0043 v33 = load.i64 notrap aligned readonly region12 v23+24+;; @0043 v32 = load.i64 notrap aligned readonly region12 v23+8+;; @0043 v33 = load.i64 notrap aligned readonly region13 v23+24;; @0043 v34 = call_indirect sig0, v32(v33, v0, v2);; @004a v40 = load.i32 little region4 v6;; @004d v42 = load.i64 notrap aligned region7 v8+8@@ -93,11 +94,11 @@;; @004d jump block5(v59);;;; block5(v56: i64):-;; @004d v62 = load.i32 user7 aligned readonly region10 v56+16+;; @004d v62 = load.i32 user7 aligned readonly region11 v56+16;; @004d v63 = icmp eq v62, v28;; @004d trapz v63, user8-;; @004d v65 = load.i64 notrap aligned readonly region11 v56+8-;; @004d v66 = load.i64 notrap aligned readonly region12 v56+24+;; @004d v65 = load.i64 notrap aligned readonly region12 v56+8+;; @004d v66 = load.i64 notrap aligned readonly region13 v56+24;; @004d v67 = call_indirect sig0, v65(v66, v0, v2);; @0050 jump block1;;diff --git a/tests/disas/gc/array-new-data.wat b/tests/disas/gc/array-new-data.watindex 358946be7f..028119f1d5 100644--- a/tests/disas/gc/array-new-data.wat+++ b/tests/disas/gc/array-new-data.wat@@ -85,10 +85,11 @@;; region5 = 1744830464 "VMCopyingHeapData+0x0";; region6 = 1744830468 "VMCopyingHeapData+0x4";; region7 = 40 "VMContext+0x28"-;; region8 = 134217760 "VMStoreContext+0x20"-;; region9 = 1073741824 "GcHeap"-;; region10 = 134217768 "VMStoreContext+0x28"-;; region11 = 3087007744 "Stack(ss0)"+;; region8 = 3355443200 "TypeIdsArray+0x0"+;; region9 = 134217760 "VMStoreContext+0x20"+;; region10 = 1073741824 "GcHeap"+;; region11 = 134217768 "VMStoreContext+0x28"+;; region12 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -135,41 +136,41 @@;; @0025 store notrap aligned region5 v127, v23;; v141 = iconst.i32 -1476395002;; v142 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v143 = load.i64 notrap aligned readonly can_move region8 v142+32+;; v143 = load.i64 notrap aligned readonly can_move region9 v142+32;; @0025 v48 = iadd v143, v31-;; @0025 store user2 region9 v141, v48 ; v141 = -1476395002+;; @0025 store user2 region10 v141, v48 ; v141 = -1476395002;; v144 = load.i64 notrap aligned readonly can_move region7 v0+40-;; v145 = load.i32 notrap aligned readonly can_move v144-;; @0025 store user2 region9 v145, v48+4+;; v145 = load.i32 notrap aligned readonly can_move region8 v144+;; @0025 store user2 region10 v145, v48+4;; v146 = band.i64 v29, v28 ; v28 = -16-;; @0025 istore32 user2 region9 v146, v48+8+;; @0025 istore32 user2 region10 v146, v48+8;; @0025 jump block4(v24, v48);;;; block3 cold:;; @0025 v35 = iconst.i32 -1476395002;; @0025 v36 = load.i64 notrap aligned readonly can_move region7 v0+40-;; @0025 v37 = load.i32 notrap aligned readonly can_move v36+;; @0025 v37 = load.i32 notrap aligned readonly can_move region8 v36;; @0025 v38 = iconst.i32 16;; @0025 v39 = call fn0(v0, v35, v37, v22, v38) ; v35 = -1476395002, v38 = 16;; @0025 v40 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0025 v41 = load.i64 notrap aligned readonly can_move region8 v40+32+;; @0025 v41 = load.i64 notrap aligned readonly can_move region9 v40+32;; @0025 v42 = uextend.i64 v39;; @0025 v43 = iadd v41, v42;; @0025 jump block4(v39, v43);;;; block4(v52: i32, v53: i64):;; v112 = stack_addr.i64 ss0-;; store notrap aligned region11 v52, v112+;; store notrap aligned region12 v52, v112;; @0025 v54 = iconst.i64 16;; @0025 v55 = iadd v53, v54 ; v54 = 16-;; @0025 store.i32 user2 region9 v3, v55+;; @0025 store.i32 user2 region10 v3, v55;; @0025 trapz v52, user16;; v147 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v148 = load.i64 notrap aligned readonly can_move region8 v147+32+;; v148 = load.i64 notrap aligned readonly can_move region9 v147+32;; @0025 v57 = uextend.i64 v52;; @0025 v60 = iadd v148, v57;; @0025 v62 = iadd v60, v54 ; v54 = 16-;; @0025 v63 = load.i32 user2 readonly region9 v62+;; @0025 v63 = load.i32 user2 readonly region10 v62;; @0025 v64 = uextend.i64 v63;; @0025 v70 = icmp.i64 ugt v7, v64;; @0025 trapnz v70, user17@@ -178,7 +179,7 @@;; @0025 v88 = icmp.i64 ugt v10, v82;; @0025 trapnz v88, heap_oob;; @0025 v89 = load.i64 notrap aligned region3 v0+48-;; @0025 v100 = load.i64 notrap aligned region10 v147+40+;; @0025 v100 = load.i64 notrap aligned region11 v147+40;; @0025 v75 = iconst.i64 20;; @0025 v76 = iadd v60, v75 ; v75 = 20;; @0025 v102 = uadd_overflow_trap v76, v7, user2@@ -190,6 +191,6 @@;; @0029 jump block1;;;; block1:-;; v105 = load.i32 notrap aligned region11 v112+;; v105 = load.i32 notrap aligned region12 v112;; @0029 return v105;; }diff --git a/tests/disas/gc/array-new-default-anyref.wat b/tests/disas/gc/array-new-default-anyref.watindex f0d2488bc2..ae678e1c67 100644--- a/tests/disas/gc/array-new-default-anyref.wat+++ b/tests/disas/gc/array-new-default-anyref.wat@@ -16,9 +16,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -60,24 +61,24 @@;; @001f store notrap aligned region3 v110, v11;; v126 = iconst.i32 -1476394994;; v127 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v128 = load.i64 notrap aligned readonly can_move region6 v127+32+;; v128 = load.i64 notrap aligned readonly can_move region7 v127+32;; @001f v36 = iadd v128, v19-;; @001f store user2 region7 v126, v36 ; v126 = -1476394994+;; @001f store user2 region8 v126, v36 ; v126 = -1476394994;; v129 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v130 = load.i32 notrap aligned readonly can_move v129-;; @001f store user2 region7 v130, v36+4+;; v130 = load.i32 notrap aligned readonly can_move region6 v129+;; @001f store user2 region8 v130, v36+4;; v131 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v131, v36+8+;; @001f istore32 user2 region8 v131, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476394994;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476394994, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31)@@ -85,18 +86,18 @@;; block4(v40: i32, v41: i64):;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v132 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v133 = load.i64 notrap aligned readonly can_move region6 v132+32+;; v133 = load.i64 notrap aligned readonly can_move region7 v132+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v133, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v132+40+;; @001f v76 = load.i64 notrap aligned region9 v132+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v88, user2@@ -112,7 +113,7 @@;;;; block5(v83: i64):;; v134 = iconst.i32 0-;; @001f store user2 little region7 v134, v83 ; v134 = 0+;; @001f store user2 little region8 v134, v83 ; v134 = 0;; v135 = iconst.i64 4;; v136 = iadd v83, v135 ; v135 = 4;; @001f v86 = icmp eq v136, v80diff --git a/tests/disas/gc/array-new-default-exnref.wat b/tests/disas/gc/array-new-default-exnref.watindex 5b8e5d0159..7fb430c99a 100644--- a/tests/disas/gc/array-new-default-exnref.wat+++ b/tests/disas/gc/array-new-default-exnref.wat@@ -16,9 +16,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -60,24 +61,24 @@;; @001f store notrap aligned region3 v110, v11;; v126 = iconst.i32 -1476394994;; v127 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v128 = load.i64 notrap aligned readonly can_move region6 v127+32+;; v128 = load.i64 notrap aligned readonly can_move region7 v127+32;; @001f v36 = iadd v128, v19-;; @001f store user2 region7 v126, v36 ; v126 = -1476394994+;; @001f store user2 region8 v126, v36 ; v126 = -1476394994;; v129 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v130 = load.i32 notrap aligned readonly can_move v129-;; @001f store user2 region7 v130, v36+4+;; v130 = load.i32 notrap aligned readonly can_move region6 v129+;; @001f store user2 region8 v130, v36+4;; v131 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v131, v36+8+;; @001f istore32 user2 region8 v131, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476394994;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476394994, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31)@@ -85,18 +86,18 @@;; block4(v40: i32, v41: i64):;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v132 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v133 = load.i64 notrap aligned readonly can_move region6 v132+32+;; v133 = load.i64 notrap aligned readonly can_move region7 v132+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v133, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v132+40+;; @001f v76 = load.i64 notrap aligned region9 v132+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v88, user2@@ -112,7 +113,7 @@;;;; block5(v83: i64):;; v134 = iconst.i32 0-;; @001f store user2 little region7 v134, v83 ; v134 = 0+;; @001f store user2 little region8 v134, v83 ; v134 = 0;; v135 = iconst.i64 4;; v136 = iadd v83, v135 ; v135 = 4;; @001f v86 = icmp eq v136, v80diff --git a/tests/disas/gc/array-new-default-externref.wat b/tests/disas/gc/array-new-default-externref.watindex 7b968127a2..cdcc2bf3b4 100644--- a/tests/disas/gc/array-new-default-externref.wat+++ b/tests/disas/gc/array-new-default-externref.wat@@ -16,9 +16,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -60,24 +61,24 @@;; @001f store notrap aligned region3 v110, v11;; v126 = iconst.i32 -1476394994;; v127 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v128 = load.i64 notrap aligned readonly can_move region6 v127+32+;; v128 = load.i64 notrap aligned readonly can_move region7 v127+32;; @001f v36 = iadd v128, v19-;; @001f store user2 region7 v126, v36 ; v126 = -1476394994+;; @001f store user2 region8 v126, v36 ; v126 = -1476394994;; v129 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v130 = load.i32 notrap aligned readonly can_move v129-;; @001f store user2 region7 v130, v36+4+;; v130 = load.i32 notrap aligned readonly can_move region6 v129+;; @001f store user2 region8 v130, v36+4;; v131 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v131, v36+8+;; @001f istore32 user2 region8 v131, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476394994;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476394994, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31)@@ -85,18 +86,18 @@;; block4(v40: i32, v41: i64):;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v132 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v133 = load.i64 notrap aligned readonly can_move region6 v132+32+;; v133 = load.i64 notrap aligned readonly can_move region7 v132+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v133, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v132+40+;; @001f v76 = load.i64 notrap aligned region9 v132+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v88, user2@@ -112,7 +113,7 @@;;;; block5(v83: i64):;; v134 = iconst.i32 0-;; @001f store user2 little region7 v134, v83 ; v134 = 0+;; @001f store user2 little region8 v134, v83 ; v134 = 0;; v135 = iconst.i64 4;; v136 = iadd v83, v135 ; v135 = 4;; @001f v86 = icmp eq v136, v80diff --git a/tests/disas/gc/array-new-default-f32.wat b/tests/disas/gc/array-new-default-f32.watindex 883955ea9b..175df803fb 100644--- a/tests/disas/gc/array-new-default-f32.wat+++ b/tests/disas/gc/array-new-default-f32.wat@@ -17,10 +17,11 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -64,45 +65,45 @@;; @001f store notrap aligned region3 v113, v11;; v129 = iconst.i32 -1476395002;; v130 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v131 = load.i64 notrap aligned readonly can_move region6 v130+32+;; v131 = load.i64 notrap aligned readonly can_move region7 v130+32;; @001f v36 = iadd v131, v19-;; @001f store user2 region7 v129, v36 ; v129 = -1476395002+;; @001f store user2 region8 v129, v36 ; v129 = -1476395002;; v132 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v133 = load.i32 notrap aligned readonly can_move v132-;; @001f store user2 region7 v133, v36+4+;; v133 = load.i32 notrap aligned readonly can_move region6 v132+;; @001f store user2 region8 v133, v36+4;; v134 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v134, v36+8+;; @001f istore32 user2 region8 v134, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476395002;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476395002, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31);;;; block4(v40: i32, v41: i64):;; v89 = stack_addr.i64 ss0-;; store notrap aligned region9 v40, v89+;; store notrap aligned region10 v40, v89;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v135 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v136 = load.i64 notrap aligned readonly can_move region6 v135+32+;; v136 = load.i64 notrap aligned readonly can_move region7 v135+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v136, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v135+40+;; @001f v76 = load.i64 notrap aligned region9 v135+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v91, user2@@ -114,6 +115,6 @@;; @0022 jump block1;;;; block1:-;; v82 = load.i32 notrap aligned region9 v89+;; v82 = load.i32 notrap aligned region10 v89;; @0022 return v82;; }diff --git a/tests/disas/gc/array-new-default-f64.wat b/tests/disas/gc/array-new-default-f64.watindex f3c509a1b6..fbd45cf56e 100644--- a/tests/disas/gc/array-new-default-f64.wat+++ b/tests/disas/gc/array-new-default-f64.wat@@ -17,10 +17,11 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -64,45 +65,45 @@;; @001f store notrap aligned region3 v113, v11;; v129 = iconst.i32 -1476395002;; v130 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v131 = load.i64 notrap aligned readonly can_move region6 v130+32+;; v131 = load.i64 notrap aligned readonly can_move region7 v130+32;; @001f v36 = iadd v131, v19-;; @001f store user2 region7 v129, v36 ; v129 = -1476395002+;; @001f store user2 region8 v129, v36 ; v129 = -1476395002;; v132 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v133 = load.i32 notrap aligned readonly can_move v132-;; @001f store user2 region7 v133, v36+4+;; v133 = load.i32 notrap aligned readonly can_move region6 v132+;; @001f store user2 region8 v133, v36+4;; v134 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v134, v36+8+;; @001f istore32 user2 region8 v134, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476395002;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476395002, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31);;;; block4(v40: i32, v41: i64):;; v89 = stack_addr.i64 ss0-;; store notrap aligned region9 v40, v89+;; store notrap aligned region10 v40, v89;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v135 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v136 = load.i64 notrap aligned readonly can_move region6 v135+32+;; v136 = load.i64 notrap aligned readonly can_move region7 v135+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v136, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v135+40+;; @001f v76 = load.i64 notrap aligned region9 v135+40;; @001f v64 = iconst.i64 24;; @001f v65 = iadd v49, v64 ; v64 = 24;; @001f v78 = uadd_overflow_trap v65, v91, user2@@ -114,6 +115,6 @@;; @0022 jump block1;;;; block1:-;; v82 = load.i32 notrap aligned region9 v89+;; v82 = load.i32 notrap aligned region10 v89;; @0022 return v82;; }diff --git a/tests/disas/gc/array-new-default-funcref.wat b/tests/disas/gc/array-new-default-funcref.watindex 5571a80bf4..5b955631f0 100644--- a/tests/disas/gc/array-new-default-funcref.wat+++ b/tests/disas/gc/array-new-default-funcref.wat@@ -17,10 +17,11 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -64,45 +65,45 @@;; @001f store notrap aligned region3 v121, v11;; v136 = iconst.i32 -1476395002;; v137 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v138 = load.i64 notrap aligned readonly can_move region6 v137+32+;; v138 = load.i64 notrap aligned readonly can_move region7 v137+32;; @001f v36 = iadd v138, v19-;; @001f store user2 region7 v136, v36 ; v136 = -1476395002+;; @001f store user2 region8 v136, v36 ; v136 = -1476395002;; v139 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v140 = load.i32 notrap aligned readonly can_move v139-;; @001f store user2 region7 v140, v36+4+;; v140 = load.i32 notrap aligned readonly can_move region6 v139+;; @001f store user2 region8 v140, v36+4;; v141 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v141, v36+8+;; @001f istore32 user2 region8 v141, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476395002;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476395002, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31);;;; block4(v40: i32, v41: i64):;; v97 = stack_addr.i64 ss0-;; store notrap aligned region9 v40, v97+;; store notrap aligned region10 v40, v97;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v142 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v143 = load.i64 notrap aligned readonly can_move region6 v142+32+;; v143 = load.i64 notrap aligned readonly can_move region7 v142+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v143, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v142+40+;; @001f v76 = load.i64 notrap aligned region9 v142+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v99, user2@@ -118,7 +119,7 @@;; @001f brif v84, block6, block5(v65);;;; block5(v85: i64):-;; @001f store.i32 notrap aligned little region7 v81, v85+;; @001f store.i32 notrap aligned little region8 v81, v85;; v144 = iconst.i64 4;; v145 = iadd v85, v144 ; v144 = 4;; @001f v88 = icmp eq v145, v82@@ -128,6 +129,6 @@;; @0022 jump block1;;;; block1:-;; v90 = load.i32 notrap aligned region9 v97+;; v90 = load.i32 notrap aligned region10 v97;; @0022 return v90;; }diff --git a/tests/disas/gc/array-new-default-i16.wat b/tests/disas/gc/array-new-default-i16.watindex 9d47e1a277..aec58cbe1d 100644--- a/tests/disas/gc/array-new-default-i16.wat+++ b/tests/disas/gc/array-new-default-i16.wat@@ -17,10 +17,11 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -63,45 +64,45 @@;; @001f store notrap aligned region3 v118, v11;; v139 = iconst.i32 -1476395002;; v140 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v141 = load.i64 notrap aligned readonly can_move region6 v140+32+;; v141 = load.i64 notrap aligned readonly can_move region7 v140+32;; @001f v36 = iadd v141, v19-;; @001f store user2 region7 v139, v36 ; v139 = -1476395002+;; @001f store user2 region8 v139, v36 ; v139 = -1476395002;; v142 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v143 = load.i32 notrap aligned readonly can_move v142-;; @001f store user2 region7 v143, v36+4+;; v143 = load.i32 notrap aligned readonly can_move region6 v142+;; @001f store user2 region8 v143, v36+4;; v144 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v144, v36+8+;; @001f istore32 user2 region8 v144, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476395002;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476395002, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31);;;; block4(v40: i32, v41: i64):;; v89 = stack_addr.i64 ss0-;; store notrap aligned region9 v40, v89+;; store notrap aligned region10 v40, v89;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v145 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v146 = load.i64 notrap aligned readonly can_move region6 v145+32+;; v146 = load.i64 notrap aligned readonly can_move region7 v145+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v146, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v145+40+;; @001f v76 = load.i64 notrap aligned region9 v145+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v92, user2@@ -113,6 +114,6 @@;; @0022 jump block1;;;; block1:-;; v82 = load.i32 notrap aligned region9 v89+;; v82 = load.i32 notrap aligned region10 v89;; @0022 return v82;; }diff --git a/tests/disas/gc/array-new-default-i32.wat b/tests/disas/gc/array-new-default-i32.watindex 2dc782cd8d..a5a31fcd3a 100644--- a/tests/disas/gc/array-new-default-i32.wat+++ b/tests/disas/gc/array-new-default-i32.wat@@ -17,10 +17,11 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -64,45 +65,45 @@;; @001f store notrap aligned region3 v113, v11;; v129 = iconst.i32 -1476395002;; v130 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v131 = load.i64 notrap aligned readonly can_move region6 v130+32+;; v131 = load.i64 notrap aligned readonly can_move region7 v130+32;; @001f v36 = iadd v131, v19-;; @001f store user2 region7 v129, v36 ; v129 = -1476395002+;; @001f store user2 region8 v129, v36 ; v129 = -1476395002;; v132 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v133 = load.i32 notrap aligned readonly can_move v132-;; @001f store user2 region7 v133, v36+4+;; v133 = load.i32 notrap aligned readonly can_move region6 v132+;; @001f store user2 region8 v133, v36+4;; v134 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v134, v36+8+;; @001f istore32 user2 region8 v134, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476395002;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476395002, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31);;;; block4(v40: i32, v41: i64):;; v89 = stack_addr.i64 ss0-;; store notrap aligned region9 v40, v89+;; store notrap aligned region10 v40, v89;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v135 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v136 = load.i64 notrap aligned readonly can_move region6 v135+32+;; v136 = load.i64 notrap aligned readonly can_move region7 v135+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v136, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v135+40+;; @001f v76 = load.i64 notrap aligned region9 v135+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v91, user2@@ -114,6 +115,6 @@;; @0022 jump block1;;;; block1:-;; v82 = load.i32 notrap aligned region9 v89+;; v82 = load.i32 notrap aligned region10 v89;; @0022 return v82;; }diff --git a/tests/disas/gc/array-new-default-i64.wat b/tests/disas/gc/array-new-default-i64.watindex d20b37c1da..4aecad618a 100644--- a/tests/disas/gc/array-new-default-i64.wat+++ b/tests/disas/gc/array-new-default-i64.wat@@ -17,10 +17,11 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -64,45 +65,45 @@;; @001f store notrap aligned region3 v113, v11;; v128 = iconst.i32 -1476395002;; v129 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v130 = load.i64 notrap aligned readonly can_move region6 v129+32+;; v130 = load.i64 notrap aligned readonly can_move region7 v129+32;; @001f v36 = iadd v130, v19-;; @001f store user2 region7 v128, v36 ; v128 = -1476395002+;; @001f store user2 region8 v128, v36 ; v128 = -1476395002;; v131 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v132 = load.i32 notrap aligned readonly can_move v131-;; @001f store user2 region7 v132, v36+4+;; v132 = load.i32 notrap aligned readonly can_move region6 v131+;; @001f store user2 region8 v132, v36+4;; v133 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v133, v36+8+;; @001f istore32 user2 region8 v133, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476395002;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476395002, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31);;;; block4(v40: i32, v41: i64):;; v89 = stack_addr.i64 ss0-;; store notrap aligned region9 v40, v89+;; store notrap aligned region10 v40, v89;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v134 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v135 = load.i64 notrap aligned readonly can_move region6 v134+32+;; v135 = load.i64 notrap aligned readonly can_move region7 v134+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v135, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v134+40+;; @001f v76 = load.i64 notrap aligned region9 v134+40;; @001f v64 = iconst.i64 24;; @001f v65 = iadd v49, v64 ; v64 = 24;; @001f v78 = uadd_overflow_trap v65, v91, user2@@ -114,6 +115,6 @@;; @0022 jump block1;;;; block1:-;; v82 = load.i32 notrap aligned region9 v89+;; v82 = load.i32 notrap aligned region10 v89;; @0022 return v82;; }diff --git a/tests/disas/gc/array-new-default-i8.wat b/tests/disas/gc/array-new-default-i8.watindex b4ca8291e8..f3554511d4 100644--- a/tests/disas/gc/array-new-default-i8.wat+++ b/tests/disas/gc/array-new-default-i8.wat@@ -17,10 +17,11 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -60,45 +61,45 @@;; @001f store notrap aligned region3 v103, v11;; v117 = iconst.i32 -1476395002;; v118 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v119 = load.i64 notrap aligned readonly can_move region6 v118+32+;; v119 = load.i64 notrap aligned readonly can_move region7 v118+32;; @001f v36 = iadd v119, v19-;; @001f store user2 region7 v117, v36 ; v117 = -1476395002+;; @001f store user2 region8 v117, v36 ; v117 = -1476395002;; v120 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v121 = load.i32 notrap aligned readonly can_move v120-;; @001f store user2 region7 v121, v36+4+;; v121 = load.i32 notrap aligned readonly can_move region6 v120+;; @001f store user2 region8 v121, v36+4;; v122 = band.i64 v17, v16 ; v16 = -16-;; @001f istore32 user2 region7 v122, v36+8+;; @001f istore32 user2 region8 v122, v36+8;; @001f jump block4(v12, v36);;;; block3 cold:;; @001f v23 = iconst.i32 -1476395002;; @001f v24 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @001f v25 = load.i32 notrap aligned readonly can_move v24+;; @001f v25 = load.i32 notrap aligned readonly can_move region6 v24;; @001f v26 = iconst.i32 16;; @001f v27 = call fn0(v0, v23, v25, v10, v26) ; v23 = -1476395002, v26 = 16;; @001f v28 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001f v29 = load.i64 notrap aligned readonly can_move region6 v28+32+;; @001f v29 = load.i64 notrap aligned readonly can_move region7 v28+32;; @001f v30 = uextend.i64 v27;; @001f v31 = iadd v29, v30;; @001f jump block4(v27, v31);;;; block4(v40: i32, v41: i64):;; v88 = stack_addr.i64 ss0-;; store notrap aligned region9 v40, v88+;; store notrap aligned region10 v40, v88;; @001f v42 = iconst.i64 16;; @001f v43 = iadd v41, v42 ; v42 = 16-;; @001f store.i32 user2 region7 v2, v43+;; @001f store.i32 user2 region8 v2, v43;; @001f trapz v40, user16;; v123 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v124 = load.i64 notrap aligned readonly can_move region6 v123+32+;; v124 = load.i64 notrap aligned readonly can_move region7 v123+32;; @001f v46 = uextend.i64 v40;; @001f v49 = iadd v124, v46;; @001f v51 = iadd v49, v42 ; v42 = 16-;; @001f v52 = load.i32 user2 readonly region7 v51+;; @001f v52 = load.i32 user2 readonly region8 v51;; @001f v53 = uextend.i64 v52;; @001f v59 = icmp.i64 ugt v4, v53;; @001f trapnz v59, user17-;; @001f v76 = load.i64 notrap aligned region8 v123+40+;; @001f v76 = load.i64 notrap aligned region9 v123+40;; @001f v64 = iconst.i64 20;; @001f v65 = iadd v49, v64 ; v64 = 20;; @001f v78 = uadd_overflow_trap v65, v4, user2@@ -110,6 +111,6 @@;; @0022 jump block1;;;; block1:-;; v81 = load.i32 notrap aligned region9 v88+;; v81 = load.i32 notrap aligned region10 v88;; @0022 return v81;; }diff --git a/tests/disas/gc/call-indirect-final-type.wat b/tests/disas/gc/call-indirect-final-type.watindex 5493c6773b..b0213b3dc9 100644--- a/tests/disas/gc/call-indirect-final-type.wat+++ b/tests/disas/gc/call-indirect-final-type.wat@@ -22,9 +22,10 @@;; region3 = 1342177288 "VMTableDefinition+0x8";; region4 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region5 = 40 "VMContext+0x28"-;; region6 = 3221225488 "VMFuncRef+0x10"-;; region7 = 3221225480 "VMFuncRef+0x8"-;; region8 = 3221225496 "VMFuncRef+0x18"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 3221225488 "VMFuncRef+0x10"+;; region8 = 3221225480 "VMFuncRef+0x8"+;; region9 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -55,13 +56,13 @@;; @002b jump block3(v20);;;; block3(v17: i64):-;; @002b v23 = load.i32 user7 aligned readonly region6 v17+16+;; @002b v23 = load.i32 user7 aligned readonly region7 v17+16;; @002b v21 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @002b v22 = load.i32 notrap aligned readonly can_move v21+;; @002b v22 = load.i32 notrap aligned readonly can_move region6 v21;; @002b v24 = icmp eq v23, v22;; @002b trapz v24, user8-;; @002b v26 = load.i64 notrap aligned readonly region7 v17+8-;; @002b v27 = load.i64 notrap aligned readonly region8 v17+24+;; @002b v26 = load.i64 notrap aligned readonly region8 v17+8+;; @002b v27 = load.i64 notrap aligned readonly region9 v17+24;; @002b v28 = call_indirect sig0, v26(v27, v0, v2);; @002e jump block1;;@@ -76,9 +77,10 @@;; region3 = 1342177288 "VMTableDefinition+0x8";; region4 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region5 = 40 "VMContext+0x28"-;; region6 = 3221225488 "VMFuncRef+0x10"-;; region7 = 3221225480 "VMFuncRef+0x8"-;; region8 = 3221225496 "VMFuncRef+0x18"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 3221225488 "VMFuncRef+0x10"+;; region8 = 3221225480 "VMFuncRef+0x8"+;; region9 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -109,12 +111,12 @@;; @0035 jump block3(v20);;;; block3(v17: i64):-;; @0035 v23 = load.i32 user7 aligned readonly region6 v17+16+;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0035 v22 = load.i32 notrap aligned readonly can_move v21+;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21;; @0035 v24 = icmp eq v23, v22;; @0035 trapz v24, user8-;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8-;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24+;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8+;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24;; @0035 return_call_indirect sig0, v26(v27, v0, v2);; }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.watindex 053db9548a..ac5a35a54d 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@@ -18,12 +18,13 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"-;; region9 = 3087007744 "Stack(ss0)"-;; region10 = 3087007745 "Stack(ss1)"-;; region11 = 3087007746 "Stack(ss2)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28"+;; region10 = 3087007744 "Stack(ss0)"+;; region11 = 3087007745 "Stack(ss1)"+;; region12 = 3087007746 "Stack(ss2)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -33,11 +34,11 @@;;;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32):;; v137 = stack_addr.i64 ss2-;; store notrap aligned region11 v2, v137+;; store notrap aligned region12 v2, v137;; v138 = stack_addr.i64 ss1-;; store notrap aligned region10 v3, v138+;; store notrap aligned region11 v3, v138;; v139 = stack_addr.i64 ss0-;; store notrap aligned region9 v4, v139+;; store notrap aligned region10 v4, v139;; @0025 v14 = load.i64 notrap aligned readonly can_move region2 v0+32;; @0025 v15 = load.i32 notrap aligned region3 v14;; @0025 v16 = load.i32 notrap aligned region4 v14+4@@ -54,25 +55,25 @@;; @0025 store notrap aligned region3 v165, v14;; v260 = iconst.i32 -1476394994;; v261 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v262 = load.i64 notrap aligned readonly can_move region6 v261+32+;; v262 = load.i64 notrap aligned readonly can_move region7 v261+32;; @0025 v39 = iadd v262, v22-;; @0025 store user2 region7 v260, v39 ; v260 = -1476394994+;; @0025 store user2 region8 v260, v39 ; v260 = -1476394994;; v263 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v264 = load.i32 notrap aligned readonly can_move v263-;; @0025 store user2 region7 v264, v39+4+;; v264 = load.i32 notrap aligned readonly can_move region6 v263+;; @0025 store user2 region8 v264, v39+4;; v265 = iconst.i64 32-;; @0025 istore32 user2 region7 v265, v39+8 ; v265 = 32+;; @0025 istore32 user2 region8 v265, v39+8 ; v265 = 32;; @0025 jump block4(v15, v39);;;; block3 cold:;; @0025 v26 = iconst.i32 -1476394994;; @0025 v27 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0025 v28 = load.i32 notrap aligned readonly can_move v27+;; @0025 v28 = load.i32 notrap aligned readonly can_move region6 v27;; v151 = iconst.i32 32;; @0025 v29 = iconst.i32 16;; @0025 v30 = call fn0(v0, v26, v28, v151, v29), stack_map=[i32 @ ss2+0, i32 @ ss1+0, i32 @ ss0+0] ; v26 = -1476394994, v151 = 32, v29 = 16;; @0025 v31 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0025 v32 = load.i64 notrap aligned readonly can_move region6 v31+32+;; @0025 v32 = load.i64 notrap aligned readonly can_move region7 v31+32;; @0025 v33 = uextend.i64 v30;; @0025 v34 = iadd v32, v33;; @0025 jump block4(v30, v34)@@ -81,14 +82,14 @@;; @0025 v5 = iconst.i32 3;; @0025 v45 = iconst.i64 16;; @0025 v46 = iadd v44, v45 ; v45 = 16-;; @0025 store user2 region7 v5, v46 ; v5 = 3+;; @0025 store user2 region8 v5, v46 ; v5 = 3;; @0025 trapz v43, user16;; v266 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v267 = load.i64 notrap aligned readonly can_move region6 v266+32+;; v267 = load.i64 notrap aligned readonly can_move region7 v266+32;; @0025 v48 = uextend.i64 v43;; @0025 v51 = iadd v267, v48;; @0025 v53 = iadd v51, v45 ; v45 = 16-;; @0025 v54 = load.i32 user2 readonly region7 v53+;; @0025 v54 = load.i32 user2 readonly region8 v53;; @0025 trapz v54, user17;; @0025 v57 = uextend.i64 v54;; v142 = iconst.i64 2@@ -101,14 +102,14 @@;; @0025 v6 = iconst.i32 20;; @0025 v63 = uadd_overflow_trap v181, v6, user2 ; v6 = 20;; @0025 v67 = uadd_overflow_trap v43, v63, user2-;; v136 = load.i32 notrap aligned region11 v137+;; v136 = load.i32 notrap aligned region12 v137;; @0025 v68 = uextend.i64 v67;; @0025 v71 = iadd v267, v68;; @0025 v72 = isub v63, v6 ; v6 = 20;; @0025 v73 = uextend.i64 v72;; @0025 v74 = isub v71, v73-;; @0025 store user2 little region7 v136, v74-;; @0025 v82 = load.i32 user2 readonly region7 v53+;; @0025 store user2 little region8 v136, v74+;; @0025 v82 = load.i32 user2 readonly region8 v53;; @0025 v75 = iconst.i32 1;; v198 = icmp ugt v82, v75 ; v75 = 1;; @0025 trapz v198, user17@@ -119,15 +120,15 @@;; v207 = ishl v82, v180 ; v180 = 2;; @0025 v91 = uadd_overflow_trap v207, v6, user2 ; v6 = 20;; @0025 v95 = uadd_overflow_trap v43, v91, user2-;; v134 = load.i32 notrap aligned region10 v138+;; v134 = load.i32 notrap aligned region11 v138;; @0025 v96 = uextend.i64 v95;; @0025 v99 = iadd v267, v96;; v220 = iconst.i32 24;; @0025 v100 = isub v91, v220 ; v220 = 24;; @0025 v101 = uextend.i64 v100;; @0025 v102 = isub v99, v101-;; @0025 store user2 little region7 v134, v102-;; @0025 v110 = load.i32 user2 readonly region7 v53+;; @0025 store user2 little region8 v134, v102+;; @0025 v110 = load.i32 user2 readonly region8 v53;; v226 = icmp ugt v110, v180 ; v180 = 2;; @0025 trapz v226, user17;; @0025 v113 = uextend.i64 v110@@ -137,14 +138,14 @@;; v235 = ishl v110, v180 ; v180 = 2;; @0025 v119 = uadd_overflow_trap v235, v6, user2 ; v6 = 20;; @0025 v123 = uadd_overflow_trap v43, v119, user2-;; v132 = load.i32 notrap aligned region9 v139+;; v132 = load.i32 notrap aligned region10 v139;; @0025 v124 = uextend.i64 v123;; @0025 v127 = iadd v267, v124;; v253 = iconst.i32 28;; @0025 v128 = isub v119, v253 ; v253 = 28;; @0025 v129 = uextend.i64 v128;; @0025 v130 = isub v127, v129-;; @0025 store user2 little region7 v132, v130+;; @0025 store user2 little region8 v132, v130;; @0029 jump block1;;;; block1:diff --git a/tests/disas/gc/copying/array-new-fixed.wat b/tests/disas/gc/copying/array-new-fixed.watindex 3124d800cb..ffc39d4001 100644--- a/tests/disas/gc/copying/array-new-fixed.wat+++ b/tests/disas/gc/copying/array-new-fixed.wat@@ -15,9 +15,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -42,25 +43,25 @@;; @0025 store notrap aligned region3 v155, v14;; v248 = iconst.i32 -1476395002;; v249 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v250 = load.i64 notrap aligned readonly can_move region6 v249+32+;; v250 = load.i64 notrap aligned readonly can_move region7 v249+32;; @0025 v39 = iadd v250, v22-;; @0025 store user2 region7 v248, v39 ; v248 = -1476395002+;; @0025 store user2 region8 v248, v39 ; v248 = -1476395002;; v251 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v252 = load.i32 notrap aligned readonly can_move v251-;; @0025 store user2 region7 v252, v39+4+;; v252 = load.i32 notrap aligned readonly can_move region6 v251+;; @0025 store user2 region8 v252, v39+4;; v253 = iconst.i64 48-;; @0025 istore32 user2 region7 v253, v39+8 ; v253 = 48+;; @0025 istore32 user2 region8 v253, v39+8 ; v253 = 48;; @0025 jump block4(v15, v39);;;; block3 cold:;; @0025 v26 = iconst.i32 -1476395002;; @0025 v27 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0025 v28 = load.i32 notrap aligned readonly can_move v27+;; @0025 v28 = load.i32 notrap aligned readonly can_move region6 v27;; v140 = iconst.i32 48;; @0025 v29 = iconst.i32 16;; @0025 v30 = call fn0(v0, v26, v28, v140, v29) ; v26 = -1476395002, v140 = 48, v29 = 16;; @0025 v31 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0025 v32 = load.i64 notrap aligned readonly can_move region6 v31+32+;; @0025 v32 = load.i64 notrap aligned readonly can_move region7 v31+32;; @0025 v33 = uextend.i64 v30;; @0025 v34 = iadd v32, v33;; @0025 jump block4(v30, v34)@@ -69,14 +70,14 @@;; @0025 v5 = iconst.i32 3;; @0025 v45 = iconst.i64 16;; @0025 v46 = iadd v44, v45 ; v45 = 16-;; @0025 store user2 region7 v5, v46 ; v5 = 3+;; @0025 store user2 region8 v5, v46 ; v5 = 3;; @0025 trapz v43, user16;; v254 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v255 = load.i64 notrap aligned readonly can_move region6 v254+32+;; v255 = load.i64 notrap aligned readonly can_move region7 v254+32;; @0025 v48 = uextend.i64 v43;; @0025 v51 = iadd v255, v48;; @0025 v53 = iadd v51, v45 ; v45 = 16-;; @0025 v54 = load.i32 user2 readonly region7 v53+;; @0025 v54 = load.i32 user2 readonly region8 v53;; @0025 trapz v54, user17;; @0025 v57 = uextend.i64 v54;; v131 = iconst.i64 3@@ -93,8 +94,8 @@;; @0025 v72 = isub v63, v6 ; v6 = 24;; @0025 v73 = uextend.i64 v72;; @0025 v74 = isub v71, v73-;; @0025 store.i64 user2 little region7 v2, v74-;; @0025 v82 = load.i32 user2 readonly region7 v53+;; @0025 store.i64 user2 little region8 v2, v74+;; @0025 v82 = load.i32 user2 readonly region8 v53;; @0025 v75 = iconst.i32 1;; v187 = icmp ugt v82, v75 ; v75 = 1;; @0025 trapz v187, user17@@ -111,8 +112,8 @@;; @0025 v100 = isub v91, v209 ; v209 = 32;; @0025 v101 = uextend.i64 v100;; @0025 v102 = isub v99, v101-;; @0025 store.i64 user2 little region7 v3, v102-;; @0025 v110 = load.i32 user2 readonly region7 v53+;; @0025 store.i64 user2 little region8 v3, v102+;; @0025 v110 = load.i32 user2 readonly region8 v53;; @0025 v103 = iconst.i32 2;; v215 = icmp ugt v110, v103 ; v103 = 2;; @0025 trapz v215, user17@@ -129,7 +130,7 @@;; @0025 v128 = isub v119, v241 ; v241 = 40;; @0025 v129 = uextend.i64 v128;; @0025 v130 = isub v127, v129-;; @0025 store.i64 user2 little region7 v4, v130+;; @0025 store.i64 user2 little region8 v4, v130;; @0029 jump block1;;;; block1:diff --git a/tests/disas/gc/copying/array-new.wat b/tests/disas/gc/copying/array-new.watindex 0e1c2ee82b..45aaf52d46 100644--- a/tests/disas/gc/copying/array-new.wat+++ b/tests/disas/gc/copying/array-new.wat@@ -15,9 +15,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 134217768 "VMStoreContext+0x28"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -59,24 +60,24 @@;; @0022 store notrap aligned region3 v110, v12;; v126 = iconst.i32 -1476395002;; v127 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v128 = load.i64 notrap aligned readonly can_move region6 v127+32+;; v128 = load.i64 notrap aligned readonly can_move region7 v127+32;; @0022 v37 = iadd v128, v20-;; @0022 store user2 region7 v126, v37 ; v126 = -1476395002+;; @0022 store user2 region8 v126, v37 ; v126 = -1476395002;; v129 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v130 = load.i32 notrap aligned readonly can_move v129-;; @0022 store user2 region7 v130, v37+4+;; v130 = load.i32 notrap aligned readonly can_move region6 v129+;; @0022 store user2 region8 v130, v37+4;; v131 = band.i64 v18, v17 ; v17 = -16-;; @0022 istore32 user2 region7 v131, v37+8+;; @0022 istore32 user2 region8 v131, v37+8;; @0022 jump block4(v13, v37);;;; block3 cold:;; @0022 v24 = iconst.i32 -1476395002;; @0022 v25 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0022 v26 = load.i32 notrap aligned readonly can_move v25+;; @0022 v26 = load.i32 notrap aligned readonly can_move region6 v25;; @0022 v27 = iconst.i32 16;; @0022 v28 = call fn0(v0, v24, v26, v11, v27) ; v24 = -1476395002, v27 = 16;; @0022 v29 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0022 v30 = load.i64 notrap aligned readonly can_move region6 v29+32+;; @0022 v30 = load.i64 notrap aligned readonly can_move region7 v29+32;; @0022 v31 = uextend.i64 v28;; @0022 v32 = iadd v30, v31;; @0022 jump block4(v28, v32)@@ -84,18 +85,18 @@;; block4(v41: i32, v42: i64):;; @0022 v43 = iconst.i64 16;; @0022 v44 = iadd v42, v43 ; v43 = 16-;; @0022 store.i32 user2 region7 v3, v44+;; @0022 store.i32 user2 region8 v3, v44;; @0022 trapz v41, user16;; v132 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v133 = load.i64 notrap aligned readonly can_move region6 v132+32+;; v133 = load.i64 notrap aligned readonly can_move region7 v132+32;; @0022 v46 = uextend.i64 v41;; @0022 v49 = iadd v133, v46;; @0022 v51 = iadd v49, v43 ; v43 = 16-;; @0022 v52 = load.i32 user2 readonly region7 v51+;; @0022 v52 = load.i32 user2 readonly region8 v51;; @0022 v53 = uextend.i64 v52;; @0022 v59 = icmp.i64 ugt v5, v53;; @0022 trapnz v59, user17-;; @0022 v76 = load.i64 notrap aligned region8 v132+40+;; @0022 v76 = load.i64 notrap aligned region9 v132+40;; @0022 v64 = iconst.i64 24;; @0022 v65 = iadd v49, v64 ; v64 = 24;; @0022 v78 = uadd_overflow_trap v65, v88, user2@@ -109,7 +110,7 @@;; @0022 brif v82, block6, block5(v65);;;; block5(v83: i64):-;; @0022 store.i64 user2 little region7 v2, v83+;; @0022 store.i64 user2 little region8 v2, v83;; v134 = iconst.i64 8;; v135 = iadd v83, v134 ; v134 = 8;; @0022 v86 = icmp eq v135, v80diff --git a/tests/disas/gc/copying/br-on-cast-fail.wat b/tests/disas/gc/copying/br-on-cast-fail.watindex b13d95f47d..a7575388f7 100644--- a/tests/disas/gc/copying/br-on-cast-fail.wat+++ b/tests/disas/gc/copying/br-on-cast-fail.wat@@ -19,11 +19,12 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"-;; region6 = 2415919128 "VMFunctionImport+0x18"-;; region7 = 2415919112 "VMFunctionImport+0x8"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap"+;; region7 = 2415919128 "VMFunctionImport+0x18"+;; region8 = 2415919112 "VMFunctionImport+0x8";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -43,14 +44,14 @@;;;; block4:;; @002e v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002e v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @002e v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @002e v12 = uextend.i64 v2;; @002e v15 = iadd v14, v12;; @002e v16 = iconst.i64 4;; @002e v17 = iadd v15, v16 ; v16 = 4-;; @002e v18 = load.i32 user2 readonly region5 v17+;; @002e v18 = load.i32 user2 readonly region6 v17;; @002e v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002e v11 = load.i32 notrap aligned readonly can_move v10+;; @002e v11 = load.i32 notrap aligned readonly can_move region3 v10;; @002e v19 = icmp eq v18, v11;; @002e v20 = uextend.i32 v19;; @002e jump block5(v20)@@ -59,14 +60,14 @@;; @002e brif v21, block6, block2;;;; block6:-;; @0034 v23 = load.i64 notrap aligned readonly can_move region7 v0+56-;; @0034 v22 = load.i64 notrap aligned readonly can_move region6 v0+72+;; @0034 v23 = load.i64 notrap aligned readonly can_move region8 v0+56+;; @0034 v22 = load.i64 notrap aligned readonly can_move region7 v0+72;; @0034 call_indirect sig0, v23(v22, v0);; @0036 return;;;; block2:-;; @0038 v25 = load.i64 notrap aligned readonly can_move region7 v0+88-;; @0038 v24 = load.i64 notrap aligned readonly can_move region6 v0+104+;; @0038 v25 = load.i64 notrap aligned readonly can_move region8 v0+88+;; @0038 v24 = load.i64 notrap aligned readonly can_move region7 v0+104;; @0038 call_indirect sig0, v25(v24, v0);; @003a return;; }diff --git a/tests/disas/gc/copying/br-on-cast.wat b/tests/disas/gc/copying/br-on-cast.watindex 4d43dc1efc..cf9c98266e 100644--- a/tests/disas/gc/copying/br-on-cast.wat+++ b/tests/disas/gc/copying/br-on-cast.wat@@ -19,11 +19,12 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"-;; region6 = 2415919128 "VMFunctionImport+0x18"-;; region7 = 2415919112 "VMFunctionImport+0x8"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap"+;; region7 = 2415919128 "VMFunctionImport+0x18"+;; region8 = 2415919112 "VMFunctionImport+0x8";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -43,14 +44,14 @@;;;; block4:;; @002f v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002f v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @002f v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @002f v12 = uextend.i64 v2;; @002f v15 = iadd v14, v12;; @002f v16 = iconst.i64 4;; @002f v17 = iadd v15, v16 ; v16 = 4-;; @002f v18 = load.i32 user2 readonly region5 v17+;; @002f v18 = load.i32 user2 readonly region6 v17;; @002f v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002f v11 = load.i32 notrap aligned readonly can_move v10+;; @002f v11 = load.i32 notrap aligned readonly can_move region3 v10;; @002f v19 = icmp eq v18, v11;; @002f v20 = uextend.i32 v19;; @002f jump block5(v20)@@ -59,14 +60,14 @@;; @002f brif v21, block2, block6;;;; block6:-;; @0035 v23 = load.i64 notrap aligned readonly can_move region7 v0+56-;; @0035 v22 = load.i64 notrap aligned readonly can_move region6 v0+72+;; @0035 v23 = load.i64 notrap aligned readonly can_move region8 v0+56+;; @0035 v22 = load.i64 notrap aligned readonly can_move region7 v0+72;; @0035 call_indirect sig0, v23(v22, v0);; @0037 return;;;; block2:-;; @0039 v25 = load.i64 notrap aligned readonly can_move region7 v0+88-;; @0039 v24 = load.i64 notrap aligned readonly can_move region6 v0+104+;; @0039 v25 = load.i64 notrap aligned readonly can_move region8 v0+88+;; @0039 v24 = load.i64 notrap aligned readonly can_move region7 v0+104;; @0039 call_indirect sig0, v25(v24, v0);; @003b return;; }diff --git a/tests/disas/gc/copying/call-indirect-and-subtyping.wat b/tests/disas/gc/copying/call-indirect-and-subtyping.watindex 1f9aeac5cb..de3497996b 100644--- a/tests/disas/gc/copying/call-indirect-and-subtyping.wat+++ b/tests/disas/gc/copying/call-indirect-and-subtyping.wat@@ -21,9 +21,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -55,9 +56,9 @@;; @005c jump block3(v18);;;; block3(v15: i64):-;; @005c v21 = load.i32 user7 aligned readonly region5 v15+16+;; @005c v21 = load.i32 user7 aligned readonly region6 v15+16;; @005c v19 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @005c v20 = load.i32 notrap aligned readonly can_move v19+;; @005c v20 = load.i32 notrap aligned readonly can_move region5 v19;; @005c v22 = icmp eq v21, v20;; @005c v23 = uextend.i32 v22;; @005c brif v22, block5(v23), block4@@ -68,8 +69,8 @@;;;; block5(v25: i32):;; @005c trapz v25, user8-;; @005c v26 = load.i64 notrap aligned readonly region6 v15+8-;; @005c v27 = load.i64 notrap aligned readonly region7 v15+24+;; @005c v26 = load.i64 notrap aligned readonly region7 v15+8+;; @005c v27 = load.i64 notrap aligned readonly region8 v15+24;; @005c call_indirect sig0, v26(v27, v0);; @005f jump block1;;diff --git a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat b/tests/disas/gc/copying/funcref-in-gc-heap-new.watindex fa758d0330..21f2626cbc 100644--- a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat+++ b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat@@ -16,9 +16,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -45,40 +46,40 @@;; @0020 store notrap aligned region3 v56, v4;; v59 = iconst.i32 -1342177278;; v60 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v61 = load.i64 notrap aligned readonly can_move region6 v60+32+;; v61 = load.i64 notrap aligned readonly can_move region7 v60+32;; @0020 v29 = iadd v61, v12-;; @0020 store user2 region7 v59, v29 ; v59 = -1342177278+;; @0020 store user2 region8 v59, v29 ; v59 = -1342177278;; v62 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v63 = load.i32 notrap aligned readonly can_move v62-;; @0020 store user2 region7 v63, v29+4+;; v63 = load.i32 notrap aligned readonly can_move region6 v62+;; @0020 store user2 region8 v63, v29+4;; v64 = iconst.i64 32-;; @0020 istore32 user2 region7 v64, v29+8 ; v64 = 32+;; @0020 istore32 user2 region8 v64, v29+8 ; v64 = 32;; @0020 jump block4(v5, v29);;;; block3 cold:;; @0020 v16 = iconst.i32 -1342177278;; @0020 v17 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0020 v18 = load.i32 notrap aligned readonly can_move v17+;; @0020 v18 = load.i32 notrap aligned readonly can_move region6 v17;; @0020 v3 = iconst.i32 32;; @0020 v19 = iconst.i32 16;; @0020 v20 = call fn0(v0, v16, v18, v3, v19) ; v16 = -1342177278, v3 = 32, v19 = 16;; @0020 v21 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0020 v22 = load.i64 notrap aligned readonly can_move region6 v21+32+;; @0020 v22 = load.i64 notrap aligned readonly can_move region7 v21+32;; @0020 v23 = uextend.i64 v20;; @0020 v24 = iadd v22, v23;; @0020 jump block4(v20, v24);;;; block4(v33: i32, v34: i64):;; v41 = stack_addr.i64 ss0-;; store notrap aligned region8 v33, v41+;; store notrap aligned region9 v33, v41;; @0020 v37 = call fn1(v0, v2), stack_map=[i32 @ ss0+0];; @0020 v38 = ireduce.i32 v37;; @0020 v35 = iconst.i64 16;; @0020 v36 = iadd v34, v35 ; v35 = 16-;; @0020 store user2 little region7 v38, v36+;; @0020 store user2 little region8 v38, v36;; @0023 jump block1;;;; block1:-;; v40 = load.i32 notrap aligned region8 v41+;; v40 = load.i32 notrap aligned region9 v41;; @0023 return v40;; }diff --git a/tests/disas/gc/copying/ref-cast.wat b/tests/disas/gc/copying/ref-cast.watindex 15f946cd3a..9ec30967e2 100644--- a/tests/disas/gc/copying/ref-cast.wat+++ b/tests/disas/gc/copying/ref-cast.wat@@ -11,9 +11,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -32,14 +33,14 @@;;;; block3:;; @001e v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001e v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @001e v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @001e v12 = uextend.i64 v2;; @001e v15 = iadd v14, v12;; @001e v16 = iconst.i64 4;; @001e v17 = iadd v15, v16 ; v16 = 4-;; @001e v18 = load.i32 user2 readonly region5 v17+;; @001e v18 = load.i32 user2 readonly region6 v17;; @001e v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @001e v11 = load.i32 notrap aligned readonly can_move v10+;; @001e v11 = load.i32 notrap aligned readonly can_move region3 v10;; @001e v19 = icmp eq v18, v11;; @001e v20 = uextend.i32 v19;; @001e jump block4(v20)diff --git a/tests/disas/gc/copying/ref-test-concrete-func-type.wat b/tests/disas/gc/copying/ref-test-concrete-func-type.watindex a7dc0a75d4..0cf929f1db 100644--- a/tests/disas/gc/copying/ref-test-concrete-func-type.wat+++ b/tests/disas/gc/copying/ref-test-concrete-func-type.wat@@ -11,7 +11,8 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 3221225488 "VMFuncRef+0x10"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 3221225488 "VMFuncRef+0x10";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -27,9 +28,9 @@;; @0020 jump block3;;;; block3:-;; @0020 v9 = load.i32 notrap aligned readonly region3 v2+16+;; @0020 v9 = load.i32 notrap aligned readonly region4 v2+16;; @0020 v7 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0020 v8 = load.i32 notrap aligned readonly can_move v7+;; @0020 v8 = load.i32 notrap aligned readonly can_move region3 v7;; @0020 v10 = icmp eq v9, v8;; @0020 v11 = uextend.i32 v10;; @0020 jump block4(v11)diff --git a/tests/disas/gc/copying/ref-test-concrete-type.wat b/tests/disas/gc/copying/ref-test-concrete-type.watindex c2372d133a..dbf751b371 100644--- a/tests/disas/gc/copying/ref-test-concrete-type.wat+++ b/tests/disas/gc/copying/ref-test-concrete-type.wat@@ -11,9 +11,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -32,14 +33,14 @@;;;; block3:;; @001d v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001d v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @001d v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @001d v12 = uextend.i64 v2;; @001d v15 = iadd v14, v12;; @001d v16 = iconst.i64 4;; @001d v17 = iadd v15, v16 ; v16 = 4-;; @001d v18 = load.i32 user2 readonly region5 v17+;; @001d v18 = load.i32 user2 readonly region6 v17;; @001d v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @001d v11 = load.i32 notrap aligned readonly can_move v10+;; @001d v11 = load.i32 notrap aligned readonly can_move region3 v10;; @001d v19 = icmp eq v18, v11;; @001d v20 = uextend.i32 v19;; @001d jump block4(v20)diff --git a/tests/disas/gc/copying/struct-new-default.wat b/tests/disas/gc/copying/struct-new-default.watindex d2f5ec3cc9..7429b00c1c 100644--- a/tests/disas/gc/copying/struct-new-default.wat+++ b/tests/disas/gc/copying/struct-new-default.wat@@ -17,8 +17,9 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -43,25 +44,25 @@;; @0021 store notrap aligned region3 v57, v6;; v60 = iconst.i32 -1342177246;; v61 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v62 = load.i64 notrap aligned readonly can_move region6 v61+32+;; v62 = load.i64 notrap aligned readonly can_move region7 v61+32;; @0021 v31 = iadd v62, v14-;; @0021 store user2 region7 v60, v31 ; v60 = -1342177246+;; @0021 store user2 region8 v60, v31 ; v60 = -1342177246;; v63 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v64 = load.i32 notrap aligned readonly can_move v63-;; @0021 store user2 region7 v64, v31+4+;; v64 = load.i32 notrap aligned readonly can_move region6 v63+;; @0021 store user2 region8 v64, v31+4;; v65 = iconst.i64 32-;; @0021 istore32 user2 region7 v65, v31+8 ; v65 = 32+;; @0021 istore32 user2 region8 v65, v31+8 ; v65 = 32;; @0021 jump block4(v7, v31);;;; block3 cold:;; @0021 v18 = iconst.i32 -1342177246;; @0021 v19 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0021 v20 = load.i32 notrap aligned readonly can_move v19+;; @0021 v20 = load.i32 notrap aligned readonly can_move region6 v19;; @0021 v5 = iconst.i32 32;; @0021 v21 = iconst.i32 16;; @0021 v22 = call fn0(v0, v18, v20, v5, v21) ; v18 = -1342177246, v5 = 32, v21 = 16;; @0021 v23 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0021 v24 = load.i64 notrap aligned readonly can_move region6 v23+32+;; @0021 v24 = load.i64 notrap aligned readonly can_move region7 v23+32;; @0021 v25 = uextend.i64 v22;; @0021 v26 = iadd v24, v25;; @0021 jump block4(v22, v26)@@ -70,14 +71,14 @@;; @0021 v2 = f32const 0.0;; @0021 v37 = iconst.i64 16;; @0021 v38 = iadd v36, v37 ; v37 = 16-;; @0021 store user2 little region7 v2, v38 ; v2 = 0.0+;; @0021 store user2 little region8 v2, v38 ; v2 = 0.0;; @0021 v3 = iconst.i32 0;; @0021 v39 = iconst.i64 20;; @0021 v40 = iadd v36, v39 ; v39 = 20-;; @0021 istore8 user2 little region7 v3, v40 ; v3 = 0+;; @0021 istore8 user2 little region8 v3, v40 ; v3 = 0;; @0021 v41 = iconst.i64 24;; @0021 v42 = iadd v36, v41 ; v41 = 24-;; @0021 store user2 little region7 v3, v42 ; v3 = 0+;; @0021 store user2 little region8 v3, v42 ; v3 = 0;; @0024 jump block1;;;; block1:diff --git a/tests/disas/gc/copying/struct-new.wat b/tests/disas/gc/copying/struct-new.watindex ffa622517a..53d3910baa 100644--- a/tests/disas/gc/copying/struct-new.wat+++ b/tests/disas/gc/copying/struct-new.wat@@ -18,9 +18,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -30,7 +31,7 @@;;;; block0(v0: i64, v1: i64, v2: f32, v3: i32, v4: i32):;; v45 = stack_addr.i64 ss0-;; store notrap aligned region8 v4, v45+;; store notrap aligned region9 v4, v45;; @002a v6 = load.i64 notrap aligned readonly can_move region2 v0+32;; @002a v7 = load.i32 notrap aligned region3 v6;; @002a v8 = load.i32 notrap aligned region4 v6+4@@ -47,25 +48,25 @@;; @002a store notrap aligned region3 v60, v6;; v63 = iconst.i32 -1342177246;; v64 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v65 = load.i64 notrap aligned readonly can_move region6 v64+32+;; v65 = load.i64 notrap aligned readonly can_move region7 v64+32;; @002a v31 = iadd v65, v14-;; @002a store user2 region7 v63, v31 ; v63 = -1342177246+;; @002a store user2 region8 v63, v31 ; v63 = -1342177246;; v66 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v67 = load.i32 notrap aligned readonly can_move v66-;; @002a store user2 region7 v67, v31+4+;; v67 = load.i32 notrap aligned readonly can_move region6 v66+;; @002a store user2 region8 v67, v31+4;; v68 = iconst.i64 32-;; @002a istore32 user2 region7 v68, v31+8 ; v68 = 32+;; @002a istore32 user2 region8 v68, v31+8 ; v68 = 32;; @002a jump block4(v7, v31);;;; block3 cold:;; @002a v18 = iconst.i32 -1342177246;; @002a v19 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @002a v20 = load.i32 notrap aligned readonly can_move v19+;; @002a v20 = load.i32 notrap aligned readonly can_move region6 v19;; @002a v5 = iconst.i32 32;; @002a v21 = iconst.i32 16;; @002a v22 = call fn0(v0, v18, v20, v5, v21), stack_map=[i32 @ ss0+0] ; v18 = -1342177246, v5 = 32, v21 = 16;; @002a v23 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002a v24 = load.i64 notrap aligned readonly can_move region6 v23+32+;; @002a v24 = load.i64 notrap aligned readonly can_move region7 v23+32;; @002a v25 = uextend.i64 v22;; @002a v26 = iadd v24, v25;; @002a jump block4(v22, v26)@@ -73,14 +74,14 @@;; block4(v35: i32, v36: i64):;; @002a v37 = iconst.i64 16;; @002a v38 = iadd v36, v37 ; v37 = 16-;; @002a store.f32 user2 little region7 v2, v38+;; @002a store.f32 user2 little region8 v2, v38;; @002a v39 = iconst.i64 20;; @002a v40 = iadd v36, v39 ; v39 = 20-;; @002a istore8.i32 user2 little region7 v3, v40-;; v44 = load.i32 notrap aligned region8 v45+;; @002a istore8.i32 user2 little region8 v3, v40+;; v44 = load.i32 notrap aligned region9 v45;; @002a v41 = iconst.i64 24;; @002a v42 = iadd v36, v41 ; v41 = 24-;; @002a store user2 little region7 v44, v42+;; @002a store user2 little region8 v44, v42;; @002d jump block1;;;; block1: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.watindex da0623da33..f94c0e0aec 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@@ -16,12 +16,13 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 1073741824 "GcHeap"-;; region5 = 134217768 "VMStoreContext+0x28"-;; region6 = 3087007744 "Stack(ss0)"-;; region7 = 3087007745 "Stack(ss1)"-;; region8 = 3087007746 "Stack(ss2)"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 1073741824 "GcHeap"+;; region6 = 134217768 "VMStoreContext+0x28"+;; region7 = 3087007744 "Stack(ss0)"+;; region8 = 3087007745 "Stack(ss1)"+;; region9 = 3087007746 "Stack(ss2)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -31,28 +32,28 @@;;;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32):;; v202 = stack_addr.i64 ss2-;; store notrap aligned region8 v2, v202+;; store notrap aligned region9 v2, v202;; v203 = stack_addr.i64 ss1-;; store notrap aligned region7 v3, v203+;; store notrap aligned region8 v3, v203;; v204 = stack_addr.i64 ss0-;; store notrap aligned region6 v4, v204+;; store notrap aligned region7 v4, v204;; @0025 v14 = iconst.i32 -1476395008;; @0025 v15 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0025 v16 = load.i32 notrap aligned readonly can_move v15+;; @0025 v16 = load.i32 notrap aligned readonly can_move region3 v15;; v216 = iconst.i32 40;; @0025 v17 = iconst.i32 8;; @0025 v18 = call fn0(v0, v14, v16, v216, v17), stack_map=[i32 @ ss2+0, i32 @ ss1+0, i32 @ ss0+0] ; v14 = -1476395008, v216 = 40, v17 = 8;; @0025 v5 = iconst.i32 3;; @0025 v19 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0025 v20 = load.i64 notrap aligned readonly can_move region3 v19+32+;; @0025 v20 = load.i64 notrap aligned readonly can_move region4 v19+32;; @0025 v21 = uextend.i64 v18;; @0025 v22 = iadd v20, v21;; @0025 v23 = iconst.i64 24;; @0025 v24 = iadd v22, v23 ; v23 = 24-;; @0025 store user2 region4 v5, v24 ; v5 = 3+;; @0025 store user2 region5 v5, v24 ; v5 = 3;; @0025 trapz v18, user16;; @0025 v45 = uadd_overflow_trap v18, v216, user2 ; v216 = 40-;; v201 = load.i32 notrap aligned region8 v202+;; v201 = load.i32 notrap aligned region9 v202;; @0025 v53 = iconst.i32 1;; @0025 v54 = band v201, v53 ; v53 = 1;; @0025 v25 = iconst.i32 0@@ -62,26 +63,26 @@;; @0025 brif v58, block3, block2;;;; block2:-;; v197 = load.i32 notrap aligned region8 v202+;; v197 = load.i32 notrap aligned region9 v202;; @0025 v59 = uextend.i64 v197;; @0025 v62 = iadd.i64 v20, v59;; @0025 v63 = iconst.i64 8;; @0025 v64 = iadd v62, v63 ; v63 = 8-;; @0025 v65 = load.i64 user2 region4 v64+;; @0025 v65 = load.i64 user2 region5 v64;; @0025 v66 = iconst.i64 1;; @0025 v67 = iadd v65, v66 ; v66 = 1-;; @0025 store user2 region4 v67, v64+;; @0025 store user2 region5 v67, v64;; @0025 jump block3;;;; block3:-;; v193 = load.i32 notrap aligned region8 v202+;; v193 = load.i32 notrap aligned region9 v202;; @0025 v46 = uextend.i64 v45;; @0025 v49 = iadd.i64 v20, v46;; v206 = iconst.i64 12;; @0025 v52 = isub v49, v206 ; v206 = 12-;; @0025 store user2 little region4 v193, v52+;; @0025 store user2 little region5 v193, v52;; v309 = iadd.i64 v22, v23 ; v23 = 24-;; @0025 v81 = load.i32 user2 readonly region4 v309+;; @0025 v81 = load.i32 user2 readonly region5 v309;; v310 = iconst.i32 1;; v311 = icmp ugt v81, v310 ; v310 = 1;; @0025 trapz v311, user17@@ -96,7 +97,7 @@;; @0025 v6 = iconst.i32 28;; @0025 v90 = uadd_overflow_trap v258, v6, user2 ; v6 = 28;; @0025 v94 = uadd_overflow_trap.i32 v18, v90, user2-;; v191 = load.i32 notrap aligned region7 v203+;; v191 = load.i32 notrap aligned region8 v203;; v312 = band v191, v310 ; v310 = 1;; v313 = iconst.i32 0;; v314 = icmp eq v191, v313 ; v313 = 0@@ -105,28 +106,28 @@;; @0025 brif v107, block5, block4;;;; block4:-;; v187 = load.i32 notrap aligned region7 v203+;; v187 = load.i32 notrap aligned region8 v203;; @0025 v108 = uextend.i64 v187;; @0025 v111 = iadd.i64 v20, v108;; v315 = iconst.i64 8;; @0025 v113 = iadd v111, v315 ; v315 = 8-;; @0025 v114 = load.i64 user2 region4 v113+;; @0025 v114 = load.i64 user2 region5 v113;; v316 = iconst.i64 1;; @0025 v116 = iadd v114, v316 ; v316 = 1-;; @0025 store user2 region4 v116, v113+;; @0025 store user2 region5 v116, v113;; @0025 jump block5;;;; block5:-;; v183 = load.i32 notrap aligned region7 v203+;; v183 = load.i32 notrap aligned region8 v203;; @0025 v95 = uextend.i64 v94;; @0025 v98 = iadd.i64 v20, v95;; v271 = iconst.i32 32;; @0025 v99 = isub.i32 v90, v271 ; v271 = 32;; @0025 v100 = uextend.i64 v99;; @0025 v101 = isub v98, v100-;; @0025 store user2 little region4 v183, v101+;; @0025 store user2 little region5 v183, v101;; v317 = iadd.i64 v22, v23 ; v23 = 24-;; @0025 v130 = load.i32 user2 readonly region4 v317+;; @0025 v130 = load.i32 user2 readonly region5 v317;; v318 = iconst.i32 2;; v319 = icmp ugt v130, v318 ; v318 = 2;; @0025 trapz v319, user17@@ -140,7 +141,7 @@;; v325 = iconst.i32 28;; @0025 v139 = uadd_overflow_trap v324, v325, user2 ; v325 = 28;; @0025 v143 = uadd_overflow_trap.i32 v18, v139, user2-;; v181 = load.i32 notrap aligned region6 v204+;; v181 = load.i32 notrap aligned region7 v204;; v326 = iconst.i32 1;; v327 = band v181, v326 ; v326 = 1;; v328 = iconst.i32 0@@ -150,26 +151,26 @@;; @0025 brif v156, block7, block6;;;; block6:-;; v177 = load.i32 notrap aligned region6 v204+;; v177 = load.i32 notrap aligned region7 v204;; @0025 v157 = uextend.i64 v177;; @0025 v160 = iadd.i64 v20, v157;; v330 = iconst.i64 8;; @0025 v162 = iadd v160, v330 ; v330 = 8-;; @0025 v163 = load.i64 user2 region4 v162+;; @0025 v163 = load.i64 user2 region5 v162;; v331 = iconst.i64 1;; @0025 v165 = iadd v163, v331 ; v331 = 1-;; @0025 store user2 region4 v165, v162+;; @0025 store user2 region5 v165, v162;; @0025 jump block7;;;; block7:-;; v173 = load.i32 notrap aligned region6 v204+;; v173 = load.i32 notrap aligned region7 v204;; @0025 v144 = uextend.i64 v143;; @0025 v147 = iadd.i64 v20, v144;; v303 = iconst.i32 36;; @0025 v148 = isub.i32 v139, v303 ; v303 = 36;; @0025 v149 = uextend.i64 v148;; @0025 v150 = isub v147, v149-;; @0025 store user2 little region4 v173, v150+;; @0025 store user2 little region5 v173, v150;; @0029 jump block1;;;; block1:diff --git a/tests/disas/gc/drc/array-new-fixed.wat b/tests/disas/gc/drc/array-new-fixed.watindex 05a3bebec6..ed3e20202a 100644--- a/tests/disas/gc/drc/array-new-fixed.wat+++ b/tests/disas/gc/drc/array-new-fixed.wat@@ -13,9 +13,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 1073741824 "GcHeap"-;; region5 = 134217768 "VMStoreContext+0x28"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 1073741824 "GcHeap"+;; region6 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -26,25 +27,25 @@;; block0(v0: i64, v1: i64, v2: i64, v3: i64, v4: i64):;; @0025 v14 = iconst.i32 -1476395008;; @0025 v15 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0025 v16 = load.i32 notrap aligned readonly can_move v15+;; @0025 v16 = load.i32 notrap aligned readonly can_move region3 v15;; v119 = iconst.i32 56;; @0025 v17 = iconst.i32 8;; @0025 v18 = call fn0(v0, v14, v16, v119, v17) ; v14 = -1476395008, v119 = 56, v17 = 8;; @0025 v5 = iconst.i32 3;; @0025 v19 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0025 v20 = load.i64 notrap aligned readonly can_move region3 v19+32+;; @0025 v20 = load.i64 notrap aligned readonly can_move region4 v19+32;; @0025 v21 = uextend.i64 v18;; @0025 v22 = iadd v20, v21;; v110 = iconst.i64 24;; @0025 v24 = iadd v22, v110 ; v110 = 24-;; @0025 store user2 region4 v5, v24 ; v5 = 3+;; @0025 store user2 region5 v5, v24 ; v5 = 3;; @0025 trapz v18, user16;; @0025 v45 = uadd_overflow_trap v18, v119, user2 ; v119 = 56;; @0025 v46 = uextend.i64 v45;; @0025 v49 = iadd v20, v46;; @0025 v52 = isub v49, v110 ; v110 = 24-;; @0025 store user2 little region4 v2, v52-;; @0025 v60 = load.i32 user2 readonly region4 v24+;; @0025 store user2 little region5 v2, v52+;; @0025 v60 = load.i32 user2 readonly region5 v24;; @0025 v53 = iconst.i32 1;; v150 = icmp ugt v60, v53 ; v53 = 1;; @0025 trapz v150, user17@@ -64,8 +65,8 @@;; @0025 v78 = isub v69, v172 ; v172 = 40;; @0025 v79 = uextend.i64 v78;; @0025 v80 = isub v77, v79-;; @0025 store user2 little region4 v3, v80-;; @0025 v88 = load.i32 user2 readonly region4 v24+;; @0025 store user2 little region5 v3, v80+;; @0025 v88 = load.i32 user2 readonly region5 v24;; @0025 v81 = iconst.i32 2;; v178 = icmp ugt v88, v81 ; v81 = 2;; @0025 trapz v178, user17@@ -82,7 +83,7 @@;; @0025 v106 = isub v97, v205 ; v205 = 48;; @0025 v107 = uextend.i64 v106;; @0025 v108 = isub v105, v107-;; @0025 store user2 little region4 v4, v108+;; @0025 store user2 little region5 v4, v108;; @0029 jump block1;;;; block1:diff --git a/tests/disas/gc/drc/array-new.wat b/tests/disas/gc/drc/array-new.watindex 739be6acf9..95110692d3 100644--- a/tests/disas/gc/drc/array-new.wat+++ b/tests/disas/gc/drc/array-new.wat@@ -13,9 +13,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 1073741824 "GcHeap"-;; region5 = 134217768 "VMStoreContext+0x28"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 1073741824 "GcHeap"+;; region6 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -36,18 +37,18 @@;; @0022 v11 = uadd_overflow_trap v4, v73, user18 ; v4 = 32;; @0022 v12 = iconst.i32 -1476395008;; @0022 v13 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0022 v14 = load.i32 notrap aligned readonly can_move v13+;; @0022 v14 = load.i32 notrap aligned readonly can_move region3 v13;; v70 = iconst.i32 8;; @0022 v16 = call fn0(v0, v12, v14, v11, v70) ; v12 = -1476395008, v70 = 8;; @0022 v17 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0022 v18 = load.i64 notrap aligned readonly can_move region3 v17+32+;; @0022 v18 = load.i64 notrap aligned readonly can_move region4 v17+32;; @0022 v19 = uextend.i64 v16;; @0022 v20 = iadd v18, v19;; @0022 v21 = iconst.i64 24;; @0022 v22 = iadd v20, v21 ; v21 = 24-;; @0022 store user2 region4 v3, v22+;; @0022 store user2 region5 v3, v22;; @0022 trapz v16, user16-;; @0022 v54 = load.i64 notrap aligned region5 v17+40+;; @0022 v54 = load.i64 notrap aligned region6 v17+40;; @0022 v43 = iadd v20, v8 ; v8 = 32;; @0022 v56 = uadd_overflow_trap v43, v66, user2;; @0022 v55 = iadd v18, v54@@ -60,7 +61,7 @@;; @0022 brif v60, block3, block2(v43);;;; block2(v61: i64):-;; @0022 store.i64 user2 little region4 v2, v61+;; @0022 store.i64 user2 little region5 v2, v61;; v91 = iconst.i64 8;; v92 = iadd v61, v91 ; v91 = 8;; @0022 v64 = icmp eq v92, v58diff --git a/tests/disas/gc/drc/br-on-cast-fail.wat b/tests/disas/gc/drc/br-on-cast-fail.watindex f23d07eee3..6117191fd9 100644--- a/tests/disas/gc/drc/br-on-cast-fail.wat+++ b/tests/disas/gc/drc/br-on-cast-fail.wat@@ -20,11 +20,12 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"-;; region6 = 2415919128 "VMFunctionImport+0x18"-;; region7 = 2415919112 "VMFunctionImport+0x8"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap"+;; region7 = 2415919128 "VMFunctionImport+0x18"+;; region8 = 2415919112 "VMFunctionImport+0x8";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -44,14 +45,14 @@;;;; block4:;; @002e v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002e v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @002e v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @002e v12 = uextend.i64 v2;; @002e v15 = iadd v14, v12;; @002e v16 = iconst.i64 4;; @002e v17 = iadd v15, v16 ; v16 = 4-;; @002e v18 = load.i32 user2 readonly region5 v17+;; @002e v18 = load.i32 user2 readonly region6 v17;; @002e v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002e v11 = load.i32 notrap aligned readonly can_move v10+;; @002e v11 = load.i32 notrap aligned readonly can_move region3 v10;; @002e v19 = icmp eq v18, v11;; @002e v20 = uextend.i32 v19;; @002e jump block5(v20)@@ -60,14 +61,14 @@;; @002e brif v21, block6, block2;;;; block6:-;; @0034 v23 = load.i64 notrap aligned readonly can_move region7 v0+56-;; @0034 v22 = load.i64 notrap aligned readonly can_move region6 v0+72+;; @0034 v23 = load.i64 notrap aligned readonly can_move region8 v0+56+;; @0034 v22 = load.i64 notrap aligned readonly can_move region7 v0+72;; @0034 call_indirect sig0, v23(v22, v0);; @0036 return;;;; block2:-;; @0038 v25 = load.i64 notrap aligned readonly can_move region7 v0+88-;; @0038 v24 = load.i64 notrap aligned readonly can_move region6 v0+104+;; @0038 v25 = load.i64 notrap aligned readonly can_move region8 v0+88+;; @0038 v24 = load.i64 notrap aligned readonly can_move region7 v0+104;; @0038 call_indirect sig0, v25(v24, v0);; @003a return;; }diff --git a/tests/disas/gc/drc/br-on-cast.wat b/tests/disas/gc/drc/br-on-cast.watindex 3e543594c0..abe8528af5 100644--- a/tests/disas/gc/drc/br-on-cast.wat+++ b/tests/disas/gc/drc/br-on-cast.wat@@ -20,11 +20,12 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"-;; region6 = 2415919128 "VMFunctionImport+0x18"-;; region7 = 2415919112 "VMFunctionImport+0x8"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap"+;; region7 = 2415919128 "VMFunctionImport+0x18"+;; region8 = 2415919112 "VMFunctionImport+0x8";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -44,14 +45,14 @@;;;; block4:;; @002f v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002f v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @002f v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @002f v12 = uextend.i64 v2;; @002f v15 = iadd v14, v12;; @002f v16 = iconst.i64 4;; @002f v17 = iadd v15, v16 ; v16 = 4-;; @002f v18 = load.i32 user2 readonly region5 v17+;; @002f v18 = load.i32 user2 readonly region6 v17;; @002f v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002f v11 = load.i32 notrap aligned readonly can_move v10+;; @002f v11 = load.i32 notrap aligned readonly can_move region3 v10;; @002f v19 = icmp eq v18, v11;; @002f v20 = uextend.i32 v19;; @002f jump block5(v20)@@ -60,14 +61,14 @@;; @002f brif v21, block2, block6;;;; block6:-;; @0035 v23 = load.i64 notrap aligned readonly can_move region7 v0+56-;; @0035 v22 = load.i64 notrap aligned readonly can_move region6 v0+72+;; @0035 v23 = load.i64 notrap aligned readonly can_move region8 v0+56+;; @0035 v22 = load.i64 notrap aligned readonly can_move region7 v0+72;; @0035 call_indirect sig0, v23(v22, v0);; @0037 return;;;; block2:-;; @0039 v25 = load.i64 notrap aligned readonly can_move region7 v0+88-;; @0039 v24 = load.i64 notrap aligned readonly can_move region6 v0+104+;; @0039 v25 = load.i64 notrap aligned readonly can_move region8 v0+88+;; @0039 v24 = load.i64 notrap aligned readonly can_move region7 v0+104;; @0039 call_indirect sig0, v25(v24, v0);; @003b return;; }diff --git a/tests/disas/gc/drc/call-indirect-and-subtyping.wat b/tests/disas/gc/drc/call-indirect-and-subtyping.watindex cd6e16a8aa..384a18c46e 100644--- a/tests/disas/gc/drc/call-indirect-and-subtyping.wat+++ b/tests/disas/gc/drc/call-indirect-and-subtyping.wat@@ -22,9 +22,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -56,9 +57,9 @@;; @005c jump block3(v18);;;; block3(v15: i64):-;; @005c v21 = load.i32 user7 aligned readonly region5 v15+16+;; @005c v21 = load.i32 user7 aligned readonly region6 v15+16;; @005c v19 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @005c v20 = load.i32 notrap aligned readonly can_move v19+;; @005c v20 = load.i32 notrap aligned readonly can_move region5 v19;; @005c v22 = icmp eq v21, v20;; @005c v23 = uextend.i32 v22;; @005c brif v22, block5(v23), block4@@ -69,8 +70,8 @@;;;; block5(v25: i32):;; @005c trapz v25, user8-;; @005c v26 = load.i64 notrap aligned readonly region6 v15+8-;; @005c v27 = load.i64 notrap aligned readonly region7 v15+24+;; @005c v26 = load.i64 notrap aligned readonly region7 v15+8+;; @005c v27 = load.i64 notrap aligned readonly region8 v15+24;; @005c call_indirect sig0, v26(v27, v0);; @005f jump block1;;diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat b/tests/disas/gc/drc/funcref-in-gc-heap-new.watindex e3701489d2..6fcedcd5cd 100644--- a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat+++ b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat@@ -14,9 +14,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 1073741824 "GcHeap"-;; region5 = 3087007744 "Stack(ss0)"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 1073741824 "GcHeap"+;; region6 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -29,24 +30,24 @@;; block0(v0: i64, v1: i64, v2: i64):;; @0020 v4 = iconst.i32 -1342177280;; @0020 v5 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0020 v6 = load.i32 notrap aligned readonly can_move v5+;; @0020 v6 = load.i32 notrap aligned readonly can_move region3 v5;; @0020 v3 = iconst.i32 32;; @0020 v7 = iconst.i32 8;; @0020 v8 = call fn0(v0, v4, v6, v3, v7) ; v4 = -1342177280, v3 = 32, v7 = 8;; v21 = stack_addr.i64 ss0-;; store notrap aligned region5 v8, v21+;; store notrap aligned region6 v8, v21;; @0020 v15 = call fn1(v0, v2), stack_map=[i32 @ ss0+0];; @0020 v16 = ireduce.i32 v15;; @0020 v9 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0020 v10 = load.i64 notrap aligned readonly can_move region3 v9+32+;; @0020 v10 = load.i64 notrap aligned readonly can_move region4 v9+32;; @0020 v11 = uextend.i64 v8;; @0020 v12 = iadd v10, v11;; @0020 v13 = iconst.i64 24;; @0020 v14 = iadd v12, v13 ; v13 = 24-;; @0020 store user2 little region4 v16, v14+;; @0020 store user2 little region5 v16, v14;; @0023 jump block1;;;; block1:-;; v18 = load.i32 notrap aligned region5 v21+;; v18 = load.i32 notrap aligned region6 v21;; @0023 return v18;; }diff --git a/tests/disas/gc/drc/ref-cast.wat b/tests/disas/gc/drc/ref-cast.watindex 58cac4da81..1d94bdf3a1 100644--- a/tests/disas/gc/drc/ref-cast.wat+++ b/tests/disas/gc/drc/ref-cast.wat@@ -12,9 +12,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -33,14 +34,14 @@;;;; block3:;; @001e v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001e v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @001e v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @001e v12 = uextend.i64 v2;; @001e v15 = iadd v14, v12;; @001e v16 = iconst.i64 4;; @001e v17 = iadd v15, v16 ; v16 = 4-;; @001e v18 = load.i32 user2 readonly region5 v17+;; @001e v18 = load.i32 user2 readonly region6 v17;; @001e v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @001e v11 = load.i32 notrap aligned readonly can_move v10+;; @001e v11 = load.i32 notrap aligned readonly can_move region3 v10;; @001e v19 = icmp eq v18, v11;; @001e v20 = uextend.i32 v19;; @001e jump block4(v20)diff --git a/tests/disas/gc/drc/ref-test-concrete-func-type.wat b/tests/disas/gc/drc/ref-test-concrete-func-type.watindex 78be028877..f06ba52ee1 100644--- a/tests/disas/gc/drc/ref-test-concrete-func-type.wat+++ b/tests/disas/gc/drc/ref-test-concrete-func-type.wat@@ -12,7 +12,8 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 3221225488 "VMFuncRef+0x10"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 3221225488 "VMFuncRef+0x10";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -28,9 +29,9 @@;; @0020 jump block3;;;; block3:-;; @0020 v9 = load.i32 notrap aligned readonly region3 v2+16+;; @0020 v9 = load.i32 notrap aligned readonly region4 v2+16;; @0020 v7 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0020 v8 = load.i32 notrap aligned readonly can_move v7+;; @0020 v8 = load.i32 notrap aligned readonly can_move region3 v7;; @0020 v10 = icmp eq v9, v8;; @0020 v11 = uextend.i32 v10;; @0020 jump block4(v11)diff --git a/tests/disas/gc/drc/ref-test-concrete-type.wat b/tests/disas/gc/drc/ref-test-concrete-type.watindex 4c5873c417..5b61739167 100644--- a/tests/disas/gc/drc/ref-test-concrete-type.wat+++ b/tests/disas/gc/drc/ref-test-concrete-type.wat@@ -12,9 +12,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -33,14 +34,14 @@;;;; block3:;; @001d v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001d v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @001d v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @001d v12 = uextend.i64 v2;; @001d v15 = iadd v14, v12;; @001d v16 = iconst.i64 4;; @001d v17 = iadd v15, v16 ; v16 = 4-;; @001d v18 = load.i32 user2 readonly region5 v17+;; @001d v18 = load.i32 user2 readonly region6 v17;; @001d v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @001d v11 = load.i32 notrap aligned readonly can_move v10+;; @001d v11 = load.i32 notrap aligned readonly can_move region3 v10;; @001d v19 = icmp eq v18, v11;; @001d v20 = uextend.i32 v19;; @001d jump block4(v20)diff --git a/tests/disas/gc/drc/struct-new-default.wat b/tests/disas/gc/drc/struct-new-default.watindex b3e9470401..6fe2e94b0a 100644--- a/tests/disas/gc/drc/struct-new-default.wat+++ b/tests/disas/gc/drc/struct-new-default.wat@@ -15,9 +15,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 1073741824 "GcHeap"-;; region5 = 134217768 "VMStoreContext+0x28"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 1073741824 "GcHeap"+;; region6 = 134217768 "VMStoreContext+0x28";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -28,29 +29,29 @@;; block0(v0: i64, v1: i64):;; @0021 v6 = iconst.i32 -1342177280;; @0021 v7 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0021 v8 = load.i32 notrap aligned readonly can_move v7+;; @0021 v8 = load.i32 notrap aligned readonly can_move region3 v7;; @0021 v5 = iconst.i32 40;; @0021 v9 = iconst.i32 8;; @0021 v10 = call fn0(v0, v6, v8, v5, v9) ; v6 = -1342177280, v5 = 40, v9 = 8;; @0021 v2 = f32const 0.0;; @0021 v11 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0021 v12 = load.i64 notrap aligned readonly can_move region3 v11+32+;; @0021 v12 = load.i64 notrap aligned readonly can_move region4 v11+32;; @0021 v13 = uextend.i64 v10;; @0021 v14 = iadd v12, v13;; @0021 v15 = iconst.i64 24;; @0021 v16 = iadd v14, v15 ; v15 = 24-;; @0021 store user2 little region4 v2, v16 ; v2 = 0.0+;; @0021 store user2 little region5 v2, v16 ; v2 = 0.0;; @0021 v3 = iconst.i32 0;; @0021 v17 = iconst.i64 28;; @0021 v18 = iadd v14, v17 ; v17 = 28-;; @0021 istore8 user2 little region4 v3, v18 ; v3 = 0+;; @0021 istore8 user2 little region5 v3, v18 ; v3 = 0;; @0021 jump block3;;;; block3:;; v59 = iconst.i32 0;; @0021 v19 = iconst.i64 32;; @0021 v20 = iadd.i64 v14, v19 ; v19 = 32-;; @0021 store user2 little region4 v59, v20 ; v59 = 0+;; @0021 store user2 little region5 v59, v20 ; v59 = 0;; @0024 jump block1;;;; block1:diff --git a/tests/disas/gc/drc/struct-new.wat b/tests/disas/gc/drc/struct-new.watindex 41a9ada503..474da90c4c 100644--- a/tests/disas/gc/drc/struct-new.wat+++ b/tests/disas/gc/drc/struct-new.wat@@ -16,10 +16,11 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 1073741824 "GcHeap"-;; region5 = 134217768 "VMStoreContext+0x28"-;; region6 = 3087007744 "Stack(ss0)"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 1073741824 "GcHeap"+;; region6 = 134217768 "VMStoreContext+0x28"+;; region7 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -29,24 +30,24 @@;;;; block0(v0: i64, v1: i64, v2: f32, v3: i32, v4: i32):;; v52 = stack_addr.i64 ss0-;; store notrap aligned region6 v4, v52+;; store notrap aligned region7 v4, v52;; @002a v6 = iconst.i32 -1342177280;; @002a v7 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002a v8 = load.i32 notrap aligned readonly can_move v7+;; @002a v8 = load.i32 notrap aligned readonly can_move region3 v7;; @002a v5 = iconst.i32 40;; @002a v9 = iconst.i32 8;; @002a v10 = call fn0(v0, v6, v8, v5, v9), stack_map=[i32 @ ss0+0] ; v6 = -1342177280, v5 = 40, v9 = 8;; @002a v11 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002a v12 = load.i64 notrap aligned readonly can_move region3 v11+32+;; @002a v12 = load.i64 notrap aligned readonly can_move region4 v11+32;; @002a v13 = uextend.i64 v10;; @002a v14 = iadd v12, v13;; @002a v15 = iconst.i64 24;; @002a v16 = iadd v14, v15 ; v15 = 24-;; @002a store user2 little region4 v2, v16+;; @002a store user2 little region5 v2, v16;; @002a v17 = iconst.i64 28;; @002a v18 = iadd v14, v17 ; v17 = 28-;; @002a istore8 user2 little region4 v3, v18-;; v51 = load.i32 notrap aligned region6 v52+;; @002a istore8 user2 little region5 v3, v18+;; v51 = load.i32 notrap aligned region7 v52;; @002a v21 = iconst.i32 1;; @002a v22 = band v51, v21 ; v21 = 1;; @002a v23 = iconst.i32 0@@ -60,16 +61,16 @@;; @002a v30 = iadd.i64 v12, v27;; @002a v31 = iconst.i64 8;; @002a v32 = iadd v30, v31 ; v31 = 8-;; @002a v33 = load.i64 user2 region4 v32+;; @002a v33 = load.i64 user2 region5 v32;; @002a v34 = iconst.i64 1;; @002a v35 = iadd v33, v34 ; v34 = 1-;; @002a store user2 region4 v35, v32+;; @002a store user2 region5 v35, v32;; @002a jump block3;;;; block3:;; @002a v19 = iconst.i64 32;; @002a v20 = iadd.i64 v14, v19 ; v19 = 32-;; @002a store.i32 user2 little region4 v51, v20+;; @002a store.i32 user2 little region5 v51, v20;; @002d jump block1;;;; block1: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.watindex 997cf9f4a4..04900b1517 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@@ -20,10 +20,11 @@;; region4 = 134217768 "VMStoreContext+0x28";; region5 = 134217760 "VMStoreContext+0x20";; region6 = 40 "VMContext+0x28"-;; region7 = 1073741824 "GcHeap"-;; region8 = 3087007744 "Stack(ss0)"-;; region9 = 3087007745 "Stack(ss1)"-;; region10 = 3087007746 "Stack(ss2)"+;; region7 = 3355443200 "TypeIdsArray+0x0"+;; region8 = 1073741824 "GcHeap"+;; region9 = 3087007744 "Stack(ss0)"+;; region10 = 3087007745 "Stack(ss1)"+;; region11 = 3087007746 "Stack(ss2)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -33,11 +34,11 @@;;;; block0(v0: i64, v1: i64, v2: i32, v3: i32, v4: i32):;; v131 = stack_addr.i64 ss2-;; store notrap aligned region10 v2, v131+;; store notrap aligned region11 v2, v131;; v132 = stack_addr.i64 ss1-;; store notrap aligned region9 v3, v132+;; store notrap aligned region10 v3, v132;; v133 = stack_addr.i64 ss0-;; store notrap aligned region8 v4, v133+;; store notrap aligned region9 v4, v133;; @0025 v17 = load.i64 notrap aligned readonly can_move region2 v0+32;; @0025 v18 = load.i32 notrap aligned region3 v17;; v151 = iconst.i32 7@@ -58,25 +59,25 @@;; v256 = band.i32 v21, v157 ; v157 = -8;; v257 = uextend.i64 v256;; @0025 v34 = iadd v32, v257-;; @0025 store user2 region7 v158, v34 ; v158 = -1476394984+;; @0025 store user2 region8 v158, v34 ; v158 = -1476394984;; @0025 v37 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @0025 v38 = load.i32 notrap aligned readonly can_move v37-;; @0025 store user2 region7 v38, v34+4+;; @0025 v38 = load.i32 notrap aligned readonly can_move region7 v37+;; @0025 store user2 region8 v38, v34+4;; @0025 store.i32 notrap aligned region3 v24, v17;; @0025 v5 = iconst.i32 3;; @0025 v39 = iconst.i64 8;; @0025 v40 = iadd v34, v39 ; v39 = 8-;; @0025 store user2 region7 v5, v40 ; v5 = 3+;; @0025 store user2 region8 v5, v40 ; v5 = 3;; @0025 trapz v256, user16;; v258 = iconst.i32 24;; @0025 v61 = uadd_overflow_trap v256, v258, user2 ; v258 = 24-;; v130 = load.i32 notrap aligned region10 v131+;; v130 = load.i32 notrap aligned region11 v131;; @0025 v62 = uextend.i64 v61;; @0025 v65 = iadd v32, v62;; v135 = iconst.i64 12;; @0025 v68 = isub v65, v135 ; v135 = 12-;; @0025 store user2 little region7 v130, v68-;; @0025 v76 = load.i32 user2 readonly region7 v40+;; @0025 store user2 little region8 v130, v68+;; @0025 v76 = load.i32 user2 readonly region8 v40;; @0025 v69 = iconst.i32 1;; v196 = icmp ugt v76, v69 ; v69 = 1;; @0025 trapz v196, user17@@ -91,15 +92,15 @@;; @0025 v6 = iconst.i32 12;; @0025 v85 = uadd_overflow_trap v205, v6, user2 ; v6 = 12;; @0025 v89 = uadd_overflow_trap v256, v85, user2-;; v128 = load.i32 notrap aligned region9 v132+;; v128 = load.i32 notrap aligned region10 v132;; @0025 v90 = uextend.i64 v89;; @0025 v93 = iadd v32, v90;; v218 = iconst.i32 16;; @0025 v94 = isub v85, v218 ; v218 = 16;; @0025 v95 = uextend.i64 v94;; @0025 v96 = isub v93, v95-;; @0025 store user2 little region7 v128, v96-;; @0025 v104 = load.i32 user2 readonly region7 v40+;; @0025 store user2 little region8 v128, v96+;; @0025 v104 = load.i32 user2 readonly region8 v40;; v224 = icmp ugt v104, v175 ; v175 = 2;; @0025 trapz v224, user17;; @0025 v107 = uextend.i64 v104@@ -109,14 +110,14 @@;; v233 = ishl v104, v175 ; v175 = 2;; @0025 v113 = uadd_overflow_trap v233, v6, user2 ; v6 = 12;; @0025 v117 = uadd_overflow_trap v256, v113, user2-;; v126 = load.i32 notrap aligned region8 v133+;; v126 = load.i32 notrap aligned region9 v133;; @0025 v118 = uextend.i64 v117;; @0025 v121 = iadd v32, v118;; v250 = iconst.i32 20;; @0025 v122 = isub v113, v250 ; v250 = 20;; @0025 v123 = uextend.i64 v122;; @0025 v124 = isub v121, v123-;; @0025 store user2 little region7 v126, v124+;; @0025 store user2 little region8 v126, v124;; @0029 jump block1;;;; block3 cold:diff --git a/tests/disas/gc/null/array-new-fixed.wat b/tests/disas/gc/null/array-new-fixed.watindex 0732eaab81..1f00d9f41e 100644--- a/tests/disas/gc/null/array-new-fixed.wat+++ b/tests/disas/gc/null/array-new-fixed.wat@@ -17,7 +17,8 @@;; region4 = 134217768 "VMStoreContext+0x28";; region5 = 134217760 "VMStoreContext+0x20";; region6 = 40 "VMContext+0x28"-;; region7 = 1073741824 "GcHeap"+;; region7 = 3355443200 "TypeIdsArray+0x0"+;; region8 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -46,15 +47,15 @@;; v244 = band.i32 v21, v148 ; v148 = -8;; v245 = uextend.i64 v244;; @0025 v34 = iadd v32, v245-;; @0025 store user2 region7 v149, v34 ; v149 = -1476394968+;; @0025 store user2 region8 v149, v34 ; v149 = -1476394968;; @0025 v37 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @0025 v38 = load.i32 notrap aligned readonly can_move v37-;; @0025 store user2 region7 v38, v34+4+;; @0025 v38 = load.i32 notrap aligned readonly can_move region7 v37+;; @0025 store user2 region8 v38, v34+4;; @0025 store.i32 notrap aligned region3 v24, v17;; @0025 v5 = iconst.i32 3;; @0025 v8 = iconst.i64 8;; @0025 v40 = iadd v34, v8 ; v8 = 8-;; @0025 store user2 region7 v5, v40 ; v5 = 3+;; @0025 store user2 region8 v5, v40 ; v5 = 3;; @0025 trapz v244, user16;; v246 = iconst.i32 40;; @0025 v61 = uadd_overflow_trap v244, v246, user2 ; v246 = 40@@ -62,8 +63,8 @@;; @0025 v65 = iadd v32, v62;; v126 = iconst.i64 24;; @0025 v68 = isub v65, v126 ; v126 = 24-;; @0025 store.i64 user2 little region7 v2, v68-;; @0025 v76 = load.i32 user2 readonly region7 v40+;; @0025 store.i64 user2 little region8 v2, v68+;; @0025 v76 = load.i32 user2 readonly region8 v40;; @0025 v69 = iconst.i32 1;; v185 = icmp ugt v76, v69 ; v69 = 1;; @0025 trapz v185, user17@@ -83,8 +84,8 @@;; @0025 v94 = isub v85, v134 ; v134 = 24;; @0025 v95 = uextend.i64 v94;; @0025 v96 = isub v93, v95-;; @0025 store.i64 user2 little region7 v3, v96-;; @0025 v104 = load.i32 user2 readonly region7 v40+;; @0025 store.i64 user2 little region8 v3, v96+;; @0025 v104 = load.i32 user2 readonly region8 v40;; @0025 v97 = iconst.i32 2;; v212 = icmp ugt v104, v97 ; v97 = 2;; @0025 trapz v212, user17@@ -101,7 +102,7 @@;; @0025 v122 = isub v113, v238 ; v238 = 32;; @0025 v123 = uextend.i64 v122;; @0025 v124 = isub v121, v123-;; @0025 store.i64 user2 little region7 v4, v124+;; @0025 store.i64 user2 little region8 v4, v124;; @0029 jump block1;;;; block3 cold:diff --git a/tests/disas/gc/null/array-new.wat b/tests/disas/gc/null/array-new.watindex 91bcc42186..e1c329171e 100644--- a/tests/disas/gc/null/array-new.wat+++ b/tests/disas/gc/null/array-new.wat@@ -17,7 +17,8 @@;; region4 = 134217768 "VMStoreContext+0x28";; region5 = 134217760 "VMStoreContext+0x20";; region6 = 40 "VMContext+0x28"-;; region7 = 1073741824 "GcHeap"+;; region7 = 3355443200 "TypeIdsArray+0x0"+;; region8 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -59,14 +60,14 @@;; v116 = band.i32 v19, v98 ; v98 = -8;; v117 = uextend.i64 v116;; @0022 v32 = iadd v30, v117-;; @0022 store user2 region7 v99, v32+;; @0022 store user2 region8 v99, v32;; @0022 v35 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @0022 v36 = load.i32 notrap aligned readonly can_move v35-;; @0022 store user2 region7 v36, v32+4+;; @0022 v36 = load.i32 notrap aligned readonly can_move region7 v35+;; @0022 store user2 region8 v36, v32+4;; @0022 store.i32 notrap aligned region3 v22, v15;; @0022 v6 = iconst.i64 8;; @0022 v38 = iadd v32, v6 ; v6 = 8-;; @0022 store.i32 user2 region7 v3, v38+;; @0022 store.i32 user2 region8 v3, v38;; @0022 trapz v116, user16;; @0022 v70 = load.i64 notrap aligned region4 v24+40;; @0022 v58 = iconst.i64 16@@ -81,7 +82,7 @@;; @0022 brif v76, block5, block4(v59);;;; block4(v77: i64):-;; @0022 store.i64 user2 little region7 v2, v77+;; @0022 store.i64 user2 little region8 v2, v77;; v118 = iconst.i64 8;; v119 = iadd v77, v118 ; v118 = 8;; @0022 v80 = icmp eq v119, v74diff --git a/tests/disas/gc/null/br-on-cast-fail.wat b/tests/disas/gc/null/br-on-cast-fail.watindex 99eff6a919..de55365a1d 100644--- a/tests/disas/gc/null/br-on-cast-fail.wat+++ b/tests/disas/gc/null/br-on-cast-fail.wat@@ -20,11 +20,12 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"-;; region6 = 2415919128 "VMFunctionImport+0x18"-;; region7 = 2415919112 "VMFunctionImport+0x8"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap"+;; region7 = 2415919128 "VMFunctionImport+0x18"+;; region8 = 2415919112 "VMFunctionImport+0x8";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -44,14 +45,14 @@;;;; block4:;; @002e v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002e v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @002e v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @002e v12 = uextend.i64 v2;; @002e v15 = iadd v14, v12;; @002e v16 = iconst.i64 4;; @002e v17 = iadd v15, v16 ; v16 = 4-;; @002e v18 = load.i32 user2 readonly region5 v17+;; @002e v18 = load.i32 user2 readonly region6 v17;; @002e v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002e v11 = load.i32 notrap aligned readonly can_move v10+;; @002e v11 = load.i32 notrap aligned readonly can_move region3 v10;; @002e v19 = icmp eq v18, v11;; @002e v20 = uextend.i32 v19;; @002e jump block5(v20)@@ -60,14 +61,14 @@;; @002e brif v21, block6, block2;;;; block6:-;; @0034 v23 = load.i64 notrap aligned readonly can_move region7 v0+56-;; @0034 v22 = load.i64 notrap aligned readonly can_move region6 v0+72+;; @0034 v23 = load.i64 notrap aligned readonly can_move region8 v0+56+;; @0034 v22 = load.i64 notrap aligned readonly can_move region7 v0+72;; @0034 call_indirect sig0, v23(v22, v0);; @0036 return;;;; block2:-;; @0038 v25 = load.i64 notrap aligned readonly can_move region7 v0+88-;; @0038 v24 = load.i64 notrap aligned readonly can_move region6 v0+104+;; @0038 v25 = load.i64 notrap aligned readonly can_move region8 v0+88+;; @0038 v24 = load.i64 notrap aligned readonly can_move region7 v0+104;; @0038 call_indirect sig0, v25(v24, v0);; @003a return;; }diff --git a/tests/disas/gc/null/br-on-cast.wat b/tests/disas/gc/null/br-on-cast.watindex 407760024e..1e73a0cdbb 100644--- a/tests/disas/gc/null/br-on-cast.wat+++ b/tests/disas/gc/null/br-on-cast.wat@@ -20,11 +20,12 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"-;; region6 = 2415919128 "VMFunctionImport+0x18"-;; region7 = 2415919112 "VMFunctionImport+0x8"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap"+;; region7 = 2415919128 "VMFunctionImport+0x18"+;; region8 = 2415919112 "VMFunctionImport+0x8";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -44,14 +45,14 @@;;;; block4:;; @002f v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002f v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @002f v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @002f v12 = uextend.i64 v2;; @002f v15 = iadd v14, v12;; @002f v16 = iconst.i64 4;; @002f v17 = iadd v15, v16 ; v16 = 4-;; @002f v18 = load.i32 user2 readonly region5 v17+;; @002f v18 = load.i32 user2 readonly region6 v17;; @002f v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002f v11 = load.i32 notrap aligned readonly can_move v10+;; @002f v11 = load.i32 notrap aligned readonly can_move region3 v10;; @002f v19 = icmp eq v18, v11;; @002f v20 = uextend.i32 v19;; @002f jump block5(v20)@@ -60,14 +61,14 @@;; @002f brif v21, block2, block6;;;; block6:-;; @0035 v23 = load.i64 notrap aligned readonly can_move region7 v0+56-;; @0035 v22 = load.i64 notrap aligned readonly can_move region6 v0+72+;; @0035 v23 = load.i64 notrap aligned readonly can_move region8 v0+56+;; @0035 v22 = load.i64 notrap aligned readonly can_move region7 v0+72;; @0035 call_indirect sig0, v23(v22, v0);; @0037 return;;;; block2:-;; @0039 v25 = load.i64 notrap aligned readonly can_move region7 v0+88-;; @0039 v24 = load.i64 notrap aligned readonly can_move region6 v0+104+;; @0039 v25 = load.i64 notrap aligned readonly can_move region8 v0+88+;; @0039 v24 = load.i64 notrap aligned readonly can_move region7 v0+104;; @0039 call_indirect sig0, v25(v24, v0);; @003b return;; }diff --git a/tests/disas/gc/null/call-indirect-and-subtyping.wat b/tests/disas/gc/null/call-indirect-and-subtyping.watindex 7b8056d868..26785dbe46 100644--- a/tests/disas/gc/null/call-indirect-and-subtyping.wat+++ b/tests/disas/gc/null/call-indirect-and-subtyping.wat@@ -22,9 +22,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -56,9 +57,9 @@;; @005c jump block3(v18);;;; block3(v15: i64):-;; @005c v21 = load.i32 user7 aligned readonly region5 v15+16+;; @005c v21 = load.i32 user7 aligned readonly region6 v15+16;; @005c v19 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @005c v20 = load.i32 notrap aligned readonly can_move v19+;; @005c v20 = load.i32 notrap aligned readonly can_move region5 v19;; @005c v22 = icmp eq v21, v20;; @005c v23 = uextend.i32 v22;; @005c brif v22, block5(v23), block4@@ -69,8 +70,8 @@;;;; block5(v25: i32):;; @005c trapz v25, user8-;; @005c v26 = load.i64 notrap aligned readonly region6 v15+8-;; @005c v27 = load.i64 notrap aligned readonly region7 v15+24+;; @005c v26 = load.i64 notrap aligned readonly region7 v15+8+;; @005c v27 = load.i64 notrap aligned readonly region8 v15+24;; @005c call_indirect sig0, v26(v27, v0);; @005f jump block1;;diff --git a/tests/disas/gc/null/funcref-in-gc-heap-new.wat b/tests/disas/gc/null/funcref-in-gc-heap-new.watindex 9aefcd39bc..22dbf0b0d3 100644--- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat+++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat@@ -17,7 +17,8 @@;; region4 = 134217768 "VMStoreContext+0x28";; region5 = 134217760 "VMStoreContext+0x20";; region6 = 40 "VMContext+0x28"-;; region7 = 1073741824 "GcHeap"+;; region7 = 3355443200 "TypeIdsArray+0x0"+;; region8 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -48,16 +49,16 @@;; v52 = band.i32 v11, v45 ; v45 = -8;; v53 = uextend.i64 v52;; @0020 v24 = iadd v22, v53-;; @0020 store user2 region7 v46, v24 ; v46 = -1342177264+;; @0020 store user2 region8 v46, v24 ; v46 = -1342177264;; @0020 v27 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @0020 v28 = load.i32 notrap aligned readonly can_move v27-;; @0020 store user2 region7 v28, v24+4+;; @0020 v28 = load.i32 notrap aligned readonly can_move region7 v27+;; @0020 store user2 region8 v28, v24+4;; @0020 store.i32 notrap aligned region3 v14, v7;; @0020 v31 = call fn1(v0, v2);; @0020 v32 = ireduce.i32 v31;; @0020 v29 = iconst.i64 8;; @0020 v30 = iadd v24, v29 ; v29 = 8-;; @0020 store user2 little region7 v32, v30+;; @0020 store user2 little region8 v32, v30;; @0023 jump block1;;;; block3 cold:diff --git a/tests/disas/gc/null/ref-cast.wat b/tests/disas/gc/null/ref-cast.watindex 81d6ea93ed..1fd8d81517 100644--- a/tests/disas/gc/null/ref-cast.wat+++ b/tests/disas/gc/null/ref-cast.wat@@ -12,9 +12,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -33,14 +34,14 @@;;;; block3:;; @001e v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001e v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @001e v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @001e v12 = uextend.i64 v2;; @001e v15 = iadd v14, v12;; @001e v16 = iconst.i64 4;; @001e v17 = iadd v15, v16 ; v16 = 4-;; @001e v18 = load.i32 user2 readonly region5 v17+;; @001e v18 = load.i32 user2 readonly region6 v17;; @001e v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @001e v11 = load.i32 notrap aligned readonly can_move v10+;; @001e v11 = load.i32 notrap aligned readonly can_move region3 v10;; @001e v19 = icmp eq v18, v11;; @001e v20 = uextend.i32 v19;; @001e jump block4(v20)diff --git a/tests/disas/gc/null/ref-test-concrete-func-type.wat b/tests/disas/gc/null/ref-test-concrete-func-type.watindex 0cffbb3c94..c6e2ec3166 100644--- a/tests/disas/gc/null/ref-test-concrete-func-type.wat+++ b/tests/disas/gc/null/ref-test-concrete-func-type.wat@@ -12,7 +12,8 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 3221225488 "VMFuncRef+0x10"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 3221225488 "VMFuncRef+0x10";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -28,9 +29,9 @@;; @0020 jump block3;;;; block3:-;; @0020 v9 = load.i32 notrap aligned readonly region3 v2+16+;; @0020 v9 = load.i32 notrap aligned readonly region4 v2+16;; @0020 v7 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0020 v8 = load.i32 notrap aligned readonly can_move v7+;; @0020 v8 = load.i32 notrap aligned readonly can_move region3 v7;; @0020 v10 = icmp eq v9, v8;; @0020 v11 = uextend.i32 v10;; @0020 jump block4(v11)diff --git a/tests/disas/gc/null/ref-test-concrete-type.wat b/tests/disas/gc/null/ref-test-concrete-type.watindex e49be09940..0f77aef17c 100644--- a/tests/disas/gc/null/ref-test-concrete-type.wat+++ b/tests/disas/gc/null/ref-test-concrete-type.wat@@ -12,9 +12,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -33,14 +34,14 @@;;;; block3:;; @001d v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @001d v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @001d v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @001d v12 = uextend.i64 v2;; @001d v15 = iadd v14, v12;; @001d v16 = iconst.i64 4;; @001d v17 = iadd v15, v16 ; v16 = 4-;; @001d v18 = load.i32 user2 readonly region5 v17+;; @001d v18 = load.i32 user2 readonly region6 v17;; @001d v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @001d v11 = load.i32 notrap aligned readonly can_move v10+;; @001d v11 = load.i32 notrap aligned readonly can_move region3 v10;; @001d v19 = icmp eq v18, v11;; @001d v20 = uextend.i32 v19;; @001d jump block4(v20)diff --git a/tests/disas/gc/null/struct-new-default.wat b/tests/disas/gc/null/struct-new-default.watindex 1f7723a446..e4f4eaf630 100644--- a/tests/disas/gc/null/struct-new-default.wat+++ b/tests/disas/gc/null/struct-new-default.wat@@ -19,7 +19,8 @@;; region4 = 134217768 "VMStoreContext+0x28";; region5 = 134217760 "VMStoreContext+0x20";; region6 = 40 "VMContext+0x28"-;; region7 = 1073741824 "GcHeap"+;; region7 = 3355443200 "TypeIdsArray+0x0"+;; region8 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -48,22 +49,22 @@;; v55 = band.i32 v13, v48 ; v48 = -8;; v56 = uextend.i64 v55;; @0021 v26 = iadd v24, v56-;; @0021 store user2 region7 v49, v26 ; v49 = -1342177256+;; @0021 store user2 region8 v49, v26 ; v49 = -1342177256;; @0021 v29 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @0021 v30 = load.i32 notrap aligned readonly can_move v29-;; @0021 store user2 region7 v30, v26+4+;; @0021 v30 = load.i32 notrap aligned readonly can_move region7 v29+;; @0021 store user2 region8 v30, v26+4;; @0021 store.i32 notrap aligned region3 v16, v9;; @0021 v2 = f32const 0.0;; @0021 v31 = iconst.i64 8;; @0021 v32 = iadd v26, v31 ; v31 = 8-;; @0021 store user2 little region7 v2, v32 ; v2 = 0.0+;; @0021 store user2 little region8 v2, v32 ; v2 = 0.0;; @0021 v3 = iconst.i32 0;; @0021 v33 = iconst.i64 12;; @0021 v34 = iadd v26, v33 ; v33 = 12-;; @0021 istore8 user2 little region7 v3, v34 ; v3 = 0+;; @0021 istore8 user2 little region8 v3, v34 ; v3 = 0;; @0021 v35 = iconst.i64 16;; @0021 v36 = iadd v26, v35 ; v35 = 16-;; @0021 store user2 little region7 v3, v36 ; v3 = 0+;; @0021 store user2 little region8 v3, v36 ; v3 = 0;; @0024 jump block1;;;; block3 cold:diff --git a/tests/disas/gc/null/struct-new.wat b/tests/disas/gc/null/struct-new.watindex 5a1d56831a..be38ed1594 100644--- a/tests/disas/gc/null/struct-new.wat+++ b/tests/disas/gc/null/struct-new.wat@@ -20,8 +20,9 @@;; region4 = 134217768 "VMStoreContext+0x28";; region5 = 134217760 "VMStoreContext+0x20";; region6 = 40 "VMContext+0x28"-;; region7 = 1073741824 "GcHeap"-;; region8 = 3087007744 "Stack(ss0)"+;; region7 = 3355443200 "TypeIdsArray+0x0"+;; region8 = 1073741824 "GcHeap"+;; region9 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -31,7 +32,7 @@;;;; block0(v0: i64, v1: i64, v2: f32, v3: i32, v4: i32):;; v39 = stack_addr.i64 ss0-;; store notrap aligned region8 v4, v39+;; store notrap aligned region9 v4, v39;; @002a v9 = load.i64 notrap aligned readonly can_move region2 v0+32;; @002a v10 = load.i32 notrap aligned region3 v9;; v46 = iconst.i32 7@@ -52,21 +53,21 @@;; v59 = band.i32 v13, v52 ; v52 = -8;; v60 = uextend.i64 v59;; @002a v26 = iadd v24, v60-;; @002a store user2 region7 v53, v26 ; v53 = -1342177256+;; @002a store user2 region8 v53, v26 ; v53 = -1342177256;; @002a v29 = load.i64 notrap aligned readonly can_move region6 v0+40-;; @002a v30 = load.i32 notrap aligned readonly can_move v29-;; @002a store user2 region7 v30, v26+4+;; @002a v30 = load.i32 notrap aligned readonly can_move region7 v29+;; @002a store user2 region8 v30, v26+4;; @002a store.i32 notrap aligned region3 v16, v9;; @002a v31 = iconst.i64 8;; @002a v32 = iadd v26, v31 ; v31 = 8-;; @002a store.f32 user2 little region7 v2, v32+;; @002a store.f32 user2 little region8 v2, v32;; @002a v33 = iconst.i64 12;; @002a v34 = iadd v26, v33 ; v33 = 12-;; @002a istore8.i32 user2 little region7 v3, v34-;; v38 = load.i32 notrap aligned region8 v39+;; @002a istore8.i32 user2 little region8 v3, v34+;; v38 = load.i32 notrap aligned region9 v39;; @002a v35 = iconst.i64 16;; @002a v36 = iadd v26, v35 ; v35 = 16-;; @002a store user2 little region7 v38, v36+;; @002a store user2 little region8 v38, v36;; @002d jump block1;;;; block3 cold:diff --git a/tests/disas/gc/ref-test-cast-final-type.wat b/tests/disas/gc/ref-test-cast-final-type.watindex d27fb41c75..e96fe091be 100644--- a/tests/disas/gc/ref-test-cast-final-type.wat+++ b/tests/disas/gc/ref-test-cast-final-type.wat@@ -18,9 +18,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -39,14 +40,14 @@;;;; block3:;; @0024 v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0024 v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @0024 v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @0024 v12 = uextend.i64 v2;; @0024 v15 = iadd v14, v12;; @0024 v16 = iconst.i64 4;; @0024 v17 = iadd v15, v16 ; v16 = 4-;; @0024 v18 = load.i32 user2 readonly region5 v17+;; @0024 v18 = load.i32 user2 readonly region6 v17;; @0024 v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @0024 v11 = load.i32 notrap aligned readonly can_move v10+;; @0024 v11 = load.i32 notrap aligned readonly can_move region3 v10;; @0024 v19 = icmp eq v18, v11;; @0024 v20 = uextend.i32 v19;; @0024 jump block4(v20)@@ -62,9 +63,10 @@;; region0 = 8 "VMContext+0x8";; region1 = 134217752 "VMStoreContext+0x18";; region2 = 40 "VMContext+0x28"-;; region3 = 134217760 "VMStoreContext+0x20"-;; region4 = 134217768 "VMStoreContext+0x28"-;; region5 = 1073741824 "GcHeap"+;; region3 = 3355443200 "TypeIdsArray+0x0"+;; region4 = 134217760 "VMStoreContext+0x20"+;; region5 = 134217768 "VMStoreContext+0x28"+;; region6 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -83,14 +85,14 @@;;;; block3:;; @002c v13 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002c v14 = load.i64 notrap aligned readonly can_move region3 v13+32+;; @002c v14 = load.i64 notrap aligned readonly can_move region4 v13+32;; @002c v12 = uextend.i64 v2;; @002c v15 = iadd v14, v12;; @002c v16 = iconst.i64 4;; @002c v17 = iadd v15, v16 ; v16 = 4-;; @002c v18 = load.i32 user2 readonly region5 v17+;; @002c v18 = load.i32 user2 readonly region6 v17;; @002c v10 = load.i64 notrap aligned readonly can_move region2 v0+40-;; @002c v11 = load.i32 notrap aligned readonly can_move v10+;; @002c v11 = load.i32 notrap aligned readonly can_move region3 v10;; @002c v19 = icmp eq v18, v11;; @002c v20 = uextend.i32 v19;; @002c jump block4(v20)diff --git a/tests/disas/gc/struct-new-default.wat b/tests/disas/gc/struct-new-default.watindex dcb1d775ec..bdcc8576e5 100644--- a/tests/disas/gc/struct-new-default.wat+++ b/tests/disas/gc/struct-new-default.wat@@ -19,8 +19,9 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -46,25 +47,25 @@;; @0023 store notrap aligned region3 v60, v7;; v63 = iconst.i32 -1342177246;; v64 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v65 = load.i64 notrap aligned readonly can_move region6 v64+32+;; v65 = load.i64 notrap aligned readonly can_move region7 v64+32;; @0023 v32 = iadd v65, v15-;; @0023 store user2 region7 v63, v32 ; v63 = -1342177246+;; @0023 store user2 region8 v63, v32 ; v63 = -1342177246;; v66 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v67 = load.i32 notrap aligned readonly can_move v66-;; @0023 store user2 region7 v67, v32+4+;; v67 = load.i32 notrap aligned readonly can_move region6 v66+;; @0023 store user2 region8 v67, v32+4;; v68 = iconst.i64 48-;; @0023 istore32 user2 region7 v68, v32+8 ; v68 = 48+;; @0023 istore32 user2 region8 v68, v32+8 ; v68 = 48;; @0023 jump block4(v8, v32);;;; block3 cold:;; @0023 v19 = iconst.i32 -1342177246;; @0023 v20 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @0023 v21 = load.i32 notrap aligned readonly can_move v20+;; @0023 v21 = load.i32 notrap aligned readonly can_move region6 v20;; @0023 v6 = iconst.i32 48;; @0023 v22 = iconst.i32 16;; @0023 v23 = call fn0(v0, v19, v21, v6, v22) ; v19 = -1342177246, v6 = 48, v22 = 16;; @0023 v24 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @0023 v25 = load.i64 notrap aligned readonly can_move region6 v24+32+;; @0023 v25 = load.i64 notrap aligned readonly can_move region7 v24+32;; @0023 v26 = uextend.i64 v23;; @0023 v27 = iadd v25, v26;; @0023 jump block4(v23, v27)@@ -73,18 +74,18 @@;; @0023 v2 = f32const 0.0;; @0023 v38 = iconst.i64 16;; @0023 v39 = iadd v37, v38 ; v38 = 16-;; @0023 store user2 little region7 v2, v39 ; v2 = 0.0+;; @0023 store user2 little region8 v2, v39 ; v2 = 0.0;; @0023 v3 = iconst.i32 0;; @0023 v40 = iconst.i64 20;; @0023 v41 = iadd v37, v40 ; v40 = 20-;; @0023 istore8 user2 little region7 v3, v41 ; v3 = 0+;; @0023 istore8 user2 little region8 v3, v41 ; v3 = 0;; @0023 v42 = iconst.i64 24;; @0023 v43 = iadd v37, v42 ; v42 = 24-;; @0023 store user2 little region7 v3, v43 ; v3 = 0+;; @0023 store user2 little region8 v3, v43 ; v3 = 0;; @0023 v5 = vconst.i8x16 const0;; @0023 v44 = iconst.i64 32;; @0023 v45 = iadd v37, v44 ; v44 = 32-;; @0023 store user2 little region7 v5, v45 ; v5 = const0+;; @0023 store user2 little region8 v5, v45 ; v5 = const0;; @0026 jump block1;;;; block1:diff --git a/tests/disas/gc/struct-new.wat b/tests/disas/gc/struct-new.watindex 088f660a44..256353fd0e 100644--- a/tests/disas/gc/struct-new.wat+++ b/tests/disas/gc/struct-new.wat@@ -19,9 +19,10 @@;; region3 = 1744830464 "VMCopyingHeapData+0x0";; region4 = 1744830468 "VMCopyingHeapData+0x4";; region5 = 40 "VMContext+0x28"-;; region6 = 134217760 "VMStoreContext+0x20"-;; region7 = 1073741824 "GcHeap"-;; region8 = 3087007744 "Stack(ss0)"+;; region6 = 3355443200 "TypeIdsArray+0x0"+;; region7 = 134217760 "VMStoreContext+0x20"+;; region8 = 1073741824 "GcHeap"+;; region9 = 3087007744 "Stack(ss0)";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -31,7 +32,7 @@;;;; block0(v0: i64, v1: i64, v2: f32, v3: i32, v4: i32):;; v45 = stack_addr.i64 ss0-;; store notrap aligned region8 v4, v45+;; store notrap aligned region9 v4, v45;; @002a v6 = load.i64 notrap aligned readonly can_move region2 v0+32;; @002a v7 = load.i32 notrap aligned region3 v6;; @002a v8 = load.i32 notrap aligned region4 v6+4@@ -48,25 +49,25 @@;; @002a store notrap aligned region3 v60, v6;; v63 = iconst.i32 -1342177246;; v64 = load.i64 notrap aligned readonly can_move region0 v0+8-;; v65 = load.i64 notrap aligned readonly can_move region6 v64+32+;; v65 = load.i64 notrap aligned readonly can_move region7 v64+32;; @002a v31 = iadd v65, v14-;; @002a store user2 region7 v63, v31 ; v63 = -1342177246+;; @002a store user2 region8 v63, v31 ; v63 = -1342177246;; v66 = load.i64 notrap aligned readonly can_move region5 v0+40-;; v67 = load.i32 notrap aligned readonly can_move v66-;; @002a store user2 region7 v67, v31+4+;; v67 = load.i32 notrap aligned readonly can_move region6 v66+;; @002a store user2 region8 v67, v31+4;; v68 = iconst.i64 32-;; @002a istore32 user2 region7 v68, v31+8 ; v68 = 32+;; @002a istore32 user2 region8 v68, v31+8 ; v68 = 32;; @002a jump block4(v7, v31);;;; block3 cold:;; @002a v18 = iconst.i32 -1342177246;; @002a v19 = load.i64 notrap aligned readonly can_move region5 v0+40-;; @002a v20 = load.i32 notrap aligned readonly can_move v19+;; @002a v20 = load.i32 notrap aligned readonly can_move region6 v19;; @002a v5 = iconst.i32 32;; @002a v21 = iconst.i32 16;; @002a v22 = call fn0(v0, v18, v20, v5, v21), stack_map=[i32 @ ss0+0] ; v18 = -1342177246, v5 = 32, v21 = 16;; @002a v23 = load.i64 notrap aligned readonly can_move region0 v0+8-;; @002a v24 = load.i64 notrap aligned readonly can_move region6 v23+32+;; @002a v24 = load.i64 notrap aligned readonly can_move region7 v23+32;; @002a v25 = uextend.i64 v22;; @002a v26 = iadd v24, v25;; @002a jump block4(v22, v26)@@ -74,14 +75,14 @@;; block4(v35: i32, v36: i64):;; @002a v37 = iconst.i64 16;; @002a v38 = iadd v36, v37 ; v37 = 16-;; @002a store.f32 user2 little region7 v2, v38+;; @002a store.f32 user2 little region8 v2, v38;; @002a v39 = iconst.i64 20;; @002a v40 = iadd v36, v39 ; v39 = 20-;; @002a istore8.i32 user2 little region7 v3, v40-;; v44 = load.i32 notrap aligned region8 v45+;; @002a istore8.i32 user2 little region8 v3, v40+;; v44 = load.i32 notrap aligned region9 v45;; @002a v41 = iconst.i64 24;; @002a v42 = iadd v36, v41 ; v41 = 24-;; @002a store user2 little region7 v44, v42+;; @002a store user2 little region8 v44, v42;; @002d jump block1;;;; block1:diff --git a/tests/disas/icall-loop.wat b/tests/disas/icall-loop.watindex c3b19962a0..497f29cedc 100644--- a/tests/disas/icall-loop.wat+++ b/tests/disas/icall-loop.wat@@ -28,9 +28,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -52,7 +53,7 @@;; @002b v14 = iconst.i64 -2;; @002b v17 = iconst.i32 0;; @002b v20 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @002b v21 = load.i32 notrap aligned readonly can_move v20+;; @002b v21 = load.i32 notrap aligned readonly can_move region5 v20;; @0027 jump block2;;;; block2:@@ -67,11 +68,11 @@;; @002b jump block5(v19);;;; block5(v16: i64):-;; @002b v22 = load.i32 user7 aligned readonly region5 v16+16+;; @002b v22 = load.i32 user7 aligned readonly region6 v16+16;; @002b v23 = icmp eq v22, v21;; @002b trapz v23, user8-;; @002b v25 = load.i64 notrap aligned readonly region6 v16+8-;; @002b v26 = load.i64 notrap aligned readonly region7 v16+24+;; @002b v25 = load.i64 notrap aligned readonly region7 v16+8+;; @002b v26 = load.i64 notrap aligned readonly region8 v16+24;; @002b v27 = call_indirect sig0, v25(v26, v0);; @002e jump block2;; }@@ -82,9 +83,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -101,7 +103,7 @@;; @0038 v16 = iconst.i32 0;; v33 = iconst.i64 1;; @0038 v19 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @0038 v20 = load.i32 notrap aligned readonly can_move v19+;; @0038 v20 = load.i32 notrap aligned readonly can_move region5 v19;; @0034 jump block2;;;; block2:@@ -118,11 +120,11 @@;; @0038 jump block5(v18);;;; block5(v15: i64):-;; @0038 v21 = load.i32 user7 aligned readonly region5 v15+16+;; @0038 v21 = load.i32 user7 aligned readonly region6 v15+16;; @0038 v22 = icmp eq v21, v20;; @0038 trapz v22, user8-;; @0038 v24 = load.i64 notrap aligned readonly region6 v15+8-;; @0038 v25 = load.i64 notrap aligned readonly region7 v15+24+;; @0038 v24 = load.i64 notrap aligned readonly region7 v15+8+;; @0038 v25 = load.i64 notrap aligned readonly region8 v15+24;; @0038 v26 = call_indirect sig0, v24(v25, v0);; @003b jump block2;; }diff --git a/tests/disas/icall-simd.wat b/tests/disas/icall-simd.watindex 8a5ea55d86..e8db487873 100644--- a/tests/disas/icall-simd.wat+++ b/tests/disas/icall-simd.wat@@ -14,9 +14,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -48,13 +49,13 @@;;;; block3(v16: i64):;; @0033 v20 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @0033 v21 = load.i32 notrap aligned readonly can_move v20-;; @0033 v22 = load.i32 user7 aligned readonly region5 v16+16+;; @0033 v21 = load.i32 notrap aligned readonly can_move region5 v20+;; @0033 v22 = load.i32 user7 aligned readonly region6 v16+16;; @0033 v23 = icmp eq v22, v21;; @0033 v24 = uextend.i32 v23;; @0033 trapz v24, user8-;; @0033 v25 = load.i64 notrap aligned readonly region6 v16+8-;; @0033 v26 = load.i64 notrap aligned readonly region7 v16+24+;; @0033 v25 = load.i64 notrap aligned readonly region7 v16+8+;; @0033 v26 = load.i64 notrap aligned readonly region8 v16+24;; @0033 v27 = call_indirect sig0, v25(v26, v0, v3);; @0036 jump block1;;diff --git a/tests/disas/icall.wat b/tests/disas/icall.watindex 479e7e76ee..bc57836365 100644--- a/tests/disas/icall.wat+++ b/tests/disas/icall.wat@@ -14,9 +14,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -48,13 +49,13 @@;;;; block3(v16: i64):;; @0033 v20 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @0033 v21 = load.i32 notrap aligned readonly can_move v20-;; @0033 v22 = load.i32 user7 aligned readonly region5 v16+16+;; @0033 v21 = load.i32 notrap aligned readonly can_move region5 v20+;; @0033 v22 = load.i32 user7 aligned readonly region6 v16+16;; @0033 v23 = icmp eq v22, v21;; @0033 v24 = uextend.i32 v23;; @0033 trapz v24, user8-;; @0033 v25 = load.i64 notrap aligned readonly region6 v16+8-;; @0033 v26 = load.i64 notrap aligned readonly region7 v16+24+;; @0033 v25 = load.i64 notrap aligned readonly region7 v16+8+;; @0033 v26 = load.i64 notrap aligned readonly region8 v16+24;; @0033 v27 = call_indirect sig0, v25(v26, v0, v3);; @0036 jump block1;;diff --git a/tests/disas/indirect-call-no-caching.wat b/tests/disas/indirect-call-no-caching.watindex 3eb1745a4d..e6ff22cd77 100644--- a/tests/disas/indirect-call-no-caching.wat+++ b/tests/disas/indirect-call-no-caching.wat@@ -74,9 +74,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -108,13 +109,13 @@;;;; block3(v15: i64):;; @0050 v19 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @0050 v20 = load.i32 notrap aligned readonly can_move v19-;; @0050 v21 = load.i32 user7 aligned readonly region5 v15+16+;; @0050 v20 = load.i32 notrap aligned readonly can_move region5 v19+;; @0050 v21 = load.i32 user7 aligned readonly region6 v15+16;; @0050 v22 = icmp eq v21, v20;; @0050 v23 = uextend.i32 v22;; @0050 trapz v23, user8-;; @0050 v24 = load.i64 notrap aligned readonly region6 v15+8-;; @0050 v25 = load.i64 notrap aligned readonly region7 v15+24+;; @0050 v24 = load.i64 notrap aligned readonly region7 v15+8+;; @0050 v25 = load.i64 notrap aligned readonly region8 v15+24;; @0050 v26 = call_indirect sig0, v24(v25, v0);; @0053 jump block1;;diff --git a/tests/disas/readonly-funcrefs.wat b/tests/disas/readonly-funcrefs.watindex 5329afbad2..ad1dcfb730 100644--- a/tests/disas/readonly-funcrefs.wat+++ b/tests/disas/readonly-funcrefs.wat@@ -39,9 +39,10 @@;; region2 = 1342177280 "VMTableDefinition+0x0";; region3 = 671088640 "DefinedTable(StaticModuleIndex(0), DefinedTableIndex(0))";; region4 = 40 "VMContext+0x28"-;; region5 = 3221225488 "VMFuncRef+0x10"-;; region6 = 3221225480 "VMFuncRef+0x8"-;; region7 = 3221225496 "VMFuncRef+0x18"+;; region5 = 3355443200 "TypeIdsArray+0x0"+;; region6 = 3221225488 "VMFuncRef+0x10"+;; region7 = 3221225480 "VMFuncRef+0x8"+;; region8 = 3221225496 "VMFuncRef+0x18";; gv0 = vmctx;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8;; gv2 = load.i64 notrap aligned region1 gv1+24@@ -71,13 +72,13 @@;; @0031 jump block3(v18);;;; block3(v15: i64):-;; @0031 v21 = load.i32 user7 aligned readonly region5 v15+16+;; @0031 v21 = load.i32 user7 aligned readonly region6 v15+16;; @0031 v19 = load.i64 notrap aligned readonly can_move region4 v0+40-;; @0031 v20 = load.i32 notrap aligned readonly can_move v19+;; @0031 v20 = load.i32 notrap aligned readonly can_move region5 v19;; @0031 v22 = icmp eq v21, v20;; @0031 trapz v22, user8-;; @0031 v24 = load.i64 notrap aligned readonly region6 v15+8-;; @0031 v25 = load.i64 notrap aligned readonly region7 v15+24+;; @0031 v24 = load.i64 notrap aligned readonly region7 v15+8+;; @0031 v25 = load.i64 notrap aligned readonly region8 v15+24;; @0031 call_indirect sig0, v24(v25, v0);; @0034 jump block1;;