diff --git a/tests/disas/winch/x64/br_if/as_local_set_value.wat b/tests/disas/winch/x64/br_if/as_local_set_value.wat
index f64a2337c411..f5ac16fff38b 100644
--- a/tests/disas/winch/x64/br_if/as_local_set_value.wat
+++ b/tests/disas/winch/x64/br_if/as_local_set_value.wat
@@ -23,7 +23,7 @@
 ;;       movq    %rsi, 0x10(%rsp)
 ;;       movl    %edx, 0xc(%rsp)
 ;;       movl    $0, 8(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movl    0xc(%rsp), %ecx
 ;;       movl    $0x11, %eax
 ;;       testl   %ecx, %ecx
diff --git a/tests/disas/winch/x64/f64_add/locals.wat b/tests/disas/winch/x64/f64_add/locals.wat
index 1a5daa3d48f3..a4dc97e09c53 100644
--- a/tests/disas/winch/x64/f64_add/locals.wat
+++ b/tests/disas/winch/x64/f64_add/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x30(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_copysign/locals.wat b/tests/disas/winch/x64/f64_copysign/locals.wat
index 85fa03ca49e9..b89df0c4ee40 100644
--- a/tests/disas/winch/x64/f64_copysign/locals.wat
+++ b/tests/disas/winch/x64/f64_copysign/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x50(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_div/locals.wat b/tests/disas/winch/x64/f64_div/locals.wat
index 6b183e12893a..e70bfbf16e76 100644
--- a/tests/disas/winch/x64/f64_div/locals.wat
+++ b/tests/disas/winch/x64/f64_div/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x30(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_eq/locals.wat b/tests/disas/winch/x64/f64_eq/locals.wat
index 0efba13c5059..e37fa97e5660 100644
--- a/tests/disas/winch/x64/f64_eq/locals.wat
+++ b/tests/disas/winch/x64/f64_eq/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x40(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_ge/locals.wat b/tests/disas/winch/x64/f64_ge/locals.wat
index b1b4283d14a2..2842be67fbcb 100644
--- a/tests/disas/winch/x64/f64_ge/locals.wat
+++ b/tests/disas/winch/x64/f64_ge/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x40(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_gt/locals.wat b/tests/disas/winch/x64/f64_gt/locals.wat
index 76130c7f4b56..bd52ed34aa9f 100644
--- a/tests/disas/winch/x64/f64_gt/locals.wat
+++ b/tests/disas/winch/x64/f64_gt/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x40(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_le/locals.wat b/tests/disas/winch/x64/f64_le/locals.wat
index 4a7f1bce6e88..8f8fd67ae4cb 100644
--- a/tests/disas/winch/x64/f64_le/locals.wat
+++ b/tests/disas/winch/x64/f64_le/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x38(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_le/params.wat b/tests/disas/winch/x64/f64_le/params.wat
index 4a7f1bce6e88..8f8fd67ae4cb 100644
--- a/tests/disas/winch/x64/f64_le/params.wat
+++ b/tests/disas/winch/x64/f64_le/params.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x38(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_lt/locals.wat b/tests/disas/winch/x64/f64_lt/locals.wat
index d6a771d1dcf4..d71943e9e747 100644
--- a/tests/disas/winch/x64/f64_lt/locals.wat
+++ b/tests/disas/winch/x64/f64_lt/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x38(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_max/locals.wat b/tests/disas/winch/x64/f64_max/locals.wat
index cd54a0dc894a..f3c683e52166 100644
--- a/tests/disas/winch/x64/f64_max/locals.wat
+++ b/tests/disas/winch/x64/f64_max/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x58(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_min/locals.wat b/tests/disas/winch/x64/f64_min/locals.wat
index 785591d45ef6..2da36481ea1d 100644
--- a/tests/disas/winch/x64/f64_min/locals.wat
+++ b/tests/disas/winch/x64/f64_min/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x58(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_mul/locals.wat b/tests/disas/winch/x64/f64_mul/locals.wat
index 9e8f51066525..d4ca122da439 100644
--- a/tests/disas/winch/x64/f64_mul/locals.wat
+++ b/tests/disas/winch/x64/f64_mul/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x30(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_ne/locals.wat b/tests/disas/winch/x64/f64_ne/locals.wat
index a1c322ab7a48..00255a1e51fd 100644
--- a/tests/disas/winch/x64/f64_ne/locals.wat
+++ b/tests/disas/winch/x64/f64_ne/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x40(%rip), %xmm0
diff --git a/tests/disas/winch/x64/f64_sub/locals.wat b/tests/disas/winch/x64/f64_sub/locals.wat
index 11f7d41ea664..a3504af30d56 100644
--- a/tests/disas/winch/x64/f64_sub/locals.wat
+++ b/tests/disas/winch/x64/f64_sub/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movsd   0x30(%rip), %xmm0
diff --git a/tests/disas/winch/x64/i64_add/locals.wat b/tests/disas/winch/x64/i64_add/locals.wat
index aa2271638540..984f996b5f4b 100644
--- a/tests/disas/winch/x64/i64_add/locals.wat
+++ b/tests/disas/winch/x64/i64_add/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $0xa, %rax
diff --git a/tests/disas/winch/x64/i64_and/locals.wat b/tests/disas/winch/x64/i64_and/locals.wat
index 6571ab031c35..22d1f7bc2416 100644
--- a/tests/disas/winch/x64/i64_and/locals.wat
+++ b/tests/disas/winch/x64/i64_and/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_eq/locals.wat b/tests/disas/winch/x64/i64_eq/locals.wat
index 4f98603e18c3..8f84c5f8812d 100644
--- a/tests/disas/winch/x64/i64_eq/locals.wat
+++ b/tests/disas/winch/x64/i64_eq/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_ge_s/locals.wat b/tests/disas/winch/x64/i64_ge_s/locals.wat
index ea33cd885649..eb91bbbc3895 100644
--- a/tests/disas/winch/x64/i64_ge_s/locals.wat
+++ b/tests/disas/winch/x64/i64_ge_s/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_ge_u/locals.wat b/tests/disas/winch/x64/i64_ge_u/locals.wat
index f782ccdc24de..d076be460811 100644
--- a/tests/disas/winch/x64/i64_ge_u/locals.wat
+++ b/tests/disas/winch/x64/i64_ge_u/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_gt_s/locals.wat b/tests/disas/winch/x64/i64_gt_s/locals.wat
index b652a2470c8d..fc5a58619aa8 100644
--- a/tests/disas/winch/x64/i64_gt_s/locals.wat
+++ b/tests/disas/winch/x64/i64_gt_s/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_gt_u/locals.wat b/tests/disas/winch/x64/i64_gt_u/locals.wat
index 60fe51003ec0..af245db70041 100644
--- a/tests/disas/winch/x64/i64_gt_u/locals.wat
+++ b/tests/disas/winch/x64/i64_gt_u/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_le_s/locals.wat b/tests/disas/winch/x64/i64_le_s/locals.wat
index dc7cd3401b27..5464b6bab68a 100644
--- a/tests/disas/winch/x64/i64_le_s/locals.wat
+++ b/tests/disas/winch/x64/i64_le_s/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_le_u/locals.wat b/tests/disas/winch/x64/i64_le_u/locals.wat
index 4350a1e56c2c..c8d56f1f8599 100644
--- a/tests/disas/winch/x64/i64_le_u/locals.wat
+++ b/tests/disas/winch/x64/i64_le_u/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_lt_s/locals.wat b/tests/disas/winch/x64/i64_lt_s/locals.wat
index e5c74285f244..be14f09195b4 100644
--- a/tests/disas/winch/x64/i64_lt_s/locals.wat
+++ b/tests/disas/winch/x64/i64_lt_s/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_lt_u/locals.wat b/tests/disas/winch/x64/i64_lt_u/locals.wat
index 98d076c95788..9c1b7d8fb05f 100644
--- a/tests/disas/winch/x64/i64_lt_u/locals.wat
+++ b/tests/disas/winch/x64/i64_lt_u/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_mul/locals.wat b/tests/disas/winch/x64/i64_mul/locals.wat
index 799e39f584b3..fb0d99c2f847 100644
--- a/tests/disas/winch/x64/i64_mul/locals.wat
+++ b/tests/disas/winch/x64/i64_mul/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $0xa, %rax
diff --git a/tests/disas/winch/x64/i64_ne/locals.wat b/tests/disas/winch/x64/i64_ne/locals.wat
index b57f5cc040f3..40e2cf51d0d1 100644
--- a/tests/disas/winch/x64/i64_ne/locals.wat
+++ b/tests/disas/winch/x64/i64_ne/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_or/locals.wat b/tests/disas/winch/x64/i64_or/locals.wat
index 55ef4f07a4f9..1c07a892ac3f 100644
--- a/tests/disas/winch/x64/i64_or/locals.wat
+++ b/tests/disas/winch/x64/i64_or/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/i64_rotl/locals.wat b/tests/disas/winch/x64/i64_rotl/locals.wat
index 176df7b61fba..b36135def187 100644
--- a/tests/disas/winch/x64/i64_rotl/locals.wat
+++ b/tests/disas/winch/x64/i64_rotl/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $1, %rax
diff --git a/tests/disas/winch/x64/i64_rotr/locals.wat b/tests/disas/winch/x64/i64_rotr/locals.wat
index 7458dfcf4cae..45ef6a6c6b93 100644
--- a/tests/disas/winch/x64/i64_rotr/locals.wat
+++ b/tests/disas/winch/x64/i64_rotr/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $1, %rax
diff --git a/tests/disas/winch/x64/i64_shl/locals.wat b/tests/disas/winch/x64/i64_shl/locals.wat
index b7cd8b15477a..50d91296f0d4 100644
--- a/tests/disas/winch/x64/i64_shl/locals.wat
+++ b/tests/disas/winch/x64/i64_shl/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $1, %rax
diff --git a/tests/disas/winch/x64/i64_shr_s/locals.wat b/tests/disas/winch/x64/i64_shr_s/locals.wat
index 7fe21fbcafaa..ba348d72f72c 100644
--- a/tests/disas/winch/x64/i64_shr_s/locals.wat
+++ b/tests/disas/winch/x64/i64_shr_s/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $1, %rax
diff --git a/tests/disas/winch/x64/i64_shr_u/locals.wat b/tests/disas/winch/x64/i64_shr_u/locals.wat
index 45f6b69d8a67..0d7bd08f6a70 100644
--- a/tests/disas/winch/x64/i64_shr_u/locals.wat
+++ b/tests/disas/winch/x64/i64_shr_u/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $1, %rax
diff --git a/tests/disas/winch/x64/i64_sub/locals.wat b/tests/disas/winch/x64/i64_sub/locals.wat
index 2407ebef8d36..936e42a65a05 100644
--- a/tests/disas/winch/x64/i64_sub/locals.wat
+++ b/tests/disas/winch/x64/i64_sub/locals.wat
@@ -29,7 +29,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $0xa, %rax
diff --git a/tests/disas/winch/x64/i64_xor/locals.wat b/tests/disas/winch/x64/i64_xor/locals.wat
index b341152bec0d..324902b1ea82 100644
--- a/tests/disas/winch/x64/i64_xor/locals.wat
+++ b/tests/disas/winch/x64/i64_xor/locals.wat
@@ -28,7 +28,7 @@
 ;;       subq    $0x20, %rsp
 ;;       movq    %rdi, 0x18(%rsp)
 ;;       movq    %rsi, 0x10(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    %r11, (%rsp)
 ;;       movq    $2, %rax
diff --git a/tests/disas/winch/x64/loop/for.wat b/tests/disas/winch/x64/loop/for.wat
index 98223aeade78..50e46e765904 100644
--- a/tests/disas/winch/x64/loop/for.wat
+++ b/tests/disas/winch/x64/loop/for.wat
@@ -29,7 +29,7 @@
 ;;       movq    %rdi, 0x28(%rsp)
 ;;       movq    %rsi, 0x20(%rsp)
 ;;       movq    %rdx, 0x18(%rsp)
-;;       xorl    %r11d, %r11d
+;;       xorq    %r11, %r11
 ;;       movq    %r11, 0x10(%rsp)
 ;;       movq    %r11, 8(%rsp)
 ;;       movq    $1, %rax
diff --git a/winch/codegen/src/isa/x64/masm.rs b/winch/codegen/src/isa/x64/masm.rs
index e1fb67a5f1f4..c9d4d43809ff 100644
--- a/winch/codegen/src/isa/x64/masm.rs
+++ b/winch/codegen/src/isa/x64/masm.rs
@@ -275,7 +275,8 @@ impl Masm for MacroAssembler {
     }
 
     fn zero(&mut self, reg: Reg) {
-        self.asm.xor_rr(reg, reg, OperandSize::S32);
+        self.asm
+            .xor_rr(reg, reg, OperandSize::from_bytes(<Self::ABI>::word_bytes()));
     }
 
     fn mov(&mut self, src: RegImm, dst: Reg, size: OperandSize) {