winch: Fix missing zero-extensions of addresses loaded from

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, #0

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, x28

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, x28

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, x28

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, x28

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, #0

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, x28

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, x28

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, x28

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: ud2

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: ud2

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: ud2

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: ud2

tests/disas/winch/x64/atomic/load/i64_atomic_load.wat

@@ -14,21 +14,22 @@
 ;;       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)
 ;;       movq    %rsi, (%rsp)
 ;;       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: ud2

tests/disas/winch/x64/atomic/load/i64_atomic_load16_u.wat

@@ -14,21 +14,22 @@
 ;;       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)
 ;;       movq    %rsi, (%rsp)
 ;;       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: ud2

tests/disas/winch/x64/atomic/load/i64_atomic_load32_u.wat

@@ -14,21 +14,22 @@
 ;;       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)
 ;;       movq    %rsi, (%rsp)
 ;;       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: ud2

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: ud2

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: ud2

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: ud2