Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Update capstone dependency (#13546)

Alex Crichtonc96a4e52dcc4
diff --git a/Cargo.lock b/Cargo.lock
index c576a222f5..d04c1b3c08 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -425,22 +425,21 @@ dependencies = [
[[package]]
name = "capstone"
-version = "0.13.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "015ef5d5ca1743e3f94af9509ba6bd2886523cfee46e48d15c2ef5216fd4ac9a"
+checksum = "f442ae0f2f3f1b923334b4a5386c95c69c1cfa072bafa23d6fae6d9682eb1dd4"
dependencies = [
"capstone-sys",
- "libc",
+ "static_assertions",
]
[[package]]
name = "capstone-sys"
-version = "0.17.0"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2267cb8d16a1e4197863ec4284ffd1aec26fe7e57c58af46b02590a0235809a0"
+checksum = "a4e8087cab6731295f5a2a2bd82989ba4f41d3a428aab2e7c98d8f4db38aac05"
dependencies = [
"cc",
- "libc",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index f1ca40f175..69c3066da3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -400,7 +400,7 @@ log = { version = "0.4.28", default-features = false }
clap = { version = "4.5.48", default-features = false, features = ["std", "derive"] }
clap_complete = "4.5.58"
hashbrown = { version = "0.17", default-features = false }
-capstone = "0.13.0"
+capstone = { version = "0.14.0", default-features = false, features = ['full', 'arch_x86', 'arch_riscv', 'arch_arm64', 'arch_sysz'] }
smallvec = { version = "1.15.1", features = ["union"] }
tracing = { version = "0.1.41", default-features = false }
bitflags = "2.9.4"
diff --git a/cranelift/filetests/filetests/isa/aarch64/amodes.clif b/cranelift/filetests/filetests/isa/aarch64/amodes.clif
index 91315af7b7..cefb45c2c5 100644
--- a/cranelift/filetests/filetests/isa/aarch64/amodes.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/amodes.clif
@@ -193,7 +193,7 @@ block0(v0: i64):
;
; Disassembled:
; block0: ; offset 0x0
-; orr x2, xzr, #0xfff000
+; mov x2, #0xfff000
; ldr w0, [x0, x2] ; trap: heap_oob
; ret
diff --git a/cranelift/filetests/filetests/isa/aarch64/arithmetic.clif b/cranelift/filetests/filetests/isa/aarch64/arithmetic.clif
index ee76034049..9ee1a0b91a 100644
--- a/cranelift/filetests/filetests/isa/aarch64/arithmetic.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/arithmetic.clif
@@ -105,8 +105,8 @@ block0(v0: i64, v1: i64):
; b.vs #0x1c
; sdiv x0, x0, x1
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: int_divz
+; udf #0xc11f ; trap: int_ovf
function %f7(i64) -> i64 {
block0(v0: i64):
@@ -144,7 +144,7 @@ block0(v0: i64, v1: i64):
; cbz x1, #0xc
; udiv x0, x0, x1
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
+; udf #0xc11f ; trap: int_divz
function %f9(i64) -> i64 {
block0(v0: i64):
@@ -184,7 +184,7 @@ block0(v0: i64, v1: i64):
; sdiv x4, x0, x1
; msub x0, x4, x1, x0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
+; udf #0xc11f ; trap: int_divz
function %f11(i64, i64) -> i64 {
block0(v0: i64, v1: i64):
@@ -205,7 +205,7 @@ block0(v0: i64, v1: i64):
; udiv x4, x0, x1
; msub x0, x4, x1, x0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
+; udf #0xc11f ; trap: int_divz
function %f12(i32, i32) -> i32 {
block0(v0: i32, v1: i32):
@@ -230,8 +230,8 @@ block0(v0: i32, v1: i32):
; b.vs #0x1c
; sdiv w0, w0, w1
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: int_divz
+; udf #0xc11f ; trap: int_ovf
function %f13(i32) -> i32 {
block0(v0: i32):
@@ -269,7 +269,7 @@ block0(v0: i32, v1: i32):
; cbz w1, #0xc
; udiv w0, w0, w1
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
+; udf #0xc11f ; trap: int_divz
function %f15(i32) -> i32 {
block0(v0: i32):
@@ -309,7 +309,7 @@ block0(v0: i32, v1: i32):
; sdiv w4, w0, w1
; msub w0, w4, w1, w0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
+; udf #0xc11f ; trap: int_divz
function %f17(i32, i32) -> i32 {
block0(v0: i32, v1: i32):
@@ -330,7 +330,7 @@ block0(v0: i32, v1: i32):
; udiv w4, w0, w1
; msub w0, w4, w1, w0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
+; udf #0xc11f ; trap: int_divz
function %f18(i64, i64) -> i64 {
block0(v0: i64, v1: i64):
@@ -779,7 +779,7 @@ block0(v0: i64):
; b.vs #0x18
; sdiv x0, x0, x2
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %sdiv_i16_const(i16) -> i16 {
block0(v0: i16):
diff --git a/cranelift/filetests/filetests/isa/aarch64/bti.clif b/cranelift/filetests/filetests/isa/aarch64/bti.clif
index f4bad9d595..5cf243942a 100644
--- a/cranelift/filetests/filetests/isa/aarch64/bti.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/bti.clif
@@ -56,7 +56,7 @@ block5(v5: i32):
;
; Disassembled:
; block0: ; offset 0x0
-; hint #0x22
+; bti c
; block1: ; offset 0x4
; cmp w0, #3
; b.hs #0x50
@@ -65,19 +65,19 @@ block5(v5: i32):
; ldrsw x11, [x10, w11, uxtw #2]
; add x10, x10, x11
; br x10
-; .byte 0x24, 0x00, 0x00, 0x00
-; .byte 0x18, 0x00, 0x00, 0x00
-; .byte 0x0c, 0x00, 0x00, 0x00
+; udf #0x24
+; udf #0x18
+; udf #0xc
; block2: ; offset 0x2c
-; hint #0x24
+; bti j
; mov w5, #3
; b #0x54
; block3: ; offset 0x38
-; hint #0x24
+; bti j
; mov w5, #2
; b #0x54
; block4: ; offset 0x44
-; hint #0x24
+; bti j
; mov w5, #1
; b #0x54
; block5: ; offset 0x50
@@ -122,7 +122,7 @@ block2:
;
; Disassembled:
; block0: ; offset 0x0
-; hint #0x22
+; bti c
; block1: ; offset 0x4
; ldr x5, [x0]
; mov x8, x5
@@ -133,9 +133,9 @@ block2:
; ldrsw x7, [x6, w7, uxtw #2]
; add x6, x6, x7
; br x6
-; .byte 0x04, 0x00, 0x00, 0x00
+; udf #4
; block2: ; offset 0x2c
-; hint #0x24
+; bti j
; mov x0, x8
; add x0, x0, #0x2a
; ret
@@ -165,14 +165,14 @@ block0(v0: i64):
;
; Disassembled:
; block0: ; offset 0x0
-; hint #0x22
+; bti c
; stp x29, x30, [sp, #-0x10]!
; mov x29, sp
; block1: ; offset 0xc
; ldr x3, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x3
; ldp x29, x30, [sp], #0x10
; ret
diff --git a/cranelift/filetests/filetests/isa/aarch64/bti_with_csdb.clif b/cranelift/filetests/filetests/isa/aarch64/bti_with_csdb.clif
index 19caa72f44..1ba5d83573 100644
--- a/cranelift/filetests/filetests/isa/aarch64/bti_with_csdb.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/bti_with_csdb.clif
@@ -56,7 +56,7 @@ block5(v5: i32):
;
; Disassembled:
; block0: ; offset 0x0
-; hint #0x22
+; bti c
; block1: ; offset 0x4
; cmp w0, #3
; b.hs #0x54
@@ -66,19 +66,19 @@ block5(v5: i32):
; ldrsw x11, [x10, w11, uxtw #2]
; add x10, x10, x11
; br x10
-; .byte 0x24, 0x00, 0x00, 0x00
-; .byte 0x18, 0x00, 0x00, 0x00
-; .byte 0x0c, 0x00, 0x00, 0x00
+; udf #0x24
+; udf #0x18
+; udf #0xc
; block2: ; offset 0x30
-; hint #0x24
+; bti j
; mov w5, #3
; b #0x58
; block3: ; offset 0x3c
-; hint #0x24
+; bti j
; mov w5, #2
; b #0x58
; block4: ; offset 0x48
-; hint #0x24
+; bti j
; mov w5, #1
; b #0x58
; block5: ; offset 0x54
@@ -123,7 +123,7 @@ block2:
;
; Disassembled:
; block0: ; offset 0x0
-; hint #0x22
+; bti c
; block1: ; offset 0x4
; ldr x5, [x0]
; mov x8, x5
@@ -135,9 +135,9 @@ block2:
; ldrsw x7, [x6, w7, uxtw #2]
; add x6, x6, x7
; br x6
-; .byte 0x04, 0x00, 0x00, 0x00
+; udf #4
; block2: ; offset 0x30
-; hint #0x24
+; bti j
; mov x0, x8
; add x0, x0, #0x2a
; ret
@@ -167,14 +167,15 @@ block0(v0: i64):
;
; Disassembled:
; block0: ; offset 0x0
-; hint #0x22
+; bti c
; stp x29, x30, [sp, #-0x10]!
; mov x29, sp
; block1: ; offset 0xc
; ldr x3, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x3
; ldp x29, x30, [sp], #0x10
; ret
+
diff --git a/cranelift/filetests/filetests/isa/aarch64/call-pauth-bkey.clif b/cranelift/filetests/filetests/isa/aarch64/call-pauth-bkey.clif
index f707a1accd..a63639dd19 100644
--- a/cranelift/filetests/filetests/isa/aarch64/call-pauth-bkey.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/call-pauth-bkey.clif
@@ -28,8 +28,8 @@ block0(v0: i64):
; block1: ; offset 0xc
; ldr x3, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x3
; ldp x29, x30, [sp], #0x10
; retab
@@ -78,8 +78,8 @@ block0(v0: i64):
; block1: ; offset 0xc
; ldr x3, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; mov x0, x2
; blr x3
; mov x2, x0
@@ -103,7 +103,7 @@ block0(v0: i64):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; br x1
diff --git a/cranelift/filetests/filetests/isa/aarch64/call-pauth.clif b/cranelift/filetests/filetests/isa/aarch64/call-pauth.clif
index 5ad09e6d3a..318219108c 100644
--- a/cranelift/filetests/filetests/isa/aarch64/call-pauth.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/call-pauth.clif
@@ -28,8 +28,8 @@ block0(v0: i64):
; block1: ; offset 0xc
; ldr x3, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x3
; ldp x29, x30, [sp], #0x10
; autiasp
@@ -79,8 +79,8 @@ block0(v0: i64):
; block1: ; offset 0xc
; ldr x3, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; mov x0, x2
; blr x3
; mov x2, x0
@@ -104,7 +104,7 @@ block0(v0: i64):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; br x1
diff --git a/cranelift/filetests/filetests/isa/aarch64/call.clif b/cranelift/filetests/filetests/isa/aarch64/call.clif
index eb1eb7d5fd..89d66b3500 100644
--- a/cranelift/filetests/filetests/isa/aarch64/call.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/call.clif
@@ -29,8 +29,8 @@ block0(v0: i64):
; block1: ; offset 0x8
; ldr x3, #0x10
; b #0x18
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x3
; ldp x29, x30, [sp], #0x10
; ret
@@ -59,8 +59,8 @@ block0(v0: i32):
; block1: ; offset 0x8
; ldr x3, #0x10
; b #0x18
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x3
; ldp x29, x30, [sp], #0x10
; ret
@@ -102,8 +102,8 @@ block0(v0: i32):
; block1: ; offset 0x8
; ldr x3, #0x10
; b #0x18
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x3
; ldp x29, x30, [sp], #0x10
; ret
@@ -160,8 +160,8 @@ block0(v0: i8):
; sturb w0, [sp]
; ldr x8, #0x1c
; b #0x24
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; mov x0, x7
; mov x1, x7
; mov x2, x7
@@ -261,43 +261,43 @@ block0:
; block1: ; offset 0xc
; ldr x9, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g0 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g0 0
+; udf #0
; blr x9
; stur q0, [sp, #0x20]
; ldr x9, #0x2c
; b #0x34
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g1 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g1 0
+; udf #0
; blr x9
; stur q0, [sp, #0x10]
; ldr x9, #0x44
; b #0x4c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g1 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g1 0
+; udf #0
; blr x9
; stur q0, [sp]
; ldr x9, #0x5c
; b #0x64
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g2 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g2 0
+; udf #0
; blr x9
; ldr x10, #0x70
; b #0x78
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g3 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g3 0
+; udf #0
; ldur q0, [sp, #0x20]
; blr x10
; ldr x11, #0x88
; b #0x90
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g4 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g4 0
+; udf #0
; ldur q0, [sp, #0x10]
; blr x11
; ldr x12, #0xa0
; b #0xa8
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g4 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g4 0
+; udf #0
; ldur q0, [sp]
; blr x12
; add sp, sp, #0x30
@@ -357,43 +357,43 @@ block0:
; block1: ; offset 0xc
; ldr x9, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g0 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g0 0
+; udf #0
; blr x9
; stur q0, [sp, #0x20]
; ldr x9, #0x2c
; b #0x34
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g0 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g0 0
+; udf #0
; blr x9
; stur q0, [sp, #0x10]
; ldr x9, #0x44
; b #0x4c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g0 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g0 0
+; udf #0
; blr x9
; stur q0, [sp]
; ldr x9, #0x5c
; b #0x64
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g1 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g1 0
+; udf #0
; blr x9
; ldr x10, #0x70
; b #0x78
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g2 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g2 0
+; udf #0
; ldur q0, [sp, #0x20]
; blr x10
; ldr x11, #0x88
; b #0x90
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g2 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g2 0
+; udf #0
; ldur q0, [sp, #0x10]
; blr x11
; ldr x12, #0xa0
; b #0xa8
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g2 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g2 0
+; udf #0
; ldur q0, [sp]
; blr x12
; add sp, sp, #0x30
@@ -457,43 +457,43 @@ block0:
; block1: ; offset 0xc
; ldr x9, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g0 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g0 0
+; udf #0
; blr x9
; stur q0, [sp, #0x20]
; ldr x9, #0x2c
; b #0x34
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g1 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g1 0
+; udf #0
; blr x9
; stur q0, [sp, #0x10]
; ldr x9, #0x44
; b #0x4c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g2 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g2 0
+; udf #0
; blr x9
; stur q0, [sp]
; ldr x9, #0x5c
; b #0x64
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g3 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g3 0
+; udf #0
; blr x9
; ldr x10, #0x70
; b #0x78
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g4 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g4 0
+; udf #0
; ldur q0, [sp, #0x20]
; blr x10
; ldr x11, #0x88
; b #0x90
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g5 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g5 0
+; udf #0
; ldur q0, [sp, #0x10]
; blr x11
; ldr x12, #0xa0
; b #0xa8
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g6 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g6 0
+; udf #0
; ldur q0, [sp]
; blr x12
; add sp, sp, #0x30
@@ -546,8 +546,8 @@ block0(v0: i64):
; mov x2, #0x2a
; ldr x4, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f11 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %f11 0
+; udf #0
; mov x1, x0
; mov x0, x2
; blr x4
@@ -600,8 +600,8 @@ block0(v0: i64):
; mov x3, #0x2a
; ldr x4, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f12 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %f12 0
+; udf #0
; mov x2, x0
; mov x0, x3
; blr x4
@@ -654,8 +654,8 @@ block0(v0: i64):
; mov x2, #0x2a
; ldr x4, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f13 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %f13 0
+; udf #0
; mov x1, x0
; mov x0, x2
; blr x4
@@ -722,8 +722,8 @@ block0(v0: i128, v1: i64):
; stur x1, [sp, #8]
; ldr x8, #0x1c
; b #0x24
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f14 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %f14 0
+; udf #0
; mov x4, x0
; mov x5, x1
; mov x6, x2
@@ -794,8 +794,8 @@ block0(v0: i128, v1: i64):
; stur x1, [sp, #8]
; ldr x8, #0x1c
; b #0x24
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %f15 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %f15 0
+; udf #0
; mov x4, x0
; mov x5, x1
; mov x6, x2
@@ -856,8 +856,8 @@ block0(v0: i64):
; mov x19, x0
; ldr x2, #0x18
; b #0x20
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; mov x8, x19
; blr x2
; mov x0, x19
@@ -895,8 +895,8 @@ block0(v0: i64):
; mov x19, x8
; ldr x2, #0x18
; b #0x20
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x2
; mov x8, x19
; ldr x19, [sp], #0x10
@@ -927,8 +927,8 @@ block0:
; block1: ; offset 0x8
; ldr x0, #0x10
; b #0x18
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x0
; ldp x29, x30, [sp], #0x10
; ret
diff --git a/cranelift/filetests/filetests/isa/aarch64/constants.clif b/cranelift/filetests/filetests/isa/aarch64/constants.clif
index 5f733b3f06..7209f47f33 100644
--- a/cranelift/filetests/filetests/isa/aarch64/constants.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/constants.clif
@@ -331,11 +331,11 @@ block0:
; block0: ; offset 0x0
; ldr q0, #0x10
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
+; udf #0
+; udf #0
; .byte 0x00, 0x00, 0xff, 0x3f
function %f() -> f64 {
@@ -403,11 +403,11 @@ block0:
; block0: ; offset 0x0
; ldr q0, #0x10
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
+; udf #0
+; udf #0
; .byte 0x00, 0x90, 0x04, 0x40
function %f() -> f64 {
@@ -543,11 +543,11 @@ block0:
; block0: ; offset 0x0
; ldr q0, #0x10
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
+; udf #0
+; udf #0
; .byte 0x00, 0x00, 0x03, 0xc0
function %f() -> f64 {
diff --git a/cranelift/filetests/filetests/isa/aarch64/exception-handler-address.clif b/cranelift/filetests/filetests/isa/aarch64/exception-handler-address.clif
index b401bdec55..c3982bac8d 100644
--- a/cranelift/filetests/filetests/isa/aarch64/exception-handler-address.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/exception-handler-address.clif
@@ -109,8 +109,8 @@ function %f0() -> i64 {
; block2: ; offset 0x38
; ldr x5, #0x40
; b #0x48
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x5
; block3: ; offset 0x4c
; ldur x0, [sp]
@@ -263,8 +263,8 @@ function %f0() -> i64 {
; block2: ; offset 0x38
; ldr x5, #0x40
; b #0x48
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x5
; block3: ; offset 0x4c
; ldur x0, [sp]
diff --git a/cranelift/filetests/filetests/isa/aarch64/exceptions.clif b/cranelift/filetests/filetests/isa/aarch64/exceptions.clif
index c4b3de97f1..ffcbdec02b 100644
--- a/cranelift/filetests/filetests/isa/aarch64/exceptions.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/exceptions.clif
@@ -213,8 +213,8 @@ function %f2(i32) -> i32, f32, f64 {
; stur q1, [sp]
; ldr x11, #0x40
; b #0x48
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; mov x2, x0
; blr x11
; block2: ; offset 0x50
@@ -354,8 +354,8 @@ function %f4(i64, i32) -> i32, f32, f64 {
; stur q1, [sp, #0x10]
; ldr x12, #0x44
; b #0x4c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; mov x2, x1
; stur x1, [sp]
; blr x12
@@ -487,8 +487,8 @@ function %f5() -> i64 {
; block2: ; offset 0x38
; ldr x4, #0x40
; b #0x48
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %g 0
+; udf #0
; blr x4
; block3: ; offset 0x4c
; ldur x0, [sp]
diff --git a/cranelift/filetests/filetests/isa/aarch64/fcvt-small.clif b/cranelift/filetests/filetests/isa/aarch64/fcvt-small.clif
index ffc83cb4e8..4e91cba250 100644
--- a/cranelift/filetests/filetests/isa/aarch64/fcvt-small.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/fcvt-small.clif
@@ -107,9 +107,9 @@ block0(v0: f32):
; b.ge #0x34
; fcvtzu w0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function u0:0(f64) -> i8 {
block0(v0: f64):
@@ -144,9 +144,9 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzu w0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function u0:0(f32) -> i16 {
block0(v0: f32):
@@ -181,9 +181,9 @@ block0(v0: f32):
; b.ge #0x34
; fcvtzu w0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function u0:0(f64) -> i16 {
block0(v0: f64):
@@ -218,7 +218,7 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzu w0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
diff --git a/cranelift/filetests/filetests/isa/aarch64/fcvt.clif b/cranelift/filetests/filetests/isa/aarch64/fcvt.clif
index 9456f73f35..da63e4712e 100644
--- a/cranelift/filetests/filetests/isa/aarch64/fcvt.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/fcvt.clif
@@ -262,9 +262,9 @@ block0(v0: f32):
; b.ge #0x34
; fcvtzu w0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f14(f32) -> i64 {
block0(v0: f32):
@@ -299,9 +299,9 @@ block0(v0: f32):
; b.ge #0x34
; fcvtzu x0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f15(f64) -> i32 {
block0(v0: f64):
@@ -336,9 +336,9 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzu w0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f16(f64) -> i64 {
block0(v0: f64):
@@ -373,9 +373,9 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzu x0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f17(f32) -> i32 {
block0(v0: f32):
@@ -476,9 +476,9 @@ block0(v0: f32):
; b.ge #0x38
; fcvtzs w0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f22(f32) -> i64 {
block0(v0: f32):
@@ -515,9 +515,9 @@ block0(v0: f32):
; b.ge #0x38
; fcvtzs x0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f23(f64) -> i32 {
block0(v0: f64):
@@ -552,9 +552,9 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzs w0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
; .byte 0x00, 0x00, 0x20, 0x00
; .byte 0x00, 0x00, 0xe0, 0xc1
@@ -593,9 +593,9 @@ block0(v0: f64):
; b.ge #0x38
; fcvtzs x0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f25(f32) -> i32 {
block0(v0: f32):
diff --git a/cranelift/filetests/filetests/isa/aarch64/floating-point.clif b/cranelift/filetests/filetests/isa/aarch64/floating-point.clif
index e563fdb955..09a199b77c 100644
--- a/cranelift/filetests/filetests/isa/aarch64/floating-point.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/floating-point.clif
@@ -551,9 +551,9 @@ block0(v0: f32):
; b.ge #0x34
; fcvtzu w0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f34(f32) -> i32 {
block0(v0: f32):
@@ -590,9 +590,9 @@ block0(v0: f32):
; b.ge #0x38
; fcvtzs w0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f35(f32) -> i64 {
block0(v0: f32):
@@ -627,9 +627,9 @@ block0(v0: f32):
; b.ge #0x34
; fcvtzu x0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f36(f32) -> i64 {
block0(v0: f32):
@@ -666,9 +666,9 @@ block0(v0: f32):
; b.ge #0x38
; fcvtzs x0, s0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f37(f64) -> i32 {
block0(v0: f64):
@@ -703,9 +703,9 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzu w0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f38(f64) -> i32 {
block0(v0: f64):
@@ -740,9 +740,9 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzs w0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
; .byte 0x00, 0x00, 0x20, 0x00
; .byte 0x00, 0x00, 0xe0, 0xc1
@@ -779,9 +779,9 @@ block0(v0: f64):
; b.ge #0x34
; fcvtzu x0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f40(f64) -> i64 {
block0(v0: f64):
@@ -818,9 +818,9 @@ block0(v0: f64):
; b.ge #0x38
; fcvtzs x0, d0
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: bad_toint
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: bad_toint
+; udf #0xc11f ; trap: int_ovf
+; udf #0xc11f ; trap: int_ovf
function %f41(i32) -> f32 {
block0(v0: i32):
diff --git a/cranelift/filetests/filetests/isa/aarch64/fuzzbug-60035.clif b/cranelift/filetests/filetests/isa/aarch64/fuzzbug-60035.clif
index 12e6787c6d..c4688aba9c 100644
--- a/cranelift/filetests/filetests/isa/aarch64/fuzzbug-60035.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/fuzzbug-60035.clif
@@ -32,8 +32,8 @@ block0:
; block1: ; offset 0xc
; ldr x19, #0x14
; b #0x1c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 u1:7 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 u1:7 0
+; udf #0
; blr x19
; blr x19
; ldr x19, [sp], #0x10
diff --git a/cranelift/filetests/filetests/isa/aarch64/jumptable-no-spectre.clif b/cranelift/filetests/filetests/isa/aarch64/jumptable-no-spectre.clif
index f34789f2b7..1a88e4af4e 100644
--- a/cranelift/filetests/filetests/isa/aarch64/jumptable-no-spectre.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/jumptable-no-spectre.clif
@@ -58,9 +58,9 @@ block5(v5: i32):
; ldrsw x11, [x10, w11, uxtw #2]
; add x10, x10, x11
; br x10
-; .byte 0x1c, 0x00, 0x00, 0x00
-; .byte 0x14, 0x00, 0x00, 0x00
-; .byte 0x0c, 0x00, 0x00, 0x00
+; udf #0x1c
+; udf #0x14
+; udf #0xc
; block1: ; offset 0x28
; mov w5, #3
; b #0x44
diff --git a/cranelift/filetests/filetests/isa/aarch64/jumptable.clif b/cranelift/filetests/filetests/isa/aarch64/jumptable.clif
index 999ac448d2..b54297769c 100644
--- a/cranelift/filetests/filetests/isa/aarch64/jumptable.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/jumptable.clif
@@ -57,9 +57,9 @@ block5(v5: i32):
; ldrsw x11, [x10, w11, uxtw #2]
; add x10, x10, x11
; br x10
-; .byte 0x1c, 0x00, 0x00, 0x00
-; .byte 0x14, 0x00, 0x00, 0x00
-; .byte 0x0c, 0x00, 0x00, 0x00
+; udf #0x1c
+; udf #0x14
+; udf #0xc
; block1: ; offset 0x28
; mov w5, #3
; b #0x44
diff --git a/cranelift/filetests/filetests/isa/aarch64/jumptable_with_csdb.clif b/cranelift/filetests/filetests/isa/aarch64/jumptable_with_csdb.clif
index 3712b4fef9..5976ff5ca1 100644
--- a/cranelift/filetests/filetests/isa/aarch64/jumptable_with_csdb.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/jumptable_with_csdb.clif
@@ -58,9 +58,9 @@ block5(v5: i32):
; ldrsw x11, [x10, w11, uxtw #2]
; add x10, x10, x11
; br x10
-; .byte 0x1c, 0x00, 0x00, 0x00
-; .byte 0x14, 0x00, 0x00, 0x00
-; .byte 0x0c, 0x00, 0x00, 0x00
+; udf #0x1c
+; udf #0x14
+; udf #0xc
; block1: ; offset 0x2c
; mov w5, #3
; b #0x48
diff --git a/cranelift/filetests/filetests/isa/aarch64/no_spill_floats_on_try_call.clif b/cranelift/filetests/filetests/isa/aarch64/no_spill_floats_on_try_call.clif
index 961db90cbc..d9265e0070 100644
--- a/cranelift/filetests/filetests/isa/aarch64/no_spill_floats_on_try_call.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/no_spill_floats_on_try_call.clif
@@ -66,5 +66,5 @@ block2(v0: i64):
; ldp x29, x30, [sp], #0x10
; ret
; block3: ; offset 0x14
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
diff --git a/cranelift/filetests/filetests/isa/aarch64/preserve-all.clif b/cranelift/filetests/filetests/isa/aarch64/preserve-all.clif
index 2f3672baf4..099157bfd0 100644
--- a/cranelift/filetests/filetests/isa/aarch64/preserve-all.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/preserve-all.clif
@@ -180,8 +180,8 @@ block0(v0: i64):
; block1: ; offset 0xac
; ldr x2, #0xb4
; b #0xbc
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %libcall 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %libcall 0
+; udf #0
; blr x2
; ldr q0, [sp], #0x10
; ldr q1, [sp], #0x10
diff --git a/cranelift/filetests/filetests/isa/aarch64/return-call-indirect.clif b/cranelift/filetests/filetests/isa/aarch64/return-call-indirect.clif
index 6239e23cf6..748baf8f0b 100644
--- a/cranelift/filetests/filetests/isa/aarch64/return-call-indirect.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/return-call-indirect.clif
@@ -39,8 +39,8 @@ block0(v0: i64):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %callee_i64 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %callee_i64 0
+; udf #0
; br x1
;;;; Test colocated tail calls ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -104,8 +104,8 @@ block0(v0: f64):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %callee_f64 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %callee_f64 0
+; udf #0
; br x1
;;;; Test passing `i8`s ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -147,8 +147,8 @@ block0(v0: i8):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %callee_i8 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %callee_i8 0
+; udf #0
; br x1
;;;; Test passing many arguments on stack ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -297,8 +297,8 @@ block0:
; mov x25, #0x87
; ldr x2, #0xa4
; b #0xac
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_args 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %tail_callee_stack_args 0
+; udf #0
; stur x0, [sp, #0x70]
; stur x1, [sp, #0x78]
; stur x8, [sp, #0x80]
diff --git a/cranelift/filetests/filetests/isa/aarch64/return-call.clif b/cranelift/filetests/filetests/isa/aarch64/return-call.clif
index 27182989a7..b52c38acb9 100644
--- a/cranelift/filetests/filetests/isa/aarch64/return-call.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/return-call.clif
@@ -37,8 +37,8 @@ block0(v0: i64):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %callee_i64 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %callee_i64 0
+; udf #0
; br x1
;;;; Test colocated tail calls ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -95,8 +95,8 @@ block0(v0: f64):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %callee_f64 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %callee_f64 0
+; udf #0
; br x1
;;;; Test passing `i8`s ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -136,8 +136,8 @@ block0(v0: i8):
; block0: ; offset 0x0
; ldr x1, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %callee_i8 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %callee_i8 0
+; udf #0
; br x1
;;;; Test passing many arguments on stack ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -323,8 +323,8 @@ block0:
; stur x25, [sp, #0xf8]
; ldr x1, #0xec
; b #0xf4
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_args 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %tail_callee_stack_args 0
+; udf #0
; ldp x19, x20, [sp], #0x10
; ldp x21, x22, [sp], #0x10
; ldp x23, x24, [sp], #0x10
@@ -585,8 +585,8 @@ block2:
; str x2, [sp, #0x110]
; ldr x1, #0x100
; b #0x108
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %different_callee2 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %different_callee2 0
+; udf #0
; ldur x2, [sp]
; add sp, sp, #0x10
; ldp x19, x20, [sp], #0x10
@@ -620,8 +620,8 @@ block2:
; str x0, [sp, #0x118]
; ldr x1, #0x188
; b #0x190
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %different_callee1 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %different_callee1 0
+; udf #0
; add sp, sp, #0x10
; ldp x19, x20, [sp], #0x10
; ldp x21, x22, [sp], #0x10
diff --git a/cranelift/filetests/filetests/isa/aarch64/shuffle.clif b/cranelift/filetests/filetests/isa/aarch64/shuffle.clif
index b20ceee6d0..9f57b2ed7e 100644
--- a/cranelift/filetests/filetests/isa/aarch64/shuffle.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/shuffle.clif
@@ -23,9 +23,9 @@ block0(v0: i8x16, v1: i8x16):
; mov v31.16b, v1.16b
; tbl v0.16b, {v30.16b, v31.16b}, v3.16b
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
; adc w3, w0, wzr
; add w4, w16, w12, lsl #1
; orr z23.b, p3/m, z23.b, z8.b
@@ -554,9 +554,9 @@ block0(v0: i8x16, v1: i8x16):
; mov v31.16b, v1.16b
; tbl v0.16b, {v30.16b, v31.16b}, v3.16b
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
; sbfiz w16, w8, #0xe, #5
; b #0xfffffffffc585474
; madd w24, w8, w26, w6
diff --git a/cranelift/filetests/filetests/isa/aarch64/simd-bitwise-compile.clif b/cranelift/filetests/filetests/isa/aarch64/simd-bitwise-compile.clif
index cbf2a10140..fb53df63ed 100644
--- a/cranelift/filetests/filetests/isa/aarch64/simd-bitwise-compile.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/simd-bitwise-compile.clif
@@ -240,9 +240,9 @@ block0(v0: i32):
; dup v6.16b, w3
; sshl v0.16b, v5.16b, v6.16b
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
; .byte 0x00, 0x01, 0x02, 0x03
; .byte 0x04, 0x05, 0x06, 0x07
; add w8, w8, w10, lsl #2
@@ -267,7 +267,7 @@ block0:
; ldr q1, #0x10
; ushr v0.16b, v1.16b, #1
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
; .byte 0x00, 0x01, 0x02, 0x03
; .byte 0x04, 0x05, 0x06, 0x07
; add w8, w8, w10, lsl #2
@@ -297,8 +297,8 @@ block0(v0: i32):
; dup v7.16b, w5
; sshl v0.16b, v6.16b, v7.16b
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
; .byte 0x00, 0x01, 0x02, 0x03
; .byte 0x04, 0x05, 0x06, 0x07
; add w8, w8, w10, lsl #2
diff --git a/cranelift/filetests/filetests/isa/aarch64/simd-lane-access-compile.clif b/cranelift/filetests/filetests/isa/aarch64/simd-lane-access-compile.clif
index c855573ed7..6bda60c20e 100644
--- a/cranelift/filetests/filetests/isa/aarch64/simd-lane-access-compile.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/simd-lane-access-compile.clif
@@ -28,11 +28,11 @@ block0:
; ldr q3, #0x20
; tbl v0.16b, {v30.16b, v31.16b}, v3.16b
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
+; udf #0
+; udf #0
; add w0, w0, #0
function %shuffle_same_ssa_value() -> i8x16 {
@@ -59,11 +59,11 @@ block0:
; mov v30.16b, v31.16b
; tbl v0.16b, {v30.16b, v31.16b}, v2.16b
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #0
+; udf #0
+; udf #0
; sbfx w0, w0, #0, #1
function %swizzle() -> i8x16 {
diff --git a/cranelift/filetests/filetests/isa/aarch64/stack-limit.clif b/cranelift/filetests/filetests/isa/aarch64/stack-limit.clif
index 26081172cf..237695394e 100644
--- a/cranelift/filetests/filetests/isa/aarch64/stack-limit.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/stack-limit.clif
@@ -69,12 +69,12 @@ block0(v0: i64):
; block1: ; offset 0x1c
; ldr x0, #0x24
; b #0x2c
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %foo 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %foo 0
+; udf #0
; blr x0
; ldp x29, x30, [sp], #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: stk_ovf
+; udf #0xc11f ; trap: stk_ovf
function %limit_preamble(i64 vmctx) {
gv0 = vmctx
@@ -114,7 +114,7 @@ block0(v0: i64):
; add sp, sp, #0x20
; ldp x29, x30, [sp], #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: stk_ovf
+; udf #0xc11f ; trap: stk_ovf
function %limit_preamble_huge(i64 vmctx) {
gv0 = vmctx
@@ -170,8 +170,8 @@ block0(v0: i64):
; add sp, sp, x16
; ldp x29, x30, [sp], #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: stk_ovf
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: stk_ovf
+; udf #0xc11f ; trap: stk_ovf
+; udf #0xc11f ; trap: stk_ovf
function %limit_preamble_huge_offset(i64 vmctx) {
gv0 = vmctx
@@ -210,5 +210,5 @@ block0(v0: i64):
; add sp, sp, #0x20
; ldp x29, x30, [sp], #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: stk_ovf
+; udf #0xc11f ; trap: stk_ovf
diff --git a/cranelift/filetests/filetests/isa/aarch64/symbol-value.clif b/cranelift/filetests/filetests/isa/aarch64/symbol-value.clif
index e2c6f94296..7193006d30 100644
--- a/cranelift/filetests/filetests/isa/aarch64/symbol-value.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/symbol-value.clif
@@ -19,8 +19,8 @@ block0:
; block0: ; offset 0x0
; ldr x0, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %func0 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %func0 0
+; udf #0
; ret
function %colocated_func_addr() -> i64 {
@@ -59,8 +59,8 @@ block0:
; block0: ; offset 0x0
; ldr x0, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %global0 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %global0 0
+; udf #0
; ret
function %symbol_value_plus_offset() -> i64 {
@@ -80,8 +80,8 @@ block0:
; block0: ; offset 0x0
; ldr x0, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %global0 123
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %global0 123
+; udf #0
; ret
function %symbol_value_minus_offset() -> i64 {
@@ -101,8 +101,8 @@ block0:
; block0: ; offset 0x0
; ldr x0, #8
; b #0x10
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %global0 -123
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %global0 -123
+; udf #0
; ret
function %colocated_symbol_value() -> i64 {
diff --git a/cranelift/filetests/filetests/isa/aarch64/tail-call-conv.clif b/cranelift/filetests/filetests/isa/aarch64/tail-call-conv.clif
index 1a421e8962..252b52cb0f 100644
--- a/cranelift/filetests/filetests/isa/aarch64/tail-call-conv.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/tail-call-conv.clif
@@ -188,8 +188,8 @@ block0:
; stur x26, [sp, #0x98]
; ldr x0, #0xe0
; b #0xe8
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_args 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %tail_callee_stack_args 0
+; udf #0
; blr x0
; sub sp, sp, #0xa0
; add sp, sp, #0xa0
@@ -414,8 +414,8 @@ block0:
; mov x8, sp
; ldr x0, #0x2c
; b #0x34
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_rets 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %tail_callee_stack_rets 0
+; udf #0
; blr x0
; ldur x9, [sp]
; stur x9, [sp, #0xa0]
@@ -753,8 +753,8 @@ block0:
; add x8, sp, #0xa0
; ldr x11, #0xe4
; b #0xec
-; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %tail_callee_stack_args_and_rets 0
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0 ; reloc_external Abs8 %tail_callee_stack_args_and_rets 0
+; udf #0
; blr x11
; sub sp, sp, #0xa0
; ldur x9, [sp, #0xa0]
diff --git a/cranelift/filetests/filetests/isa/aarch64/trap_sdiv.clif b/cranelift/filetests/filetests/isa/aarch64/trap_sdiv.clif
index 498f39de8f..c45b795b8b 100644
--- a/cranelift/filetests/filetests/isa/aarch64/trap_sdiv.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/trap_sdiv.clif
@@ -30,8 +30,8 @@ block0(v0: i8, v1: i8):
; b.vs #0x28
; sdiv w0, w3, w5
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: int_divz
+; udf #0xc11f ; trap: int_ovf
function %div16(i16, i16) -> i16 {
block0(v0: i16, v1: i16):
@@ -62,8 +62,8 @@ block0(v0: i16, v1: i16):
; b.vs #0x28
; sdiv w0, w3, w5
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: int_divz
+; udf #0xc11f ; trap: int_ovf
function %div32(i32, i32) -> i32 {
block0(v0: i32, v1: i32):
@@ -88,8 +88,8 @@ block0(v0: i32, v1: i32):
; b.vs #0x1c
; sdiv w0, w0, w1
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: int_divz
+; udf #0xc11f ; trap: int_ovf
function %div64(i64, i64) -> i64 {
block0(v0: i64, v1: i64):
@@ -114,6 +114,6 @@ block0(v0: i64, v1: i64):
; b.vs #0x1c
; sdiv x0, x0, x1
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_divz
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: int_ovf
+; udf #0xc11f ; trap: int_divz
+; udf #0xc11f ; trap: int_ovf
diff --git a/cranelift/filetests/filetests/isa/aarch64/traps.clif b/cranelift/filetests/filetests/isa/aarch64/traps.clif
index a041eb906b..a0f7cf01bf 100644
--- a/cranelift/filetests/filetests/isa/aarch64/traps.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/traps.clif
@@ -12,7 +12,7 @@ block0:
;
; Disassembled:
; block0: ; offset 0x0
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trap_iadd_ifcout(i64, i64) {
block0(v0: i64, v1: i64):
@@ -31,7 +31,7 @@ block0(v0: i64, v1: i64):
; adds x3, x0, x1
; b.hs #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz(i64) {
block0(v0: i64):
@@ -48,7 +48,7 @@ block0(v0: i64):
; block0: ; offset 0x0
; cbz x0, #8
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapnz(i64) {
block0(v0: i64):
@@ -65,7 +65,7 @@ block0(v0: i64):
; block0: ; offset 0x0
; cbnz x0, #8
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz_i128(i128) {
block0(v0: i128):
@@ -84,7 +84,7 @@ block0(v0: i128):
; orr x3, x0, x1
; cbz x3, #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapnz_i128(i128) {
block0(v0: i128):
@@ -103,7 +103,7 @@ block0(v0: i128):
; orr x3, x0, x1
; cbnz x3, #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz_icmp(i64, i64) {
block0(v0: i64, v1: i64):
@@ -123,7 +123,7 @@ block0(v0: i64, v1: i64):
; cmp x0, x1
; b.ne #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapnz_icmp(i64, i64) {
block0(v0: i64, v1: i64):
@@ -143,7 +143,7 @@ block0(v0: i64, v1: i64):
; cmp x0, x1
; b.eq #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz_fcmp(f64, f64) {
block0(v0: f64, v1: f64):
@@ -163,7 +163,7 @@ block0(v0: f64, v1: f64):
; fcmp d0, d1
; b.ne #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapnz_fcmp(f64, f64) {
block0(v0: f64, v1: f64):
@@ -183,7 +183,7 @@ block0(v0: f64, v1: f64):
; fcmp d0, d1
; b.eq #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz_uextend_icmp(i64, i64) {
block0(v0: i64, v1: i64):
@@ -204,7 +204,7 @@ block0(v0: i64, v1: i64):
; cmp x0, x1
; b.ne #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapnz_uextend_icmp(i64, i64) {
block0(v0: i64, v1: i64):
@@ -225,7 +225,7 @@ block0(v0: i64, v1: i64):
; cmp x0, x1
; b.eq #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz_uextend_fcmp(f64, f64) {
block0(v0: f64, v1: f64):
@@ -246,7 +246,7 @@ block0(v0: f64, v1: f64):
; fcmp d0, d1
; b.ne #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapnz_uextend_fcmp(f64, f64) {
block0(v0: f64, v1: f64):
@@ -267,7 +267,7 @@ block0(v0: f64, v1: f64):
; fcmp d0, d1
; b.eq #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz_fcmp_one(f64, f64) {
block0(v0: f64, v1: f64):
@@ -293,7 +293,7 @@ block0(v0: f64, v1: f64):
; and w8, w4, w6
; cbnz w8, #0x18
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %trapz_fcmp_ueq(f64, f64) {
block0(v0: f64, v1: f64):
@@ -319,5 +319,5 @@ block0(v0: f64, v1: f64):
; and w8, w4, w6
; cbnz w8, #0x18
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
diff --git a/cranelift/filetests/filetests/isa/aarch64/uadd_overflow_trap.clif b/cranelift/filetests/filetests/isa/aarch64/uadd_overflow_trap.clif
index 97adafc5c6..d81aba5824 100644
--- a/cranelift/filetests/filetests/isa/aarch64/uadd_overflow_trap.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/uadd_overflow_trap.clif
@@ -21,7 +21,7 @@ block0(v0: i32):
; adds w0, w0, w3
; b.hs #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %f1(i32) -> i32 {
block0(v0: i32):
@@ -43,7 +43,7 @@ block0(v0: i32):
; adds w0, w3, w0
; b.hs #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %f2(i32, i32) -> i32 {
block0(v0: i32, v1: i32):
@@ -62,7 +62,7 @@ block0(v0: i32, v1: i32):
; adds w0, w0, w1
; b.hs #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %f3(i64) -> i64 {
block0(v0: i64):
@@ -84,7 +84,7 @@ block0(v0: i64):
; adds x0, x0, x3
; b.hs #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %f3(i64) -> i64 {
block0(v0: i64):
@@ -106,7 +106,7 @@ block0(v0: i64):
; adds x0, x3, x0
; b.hs #0x10
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
function %f4(i64, i64) -> i64 {
block0(v0: i64, v1: i64):
@@ -125,5 +125,5 @@ block0(v0: i64, v1: i64):
; adds x0, x0, x1
; b.hs #0xc
; ret
-; .byte 0x1f, 0xc1, 0x00, 0x00 ; trap: user1
+; udf #0xc11f ; trap: user1
diff --git a/cranelift/filetests/filetests/isa/aarch64/vhigh_bits.clif b/cranelift/filetests/filetests/isa/aarch64/vhigh_bits.clif
index d26dab8662..3675cf56c6 100644
--- a/cranelift/filetests/filetests/isa/aarch64/vhigh_bits.clif
+++ b/cranelift/filetests/filetests/isa/aarch64/vhigh_bits.clif
@@ -96,8 +96,8 @@ block0(v0: i16x8):
; addv h16, v6.8h
; umov w0, v16.h[0]
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
; .byte 0x01, 0x00, 0x02, 0x00
; .byte 0x04, 0x00, 0x08, 0x00
; .byte 0x10, 0x00, 0x20, 0x00
@@ -126,12 +126,12 @@ block0(v0: i32x4):
; addv s16, v6.4s
; mov w0, v16.s[0]
; ret
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x00, 0x00, 0x00, 0x00
-; .byte 0x01, 0x00, 0x00, 0x00
-; .byte 0x02, 0x00, 0x00, 0x00
-; .byte 0x04, 0x00, 0x00, 0x00
-; .byte 0x08, 0x00, 0x00, 0x00
+; udf #0
+; udf #0
+; udf #1
+; udf #2
+; udf #4
+; udf #8
function %f5(i64x2) -> i8 {
block0(v0: i64x2):
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 3c94821b18..702f3c4431 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -2571,12 +2571,24 @@ criteria = "safe-to-deploy"
delta = "0.12.0 -> 0.13.0"
notes = "No new major features added here, mostly new architectures from a capstone update. No fundamental new `unsafe` code or anything suspicious"
+[[audits.capstone]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.13.0 -> 0.14.0"
+notes = "More features, more architectures, minor Rust idiom changes, nothing major."
+
[[audits.capstone-sys]]
who = "Alex Crichton <[email protected]>"
criteria = "safe-to-deploy"
delta = "0.16.0 -> 0.17.0"
notes = "Updates to the build process of capstone and adding some new architectures. Nothing major."
+[[audits.capstone-sys]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.17.0 -> 0.18.0"
+notes = "Huge number of changes, but verified to be an expected update to the capstone library."
+
[[audits.cargo-platform]]
who = "Pat Hickey <[email protected]>"
criteria = "safe-to-deploy"
diff --git a/tests/disas/debug-exceptions.wat b/tests/disas/debug-exceptions.wat
index 6da6c76fb3..7ce7f35dec 100644
--- a/tests/disas/debug-exceptions.wat
+++ b/tests/disas/debug-exceptions.wat
@@ -101,7 +101,7 @@
;; 118: ldur x2, [sp, #0x10]
;; bl #0x498
;; ╰─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 0x42, slot at FP-0xb0, locals , stack I32 @ slot+0x8
-;; 120: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 120: udf #0xc11f
;; mov w1, w0
;; mov x2, #0x20
;; adds x1, x1, x2
@@ -167,18 +167,18 @@
;; 200: ldur x2, [sp, #0x10]
;; 204: bl #0x498
;; ╰─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 0x37, slot at FP-0xb0, locals , stack
-;; 208: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 208: udf #0xc11f
;; 20c: mov w3, #0xfe
;; 210: ldur x2, [sp, #0x10]
;; 214: bl #0x460
;; 218: ldur x2, [sp, #0x10]
;; 21c: bl #0x498
;; ╰─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 0x37, slot at FP-0xb0, locals , stack
-;; 220: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 220: udf #0xc11f
;; 224: stur x2, [sp, #0x10]
;; 228: mov w3, #0
;; 22c: bl #0x460
;; 230: ldur x2, [sp, #0x10]
;; 234: bl #0x498
;; ╰─╼ debug frame state (after previous inst): func key DefinedWasmFunction(StaticModuleIndex(0), DefinedFuncIndex(0)), wasm PC 0x34, slot at FP-0xb0, locals , stack
-;; 238: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 238: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index 72951b6dd0..a773bbc512 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -30,7 +30,7 @@
;; str w5, [x9, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldr w2, [x9, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 70ecafab0b..2c2214845e 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -32,7 +32,7 @@
;; str w5, [x11, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 34: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 34: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -48,4 +48,4 @@
;; ldr w2, [x10, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 2e47b94cd5..94cf417b3e 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -34,8 +34,8 @@
;; str w5, [x13, x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 3c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 40: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 3c: udf #0xc11f
+;; 40: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -53,5 +53,5 @@
;; ldr w2, [x13, x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; a0: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 9c: udf #0xc11f
+;; a0: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
index ea93c51b90..59ca62ae20 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -29,7 +29,7 @@
;; strb w5, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldrb w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index f62d0c6879..be4494771d 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -32,7 +32,7 @@
;; strb w5, [x11, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 34: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 34: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -48,4 +48,4 @@
;; ldrb w2, [x10, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 1b14c8178d..f9b42bf454 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -34,8 +34,8 @@
;; strb w5, [x13, x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 3c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 40: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 3c: udf #0xc11f
+;; 40: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -53,5 +53,5 @@
;; ldrb w2, [x13, x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; a0: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 9c: udf #0xc11f
+;; a0: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index ee47f4d59f..0652654eac 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -36,7 +36,7 @@
;; str w5, [x15]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 44: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 44: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -56,4 +56,4 @@
;; ldr w2, [x15]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; a4: .byte 0x1f, 0xc1, 0x00, 0x00
+;; a4: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index 314b3796f4..65b4b09c8b 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -36,7 +36,7 @@
;; strb w5, [x15]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 44: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 44: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -56,4 +56,4 @@
;; ldrb w2, [x15]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; a4: .byte 0x1f, 0xc1, 0x00, 0x00
+;; a4: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 84148aa2f2..0820181d3e 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -29,7 +29,7 @@
;; str w5, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldr w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index f3431ce562..101ea14e55 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -30,7 +30,7 @@
;; str w5, [x9, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldr w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 4311e45803..13ca315f2a 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -31,7 +31,7 @@
;; str w5, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 30: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 30: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -46,4 +46,4 @@
;; ldr w2, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 5e03d5faa7..8a8c9901ca 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -29,7 +29,7 @@
;; strb w5, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldrb w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 213446f6e5..a27e5f063e 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -30,7 +30,7 @@
;; strb w5, [x9, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldrb w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index f4318c5fd9..a24e3cd309 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -31,7 +31,7 @@
;; strb w5, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 30: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 30: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -46,4 +46,4 @@
;; ldrb w2, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index 8951ec74ee..d25db3f049 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -29,7 +29,7 @@
;; str w5, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldr w2, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index a1b05c93d5..e08e17f894 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -31,7 +31,7 @@
;; str w5, [x10, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 30: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 30: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -46,4 +46,4 @@
;; ldr w2, [x9, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index aa49b3b324..e9399cd10d 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -33,8 +33,8 @@
;; str w5, [x12, x13]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 38: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 3c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 38: udf #0xc11f
+;; 3c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -51,5 +51,5 @@
;; ldr w2, [x12, x13]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index a492f6b44b..deb4ebd3e2 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -28,7 +28,7 @@
;; strb w5, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 24: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 24: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -40,4 +40,4 @@
;; ldrb w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 45fa55047b..08ab67fd3f 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -31,7 +31,7 @@
;; strb w5, [x10, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 30: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 30: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -46,4 +46,4 @@
;; ldrb w2, [x9, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 2893ef9af1..6857e4bc58 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -33,8 +33,8 @@
;; strb w5, [x12, x13]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 38: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 3c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 38: udf #0xc11f
+;; 3c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -51,5 +51,5 @@
;; ldrb w2, [x12, x13]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
index 2478ba87f3..939715eee0 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat
@@ -35,7 +35,7 @@
;; str w5, [x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 40: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 40: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -54,4 +54,4 @@
;; ldr w2, [x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; a0: .byte 0x1f, 0xc1, 0x00, 0x00
+;; a0: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
index e95a0dfd4e..6ad974e656 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat
@@ -35,7 +35,7 @@
;; strb w5, [x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 40: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 40: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -54,4 +54,4 @@
;; ldrb w2, [x14]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; a0: .byte 0x1f, 0xc1, 0x00, 0x00
+;; a0: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 51c5c9c5b6..b3a817b832 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -28,7 +28,7 @@
;; str w5, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 24: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 24: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -40,4 +40,4 @@
;; ldr w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index 8e6a5a6063..f6aaeac453 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -29,7 +29,7 @@
;; str w5, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldr w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 6ccbb3e0d6..0f1f2b853e 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -30,7 +30,7 @@
;; str w5, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldr w2, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index 128a6a2a3a..6eb814e57d 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -28,7 +28,7 @@
;; strb w5, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 24: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 24: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -40,4 +40,4 @@
;; ldrb w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index 978f448c33..cc6498872c 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -29,7 +29,7 @@
;; strb w5, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldrb w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 65fab5987c..be18c1f2d2 100644
--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -30,7 +30,7 @@
;; strb w5, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldrb w2, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
index 1c951f7228..79894ace23 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -22,24 +22,24 @@
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
;; mov w6, w4
-;; orr x7, xzr, #0xfffffffc
+;; mov x7, #0xfffffffc
;; cmp x6, x7
;; b.hi #0x28
;; 18: ldr x8, [x2, #0x38]
;; str w5, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
;; mov w6, w4
-;; orr x7, xzr, #0xfffffffc
+;; mov x7, #0xfffffffc
;; cmp x6, x7
;; b.hi #0x68
;; 58: ldr x8, [x2, #0x38]
;; ldr w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index ac8227d6d0..783f8aa0da 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -30,7 +30,7 @@
;; str w5, [x9, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldr w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 80c1a141bc..259daa092b 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -31,7 +31,7 @@
;; str w5, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 30: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 30: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -46,4 +46,4 @@
;; ldr w2, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index 7c0498f6dc..2248a7e112 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -30,7 +30,7 @@
;; strb w5, [x9, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldrb w2, [x8, w4, uxtw]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index 976e866a38..20e2c6f5c2 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -31,7 +31,7 @@
;; strb w5, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 30: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 30: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -46,4 +46,4 @@
;; ldrb w2, [x10, x11]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
index ff66db2bd8..884d041b5f 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -22,7 +22,7 @@
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
;; mov w9, w4
-;; orr x10, xzr, #0xfffffffc
+;; mov x10, #0xfffffffc
;; mov x11, #0
;; ldr x12, [x2, #0x38]
;; add x12, x12, w4, uxtw
@@ -36,7 +36,7 @@
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
;; mov w9, w4
-;; orr x10, xzr, #0xfffffffc
+;; mov x10, #0xfffffffc
;; mov x11, #0
;; ldr x12, [x2, #0x38]
;; add x12, x12, w4, uxtw
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
index 6e5df49b3a..6df67b1064 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0_offset.wat
@@ -21,23 +21,23 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x6, xzr, #0xfffffffc
+;; mov x6, #0xfffffffc
;; cmp x4, x6
;; b.hi #0x24
;; 14: ldr x7, [x2, #0x38]
;; str w5, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 24: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 24: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x5, xzr, #0xfffffffc
+;; mov x5, #0xfffffffc
;; cmp x4, x5
;; b.hi #0x64
;; 54: ldr x7, [x2, #0x38]
;; ldr w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
index 60bb5d76b1..1d15d22086 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -29,7 +29,7 @@
;; str w5, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldr w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 67155c5d8d..34e7d98314 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -30,7 +30,7 @@
;; str w5, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldr w2, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
index ec9c431f42..7a10b758d1 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0_offset.wat
@@ -21,23 +21,23 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x6, xzr, #0xffffffff
+;; mov x6, #0xffffffff
;; cmp x4, x6
;; b.hi #0x24
;; 14: ldr x7, [x2, #0x38]
;; strb w5, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 24: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 24: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x5, xzr, #0xffffffff
+;; mov x5, #0xffffffff
;; cmp x4, x5
;; b.hi #0x64
;; 54: ldr x7, [x2, #0x38]
;; ldrb w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
index a5bc720b15..3fc5b430fa 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -29,7 +29,7 @@
;; strb w5, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldrb w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
index ec608ab9c8..aa1550b2a2 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -30,7 +30,7 @@
;; strb w5, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldrb w2, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
index fcde06067c..74fe60d0ce 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xfffffffc
+;; mov x8, #0xfffffffc
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
@@ -34,7 +34,7 @@
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xfffffffc
+;; mov x8, #0xfffffffc
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
index 5d25c4ada8..76cd556a9b 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xffffffff
+;; mov x8, #0xffffffff
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
@@ -34,7 +34,7 @@
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xffffffff
+;; mov x8, #0xffffffff
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
index 0a27285bfc..3a4e3db5cd 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0_offset.wat
@@ -21,23 +21,23 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x6, xzr, #0xfffffffc
+;; mov x6, #0xfffffffc
;; cmp x4, x6
;; b.hi #0x24
;; 14: ldr x7, [x2, #0x38]
;; str w5, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 24: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 24: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x5, xzr, #0xfffffffc
+;; mov x5, #0xfffffffc
;; cmp x4, x5
;; b.hi #0x64
;; 54: ldr x7, [x2, #0x38]
;; ldr w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
index e974a45ffd..87680e1f29 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0x1000_offset.wat
@@ -29,7 +29,7 @@
;; str w5, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldr w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
index 62da41a073..b6b7230f79 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i32_access_0xffff0000_offset.wat
@@ -30,7 +30,7 @@
;; str w5, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldr w2, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
index c36b624a8c..bc8a27bca7 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0_offset.wat
@@ -21,23 +21,23 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x6, xzr, #0xffffffff
+;; mov x6, #0xffffffff
;; cmp x4, x6
;; b.hi #0x24
;; 14: ldr x7, [x2, #0x38]
;; strb w5, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 24: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 24: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x5, xzr, #0xffffffff
+;; mov x5, #0xffffffff
;; cmp x4, x5
;; b.hi #0x64
;; 54: ldr x7, [x2, #0x38]
;; ldrb w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
index ff60dd8017..a121eac2a4 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0x1000_offset.wat
@@ -29,7 +29,7 @@
;; strb w5, [x8, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -42,4 +42,4 @@
;; ldrb w2, [x7, x4]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
index fea104b477..56a7e26f07 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_no_spectre_i8_access_0xffff0000_offset.wat
@@ -30,7 +30,7 @@
;; strb w5, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 2c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 2c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -44,4 +44,4 @@
;; ldrb w2, [x9, x10]
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
index b026445488..6e9ee94df4 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat
@@ -21,7 +21,7 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xfffffffc
+;; mov x8, #0xfffffffc
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
@@ -34,7 +34,7 @@
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xfffffffc
+;; mov x8, #0xfffffffc
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
diff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
index bdba7a298d..766e2aaa1e 100644
--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat
@@ -21,7 +21,7 @@
;; wasm[0]::function[0]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xffffffff
+;; mov x8, #0xffffffff
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
@@ -34,7 +34,7 @@
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
;; mov x29, sp
-;; orr x8, xzr, #0xffffffff
+;; mov x8, #0xffffffff
;; mov x9, #0
;; ldr x10, [x2, #0x38]
;; add x10, x10, x4
diff --git a/tests/disas/winch/aarch64/br/as_br_if_cond.wat b/tests/disas/winch/aarch64/br/as_br_if_cond.wat
index d9b53d9d11..8d46136e0b 100644
--- a/tests/disas/winch/aarch64/br/as_br_if_cond.wat
+++ b/tests/disas/winch/aarch64/br/as_br_if_cond.wat
@@ -28,4 +28,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 58: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 58: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br/as_br_value.wat b/tests/disas/winch/aarch64/br/as_br_value.wat
index 07c5d0a481..72e6df5065 100644
--- a/tests/disas/winch/aarch64/br/as_br_value.wat
+++ b/tests/disas/winch/aarch64/br/as_br_value.wat
@@ -29,4 +29,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 5c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 5c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br/as_if_cond.wat b/tests/disas/winch/aarch64/br/as_if_cond.wat
index 2d1d33ba42..44d670b477 100644
--- a/tests/disas/winch/aarch64/br/as_if_cond.wat
+++ b/tests/disas/winch/aarch64/br/as_if_cond.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 5c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 5c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br/as_if_else.wat b/tests/disas/winch/aarch64/br/as_if_else.wat
index d4c1509609..b7e1de9b2d 100644
--- a/tests/disas/winch/aarch64/br/as_if_else.wat
+++ b/tests/disas/winch/aarch64/br/as_if_else.wat
@@ -42,4 +42,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br/as_if_then.wat b/tests/disas/winch/aarch64/br/as_if_then.wat
index a9ee6bf8b6..ecabc3fcd6 100644
--- a/tests/disas/winch/aarch64/br/as_if_then.wat
+++ b/tests/disas/winch/aarch64/br/as_if_then.wat
@@ -42,4 +42,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br/as_loop_first.wat b/tests/disas/winch/aarch64/br/as_loop_first.wat
index 834d295878..d0c8d30b01 100644
--- a/tests/disas/winch/aarch64/br/as_loop_first.wat
+++ b/tests/disas/winch/aarch64/br/as_loop_first.wat
@@ -30,4 +30,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 5c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 5c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br/br_jump.wat b/tests/disas/winch/aarch64/br/br_jump.wat
index 97dc3f4f0e..40056f3035 100644
--- a/tests/disas/winch/aarch64/br/br_jump.wat
+++ b/tests/disas/winch/aarch64/br/br_jump.wat
@@ -49,4 +49,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 8c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat b/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat
index 8580aeb32a..00689f506a 100644
--- a/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat
+++ b/tests/disas/winch/aarch64/br_if/as_br_if_cond.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br_if/as_br_value.wat b/tests/disas/winch/aarch64/br_if/as_br_value.wat
index f5dad10940..d3ee7a3b71 100644
--- a/tests/disas/winch/aarch64/br_if/as_br_value.wat
+++ b/tests/disas/winch/aarch64/br_if/as_br_value.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br_if/as_if_cond.wat b/tests/disas/winch/aarch64/br_if/as_if_cond.wat
index c5e3d31696..3e9ee06905 100644
--- a/tests/disas/winch/aarch64/br_if/as_if_cond.wat
+++ b/tests/disas/winch/aarch64/br_if/as_if_cond.wat
@@ -46,4 +46,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br_if/as_local_set_value.wat b/tests/disas/winch/aarch64/br_if/as_local_set_value.wat
index a9d8fb0fe1..80c5e5ba61 100644
--- a/tests/disas/winch/aarch64/br_if/as_local_set_value.wat
+++ b/tests/disas/winch/aarch64/br_if/as_local_set_value.wat
@@ -36,11 +36,11 @@
;; b.ne #0x6c
;; b #0x64
;; 64: stur w0, [x28, #4]
-;; orr x0, xzr, #0xffffffff
+;; mov x0, #0xffffffff
;; add x28, x28, #0x18
;; mov sp, x28
;; mov sp, x28
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br_table/large.wat b/tests/disas/winch/aarch64/br_table/large.wat
index c83e5a99bb..db6294d60a 100644
--- a/tests/disas/winch/aarch64/br_table/large.wat
+++ b/tests/disas/winch/aarch64/br_table/large.wat
@@ -25389,4 +25389,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 18128: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 18128: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat b/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat
index 97ae340c35..a1a5c7d414 100644
--- a/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat
+++ b/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat
@@ -46,7 +46,7 @@
;; add x16, x16, x1
;; br x16
;; 68: .byte 0xdc, 0xff, 0xff, 0xff
-;; .byte 0x0c, 0x00, 0x00, 0x00
+;; udf #0xc
;; b #0x44
;; 74: mov x0, #0
;; stur w0, [x28, #4]
@@ -59,7 +59,7 @@
;; ldrsw x1, [x16, w1, uxtw #2]
;; add x16, x16, x1
;; br x16
-;; a0: .byte 0x08, 0x00, 0x00, 0x00
+;; a0: udf #8
;; .byte 0xdc, 0xff, 0xff, 0xff
;; mov x0, #3
;; add x28, x28, #0x18
@@ -68,4 +68,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; c4: .byte 0x1f, 0xc1, 0x00, 0x00
+;; c4: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/call/multi.wat b/tests/disas/winch/aarch64/call/multi.wat
index 6281933c4d..1a1b374d73 100644
--- a/tests/disas/winch/aarch64/call/multi.wat
+++ b/tests/disas/winch/aarch64/call/multi.wat
@@ -44,7 +44,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;;
;; wasm[0]::function[1]::start:
;; stp x29, x30, [sp, #-0x10]!
@@ -82,4 +82,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 12c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 12c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/call/params.wat b/tests/disas/winch/aarch64/call/params.wat
index e8e66f1844..57059a49bb 100644
--- a/tests/disas/winch/aarch64/call/params.wat
+++ b/tests/disas/winch/aarch64/call/params.wat
@@ -121,7 +121,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 14c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 14c: udf #0xc11f
;;
;; wasm[0]::function[1]::add:
;; stp x29, x30, [sp, #-0x10]!
@@ -170,4 +170,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 218: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 218: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/call/recursive.wat b/tests/disas/winch/aarch64/call/recursive.wat
index 93e829eec6..d713786075 100644
--- a/tests/disas/winch/aarch64/call/recursive.wat
+++ b/tests/disas/winch/aarch64/call/recursive.wat
@@ -92,4 +92,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 10c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 10c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/call/reg_on_stack.wat b/tests/disas/winch/aarch64/call/reg_on_stack.wat
index e8961264ad..03613f710d 100644
--- a/tests/disas/winch/aarch64/call/reg_on_stack.wat
+++ b/tests/disas/winch/aarch64/call/reg_on_stack.wat
@@ -68,7 +68,7 @@
;; mov sp, x28
;; b #0xe0
;; d4: sub sp, x28, #4
-;; .byte 0x1f, 0xc1, 0x00, 0x00
+;; udf #0xc11f
;; mov sp, x28
;; add x28, x28, #0x18
;; mov sp, x28
@@ -76,4 +76,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; f8: .byte 0x1f, 0xc1, 0x00, 0x00
+;; f8: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/call/simple.wat b/tests/disas/winch/aarch64/call/simple.wat
index 4b5e5a2d5c..6f52dda4cb 100644
--- a/tests/disas/winch/aarch64/call/simple.wat
+++ b/tests/disas/winch/aarch64/call/simple.wat
@@ -54,7 +54,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 98: udf #0xc11f
;;
;; wasm[0]::function[1]::add:
;; stp x29, x30, [sp, #-0x10]!
@@ -85,4 +85,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 110: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 110: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/call_indirect/call_indirect.wat b/tests/disas/winch/aarch64/call_indirect/call_indirect.wat
index 9c05093313..e6b86c04d5 100644
--- a/tests/disas/winch/aarch64/call_indirect/call_indirect.wat
+++ b/tests/disas/winch/aarch64/call_indirect/call_indirect.wat
@@ -193,10 +193,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 28c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 290: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 294: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 298: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 29c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 2a0: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 2a4: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 28c: udf #0xc11f
+;; 290: udf #0xc11f
+;; 294: udf #0xc11f
+;; 298: udf #0xc11f
+;; 29c: udf #0xc11f
+;; 2a0: udf #0xc11f
+;; 2a4: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/call_indirect/local_arg.wat b/tests/disas/winch/aarch64/call_indirect/local_arg.wat
index e81a9d7d2d..2c7311368e 100644
--- a/tests/disas/winch/aarch64/call_indirect/local_arg.wat
+++ b/tests/disas/winch/aarch64/call_indirect/local_arg.wat
@@ -41,7 +41,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 5c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 5c: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -132,7 +132,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 1c0: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 1c4: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 1c8: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 1cc: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 1c0: udf #0xc11f
+;; 1c4: udf #0xc11f
+;; 1c8: udf #0xc11f
+;; 1cc: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat b/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat
index b8b4f69022..9d2a161b8f 100644
--- a/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat
+++ b/tests/disas/winch/aarch64/f32_abs/f32_abs_const.wat
@@ -32,6 +32,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0xc3, 0xf5, 0xa8, 0xbf
diff --git a/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat b/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat
index 8f1c0e9aae..6875c44f08 100644
--- a/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat
+++ b/tests/disas/winch/aarch64/f32_abs/f32_abs_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_add/const.wat b/tests/disas/winch/aarch64/f32_add/const.wat
index b74780f63c..096f49cdac 100644
--- a/tests/disas/winch/aarch64/f32_add/const.wat
+++ b/tests/disas/winch/aarch64/f32_add/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0xcd, 0xcc, 0x0c, 0x40
-;; 74: .byte 0x00, 0x00, 0x00, 0x00
+;; 74: udf #0
;; 78: .byte 0xcd, 0xcc, 0x8c, 0x3f
diff --git a/tests/disas/winch/aarch64/f32_add/locals.wat b/tests/disas/winch/aarch64/f32_add/locals.wat
index 07cd7ec45f..c6e23e8462 100644
--- a/tests/disas/winch/aarch64/f32_add/locals.wat
+++ b/tests/disas/winch/aarch64/f32_add/locals.wat
@@ -50,8 +50,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0
;; 88: .byte 0xcd, 0xcc, 0x8c, 0x3f
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0
;; 90: .byte 0xcd, 0xcc, 0x0c, 0x40
diff --git a/tests/disas/winch/aarch64/f32_add/params.wat b/tests/disas/winch/aarch64/f32_add/params.wat
index 3aabe47bcf..583a482012 100644
--- a/tests/disas/winch/aarch64/f32_add/params.wat
+++ b/tests/disas/winch/aarch64/f32_add/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat
index 28555d9ded..c98f8a60d5 100644
--- a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat
+++ b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_const.wat
@@ -32,6 +32,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0xc3, 0xf5, 0xa8, 0xbf
diff --git a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat
index 6cbc6bc815..c530c0e10c 100644
--- a/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat
+++ b/tests/disas/winch/aarch64/f32_ceil/f32_ceil_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat
index 6f1ff0bc1a..dcae741e51 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat
index ddf5bd5a57..c6307af7ea 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat
index 7bd8b4e3a6..4998fcef86 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat
index ebce830617..c50161116d 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_s/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat
index 2c8a7ec12e..c622ecea7f 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat
index 2716c72c15..6aaa61d736 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat
index 0af0ddb6ba..940790bad9 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat
index 032018d520..75e5044d71 100644
--- a/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i32_u/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat
index e1a6195047..fd716bcbcc 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat
index 70ac41cdf1..7f77f57771 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat
index e39aefae04..954c0da575 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat
index b3cd3fe295..a673c19430 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_s/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat
index c91b11a03b..98c9bb2881 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat
index 6ffade9a67..6407746cca 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat
index 23d5412f0b..3f6f8f4ba7 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat b/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat
index df61f0b50d..a467e73ed7 100644
--- a/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_convert_i64_u/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_copysign/const.wat b/tests/disas/winch/aarch64/f32_copysign/const.wat
index 679406f1f0..2b6be49090 100644
--- a/tests/disas/winch/aarch64/f32_copysign/const.wat
+++ b/tests/disas/winch/aarch64/f32_copysign/const.wat
@@ -36,7 +36,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
;; 70: .byte 0xcd, 0xcc, 0x0c, 0x40
-;; 74: .byte 0x00, 0x00, 0x00, 0x00
+;; 74: udf #0
;; 78: .byte 0xcd, 0xcc, 0x8c, 0xbf
diff --git a/tests/disas/winch/aarch64/f32_copysign/locals.wat b/tests/disas/winch/aarch64/f32_copysign/locals.wat
index d58491207c..cebebe9ede 100644
--- a/tests/disas/winch/aarch64/f32_copysign/locals.wat
+++ b/tests/disas/winch/aarch64/f32_copysign/locals.wat
@@ -51,7 +51,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;; 88: .byte 0xcd, 0xcc, 0x8c, 0xbf
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0
;; 90: .byte 0xcd, 0xcc, 0x0c, 0x40
diff --git a/tests/disas/winch/aarch64/f32_copysign/params.wat b/tests/disas/winch/aarch64/f32_copysign/params.wat
index e27c0a4785..70b9e7af71 100644
--- a/tests/disas/winch/aarch64/f32_copysign/params.wat
+++ b/tests/disas/winch/aarch64/f32_copysign/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_demote_f64/const.wat b/tests/disas/winch/aarch64/f32_demote_f64/const.wat
index a19a339e0c..bbf1257701 100644
--- a/tests/disas/winch/aarch64/f32_demote_f64/const.wat
+++ b/tests/disas/winch/aarch64/f32_demote_f64/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_demote_f64/locals.wat b/tests/disas/winch/aarch64/f32_demote_f64/locals.wat
index d5ee6b1f42..6f95c59291 100644
--- a/tests/disas/winch/aarch64/f32_demote_f64/locals.wat
+++ b/tests/disas/winch/aarch64/f32_demote_f64/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_demote_f64/params.wat b/tests/disas/winch/aarch64/f32_demote_f64/params.wat
index 1f1e5ce8ae..bc0ba8cb8b 100644
--- a/tests/disas/winch/aarch64/f32_demote_f64/params.wat
+++ b/tests/disas/winch/aarch64/f32_demote_f64/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_div/const.wat b/tests/disas/winch/aarch64/f32_div/const.wat
index de2f3f398e..16521dde4a 100644
--- a/tests/disas/winch/aarch64/f32_div/const.wat
+++ b/tests/disas/winch/aarch64/f32_div/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0xcd, 0xcc, 0x0c, 0x40
-;; 74: .byte 0x00, 0x00, 0x00, 0x00
+;; 74: udf #0
;; 78: .byte 0xcd, 0xcc, 0x8c, 0x3f
diff --git a/tests/disas/winch/aarch64/f32_div/locals.wat b/tests/disas/winch/aarch64/f32_div/locals.wat
index ca10d26421..4b9e22a001 100644
--- a/tests/disas/winch/aarch64/f32_div/locals.wat
+++ b/tests/disas/winch/aarch64/f32_div/locals.wat
@@ -50,8 +50,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0
;; 88: .byte 0xcd, 0xcc, 0x8c, 0x3f
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0
;; 90: .byte 0xcd, 0xcc, 0x0c, 0x40
diff --git a/tests/disas/winch/aarch64/f32_div/params.wat b/tests/disas/winch/aarch64/f32_div/params.wat
index 061165c313..cd43241bcb 100644
--- a/tests/disas/winch/aarch64/f32_div/params.wat
+++ b/tests/disas/winch/aarch64/f32_div/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_eq/const.wat b/tests/disas/winch/aarch64/f32_eq/const.wat
index d20226db85..96a66814cb 100644
--- a/tests/disas/winch/aarch64/f32_eq/const.wat
+++ b/tests/disas/winch/aarch64/f32_eq/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_eq/locals.wat b/tests/disas/winch/aarch64/f32_eq/locals.wat
index 451ecaa38e..201d7afaae 100644
--- a/tests/disas/winch/aarch64/f32_eq/locals.wat
+++ b/tests/disas/winch/aarch64/f32_eq/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_eq/params.wat b/tests/disas/winch/aarch64/f32_eq/params.wat
index 0e9e94b1d8..8cd0c1e946 100644
--- a/tests/disas/winch/aarch64/f32_eq/params.wat
+++ b/tests/disas/winch/aarch64/f32_eq/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat b/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat
index 448bf9c351..a9612ce9a3 100644
--- a/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat
+++ b/tests/disas/winch/aarch64/f32_floor/f32_floor_const.wat
@@ -32,6 +32,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0xc3, 0xf5, 0xa8, 0xbf
diff --git a/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat b/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat
index b7e230e70a..ae5c252f16 100644
--- a/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat
+++ b/tests/disas/winch/aarch64/f32_floor/f32_floor_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_ge/const.wat b/tests/disas/winch/aarch64/f32_ge/const.wat
index 528b2cb90d..3dc916b0d6 100644
--- a/tests/disas/winch/aarch64/f32_ge/const.wat
+++ b/tests/disas/winch/aarch64/f32_ge/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_ge/locals.wat b/tests/disas/winch/aarch64/f32_ge/locals.wat
index 36b7962f1c..4fbbd855dc 100644
--- a/tests/disas/winch/aarch64/f32_ge/locals.wat
+++ b/tests/disas/winch/aarch64/f32_ge/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_ge/params.wat b/tests/disas/winch/aarch64/f32_ge/params.wat
index 5b43096adb..401d3aa21f 100644
--- a/tests/disas/winch/aarch64/f32_ge/params.wat
+++ b/tests/disas/winch/aarch64/f32_ge/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_gt/const.wat b/tests/disas/winch/aarch64/f32_gt/const.wat
index e0bafff0c7..532d4fd415 100644
--- a/tests/disas/winch/aarch64/f32_gt/const.wat
+++ b/tests/disas/winch/aarch64/f32_gt/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_gt/locals.wat b/tests/disas/winch/aarch64/f32_gt/locals.wat
index 1c16189b0d..3ef05a250c 100644
--- a/tests/disas/winch/aarch64/f32_gt/locals.wat
+++ b/tests/disas/winch/aarch64/f32_gt/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_gt/params.wat b/tests/disas/winch/aarch64/f32_gt/params.wat
index 3ee87e8ff8..dd4d3252e0 100644
--- a/tests/disas/winch/aarch64/f32_gt/params.wat
+++ b/tests/disas/winch/aarch64/f32_gt/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_le/const.wat b/tests/disas/winch/aarch64/f32_le/const.wat
index ddfd92597d..8ccb709af9 100644
--- a/tests/disas/winch/aarch64/f32_le/const.wat
+++ b/tests/disas/winch/aarch64/f32_le/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_le/locals.wat b/tests/disas/winch/aarch64/f32_le/locals.wat
index 32664c4c79..7fcb1357eb 100644
--- a/tests/disas/winch/aarch64/f32_le/locals.wat
+++ b/tests/disas/winch/aarch64/f32_le/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_le/params.wat b/tests/disas/winch/aarch64/f32_le/params.wat
index 71067dbb85..7b9eda32ff 100644
--- a/tests/disas/winch/aarch64/f32_le/params.wat
+++ b/tests/disas/winch/aarch64/f32_le/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_lt/const.wat b/tests/disas/winch/aarch64/f32_lt/const.wat
index d161ee2968..01c14db4f5 100644
--- a/tests/disas/winch/aarch64/f32_lt/const.wat
+++ b/tests/disas/winch/aarch64/f32_lt/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_lt/locals.wat b/tests/disas/winch/aarch64/f32_lt/locals.wat
index 1d9e4bd1c6..49a3bc2842 100644
--- a/tests/disas/winch/aarch64/f32_lt/locals.wat
+++ b/tests/disas/winch/aarch64/f32_lt/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_lt/params.wat b/tests/disas/winch/aarch64/f32_lt/params.wat
index 93e3f2f0f3..8978204fd6 100644
--- a/tests/disas/winch/aarch64/f32_lt/params.wat
+++ b/tests/disas/winch/aarch64/f32_lt/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_max/const.wat b/tests/disas/winch/aarch64/f32_max/const.wat
index 541bf01a16..4ebacc5d49 100644
--- a/tests/disas/winch/aarch64/f32_max/const.wat
+++ b/tests/disas/winch/aarch64/f32_max/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0xcd, 0xcc, 0x0c, 0x40
-;; 74: .byte 0x00, 0x00, 0x00, 0x00
+;; 74: udf #0
;; 78: .byte 0xcd, 0xcc, 0x8c, 0x3f
diff --git a/tests/disas/winch/aarch64/f32_max/locals.wat b/tests/disas/winch/aarch64/f32_max/locals.wat
index a86fde7f67..01b27944a8 100644
--- a/tests/disas/winch/aarch64/f32_max/locals.wat
+++ b/tests/disas/winch/aarch64/f32_max/locals.wat
@@ -50,8 +50,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0
;; 88: .byte 0xcd, 0xcc, 0x8c, 0x3f
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0
;; 90: .byte 0xcd, 0xcc, 0x0c, 0x40
diff --git a/tests/disas/winch/aarch64/f32_max/params.wat b/tests/disas/winch/aarch64/f32_max/params.wat
index 4f40806c5b..43ddb1ff8a 100644
--- a/tests/disas/winch/aarch64/f32_max/params.wat
+++ b/tests/disas/winch/aarch64/f32_max/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_min/const.wat b/tests/disas/winch/aarch64/f32_min/const.wat
index 936168d2bf..9ed3f633f7 100644
--- a/tests/disas/winch/aarch64/f32_min/const.wat
+++ b/tests/disas/winch/aarch64/f32_min/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0xcd, 0xcc, 0x0c, 0x40
-;; 74: .byte 0x00, 0x00, 0x00, 0x00
+;; 74: udf #0
;; 78: .byte 0xcd, 0xcc, 0x8c, 0x3f
diff --git a/tests/disas/winch/aarch64/f32_min/locals.wat b/tests/disas/winch/aarch64/f32_min/locals.wat
index 796b706cbe..501af0172d 100644
--- a/tests/disas/winch/aarch64/f32_min/locals.wat
+++ b/tests/disas/winch/aarch64/f32_min/locals.wat
@@ -50,8 +50,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0
;; 88: .byte 0xcd, 0xcc, 0x8c, 0x3f
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0
;; 90: .byte 0xcd, 0xcc, 0x0c, 0x40
diff --git a/tests/disas/winch/aarch64/f32_min/params.wat b/tests/disas/winch/aarch64/f32_min/params.wat
index 108055afa4..431aab5e3c 100644
--- a/tests/disas/winch/aarch64/f32_min/params.wat
+++ b/tests/disas/winch/aarch64/f32_min/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_mul/const.wat b/tests/disas/winch/aarch64/f32_mul/const.wat
index 503922ff78..3277780519 100644
--- a/tests/disas/winch/aarch64/f32_mul/const.wat
+++ b/tests/disas/winch/aarch64/f32_mul/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0xcd, 0xcc, 0x0c, 0x40
-;; 74: .byte 0x00, 0x00, 0x00, 0x00
+;; 74: udf #0
;; 78: .byte 0xcd, 0xcc, 0x8c, 0x3f
diff --git a/tests/disas/winch/aarch64/f32_mul/locals.wat b/tests/disas/winch/aarch64/f32_mul/locals.wat
index 189ddf197c..d53ca907d5 100644
--- a/tests/disas/winch/aarch64/f32_mul/locals.wat
+++ b/tests/disas/winch/aarch64/f32_mul/locals.wat
@@ -50,8 +50,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0
;; 88: .byte 0xcd, 0xcc, 0x8c, 0x3f
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0
;; 90: .byte 0xcd, 0xcc, 0x0c, 0x40
diff --git a/tests/disas/winch/aarch64/f32_mul/params.wat b/tests/disas/winch/aarch64/f32_mul/params.wat
index c0d6d351ef..95d23aa542 100644
--- a/tests/disas/winch/aarch64/f32_mul/params.wat
+++ b/tests/disas/winch/aarch64/f32_mul/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_ne/const.wat b/tests/disas/winch/aarch64/f32_ne/const.wat
index 3ad555142a..960239db16 100644
--- a/tests/disas/winch/aarch64/f32_ne/const.wat
+++ b/tests/disas/winch/aarch64/f32_ne/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_ne/locals.wat b/tests/disas/winch/aarch64/f32_ne/locals.wat
index 831340d73d..8c7caad60f 100644
--- a/tests/disas/winch/aarch64/f32_ne/locals.wat
+++ b/tests/disas/winch/aarch64/f32_ne/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_ne/params.wat b/tests/disas/winch/aarch64/f32_ne/params.wat
index e01eb9a260..1549611313 100644
--- a/tests/disas/winch/aarch64/f32_ne/params.wat
+++ b/tests/disas/winch/aarch64/f32_ne/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat
index ad2a4b16e6..47cfd003ac 100644
--- a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat
+++ b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_const.wat
@@ -32,6 +32,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0xc3, 0xf5, 0xa8, 0xbf
diff --git a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat
index e8bf0fc43c..1f8ce52669 100644
--- a/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat
+++ b/tests/disas/winch/aarch64/f32_nearest/f32_nearest_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat b/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat
index e3ac1adbc7..3abb0983ce 100644
--- a/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat
+++ b/tests/disas/winch/aarch64/f32_neg/f32_neg_const.wat
@@ -32,6 +32,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0xc3, 0xf5, 0xa8, 0xbf
diff --git a/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat b/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat
index ad889e23a9..98d666ce51 100644
--- a/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat
+++ b/tests/disas/winch/aarch64/f32_neg/f32_neg_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat
index be139f6c48..a7e5e955e3 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat
index c5d00e9ed2..09734dcd00 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat
index 04ee3a2575..813da6256f 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat
index 875364863f..29afcac036 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/ret_int.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat b/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat
index 297249296d..2099f8655c 100644
--- a/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat
+++ b/tests/disas/winch/aarch64/f32_reinterpret_i32/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat
index 6437dca1c0..67d9947a21 100644
--- a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat
+++ b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_const.wat
@@ -32,6 +32,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0xc3, 0xf5, 0xa8, 0x3f
diff --git a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat
index 3386a6b394..8c88e3a7ce 100644
--- a/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat
+++ b/tests/disas/winch/aarch64/f32_sqrt/f32_sqrt_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_sub/const.wat b/tests/disas/winch/aarch64/f32_sub/const.wat
index e330e0264a..3fc7625c36 100644
--- a/tests/disas/winch/aarch64/f32_sub/const.wat
+++ b/tests/disas/winch/aarch64/f32_sub/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0xcd, 0xcc, 0x0c, 0x40
-;; 74: .byte 0x00, 0x00, 0x00, 0x00
+;; 74: udf #0
;; 78: .byte 0xcd, 0xcc, 0x8c, 0x3f
diff --git a/tests/disas/winch/aarch64/f32_sub/locals.wat b/tests/disas/winch/aarch64/f32_sub/locals.wat
index 2fc97a5813..373467c5d3 100644
--- a/tests/disas/winch/aarch64/f32_sub/locals.wat
+++ b/tests/disas/winch/aarch64/f32_sub/locals.wat
@@ -50,8 +50,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0
;; 88: .byte 0xcd, 0xcc, 0x8c, 0x3f
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0
;; 90: .byte 0xcd, 0xcc, 0x0c, 0x40
diff --git a/tests/disas/winch/aarch64/f32_sub/params.wat b/tests/disas/winch/aarch64/f32_sub/params.wat
index 8e82d58d89..5206433822 100644
--- a/tests/disas/winch/aarch64/f32_sub/params.wat
+++ b/tests/disas/winch/aarch64/f32_sub/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat
index 2a2c6a490e..daaee7092f 100644
--- a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat
+++ b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_const.wat
@@ -32,6 +32,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0xc3, 0xf5, 0xa8, 0xbf
diff --git a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat
index 6949d39124..b03a19c081 100644
--- a/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat
+++ b/tests/disas/winch/aarch64/f32_trunc/f32_trunc_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat b/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat
index c02fdbafb3..9792a95c5a 100644
--- a/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat
+++ b/tests/disas/winch/aarch64/f64_abs/f64_abs_const.wat
@@ -32,7 +32,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0x1f, 0x85, 0xeb, 0x51
;; 6c: .byte 0xb8, 0x1e, 0xf5, 0xbf
diff --git a/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat b/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat
index 6cd024efe6..f2e051a45a 100644
--- a/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat
+++ b/tests/disas/winch/aarch64/f64_abs/f64_abs_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_add/const.wat b/tests/disas/winch/aarch64/f64_add/const.wat
index 474ee91026..0ed6394ec6 100644
--- a/tests/disas/winch/aarch64/f64_add/const.wat
+++ b/tests/disas/winch/aarch64/f64_add/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0x9a, 0x99, 0x99, 0x99
;; 74: .byte 0x99, 0x99, 0x01, 0x40
;; 78: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_add/locals.wat b/tests/disas/winch/aarch64/f64_add/locals.wat
index e60fd0b34e..620d9ce58b 100644
--- a/tests/disas/winch/aarch64/f64_add/locals.wat
+++ b/tests/disas/winch/aarch64/f64_add/locals.wat
@@ -51,7 +51,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;; 88: .byte 0x9a, 0x99, 0x99, 0x99
;; 8c: .byte 0x99, 0x99, 0xf1, 0x3f
;; 90: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_add/params.wat b/tests/disas/winch/aarch64/f64_add/params.wat
index bd20a404b7..21d6d03ed4 100644
--- a/tests/disas/winch/aarch64/f64_add/params.wat
+++ b/tests/disas/winch/aarch64/f64_add/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat
index b51f275675..1d7d0aae63 100644
--- a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat
+++ b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_const.wat
@@ -32,7 +32,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0x1f, 0x85, 0xeb, 0x51
;; 6c: .byte 0xb8, 0x1e, 0xf5, 0xbf
diff --git a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat
index 963e4b6dde..d1ddac645d 100644
--- a/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat
+++ b/tests/disas/winch/aarch64/f64_ceil/f64_ceil_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat
index a016e215e2..6c76fa6785 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat
index fca1c27354..d1600d2ec7 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat
index 74b928c75c..041d206c47 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat
index 06c26d6fdf..233dfb8052 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_s/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat
index c3c9a9e20f..b52416de6b 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat
index a2c5928eab..88971d97ea 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat
index d5a8c06a95..fd4e590373 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat
index 59b6998e8f..190d98ae85 100644
--- a/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i32_u/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat
index 4d7370822f..de40b30a6d 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat
index 2daa67fae6..021e829910 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat
index 6c1fbd9f5d..e9bc0ed72d 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat
index 43d95f3c38..54f7bc1b83 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_s/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat
index 9283c76f23..4af6592df9 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat
index 241fa37497..85d296dbc4 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat
index be478d811b..010d968995 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat b/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat
index 67779b5d17..ca07d82857 100644
--- a/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_convert_i64_u/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_copysign/const.wat b/tests/disas/winch/aarch64/f64_copysign/const.wat
index 3ec667e75f..0a6bfc5ef6 100644
--- a/tests/disas/winch/aarch64/f64_copysign/const.wat
+++ b/tests/disas/winch/aarch64/f64_copysign/const.wat
@@ -36,7 +36,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
;; 70: .byte 0x9a, 0x99, 0x99, 0x99
;; 74: .byte 0x99, 0x99, 0x01, 0x40
;; 78: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_copysign/locals.wat b/tests/disas/winch/aarch64/f64_copysign/locals.wat
index 2642bdd349..0463aed395 100644
--- a/tests/disas/winch/aarch64/f64_copysign/locals.wat
+++ b/tests/disas/winch/aarch64/f64_copysign/locals.wat
@@ -52,8 +52,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x00, 0x00, 0x00, 0x00
+;; 88: udf #0xc11f
+;; 8c: udf #0
;; 90: .byte 0x9a, 0x99, 0x99, 0x99
;; 94: .byte 0x99, 0x99, 0xf1, 0xbf
;; 98: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_copysign/params.wat b/tests/disas/winch/aarch64/f64_copysign/params.wat
index 3220abb7f5..d88d76ef52 100644
--- a/tests/disas/winch/aarch64/f64_copysign/params.wat
+++ b/tests/disas/winch/aarch64/f64_copysign/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_div/const.wat b/tests/disas/winch/aarch64/f64_div/const.wat
index bfe2652a58..ddd392fdd5 100644
--- a/tests/disas/winch/aarch64/f64_div/const.wat
+++ b/tests/disas/winch/aarch64/f64_div/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0x9a, 0x99, 0x99, 0x99
;; 74: .byte 0x99, 0x99, 0x01, 0x40
;; 78: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_div/locals.wat b/tests/disas/winch/aarch64/f64_div/locals.wat
index 308d086f40..b3b406df1b 100644
--- a/tests/disas/winch/aarch64/f64_div/locals.wat
+++ b/tests/disas/winch/aarch64/f64_div/locals.wat
@@ -51,7 +51,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;; 88: .byte 0x9a, 0x99, 0x99, 0x99
;; 8c: .byte 0x99, 0x99, 0xf1, 0x3f
;; 90: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_div/params.wat b/tests/disas/winch/aarch64/f64_div/params.wat
index 6a4913c5c0..b1caca7e80 100644
--- a/tests/disas/winch/aarch64/f64_div/params.wat
+++ b/tests/disas/winch/aarch64/f64_div/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_eq/const.wat b/tests/disas/winch/aarch64/f64_eq/const.wat
index 232d8ef3b8..1b379602d8 100644
--- a/tests/disas/winch/aarch64/f64_eq/const.wat
+++ b/tests/disas/winch/aarch64/f64_eq/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_eq/locals.wat b/tests/disas/winch/aarch64/f64_eq/locals.wat
index 04e0c6bf6d..46346c7a58 100644
--- a/tests/disas/winch/aarch64/f64_eq/locals.wat
+++ b/tests/disas/winch/aarch64/f64_eq/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_eq/params.wat b/tests/disas/winch/aarch64/f64_eq/params.wat
index d23b111bc2..586b0d71a9 100644
--- a/tests/disas/winch/aarch64/f64_eq/params.wat
+++ b/tests/disas/winch/aarch64/f64_eq/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat b/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat
index 0505c9db35..56b459a84f 100644
--- a/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat
+++ b/tests/disas/winch/aarch64/f64_floor/f64_floor_const.wat
@@ -32,7 +32,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0x1f, 0x85, 0xeb, 0x51
;; 6c: .byte 0xb8, 0x1e, 0xf5, 0xbf
diff --git a/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat b/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat
index 4a724afa57..e78461c490 100644
--- a/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat
+++ b/tests/disas/winch/aarch64/f64_floor/f64_floor_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_ge/const.wat b/tests/disas/winch/aarch64/f64_ge/const.wat
index 0b64df6062..e1dc98d6cb 100644
--- a/tests/disas/winch/aarch64/f64_ge/const.wat
+++ b/tests/disas/winch/aarch64/f64_ge/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_ge/locals.wat b/tests/disas/winch/aarch64/f64_ge/locals.wat
index 2cdcd168c4..f3696ae0d3 100644
--- a/tests/disas/winch/aarch64/f64_ge/locals.wat
+++ b/tests/disas/winch/aarch64/f64_ge/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_ge/params.wat b/tests/disas/winch/aarch64/f64_ge/params.wat
index b723d74e87..dacc7420fd 100644
--- a/tests/disas/winch/aarch64/f64_ge/params.wat
+++ b/tests/disas/winch/aarch64/f64_ge/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_gt/const.wat b/tests/disas/winch/aarch64/f64_gt/const.wat
index 327c5e831c..3d320c4b05 100644
--- a/tests/disas/winch/aarch64/f64_gt/const.wat
+++ b/tests/disas/winch/aarch64/f64_gt/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_gt/locals.wat b/tests/disas/winch/aarch64/f64_gt/locals.wat
index 90cd450d5e..9e209a6549 100644
--- a/tests/disas/winch/aarch64/f64_gt/locals.wat
+++ b/tests/disas/winch/aarch64/f64_gt/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_gt/params.wat b/tests/disas/winch/aarch64/f64_gt/params.wat
index 244220ccb4..b3f8160fcc 100644
--- a/tests/disas/winch/aarch64/f64_gt/params.wat
+++ b/tests/disas/winch/aarch64/f64_gt/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_le/const.wat b/tests/disas/winch/aarch64/f64_le/const.wat
index e3a502b41a..8bcbb1fb20 100644
--- a/tests/disas/winch/aarch64/f64_le/const.wat
+++ b/tests/disas/winch/aarch64/f64_le/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_le/locals.wat b/tests/disas/winch/aarch64/f64_le/locals.wat
index 5e9cafdcbd..b89875d35d 100644
--- a/tests/disas/winch/aarch64/f64_le/locals.wat
+++ b/tests/disas/winch/aarch64/f64_le/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_le/params.wat b/tests/disas/winch/aarch64/f64_le/params.wat
index c7941bbcce..2d69fddf1e 100644
--- a/tests/disas/winch/aarch64/f64_le/params.wat
+++ b/tests/disas/winch/aarch64/f64_le/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_lt/const.wat b/tests/disas/winch/aarch64/f64_lt/const.wat
index a4782aa262..44a8daa4f1 100644
--- a/tests/disas/winch/aarch64/f64_lt/const.wat
+++ b/tests/disas/winch/aarch64/f64_lt/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_lt/locals.wat b/tests/disas/winch/aarch64/f64_lt/locals.wat
index a2fee2009c..a952a487d6 100644
--- a/tests/disas/winch/aarch64/f64_lt/locals.wat
+++ b/tests/disas/winch/aarch64/f64_lt/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_lt/params.wat b/tests/disas/winch/aarch64/f64_lt/params.wat
index 948a444da1..b340ca8a09 100644
--- a/tests/disas/winch/aarch64/f64_lt/params.wat
+++ b/tests/disas/winch/aarch64/f64_lt/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_max/const.wat b/tests/disas/winch/aarch64/f64_max/const.wat
index 70879d637b..986837db12 100644
--- a/tests/disas/winch/aarch64/f64_max/const.wat
+++ b/tests/disas/winch/aarch64/f64_max/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0x9a, 0x99, 0x99, 0x99
;; 74: .byte 0x99, 0x99, 0x01, 0x40
;; 78: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_max/locals.wat b/tests/disas/winch/aarch64/f64_max/locals.wat
index a0b30cb6b0..02bd375155 100644
--- a/tests/disas/winch/aarch64/f64_max/locals.wat
+++ b/tests/disas/winch/aarch64/f64_max/locals.wat
@@ -51,7 +51,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;; 88: .byte 0x9a, 0x99, 0x99, 0x99
;; 8c: .byte 0x99, 0x99, 0xf1, 0x3f
;; 90: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_max/params.wat b/tests/disas/winch/aarch64/f64_max/params.wat
index f1c5ef945c..8239e837dd 100644
--- a/tests/disas/winch/aarch64/f64_max/params.wat
+++ b/tests/disas/winch/aarch64/f64_max/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_min/const.wat b/tests/disas/winch/aarch64/f64_min/const.wat
index 2668111a86..3ba2e570ae 100644
--- a/tests/disas/winch/aarch64/f64_min/const.wat
+++ b/tests/disas/winch/aarch64/f64_min/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0x9a, 0x99, 0x99, 0x99
;; 74: .byte 0x99, 0x99, 0x01, 0x40
;; 78: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_min/locals.wat b/tests/disas/winch/aarch64/f64_min/locals.wat
index 5b219954d5..efb0335ede 100644
--- a/tests/disas/winch/aarch64/f64_min/locals.wat
+++ b/tests/disas/winch/aarch64/f64_min/locals.wat
@@ -51,7 +51,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;; 88: .byte 0x9a, 0x99, 0x99, 0x99
;; 8c: .byte 0x99, 0x99, 0xf1, 0x3f
;; 90: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_min/params.wat b/tests/disas/winch/aarch64/f64_min/params.wat
index f4c30d5921..2cfa51a9c6 100644
--- a/tests/disas/winch/aarch64/f64_min/params.wat
+++ b/tests/disas/winch/aarch64/f64_min/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_mul/const.wat b/tests/disas/winch/aarch64/f64_mul/const.wat
index 2cb2cf2ac7..10d78f8530 100644
--- a/tests/disas/winch/aarch64/f64_mul/const.wat
+++ b/tests/disas/winch/aarch64/f64_mul/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0x9a, 0x99, 0x99, 0x99
;; 74: .byte 0x99, 0x99, 0x01, 0x40
;; 78: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_mul/locals.wat b/tests/disas/winch/aarch64/f64_mul/locals.wat
index 8228e95160..37ff8737dc 100644
--- a/tests/disas/winch/aarch64/f64_mul/locals.wat
+++ b/tests/disas/winch/aarch64/f64_mul/locals.wat
@@ -51,7 +51,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;; 88: .byte 0x9a, 0x99, 0x99, 0x99
;; 8c: .byte 0x99, 0x99, 0xf1, 0x3f
;; 90: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_mul/params.wat b/tests/disas/winch/aarch64/f64_mul/params.wat
index 8006746ddd..0ce42d306e 100644
--- a/tests/disas/winch/aarch64/f64_mul/params.wat
+++ b/tests/disas/winch/aarch64/f64_mul/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_ne/const.wat b/tests/disas/winch/aarch64/f64_ne/const.wat
index ba0d8768cd..e56349c912 100644
--- a/tests/disas/winch/aarch64/f64_ne/const.wat
+++ b/tests/disas/winch/aarch64/f64_ne/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_ne/locals.wat b/tests/disas/winch/aarch64/f64_ne/locals.wat
index 9d0b774e18..88c5c0e4bb 100644
--- a/tests/disas/winch/aarch64/f64_ne/locals.wat
+++ b/tests/disas/winch/aarch64/f64_ne/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_ne/params.wat b/tests/disas/winch/aarch64/f64_ne/params.wat
index d58565d7b9..eecab095f8 100644
--- a/tests/disas/winch/aarch64/f64_ne/params.wat
+++ b/tests/disas/winch/aarch64/f64_ne/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat
index aae2523d23..c282451517 100644
--- a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat
+++ b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_const.wat
@@ -32,7 +32,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0x1f, 0x85, 0xeb, 0x51
;; 6c: .byte 0xb8, 0x1e, 0xf5, 0xbf
diff --git a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat
index d07e4b5928..1eb236acce 100644
--- a/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat
+++ b/tests/disas/winch/aarch64/f64_nearest/f64_nearest_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat b/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat
index 8d9103e7c4..a5dadf03e0 100644
--- a/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat
+++ b/tests/disas/winch/aarch64/f64_neg/f64_neg_const.wat
@@ -32,7 +32,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0x1f, 0x85, 0xeb, 0x51
;; 6c: .byte 0xb8, 0x1e, 0xf5, 0xbf
diff --git a/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat b/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat
index 6a89b468a7..e5246c6018 100644
--- a/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat
+++ b/tests/disas/winch/aarch64/f64_neg/f64_neg_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_promote_f32/const.wat b/tests/disas/winch/aarch64/f64_promote_f32/const.wat
index d226a17929..3881c9e8ac 100644
--- a/tests/disas/winch/aarch64/f64_promote_f32/const.wat
+++ b/tests/disas/winch/aarch64/f64_promote_f32/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_promote_f32/locals.wat b/tests/disas/winch/aarch64/f64_promote_f32/locals.wat
index 178cd454f8..7bdcebc84d 100644
--- a/tests/disas/winch/aarch64/f64_promote_f32/locals.wat
+++ b/tests/disas/winch/aarch64/f64_promote_f32/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_promote_f32/params.wat b/tests/disas/winch/aarch64/f64_promote_f32/params.wat
index 1151a22634..c4ccee9000 100644
--- a/tests/disas/winch/aarch64/f64_promote_f32/params.wat
+++ b/tests/disas/winch/aarch64/f64_promote_f32/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat
index 2d7a768649..f4b345caf6 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat
index b2b09ccfe0..cac0bf330a 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat
index 27aa5e1ffa..81fb3d2ec7 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat
index 65098218d5..2b0a0e1c17 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/ret_int.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat b/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat
index db891e5953..eafdbe54d1 100644
--- a/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat
+++ b/tests/disas/winch/aarch64/f64_reinterpret_i64/spilled.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat
index 9323a40add..4f6717f4e7 100644
--- a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat
+++ b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_const.wat
@@ -32,7 +32,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0x1f, 0x85, 0xeb, 0x51
;; 6c: .byte 0xb8, 0x1e, 0xf5, 0x3f
diff --git a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat
index 9bee443327..2eb0e3f979 100644
--- a/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat
+++ b/tests/disas/winch/aarch64/f64_sqrt/f64_sqrt_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_sub/const.wat b/tests/disas/winch/aarch64/f64_sub/const.wat
index 454b20a0c9..43764f1e42 100644
--- a/tests/disas/winch/aarch64/f64_sub/const.wat
+++ b/tests/disas/winch/aarch64/f64_sub/const.wat
@@ -35,8 +35,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 6c: .byte 0x00, 0x00, 0x00, 0x00
+;; 68: udf #0xc11f
+;; 6c: udf #0
;; 70: .byte 0x9a, 0x99, 0x99, 0x99
;; 74: .byte 0x99, 0x99, 0x01, 0x40
;; 78: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_sub/locals.wat b/tests/disas/winch/aarch64/f64_sub/locals.wat
index 8f74027b70..2cd82c431a 100644
--- a/tests/disas/winch/aarch64/f64_sub/locals.wat
+++ b/tests/disas/winch/aarch64/f64_sub/locals.wat
@@ -51,7 +51,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
;; 88: .byte 0x9a, 0x99, 0x99, 0x99
;; 8c: .byte 0x99, 0x99, 0xf1, 0x3f
;; 90: .byte 0x9a, 0x99, 0x99, 0x99
diff --git a/tests/disas/winch/aarch64/f64_sub/params.wat b/tests/disas/winch/aarch64/f64_sub/params.wat
index df38171a0a..5657bb44f1 100644
--- a/tests/disas/winch/aarch64/f64_sub/params.wat
+++ b/tests/disas/winch/aarch64/f64_sub/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat
index f4ec90fce6..d8b8d62ec3 100644
--- a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat
+++ b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_const.wat
@@ -32,7 +32,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 64: .byte 0x00, 0x00, 0x00, 0x00
+;; 60: udf #0xc11f
+;; 64: udf #0
;; 68: .byte 0x1f, 0x85, 0xeb, 0x51
;; 6c: .byte 0xb8, 0x1e, 0xf5, 0xbf
diff --git a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat
index 4709be4978..5f5dd911d9 100644
--- a/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat
+++ b/tests/disas/winch/aarch64/f64_trunc/f64_trunc_param.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/const.wat b/tests/disas/winch/aarch64/i32_add/const.wat
index 0f3bcb7d7d..b818dc6650 100644
--- a/tests/disas/winch/aarch64/i32_add/const.wat
+++ b/tests/disas/winch/aarch64/i32_add/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/locals.wat b/tests/disas/winch/aarch64/i32_add/locals.wat
index d75948e8c7..948f4257a2 100644
--- a/tests/disas/winch/aarch64/i32_add/locals.wat
+++ b/tests/disas/winch/aarch64/i32_add/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/max.wat b/tests/disas/winch/aarch64/i32_add/max.wat
index e38b7bafc4..8ab1e4f5e6 100644
--- a/tests/disas/winch/aarch64/i32_add/max.wat
+++ b/tests/disas/winch/aarch64/i32_add/max.wat
@@ -24,7 +24,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0x7fffffff
+;; mov x0, #0x7fffffff
;; add w0, w0, #1
;; add x28, x28, #0x10
;; mov sp, x28
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/max_one.wat b/tests/disas/winch/aarch64/i32_add/max_one.wat
index f2e8618d36..2043ea0cce 100644
--- a/tests/disas/winch/aarch64/i32_add/max_one.wat
+++ b/tests/disas/winch/aarch64/i32_add/max_one.wat
@@ -26,7 +26,7 @@
;; stur x0, [x28, #8]
;; stur x1, [x28]
;; mov x0, #0x80000000
-;; orr x16, xzr, #0xffffffff
+;; mov x16, #0xffffffff
;; add w0, w0, w16, uxtx
;; add x28, x28, #0x10
;; mov sp, x28
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/mixed.wat b/tests/disas/winch/aarch64/i32_add/mixed.wat
index 647a5367da..da1852e2c8 100644
--- a/tests/disas/winch/aarch64/i32_add/mixed.wat
+++ b/tests/disas/winch/aarch64/i32_add/mixed.wat
@@ -25,7 +25,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
+;; mov x0, #0xffffffff
;; add w0, w0, #1
;; add x28, x28, #0x10
;; mov sp, x28
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/params.wat b/tests/disas/winch/aarch64/i32_add/params.wat
index 7321d041b4..64ef1faf18 100644
--- a/tests/disas/winch/aarch64/i32_add/params.wat
+++ b/tests/disas/winch/aarch64/i32_add/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/signed.wat b/tests/disas/winch/aarch64/i32_add/signed.wat
index 77e734a091..578a0f781e 100644
--- a/tests/disas/winch/aarch64/i32_add/signed.wat
+++ b/tests/disas/winch/aarch64/i32_add/signed.wat
@@ -25,8 +25,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x16, xzr, #0xffffffff
+;; mov x0, #0xffffffff
+;; mov x16, #0xffffffff
;; add w0, w0, w16, uxtx
;; add x28, x28, #0x10
;; mov sp, x28
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat
index 18b9a0df16..be7d40d929 100644
--- a/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i32_add/unsigned_with_zero.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_and/const.wat b/tests/disas/winch/aarch64/i32_and/const.wat
index 59f61709e7..7b66442599 100644
--- a/tests/disas/winch/aarch64/i32_and/const.wat
+++ b/tests/disas/winch/aarch64/i32_and/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_and/locals.wat b/tests/disas/winch/aarch64/i32_and/locals.wat
index 3d5ef6be50..22fce6062f 100644
--- a/tests/disas/winch/aarch64/i32_and/locals.wat
+++ b/tests/disas/winch/aarch64/i32_and/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_and/params.wat b/tests/disas/winch/aarch64/i32_and/params.wat
index e55c61f4a0..228fb33b06 100644
--- a/tests/disas/winch/aarch64/i32_and/params.wat
+++ b/tests/disas/winch/aarch64/i32_and/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_clz/const.wat b/tests/disas/winch/aarch64/i32_clz/const.wat
index 9b26934cbf..19f4c5e251 100644
--- a/tests/disas/winch/aarch64/i32_clz/const.wat
+++ b/tests/disas/winch/aarch64/i32_clz/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_clz/locals.wat b/tests/disas/winch/aarch64/i32_clz/locals.wat
index 24543884b3..dab258c6e5 100644
--- a/tests/disas/winch/aarch64/i32_clz/locals.wat
+++ b/tests/disas/winch/aarch64/i32_clz/locals.wat
@@ -39,4 +39,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_clz/params.wat b/tests/disas/winch/aarch64/i32_clz/params.wat
index 1b0823ebb3..76a16d2c1c 100644
--- a/tests/disas/winch/aarch64/i32_clz/params.wat
+++ b/tests/disas/winch/aarch64/i32_clz/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ctz/const.wat b/tests/disas/winch/aarch64/i32_ctz/const.wat
index 1bfd92a789..b6d3df3556 100644
--- a/tests/disas/winch/aarch64/i32_ctz/const.wat
+++ b/tests/disas/winch/aarch64/i32_ctz/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ctz/locals.wat b/tests/disas/winch/aarch64/i32_ctz/locals.wat
index d853ca67e8..746bca8dac 100644
--- a/tests/disas/winch/aarch64/i32_ctz/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ctz/locals.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ctz/params.wat b/tests/disas/winch/aarch64/i32_ctz/params.wat
index 6bc2bd213d..5408c7dd60 100644
--- a/tests/disas/winch/aarch64/i32_ctz/params.wat
+++ b/tests/disas/winch/aarch64/i32_ctz/params.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divs/const.wat b/tests/disas/winch/aarch64/i32_divs/const.wat
index 97722b9321..d7d6de8042 100644
--- a/tests/disas/winch/aarch64/i32_divs/const.wat
+++ b/tests/disas/winch/aarch64/i32_divs/const.wat
@@ -42,6 +42,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divs/one_zero.wat b/tests/disas/winch/aarch64/i32_divs/one_zero.wat
index 67d5bb8787..986b6ed8f5 100644
--- a/tests/disas/winch/aarch64/i32_divs/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divs/one_zero.wat
@@ -42,6 +42,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divs/overflow.wat b/tests/disas/winch/aarch64/i32_divs/overflow.wat
index d7736b3a43..91744ea04b 100644
--- a/tests/disas/winch/aarch64/i32_divs/overflow.wat
+++ b/tests/disas/winch/aarch64/i32_divs/overflow.wat
@@ -26,7 +26,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
+;; mov x0, #0xffffffff
;; mov x1, #0x80000000
;; cbz w0, #0x84
;; 4c: cmn w0, #1
@@ -42,6 +42,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divs/params.wat b/tests/disas/winch/aarch64/i32_divs/params.wat
index 75ed3ecddc..d58e4ab24e 100644
--- a/tests/disas/winch/aarch64/i32_divs/params.wat
+++ b/tests/disas/winch/aarch64/i32_divs/params.wat
@@ -46,6 +46,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divs/zero_zero.wat b/tests/disas/winch/aarch64/i32_divs/zero_zero.wat
index 0411ef6aa2..e9b30c18cf 100644
--- a/tests/disas/winch/aarch64/i32_divs/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divs/zero_zero.wat
@@ -42,6 +42,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divu/const.wat b/tests/disas/winch/aarch64/i32_divu/const.wat
index 1299fee706..f19bd88e87 100644
--- a/tests/disas/winch/aarch64/i32_divu/const.wat
+++ b/tests/disas/winch/aarch64/i32_divu/const.wat
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divu/one_zero.wat b/tests/disas/winch/aarch64/i32_divu/one_zero.wat
index 57fe89c7cf..ad3c8d786b 100644
--- a/tests/disas/winch/aarch64/i32_divu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divu/one_zero.wat
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divu/params.wat b/tests/disas/winch/aarch64/i32_divu/params.wat
index f375f0d42f..a986893baa 100644
--- a/tests/disas/winch/aarch64/i32_divu/params.wat
+++ b/tests/disas/winch/aarch64/i32_divu/params.wat
@@ -41,5 +41,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 7c: udf #0xc11f
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divu/signed.wat b/tests/disas/winch/aarch64/i32_divu/signed.wat
index 67a7140336..15513afb74 100644
--- a/tests/disas/winch/aarch64/i32_divu/signed.wat
+++ b/tests/disas/winch/aarch64/i32_divu/signed.wat
@@ -26,8 +26,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x1, xzr, #0xffffffff
+;; mov x0, #0xffffffff
+;; mov x1, #0xffffffff
;; cbz w0, #0x70
;; 4c: udiv w1, w1, w0
;; mov w0, w1
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_divu/zero_zero.wat b/tests/disas/winch/aarch64/i32_divu/zero_zero.wat
index b9fb07e159..91ca431183 100644
--- a/tests/disas/winch/aarch64/i32_divu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_divu/zero_zero.wat
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_eq/const.wat b/tests/disas/winch/aarch64/i32_eq/const.wat
index 224cd99a59..174064af6b 100644
--- a/tests/disas/winch/aarch64/i32_eq/const.wat
+++ b/tests/disas/winch/aarch64/i32_eq/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_eq/locals.wat b/tests/disas/winch/aarch64/i32_eq/locals.wat
index 0241439f82..cbd022a155 100644
--- a/tests/disas/winch/aarch64/i32_eq/locals.wat
+++ b/tests/disas/winch/aarch64/i32_eq/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_eq/params.wat b/tests/disas/winch/aarch64/i32_eq/params.wat
index 234f42c1bc..0ca2158f16 100644
--- a/tests/disas/winch/aarch64/i32_eq/params.wat
+++ b/tests/disas/winch/aarch64/i32_eq/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_extend_16_s/const.wat b/tests/disas/winch/aarch64/i32_extend_16_s/const.wat
index a6d5d884d1..172d277176 100644
--- a/tests/disas/winch/aarch64/i32_extend_16_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_extend_16_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat b/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat
index dd6b13d011..39fedc8601 100644
--- a/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_extend_16_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_extend_16_s/params.wat b/tests/disas/winch/aarch64/i32_extend_16_s/params.wat
index 78dc5c0815..35da9a6d78 100644
--- a/tests/disas/winch/aarch64/i32_extend_16_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_extend_16_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_extend_8_s/const.wat b/tests/disas/winch/aarch64/i32_extend_8_s/const.wat
index a8e4f1b003..f49906a76e 100644
--- a/tests/disas/winch/aarch64/i32_extend_8_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_extend_8_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat b/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat
index 05c1550bbc..653de9cae5 100644
--- a/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_extend_8_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_extend_8_s/params.wat b/tests/disas/winch/aarch64/i32_extend_8_s/params.wat
index 6217b720d6..73d8c7e594 100644
--- a/tests/disas/winch/aarch64/i32_extend_8_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_extend_8_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ge_s/const.wat b/tests/disas/winch/aarch64/i32_ge_s/const.wat
index 0101fc9b34..125f424ec0 100644
--- a/tests/disas/winch/aarch64/i32_ge_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_ge_s/const.wat
@@ -26,8 +26,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x16, xzr, #0xfffffffe
+;; mov x0, #0xffffffff
+;; mov x16, #0xfffffffe
;; cmp w0, w16, uxtx
;; cset x0, ge
;; add x28, x28, #0x10
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ge_s/locals.wat b/tests/disas/winch/aarch64/i32_ge_s/locals.wat
index 88afc6078a..e618662f05 100644
--- a/tests/disas/winch/aarch64/i32_ge_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ge_s/locals.wat
@@ -36,7 +36,7 @@
;; stur x1, [x28, #8]
;; mov x16, #0
;; stur x16, [x28]
-;; orr x0, xzr, #0xfffffffe
+;; mov x0, #0xfffffffe
;; stur w0, [x28, #4]
;; mov w0, #-3
;; stur w0, [x28]
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ge_s/params.wat b/tests/disas/winch/aarch64/i32_ge_s/params.wat
index 08664e4cb4..648460c7a3 100644
--- a/tests/disas/winch/aarch64/i32_ge_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_ge_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ge_u/const.wat b/tests/disas/winch/aarch64/i32_ge_u/const.wat
index c20f830ab1..ce894fe37f 100644
--- a/tests/disas/winch/aarch64/i32_ge_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_ge_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ge_u/locals.wat b/tests/disas/winch/aarch64/i32_ge_u/locals.wat
index 99d1ac964b..d889e9faef 100644
--- a/tests/disas/winch/aarch64/i32_ge_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ge_u/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ge_u/params.wat b/tests/disas/winch/aarch64/i32_ge_u/params.wat
index d9db849d75..a168efc0e4 100644
--- a/tests/disas/winch/aarch64/i32_ge_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_ge_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_gt_s/const.wat b/tests/disas/winch/aarch64/i32_gt_s/const.wat
index 7157a758fb..f003b5d7c1 100644
--- a/tests/disas/winch/aarch64/i32_gt_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_gt_s/const.wat
@@ -26,8 +26,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x16, xzr, #0xfffffffe
+;; mov x0, #0xffffffff
+;; mov x16, #0xfffffffe
;; cmp w0, w16, uxtx
;; cset x0, gt
;; add x28, x28, #0x10
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_gt_s/locals.wat b/tests/disas/winch/aarch64/i32_gt_s/locals.wat
index f009f21d29..4db4749d31 100644
--- a/tests/disas/winch/aarch64/i32_gt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_gt_s/locals.wat
@@ -36,7 +36,7 @@
;; stur x1, [x28, #8]
;; mov x16, #0
;; stur x16, [x28]
-;; orr x0, xzr, #0xfffffffe
+;; mov x0, #0xfffffffe
;; stur w0, [x28, #4]
;; mov w0, #-3
;; stur w0, [x28]
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_gt_s/params.wat b/tests/disas/winch/aarch64/i32_gt_s/params.wat
index c3a0d9a176..54ee2c1d3b 100644
--- a/tests/disas/winch/aarch64/i32_gt_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_gt_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_gt_u/const.wat b/tests/disas/winch/aarch64/i32_gt_u/const.wat
index 85833c6a09..64f57ffb00 100644
--- a/tests/disas/winch/aarch64/i32_gt_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_gt_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_gt_u/locals.wat b/tests/disas/winch/aarch64/i32_gt_u/locals.wat
index c534ee302a..34385e628c 100644
--- a/tests/disas/winch/aarch64/i32_gt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_gt_u/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_gt_u/params.wat b/tests/disas/winch/aarch64/i32_gt_u/params.wat
index 0c4f0da42a..b35087953f 100644
--- a/tests/disas/winch/aarch64/i32_gt_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_gt_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_le_s/const.wat b/tests/disas/winch/aarch64/i32_le_s/const.wat
index 76f3e014be..86bca45b51 100644
--- a/tests/disas/winch/aarch64/i32_le_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_le_s/const.wat
@@ -26,8 +26,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x16, xzr, #0xfffffffe
+;; mov x0, #0xffffffff
+;; mov x16, #0xfffffffe
;; cmp w0, w16, uxtx
;; cset x0, le
;; add x28, x28, #0x10
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_le_s/locals.wat b/tests/disas/winch/aarch64/i32_le_s/locals.wat
index 729c6710d9..22b4603ada 100644
--- a/tests/disas/winch/aarch64/i32_le_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_le_s/locals.wat
@@ -36,7 +36,7 @@
;; stur x1, [x28, #8]
;; mov x16, #0
;; stur x16, [x28]
-;; orr x0, xzr, #0xfffffffe
+;; mov x0, #0xfffffffe
;; stur w0, [x28, #4]
;; mov w0, #-3
;; stur w0, [x28]
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_le_s/params.wat b/tests/disas/winch/aarch64/i32_le_s/params.wat
index deb243bf56..5cfe3d6c18 100644
--- a/tests/disas/winch/aarch64/i32_le_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_le_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_le_u/const.wat b/tests/disas/winch/aarch64/i32_le_u/const.wat
index 70c8e08040..3f7706d800 100644
--- a/tests/disas/winch/aarch64/i32_le_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_le_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_le_u/locals.wat b/tests/disas/winch/aarch64/i32_le_u/locals.wat
index 724436de76..06c4c2baae 100644
--- a/tests/disas/winch/aarch64/i32_le_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_le_u/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_le_u/params.wat b/tests/disas/winch/aarch64/i32_le_u/params.wat
index 6061068a4b..5d4889f851 100644
--- a/tests/disas/winch/aarch64/i32_le_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_le_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_lt_s/const.wat b/tests/disas/winch/aarch64/i32_lt_s/const.wat
index 4625c7f3e5..0e24c40f93 100644
--- a/tests/disas/winch/aarch64/i32_lt_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_lt_s/const.wat
@@ -26,8 +26,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x16, xzr, #0xfffffffe
+;; mov x0, #0xffffffff
+;; mov x16, #0xfffffffe
;; cmp w0, w16, uxtx
;; cset x0, lt
;; add x28, x28, #0x10
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_lt_s/locals.wat b/tests/disas/winch/aarch64/i32_lt_s/locals.wat
index f28cc9afd0..2cd007707f 100644
--- a/tests/disas/winch/aarch64/i32_lt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_lt_s/locals.wat
@@ -36,7 +36,7 @@
;; stur x1, [x28, #8]
;; mov x16, #0
;; stur x16, [x28]
-;; orr x0, xzr, #0xfffffffe
+;; mov x0, #0xfffffffe
;; stur w0, [x28, #4]
;; mov w0, #-3
;; stur w0, [x28]
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_lt_s/params.wat b/tests/disas/winch/aarch64/i32_lt_s/params.wat
index f504f7a8a8..8bf5052820 100644
--- a/tests/disas/winch/aarch64/i32_lt_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_lt_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_lt_u/const.wat b/tests/disas/winch/aarch64/i32_lt_u/const.wat
index 4364bbfb13..5b2de7d7c7 100644
--- a/tests/disas/winch/aarch64/i32_lt_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_lt_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_lt_u/locals.wat b/tests/disas/winch/aarch64/i32_lt_u/locals.wat
index 40653bd762..3f232ca98b 100644
--- a/tests/disas/winch/aarch64/i32_lt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_lt_u/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_lt_u/params.wat b/tests/disas/winch/aarch64/i32_lt_u/params.wat
index c0f7eac728..61caa6632a 100644
--- a/tests/disas/winch/aarch64/i32_lt_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_lt_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/const.wat b/tests/disas/winch/aarch64/i32_mul/const.wat
index f56fbd7219..a40aa56040 100644
--- a/tests/disas/winch/aarch64/i32_mul/const.wat
+++ b/tests/disas/winch/aarch64/i32_mul/const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/locals.wat b/tests/disas/winch/aarch64/i32_mul/locals.wat
index 8c3fb56367..e3e22249df 100644
--- a/tests/disas/winch/aarch64/i32_mul/locals.wat
+++ b/tests/disas/winch/aarch64/i32_mul/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/max.wat b/tests/disas/winch/aarch64/i32_mul/max.wat
index 4351b3e9b2..ad3b5f45c3 100644
--- a/tests/disas/winch/aarch64/i32_mul/max.wat
+++ b/tests/disas/winch/aarch64/i32_mul/max.wat
@@ -25,8 +25,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0x7fffffff
-;; orr x16, xzr, #0xffffffff
+;; mov x0, #0x7fffffff
+;; mov x16, #0xffffffff
;; mul w0, w0, w16
;; add x28, x28, #0x10
;; mov sp, x28
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/max_one.wat b/tests/disas/winch/aarch64/i32_mul/max_one.wat
index 75ae949c8a..701c9b2c3e 100644
--- a/tests/disas/winch/aarch64/i32_mul/max_one.wat
+++ b/tests/disas/winch/aarch64/i32_mul/max_one.wat
@@ -26,7 +26,7 @@
;; stur x0, [x28, #8]
;; stur x1, [x28]
;; mov x0, #0x80000000
-;; orr x16, xzr, #0xffffffff
+;; mov x16, #0xffffffff
;; mul w0, w0, w16
;; add x28, x28, #0x10
;; mov sp, x28
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/mixed.wat b/tests/disas/winch/aarch64/i32_mul/mixed.wat
index 1c8bc14772..b2756397e5 100644
--- a/tests/disas/winch/aarch64/i32_mul/mixed.wat
+++ b/tests/disas/winch/aarch64/i32_mul/mixed.wat
@@ -25,7 +25,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
+;; mov x0, #0xffffffff
;; mov x16, #1
;; mul w0, w0, w16
;; add x28, x28, #0x10
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/params.wat b/tests/disas/winch/aarch64/i32_mul/params.wat
index d45d489207..d38cf6acac 100644
--- a/tests/disas/winch/aarch64/i32_mul/params.wat
+++ b/tests/disas/winch/aarch64/i32_mul/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/signed.wat b/tests/disas/winch/aarch64/i32_mul/signed.wat
index 68d4f34c60..39ab946b1e 100644
--- a/tests/disas/winch/aarch64/i32_mul/signed.wat
+++ b/tests/disas/winch/aarch64/i32_mul/signed.wat
@@ -25,8 +25,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x16, xzr, #0xffffffff
+;; mov x0, #0xffffffff
+;; mov x16, #0xffffffff
;; mul w0, w0, w16
;; add x28, x28, #0x10
;; mov sp, x28
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat
index bc7fdc8214..5034b297d9 100644
--- a/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i32_mul/unsigned_with_zero.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ne/const.wat b/tests/disas/winch/aarch64/i32_ne/const.wat
index 1179bde8c0..4ceab8b282 100644
--- a/tests/disas/winch/aarch64/i32_ne/const.wat
+++ b/tests/disas/winch/aarch64/i32_ne/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ne/locals.wat b/tests/disas/winch/aarch64/i32_ne/locals.wat
index 82c573072e..21cfe665b9 100644
--- a/tests/disas/winch/aarch64/i32_ne/locals.wat
+++ b/tests/disas/winch/aarch64/i32_ne/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_ne/params.wat b/tests/disas/winch/aarch64/i32_ne/params.wat
index a093f38c72..982489f235 100644
--- a/tests/disas/winch/aarch64/i32_ne/params.wat
+++ b/tests/disas/winch/aarch64/i32_ne/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_or/const.wat b/tests/disas/winch/aarch64/i32_or/const.wat
index 3210f342f6..9f74da68b5 100644
--- a/tests/disas/winch/aarch64/i32_or/const.wat
+++ b/tests/disas/winch/aarch64/i32_or/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_or/locals.wat b/tests/disas/winch/aarch64/i32_or/locals.wat
index 783a232aff..934786a33a 100644
--- a/tests/disas/winch/aarch64/i32_or/locals.wat
+++ b/tests/disas/winch/aarch64/i32_or/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_or/params.wat b/tests/disas/winch/aarch64/i32_or/params.wat
index dfa031ea98..5a4c090c96 100644
--- a/tests/disas/winch/aarch64/i32_or/params.wat
+++ b/tests/disas/winch/aarch64/i32_or/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_popcnt/const.wat b/tests/disas/winch/aarch64/i32_popcnt/const.wat
index fe0d0bda1a..2c609efff8 100644
--- a/tests/disas/winch/aarch64/i32_popcnt/const.wat
+++ b/tests/disas/winch/aarch64/i32_popcnt/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_popcnt/reg.wat b/tests/disas/winch/aarch64/i32_popcnt/reg.wat
index cb5f7605ac..6631c37117 100644
--- a/tests/disas/winch/aarch64/i32_popcnt/reg.wat
+++ b/tests/disas/winch/aarch64/i32_popcnt/reg.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat
index c8f7d14c81..364f6163bd 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat
index 9b4663c082..511875ba42 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat
index fd339c1326..fdf112c88a 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat b/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat
index 68b045d35b..a02aa83e94 100644
--- a/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat
+++ b/tests/disas/winch/aarch64/i32_reinterpret_f32/ret_float.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rems/const.wat b/tests/disas/winch/aarch64/i32_rems/const.wat
index 6221aa1997..1dd55207fc 100644
--- a/tests/disas/winch/aarch64/i32_rems/const.wat
+++ b/tests/disas/winch/aarch64/i32_rems/const.wat
@@ -40,5 +40,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rems/one_zero.wat b/tests/disas/winch/aarch64/i32_rems/one_zero.wat
index 27ff43e9b3..7c1ab97178 100644
--- a/tests/disas/winch/aarch64/i32_rems/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_rems/one_zero.wat
@@ -40,5 +40,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rems/overflow.wat b/tests/disas/winch/aarch64/i32_rems/overflow.wat
index b75d2d0bcc..7f3b4b955c 100644
--- a/tests/disas/winch/aarch64/i32_rems/overflow.wat
+++ b/tests/disas/winch/aarch64/i32_rems/overflow.wat
@@ -26,7 +26,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
+;; mov x0, #0xffffffff
;; mov x1, #0x80000000
;; cbz w0, #0x7c
;; 4c: sxtw x0, w0
@@ -40,5 +40,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rems/params.wat b/tests/disas/winch/aarch64/i32_rems/params.wat
index 45c90d253d..a2403cabf6 100644
--- a/tests/disas/winch/aarch64/i32_rems/params.wat
+++ b/tests/disas/winch/aarch64/i32_rems/params.wat
@@ -44,5 +44,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rems/zero_zero.wat b/tests/disas/winch/aarch64/i32_rems/zero_zero.wat
index b182177497..38916079c7 100644
--- a/tests/disas/winch/aarch64/i32_rems/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_rems/zero_zero.wat
@@ -40,5 +40,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_remu/const.wat b/tests/disas/winch/aarch64/i32_remu/const.wat
index 5a14683315..4f2783da09 100644
--- a/tests/disas/winch/aarch64/i32_remu/const.wat
+++ b/tests/disas/winch/aarch64/i32_remu/const.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_remu/one_zero.wat b/tests/disas/winch/aarch64/i32_remu/one_zero.wat
index d957fdb01b..d66318f60c 100644
--- a/tests/disas/winch/aarch64/i32_remu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i32_remu/one_zero.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_remu/params.wat b/tests/disas/winch/aarch64/i32_remu/params.wat
index fa4cc3b0a6..87609c0184 100644
--- a/tests/disas/winch/aarch64/i32_remu/params.wat
+++ b/tests/disas/winch/aarch64/i32_remu/params.wat
@@ -42,5 +42,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_remu/signed.wat b/tests/disas/winch/aarch64/i32_remu/signed.wat
index 426e5c982e..2683617cbb 100644
--- a/tests/disas/winch/aarch64/i32_remu/signed.wat
+++ b/tests/disas/winch/aarch64/i32_remu/signed.wat
@@ -26,8 +26,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x1, xzr, #0xffffffff
+;; mov x0, #0xffffffff
+;; mov x1, #0xffffffff
;; cbz w0, #0x74
;; 4c: udiv w16, w1, w0
;; msub w1, w0, w16, w1
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_remu/zero_zero.wat b/tests/disas/winch/aarch64/i32_remu/zero_zero.wat
index 6171a826e4..27fdeaa8d4 100644
--- a/tests/disas/winch/aarch64/i32_remu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i32_remu/zero_zero.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotl/16_const.wat b/tests/disas/winch/aarch64/i32_rotl/16_const.wat
index d633ba3963..eb9925098a 100644
--- a/tests/disas/winch/aarch64/i32_rotl/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/16_const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotl/8_const.wat b/tests/disas/winch/aarch64/i32_rotl/8_const.wat
index 40b3e6d62c..acf94f9699 100644
--- a/tests/disas/winch/aarch64/i32_rotl/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotl/locals.wat b/tests/disas/winch/aarch64/i32_rotl/locals.wat
index abd9df83c3..c233229cbd 100644
--- a/tests/disas/winch/aarch64/i32_rotl/locals.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotl/params.wat b/tests/disas/winch/aarch64/i32_rotl/params.wat
index ee64fd4522..f06ebd411a 100644
--- a/tests/disas/winch/aarch64/i32_rotl/params.wat
+++ b/tests/disas/winch/aarch64/i32_rotl/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotr/16_const.wat b/tests/disas/winch/aarch64/i32_rotr/16_const.wat
index 79e295382f..0638eff7d8 100644
--- a/tests/disas/winch/aarch64/i32_rotr/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/16_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotr/8_const.wat b/tests/disas/winch/aarch64/i32_rotr/8_const.wat
index b0b834135b..5a67801eab 100644
--- a/tests/disas/winch/aarch64/i32_rotr/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotr/locals.wat b/tests/disas/winch/aarch64/i32_rotr/locals.wat
index 99e82efeec..2fdda7198e 100644
--- a/tests/disas/winch/aarch64/i32_rotr/locals.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_rotr/params.wat b/tests/disas/winch/aarch64/i32_rotr/params.wat
index 4e69aa80ff..4cec175bd2 100644
--- a/tests/disas/winch/aarch64/i32_rotr/params.wat
+++ b/tests/disas/winch/aarch64/i32_rotr/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shl/16_const.wat b/tests/disas/winch/aarch64/i32_shl/16_const.wat
index 0b804241a0..e6218ae600 100644
--- a/tests/disas/winch/aarch64/i32_shl/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_shl/16_const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shl/8_const.wat b/tests/disas/winch/aarch64/i32_shl/8_const.wat
index 12e842cffd..46fc30821e 100644
--- a/tests/disas/winch/aarch64/i32_shl/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_shl/8_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shl/imm.wat b/tests/disas/winch/aarch64/i32_shl/imm.wat
index 73fc51afc9..e461a08692 100644
--- a/tests/disas/winch/aarch64/i32_shl/imm.wat
+++ b/tests/disas/winch/aarch64/i32_shl/imm.wat
@@ -38,11 +38,11 @@
;; tst w0, w0
;; b.eq #0x60
;; b #0x5c
-;; 5c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 5c: udf #0xc11f
;; add x28, x28, #0x10
;; mov sp, x28
;; mov sp, x28
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shl/locals.wat b/tests/disas/winch/aarch64/i32_shl/locals.wat
index 1500d2e22c..b92bdbdfe6 100644
--- a/tests/disas/winch/aarch64/i32_shl/locals.wat
+++ b/tests/disas/winch/aarch64/i32_shl/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shl/params.wat b/tests/disas/winch/aarch64/i32_shl/params.wat
index f8f367d26d..0a20f2009f 100644
--- a/tests/disas/winch/aarch64/i32_shl/params.wat
+++ b/tests/disas/winch/aarch64/i32_shl/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_s/16_const.wat b/tests/disas/winch/aarch64/i32_shr_s/16_const.wat
index f2b0da3948..cf3223f529 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/16_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_s/8_const.wat b/tests/disas/winch/aarch64/i32_shr_s/8_const.wat
index 8999c2cd2e..a81030e56c 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_s/locals.wat b/tests/disas/winch/aarch64/i32_shr_s/locals.wat
index 1e663d7b9c..5159234813 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_s/params.wat b/tests/disas/winch/aarch64/i32_shr_s/params.wat
index dab7b8e3c4..00fe4e4dd9 100644
--- a/tests/disas/winch/aarch64/i32_shr_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_shr_s/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_u/16_const.wat b/tests/disas/winch/aarch64/i32_shr_u/16_const.wat
index accf5fcd35..8120023842 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/16_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/16_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_u/8_const.wat b/tests/disas/winch/aarch64/i32_shr_u/8_const.wat
index 537e867583..76c9f16a9b 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/8_const.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_u/locals.wat b/tests/disas/winch/aarch64/i32_shr_u/locals.wat
index 85020fb103..e571020dd1 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_shr_u/params.wat b/tests/disas/winch/aarch64/i32_shr_u/params.wat
index 7a039b33c1..3ea69adf6d 100644
--- a/tests/disas/winch/aarch64/i32_shr_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_shr_u/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/const.wat b/tests/disas/winch/aarch64/i32_sub/const.wat
index e6c9153a96..170e593b67 100644
--- a/tests/disas/winch/aarch64/i32_sub/const.wat
+++ b/tests/disas/winch/aarch64/i32_sub/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/locals.wat b/tests/disas/winch/aarch64/i32_sub/locals.wat
index 7010935a8c..e5de81a137 100644
--- a/tests/disas/winch/aarch64/i32_sub/locals.wat
+++ b/tests/disas/winch/aarch64/i32_sub/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/max.wat b/tests/disas/winch/aarch64/i32_sub/max.wat
index 8fd8ab9544..a92e72c261 100644
--- a/tests/disas/winch/aarch64/i32_sub/max.wat
+++ b/tests/disas/winch/aarch64/i32_sub/max.wat
@@ -24,8 +24,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0x7fffffff
-;; orr x16, xzr, #0xffffffff
+;; mov x0, #0x7fffffff
+;; mov x16, #0xffffffff
;; sub w0, w0, w16, uxtx
;; add x28, x28, #0x10
;; mov sp, x28
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/max_one.wat b/tests/disas/winch/aarch64/i32_sub/max_one.wat
index 8fc4e424e1..b77e8af289 100644
--- a/tests/disas/winch/aarch64/i32_sub/max_one.wat
+++ b/tests/disas/winch/aarch64/i32_sub/max_one.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/mixed.wat b/tests/disas/winch/aarch64/i32_sub/mixed.wat
index f2e205bc52..fd88d2d64f 100644
--- a/tests/disas/winch/aarch64/i32_sub/mixed.wat
+++ b/tests/disas/winch/aarch64/i32_sub/mixed.wat
@@ -25,7 +25,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
+;; mov x0, #0xffffffff
;; sub w0, w0, #1
;; add x28, x28, #0x10
;; mov sp, x28
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/params.wat b/tests/disas/winch/aarch64/i32_sub/params.wat
index 95338ca146..f237534dd1 100644
--- a/tests/disas/winch/aarch64/i32_sub/params.wat
+++ b/tests/disas/winch/aarch64/i32_sub/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/signed.wat b/tests/disas/winch/aarch64/i32_sub/signed.wat
index d0e548b5df..beb0c2f2bd 100644
--- a/tests/disas/winch/aarch64/i32_sub/signed.wat
+++ b/tests/disas/winch/aarch64/i32_sub/signed.wat
@@ -25,8 +25,8 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0xffffffff
-;; orr x16, xzr, #0xffffffff
+;; mov x0, #0xffffffff
+;; mov x16, #0xffffffff
;; sub w0, w0, w16, uxtx
;; add x28, x28, #0x10
;; mov sp, x28
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat
index f18bb80af9..4dcb3291f3 100644
--- a/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i32_sub/unsigned_with_zero.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat b/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat
index ebf9a2d5a2..4f4d735a2f 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_s/const.wat
@@ -40,10 +40,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
;; 90: .byte 0x01, 0x00, 0x00, 0xcf
-;; 94: .byte 0x00, 0x00, 0x00, 0x00
+;; 94: udf #0
;; 98: .byte 0x00, 0x00, 0x00, 0x4f
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat
index 5a9e6442a8..13688e2bb3 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_s/locals.wat
@@ -46,10 +46,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
;; a0: .byte 0x01, 0x00, 0x00, 0xcf
-;; a4: .byte 0x00, 0x00, 0x00, 0x00
+;; a4: udf #0
;; a8: .byte 0x00, 0x00, 0x00, 0x4f
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat b/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat
index c34416ac06..952bfc6c56 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_s/params.wat
@@ -43,11 +43,11 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
;; a0: .byte 0x01, 0x00, 0x00, 0xcf
-;; a4: .byte 0x00, 0x00, 0x00, 0x00
+;; a4: udf #0
;; a8: .byte 0x00, 0x00, 0x00, 0x4f
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat b/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat
index 6d106f1b4c..763c3cd0b5 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_u/const.wat
@@ -40,8 +40,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x00, 0x00, 0x80, 0x4f
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
+;; 90: fmlal v0.4s, v0.4h, v0.h[0]
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat
index 6eeadd567f..6bca16f17b 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_u/locals.wat
@@ -46,8 +46,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; a0: .byte 0x00, 0x00, 0x80, 0x4f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
+;; a0: fmlal v0.4s, v0.4h, v0.h[0]
diff --git a/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat b/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat
index 5393be570f..50b2af51fe 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f32_u/params.wat
@@ -43,9 +43,9 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
-;; a0: .byte 0x00, 0x00, 0x80, 0x4f
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
+;; a0: fmlal v0.4s, v0.4h, v0.h[0]
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat b/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat
index ce7afbcb9f..4ef07ae769 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_s/const.wat
@@ -40,11 +40,11 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
;; 90: .byte 0x00, 0x00, 0x20, 0x00
;; 94: .byte 0x00, 0x00, 0xe0, 0xc1
-;; 98: .byte 0x00, 0x00, 0x00, 0x00
+;; 98: udf #0
;; 9c: .byte 0x00, 0x00, 0xe0, 0x41
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat
index 9eef21a359..755fc6da34 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_s/locals.wat
@@ -46,11 +46,11 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
;; a0: .byte 0x00, 0x00, 0x20, 0x00
;; a4: .byte 0x00, 0x00, 0xe0, 0xc1
-;; a8: .byte 0x00, 0x00, 0x00, 0x00
+;; a8: udf #0
;; ac: .byte 0x00, 0x00, 0xe0, 0x41
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat b/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat
index 8c457bc508..70fdf4ae95 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_s/params.wat
@@ -43,12 +43,12 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
;; a0: .byte 0x00, 0x00, 0x20, 0x00
;; a4: .byte 0x00, 0x00, 0xe0, 0xc1
-;; a8: .byte 0x00, 0x00, 0x00, 0x00
+;; a8: udf #0
;; ac: .byte 0x00, 0x00, 0xe0, 0x41
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat b/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat
index 829855d2f7..c5837b1311 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_u/const.wat
@@ -40,9 +40,9 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
+;; 90: udf #0
;; 94: .byte 0x00, 0x00, 0xf0, 0x41
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat b/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat
index 0b5e47c400..e33cd9aa88 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_u/locals.wat
@@ -46,9 +46,9 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; a0: .byte 0x00, 0x00, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
+;; a0: udf #0
;; a4: .byte 0x00, 0x00, 0xf0, 0x41
diff --git a/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat b/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat
index 6cfda95fc1..b76a63b5f0 100644
--- a/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat
+++ b/tests/disas/winch/aarch64/i32_trunc_f64_u/params.wat
@@ -43,10 +43,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
-;; a0: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
+;; a0: udf #0
;; a4: .byte 0x00, 0x00, 0xf0, 0x41
diff --git a/tests/disas/winch/aarch64/i32_wrap_i64/const.wat b/tests/disas/winch/aarch64/i32_wrap_i64/const.wat
index 5d069064b3..b3a645b869 100644
--- a/tests/disas/winch/aarch64/i32_wrap_i64/const.wat
+++ b/tests/disas/winch/aarch64/i32_wrap_i64/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat b/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat
index 522ff2903f..366d9eb232 100644
--- a/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat
+++ b/tests/disas/winch/aarch64/i32_wrap_i64/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_wrap_i64/params.wat b/tests/disas/winch/aarch64/i32_wrap_i64/params.wat
index c585fffd4a..e82beea4ce 100644
--- a/tests/disas/winch/aarch64/i32_wrap_i64/params.wat
+++ b/tests/disas/winch/aarch64/i32_wrap_i64/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_xor/const.wat b/tests/disas/winch/aarch64/i32_xor/const.wat
index 3b60d0a6a6..28a1a92462 100644
--- a/tests/disas/winch/aarch64/i32_xor/const.wat
+++ b/tests/disas/winch/aarch64/i32_xor/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_xor/locals.wat b/tests/disas/winch/aarch64/i32_xor/locals.wat
index 49bf429f7f..bcf4a18a0a 100644
--- a/tests/disas/winch/aarch64/i32_xor/locals.wat
+++ b/tests/disas/winch/aarch64/i32_xor/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i32_xor/params.wat b/tests/disas/winch/aarch64/i32_xor/params.wat
index 6e33101f0e..043b2f5ee0 100644
--- a/tests/disas/winch/aarch64/i32_xor/params.wat
+++ b/tests/disas/winch/aarch64/i32_xor/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/const.wat b/tests/disas/winch/aarch64/i64_add/const.wat
index 7a87822547..102d30ecd4 100644
--- a/tests/disas/winch/aarch64/i64_add/const.wat
+++ b/tests/disas/winch/aarch64/i64_add/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/locals.wat b/tests/disas/winch/aarch64/i64_add/locals.wat
index d6b45a1b26..11b9197d8d 100644
--- a/tests/disas/winch/aarch64/i64_add/locals.wat
+++ b/tests/disas/winch/aarch64/i64_add/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/max.wat b/tests/disas/winch/aarch64/i64_add/max.wat
index 7c24f1faa4..60f084557c 100644
--- a/tests/disas/winch/aarch64/i64_add/max.wat
+++ b/tests/disas/winch/aarch64/i64_add/max.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/max_one.wat b/tests/disas/winch/aarch64/i64_add/max_one.wat
index e300fe7f93..f7db38aa15 100644
--- a/tests/disas/winch/aarch64/i64_add/max_one.wat
+++ b/tests/disas/winch/aarch64/i64_add/max_one.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/mixed.wat b/tests/disas/winch/aarch64/i64_add/mixed.wat
index d43bdc3cbe..923a4fbd37 100644
--- a/tests/disas/winch/aarch64/i64_add/mixed.wat
+++ b/tests/disas/winch/aarch64/i64_add/mixed.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/params.wat b/tests/disas/winch/aarch64/i64_add/params.wat
index 96da5ef96b..9de34de365 100644
--- a/tests/disas/winch/aarch64/i64_add/params.wat
+++ b/tests/disas/winch/aarch64/i64_add/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/signed.wat b/tests/disas/winch/aarch64/i64_add/signed.wat
index de0023bedc..89f6eff45e 100644
--- a/tests/disas/winch/aarch64/i64_add/signed.wat
+++ b/tests/disas/winch/aarch64/i64_add/signed.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat
index 021c2c1245..5bff617a7d 100644
--- a/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i64_add/unsigned_with_zero.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add128/const.wat b/tests/disas/winch/aarch64/i64_add128/const.wat
index 7b1ab3bd9f..81d9bc78e8 100644
--- a/tests/disas/winch/aarch64/i64_add128/const.wat
+++ b/tests/disas/winch/aarch64/i64_add128/const.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 98: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add128/locals.wat b/tests/disas/winch/aarch64/i64_add128/locals.wat
index 85960de188..aa4c103128 100644
--- a/tests/disas/winch/aarch64/i64_add128/locals.wat
+++ b/tests/disas/winch/aarch64/i64_add128/locals.wat
@@ -77,4 +77,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; cc: .byte 0x1f, 0xc1, 0x00, 0x00
+;; cc: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_add128/params.wat b/tests/disas/winch/aarch64/i64_add128/params.wat
index 3a47eb5263..5c1a3cfa26 100644
--- a/tests/disas/winch/aarch64/i64_add128/params.wat
+++ b/tests/disas/winch/aarch64/i64_add128/params.wat
@@ -54,4 +54,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; a8: .byte 0x1f, 0xc1, 0x00, 0x00
+;; a8: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_and/32_const.wat b/tests/disas/winch/aarch64/i64_and/32_const.wat
index 13bb0be7c4..701317a5ff 100644
--- a/tests/disas/winch/aarch64/i64_and/32_const.wat
+++ b/tests/disas/winch/aarch64/i64_and/32_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_and/64_const.wat b/tests/disas/winch/aarch64/i64_and/64_const.wat
index c66edf9569..0936cc9eea 100644
--- a/tests/disas/winch/aarch64/i64_and/64_const.wat
+++ b/tests/disas/winch/aarch64/i64_and/64_const.wat
@@ -25,7 +25,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0x7ffffffffffffffe
+;; mov x0, #0x7ffffffffffffffe
;; and x0, x0, #0x7fffffffffffffff
;; add x28, x28, #0x10
;; mov sp, x28
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_and/locals.wat b/tests/disas/winch/aarch64/i64_and/locals.wat
index 680c356afd..d52dd6c837 100644
--- a/tests/disas/winch/aarch64/i64_and/locals.wat
+++ b/tests/disas/winch/aarch64/i64_and/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_and/params.wat b/tests/disas/winch/aarch64/i64_and/params.wat
index a8361585e6..45510bcfd5 100644
--- a/tests/disas/winch/aarch64/i64_and/params.wat
+++ b/tests/disas/winch/aarch64/i64_and/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_clz/const.wat b/tests/disas/winch/aarch64/i64_clz/const.wat
index 4eca4fa20b..572c33c535 100644
--- a/tests/disas/winch/aarch64/i64_clz/const.wat
+++ b/tests/disas/winch/aarch64/i64_clz/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_clz/locals.wat b/tests/disas/winch/aarch64/i64_clz/locals.wat
index 15d465cfdb..af061a5d65 100644
--- a/tests/disas/winch/aarch64/i64_clz/locals.wat
+++ b/tests/disas/winch/aarch64/i64_clz/locals.wat
@@ -39,4 +39,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_clz/params.wat b/tests/disas/winch/aarch64/i64_clz/params.wat
index c80661babf..daa41809c8 100644
--- a/tests/disas/winch/aarch64/i64_clz/params.wat
+++ b/tests/disas/winch/aarch64/i64_clz/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ctz/const.wat b/tests/disas/winch/aarch64/i64_ctz/const.wat
index 115f5056b9..4ba0dc2c5f 100644
--- a/tests/disas/winch/aarch64/i64_ctz/const.wat
+++ b/tests/disas/winch/aarch64/i64_ctz/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ctz/locals.wat b/tests/disas/winch/aarch64/i64_ctz/locals.wat
index 46d0809af5..ff500a861f 100644
--- a/tests/disas/winch/aarch64/i64_ctz/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ctz/locals.wat
@@ -40,4 +40,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ctz/params.wat b/tests/disas/winch/aarch64/i64_ctz/params.wat
index 101e22e68b..f0d1be9317 100644
--- a/tests/disas/winch/aarch64/i64_ctz/params.wat
+++ b/tests/disas/winch/aarch64/i64_ctz/params.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divs/const.wat b/tests/disas/winch/aarch64/i64_divs/const.wat
index 6bf83a04b7..a473f0bf3f 100644
--- a/tests/disas/winch/aarch64/i64_divs/const.wat
+++ b/tests/disas/winch/aarch64/i64_divs/const.wat
@@ -40,6 +40,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divs/one_zero.wat b/tests/disas/winch/aarch64/i64_divs/one_zero.wat
index 29d7a30e69..db2e8b8eda 100644
--- a/tests/disas/winch/aarch64/i64_divs/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divs/one_zero.wat
@@ -40,6 +40,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divs/overflow.wat b/tests/disas/winch/aarch64/i64_divs/overflow.wat
index cb06665e9a..1c42d8b3d8 100644
--- a/tests/disas/winch/aarch64/i64_divs/overflow.wat
+++ b/tests/disas/winch/aarch64/i64_divs/overflow.wat
@@ -40,6 +40,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divs/params.wat b/tests/disas/winch/aarch64/i64_divs/params.wat
index c695f861f6..ab5e3cb5b5 100644
--- a/tests/disas/winch/aarch64/i64_divs/params.wat
+++ b/tests/disas/winch/aarch64/i64_divs/params.wat
@@ -42,6 +42,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divs/zero_zero.wat b/tests/disas/winch/aarch64/i64_divs/zero_zero.wat
index 6431cf9bd8..dafbd375db 100644
--- a/tests/disas/winch/aarch64/i64_divs/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divs/zero_zero.wat
@@ -40,6 +40,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
+;; 80: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divu/const.wat b/tests/disas/winch/aarch64/i64_divu/const.wat
index 1599193c17..57f9fbe9a6 100644
--- a/tests/disas/winch/aarch64/i64_divu/const.wat
+++ b/tests/disas/winch/aarch64/i64_divu/const.wat
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divu/one_zero.wat b/tests/disas/winch/aarch64/i64_divu/one_zero.wat
index 58d5a774ab..531df6c988 100644
--- a/tests/disas/winch/aarch64/i64_divu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divu/one_zero.wat
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divu/params.wat b/tests/disas/winch/aarch64/i64_divu/params.wat
index 8b96163519..b193a3c18e 100644
--- a/tests/disas/winch/aarch64/i64_divu/params.wat
+++ b/tests/disas/winch/aarch64/i64_divu/params.wat
@@ -39,5 +39,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divu/signed.wat b/tests/disas/winch/aarch64/i64_divu/signed.wat
index f69396c285..9fbb9cdfb9 100644
--- a/tests/disas/winch/aarch64/i64_divu/signed.wat
+++ b/tests/disas/winch/aarch64/i64_divu/signed.wat
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_divu/zero_zero.wat b/tests/disas/winch/aarch64/i64_divu/zero_zero.wat
index 215ae5e9a8..5491c71483 100644
--- a/tests/disas/winch/aarch64/i64_divu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_divu/zero_zero.wat
@@ -37,5 +37,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_eq/const.wat b/tests/disas/winch/aarch64/i64_eq/const.wat
index cbff73646a..f7b1aa30f8 100644
--- a/tests/disas/winch/aarch64/i64_eq/const.wat
+++ b/tests/disas/winch/aarch64/i64_eq/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_eq/locals.wat b/tests/disas/winch/aarch64/i64_eq/locals.wat
index debeda91e3..8e928d05d7 100644
--- a/tests/disas/winch/aarch64/i64_eq/locals.wat
+++ b/tests/disas/winch/aarch64/i64_eq/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_eq/params.wat b/tests/disas/winch/aarch64/i64_eq/params.wat
index 3cd8e99c51..8653b96ec8 100644
--- a/tests/disas/winch/aarch64/i64_eq/params.wat
+++ b/tests/disas/winch/aarch64/i64_eq/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_16_s/const.wat b/tests/disas/winch/aarch64/i64_extend_16_s/const.wat
index ee8dab0a1b..3487fd32d4 100644
--- a/tests/disas/winch/aarch64/i64_extend_16_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_16_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat
index ed28aae583..8e5b25d09e 100644
--- a/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_16_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_16_s/params.wat b/tests/disas/winch/aarch64/i64_extend_16_s/params.wat
index 902d8a8cd4..cf9b62565f 100644
--- a/tests/disas/winch/aarch64/i64_extend_16_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_16_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_32_s/const.wat b/tests/disas/winch/aarch64/i64_extend_32_s/const.wat
index b894f80d9b..4d002c4676 100644
--- a/tests/disas/winch/aarch64/i64_extend_32_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_32_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat
index 1e07b09249..47ceb283ee 100644
--- a/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_32_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_32_s/params.wat b/tests/disas/winch/aarch64/i64_extend_32_s/params.wat
index 592faba89f..a5d2276ae3 100644
--- a/tests/disas/winch/aarch64/i64_extend_32_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_32_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_8_s/const.wat b/tests/disas/winch/aarch64/i64_extend_8_s/const.wat
index 389c457c7e..a46396f9c9 100644
--- a/tests/disas/winch/aarch64/i64_extend_8_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_8_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat
index 28a580528c..98e65d44be 100644
--- a/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_8_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_8_s/params.wat b/tests/disas/winch/aarch64/i64_extend_8_s/params.wat
index 2da23a407d..790e61809c 100644
--- a/tests/disas/winch/aarch64/i64_extend_8_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_8_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat b/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat
index 613d589b1e..4f1d256996 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_s/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat b/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat
index a91670b875..0b5cacb67b 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_s/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat b/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat
index 12a4636316..df4690a40b 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_s/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat b/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat
index dab891e592..2bf439af39 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_u/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat b/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat
index a2cfa0a4ab..000c8fcf2d 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_u/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat b/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat
index 9adc9b2c23..d4f8cca15e 100644
--- a/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_extend_i32_u/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ge_s/const.wat b/tests/disas/winch/aarch64/i64_ge_s/const.wat
index b5fd369b4d..ddba548901 100644
--- a/tests/disas/winch/aarch64/i64_ge_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_ge_s/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ge_s/locals.wat b/tests/disas/winch/aarch64/i64_ge_s/locals.wat
index 837ead01d4..8d12f808f9 100644
--- a/tests/disas/winch/aarch64/i64_ge_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ge_s/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ge_s/params.wat b/tests/disas/winch/aarch64/i64_ge_s/params.wat
index 6a55394f20..7943a27543 100644
--- a/tests/disas/winch/aarch64/i64_ge_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_ge_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ge_u/const.wat b/tests/disas/winch/aarch64/i64_ge_u/const.wat
index c16e907b31..335541feb5 100644
--- a/tests/disas/winch/aarch64/i64_ge_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_ge_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ge_u/locals.wat b/tests/disas/winch/aarch64/i64_ge_u/locals.wat
index 4d35ad5a15..024bb2f3d6 100644
--- a/tests/disas/winch/aarch64/i64_ge_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ge_u/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ge_u/params.wat b/tests/disas/winch/aarch64/i64_ge_u/params.wat
index dd174c386b..d1b3dbae91 100644
--- a/tests/disas/winch/aarch64/i64_ge_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_ge_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_gt_s/const.wat b/tests/disas/winch/aarch64/i64_gt_s/const.wat
index 4a8f318515..9299ea60b6 100644
--- a/tests/disas/winch/aarch64/i64_gt_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_gt_s/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_gt_s/locals.wat b/tests/disas/winch/aarch64/i64_gt_s/locals.wat
index 2e00b60d1d..10fcff1406 100644
--- a/tests/disas/winch/aarch64/i64_gt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_gt_s/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_gt_s/params.wat b/tests/disas/winch/aarch64/i64_gt_s/params.wat
index dde0ca2769..309e9a4973 100644
--- a/tests/disas/winch/aarch64/i64_gt_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_gt_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_gt_u/const.wat b/tests/disas/winch/aarch64/i64_gt_u/const.wat
index c7fdba5ff2..5d475e8f57 100644
--- a/tests/disas/winch/aarch64/i64_gt_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_gt_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_gt_u/locals.wat b/tests/disas/winch/aarch64/i64_gt_u/locals.wat
index e0f6ef7cec..ec10a5845a 100644
--- a/tests/disas/winch/aarch64/i64_gt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_gt_u/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_gt_u/params.wat b/tests/disas/winch/aarch64/i64_gt_u/params.wat
index 582b12d017..8175904e61 100644
--- a/tests/disas/winch/aarch64/i64_gt_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_gt_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_le_s/const.wat b/tests/disas/winch/aarch64/i64_le_s/const.wat
index b62b32b7eb..37927ff9c8 100644
--- a/tests/disas/winch/aarch64/i64_le_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_le_s/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_le_s/locals.wat b/tests/disas/winch/aarch64/i64_le_s/locals.wat
index 2e84df6e1e..b56de390de 100644
--- a/tests/disas/winch/aarch64/i64_le_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_le_s/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_le_s/params.wat b/tests/disas/winch/aarch64/i64_le_s/params.wat
index 8a097664f5..4627650a9d 100644
--- a/tests/disas/winch/aarch64/i64_le_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_le_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_le_u/const.wat b/tests/disas/winch/aarch64/i64_le_u/const.wat
index 6943d33118..c20894d828 100644
--- a/tests/disas/winch/aarch64/i64_le_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_le_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_le_u/locals.wat b/tests/disas/winch/aarch64/i64_le_u/locals.wat
index e64aeadbf0..5ae9fc75e2 100644
--- a/tests/disas/winch/aarch64/i64_le_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_le_u/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_le_u/params.wat b/tests/disas/winch/aarch64/i64_le_u/params.wat
index d38f117a86..0fed7f35b8 100644
--- a/tests/disas/winch/aarch64/i64_le_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_le_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_lt_s/const.wat b/tests/disas/winch/aarch64/i64_lt_s/const.wat
index afd811389c..e5d3e902f2 100644
--- a/tests/disas/winch/aarch64/i64_lt_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_lt_s/const.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_lt_s/locals.wat b/tests/disas/winch/aarch64/i64_lt_s/locals.wat
index efeb0d5e04..0698084a83 100644
--- a/tests/disas/winch/aarch64/i64_lt_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_lt_s/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_lt_s/params.wat b/tests/disas/winch/aarch64/i64_lt_s/params.wat
index 636b8a83be..03d54d22d1 100644
--- a/tests/disas/winch/aarch64/i64_lt_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_lt_s/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_lt_u/const.wat b/tests/disas/winch/aarch64/i64_lt_u/const.wat
index a4d85254a3..402498df33 100644
--- a/tests/disas/winch/aarch64/i64_lt_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_lt_u/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_lt_u/locals.wat b/tests/disas/winch/aarch64/i64_lt_u/locals.wat
index eb5da4f3d0..7eda9a772b 100644
--- a/tests/disas/winch/aarch64/i64_lt_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_lt_u/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_lt_u/params.wat b/tests/disas/winch/aarch64/i64_lt_u/params.wat
index 9ea854ded3..232cc9eb0b 100644
--- a/tests/disas/winch/aarch64/i64_lt_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_lt_u/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/const.wat b/tests/disas/winch/aarch64/i64_mul/const.wat
index 6afa709bd5..12a7d9f945 100644
--- a/tests/disas/winch/aarch64/i64_mul/const.wat
+++ b/tests/disas/winch/aarch64/i64_mul/const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/locals.wat b/tests/disas/winch/aarch64/i64_mul/locals.wat
index 33f60a23ad..de6ad80030 100644
--- a/tests/disas/winch/aarch64/i64_mul/locals.wat
+++ b/tests/disas/winch/aarch64/i64_mul/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/max.wat b/tests/disas/winch/aarch64/i64_mul/max.wat
index bd78df5af2..865d07733c 100644
--- a/tests/disas/winch/aarch64/i64_mul/max.wat
+++ b/tests/disas/winch/aarch64/i64_mul/max.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/max_one.wat b/tests/disas/winch/aarch64/i64_mul/max_one.wat
index de2cba7194..7fc0d1c6d5 100644
--- a/tests/disas/winch/aarch64/i64_mul/max_one.wat
+++ b/tests/disas/winch/aarch64/i64_mul/max_one.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/mixed.wat b/tests/disas/winch/aarch64/i64_mul/mixed.wat
index dcc654b947..60fd1cb98d 100644
--- a/tests/disas/winch/aarch64/i64_mul/mixed.wat
+++ b/tests/disas/winch/aarch64/i64_mul/mixed.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/params.wat b/tests/disas/winch/aarch64/i64_mul/params.wat
index 7a4d732d0a..771250cac3 100644
--- a/tests/disas/winch/aarch64/i64_mul/params.wat
+++ b/tests/disas/winch/aarch64/i64_mul/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/signed.wat b/tests/disas/winch/aarch64/i64_mul/signed.wat
index cf4f07bdd5..7fdbf9957a 100644
--- a/tests/disas/winch/aarch64/i64_mul/signed.wat
+++ b/tests/disas/winch/aarch64/i64_mul/signed.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat
index 8686ecee04..584e922261 100644
--- a/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i64_mul/unsigned_with_zero.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul_wide_s/const.wat b/tests/disas/winch/aarch64/i64_mul_wide_s/const.wat
index 5e2ec8f954..75ef79057f 100644
--- a/tests/disas/winch/aarch64/i64_mul_wide_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_mul_wide_s/const.wat
@@ -46,4 +46,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul_wide_s/locals.wat b/tests/disas/winch/aarch64/i64_mul_wide_s/locals.wat
index 652ffba3bd..762d188cbe 100644
--- a/tests/disas/winch/aarch64/i64_mul_wide_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_mul_wide_s/locals.wat
@@ -61,4 +61,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; ac: .byte 0x1f, 0xc1, 0x00, 0x00
+;; ac: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul_wide_s/params.wat b/tests/disas/winch/aarch64/i64_mul_wide_s/params.wat
index 0e8bb4e13b..8eebdf5d9d 100644
--- a/tests/disas/winch/aarch64/i64_mul_wide_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_mul_wide_s/params.wat
@@ -48,4 +48,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 98: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul_wide_u/const.wat b/tests/disas/winch/aarch64/i64_mul_wide_u/const.wat
index 86132188cf..209d9b965f 100644
--- a/tests/disas/winch/aarch64/i64_mul_wide_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_mul_wide_u/const.wat
@@ -46,4 +46,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul_wide_u/locals.wat b/tests/disas/winch/aarch64/i64_mul_wide_u/locals.wat
index e903a75fc2..727f970fa1 100644
--- a/tests/disas/winch/aarch64/i64_mul_wide_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_mul_wide_u/locals.wat
@@ -61,4 +61,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; ac: .byte 0x1f, 0xc1, 0x00, 0x00
+;; ac: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_mul_wide_u/params.wat b/tests/disas/winch/aarch64/i64_mul_wide_u/params.wat
index 86a42dabb1..6b859e8564 100644
--- a/tests/disas/winch/aarch64/i64_mul_wide_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_mul_wide_u/params.wat
@@ -48,4 +48,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 98: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ne/const.wat b/tests/disas/winch/aarch64/i64_ne/const.wat
index 707e9d9b2b..a7adea9252 100644
--- a/tests/disas/winch/aarch64/i64_ne/const.wat
+++ b/tests/disas/winch/aarch64/i64_ne/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ne/locals.wat b/tests/disas/winch/aarch64/i64_ne/locals.wat
index be347fd98f..7ea216c426 100644
--- a/tests/disas/winch/aarch64/i64_ne/locals.wat
+++ b/tests/disas/winch/aarch64/i64_ne/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_ne/params.wat b/tests/disas/winch/aarch64/i64_ne/params.wat
index d248596bc7..a53e0350ba 100644
--- a/tests/disas/winch/aarch64/i64_ne/params.wat
+++ b/tests/disas/winch/aarch64/i64_ne/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_or/32_const.wat b/tests/disas/winch/aarch64/i64_or/32_const.wat
index 7a57ab96b7..a114f3be7a 100644
--- a/tests/disas/winch/aarch64/i64_or/32_const.wat
+++ b/tests/disas/winch/aarch64/i64_or/32_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_or/64_const.wat b/tests/disas/winch/aarch64/i64_or/64_const.wat
index f8beaa7677..a03d45ba58 100644
--- a/tests/disas/winch/aarch64/i64_or/64_const.wat
+++ b/tests/disas/winch/aarch64/i64_or/64_const.wat
@@ -25,7 +25,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0x7ffffffffffffffe
+;; mov x0, #0x7ffffffffffffffe
;; orr x0, x0, #0x7fffffffffffffff
;; add x28, x28, #0x10
;; mov sp, x28
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_or/locals.wat b/tests/disas/winch/aarch64/i64_or/locals.wat
index b2697566ec..7d97918638 100644
--- a/tests/disas/winch/aarch64/i64_or/locals.wat
+++ b/tests/disas/winch/aarch64/i64_or/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_or/params.wat b/tests/disas/winch/aarch64/i64_or/params.wat
index 43d37cfb02..345f9f2733 100644
--- a/tests/disas/winch/aarch64/i64_or/params.wat
+++ b/tests/disas/winch/aarch64/i64_or/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_popcnt/const.wat b/tests/disas/winch/aarch64/i64_popcnt/const.wat
index 1f448e0d7b..48004afb7f 100644
--- a/tests/disas/winch/aarch64/i64_popcnt/const.wat
+++ b/tests/disas/winch/aarch64/i64_popcnt/const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_popcnt/reg.wat b/tests/disas/winch/aarch64/i64_popcnt/reg.wat
index 418b40ab04..4e9b62e897 100644
--- a/tests/disas/winch/aarch64/i64_popcnt/reg.wat
+++ b/tests/disas/winch/aarch64/i64_popcnt/reg.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat
index 38ba69cafe..0decd85f73 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/const.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat
index 98b468e998..e904bd3d69 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/locals.wat
@@ -36,4 +36,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat
index b9dfc8db84..e27d91ff99 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/params.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat b/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat
index 7b11e04a47..cc487b589e 100644
--- a/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat
+++ b/tests/disas/winch/aarch64/i64_reinterpret_f64/ret_float.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rems/const.wat b/tests/disas/winch/aarch64/i64_rems/const.wat
index c14f538bbd..8eda0b34d9 100644
--- a/tests/disas/winch/aarch64/i64_rems/const.wat
+++ b/tests/disas/winch/aarch64/i64_rems/const.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rems/one_zero.wat b/tests/disas/winch/aarch64/i64_rems/one_zero.wat
index aa5532a4af..2588838c96 100644
--- a/tests/disas/winch/aarch64/i64_rems/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_rems/one_zero.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rems/overflow.wat b/tests/disas/winch/aarch64/i64_rems/overflow.wat
index 41db5285b2..0eaddad5e8 100644
--- a/tests/disas/winch/aarch64/i64_rems/overflow.wat
+++ b/tests/disas/winch/aarch64/i64_rems/overflow.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rems/params.wat b/tests/disas/winch/aarch64/i64_rems/params.wat
index 4f55c6a5bc..dbd7d098b6 100644
--- a/tests/disas/winch/aarch64/i64_rems/params.wat
+++ b/tests/disas/winch/aarch64/i64_rems/params.wat
@@ -40,5 +40,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rems/zero_zero.wat b/tests/disas/winch/aarch64/i64_rems/zero_zero.wat
index e5d5abc910..094b91cb88 100644
--- a/tests/disas/winch/aarch64/i64_rems/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_rems/zero_zero.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_remu/const.wat b/tests/disas/winch/aarch64/i64_remu/const.wat
index 63c5ce8e18..e3c10f5fee 100644
--- a/tests/disas/winch/aarch64/i64_remu/const.wat
+++ b/tests/disas/winch/aarch64/i64_remu/const.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_remu/one_zero.wat b/tests/disas/winch/aarch64/i64_remu/one_zero.wat
index c803b8f9d6..46f6ca87f6 100644
--- a/tests/disas/winch/aarch64/i64_remu/one_zero.wat
+++ b/tests/disas/winch/aarch64/i64_remu/one_zero.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_remu/params.wat b/tests/disas/winch/aarch64/i64_remu/params.wat
index 184469344a..228e28cacc 100644
--- a/tests/disas/winch/aarch64/i64_remu/params.wat
+++ b/tests/disas/winch/aarch64/i64_remu/params.wat
@@ -40,5 +40,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 7c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
+;; 7c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_remu/signed.wat b/tests/disas/winch/aarch64/i64_remu/signed.wat
index c2e1b4e592..64c633319b 100644
--- a/tests/disas/winch/aarch64/i64_remu/signed.wat
+++ b/tests/disas/winch/aarch64/i64_remu/signed.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_remu/zero_zero.wat b/tests/disas/winch/aarch64/i64_remu/zero_zero.wat
index 44cb640797..e8b753d72c 100644
--- a/tests/disas/winch/aarch64/i64_remu/zero_zero.wat
+++ b/tests/disas/winch/aarch64/i64_remu/zero_zero.wat
@@ -38,5 +38,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotl/16_const.wat b/tests/disas/winch/aarch64/i64_rotl/16_const.wat
index 1a64e44c6f..6ba4f1b2b4 100644
--- a/tests/disas/winch/aarch64/i64_rotl/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/16_const.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotl/8_const.wat b/tests/disas/winch/aarch64/i64_rotl/8_const.wat
index 2ec42f63d0..e7c365fecf 100644
--- a/tests/disas/winch/aarch64/i64_rotl/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotl/locals.wat b/tests/disas/winch/aarch64/i64_rotl/locals.wat
index 719407f249..afe7551560 100644
--- a/tests/disas/winch/aarch64/i64_rotl/locals.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/locals.wat
@@ -52,4 +52,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 88: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotl/params.wat b/tests/disas/winch/aarch64/i64_rotl/params.wat
index 0328e75533..9af86f7f4b 100644
--- a/tests/disas/winch/aarch64/i64_rotl/params.wat
+++ b/tests/disas/winch/aarch64/i64_rotl/params.wat
@@ -38,4 +38,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotr/16_const.wat b/tests/disas/winch/aarch64/i64_rotr/16_const.wat
index 3897f019f2..30615964a7 100644
--- a/tests/disas/winch/aarch64/i64_rotr/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/16_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotr/8_const.wat b/tests/disas/winch/aarch64/i64_rotr/8_const.wat
index 85e58e0126..e75e137821 100644
--- a/tests/disas/winch/aarch64/i64_rotr/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotr/locals.wat b/tests/disas/winch/aarch64/i64_rotr/locals.wat
index b6d0b0a150..7814ee3ec5 100644
--- a/tests/disas/winch/aarch64/i64_rotr/locals.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_rotr/params.wat b/tests/disas/winch/aarch64/i64_rotr/params.wat
index 89f71a7308..acdae7783f 100644
--- a/tests/disas/winch/aarch64/i64_rotr/params.wat
+++ b/tests/disas/winch/aarch64/i64_rotr/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shl/16_const.wat b/tests/disas/winch/aarch64/i64_shl/16_const.wat
index 3bc9fbaac5..7e2b7dca8c 100644
--- a/tests/disas/winch/aarch64/i64_shl/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_shl/16_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shl/8_const.wat b/tests/disas/winch/aarch64/i64_shl/8_const.wat
index 492458e2d2..33624f6402 100644
--- a/tests/disas/winch/aarch64/i64_shl/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_shl/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shl/imm.wat b/tests/disas/winch/aarch64/i64_shl/imm.wat
index 78664a0b5d..3ef058814b 100644
--- a/tests/disas/winch/aarch64/i64_shl/imm.wat
+++ b/tests/disas/winch/aarch64/i64_shl/imm.wat
@@ -38,11 +38,11 @@
;; tst w0, w0
;; b.eq #0x60
;; b #0x5c
-;; 5c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 5c: udf #0xc11f
;; add x28, x28, #0x10
;; mov sp, x28
;; mov sp, x28
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 78: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 78: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shl/locals.wat b/tests/disas/winch/aarch64/i64_shl/locals.wat
index ec46eb7b1e..5746339cd7 100644
--- a/tests/disas/winch/aarch64/i64_shl/locals.wat
+++ b/tests/disas/winch/aarch64/i64_shl/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shl/params.wat b/tests/disas/winch/aarch64/i64_shl/params.wat
index c19e6735a6..948d8f6361 100644
--- a/tests/disas/winch/aarch64/i64_shl/params.wat
+++ b/tests/disas/winch/aarch64/i64_shl/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_s/16_const.wat b/tests/disas/winch/aarch64/i64_shr_s/16_const.wat
index 61694a9e83..8b330a7235 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/16_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_s/8_const.wat b/tests/disas/winch/aarch64/i64_shr_s/8_const.wat
index 32486c291d..5f71d5e503 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_s/locals.wat b/tests/disas/winch/aarch64/i64_shr_s/locals.wat
index adf8f0c175..80c561af51 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_s/params.wat b/tests/disas/winch/aarch64/i64_shr_s/params.wat
index 7fbfefd5cd..26d365b09b 100644
--- a/tests/disas/winch/aarch64/i64_shr_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_shr_s/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_u/16_const.wat b/tests/disas/winch/aarch64/i64_shr_u/16_const.wat
index e38857c3f8..953059471d 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/16_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/16_const.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_u/8_const.wat b/tests/disas/winch/aarch64/i64_shr_u/8_const.wat
index 4d8af6ee8a..05443b2058 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/8_const.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/8_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_u/locals.wat b/tests/disas/winch/aarch64/i64_shr_u/locals.wat
index 18264acadc..79c440498e 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_shr_u/params.wat b/tests/disas/winch/aarch64/i64_shr_u/params.wat
index 8b571550f0..171e66896a 100644
--- a/tests/disas/winch/aarch64/i64_shr_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_shr_u/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/const.wat b/tests/disas/winch/aarch64/i64_sub/const.wat
index b143fb7280..506efd919c 100644
--- a/tests/disas/winch/aarch64/i64_sub/const.wat
+++ b/tests/disas/winch/aarch64/i64_sub/const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/locals.wat b/tests/disas/winch/aarch64/i64_sub/locals.wat
index 5ed7746a73..31c1954fed 100644
--- a/tests/disas/winch/aarch64/i64_sub/locals.wat
+++ b/tests/disas/winch/aarch64/i64_sub/locals.wat
@@ -51,4 +51,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/max.wat b/tests/disas/winch/aarch64/i64_sub/max.wat
index 78735eb275..eeb5eb55c7 100644
--- a/tests/disas/winch/aarch64/i64_sub/max.wat
+++ b/tests/disas/winch/aarch64/i64_sub/max.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/max_one.wat b/tests/disas/winch/aarch64/i64_sub/max_one.wat
index 9868db628e..bc35fbdc23 100644
--- a/tests/disas/winch/aarch64/i64_sub/max_one.wat
+++ b/tests/disas/winch/aarch64/i64_sub/max_one.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/mixed.wat b/tests/disas/winch/aarch64/i64_sub/mixed.wat
index 41f9dcf2ed..0b09e0a098 100644
--- a/tests/disas/winch/aarch64/i64_sub/mixed.wat
+++ b/tests/disas/winch/aarch64/i64_sub/mixed.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/params.wat b/tests/disas/winch/aarch64/i64_sub/params.wat
index b8685defbf..f1c7957fd3 100644
--- a/tests/disas/winch/aarch64/i64_sub/params.wat
+++ b/tests/disas/winch/aarch64/i64_sub/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/signed.wat b/tests/disas/winch/aarch64/i64_sub/signed.wat
index 7b4198147f..8646e2d6e9 100644
--- a/tests/disas/winch/aarch64/i64_sub/signed.wat
+++ b/tests/disas/winch/aarch64/i64_sub/signed.wat
@@ -34,4 +34,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 64: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 64: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat b/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat
index e9340ea223..2616a22bef 100644
--- a/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat
+++ b/tests/disas/winch/aarch64/i64_sub/unsigned_with_zero.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub128/const.wat b/tests/disas/winch/aarch64/i64_sub128/const.wat
index 5850fd3521..f82c87a34e 100644
--- a/tests/disas/winch/aarch64/i64_sub128/const.wat
+++ b/tests/disas/winch/aarch64/i64_sub128/const.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 98: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub128/locals.wat b/tests/disas/winch/aarch64/i64_sub128/locals.wat
index 2659dde6cd..c4c72772b7 100644
--- a/tests/disas/winch/aarch64/i64_sub128/locals.wat
+++ b/tests/disas/winch/aarch64/i64_sub128/locals.wat
@@ -77,4 +77,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; cc: .byte 0x1f, 0xc1, 0x00, 0x00
+;; cc: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_sub128/params.wat b/tests/disas/winch/aarch64/i64_sub128/params.wat
index f7ccb59775..4a1cd9e9db 100644
--- a/tests/disas/winch/aarch64/i64_sub128/params.wat
+++ b/tests/disas/winch/aarch64/i64_sub128/params.wat
@@ -54,4 +54,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; a8: .byte 0x1f, 0xc1, 0x00, 0x00
+;; a8: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat b/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat
index a8cf0c3866..e14528b2e7 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_s/const.wat
@@ -40,10 +40,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
;; 90: .byte 0x01, 0x00, 0x00, 0xdf
-;; 94: .byte 0x00, 0x00, 0x00, 0x00
+;; 94: udf #0
;; 98: .byte 0x00, 0x00, 0x00, 0x5f
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat
index e2a4a4166f..7d36d60071 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_s/locals.wat
@@ -46,10 +46,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
;; a0: .byte 0x01, 0x00, 0x00, 0xdf
-;; a4: .byte 0x00, 0x00, 0x00, 0x00
+;; a4: udf #0
;; a8: .byte 0x00, 0x00, 0x00, 0x5f
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat b/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat
index 631ebb0873..d0372028e0 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_s/params.wat
@@ -43,11 +43,11 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
;; a0: .byte 0x01, 0x00, 0x00, 0xdf
-;; a4: .byte 0x00, 0x00, 0x00, 0x00
+;; a4: udf #0
;; a8: .byte 0x00, 0x00, 0x00, 0x5f
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat b/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat
index 55fe4928bd..1598802cb1 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_u/const.wat
@@ -40,8 +40,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
;; 90: .byte 0x00, 0x00, 0x80, 0x5f
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat
index 6b17af10e8..08a8bd3659 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_u/locals.wat
@@ -46,8 +46,8 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
;; a0: .byte 0x00, 0x00, 0x80, 0x5f
diff --git a/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat b/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat
index 9c1caa2ac6..c610c0f26f 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f32_u/params.wat
@@ -43,9 +43,9 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
;; a0: .byte 0x00, 0x00, 0x80, 0x5f
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat b/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat
index 678744c809..29c8b6061f 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_s/const.wat
@@ -40,11 +40,11 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x01, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
+;; 90: udf #1
;; 94: .byte 0x00, 0x00, 0xe0, 0xc3
-;; 98: .byte 0x00, 0x00, 0x00, 0x00
+;; 98: udf #0
;; 9c: .byte 0x00, 0x00, 0xe0, 0x43
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat
index b1d374b396..f1388b5ea5 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_s/locals.wat
@@ -46,11 +46,11 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; a0: .byte 0x01, 0x00, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
+;; a0: udf #1
;; a4: .byte 0x00, 0x00, 0xe0, 0xc3
-;; a8: .byte 0x00, 0x00, 0x00, 0x00
+;; a8: udf #0
;; ac: .byte 0x00, 0x00, 0xe0, 0x43
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat b/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat
index c4a129aebb..d2b08fc6ed 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_s/params.wat
@@ -43,12 +43,12 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
-;; a0: .byte 0x01, 0x00, 0x00, 0x00
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
+;; a0: udf #1
;; a4: .byte 0x00, 0x00, 0xe0, 0xc3
-;; a8: .byte 0x00, 0x00, 0x00, 0x00
+;; a8: udf #0
;; ac: .byte 0x00, 0x00, 0xe0, 0x43
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat b/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat
index abc55dd39c..bbd70652f3 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_u/const.wat
@@ -40,9 +40,9 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 80: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 88: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x00, 0x00, 0x00, 0x00
+;; 80: udf #0xc11f
+;; 84: udf #0xc11f
+;; 88: udf #0xc11f
+;; 8c: udf #0xc11f
+;; 90: udf #0
;; 94: .byte 0x00, 0x00, 0xf0, 0x43
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat b/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat
index 92ec10ddc3..57650d46e3 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_u/locals.wat
@@ -46,9 +46,9 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; a0: .byte 0x00, 0x00, 0x00, 0x00
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0xc11f
+;; a0: udf #0
;; a4: .byte 0x00, 0x00, 0xf0, 0x43
diff --git a/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat b/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat
index 86deab44bc..9d90577e37 100644
--- a/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat
+++ b/tests/disas/winch/aarch64/i64_trunc_f64_u/params.wat
@@ -43,10 +43,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 94: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 98: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 9c: .byte 0x00, 0x00, 0x00, 0x00
-;; a0: .byte 0x00, 0x00, 0x00, 0x00
+;; 8c: udf #0xc11f
+;; 90: udf #0xc11f
+;; 94: udf #0xc11f
+;; 98: udf #0xc11f
+;; 9c: udf #0
+;; a0: udf #0
;; a4: .byte 0x00, 0x00, 0xf0, 0x43
diff --git a/tests/disas/winch/aarch64/i64_xor/32_const.wat b/tests/disas/winch/aarch64/i64_xor/32_const.wat
index 902847d8fd..ad6a589ee6 100644
--- a/tests/disas/winch/aarch64/i64_xor/32_const.wat
+++ b/tests/disas/winch/aarch64/i64_xor/32_const.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_xor/64_const.wat b/tests/disas/winch/aarch64/i64_xor/64_const.wat
index 9d5c102eb0..e4ebb3a367 100644
--- a/tests/disas/winch/aarch64/i64_xor/64_const.wat
+++ b/tests/disas/winch/aarch64/i64_xor/64_const.wat
@@ -25,7 +25,7 @@
;; mov sp, x28
;; stur x0, [x28, #8]
;; stur x1, [x28]
-;; orr x0, xzr, #0x7ffffffffffffffe
+;; mov x0, #0x7ffffffffffffffe
;; eor x0, x0, #0x7fffffffffffffff
;; add x28, x28, #0x10
;; mov sp, x28
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 60: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 60: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_xor/locals.wat b/tests/disas/winch/aarch64/i64_xor/locals.wat
index 1e1b152390..1128d8a063 100644
--- a/tests/disas/winch/aarch64/i64_xor/locals.wat
+++ b/tests/disas/winch/aarch64/i64_xor/locals.wat
@@ -50,4 +50,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 84: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 84: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/i64_xor/params.wat b/tests/disas/winch/aarch64/i64_xor/params.wat
index 0f5aafe868..a7f49ff933 100644
--- a/tests/disas/winch/aarch64/i64_xor/params.wat
+++ b/tests/disas/winch/aarch64/i64_xor/params.wat
@@ -37,4 +37,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 70: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 70: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/load/dynamic_heap.wat b/tests/disas/winch/aarch64/load/dynamic_heap.wat
index 6e884275c6..c827bd2c01 100644
--- a/tests/disas/winch/aarch64/load/dynamic_heap.wat
+++ b/tests/disas/winch/aarch64/load/dynamic_heap.wat
@@ -76,7 +76,7 @@
;; b.hi #0x168
;; d8: ldur x5, [x9, #0x38]
;; add x5, x5, w2, uxtw
-;; orr x16, xzr, #0xfffff
+;; mov x16, #0xfffff
;; add x5, x5, x16, uxtx
;; mov x6, #0
;; cmp x4, x3, uxtx
@@ -104,10 +104,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 150: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 154: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 158: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 15c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 160: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 164: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 168: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 150: udf #0xc11f
+;; 154: udf #0xc11f
+;; 158: udf #0xc11f
+;; 15c: udf #0xc11f
+;; 160: udf #0xc11f
+;; 164: udf #0xc11f
+;; 168: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/load/f32.wat b/tests/disas/winch/aarch64/load/f32.wat
index 29b8e2dcc8..3ee254c039 100644
--- a/tests/disas/winch/aarch64/load/f32.wat
+++ b/tests/disas/winch/aarch64/load/f32.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/load/f64.wat b/tests/disas/winch/aarch64/load/f64.wat
index ad5fc6a743..2062d38ade 100644
--- a/tests/disas/winch/aarch64/load/f64.wat
+++ b/tests/disas/winch/aarch64/load/f64.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/load/i32.wat b/tests/disas/winch/aarch64/load/i32.wat
index fccf976b36..9f5352c77b 100644
--- a/tests/disas/winch/aarch64/load/i32.wat
+++ b/tests/disas/winch/aarch64/load/i32.wat
@@ -33,4 +33,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 68: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 68: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/load/i64.wat b/tests/disas/winch/aarch64/load/i64.wat
index 999906081a..fdac97c768 100644
--- a/tests/disas/winch/aarch64/load/i64.wat
+++ b/tests/disas/winch/aarch64/load/i64.wat
@@ -44,4 +44,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 90: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 90: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/memory_offsets/index.wat b/tests/disas/winch/aarch64/memory_offsets/index.wat
index d727a3bb3c..a87638f4dc 100644
--- a/tests/disas/winch/aarch64/memory_offsets/index.wat
+++ b/tests/disas/winch/aarch64/memory_offsets/index.wat
@@ -1097,7 +1097,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 8a8: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 8a8: udf #0xc11f
;;
;; wasm[0]::function[1]:
;; stp x29, x30, [sp, #-0x10]!
@@ -1211,10 +1211,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; a7c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; a80: .byte 0x00, 0x00, 0x00, 0x00
-;; a84: .byte 0x00, 0x00, 0x00, 0x00
-;; a88: .byte 0x00, 0x00, 0x00, 0x00
+;; a7c: udf #0xc11f
+;; a80: udf #0
+;; a84: udf #0
+;; a88: udf #0
;;
;; wasm[0]::function[2]:
;; stp x29, x30, [sp, #-0x10]!
@@ -1328,7 +1328,7 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; c5c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; c60: .byte 0x00, 0x00, 0x00, 0x00
-;; c64: .byte 0x00, 0x00, 0x00, 0x00
-;; c68: .byte 0x00, 0x00, 0x00, 0x00
+;; c5c: udf #0xc11f
+;; c60: udf #0
+;; c64: udf #0
+;; c68: udf #0
diff --git a/tests/disas/winch/aarch64/nop/nop.wat b/tests/disas/winch/aarch64/nop/nop.wat
index 1e9044b10c..e92726cacd 100644
--- a/tests/disas/winch/aarch64/nop/nop.wat
+++ b/tests/disas/winch/aarch64/nop/nop.wat
@@ -29,4 +29,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 58: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 58: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/params/400_params.wat b/tests/disas/winch/aarch64/params/400_params.wat
index 2c19f60171..5e72929bc6 100644
--- a/tests/disas/winch/aarch64/params/400_params.wat
+++ b/tests/disas/winch/aarch64/params/400_params.wat
@@ -79,4 +79,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 74: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 74: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/params/multi_values.wat b/tests/disas/winch/aarch64/params/multi_values.wat
index 0c0b36c691..dc7f8d1e15 100644
--- a/tests/disas/winch/aarch64/params/multi_values.wat
+++ b/tests/disas/winch/aarch64/params/multi_values.wat
@@ -63,4 +63,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; d4: .byte 0x1f, 0xc1, 0x00, 0x00
+;; d4: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/store/dynamic_heap.wat b/tests/disas/winch/aarch64/store/dynamic_heap.wat
index c2be4e9701..fbdd29e2cc 100644
--- a/tests/disas/winch/aarch64/store/dynamic_heap.wat
+++ b/tests/disas/winch/aarch64/store/dynamic_heap.wat
@@ -81,7 +81,7 @@
;; b.hi #0x13c
;; ec: ldur x4, [x9, #0x38]
;; add x4, x4, w1, uxtw
-;; orr x16, xzr, #0xfffff
+;; mov x16, #0xfffff
;; add x4, x4, x16, uxtx
;; mov x5, #0
;; cmp x3, x2, uxtx
@@ -93,10 +93,10 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 124: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 128: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 12c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 130: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 134: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 138: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 13c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 124: udf #0xc11f
+;; 128: udf #0xc11f
+;; 12c: udf #0xc11f
+;; 130: udf #0xc11f
+;; 134: udf #0xc11f
+;; 138: udf #0xc11f
+;; 13c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/store/f32.wat b/tests/disas/winch/aarch64/store/f32.wat
index 8717dd199f..bd1a0b2b29 100644
--- a/tests/disas/winch/aarch64/store/f32.wat
+++ b/tests/disas/winch/aarch64/store/f32.wat
@@ -33,5 +33,5 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
;; 70: .byte 0x00, 0x00, 0xa0, 0x7f
diff --git a/tests/disas/winch/aarch64/store/f64.wat b/tests/disas/winch/aarch64/store/f64.wat
index 70bdd13d9f..747d650d0f 100644
--- a/tests/disas/winch/aarch64/store/f64.wat
+++ b/tests/disas/winch/aarch64/store/f64.wat
@@ -34,6 +34,6 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
-;; 70: .byte 0x00, 0x00, 0x00, 0x00
+;; 6c: udf #0xc11f
+;; 70: udf #0
;; 74: .byte 0x00, 0x00, 0xf4, 0x7f
diff --git a/tests/disas/winch/aarch64/store/i32.wat b/tests/disas/winch/aarch64/store/i32.wat
index d5ab1b9587..ce49529717 100644
--- a/tests/disas/winch/aarch64/store/i32.wat
+++ b/tests/disas/winch/aarch64/store/i32.wat
@@ -35,4 +35,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 6c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 6c: udf #0xc11f
diff --git a/tests/disas/winch/aarch64/store/i64.wat b/tests/disas/winch/aarch64/store/i64.wat
index 66eeacb443..900585b6e9 100644
--- a/tests/disas/winch/aarch64/store/i64.wat
+++ b/tests/disas/winch/aarch64/store/i64.wat
@@ -32,4 +32,4 @@
;; ldr x28, [sp], #0x10
;; ldp x29, x30, [sp], #0x10
;; ret
-;; 5c: .byte 0x1f, 0xc1, 0x00, 0x00
+;; 5c: udf #0xc11f