From ac86a68f5b895c12942edde4fd9ccf37ee7a70f2 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 1 Nov 2024 20:24:56 -0700 Subject: [PATCH] Update test expectations --- tests/disas/basic-wat-test.wat | 7 +- tests/disas/duplicate-loads-static-memory.wat | 6 +- tests/disas/f32-load.wat | 5 +- tests/disas/f32-store.wat | 5 +- tests/disas/f64-load.wat | 5 +- tests/disas/f64-store.wat | 5 +- tests/disas/fibonacci.wat | 5 +- tests/disas/globals.wat | 5 +- tests/disas/i32-load.wat | 5 +- tests/disas/i32-load16-s.wat | 5 +- tests/disas/i32-load16-u.wat | 5 +- tests/disas/i32-load8-s.wat | 5 +- tests/disas/i32-load8-u.wat | 5 +- tests/disas/i32-store.wat | 5 +- tests/disas/i32-store16.wat | 5 +- tests/disas/i32-store8.wat | 5 +- tests/disas/i64-load.wat | 5 +- tests/disas/i64-load16-s.wat | 5 +- tests/disas/i64-load16-u.wat | 5 +- tests/disas/i64-load8-s.wat | 5 +- tests/disas/i64-load8-u.wat | 5 +- tests/disas/i64-store.wat | 5 +- tests/disas/i64-store16.wat | 5 +- tests/disas/i64-store32.wat | 5 +- tests/disas/i64-store8.wat | 5 +- tests/disas/if-unreachable-else-params-2.wat | 5 +- tests/disas/if-unreachable-else-params.wat | 5 +- ...0_guard_no_spectre_i32_access_0_offset.wat | 10 +- ...rd_no_spectre_i32_access_0x1000_offset.wat | 10 +- ...o_spectre_i32_access_0xffff0000_offset.wat | 10 +- ..._0_guard_no_spectre_i8_access_0_offset.wat | 10 +- ...ard_no_spectre_i8_access_0x1000_offset.wat | 10 +- ...no_spectre_i8_access_0xffff0000_offset.wat | 10 +- ..._guard_yes_spectre_i32_access_0_offset.wat | 10 +- ...d_yes_spectre_i32_access_0x1000_offset.wat | 10 +- ...s_spectre_i32_access_0xffff0000_offset.wat | 10 +- ...0_guard_yes_spectre_i8_access_0_offset.wat | 10 +- ...rd_yes_spectre_i8_access_0x1000_offset.wat | 10 +- ...es_spectre_i8_access_0xffff0000_offset.wat | 10 +- ...f_guard_no_spectre_i32_access_0_offset.wat | 10 +- ...rd_no_spectre_i32_access_0x1000_offset.wat | 10 +- ...o_spectre_i32_access_0xffff0000_offset.wat | 10 +- ...ff_guard_no_spectre_i8_access_0_offset.wat | 10 +- ...ard_no_spectre_i8_access_0x1000_offset.wat | 10 +- ...no_spectre_i8_access_0xffff0000_offset.wat | 10 +- ..._guard_yes_spectre_i32_access_0_offset.wat | 10 +- ...d_yes_spectre_i32_access_0x1000_offset.wat | 10 +- ...s_spectre_i32_access_0xffff0000_offset.wat | 10 +- ...f_guard_yes_spectre_i8_access_0_offset.wat | 10 +- ...rd_yes_spectre_i8_access_0x1000_offset.wat | 10 +- ...es_spectre_i8_access_0xffff0000_offset.wat | 10 +- ...0_guard_no_spectre_i32_access_0_offset.wat | 10 +- ...rd_no_spectre_i32_access_0x1000_offset.wat | 10 +- ...o_spectre_i32_access_0xffff0000_offset.wat | 10 +- ..._0_guard_no_spectre_i8_access_0_offset.wat | 10 +- ...ard_no_spectre_i8_access_0x1000_offset.wat | 10 +- ...no_spectre_i8_access_0xffff0000_offset.wat | 10 +- ..._guard_yes_spectre_i32_access_0_offset.wat | 10 +- ...d_yes_spectre_i32_access_0x1000_offset.wat | 10 +- ...s_spectre_i32_access_0xffff0000_offset.wat | 10 +- ...0_guard_yes_spectre_i8_access_0_offset.wat | 10 +- ...rd_yes_spectre_i8_access_0x1000_offset.wat | 10 +- ...es_spectre_i8_access_0xffff0000_offset.wat | 10 +- ...f_guard_no_spectre_i32_access_0_offset.wat | 10 +- ...rd_no_spectre_i32_access_0x1000_offset.wat | 10 +- ...o_spectre_i32_access_0xffff0000_offset.wat | 10 +- ...ff_guard_no_spectre_i8_access_0_offset.wat | 10 +- ...ard_no_spectre_i8_access_0x1000_offset.wat | 10 +- ...no_spectre_i8_access_0xffff0000_offset.wat | 10 +- ..._guard_yes_spectre_i32_access_0_offset.wat | 10 +- ...d_yes_spectre_i32_access_0x1000_offset.wat | 10 +- ...s_spectre_i32_access_0xffff0000_offset.wat | 10 +- ...f_guard_yes_spectre_i8_access_0_offset.wat | 10 +- ...rd_yes_spectre_i8_access_0x1000_offset.wat | 10 +- ...es_spectre_i8_access_0xffff0000_offset.wat | 10 +- tests/disas/memory.wat | 11 +- tests/disas/passive-data.wat | 3 +- tests/disas/pr2303.wat | 13 +- tests/disas/simd-store.wat | 170 +++++++++++------- 79 files changed, 488 insertions(+), 327 deletions(-) diff --git a/tests/disas/basic-wat-test.wat b/tests/disas/basic-wat-test.wat index c936204d602f..2c6cef13b7f8 100644 --- a/tests/disas/basic-wat-test.wat +++ b/tests/disas/basic-wat-test.wat @@ -14,16 +14,17 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0021 v5 = uextend.i64 v2 -;; @0021 v6 = global_value.i64 gv4 +;; @0021 v6 = global_value.i64 gv5 ;; @0021 v7 = iadd v6, v5 ;; @0021 v8 = load.i32 little heap v7 ;; @0026 v9 = uextend.i64 v3 -;; @0026 v10 = global_value.i64 gv4 +;; @0026 v10 = global_value.i64 gv5 ;; @0026 v11 = iadd v10, v9 ;; @0026 v12 = load.i32 little heap v11 ;; @0029 v13 = iadd v8, v12 diff --git a/tests/disas/duplicate-loads-static-memory.wat b/tests/disas/duplicate-loads-static-memory.wat index 1857c02e5840..4bcba7c80795 100644 --- a/tests/disas/duplicate-loads-static-memory.wat +++ b/tests/disas/duplicate-loads-static-memory.wat @@ -22,7 +22,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -41,7 +42,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): diff --git a/tests/disas/f32-load.wat b/tests/disas/f32-load.wat index 961ab900f090..d4ca4a6f4f68 100644 --- a/tests/disas/f32-load.wat +++ b/tests/disas/f32-load.wat @@ -11,12 +11,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = global_value.i64 gv4 +;; @002e v5 = global_value.i64 gv5 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.f32 little heap v6 ;; @0031 jump block1(v7) diff --git a/tests/disas/f32-store.wat b/tests/disas/f32-store.wat index 8a7d8ad5db00..d34922e5d6a6 100644 --- a/tests/disas/f32-store.wat +++ b/tests/disas/f32-store.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: f32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/f64-load.wat b/tests/disas/f64-load.wat index e4de181c7514..905d461733fa 100644 --- a/tests/disas/f64-load.wat +++ b/tests/disas/f64-load.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = global_value.i64 gv4 +;; @002e v5 = global_value.i64 gv5 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.f64 little heap v6 ;; @0031 jump block1(v7) diff --git a/tests/disas/f64-store.wat b/tests/disas/f64-store.wat index d6f8b1abfef8..0366a05d4ce1 100644 --- a/tests/disas/f64-store.wat +++ b/tests/disas/f64-store.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: f64): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/fibonacci.wat b/tests/disas/fibonacci.wat index 2cad836c8cac..a06733d24aed 100644 --- a/tests/disas/fibonacci.wat +++ b/tests/disas/fibonacci.wat @@ -28,7 +28,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): @@ -54,7 +55,7 @@ ;; block2: ;; @0056 v16 = iconst.i32 0 ;; @005a v17 = uextend.i64 v16 ; v16 = 0 -;; @005a v18 = global_value.i64 gv4 +;; @005a v18 = global_value.i64 gv5 ;; @005a v19 = iadd v18, v17 ;; @005a store.i32 little heap v11, v19 ;; @005d jump block1 diff --git a/tests/disas/globals.wat b/tests/disas/globals.wat index ebcd13d1f9fc..5eacd99c832a 100644 --- a/tests/disas/globals.wat +++ b/tests/disas/globals.wat @@ -14,7 +14,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): @@ -23,7 +24,7 @@ ;; @002b v4 = global_value.i64 gv3 ;; @002b v5 = load.i32 notrap aligned table v4+112 ;; @002d v6 = uextend.i64 v3 ; v3 = 0 -;; @002d v7 = global_value.i64 gv4 +;; @002d v7 = global_value.i64 gv5 ;; @002d v8 = iadd v7, v6 ;; @002d store little heap v5, v8 ;; @0030 jump block1 diff --git a/tests/disas/i32-load.wat b/tests/disas/i32-load.wat index ec40907be1ae..8d6bbb26e003 100644 --- a/tests/disas/i32-load.wat +++ b/tests/disas/i32-load.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = global_value.i64 gv4 +;; @002e v5 = global_value.i64 gv5 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.i32 little heap v6 ;; @0031 jump block1(v7) diff --git a/tests/disas/i32-load16-s.wat b/tests/disas/i32-load16-s.wat index a10d1014ca58..b54aa04123b6 100644 --- a/tests/disas/i32-load16-s.wat +++ b/tests/disas/i32-load16-s.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = global_value.i64 gv4 +;; @0032 v5 = global_value.i64 gv5 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = sload16.i32 little heap v6 ;; @0035 jump block1(v7) diff --git a/tests/disas/i32-load16-u.wat b/tests/disas/i32-load16-u.wat index 9a193e1356a6..896cc61216f1 100644 --- a/tests/disas/i32-load16-u.wat +++ b/tests/disas/i32-load16-u.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = global_value.i64 gv4 +;; @0032 v5 = global_value.i64 gv5 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = uload16.i32 little heap v6 ;; @0035 jump block1(v7) diff --git a/tests/disas/i32-load8-s.wat b/tests/disas/i32-load8-s.wat index 0619967d657d..46424e5f5c1a 100644 --- a/tests/disas/i32-load8-s.wat +++ b/tests/disas/i32-load8-s.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = sload8.i32 little heap v6 ;; @0034 jump block1(v7) diff --git a/tests/disas/i32-load8-u.wat b/tests/disas/i32-load8-u.wat index 054660c44910..54acec336413 100644 --- a/tests/disas/i32-load8-u.wat +++ b/tests/disas/i32-load8-u.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = uload8.i32 little heap v6 ;; @0034 jump block1(v7) diff --git a/tests/disas/i32-store.wat b/tests/disas/i32-store.wat index d56a260df6c1..7d5ca8df0ba6 100644 --- a/tests/disas/i32-store.wat +++ b/tests/disas/i32-store.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/i32-store16.wat b/tests/disas/i32-store16.wat index 93426b68c99b..e8623e32045a 100644 --- a/tests/disas/i32-store16.wat +++ b/tests/disas/i32-store16.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0033 v4 = uextend.i64 v2 -;; @0033 v5 = global_value.i64 gv4 +;; @0033 v5 = global_value.i64 gv5 ;; @0033 v6 = iadd v5, v4 ;; @0033 istore16 little heap v3, v6 ;; @0036 jump block1 diff --git a/tests/disas/i32-store8.wat b/tests/disas/i32-store8.wat index 949aaad4086a..cdbab2aacca8 100644 --- a/tests/disas/i32-store8.wat +++ b/tests/disas/i32-store8.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = global_value.i64 gv4 +;; @0032 v5 = global_value.i64 gv5 ;; @0032 v6 = iadd v5, v4 ;; @0032 istore8 little heap v3, v6 ;; @0035 jump block1 diff --git a/tests/disas/i64-load.wat b/tests/disas/i64-load.wat index c3136d0714d2..7e7e801ac9c6 100644 --- a/tests/disas/i64-load.wat +++ b/tests/disas/i64-load.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @002e v4 = uextend.i64 v2 -;; @002e v5 = global_value.i64 gv4 +;; @002e v5 = global_value.i64 gv5 ;; @002e v6 = iadd v5, v4 ;; @002e v7 = load.i64 little heap v6 ;; @0031 jump block1(v7) diff --git a/tests/disas/i64-load16-s.wat b/tests/disas/i64-load16-s.wat index 59dc1f4ba992..d6c1f9c32fd5 100644 --- a/tests/disas/i64-load16-s.wat +++ b/tests/disas/i64-load16-s.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = global_value.i64 gv4 +;; @0032 v5 = global_value.i64 gv5 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = sload16.i64 little heap v6 ;; @0035 jump block1(v7) diff --git a/tests/disas/i64-load16-u.wat b/tests/disas/i64-load16-u.wat index 53abb949d826..5ee05dcaef36 100644 --- a/tests/disas/i64-load16-u.wat +++ b/tests/disas/i64-load16-u.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = global_value.i64 gv4 +;; @0032 v5 = global_value.i64 gv5 ;; @0032 v6 = iadd v5, v4 ;; @0032 v7 = uload16.i64 little heap v6 ;; @0035 jump block1(v7) diff --git a/tests/disas/i64-load8-s.wat b/tests/disas/i64-load8-s.wat index 7e4c78801254..4479ba8f315b 100644 --- a/tests/disas/i64-load8-s.wat +++ b/tests/disas/i64-load8-s.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = sload8.i64 little heap v6 ;; @0034 jump block1(v7) diff --git a/tests/disas/i64-load8-u.wat b/tests/disas/i64-load8-u.wat index 6a6063c7d2a4..de2a75008b57 100644 --- a/tests/disas/i64-load8-u.wat +++ b/tests/disas/i64-load8-u.wat @@ -13,12 +13,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 v7 = uload8.i64 little heap v6 ;; @0034 jump block1(v7) diff --git a/tests/disas/i64-store.wat b/tests/disas/i64-store.wat index 0abafce94a1d..7ef7aa7d1197 100644 --- a/tests/disas/i64-store.wat +++ b/tests/disas/i64-store.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0031 v4 = uextend.i64 v2 -;; @0031 v5 = global_value.i64 gv4 +;; @0031 v5 = global_value.i64 gv5 ;; @0031 v6 = iadd v5, v4 ;; @0031 store little heap v3, v6 ;; @0034 jump block1 diff --git a/tests/disas/i64-store16.wat b/tests/disas/i64-store16.wat index 1aa5ec37a792..ef45a6a50372 100644 --- a/tests/disas/i64-store16.wat +++ b/tests/disas/i64-store16.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0033 v4 = uextend.i64 v2 -;; @0033 v5 = global_value.i64 gv4 +;; @0033 v5 = global_value.i64 gv5 ;; @0033 v6 = iadd v5, v4 ;; @0033 istore16 little heap v3, v6 ;; @0036 jump block1 diff --git a/tests/disas/i64-store32.wat b/tests/disas/i64-store32.wat index b6095ae2569c..d5b94aa6b2e2 100644 --- a/tests/disas/i64-store32.wat +++ b/tests/disas/i64-store32.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0033 v4 = uextend.i64 v2 -;; @0033 v5 = global_value.i64 gv4 +;; @0033 v5 = global_value.i64 gv5 ;; @0033 v6 = iadd v5, v4 ;; @0033 istore32 little heap v3, v6 ;; @0036 jump block1 diff --git a/tests/disas/i64-store8.wat b/tests/disas/i64-store8.wat index f81d1cdbbb23..31a8daca773a 100644 --- a/tests/disas/i64-store8.wat +++ b/tests/disas/i64-store8.wat @@ -14,12 +14,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i64): ;; @0032 v4 = uextend.i64 v2 -;; @0032 v5 = global_value.i64 gv4 +;; @0032 v5 = global_value.i64 gv5 ;; @0032 v6 = iadd v5, v4 ;; @0032 istore8 little heap v3, v6 ;; @0035 jump block1 diff --git a/tests/disas/if-unreachable-else-params-2.wat b/tests/disas/if-unreachable-else-params-2.wat index c4a1a1f06e15..23e2f63efd5b 100644 --- a/tests/disas/if-unreachable-else-params-2.wat +++ b/tests/disas/if-unreachable-else-params-2.wat @@ -24,7 +24,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+112 +;; gv4 = load.i64 notrap aligned gv3+120 +;; gv5 = load.i64 notrap aligned readonly checked gv3+112 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -33,7 +34,7 @@ ;; ;; block2: ;; @0058 v7 = uextend.i64 v2 -;; @0058 v8 = global_value.i64 gv4 +;; @0058 v8 = global_value.i64 gv5 ;; @0058 v9 = iadd v8, v7 ;; @0058 v10 = sload16.i64 little heap v9 ;; @005c jump block3 diff --git a/tests/disas/if-unreachable-else-params.wat b/tests/disas/if-unreachable-else-params.wat index 33da3d674fd1..7b138e9790a9 100644 --- a/tests/disas/if-unreachable-else-params.wat +++ b/tests/disas/if-unreachable-else-params.wat @@ -47,7 +47,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+112 +;; gv4 = load.i64 notrap aligned gv3+120 +;; gv5 = load.i64 notrap aligned readonly checked gv3+112 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -59,7 +60,7 @@ ;; ;; block4: ;; @004b v7 = uextend.i64 v4 -;; @004b v8 = global_value.i64 gv4 +;; @004b v8 = global_value.i64 gv5 ;; @004b v9 = iadd v8, v7 ;; @004b v10 = sload16.i64 little heap v9 ;; @004e trap user11 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat index 9dc5c0495396..afebe4926d51 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -23,7 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -31,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff_fffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 store little heap v3, v8 ;; @0043 jump block1 @@ -45,7 +46,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -53,7 +55,7 @@ ;; @0048 v5 = iconst.i64 0xffff_fffc ;; @0048 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc ;; @0048 trapnz v6, heap_oob -;; @0048 v7 = global_value.i64 gv4 +;; @0048 v7 = global_value.i64 gv5 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = load.i32 little heap v8 ;; @004b jump block1(v9) diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 3ebc7f9adee0..a3511efd3137 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,7 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -31,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff_effc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -47,7 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -55,7 +57,7 @@ ;; @0049 v5 = iconst.i64 0xffff_effc ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = global_value.i64 gv4 +;; @0049 v7 = global_value.i64 gv5 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index f1fb58f88217..8a235410ca67 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,7 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -31,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xfffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xfffc ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -47,7 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -55,7 +57,7 @@ ;; @004c v5 = iconst.i64 0xfffc ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xfffc ;; @004c trapnz v6, heap_oob -;; @004c v7 = global_value.i64 gv4 +;; @004c v7 = global_value.i64 gv5 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat index 6dc327980495..3c81aa6c4c35 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -42,12 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = global_value.i64 gv4 +;; @0048 v5 = global_value.i64 gv5 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1(v7) diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index 4a36d8d362cb..3ac2bde4030e 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,7 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -31,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff_efff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -47,7 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -55,7 +57,7 @@ ;; @0049 v5 = iconst.i64 0xffff_efff ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff ;; @0049 trapnz v6, heap_oob -;; @0049 v7 = global_value.i64 gv4 +;; @0049 v7 = global_value.i64 gv5 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 83a08b1d9d0b..b4e3bcc8658d 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,7 +23,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): @@ -31,7 +32,7 @@ ;; @0040 v5 = iconst.i64 0xffff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff ;; @0040 trapnz v6, heap_oob -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -47,7 +48,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): @@ -55,7 +57,7 @@ ;; @004c v5 = iconst.i64 0xffff ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xffff ;; @004c trapnz v6, heap_oob -;; @004c v7 = global_value.i64 gv4 +;; @004c v7 = global_value.i64 gv5 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat index 8debee397c91..0b6a6a9ca482 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_fffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0 ;; @0040 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 ;; @0048 v5 = iconst.i64 0xffff_fffc ;; @0048 v6 = icmp ugt v4, v5 ; v5 = 0xffff_fffc -;; @0048 v7 = global_value.i64 gv4 +;; @0048 v7 = global_value.i64 gv5 ;; @0048 v8 = iadd v7, v4 ;; @0048 v9 = iconst.i64 0 ;; @0048 v10 = select_spectre_guard v6, v9, v8 ; v9 = 0 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index b839c0b852f0..ce4925897f6e 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_effc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -48,14 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 ;; @0049 v5 = iconst.i64 0xffff_effc ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_effc -;; @0049 v7 = global_value.i64 gv4 +;; @0049 v7 = global_value.i64 gv5 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 3a9a2ddd70b7..a2c452f24e34 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xfffc ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xfffc -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -48,14 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xfffc ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xfffc -;; @004c v7 = global_value.i64 gv4 +;; @004c v7 = global_value.i64 gv5 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat index 417e11927274..16d4290c0b39 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -42,12 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = global_value.i64 gv4 +;; @0048 v5 = global_value.i64 gv5 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1(v7) diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 5df7626cc1b9..42bcca312425 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff_efff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 4096 ;; @0040 v10 = iadd v8, v9 ; v9 = 4096 @@ -48,14 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 ;; @0049 v5 = iconst.i64 0xffff_efff ;; @0049 v6 = icmp ugt v4, v5 ; v5 = 0xffff_efff -;; @0049 v7 = global_value.i64 gv4 +;; @0049 v7 = global_value.i64 gv5 ;; @0049 v8 = iadd v7, v4 ;; @0049 v9 = iconst.i64 4096 ;; @0049 v10 = iadd v8, v9 ; v9 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index 085392263f4b..cd55e9b24251 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 ;; @0040 v5 = iconst.i64 0xffff ;; @0040 v6 = icmp ugt v4, v5 ; v5 = 0xffff -;; @0040 v7 = global_value.i64 gv4 +;; @0040 v7 = global_value.i64 gv5 ;; @0040 v8 = iadd v7, v4 ;; @0040 v9 = iconst.i64 0xffff_0000 ;; @0040 v10 = iadd v8, v9 ; v9 = 0xffff_0000 @@ -48,14 +49,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 ;; @004c v5 = iconst.i64 0xffff ;; @004c v6 = icmp ugt v4, v5 ; v5 = 0xffff -;; @004c v7 = global_value.i64 gv4 +;; @004c v7 = global_value.i64 gv5 ;; @004c v8 = iadd v7, v4 ;; @004c v9 = iconst.i64 0xffff_0000 ;; @004c v10 = iadd v8, v9 ; v9 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 591590044dce..df7b8fbfb10a 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 store little heap v3, v6 ;; @0043 jump block1 @@ -42,12 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = global_value.i64 gv4 +;; @0048 v5 = global_value.i64 gv5 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = load.i32 little heap v6 ;; @004b jump block1(v7) diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index ddc6c0310640..a735b7c42b46 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = global_value.i64 gv4 +;; @0049 v5 = global_value.i64 gv5 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index b19052c18676..e152b5096e7d 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = global_value.i64 gv4 +;; @004c v5 = global_value.i64 gv5 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index 8e1233b4130f..0a71651939a3 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -42,12 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = global_value.i64 gv4 +;; @0048 v5 = global_value.i64 gv5 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1(v7) diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 5db465d32d82..e9068242837f 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = global_value.i64 gv4 +;; @0049 v5 = global_value.i64 gv5 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 9231c1e61865..28390fbd6551 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = global_value.i64 gv4 +;; @004c v5 = global_value.i64 gv5 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index e11000e2251d..9cf7b43b7fd4 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 store little heap v3, v6 ;; @0043 jump block1 @@ -42,12 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = global_value.i64 gv4 +;; @0048 v5 = global_value.i64 gv5 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = load.i32 little heap v6 ;; @004b jump block1(v7) diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 1771016a2c80..99e736391aa1 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = global_value.i64 gv4 +;; @0049 v5 = global_value.i64 gv5 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 765e3d3c25ca..004485b08110 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = global_value.i64 gv4 +;; @004c v5 = global_value.i64 gv5 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index c923bb06a666..25f54cdcfbc8 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 istore8 little heap v3, v6 ;; @0043 jump block1 @@ -42,12 +43,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0048 v4 = uextend.i64 v2 -;; @0048 v5 = global_value.i64 gv4 +;; @0048 v5 = global_value.i64 gv5 ;; @0048 v6 = iadd v5, v4 ;; @0048 v7 = uload8.i32 little heap v6 ;; @004b jump block1(v7) diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 4acf22d3e411..061181460c62 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 4096 ;; @0040 v8 = iadd v6, v7 ; v7 = 4096 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0049 v4 = uextend.i64 v2 -;; @0049 v5 = global_value.i64 gv4 +;; @0049 v5 = global_value.i64 gv5 ;; @0049 v6 = iadd v5, v4 ;; @0049 v7 = iconst.i64 4096 ;; @0049 v8 = iadd v6, v7 ; v7 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index c53777b96668..8a051c8d8819 100644 --- a/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,12 +23,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32, v3: i32): ;; @0040 v4 = uextend.i64 v2 -;; @0040 v5 = global_value.i64 gv4 +;; @0040 v5 = global_value.i64 gv5 ;; @0040 v6 = iadd v5, v4 ;; @0040 v7 = iconst.i64 0xffff_0000 ;; @0040 v8 = iadd v6, v7 ; v7 = 0xffff_0000 @@ -44,12 +45,13 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @004c v4 = uextend.i64 v2 -;; @004c v5 = global_value.i64 gv4 +;; @004c v5 = global_value.i64 gv5 ;; @004c v6 = iadd v5, v4 ;; @004c v7 = iconst.i64 0xffff_0000 ;; @004c v8 = iadd v6, v7 ; v7 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat index 46f1516a7842..6246f08ec5d1 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 store little heap v3, v7 ;; @0043 jump block1 @@ -44,14 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = load.i32 little heap v7 ;; @004b jump block1(v8) diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat index 431dd7b3d8e0..a67ba6893a0b 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat index 674a7c9d3940..6227dc1e9722 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @004c trapnz v5, heap_oob -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat index 99a72feb8c28..f71bb8c5e4a6 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 istore8 little heap v3, v7 ;; @0043 jump block1 @@ -44,14 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = uload8.i32 little heap v7 ;; @004b jump block1(v8) diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat index 11483f9cd189..7ac601a4da99 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat index 21e08e3f85bb..5eefcd78f5bb 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @004c trapnz v5, heap_oob -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat index 028cf8b2a49d..879ab013b2b3 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -45,13 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat index c8ffe5231558..f78795d8ea04 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 5e680cff302d..5b5dcfb64a52 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat index f808f9d622be..892e5245258e 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -45,13 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat index 1fe7bd8602ff..9093abe26687 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat index f72b18166c02..48b85454ee65 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat index 10b03a83c142..16e3e7b0e647 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 store little heap v3, v7 ;; @0043 jump block1 @@ -44,14 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = load.i32 little heap v7 ;; @004b jump block1(v8) diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat index 140fd148b482..a4a2272d332a 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat index d3b2860f93e2..4bbc9440ba1e 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc ;; @004c trapnz v5, heap_oob -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat index b9cf164a6c3f..cd8c40bd94a5 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 istore8 little heap v3, v7 ;; @0043 jump block1 @@ -44,14 +45,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff ;; @0048 trapnz v5, heap_oob -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = uload8.i32 little heap v7 ;; @004b jump block1(v8) diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat index 56b7047d0d9b..e520dfade816 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff ;; @0049 trapnz v5, heap_oob -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat index 21f305afd4b0..d31cbd6e4340 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat @@ -23,14 +23,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @0040 trapnz v5, heap_oob -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -46,14 +47,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff ;; @004c trapnz v5, heap_oob -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat index 778c099aed0c..343a0826826f 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_fffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -45,13 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_fffc ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_fffc -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat index 4a6fbdd639b9..35a5a2501c6b 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_effc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_effc ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_effc -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat index 5b0c14c5e9f2..cb7db236e423 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xfffc ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xfffc ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xfffc -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat index 92f576bd4223..ca5e50e12bbf 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_ffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0 ;; @0040 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 @@ -45,13 +46,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0048 v4 = iconst.i64 0xffff_ffff ;; @0048 v5 = icmp ugt v2, v4 ; v4 = 0xffff_ffff -;; @0048 v6 = global_value.i64 gv4 +;; @0048 v6 = global_value.i64 gv5 ;; @0048 v7 = iadd v6, v2 ;; @0048 v8 = iconst.i64 0 ;; @0048 v9 = select_spectre_guard v5, v8, v7 ; v8 = 0 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat index 8e6132627cac..ffab6e055fce 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff_efff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 4096 ;; @0040 v9 = iadd v7, v8 ; v8 = 4096 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @0049 v4 = iconst.i64 0xffff_efff ;; @0049 v5 = icmp ugt v2, v4 ; v4 = 0xffff_efff -;; @0049 v6 = global_value.i64 gv4 +;; @0049 v6 = global_value.i64 gv5 ;; @0049 v7 = iadd v6, v2 ;; @0049 v8 = iconst.i64 4096 ;; @0049 v9 = iadd v7, v8 ; v8 = 4096 diff --git a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat index ee8ce6711cba..ab26e746d948 100644 --- a/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat +++ b/tests/disas/load-store/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat @@ -23,13 +23,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64, v3: i32): ;; @0040 v4 = iconst.i64 0xffff ;; @0040 v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @0040 v6 = global_value.i64 gv4 +;; @0040 v6 = global_value.i64 gv5 ;; @0040 v7 = iadd v6, v2 ;; @0040 v8 = iconst.i64 0xffff_0000 ;; @0040 v9 = iadd v7, v8 ; v8 = 0xffff_0000 @@ -47,13 +48,14 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i64): ;; @004c v4 = iconst.i64 0xffff ;; @004c v5 = icmp ugt v2, v4 ; v4 = 0xffff -;; @004c v6 = global_value.i64 gv4 +;; @004c v6 = global_value.i64 gv5 ;; @004c v7 = iadd v6, v2 ;; @004c v8 = iconst.i64 0xffff_0000 ;; @004c v9 = iadd v7, v8 ; v8 = 0xffff_0000 diff --git a/tests/disas/memory.wat b/tests/disas/memory.wat index e3126929145f..e40dc66be408 100644 --- a/tests/disas/memory.wat +++ b/tests/disas/memory.wat @@ -17,7 +17,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64): @@ -25,12 +26,12 @@ ;; @0021 v3 = iconst.i32 0 ;; @0023 v4 = iconst.i32 0 ;; @0025 v5 = uextend.i64 v3 ; v3 = 0 -;; @0025 v6 = global_value.i64 gv4 +;; @0025 v6 = global_value.i64 gv5 ;; @0025 v7 = iadd v6, v5 ;; @0025 store little heap v4, v7 ; v4 = 0 ;; @0028 v8 = iconst.i32 0 ;; @002a v9 = uextend.i64 v8 ; v8 = 0 -;; @002a v10 = global_value.i64 gv4 +;; @002a v10 = global_value.i64 gv5 ;; @002a v11 = iadd v10, v9 ;; @002a v12 = load.i32 little heap v11 ;; @002d brif v12, block2, block4 @@ -39,7 +40,7 @@ ;; @002f v13 = iconst.i32 0 ;; @0031 v14 = iconst.i32 10 ;; @0033 v15 = uextend.i64 v13 ; v13 = 0 -;; @0033 v16 = global_value.i64 gv4 +;; @0033 v16 = global_value.i64 gv5 ;; @0033 v17 = iadd v16, v15 ;; @0033 store little heap v14, v17 ; v14 = 10 ;; @0036 jump block3 @@ -48,7 +49,7 @@ ;; @0037 v18 = iconst.i32 0 ;; @0039 v19 = iconst.i32 11 ;; @003b v20 = uextend.i64 v18 ; v18 = 0 -;; @003b v21 = global_value.i64 gv4 +;; @003b v21 = global_value.i64 gv5 ;; @003b v22 = iadd v21, v20 ;; @003b store little heap v19, v22 ; v19 = 11 ;; @003e jump block3 diff --git a/tests/disas/passive-data.wat b/tests/disas/passive-data.wat index 70ea0489ef5b..38bf3d5157b2 100644 --- a/tests/disas/passive-data.wat +++ b/tests/disas/passive-data.wat @@ -18,7 +18,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; sig0 = (i64 vmctx, i32 uext, i32 uext, i64, i32 uext, i32 uext) system_v ;; fn0 = colocated u1:6 sig0 ;; stack_limit = gv2 diff --git a/tests/disas/pr2303.wat b/tests/disas/pr2303.wat index 9dd422d5c25b..c3dccb070960 100644 --- a/tests/disas/pr2303.wat +++ b/tests/disas/pr2303.wat @@ -21,19 +21,20 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i32): ;; @0036 v3 = iconst.i32 48 ;; @0038 v4 = iconst.i32 0 ;; @003a v5 = uextend.i64 v4 ; v4 = 0 -;; @003a v6 = global_value.i64 gv4 +;; @003a v6 = global_value.i64 gv5 ;; @003a v7 = iadd v6, v5 ;; @003a v8 = load.i8x16 little heap v7 ;; @003e v9 = iconst.i32 16 ;; @0040 v10 = uextend.i64 v9 ; v9 = 16 -;; @0040 v11 = global_value.i64 gv4 +;; @0040 v11 = global_value.i64 gv5 ;; @0040 v12 = iadd v11, v10 ;; @0040 v13 = load.i8x16 little heap v12 ;; @0046 brif v2, block2, block4(v8, v13) @@ -44,7 +45,7 @@ ;; @0048 v18 = iadd v16, v17 ;; @004b v19 = iconst.i32 32 ;; @004d v20 = uextend.i64 v19 ; v19 = 32 -;; @004d v21 = global_value.i64 gv4 +;; @004d v21 = global_value.i64 gv5 ;; @004d v22 = iadd v21, v20 ;; @004d v23 = load.i8x16 little heap v22 ;; @0051 v26 = bitcast.i8x16 little v18 @@ -56,7 +57,7 @@ ;; @0052 v29 = isub v27, v28 ;; @0055 v30 = iconst.i32 0 ;; @0057 v31 = uextend.i64 v30 ; v30 = 0 -;; @0057 v32 = global_value.i64 gv4 +;; @0057 v32 = global_value.i64 gv5 ;; @0057 v33 = iadd v32, v31 ;; @0057 v34 = load.i8x16 little heap v33 ;; @005b v35 = bitcast.i8x16 little v29 @@ -67,7 +68,7 @@ ;; @005c v37 = bitcast.i16x8 little v15 ;; @005c v38 = imul v36, v37 ;; @005f v39 = uextend.i64 v3 ; v3 = 48 -;; @005f v40 = global_value.i64 gv4 +;; @005f v40 = global_value.i64 gv5 ;; @005f v41 = iadd v40, v39 ;; @005f store little heap v38, v41 ;; @0063 jump block1 diff --git a/tests/disas/simd-store.wat b/tests/disas/simd-store.wat index 234e0985471e..3343e227970d 100644 --- a/tests/disas/simd-store.wat +++ b/tests/disas/simd-store.wat @@ -89,14 +89,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @003f v3 = iconst.i32 0 ;; @0045 v4 = icmp eq v2, v2 ;; @0047 v5 = uextend.i64 v3 ; v3 = 0 -;; @0047 v6 = global_value.i64 gv4 +;; @0047 v6 = global_value.i64 gv5 ;; @0047 v7 = iadd v6, v5 ;; @0047 store little heap v4, v7 ;; @004b jump block1 @@ -110,7 +111,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -119,7 +121,7 @@ ;; @0054 v5 = bitcast.i16x8 little v2 ;; @0054 v6 = icmp eq v4, v5 ;; @0056 v7 = uextend.i64 v3 ; v3 = 0 -;; @0056 v8 = global_value.i64 gv4 +;; @0056 v8 = global_value.i64 gv5 ;; @0056 v9 = iadd v8, v7 ;; @0056 store little heap v6, v9 ;; @005a jump block1 @@ -133,7 +135,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -142,7 +145,7 @@ ;; @0063 v5 = bitcast.i32x4 little v2 ;; @0063 v6 = icmp eq v4, v5 ;; @0065 v7 = uextend.i64 v3 ; v3 = 0 -;; @0065 v8 = global_value.i64 gv4 +;; @0065 v8 = global_value.i64 gv5 ;; @0065 v9 = iadd v8, v7 ;; @0065 store little heap v6, v9 ;; @0069 jump block1 @@ -156,7 +159,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -165,7 +169,7 @@ ;; @0072 v5 = bitcast.i64x2 little v2 ;; @0072 v6 = icmp eq v4, v5 ;; @0075 v7 = uextend.i64 v3 ; v3 = 0 -;; @0075 v8 = global_value.i64 gv4 +;; @0075 v8 = global_value.i64 gv5 ;; @0075 v9 = iadd v8, v7 ;; @0075 store little heap v6, v9 ;; @0079 jump block1 @@ -179,14 +183,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @007c v3 = iconst.i32 0 ;; @0082 v4 = icmp ne v2, v2 ;; @0084 v5 = uextend.i64 v3 ; v3 = 0 -;; @0084 v6 = global_value.i64 gv4 +;; @0084 v6 = global_value.i64 gv5 ;; @0084 v7 = iadd v6, v5 ;; @0084 store little heap v4, v7 ;; @0088 jump block1 @@ -200,7 +205,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -209,7 +215,7 @@ ;; @0091 v5 = bitcast.i16x8 little v2 ;; @0091 v6 = icmp ne v4, v5 ;; @0093 v7 = uextend.i64 v3 ; v3 = 0 -;; @0093 v8 = global_value.i64 gv4 +;; @0093 v8 = global_value.i64 gv5 ;; @0093 v9 = iadd v8, v7 ;; @0093 store little heap v6, v9 ;; @0097 jump block1 @@ -223,7 +229,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -232,7 +239,7 @@ ;; @00a0 v5 = bitcast.i32x4 little v2 ;; @00a0 v6 = icmp ne v4, v5 ;; @00a2 v7 = uextend.i64 v3 ; v3 = 0 -;; @00a2 v8 = global_value.i64 gv4 +;; @00a2 v8 = global_value.i64 gv5 ;; @00a2 v9 = iadd v8, v7 ;; @00a2 store little heap v6, v9 ;; @00a6 jump block1 @@ -246,7 +253,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -255,7 +263,7 @@ ;; @00af v5 = bitcast.i64x2 little v2 ;; @00af v6 = icmp ne v4, v5 ;; @00b2 v7 = uextend.i64 v3 ; v3 = 0 -;; @00b2 v8 = global_value.i64 gv4 +;; @00b2 v8 = global_value.i64 gv5 ;; @00b2 v9 = iadd v8, v7 ;; @00b2 store little heap v6, v9 ;; @00b6 jump block1 @@ -269,14 +277,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @00b9 v3 = iconst.i32 0 ;; @00bf v4 = icmp slt v2, v2 ;; @00c1 v5 = uextend.i64 v3 ; v3 = 0 -;; @00c1 v6 = global_value.i64 gv4 +;; @00c1 v6 = global_value.i64 gv5 ;; @00c1 v7 = iadd v6, v5 ;; @00c1 store little heap v4, v7 ;; @00c5 jump block1 @@ -290,7 +299,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -299,7 +309,7 @@ ;; @00ce v5 = bitcast.i16x8 little v2 ;; @00ce v6 = icmp slt v4, v5 ;; @00d0 v7 = uextend.i64 v3 ; v3 = 0 -;; @00d0 v8 = global_value.i64 gv4 +;; @00d0 v8 = global_value.i64 gv5 ;; @00d0 v9 = iadd v8, v7 ;; @00d0 store little heap v6, v9 ;; @00d4 jump block1 @@ -313,7 +323,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -322,7 +333,7 @@ ;; @00dd v5 = bitcast.i32x4 little v2 ;; @00dd v6 = icmp slt v4, v5 ;; @00df v7 = uextend.i64 v3 ; v3 = 0 -;; @00df v8 = global_value.i64 gv4 +;; @00df v8 = global_value.i64 gv5 ;; @00df v9 = iadd v8, v7 ;; @00df store little heap v6, v9 ;; @00e3 jump block1 @@ -336,7 +347,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -345,7 +357,7 @@ ;; @00ec v5 = bitcast.i64x2 little v2 ;; @00ec v6 = icmp slt v4, v5 ;; @00ef v7 = uextend.i64 v3 ; v3 = 0 -;; @00ef v8 = global_value.i64 gv4 +;; @00ef v8 = global_value.i64 gv5 ;; @00ef v9 = iadd v8, v7 ;; @00ef store little heap v6, v9 ;; @00f3 jump block1 @@ -359,14 +371,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @00f6 v3 = iconst.i32 0 ;; @00fc v4 = icmp ult v2, v2 ;; @00fe v5 = uextend.i64 v3 ; v3 = 0 -;; @00fe v6 = global_value.i64 gv4 +;; @00fe v6 = global_value.i64 gv5 ;; @00fe v7 = iadd v6, v5 ;; @00fe store little heap v4, v7 ;; @0102 jump block1 @@ -380,7 +393,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -389,7 +403,7 @@ ;; @010b v5 = bitcast.i16x8 little v2 ;; @010b v6 = icmp ult v4, v5 ;; @010d v7 = uextend.i64 v3 ; v3 = 0 -;; @010d v8 = global_value.i64 gv4 +;; @010d v8 = global_value.i64 gv5 ;; @010d v9 = iadd v8, v7 ;; @010d store little heap v6, v9 ;; @0111 jump block1 @@ -403,7 +417,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -412,7 +427,7 @@ ;; @011a v5 = bitcast.i32x4 little v2 ;; @011a v6 = icmp ult v4, v5 ;; @011c v7 = uextend.i64 v3 ; v3 = 0 -;; @011c v8 = global_value.i64 gv4 +;; @011c v8 = global_value.i64 gv5 ;; @011c v9 = iadd v8, v7 ;; @011c store little heap v6, v9 ;; @0120 jump block1 @@ -426,14 +441,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @0123 v3 = iconst.i32 0 ;; @0129 v4 = icmp sgt v2, v2 ;; @012b v5 = uextend.i64 v3 ; v3 = 0 -;; @012b v6 = global_value.i64 gv4 +;; @012b v6 = global_value.i64 gv5 ;; @012b v7 = iadd v6, v5 ;; @012b store little heap v4, v7 ;; @012f jump block1 @@ -447,7 +463,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -456,7 +473,7 @@ ;; @0138 v5 = bitcast.i16x8 little v2 ;; @0138 v6 = icmp sgt v4, v5 ;; @013a v7 = uextend.i64 v3 ; v3 = 0 -;; @013a v8 = global_value.i64 gv4 +;; @013a v8 = global_value.i64 gv5 ;; @013a v9 = iadd v8, v7 ;; @013a store little heap v6, v9 ;; @013e jump block1 @@ -470,7 +487,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -479,7 +497,7 @@ ;; @0147 v5 = bitcast.i32x4 little v2 ;; @0147 v6 = icmp sgt v4, v5 ;; @0149 v7 = uextend.i64 v3 ; v3 = 0 -;; @0149 v8 = global_value.i64 gv4 +;; @0149 v8 = global_value.i64 gv5 ;; @0149 v9 = iadd v8, v7 ;; @0149 store little heap v6, v9 ;; @014d jump block1 @@ -493,7 +511,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -502,7 +521,7 @@ ;; @0156 v5 = bitcast.i64x2 little v2 ;; @0156 v6 = icmp sgt v4, v5 ;; @0159 v7 = uextend.i64 v3 ; v3 = 0 -;; @0159 v8 = global_value.i64 gv4 +;; @0159 v8 = global_value.i64 gv5 ;; @0159 v9 = iadd v8, v7 ;; @0159 store little heap v6, v9 ;; @015d jump block1 @@ -516,14 +535,15 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): ;; @0160 v3 = iconst.i32 0 ;; @0166 v4 = icmp ugt v2, v2 ;; @0168 v5 = uextend.i64 v3 ; v3 = 0 -;; @0168 v6 = global_value.i64 gv4 +;; @0168 v6 = global_value.i64 gv5 ;; @0168 v7 = iadd v6, v5 ;; @0168 store little heap v4, v7 ;; @016c jump block1 @@ -537,7 +557,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -546,7 +567,7 @@ ;; @0175 v5 = bitcast.i16x8 little v2 ;; @0175 v6 = icmp ugt v4, v5 ;; @0177 v7 = uextend.i64 v3 ; v3 = 0 -;; @0177 v8 = global_value.i64 gv4 +;; @0177 v8 = global_value.i64 gv5 ;; @0177 v9 = iadd v8, v7 ;; @0177 store little heap v6, v9 ;; @017b jump block1 @@ -560,7 +581,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -569,7 +591,7 @@ ;; @0184 v5 = bitcast.i32x4 little v2 ;; @0184 v6 = icmp ugt v4, v5 ;; @0186 v7 = uextend.i64 v3 ; v3 = 0 -;; @0186 v8 = global_value.i64 gv4 +;; @0186 v8 = global_value.i64 gv5 ;; @0186 v9 = iadd v8, v7 ;; @0186 store little heap v6, v9 ;; @018a jump block1 @@ -583,7 +605,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -592,7 +615,7 @@ ;; @0193 v5 = bitcast.f32x4 little v2 ;; @0193 v6 = fcmp eq v4, v5 ;; @0195 v7 = uextend.i64 v3 ; v3 = 0 -;; @0195 v8 = global_value.i64 gv4 +;; @0195 v8 = global_value.i64 gv5 ;; @0195 v9 = iadd v8, v7 ;; @0195 store little heap v6, v9 ;; @0199 jump block1 @@ -606,7 +629,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -615,7 +639,7 @@ ;; @01a2 v5 = bitcast.f64x2 little v2 ;; @01a2 v6 = fcmp eq v4, v5 ;; @01a4 v7 = uextend.i64 v3 ; v3 = 0 -;; @01a4 v8 = global_value.i64 gv4 +;; @01a4 v8 = global_value.i64 gv5 ;; @01a4 v9 = iadd v8, v7 ;; @01a4 store little heap v6, v9 ;; @01a8 jump block1 @@ -629,7 +653,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -638,7 +663,7 @@ ;; @01b1 v5 = bitcast.f32x4 little v2 ;; @01b1 v6 = fcmp ne v4, v5 ;; @01b3 v7 = uextend.i64 v3 ; v3 = 0 -;; @01b3 v8 = global_value.i64 gv4 +;; @01b3 v8 = global_value.i64 gv5 ;; @01b3 v9 = iadd v8, v7 ;; @01b3 store little heap v6, v9 ;; @01b7 jump block1 @@ -652,7 +677,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -661,7 +687,7 @@ ;; @01c0 v5 = bitcast.f64x2 little v2 ;; @01c0 v6 = fcmp ne v4, v5 ;; @01c2 v7 = uextend.i64 v3 ; v3 = 0 -;; @01c2 v8 = global_value.i64 gv4 +;; @01c2 v8 = global_value.i64 gv5 ;; @01c2 v9 = iadd v8, v7 ;; @01c2 store little heap v6, v9 ;; @01c6 jump block1 @@ -675,7 +701,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -684,7 +711,7 @@ ;; @01cf v5 = bitcast.f32x4 little v2 ;; @01cf v6 = fcmp lt v4, v5 ;; @01d1 v7 = uextend.i64 v3 ; v3 = 0 -;; @01d1 v8 = global_value.i64 gv4 +;; @01d1 v8 = global_value.i64 gv5 ;; @01d1 v9 = iadd v8, v7 ;; @01d1 store little heap v6, v9 ;; @01d5 jump block1 @@ -698,7 +725,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -707,7 +735,7 @@ ;; @01de v5 = bitcast.f64x2 little v2 ;; @01de v6 = fcmp lt v4, v5 ;; @01e0 v7 = uextend.i64 v3 ; v3 = 0 -;; @01e0 v8 = global_value.i64 gv4 +;; @01e0 v8 = global_value.i64 gv5 ;; @01e0 v9 = iadd v8, v7 ;; @01e0 store little heap v6, v9 ;; @01e4 jump block1 @@ -721,7 +749,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -730,7 +759,7 @@ ;; @01ed v5 = bitcast.f32x4 little v2 ;; @01ed v6 = fcmp le v4, v5 ;; @01ef v7 = uextend.i64 v3 ; v3 = 0 -;; @01ef v8 = global_value.i64 gv4 +;; @01ef v8 = global_value.i64 gv5 ;; @01ef v9 = iadd v8, v7 ;; @01ef store little heap v6, v9 ;; @01f3 jump block1 @@ -744,7 +773,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -753,7 +783,7 @@ ;; @01fc v5 = bitcast.f64x2 little v2 ;; @01fc v6 = fcmp le v4, v5 ;; @01fe v7 = uextend.i64 v3 ; v3 = 0 -;; @01fe v8 = global_value.i64 gv4 +;; @01fe v8 = global_value.i64 gv5 ;; @01fe v9 = iadd v8, v7 ;; @01fe store little heap v6, v9 ;; @0202 jump block1 @@ -767,7 +797,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -776,7 +807,7 @@ ;; @020b v5 = bitcast.f32x4 little v2 ;; @020b v6 = fcmp gt v4, v5 ;; @020d v7 = uextend.i64 v3 ; v3 = 0 -;; @020d v8 = global_value.i64 gv4 +;; @020d v8 = global_value.i64 gv5 ;; @020d v9 = iadd v8, v7 ;; @020d store little heap v6, v9 ;; @0211 jump block1 @@ -790,7 +821,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -799,7 +831,7 @@ ;; @021a v5 = bitcast.f64x2 little v2 ;; @021a v6 = fcmp gt v4, v5 ;; @021c v7 = uextend.i64 v3 ; v3 = 0 -;; @021c v8 = global_value.i64 gv4 +;; @021c v8 = global_value.i64 gv5 ;; @021c v9 = iadd v8, v7 ;; @021c store little heap v6, v9 ;; @0220 jump block1 @@ -813,7 +845,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -822,7 +855,7 @@ ;; @0229 v5 = bitcast.f32x4 little v2 ;; @0229 v6 = fcmp ge v4, v5 ;; @022b v7 = uextend.i64 v3 ; v3 = 0 -;; @022b v8 = global_value.i64 gv4 +;; @022b v8 = global_value.i64 gv5 ;; @022b v9 = iadd v8, v7 ;; @022b store little heap v6, v9 ;; @022f jump block1 @@ -836,7 +869,8 @@ ;; gv1 = load.i64 notrap aligned readonly gv0+8 ;; gv2 = load.i64 notrap aligned gv1 ;; gv3 = vmctx -;; gv4 = load.i64 notrap aligned readonly checked gv3+96 +;; gv4 = load.i64 notrap aligned gv3+104 +;; gv5 = load.i64 notrap aligned readonly checked gv3+96 ;; stack_limit = gv2 ;; ;; block0(v0: i64, v1: i64, v2: i8x16): @@ -845,7 +879,7 @@ ;; @0238 v5 = bitcast.f64x2 little v2 ;; @0238 v6 = fcmp ge v4, v5 ;; @023a v7 = uextend.i64 v3 ; v3 = 0 -;; @023a v8 = global_value.i64 gv4 +;; @023a v8 = global_value.i64 gv5 ;; @023a v9 = iadd v8, v7 ;; @023a store little heap v6, v9 ;; @023e jump block1