A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
winch: Fix missing zero-extensions of addresses loaded from (#13014)
Alex Crichton3aab955b3e9d
diff --git a/tests/disas/winch/aarch64/load/dynamic_heap.wat b/tests/disas/winch/aarch64/load/dynamic_heap.watindex 1ee8089ac0..6e884275c6 100644--- a/tests/disas/winch/aarch64/load/dynamic_heap.wat+++ b/tests/disas/winch/aarch64/load/dynamic_heap.wat@@ -46,7 +46,7 @@;; 5c: cmp x2, x1, uxtx;; b.hi #0x158;; 64: ldur x3, [x9, #0x38]-;; add x3, x3, x0, uxtx+;; add x3, x3, w0, uxtw;; mov x4, #0;; cmp x2, x1, uxtx;; csel x3, x4, x3, hi@@ -59,7 +59,7 @@;; 90: cmp x3, x2, uxtx;; b.hi #0x160;; 98: ldur x4, [x9, #0x38]-;; add x4, x4, x1, uxtx+;; add x4, x4, w1, uxtw;; add x4, x4, #4;; mov x5, #0;; cmp x3, x2, uxtx@@ -75,7 +75,7 @@;; d0: cmp x4, x3, uxtx;; b.hi #0x168;; d8: ldur x5, [x9, #0x38]-;; add x5, x5, x2, uxtx+;; add x5, x5, w2, uxtw;; orr x16, xzr, #0xfffff;; add x5, x5, x16, uxtx;; mov x6, #0diff --git a/tests/disas/winch/aarch64/load/f32.wat b/tests/disas/winch/aarch64/load/f32.watindex eaa217d4b5..29b8e2dcc8 100644--- a/tests/disas/winch/aarch64/load/f32.wat+++ b/tests/disas/winch/aarch64/load/f32.wat@@ -25,7 +25,7 @@;; stur x1, [x28];; mov x0, #0;; ldur x1, [x9, #0x38]-;; add x1, x1, x0, uxtx+;; add x1, x1, w0, uxtw;; ldur s0, [x1];; add x28, x28, #0x10;; mov sp, x28diff --git a/tests/disas/winch/aarch64/load/f64.wat b/tests/disas/winch/aarch64/load/f64.watindex 415116440d..ad5fc6a743 100644--- a/tests/disas/winch/aarch64/load/f64.wat+++ b/tests/disas/winch/aarch64/load/f64.wat@@ -24,7 +24,7 @@;; stur x1, [x28];; mov x0, #0;; ldur x1, [x9, #0x38]-;; add x1, x1, x0, uxtx+;; add x1, x1, w0, uxtw;; ldur d0, [x1];; add x28, x28, #0x10;; mov sp, x28diff --git a/tests/disas/winch/aarch64/load/i32.wat b/tests/disas/winch/aarch64/load/i32.watindex b056feacdc..fccf976b36 100644--- a/tests/disas/winch/aarch64/load/i32.wat+++ b/tests/disas/winch/aarch64/load/i32.wat@@ -25,7 +25,7 @@;; stur x1, [x28];; mov x0, #0;; ldur x1, [x9, #0x38]-;; add x1, x1, x0, uxtx+;; add x1, x1, w0, uxtw;; ldur w0, [x1];; add x28, x28, #0x10;; mov sp, x28diff --git a/tests/disas/winch/aarch64/load/i64.wat b/tests/disas/winch/aarch64/load/i64.watindex 76a80970ca..999906081a 100644--- a/tests/disas/winch/aarch64/load/i64.wat+++ b/tests/disas/winch/aarch64/load/i64.wat@@ -28,13 +28,13 @@;; ldur x0, [x28];; mov x1, #8;; ldur x2, [x9, #0x38]-;; add x2, x2, x1, uxtx+;; add x2, x2, w1, uxtw;; sub sp, x28, #8;; sturb w0, [x2];; mov sp, x28;; mov x0, #8;; ldur x1, [x9, #0x38]-;; add x1, x1, x0, uxtx+;; add x1, x1, w0, uxtw;; sub sp, x28, #8;; ldursb x0, [x1];; mov sp, x28diff --git a/tests/disas/winch/aarch64/store/dynamic_heap.wat b/tests/disas/winch/aarch64/store/dynamic_heap.watindex 24c7b3455e..c2be4e9701 100644--- a/tests/disas/winch/aarch64/store/dynamic_heap.wat+++ b/tests/disas/winch/aarch64/store/dynamic_heap.wat@@ -49,7 +49,7 @@;; 68: cmp x3, x2, uxtx;; b.hi #0x12c;; 70: ldur x4, [x9, #0x38]-;; add x4, x4, x1, uxtx+;; add x4, x4, w1, uxtw;; mov x5, #0;; cmp x3, x2, uxtx;; csel x4, x5, x4, hi@@ -63,7 +63,7 @@;; a0: cmp x3, x2, uxtx;; b.hi #0x134;; a8: ldur x4, [x9, #0x38]-;; add x4, x4, x1, uxtx+;; add x4, x4, w1, uxtw;; add x4, x4, #4;; mov x5, #0;; cmp x3, x2, uxtx@@ -80,7 +80,7 @@;; e4: cmp x3, x2, uxtx;; b.hi #0x13c;; ec: ldur x4, [x9, #0x38]-;; add x4, x4, x1, uxtx+;; add x4, x4, w1, uxtw;; orr x16, xzr, #0xfffff;; add x4, x4, x16, uxtx;; mov x5, #0diff --git a/tests/disas/winch/aarch64/store/f32.wat b/tests/disas/winch/aarch64/store/f32.watindex c9555ba4dc..8717dd199f 100644--- a/tests/disas/winch/aarch64/store/f32.wat+++ b/tests/disas/winch/aarch64/store/f32.wat@@ -25,7 +25,7 @@;; ldr s0, #0x70;; mov x0, #0;; ldur x1, [x9, #0x38]-;; add x1, x1, x0, uxtx+;; add x1, x1, w0, uxtw;; stur s0, [x1];; add x28, x28, #0x10;; mov sp, x28diff --git a/tests/disas/winch/aarch64/store/f64.wat b/tests/disas/winch/aarch64/store/f64.watindex f2aee771a2..70bdd13d9f 100644--- a/tests/disas/winch/aarch64/store/f64.wat+++ b/tests/disas/winch/aarch64/store/f64.wat@@ -26,7 +26,7 @@;; ldr d0, #0x70;; mov x0, #0;; ldur x1, [x9, #0x38]-;; add x1, x1, x0, uxtx+;; add x1, x1, w0, uxtw;; stur d0, [x1];; add x28, x28, #0x10;; mov sp, x28diff --git a/tests/disas/winch/aarch64/store/i32.wat b/tests/disas/winch/aarch64/store/i32.watindex 48fba51040..d5ab1b9587 100644--- a/tests/disas/winch/aarch64/store/i32.wat+++ b/tests/disas/winch/aarch64/store/i32.wat@@ -27,7 +27,7 @@;; mov x0, #1;; mov x1, #0;; ldur x2, [x9, #0x38]-;; add x2, x2, x1, uxtx+;; add x2, x2, w1, uxtw;; stur w0, [x2];; add x28, x28, #0x10;; mov sp, x28diff --git a/tests/disas/winch/x64/atomic/fence/fence.wat b/tests/disas/winch/x64/atomic/fence/fence.watindex 5fb841aa8e..9b4a4b038f 100644--- a/tests/disas/winch/x64/atomic/fence/fence.wat+++ b/tests/disas/winch/x64/atomic/fence/fence.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x62+;; ja 0x66;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -24,15 +24,17 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movl %eax, (%rdx);; mfence;; movl $0, %eax;; movq 0x30(%r14), %r11;; movq (%r11), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl (%rcx), %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 62: ud2+;; 66: ud2diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load.watindex f96d7b8d33..fca088c465 100644--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load.wat@@ -13,7 +13,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x5f+;; ja 0x61;; 1c: movq %rdi, %r14;; subq $0x20, %rsp;; movq %rdi, 0x18(%rsp)@@ -22,14 +22,15 @@;; movl 0xc(%rsp), %eax;; andl $3, %eax;; cmpl $0, %eax-;; jne 0x61+;; jne 0x63;; 46: movl 0xc(%rsp), %eax;; movq 0x30(%r14), %r11;; movq (%r11), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl (%rcx), %eax;; addq $0x20, %rsp;; popq %rbp;; retq-;; 5f: ud2;; 61: ud2+;; 63: ud2diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.watindex 4c82b1db26..8f190c3b6b 100644--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load16_u.wat@@ -13,7 +13,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x61+;; ja 0x63;; 1c: movq %rdi, %r14;; subq $0x20, %rsp;; movq %rdi, 0x18(%rsp)@@ -22,14 +22,15 @@;; movl 0xc(%rsp), %eax;; andw $1, %ax;; cmpw $0, %ax-;; jne 0x63+;; jne 0x65;; 46: movl 0xc(%rsp), %eax;; movq 0x30(%r14), %r11;; movq (%r11), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movzwq (%rcx), %rax;; addq $0x20, %rsp;; popq %rbp;; retq-;; 61: ud2;; 63: ud2+;; 65: ud2diff --git a/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat b/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.watindex 9a410d10a3..2a4454b864 100644--- a/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat+++ b/tests/disas/winch/x64/atomic/load/i32_atomic_load8_u.wat@@ -13,16 +13,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x48+;; ja 0x4a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movzbq (%rcx), %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 48: ud2+;; 4a: ud2diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load.watindex be89e8f71b..1482297c2c 100644--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load.wat@@ -14,7 +14,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x5c+;; ja 0x5e;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,13 +22,14 @@;; movl $0, %eax;; andq $7, %rax;; cmpq $0, %rax-;; jne 0x5e+;; jne 0x60;; 44: movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movq (%rcx), %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 5c: ud2;; 5e: ud2+;; 60: ud2diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.watindex da9c5e1d24..a27b432cb7 100644--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat@@ -14,7 +14,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x5b+;; ja 0x5d;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,13 +22,14 @@;; movl $0, %eax;; andw $1, %ax;; cmpw $0, %ax-;; jne 0x5d+;; jne 0x5f;; 42: movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movzwq (%rcx), %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 5b: ud2;; 5d: ud2+;; 5f: ud2diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.watindex be4b6bbe01..70a7f10f30 100644--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat@@ -14,7 +14,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x59+;; ja 0x5b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,13 +22,14 @@;; movl $0, %eax;; andl $3, %eax;; cmpl $0, %eax-;; jne 0x5b+;; jne 0x5d;; 42: movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl (%rcx), %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 59: ud2;; 5b: ud2+;; 5d: ud2diff --git a/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat b/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.watindex 4c0117c165..33ffb6d7e8 100644--- a/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat+++ b/tests/disas/winch/x64/atomic/load/i64_atomic_load8_u.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x48+;; ja 0x4a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movzbq (%rcx), %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 48: ud2+;; 4a: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.watindex 5c18877214..a99c2426dc 100644--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw16_addu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x68+;; ja 0x6a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,15 +21,16 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x6a+;; jne 0x6c;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; lock xaddw %ax, (%rdx);; movzwl %ax, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 68: ud2;; 6a: ud2+;; 6c: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.watindex b8652f7b97..a84a3ddaef 100644--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw8_addu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x53+;; ja 0x55;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; lock xaddb %al, (%rdx);; movzbl %al, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 53: ud2+;; 55: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.watindex 5c1ce19f75..abc3c93bd8 100644--- a/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat+++ b/tests/disas/winch/x64/atomic/rmw/add/i32_atomic_rmw_add.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x64+;; ja 0x66;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,14 +21,15 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x66+;; jne 0x68;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; lock xaddl %eax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 64: ud2;; 66: ud2+;; 68: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.watindex a66156bea0..2286d393fc 100644--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw16_addu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x69+;; ja 0x6b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,15 +21,16 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x6b+;; jne 0x6d;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; lock xaddw %ax, (%rdx);; movzwq %ax, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 69: ud2;; 6b: ud2+;; 6d: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.watindex 6adfe16211..7ae8f45786 100644--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw32_addu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x64+;; ja 0x66;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,14 +21,15 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x66+;; jne 0x68;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; lock xaddl %eax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 64: ud2;; 66: ud2+;; 68: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.watindex 05ee601a5a..1021713945 100644--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw8_addu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x54+;; ja 0x56;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; lock xaddb %al, (%rdx);; movzbq %al, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 54: ud2+;; 56: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.watindex 9ed0adca60..6757431d1a 100644--- a/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat+++ b/tests/disas/winch/x64/atomic/rmw/add/i64_atomic_rmw_add.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x67+;; ja 0x69;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,14 +21,15 @@;; movl $0, %ecx;; andq $7, %rcx;; cmpq $0, %rcx-;; jne 0x69+;; jne 0x6b;; 4a: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; lock xaddq %rax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 67: ud2;; 69: ud2+;; 6b: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.watindex 976fdbea55..057896fc79 100644--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw16_andu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x8d+;; ja 0x8f;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x8f+;; jne 0x91;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -34,10 +35,10 @@;; movq %rax, %r11;; andq %rcx, %r11;; lock cmpxchgw %r11w, (%rdx)-;; jne 0x6f-;; 81: movzwl %ax, %eax+;; jne 0x71+;; 83: movzwl %ax, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 8d: ud2;; 8f: ud2+;; 91: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.watindex 59883fd36b..805b4be84c 100644--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw8_andu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x78+;; ja 0x7a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -30,9 +31,9 @@;; movq %rax, %r11;; andq %rcx, %r11;; lock cmpxchgb %r11b, (%rdx)-;; jne 0x5b-;; 6c: movzbl %al, %eax+;; jne 0x5d+;; 6e: movzbl %al, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 78: ud2+;; 7a: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.watindex 5072b914b8..9f7d6cac30 100644--- a/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat+++ b/tests/disas/winch/x64/atomic/rmw/and/i32_atomic_rmw_and.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x87+;; ja 0x89;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x89+;; jne 0x8b;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -34,9 +35,9 @@;; movq %rax, %r11;; andq %rcx, %r11;; lock cmpxchgl %r11d, (%rdx)-;; jne 0x6d-;; 7e: addq $0x10, %rsp+;; jne 0x6f+;; 80: addq $0x10, %rsp;; popq %rbp;; retq-;; 87: ud2;; 89: ud2+;; 8b: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.watindex c7af5bece1..c008dad438 100644--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw16_andu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x7c+;; ja 0x7e;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x7e+;; jne 0x80;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,10 +33,10 @@;; movq %rax, %r11;; andq %rcx, %r11;; lock cmpxchgw %r11w, (%rdx)-;; jne 0x5d-;; 6f: movzwq %ax, %rax+;; jne 0x5f+;; 71: movzwq %ax, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 7c: ud2;; 7e: ud2+;; 80: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.watindex d050fe6d30..ebeac1c6e0 100644--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw32_andu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x75+;; ja 0x77;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x77+;; jne 0x79;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,9 +33,9 @@;; movq %rax, %r11;; andq %rcx, %r11;; lock cmpxchgl %r11d, (%rdx)-;; jne 0x5b-;; 6c: addq $0x10, %rsp+;; jne 0x5d+;; 6e: addq $0x10, %rsp;; popq %rbp;; retq-;; 75: ud2;; 77: ud2+;; 79: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.watindex a2abddb5c2..0a6d9e215c 100644--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw8_andu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x67+;; ja 0x69;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -28,9 +29,9 @@;; movq %rax, %r11;; andq %rcx, %r11;; lock cmpxchgb %r11b, (%rdx)-;; jne 0x49-;; 5a: movzbq %al, %rax+;; jne 0x4b+;; 5c: movzbq %al, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 67: ud2+;; 69: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.watindex 2bea25bb3a..e314c7be1a 100644--- a/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat+++ b/tests/disas/winch/x64/atomic/rmw/and/i64_atomic_rmw_and.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x78+;; ja 0x7a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andq $7, %rcx;; cmpq $0, %rcx-;; jne 0x7a+;; jne 0x7c;; 4a: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,9 +33,9 @@;; movq %rax, %r11;; andq %rcx, %r11;; lock cmpxchgq %r11, (%rdx)-;; jne 0x5e-;; 6f: addq $0x10, %rsp+;; jne 0x60+;; 71: addq $0x10, %rsp;; popq %rbp;; retq-;; 78: ud2;; 7a: ud2+;; 7c: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.watindex e7482e01df..1b6a30c9f4 100644--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw16_cmpxchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x95+;; ja 0x97;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,10 +22,11 @@;; movl $0, %edx;; andw $1, %dx;; cmpw $0, %dx-;; jne 0x97+;; jne 0x99;; 4d: movl $0, %edx;; movq 0x30(%r14), %r11;; movq (%r11), %rbx+;; movl %edx, %edx;; addq %rdx, %rbx;; subq $4, %rsp;; movl %ecx, (%rsp)@@ -40,5 +41,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 95: ud2;; 97: ud2+;; 99: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.watindex fdae2a0131..4bd5ff094b 100644--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw8_cmpxchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x80+;; ja 0x82;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,6 +22,7 @@;; movl $0, %edx;; movq 0x30(%r14), %r11;; movq (%r11), %rbx+;; movl %edx, %edx;; addq %rdx, %rbx;; subq $4, %rsp;; movl %ecx, (%rsp)@@ -36,4 +37,4 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 80: ud2+;; 82: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.watindex f5dc01fd46..d2e923d3fb 100644--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i32_atomic_rmw_cmpxchg.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x91+;; ja 0x93;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,10 +22,11 @@;; movl $0, %edx;; andl $3, %edx;; cmpl $0, %edx-;; jne 0x93+;; jne 0x95;; 4d: movl $0, %edx;; movq 0x30(%r14), %r11;; movq (%r11), %rbx+;; movl %edx, %edx;; addq %rdx, %rbx;; subq $4, %rsp;; movl %ecx, (%rsp)@@ -39,5 +40,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 91: ud2;; 93: ud2+;; 95: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.watindex 43431830fa..14c5d7b0a3 100644--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw16_cmpxchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x72+;; ja 0x74;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,10 +22,11 @@;; movl $0, %edx;; andw $1, %dx;; cmpw $0, %dx-;; jne 0x74+;; jne 0x76;; 4d: movl $0, %edx;; movq 0x30(%r14), %r11;; movq (%r11), %rbx+;; movl %edx, %edx;; addq %rdx, %rbx;; pushq %rcx;; pushq %rax@@ -36,5 +37,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 72: ud2;; 74: ud2+;; 76: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.watindex 83aad3af07..2fa2451eae 100644--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw32_cmpxchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x6d+;; ja 0x6f;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,10 +22,11 @@;; movl $0, %edx;; andl $3, %edx;; cmpl $0, %edx-;; jne 0x6f+;; jne 0x71;; 4d: movl $0, %edx;; movq 0x30(%r14), %r11;; movq (%r11), %rbx+;; movl %edx, %edx;; addq %rdx, %rbx;; pushq %rcx;; pushq %rax@@ -35,5 +36,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 6d: ud2;; 6f: ud2+;; 71: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.watindex 5937429bcc..96898ac61b 100644--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw8_cmpxchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x5d+;; ja 0x5f;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,6 +22,7 @@;; movl $0, %edx;; movq 0x30(%r14), %r11;; movq (%r11), %rbx+;; movl %edx, %edx;; addq %rdx, %rbx;; pushq %rcx;; pushq %rax@@ -32,4 +33,4 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 5d: ud2+;; 5f: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.watindex 35d973ffcf..08c068ef24 100644--- a/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat+++ b/tests/disas/winch/x64/atomic/rmw/cmpxchg/i64_atomic_rmw_cmpxchg.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x70+;; ja 0x72;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,10 +22,11 @@;; movl $0, %edx;; andq $7, %rdx;; cmpq $0, %rdx-;; jne 0x72+;; jne 0x74;; 4f: movl $0, %edx;; movq 0x30(%r14), %r11;; movq (%r11), %rbx+;; movl %edx, %edx;; addq %rdx, %rbx;; pushq %rcx;; pushq %rax@@ -35,5 +36,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 70: ud2;; 72: ud2+;; 74: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.watindex 6a38c317e0..ee570769a8 100644--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw16_oru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x8d+;; ja 0x8f;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x8f+;; jne 0x91;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -34,10 +35,10 @@;; movq %rax, %r11;; orq %rcx, %r11;; lock cmpxchgw %r11w, (%rdx)-;; jne 0x6f-;; 81: movzwl %ax, %eax+;; jne 0x71+;; 83: movzwl %ax, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 8d: ud2;; 8f: ud2+;; 91: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.watindex d159cb36d4..59b2b5d1bd 100644--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw8_oru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x78+;; ja 0x7a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -30,9 +31,9 @@;; movq %rax, %r11;; orq %rcx, %r11;; lock cmpxchgb %r11b, (%rdx)-;; jne 0x5b-;; 6c: movzbl %al, %eax+;; jne 0x5d+;; 6e: movzbl %al, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 78: ud2+;; 7a: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.watindex 85bd3a14b1..1472e2d27f 100644--- a/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat+++ b/tests/disas/winch/x64/atomic/rmw/or/i32_atomic_rmw_or.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x87+;; ja 0x89;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x89+;; jne 0x8b;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -34,9 +35,9 @@;; movq %rax, %r11;; orq %rcx, %r11;; lock cmpxchgl %r11d, (%rdx)-;; jne 0x6d-;; 7e: addq $0x10, %rsp+;; jne 0x6f+;; 80: addq $0x10, %rsp;; popq %rbp;; retq-;; 87: ud2;; 89: ud2+;; 8b: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.watindex f185ee1a60..76a44e3422 100644--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw16_oru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x7c+;; ja 0x7e;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x7e+;; jne 0x80;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,10 +33,10 @@;; movq %rax, %r11;; orq %rcx, %r11;; lock cmpxchgw %r11w, (%rdx)-;; jne 0x5d-;; 6f: movzwq %ax, %rax+;; jne 0x5f+;; 71: movzwq %ax, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 7c: ud2;; 7e: ud2+;; 80: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.watindex 5c096d070f..56f38739df 100644--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw32_oru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x75+;; ja 0x77;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x77+;; jne 0x79;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,9 +33,9 @@;; movq %rax, %r11;; orq %rcx, %r11;; lock cmpxchgl %r11d, (%rdx)-;; jne 0x5b-;; 6c: addq $0x10, %rsp+;; jne 0x5d+;; 6e: addq $0x10, %rsp;; popq %rbp;; retq-;; 75: ud2;; 77: ud2+;; 79: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.watindex ddf236cc81..78a1f3acf9 100644--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw8_oru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x67+;; ja 0x69;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -28,9 +29,9 @@;; movq %rax, %r11;; orq %rcx, %r11;; lock cmpxchgb %r11b, (%rdx)-;; jne 0x49-;; 5a: movzbq %al, %rax+;; jne 0x4b+;; 5c: movzbq %al, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 67: ud2+;; 69: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.watindex e5413396db..7e2aee8a68 100644--- a/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat+++ b/tests/disas/winch/x64/atomic/rmw/or/i64_atomic_rmw_or.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x78+;; ja 0x7a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andq $7, %rcx;; cmpq $0, %rcx-;; jne 0x7a+;; jne 0x7c;; 4a: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,9 +33,9 @@;; movq %rax, %r11;; orq %rcx, %r11;; lock cmpxchgq %r11, (%rdx)-;; jne 0x5e-;; 6f: addq $0x10, %rsp+;; jne 0x60+;; 71: addq $0x10, %rsp;; popq %rbp;; retq-;; 78: ud2;; 7a: ud2+;; 7c: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.watindex 60303b2447..4d36496e59 100644--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw16_subu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x6b+;; ja 0x6d;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x6d+;; jne 0x6f;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; negw %ax;; lock xaddw %ax, (%rdx)@@ -32,5 +33,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 6b: ud2;; 6d: ud2+;; 6f: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.watindex ef6c163742..e2b8981c78 100644--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw8_subu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x55+;; ja 0x57;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; negb %al;; lock xaddb %al, (%rdx)@@ -28,4 +29,4 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 55: ud2+;; 57: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.watindex d1f2c4f1a0..92c60396b4 100644--- a/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat+++ b/tests/disas/winch/x64/atomic/rmw/sub/i32_atomic_rmw_sub.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x66+;; ja 0x68;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,15 +21,16 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x68+;; jne 0x6a;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; negl %eax;; lock xaddl %eax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 66: ud2;; 68: ud2+;; 6a: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.watindex a8c7d943c1..11abf18984 100644--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw16_subu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x6c+;; ja 0x6e;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x6e+;; jne 0x70;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; negw %ax;; lock xaddw %ax, (%rdx)@@ -32,5 +33,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 6c: ud2;; 6e: ud2+;; 70: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.watindex 177df49343..889b0e3dfd 100644--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw32_subu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x66+;; ja 0x68;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,15 +21,16 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x68+;; jne 0x6a;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; negl %eax;; lock xaddl %eax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 66: ud2;; 68: ud2+;; 6a: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.watindex c447ab0fa5..3dccc0cffa 100644--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw8_subu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x56+;; ja 0x58;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; negb %al;; lock xaddb %al, (%rdx)@@ -28,4 +29,4 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 56: ud2+;; 58: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.watindex 8853273adc..9b3ad2543e 100644--- a/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat+++ b/tests/disas/winch/x64/atomic/rmw/sub/i64_atomic_rmw_sub.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x6a+;; ja 0x6c;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,15 +21,16 @@;; movl $0, %ecx;; andq $7, %rcx;; cmpq $0, %rcx-;; jne 0x6c+;; jne 0x6e;; 4a: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; negq %rax;; lock xaddq %rax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 6a: ud2;; 6c: ud2+;; 6e: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.watindex 6b23469c5e..5652d7a767 100644--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw16_xchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x66+;; ja 0x68;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,15 +21,16 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x68+;; jne 0x6a;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; xchgw %ax, (%rdx);; movzwl %ax, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 66: ud2;; 68: ud2+;; 6a: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.watindex 039f1630aa..d8d3e86abc 100644--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw8_xchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x51+;; ja 0x53;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; xchgb %al, (%rdx);; movzbl %al, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 51: ud2+;; 53: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.watindex 1b55d38f18..a243a60fbb 100644--- a/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i32_atomic_rmw_xchg.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x62+;; ja 0x64;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,14 +21,15 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x64+;; jne 0x66;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; xchgl %eax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 62: ud2;; 64: ud2+;; 66: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.watindex 582fdd104b..2d698249f8 100644--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw16_xchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x67+;; ja 0x69;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,15 +21,16 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x69+;; jne 0x6b;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; xchgw %ax, (%rdx);; movzwq %ax, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 67: ud2;; 69: ud2+;; 6b: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.watindex c5cbcc4890..87230d7133 100644--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw32_xchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x62+;; ja 0x64;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,14 +21,15 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x64+;; jne 0x66;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; xchgl %eax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 62: ud2;; 64: ud2+;; 66: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.watindex 0fe33e382e..d3ee516b4f 100644--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw8_xchgu.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x52+;; ja 0x54;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; xchgb %al, (%rdx);; movzbq %al, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 52: ud2+;; 54: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.watindex 8e16eddf52..72f9400fc6 100644--- a/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat+++ b/tests/disas/winch/x64/atomic/rmw/xchg/i64_atomic_rmw_xchg.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x65+;; ja 0x67;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,14 +21,15 @@;; movl $0, %ecx;; andq $7, %rcx;; cmpq $0, %rcx-;; jne 0x67+;; jne 0x69;; 4a: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; xchgq %rax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 65: ud2;; 67: ud2+;; 69: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.watindex d125eb187f..0f2ff36f13 100644--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw16_xoru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x8d+;; ja 0x8f;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x8f+;; jne 0x91;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -34,10 +35,10 @@;; movq %rax, %r11;; xorq %rcx, %r11;; lock cmpxchgw %r11w, (%rdx)-;; jne 0x6f-;; 81: movzwl %ax, %eax+;; jne 0x71+;; 83: movzwl %ax, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 8d: ud2;; 8f: ud2+;; 91: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.watindex 699c3d7fe1..5c9253842b 100644--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw8_xoru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x78+;; ja 0x7a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -30,9 +31,9 @@;; movq %rax, %r11;; xorq %rcx, %r11;; lock cmpxchgb %r11b, (%rdx)-;; jne 0x5b-;; 6c: movzbl %al, %eax+;; jne 0x5d+;; 6e: movzbl %al, %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 78: ud2+;; 7a: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.watindex 7baad5281b..cf0e18bd09 100644--- a/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat+++ b/tests/disas/winch/x64/atomic/rmw/xor/i32_atomic_rmw_xor.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x14, %r11;; cmpq %rsp, %r11-;; ja 0x87+;; ja 0x89;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x89+;; jne 0x8b;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; subq $4, %rsp;; movl %eax, (%rsp)@@ -34,9 +35,9 @@;; movq %rax, %r11;; xorq %rcx, %r11;; lock cmpxchgl %r11d, (%rdx)-;; jne 0x6d-;; 7e: addq $0x10, %rsp+;; jne 0x6f+;; 80: addq $0x10, %rsp;; popq %rbp;; retq-;; 87: ud2;; 89: ud2+;; 8b: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.watindex 28ab3167a7..a97056891f 100644--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw16_xoru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x7c+;; ja 0x7e;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x7e+;; jne 0x80;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,10 +33,10 @@;; movq %rax, %r11;; xorq %rcx, %r11;; lock cmpxchgw %r11w, (%rdx)-;; jne 0x5d-;; 6f: movzwq %ax, %rax+;; jne 0x5f+;; 71: movzwq %ax, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 7c: ud2;; 7e: ud2+;; 80: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.watindex 7c90075772..e86fb4dac9 100644--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw32_xoru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x75+;; ja 0x77;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x77+;; jne 0x79;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,9 +33,9 @@;; movq %rax, %r11;; xorq %rcx, %r11;; lock cmpxchgl %r11d, (%rdx)-;; jne 0x5b-;; 6c: addq $0x10, %rsp+;; jne 0x5d+;; 6e: addq $0x10, %rsp;; popq %rbp;; retq-;; 75: ud2;; 77: ud2+;; 79: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.watindex 7e46836ca4..fc8fdb115c 100644--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw8_xoru.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x67+;; ja 0x69;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,6 +21,7 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -28,9 +29,9 @@;; movq %rax, %r11;; xorq %rcx, %r11;; lock cmpxchgb %r11b, (%rdx)-;; jne 0x49-;; 5a: movzbq %al, %rax+;; jne 0x4b+;; 5c: movzbq %al, %rax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 67: ud2+;; 69: ud2diff --git a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.watindex 5b42ab4712..ec89efebde 100644--- a/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat+++ b/tests/disas/winch/x64/atomic/rmw/xor/i64_atomic_rmw_xor.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x18, %r11;; cmpq %rsp, %r11-;; ja 0x78+;; ja 0x7a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,10 +21,11 @@;; movl $0, %ecx;; andq $7, %rcx;; cmpq $0, %rcx-;; jne 0x7a+;; jne 0x7c;; 4a: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; pushq %rax;; popq %rcx@@ -32,9 +33,9 @@;; movq %rax, %r11;; xorq %rcx, %r11;; lock cmpxchgq %r11, (%rdx)-;; jne 0x5e-;; 6f: addq $0x10, %rsp+;; jne 0x60+;; 71: addq $0x10, %rsp;; popq %rbp;; retq-;; 78: ud2;; 7a: ud2+;; 7c: ud2diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store.watindex 7b42620f4a..a900070a58 100644--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store.wat@@ -11,7 +11,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x65+;; ja 0x67;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,15 +20,16 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x67+;; jne 0x69;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movl %eax, (%rdx);; mfence;; addq $0x10, %rsp;; popq %rbp;; retq-;; 65: ud2;; 67: ud2+;; 69: ud2diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store16.watindex 532bf26102..c2f2b03390 100644--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store16.wat@@ -11,7 +11,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x66+;; ja 0x68;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,15 +20,16 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x68+;; jne 0x6a;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movw %ax, (%rdx);; mfence;; addq $0x10, %rsp;; popq %rbp;; retq-;; 66: ud2;; 68: ud2+;; 6a: ud2diff --git a/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat b/tests/disas/winch/x64/atomic/store/i32_atomic_store8.watindex 24f37436f3..18ff875281 100644--- a/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat+++ b/tests/disas/winch/x64/atomic/store/i32_atomic_store8.wat@@ -11,7 +11,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x51+;; ja 0x53;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,10 +20,11 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movb %al, (%rdx);; mfence;; addq $0x10, %rsp;; popq %rbp;; retq-;; 51: ud2+;; 53: ud2diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store.watindex cce1b25e9d..9f931f720e 100644--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store.wat@@ -11,7 +11,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x68+;; ja 0x6a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,15 +20,16 @@;; movl $0, %ecx;; andq $7, %rcx;; cmpq $0, %rcx-;; jne 0x6a+;; jne 0x6c;; 4a: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movq %rax, (%rdx);; mfence;; addq $0x10, %rsp;; popq %rbp;; retq-;; 68: ud2;; 6a: ud2+;; 6c: ud2diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store16.watindex 8afe4b346e..6d64ff49f8 100644--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store16.wat@@ -11,7 +11,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x66+;; ja 0x68;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,15 +20,16 @@;; movl $0, %ecx;; andw $1, %cx;; cmpw $0, %cx-;; jne 0x68+;; jne 0x6a;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movw %ax, (%rdx);; mfence;; addq $0x10, %rsp;; popq %rbp;; retq-;; 66: ud2;; 68: ud2+;; 6a: ud2diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store32.watindex 96817f3f6c..c8a7d91f62 100644--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store32.wat@@ -11,7 +11,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x65+;; ja 0x67;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,15 +20,16 @@;; movl $0, %ecx;; andl $3, %ecx;; cmpl $0, %ecx-;; jne 0x67+;; jne 0x69;; 48: movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movl %eax, (%rdx);; mfence;; addq $0x10, %rsp;; popq %rbp;; retq-;; 65: ud2;; 67: ud2+;; 69: ud2diff --git a/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat b/tests/disas/winch/x64/atomic/store/i64_atomic_store8.watindex 0379939c3b..a84bb10007 100644--- a/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat+++ b/tests/disas/winch/x64/atomic/store/i64_atomic_store8.wat@@ -11,7 +11,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x51+;; ja 0x53;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,10 +20,11 @@;; movl $0, %ecx;; movq 0x30(%r14), %r11;; movq (%r11), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movb %al, (%rdx);; mfence;; addq $0x10, %rsp;; popq %rbp;; retq-;; 51: ud2+;; 53: ud2diff --git a/tests/disas/winch/x64/load/f32.wat b/tests/disas/winch/x64/load/f32.watindex b8f518b9a7..9fdc307e01 100644--- a/tests/disas/winch/x64/load/f32.wat+++ b/tests/disas/winch/x64/load/f32.wat@@ -13,16 +13,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x48+;; ja 0x4a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movss (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 48: ud2+;; 4a: ud2diff --git a/tests/disas/winch/x64/load/f64.wat b/tests/disas/winch/x64/load/f64.watindex 175b91e048..d496068814 100644--- a/tests/disas/winch/x64/load/f64.wat+++ b/tests/disas/winch/x64/load/f64.wat@@ -12,16 +12,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x48+;; ja 0x4a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movsd (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 48: ud2+;; 4a: ud2diff --git a/tests/disas/winch/x64/load/grow_load.wat b/tests/disas/winch/x64/load/grow_load.watindex b791c35ef2..1a20b87706 100644--- a/tests/disas/winch/x64/load/grow_load.wat+++ b/tests/disas/winch/x64/load/grow_load.wat@@ -34,7 +34,7 @@;; movq 0x18(%r11), %r11;; addq $0x70, %r11;; cmpq %rsp, %r11-;; ja 0x135+;; ja 0x137;; 1c: movq %rsi, %r14;; subq $0x60, %rsp;; movq %rsi, 0x58(%rsp)@@ -65,20 +65,21 @@;; movq %r14, %rdi;; movl 0xc(%rsp), %esi;; movl $0, %edx-;; callq 0x2e1+;; callq 0x2e9;; addq $0xc, %rsp;; addq $4, %rsp;; movq 0x58(%rsp), %r14;; movl %eax, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; addq $0x23024, %rcx;; movsbq (%rcx), %rax-;; movss 0x5c(%rip), %xmm0+;; movss 0x62(%rip), %xmm0;; subq $0xc, %rsp-;; movsd 0x54(%rip), %xmm15+;; movsd 0x5a(%rip), %xmm15;; movsd %xmm15, (%rsp)-;; movss 0x3d(%rip), %xmm15+;; movss 0x43(%rip), %xmm15;; movss %xmm15, 8(%rsp);; movq 0x14(%rsp), %rax;; movsd (%rsp), %xmm15@@ -90,8 +91,7 @@;; addq $0x60, %rsp;; popq %rbp;; retq-;; 135: ud2-;; 137: addb %al, (%rax)+;; 137: ud2;; 139: addb %al, (%rax);; 13b: addb %al, (%rax);; 13d: addb %al, (%rax)@@ -99,3 +99,7 @@;; 141: addb %al, (%rax);; 143: addb %al, (%rax);; 145: addb %al, (%rax)+;; 147: addb %al, (%rax)+;; 149: addb %al, (%rax)+;; 14b: addb %al, (%rax)+;; 14d: addb %al, (%rax)diff --git a/tests/disas/winch/x64/load/i32.wat b/tests/disas/winch/x64/load/i32.watindex 437421af67..6b073fc967 100644--- a/tests/disas/winch/x64/load/i32.wat+++ b/tests/disas/winch/x64/load/i32.wat@@ -13,16 +13,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x46+;; ja 0x48;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl (%rcx), %eax;; addq $0x10, %rsp;; popq %rbp;; retq-;; 46: ud2+;; 48: ud2diff --git a/tests/disas/winch/x64/load/i64.wat b/tests/disas/winch/x64/load/i64.watindex 510e9f3932..658d268072 100644--- a/tests/disas/winch/x64/load/i64.wat+++ b/tests/disas/winch/x64/load/i64.wat@@ -14,7 +14,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x61+;; ja 0x65;; 1c: movq %rdi, %r14;; subq $0x20, %rsp;; movq %rdi, 0x18(%rsp)@@ -23,13 +23,15 @@;; movq 8(%rsp), %rax;; movl $8, %ecx;; movq 0x38(%r14), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movb %al, (%rdx);; movl $8, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movsbq (%rcx), %rax;; addq $0x20, %rsp;; popq %rbp;; retq-;; 61: ud2+;; 65: ud2diff --git a/tests/disas/winch/x64/load/v128.wat b/tests/disas/winch/x64/load/v128.watindex 7bdfebed68..c961d2500e 100644--- a/tests/disas/winch/x64/load/v128.wat+++ b/tests/disas/winch/x64/load/v128.wat@@ -13,16 +13,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x48+;; ja 0x4a;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movdqu (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 48: ud2+;; 4a: ud2diff --git a/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat b/tests/disas/winch/x64/load/v128_load16_splat_avx2.watindex a74f5160e0..ba8a938927 100644--- a/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat+++ b/tests/disas/winch/x64/load/v128_load16_splat_avx2.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpbroadcastw (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat b/tests/disas/winch/x64/load/v128_load16x4_s_avx.watindex 40cb24794f..9ee5e73e37 100644--- a/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat+++ b/tests/disas/winch/x64/load/v128_load16x4_s_avx.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpmovsxwd (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat b/tests/disas/winch/x64/load/v128_load16x4_u_avx.watindex 0ccb8a98ea..a73fd80c1a 100644--- a/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat+++ b/tests/disas/winch/x64/load/v128_load16x4_u_avx.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpmovzxwd (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat b/tests/disas/winch/x64/load/v128_load32_splat_avx2.watindex 00fa17aa47..cb86b36d69 100644--- a/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat+++ b/tests/disas/winch/x64/load/v128_load32_splat_avx2.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpbroadcastd (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load32_zero_avx.wat b/tests/disas/winch/x64/load/v128_load32_zero_avx.watindex 3591b14e3e..ea090a4d0f 100644--- a/tests/disas/winch/x64/load/v128_load32_zero_avx.wat+++ b/tests/disas/winch/x64/load/v128_load32_zero_avx.wat@@ -14,17 +14,18 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x4c+;; ja 0x4e;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl (%rcx), %r11d;; vmovd %r11d, %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 4c: ud2+;; 4e: ud2diff --git a/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_s_avx.watindex e01996df75..b3a3c9c600 100644--- a/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat+++ b/tests/disas/winch/x64/load/v128_load32x2_s_avx.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpmovsxdq (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.watindex d34f49b482..01f56b4eb6 100644--- a/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.wat+++ b/tests/disas/winch/x64/load/v128_load32x2_s_oob_avx.wat@@ -14,15 +14,16 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x64+;; ja 0x66;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0xfff9, %eax;; cmpq $0xfff8, %rax-;; ja 0x66+;; ja 0x68;; 40: movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl $0, %edx;; cmpq $0xfff8, %rax@@ -31,5 +32,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 64: ud2;; 66: ud2+;; 68: ud2diff --git a/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_u_avx.watindex 911b0b0973..a48bc4f2dd 100644--- a/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat+++ b/tests/disas/winch/x64/load/v128_load32x2_u_avx.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpmovzxdq (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.wat b/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.watindex ba0c46d8b5..911768638f 100644--- a/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.wat+++ b/tests/disas/winch/x64/load/v128_load32x2_u_oob_avx.wat@@ -14,15 +14,16 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x64+;; ja 0x66;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0xfff9, %eax;; cmpq $0xfff8, %rax-;; ja 0x66+;; ja 0x68;; 40: movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl $0, %edx;; cmpq $0xfff8, %rax@@ -31,5 +32,5 @@;; addq $0x10, %rsp;; popq %rbp;; retq-;; 64: ud2;; 66: ud2+;; 68: ud2diff --git a/tests/disas/winch/x64/load/v128_load64_splat_avx.wat b/tests/disas/winch/x64/load/v128_load64_splat_avx.watindex 5c64a8da91..8e465afb7d 100644--- a/tests/disas/winch/x64/load/v128_load64_splat_avx.wat+++ b/tests/disas/winch/x64/load/v128_load64_splat_avx.wat@@ -14,17 +14,18 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x4d+;; ja 0x4f;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movsd (%rcx), %xmm0;; vpshufd $0x44, %xmm0, %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 4d: ud2+;; 4f: ud2diff --git a/tests/disas/winch/x64/load/v128_load64_zero_avx.wat b/tests/disas/winch/x64/load/v128_load64_zero_avx.watindex 2d555b2990..31fbcdc060 100644--- a/tests/disas/winch/x64/load/v128_load64_zero_avx.wat+++ b/tests/disas/winch/x64/load/v128_load64_zero_avx.wat@@ -14,17 +14,18 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x4c+;; ja 0x4e;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movq (%rcx), %r11;; vmovq %r11, %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 4c: ud2+;; 4e: ud2diff --git a/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat b/tests/disas/winch/x64/load/v128_load8_splat_avx2.watindex 6ca90831c9..7e96449876 100644--- a/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat+++ b/tests/disas/winch/x64/load/v128_load8_splat_avx2.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpbroadcastb (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat b/tests/disas/winch/x64/load/v128_load8x8_s_avx.watindex 4df70e0ef0..5e321b7b3d 100644--- a/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat+++ b/tests/disas/winch/x64/load/v128_load8x8_s_avx.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpmovsxbw (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat b/tests/disas/winch/x64/load/v128_load8x8_u_avx.watindex 7959ba3716..342e4325aa 100644--- a/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat+++ b/tests/disas/winch/x64/load/v128_load8x8_u_avx.wat@@ -14,16 +14,17 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x49+;; ja 0x4b;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp);; movq %rsi, (%rsp);; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpmovzxbw (%rcx), %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 49: ud2+;; 4b: ud2diff --git a/tests/disas/winch/x64/store/f32.wat b/tests/disas/winch/x64/store/f32.watindex 542b3f784a..9b4435c530 100644--- a/tests/disas/winch/x64/store/f32.wat+++ b/tests/disas/winch/x64/store/f32.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x50+;; ja 0x52;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,13 +20,13 @@;; movss 0x21(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movss %xmm0, (%rcx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 50: ud2-;; 52: addb %al, (%rax)+;; 52: ud2;; 54: addb %al, (%rax);; 56: addb %al, (%rax);; 58: addb %al, (%rax)diff --git a/tests/disas/winch/x64/store/f64.wat b/tests/disas/winch/x64/store/f64.watindex e3c936e58b..8bcea2421d 100644--- a/tests/disas/winch/x64/store/f64.wat+++ b/tests/disas/winch/x64/store/f64.wat@@ -13,7 +13,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x50+;; ja 0x52;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -21,13 +21,13 @@;; movsd 0x21(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movsd %xmm0, (%rcx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 50: ud2-;; 52: addb %al, (%rax)+;; 52: ud2;; 54: addb %al, (%rax);; 56: addb %al, (%rax);; 58: addb %al, (%rax)diff --git a/tests/disas/winch/x64/store/i32.wat b/tests/disas/winch/x64/store/i32.watindex c27f5a08f6..b5e656d808 100644--- a/tests/disas/winch/x64/store/i32.wat+++ b/tests/disas/winch/x64/store/i32.wat@@ -14,7 +14,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x4b+;; ja 0x4d;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -22,9 +22,10 @@;; movl $1, %eax;; movl $0, %ecx;; movq 0x38(%r14), %rdx+;; movl %ecx, %ecx;; addq %rcx, %rdx;; movl %eax, (%rdx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 4b: ud2+;; 4d: ud2diff --git a/tests/disas/winch/x64/store/oob.wat b/tests/disas/winch/x64/store/oob.watindex 22ff78b52c..8d32715bb5 100644--- a/tests/disas/winch/x64/store/oob.wat+++ b/tests/disas/winch/x64/store/oob.wat@@ -17,7 +17,7 @@;; movq 0x18(%r11), %r11;; addq $0x20, %r11;; cmpq %rsp, %r11-;; ja 0x86+;; ja 0x88;; 1c: movq %rdi, %r14;; subq $0x20, %rsp;; movq %rdi, 0x18(%rsp)@@ -29,10 +29,11 @@;; movl %ecx, %ebx;; movabsq $0x100000000, %r11;; addq %r11, %rbx-;; jb 0x88+;; jb 0x8a;; 56: cmpq %rdx, %rbx-;; ja 0x8a+;; ja 0x8c;; 5f: movq 0x38(%r14), %rsi+;; movl %ecx, %ecx;; addq %rcx, %rsi;; movl $0xffffffff, %r11d;; addq %r11, %rsi@@ -43,6 +44,6 @@;; addq $0x20, %rsp;; popq %rbp;; retq-;; 86: ud2;; 88: ud2;; 8a: ud2+;; 8c: ud2diff --git a/tests/disas/winch/x64/store/v128.wat b/tests/disas/winch/x64/store/v128.watindex 665e81f482..d8f87f3dce 100644--- a/tests/disas/winch/x64/store/v128.wat+++ b/tests/disas/winch/x64/store/v128.wat@@ -12,7 +12,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x50+;; ja 0x52;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -20,13 +20,13 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movdqu %xmm0, (%rcx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 50: ud2-;; 52: addb %al, (%rax)+;; 52: ud2;; 54: addb %al, (%rax);; 56: addb %al, (%rax);; 58: addb %al, (%rax)diff --git a/tests/disas/winch/x64/table/grow.wat b/tests/disas/winch/x64/table/grow.watindex 8994afbea2..46284223f8 100644--- a/tests/disas/winch/x64/table/grow.wat+++ b/tests/disas/winch/x64/table/grow.wat@@ -17,7 +17,7 @@;; movq 0x18(%r11), %r11;; addq $0x30, %r11;; cmpq %rsp, %r11-;; ja 0x76+;; ja 0x78;; 1c: movq %rdi, %r14;; subq $0x20, %rsp;; movq %rdi, 0x18(%rsp)@@ -30,11 +30,12 @@;; movl $0, %esi;; movl $0xa, %edx;; movq 8(%rsp), %rcx-;; callq 0x177+;; callq 0x179;; addq $8, %rsp;; addq $8, %rsp;; movq 0x18(%rsp), %r14+;; movl %eax, %eax;; addq $0x20, %rsp;; popq %rbp;; retq-;; 76: ud2+;; 78: ud2diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load16.wat b/tests/disas/winch/x64/v128_ops/load_lane/load16.watindex 709de01ca2..868ae7ef93 100644--- a/tests/disas/winch/x64/v128_ops/load_lane/load16.wat+++ b/tests/disas/winch/x64/v128_ops/load_lane/load16.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x56+;; ja 0x58;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,14 +23,14 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movzwq (%rcx), %r11;; vpinsrw $1, %r11d, %xmm0, %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 56: ud2-;; 58: addb %al, (%rax)+;; 58: ud2;; 5a: addb %al, (%rax);; 5c: addb %al, (%rax);; 5e: addb %al, (%rax)diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load32.wat b/tests/disas/winch/x64/v128_ops/load_lane/load32.watindex 5865941aeb..a3c5d244a7 100644--- a/tests/disas/winch/x64/v128_ops/load_lane/load32.wat+++ b/tests/disas/winch/x64/v128_ops/load_lane/load32.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x55+;; ja 0x57;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,14 +23,14 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movl (%rcx), %r11d;; vpinsrd $1, %r11d, %xmm0, %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 55: ud2-;; 57: addb %al, (%rax)+;; 57: ud2;; 59: addb %al, (%rax);; 5b: addb %al, (%rax);; 5d: addb %al, (%rax)diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load64.wat b/tests/disas/winch/x64/v128_ops/load_lane/load64.watindex 1d06ec35c2..93086310b9 100644--- a/tests/disas/winch/x64/v128_ops/load_lane/load64.wat+++ b/tests/disas/winch/x64/v128_ops/load_lane/load64.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x55+;; ja 0x57;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,14 +23,14 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movq (%rcx), %r11;; vpinsrq $1, %r11, %xmm0, %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 55: ud2-;; 57: addb %al, (%rax)+;; 57: ud2;; 59: addb %al, (%rax);; 5b: addb %al, (%rax);; 5d: addb %al, (%rax)diff --git a/tests/disas/winch/x64/v128_ops/load_lane/load8.wat b/tests/disas/winch/x64/v128_ops/load_lane/load8.watindex 191a4bb314..f5119c5563 100644--- a/tests/disas/winch/x64/v128_ops/load_lane/load8.wat+++ b/tests/disas/winch/x64/v128_ops/load_lane/load8.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x56+;; ja 0x58;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,14 +23,14 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; movzbq (%rcx), %r11;; vpinsrb $1, %r11d, %xmm0, %xmm0;; addq $0x10, %rsp;; popq %rbp;; retq-;; 56: ud2-;; 58: addb %al, (%rax)+;; 58: ud2;; 5a: addb %al, (%rax);; 5c: addb %al, (%rax);; 5e: addb %al, (%rax)diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store16.wat b/tests/disas/winch/x64/v128_ops/store_lane/store16.watindex 80d135641a..64a778736a 100644--- a/tests/disas/winch/x64/v128_ops/store_lane/store16.wat+++ b/tests/disas/winch/x64/v128_ops/store_lane/store16.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x52+;; ja 0x54;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,13 +23,13 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpextrw $1, %xmm0, (%rcx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 52: ud2-;; 54: addb %al, (%rax)+;; 54: ud2;; 56: addb %al, (%rax);; 58: addb %al, (%rax);; 5a: addb %al, (%rax)diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store32.wat b/tests/disas/winch/x64/v128_ops/store_lane/store32.watindex a9d2dc1ef6..5d0de5d2f9 100644--- a/tests/disas/winch/x64/v128_ops/store_lane/store32.wat+++ b/tests/disas/winch/x64/v128_ops/store_lane/store32.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x52+;; ja 0x54;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,13 +23,13 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpextrd $1, %xmm0, (%rcx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 52: ud2-;; 54: addb %al, (%rax)+;; 54: ud2;; 56: addb %al, (%rax);; 58: addb %al, (%rax);; 5a: addb %al, (%rax)diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store64.wat b/tests/disas/winch/x64/v128_ops/store_lane/store64.watindex 1b3849f7a3..88f6b69db7 100644--- a/tests/disas/winch/x64/v128_ops/store_lane/store64.wat+++ b/tests/disas/winch/x64/v128_ops/store_lane/store64.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x52+;; ja 0x54;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,13 +23,13 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpextrq $1, %xmm0, (%rcx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 52: ud2-;; 54: addb %al, (%rax)+;; 54: ud2;; 56: addb %al, (%rax);; 58: addb %al, (%rax);; 5a: addb %al, (%rax)diff --git a/tests/disas/winch/x64/v128_ops/store_lane/store8.wat b/tests/disas/winch/x64/v128_ops/store_lane/store8.watindex 6ae64d7886..8417c54845 100644--- a/tests/disas/winch/x64/v128_ops/store_lane/store8.wat+++ b/tests/disas/winch/x64/v128_ops/store_lane/store8.wat@@ -15,7 +15,7 @@;; movq 0x18(%r11), %r11;; addq $0x10, %r11;; cmpq %rsp, %r11-;; ja 0x52+;; ja 0x54;; 1c: movq %rdi, %r14;; subq $0x10, %rsp;; movq %rdi, 8(%rsp)@@ -23,13 +23,13 @@;; movdqu 0x29(%rip), %xmm0;; movl $0, %eax;; movq 0x38(%r14), %rcx+;; movl %eax, %eax;; addq %rax, %rcx;; vpextrb $1, %xmm0, (%rcx);; addq $0x10, %rsp;; popq %rbp;; retq-;; 52: ud2-;; 54: addb %al, (%rax)+;; 54: ud2;; 56: addb %al, (%rax);; 58: addb %al, (%rax);; 5a: addb %al, (%rax)diff --git a/tests/misc_testsuite/winch/oob_extend.wast b/tests/misc_testsuite/winch/oob_extend.wastnew file mode 100644index 0000000000..2044985ef2--- /dev/null+++ b/tests/misc_testsuite/winch/oob_extend.wast@@ -0,0 +1,11 @@+(module+ (memory 1)+ (data (i32.const 0) "\ff")+ (data (i32.const 99) "\de\ad\be\ef")+ (func (export "exploit") (result i32)+ i32.const 0+ i32.load8_s+ i32.load offset=100+ )+)+(assert_trap (invoke "exploit") "out of bounds memory access")diff --git a/tests/misc_testsuite/winch/oob_table_grow.wast b/tests/misc_testsuite/winch/oob_table_grow.wastnew file mode 100644index 0000000000..4bcdcc0540--- /dev/null+++ b/tests/misc_testsuite/winch/oob_table_grow.wast@@ -0,0 +1,13 @@+;;! reference_types = true++(module+ (memory 1)+ (table $t 1 2 funcref)+ (func $exploit (result i32)+ (i32.store offset=1+ (table.grow $t (table.get $t (i32.const 0)) (i32.const 100))+ (i32.const 0xDEADBEEF))+ (i32.load (i32.const 0)))+ (export "exploit" (func $exploit))+)+(assert_trap (invoke "exploit") "out of bounds memory access")diff --git a/winch/codegen/src/codegen/bounds.rs b/winch/codegen/src/codegen/bounds.rsindex be61233cef..00cd6281d6 100644--- a/winch/codegen/src/codegen/bounds.rs+++ b/winch/codegen/src/codegen/bounds.rs@@ -7,9 +7,10 @@ use crate::{abi::vmctx,codegen::{CodeGenContext, Emission},isa::reg::{Reg, writable},- masm::{IntCmpKind, IntScratch, MacroAssembler, OperandSize, RegImm, TrapCode},+ masm::{Imm, IntCmpKind, IntScratch, MacroAssembler, OperandSize, RegImm, TrapCode},stack::TypedReg,};+use wasmtime_environ::WasmValType;/// A newtype to represent an immediate offset argument for a heap access.#[derive(Debug, Copy, Clone)]@@ -139,7 +140,7 @@ pub(crate) fn ensure_index_and_offset<M: MacroAssembler>(masm.checked_uadd(writable!(index.as_typed_reg().into()),index.as_typed_reg().into(),- RegImm::i64(offset as i64),+ Imm::i64(offset as i64),heap_ty_size,TrapCode::HEAP_OUT_OF_BOUNDS,)?;@@ -217,8 +218,23 @@ where})?;// Start by adding the index to the heap base addr.- let index_reg = index.as_typed_reg().reg;- masm.add(writable!(dst), dst, index_reg.into(), ptr_size)?;+ let index_typed = index.as_typed_reg();+ let heap_size: OperandSize = heap.index_type().try_into()?;++ // Emit a zero-extend add when dealing with 32-bit heaps to ensure+ // that the high bits of the 64-bit values are zeroed.+ if ptr_size == OperandSize::S64 && heap_size == OperandSize::S32 {+ masm.add_uextend(+ writable!(dst),+ dst,+ index_typed.reg,+ OperandSize::S32,+ ptr_size,+ )?;+ } else {+ assert!(index_typed.ty == WasmValType::I64);+ masm.add(writable!(dst), dst, index_typed.reg.into(), ptr_size)?;+ }if offset.as_u32() > 0 {masm.add(diff --git a/winch/codegen/src/codegen/mod.rs b/winch/codegen/src/codegen/mod.rsindex 978768f67b..0d08767192 100644--- a/winch/codegen/src/codegen/mod.rs+++ b/winch/codegen/src/codegen/mod.rs@@ -681,6 +681,7 @@ wherelet memory_index = MemoryIndex::from_u32(memarg.memory);let heap = self.env.resolve_heap(memory_index);let index = Index::from_typed_reg(self.context.pop_to_reg(self.masm, None)?);+let offset = bounds::ensure_index_and_offset(self.masm,index,@@ -828,7 +829,7 @@ whereself.masm.checked_uadd(writable!(index_offset_and_access_size),index_offset_and_access_size,- RegImm::i64(offset_with_access_size as i64),+ Imm::i64(offset_with_access_size as i64),ptr_size,TrapCode::HEAP_OUT_OF_BOUNDS,)?;@@ -1482,7 +1483,7 @@ whereself.masm.checked_uadd(writable!(addr.reg),addr.reg,- RegImm::i64(arg.offset as i64),+ Imm::i64(arg.offset as i64),OperandSize::S64,TrapCode::HEAP_OUT_OF_BOUNDS,)?;@@ -1533,7 +1534,7 @@ whereself.masm.checked_uadd(writable!(addr.reg),addr.reg,- RegImm::i64(arg.offset as i64),+ Imm::i64(arg.offset as i64),OperandSize::S64,TrapCode::HEAP_OUT_OF_BOUNDS,)?;diff --git a/winch/codegen/src/isa/aarch64/asm.rs b/winch/codegen/src/isa/aarch64/asm.rsindex e7a3f49df1..2b48bf4b68 100644--- a/winch/codegen/src/isa/aarch64/asm.rs+++ b/winch/codegen/src/isa/aarch64/asm.rs@@ -390,12 +390,24 @@ impl Assembler {/// Add with three registers.pub fn add_rrr(&mut self, rm: Reg, rn: Reg, rd: WritableReg, size: OperandSize) {- self.alu_rrr_extend(ALUOp::Add, rm, rn, rd, size);+ self.alu_rrr_extend(ALUOp::Add, rm, rn, rd, size, ExtendOp::UXTX);+ }++ /// Add with three registers and explicit extend operation.+ pub fn add_rrr_with_extend(+ &mut self,+ rm: Reg,+ rn: Reg,+ rd: WritableReg,+ size: OperandSize,+ extendop: ExtendOp,+ ) {+ self.alu_rrr_extend(ALUOp::Add, rm, rn, rd, size, extendop);}/// Add with three registers, setting overflow flags.pub fn adds_rrr(&mut self, rm: Reg, rn: Reg, rd: WritableReg, size: OperandSize) {- self.alu_rrr_extend(ALUOp::AddS, rm, rn, rd, size);+ self.alu_rrr_extend(ALUOp::AddS, rm, rn, rd, size, ExtendOp::UXTX);}/// Add across Vector.@@ -420,12 +432,19 @@ impl Assembler {/// Subtract with three registers.pub fn sub_rrr(&mut self, rm: Reg, rn: Reg, rd: WritableReg, size: OperandSize) {- self.alu_rrr_extend(ALUOp::Sub, rm, rn, rd, size);+ self.alu_rrr_extend(ALUOp::Sub, rm, rn, rd, size, ExtendOp::UXTX);}/// Subtract with three registers, setting flags.pub fn subs_rrr(&mut self, rm: Reg, rn: Reg, size: OperandSize) {- self.alu_rrr_extend(ALUOp::SubS, rm, rn, writable!(regs::zero()), size);+ self.alu_rrr_extend(+ ALUOp::SubS,+ rm,+ rn,+ writable!(regs::zero()),+ size,+ ExtendOp::UXTX,+ );}/// Multiply with three registers.@@ -993,14 +1012,22 @@ impl Assembler {});}- fn alu_rrr_extend(&mut self, op: ALUOp, rm: Reg, rn: Reg, rd: WritableReg, size: OperandSize) {+ fn alu_rrr_extend(+ &mut self,+ op: ALUOp,+ rm: Reg,+ rn: Reg,+ rd: WritableReg,+ size: OperandSize,+ extendop: ExtendOp,+ ) {self.emit(Inst::AluRRRExtend {alu_op: op,size: size.into(),rd: rd.map(Into::into),rn: rn.into(),rm: rm.into(),- extendop: ExtendOp::UXTX,+ extendop,});}diff --git a/winch/codegen/src/isa/aarch64/masm.rs b/winch/codegen/src/isa/aarch64/masm.rsindex cf8324489c..6519694345 100644--- a/winch/codegen/src/isa/aarch64/masm.rs+++ b/winch/codegen/src/isa/aarch64/masm.rs@@ -17,7 +17,7 @@ use crate::{reg::{Reg, WritableReg, writable},},masm::{- CalleeKind, DivKind, Extend, ExtendKind, ExtractLaneKind, FloatCmpKind, FloatScratch,+ CalleeKind, DivKind, Extend, ExtendKind, ExtractLaneKind, FloatCmpKind, FloatScratch, Imm,Imm as I, IntCmpKind, IntScratch, LoadKind, MacroAssembler as Masm, MulWideKind,OperandSize, RegImm, RemKind, ReplaceLaneKind, RmwOp, RoundingMode, SPOffset, Scratch,ScratchType, ShiftKind, SplatKind, StackSlot, StoreKind, TRUSTED_FLAGS, TrapCode,@@ -32,7 +32,9 @@ use cranelift_codegen::{binemit::CodeOffset,ir::{MemFlags, RelSourceLoc, SourceLoc, types},isa::aarch64,- isa::aarch64::inst::{self, Cond, Imm12, ImmLogic, ImmShift, SImm7Scaled, SImm9, VectorSize},+ isa::aarch64::inst::{+ self, Cond, ExtendOp, Imm12, ImmLogic, ImmShift, SImm7Scaled, SImm9, VectorSize,+ },settings,};use regalloc2::RegClass;@@ -560,11 +562,34 @@ impl Masm for MacroAssembler {}}+ fn add_uextend(+ &mut self,+ dst: WritableReg,+ lhs: Reg,+ rhs: Reg,+ from_size: OperandSize,+ size: OperandSize,+ ) -> Result<()> {+ assert!(from_size.num_bits() <= size.num_bits());+ let extendop = match from_size {+ OperandSize::S8 => ExtendOp::UXTB,+ OperandSize::S16 => ExtendOp::UXTH,+ OperandSize::S32 => ExtendOp::UXTW,+ OperandSize::S64 => ExtendOp::UXTX,+ OperandSize::S128 => {+ return Err(format_err!(CodeGenError::invalid_operand_combination()));+ }+ };++ self.asm.add_rrr_with_extend(rhs, lhs, dst, size, extendop);+ Ok(())+ }+fn checked_uadd(&mut self,dst: WritableReg,lhs: Reg,- rhs: RegImm,+ rhs: Imm,size: OperandSize,trap: TrapCode,) -> Result<()> {@@ -572,25 +597,17 @@ impl Masm for MacroAssembler {// ensure that the real SP is 16-byte aligned in case control flow is// transferred to a signal handler.self.with_aligned_sp(|masm| {- match (rhs, lhs, dst) {- // NB: we don't use `Self::add_ir` since we explicitly- // want to emit the add variant which sets overflow- // flags.- (RegImm::Imm(i), rn, rd) => {- let imm = i.unwrap_as_u64();- match Imm12::maybe_from_u64(imm) {- Some(imm12) => masm.asm.adds_ir(imm12, rn, rd, size),- None => {- masm.with_scratch::<IntScratch, _>(|masm, scratch| {- masm.asm.mov_ir(scratch.writable(), i, i.size());- masm.asm.adds_rrr(scratch.inner(), rn, rd, size);- });- }- }- }-- (RegImm::Reg(rm), rn, rd) => {- masm.asm.adds_rrr(rm, rn, rd, size);+ // NB: we don't use `Self::add_ir` since we explicitly+ // want to emit the add variant which sets overflow+ // flags.+ let imm = rhs.unwrap_as_u64();+ match Imm12::maybe_from_u64(imm) {+ Some(imm12) => masm.asm.adds_ir(imm12, lhs, dst, size),+ None => {+ masm.with_scratch::<IntScratch, _>(|masm, scratch| {+ masm.asm.mov_ir(scratch.writable(), rhs, rhs.size());+ masm.asm.adds_rrr(scratch.inner(), lhs, dst, size);+ });}}masm.asm.trapif(Cond::Hs, trap);diff --git a/winch/codegen/src/isa/x64/masm.rs b/winch/codegen/src/isa/x64/masm.rsindex e48d86db61..83a0789edb 100644--- a/winch/codegen/src/isa/x64/masm.rs+++ b/winch/codegen/src/isa/x64/masm.rs@@ -6,13 +6,13 @@ use super::{regs::{self, rbp, rsp, scratch_fpr_bitset, scratch_gpr_bitset},};use crate::masm::{- DivKind, Extend, ExtendKind, ExtractLaneKind, FloatCmpKind, FloatScratch, Imm as I, IntCmpKind,- IntScratch, LaneSelector, LoadKind, MacroAssembler as Masm, MulWideKind, OperandSize, RegImm,- RemKind, ReplaceLaneKind, RmwOp, RoundingMode, Scratch, ScratchType, ShiftKind, SplatKind,- StoreKind, TRUSTED_FLAGS, TrapCode, TruncKind, UNTRUSTED_FLAGS, V128AbsKind, V128AddKind,- V128ConvertKind, V128ExtAddKind, V128ExtMulKind, V128ExtendKind, V128MaxKind, V128MinKind,- V128MulKind, V128NarrowKind, V128NegKind, V128SubKind, V128TruncKind, VectorCompareKind,- VectorEqualityKind, Zero,+ DivKind, Extend, ExtendKind, ExtractLaneKind, FloatCmpKind, FloatScratch, Imm, Imm as I,+ IntCmpKind, IntScratch, LaneSelector, LoadKind, MacroAssembler as Masm, MulWideKind,+ OperandSize, RegImm, RemKind, ReplaceLaneKind, RmwOp, RoundingMode, Scratch, ScratchType,+ ShiftKind, SplatKind, StoreKind, TRUSTED_FLAGS, TrapCode, TruncKind, UNTRUSTED_FLAGS,+ V128AbsKind, V128AddKind, V128ConvertKind, V128ExtAddKind, V128ExtMulKind, V128ExtendKind,+ V128MaxKind, V128MinKind, V128MulKind, V128NarrowKind, V128NegKind, V128SubKind, V128TruncKind,+ VectorCompareKind, VectorEqualityKind, Zero,};use crate::{Result,@@ -484,15 +484,40 @@ impl Masm for MacroAssembler {Ok(())}+ fn add_uextend(+ &mut self,+ dst: WritableReg,+ lhs: Reg,+ rhs: Reg,+ from_size: OperandSize,+ size: OperandSize,+ ) -> Result<()> {+ assert!(size == OperandSize::S64);+ assert!(from_size == OperandSize::S32 || from_size == OperandSize::S64);++ Self::ensure_two_argument_form(&dst.to_reg(), &lhs)?;+ if from_size == OperandSize::S32 && size == OperandSize::S64 {+ self.extend(+ writable!(rhs),+ rhs,+ ExtendKind::Unsigned(Extend::I64Extend32),+ )?;+ }++ self.asm.add_rr(rhs, dst, size);++ Ok(())+ }+fn checked_uadd(&mut self,dst: WritableReg,lhs: Reg,- rhs: RegImm,+ rhs: Imm,size: OperandSize,trap: TrapCode,) -> Result<()> {- self.add(dst, lhs, rhs, size)?;+ self.add(dst, lhs, RegImm::Imm(rhs), size)?;self.asm.trapif(CC::B, trap);Ok(())}diff --git a/winch/codegen/src/masm.rs b/winch/codegen/src/masm.rsindex 1dc68778e7..84046acc12 100644--- a/winch/codegen/src/masm.rs+++ b/winch/codegen/src/masm.rs@@ -1646,13 +1646,26 @@ pub(crate) trait MacroAssembler {/// Perform add operation.fn add(&mut self, dst: WritableReg, lhs: Reg, rhs: RegImm, size: OperandSize) -> Result<()>;+ /// Perform add with unsigned extension.+ fn add_uextend(+ &mut self,+ dst: WritableReg,+ lhs: Reg,+ rhs: Reg,+ from_size: OperandSize,+ size: OperandSize,+ ) -> Result<()>;+/// Perform a checked unsigned integer addition, emitting the provided trap/// if the addition overflows.+ ///+ /// Note: This only accepts immediate operands. For register operands with+ /// proper extension, use add_uextend with manual overflow checking.fn checked_uadd(&mut self,dst: WritableReg,lhs: Reg,- rhs: RegImm,+ rhs: Imm,size: OperandSize,trap: TrapCode,) -> Result<()>;diff --git a/winch/codegen/src/visitor.rs b/winch/codegen/src/visitor.rsindex bc082dbf12..7033769d6b 100644--- a/winch/codegen/src/visitor.rs+++ b/winch/codegen/src/visitor.rs@@ -28,8 +28,8 @@ use wasmparser::{};use wasmtime_cranelift::TRAP_INDIRECT_CALL_TO_NULL;use wasmtime_environ::{- FUNCREF_INIT_BIT, FuncIndex, GlobalIndex, MemoryIndex, TableIndex, TypeIndex, WasmHeapType,- WasmValType,+ FUNCREF_INIT_BIT, FuncIndex, GlobalIndex, IndexType, MemoryIndex, TableIndex, TypeIndex,+ WasmHeapType, WasmValType,};/// A macro to define unsupported WebAssembly operators.@@ -1761,8 +1761,12 @@ wherefn visit_table_grow(&mut self, table: u32) -> Self::Output {let table_index = TableIndex::from_u32(table);- let table_ty = self.env.table(table_index);- let builtin = match table_ty.ref_type.heap_type {+ let ptr_type = self.env.ptr_type();+ let (heap_type, idx_type) = {+ let table_ty = self.env.table(table_index);+ (table_ty.ref_type.heap_type, table_ty.idx_type)+ };+ let builtin = match heap_type {WasmHeapType::Func => self.env.builtins.table_grow_func_ref::<M::ABI>()?,_ => bail!(CodeGenError::unsupported_wasm_type()),};@@ -1783,7 +1787,20 @@ whereFnCall::emit::<M>(&mut self.env, self.masm, &mut self.context, builtin)?;- Ok(())+ // Similar to the memory.grow builtin, `table.grow` returns a+ // pointer, however, we need to ensure that the returned index+ // is representative of the address space for tables.+ match (ptr_type, idx_type) {+ (WasmValType::I64, IndexType::I64) => Ok(()),+ (WasmValType::I64, IndexType::I32) => {+ let top: Reg = self.context.pop_to_reg(self.masm, None)?.into();+ self.masm.wrap(writable!(top), top)?;+ self.context.stack.push(TypedReg::i32(top).into());+ Ok(())+ }++ _ => Err(format_err!(CodeGenError::unsupported_32_bit_platform())),+ }}fn visit_table_size(&mut self, table: u32) -> Self::Output {