aboutsummaryrefslogtreecommitdiff
path: root/test/MC/Disassembler
diff options
context:
space:
mode:
Diffstat (limited to 'test/MC/Disassembler')
-rw-r--r--test/MC/Disassembler/AArch64/arm64-scalar-fp.txt69
-rw-r--r--test/MC/Disassembler/AArch64/armv8.1a-pan.txt2
-rw-r--r--test/MC/Disassembler/AArch64/armv8.2a-at.txt9
-rw-r--r--test/MC/Disassembler/AArch64/armv8.2a-mmfr2.txt4
-rw-r--r--test/MC/Disassembler/AArch64/armv8.2a-persistent-memory.txt6
-rw-r--r--test/MC/Disassembler/AArch64/armv8.2a-statistical-profiling.txt87
-rw-r--r--test/MC/Disassembler/AArch64/armv8.2a-uao.txt19
-rw-r--r--test/MC/Disassembler/AArch64/basic-a64-instructions.txt116
-rw-r--r--test/MC/Disassembler/AArch64/fullfp16-neg.txt145
-rw-r--r--test/MC/Disassembler/AArch64/fullfp16-neon-neg.txt382
-rw-r--r--test/MC/Disassembler/ARM/fullfp16-neon-arm-neg.txt274
-rw-r--r--test/MC/Disassembler/ARM/fullfp16-neon-arm.txt309
-rw-r--r--test/MC/Disassembler/ARM/fullfp16-neon-thumb-neg.txt274
-rw-r--r--test/MC/Disassembler/ARM/fullfp16-neon-thumb.txt309
-rw-r--r--test/MC/Disassembler/ARM/invalid-thumbv7.txt23
-rw-r--r--test/MC/Disassembler/ARM/thumb-v8.txt10
-rw-r--r--test/MC/Disassembler/Hexagon/invalid_packet.txt4
-rw-r--r--test/MC/Disassembler/Hexagon/j.txt148
-rw-r--r--test/MC/Disassembler/Hexagon/ld.txt90
-rw-r--r--test/MC/Disassembler/Hexagon/lit.local.cfg6
-rw-r--r--test/MC/Disassembler/Hexagon/nv_j.txt88
-rw-r--r--test/MC/Disassembler/Hexagon/nv_st.txt127
-rw-r--r--test/MC/Disassembler/Hexagon/st.txt84
-rw-r--r--test/MC/Disassembler/Hexagon/too_many_instructions.txt4
-rw-r--r--test/MC/Disassembler/Hexagon/too_many_loop_ends.txt4
-rw-r--r--test/MC/Disassembler/Hexagon/unextendable.txt9
-rw-r--r--test/MC/Disassembler/Mips/dsp/valid-el.txt12
-rw-r--r--test/MC/Disassembler/Mips/dsp/valid.txt125
-rw-r--r--test/MC/Disassembler/Mips/dspr2/valid.txt173
-rw-r--r--test/MC/Disassembler/Mips/eva/valid_R6-eva.txt38
-rw-r--r--test/MC/Disassembler/Mips/eva/valid_preR6-eva.txt54
-rw-r--r--test/MC/Disassembler/Mips/micromips-dsp/valid.txt103
-rw-r--r--test/MC/Disassembler/Mips/micromips-dspr2/valid.txt125
-rw-r--r--test/MC/Disassembler/Mips/micromips32r3/invalid.txt4
-rw-r--r--test/MC/Disassembler/Mips/micromips32r3/valid-el.txt (renamed from test/MC/Disassembler/Mips/micromips_le.txt)295
-rw-r--r--test/MC/Disassembler/Mips/micromips32r3/valid.txt (renamed from test/MC/Disassembler/Mips/micromips.txt)301
-rw-r--r--test/MC/Disassembler/Mips/micromips32r6.txt114
-rw-r--r--test/MC/Disassembler/Mips/micromips32r6/valid.txt258
-rw-r--r--test/MC/Disassembler/Mips/micromips64r6/valid.txt171
-rw-r--r--test/MC/Disassembler/Mips/mips-dsp.txt22
-rw-r--r--test/MC/Disassembler/Mips/mips1/invalid-xfail.txt11
-rw-r--r--test/MC/Disassembler/Mips/mips1/invalid.txt45
-rw-r--r--test/MC/Disassembler/Mips/mips1/valid-mips1-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips1/valid-mips1.txt5
-rw-r--r--test/MC/Disassembler/Mips/mips1/valid-xfail.txt8
-rw-r--r--test/MC/Disassembler/Mips/mips2/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips2/valid-mips2.txt20
-rw-r--r--test/MC/Disassembler/Mips/mips2/valid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips3/invalid-xfail.txt14
-rw-r--r--test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips3/valid-mips3.txt25
-rw-r--r--test/MC/Disassembler/Mips/mips3/valid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32/valid-mips32-el.txt11
-rw-r--r--test/MC/Disassembler/Mips/mips32/valid-mips32.txt180
-rw-r--r--test/MC/Disassembler/Mips/mips32/valid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32_le.txt450
-rw-r--r--test/MC/Disassembler/Mips/mips32r2/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32r2/valid-mips32r2-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt195
-rw-r--r--test/MC/Disassembler/Mips/mips32r2/valid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32r2_le.txt459
-rw-r--r--test/MC/Disassembler/Mips/mips32r3/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt197
-rw-r--r--test/MC/Disassembler/Mips/mips32r3/valid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32r5/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt198
-rw-r--r--test/MC/Disassembler/Mips/mips32r5/valid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt3
-rw-r--r--test/MC/Disassembler/Mips/mips4/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips4/valid-mips4.txt29
-rw-r--r--test/MC/Disassembler/Mips/mips4/valid-xfail.txt16
-rw-r--r--test/MC/Disassembler/Mips/mips64/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips64/valid-mips64-el.txt30
-rw-r--r--test/MC/Disassembler/Mips/mips64/valid-mips64.txt193
-rw-r--r--test/MC/Disassembler/Mips/mips64/valid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips64_le.txt84
-rw-r--r--test/MC/Disassembler/Mips/mips64r2/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips64r2/valid-mips64r2-el.txt32
-rw-r--r--test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt212
-rw-r--r--test/MC/Disassembler/Mips/mips64r2/valid-xfail.txt14
-rw-r--r--test/MC/Disassembler/Mips/mips64r2_le.txt90
-rw-r--r--test/MC/Disassembler/Mips/mips64r3/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips64r3/valid-mips64r3-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt243
-rw-r--r--test/MC/Disassembler/Mips/mips64r3/valid-xfail.txt14
-rw-r--r--test/MC/Disassembler/Mips/mips64r5/invalid-xfail.txt13
-rw-r--r--test/MC/Disassembler/Mips/mips64r5/valid-mips64r5-el.txt2
-rw-r--r--test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt244
-rw-r--r--test/MC/Disassembler/Mips/mips64r5/valid-xfail.txt14
-rw-r--r--test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt6
-rw-r--r--test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt7
-rw-r--r--test/MC/Disassembler/Mips/msa/test_elm.txt1
-rw-r--r--test/MC/Disassembler/Mips/msa/test_elm_msa64.txt5
-rw-r--r--test/MC/Disassembler/PowerPC/ppc64-encoding.txt4
-rw-r--r--test/MC/Disassembler/PowerPC/ppc64le-encoding.txt4
-rw-r--r--test/MC/Disassembler/PowerPC/vsx.txt12
-rw-r--r--test/MC/Disassembler/Sparc/sparc-mem.txt24
-rw-r--r--test/MC/Disassembler/Sparc/sparc-v9.txt4
-rw-r--r--test/MC/Disassembler/SystemZ/insns.txt74
-rw-r--r--test/MC/Disassembler/X86/x86-64.txt111
104 files changed, 6038 insertions, 1884 deletions
diff --git a/test/MC/Disassembler/AArch64/arm64-scalar-fp.txt b/test/MC/Disassembler/AArch64/arm64-scalar-fp.txt
index f139700164ca..c536721f3466 100644
--- a/test/MC/Disassembler/AArch64/arm64-scalar-fp.txt
+++ b/test/MC/Disassembler/AArch64/arm64-scalar-fp.txt
@@ -1,98 +1,131 @@
# RUN: llvm-mc -triple arm64-apple-darwin -mattr=neon --disassemble -output-asm-variant=1 < %s | FileCheck %s
+# RUN: llvm-mc -triple arm64-apple-darwin -mattr=neon,v8.2a,fullfp16 --disassemble -output-asm-variant=1 < %s | FileCheck %s --check-prefix=CHECK --check-prefix=FP16
#-----------------------------------------------------------------------------
# Floating-point arithmetic
#-----------------------------------------------------------------------------
+0x41 0xc0 0xe0 0x1e
0x41 0xc0 0x20 0x1e
0x41 0xc0 0x60 0x1e
+# FP16: fabs h1, h2
# CHECK: fabs s1, s2
# CHECK: fabs d1, d2
+0x41 0x28 0xe3 0x1e
0x41 0x28 0x23 0x1e
0x41 0x28 0x63 0x1e
+# FP16: fadd h1, h2, h3
# CHECK: fadd s1, s2, s3
# CHECK: fadd d1, d2, d3
+0x41 0x18 0xe3 0x1e
0x41 0x18 0x23 0x1e
0x41 0x18 0x63 0x1e
+# FP16: fdiv h1, h2, h3
# CHECK: fdiv s1, s2, s3
# CHECK: fdiv d1, d2, d3
+0x41 0x10 0xc3 0x1f
0x41 0x10 0x03 0x1f
0x41 0x10 0x43 0x1f
+# FP16: fmadd h1, h2, h3, h4
# CHECK: fmadd s1, s2, s3, s4
# CHECK: fmadd d1, d2, d3, d4
+0x41 0x48 0xe3 0x1e
0x41 0x48 0x23 0x1e
0x41 0x48 0x63 0x1e
+0x41 0x68 0xe3 0x1e
0x41 0x68 0x23 0x1e
0x41 0x68 0x63 0x1e
+# FP16: fmax h1, h2, h3
# CHECK: fmax s1, s2, s3
# CHECK: fmax d1, d2, d3
+# FP16: fmaxnm h1, h2, h3
# CHECK: fmaxnm s1, s2, s3
# CHECK: fmaxnm d1, d2, d3
+0x41 0x58 0xe3 0x1e
0x41 0x58 0x23 0x1e
0x41 0x58 0x63 0x1e
+0x41 0x78 0xe3 0x1e
0x41 0x78 0x23 0x1e
0x41 0x78 0x63 0x1e
+# FP16: fmin h1, h2, h3
# CHECK: fmin s1, s2, s3
# CHECK: fmin d1, d2, d3
+# FP16: fminnm h1, h2, h3
# CHECK: fminnm s1, s2, s3
# CHECK: fminnm d1, d2, d3
+0x41 0x90 0xc3 0x1f
0x41 0x90 0x03 0x1f
0x41 0x90 0x43 0x1f
+# FP16: fmsub h1, h2, h3, h4
# CHECK: fmsub s1, s2, s3, s4
# CHECK: fmsub d1, d2, d3, d4
+0x41 0x08 0xe3 0x1e
0x41 0x08 0x23 0x1e
0x41 0x08 0x63 0x1e
+# FP16: fmul h1, h2, h3
# CHECK: fmul s1, s2, s3
# CHECK: fmul d1, d2, d3
+0x41 0x40 0xe1 0x1e
0x41 0x40 0x21 0x1e
0x41 0x40 0x61 0x1e
+# FP16: fneg h1, h2
# CHECK: fneg s1, s2
# CHECK: fneg d1, d2
+0x41 0x10 0xe3 0x1f
0x41 0x10 0x23 0x1f
0x41 0x10 0x63 0x1f
+# FP16: fnmadd h1, h2, h3, h4
# CHECK: fnmadd s1, s2, s3, s4
# CHECK: fnmadd d1, d2, d3, d4
+0x41 0x90 0xe3 0x1f
0x41 0x90 0x23 0x1f
0x41 0x90 0x63 0x1f
+# FP16: fnmsub h1, h2, h3, h4
# CHECK: fnmsub s1, s2, s3, s4
# CHECK: fnmsub d1, d2, d3, d4
+0x41 0x88 0xe3 0x1e
0x41 0x88 0x23 0x1e
0x41 0x88 0x63 0x1e
+# FP16: fnmul h1, h2, h3
# CHECK: fnmul s1, s2, s3
# CHECK: fnmul d1, d2, d3
+0x41 0xc0 0xe1 0x1e
0x41 0xc0 0x21 0x1e
0x41 0xc0 0x61 0x1e
+# FP16: fsqrt h1, h2
# CHECK: fsqrt s1, s2
# CHECK: fsqrt d1, d2
+0x41 0x38 0xe3 0x1e
0x41 0x38 0x23 0x1e
0x41 0x38 0x63 0x1e
+# FP16: fsub h1, h2, h3
# CHECK: fsub s1, s2, s3
# CHECK: fsub d1, d2, d3
@@ -100,31 +133,43 @@
# Floating-point comparison
#-----------------------------------------------------------------------------
+0x20 0x04 0xe2 0x1e
0x20 0x04 0x22 0x1e
0x20 0x04 0x62 0x1e
+0x30 0x04 0xe2 0x1e
0x30 0x04 0x22 0x1e
0x30 0x04 0x62 0x1e
+# FP16: fccmp h1, h2, #0, eq
# CHECK: fccmp s1, s2, #0, eq
# CHECK: fccmp d1, d2, #0, eq
+# FP16: fccmpe h1, h2, #0, eq
# CHECK: fccmpe s1, s2, #0, eq
# CHECK: fccmpe d1, d2, #0, eq
+0x20 0x20 0xe2 0x1e
0x20 0x20 0x22 0x1e
0x20 0x20 0x62 0x1e
+0x28 0x20 0xe0 0x1e
0x28 0x20 0x20 0x1e
0x28 0x20 0x60 0x1e
+0x30 0x20 0xe2 0x1e
0x30 0x20 0x22 0x1e
0x30 0x20 0x62 0x1e
+0x38 0x20 0xe0 0x1e
0x38 0x20 0x20 0x1e
0x38 0x20 0x60 0x1e
+# FP16: fcmp h1, h2
# CHECK: fcmp s1, s2
# CHECK: fcmp d1, d2
+# FP16: fcmp h1, #0.0
# CHECK: fcmp s1, #0.0
# CHECK: fcmp d1, #0.0
+# FP16: fcmpe h1, h2
# CHECK: fcmpe s1, s2
# CHECK: fcmpe d1, d2
+# FP16: fcmpe h1, #0.0
# CHECK: fcmpe s1, #0.0
# CHECK: fcmpe d1, #0.0
@@ -132,9 +177,11 @@
# Floating-point conditional select
#-----------------------------------------------------------------------------
+0x41 0x0c 0xe3 0x1e
0x41 0x0c 0x23 0x1e
0x41 0x0c 0x63 0x1e
+# FP16: fcsel h1, h2, h3, eq
# CHECK: fcsel s1, s2, s3, eq
# CHECK: fcsel d1, d2, d3, eq
@@ -169,29 +216,37 @@
# Floating-point move
#-----------------------------------------------------------------------------
+0x41 0x00 0xe7 0x1e
+0x41 0x00 0xe6 0x1e
0x41 0x00 0x27 0x1e
0x41 0x00 0x26 0x1e
0x41 0x00 0x67 0x9e
0x41 0x00 0x66 0x9e
+# FP16: fmov h1, w2
+# FP16: fmov w1, h2
# CHECK: fmov s1, w2
# CHECK: fmov w1, s2
# CHECK: fmov d1, x2
# CHECK: fmov x1, d2
+0x01 0x10 0xe8 0x1e
0x01 0x10 0x28 0x1e
0x01 0x10 0x68 0x1e
0x01 0xf0 0x7b 0x1e
0x01 0xf0 0x6b 0x1e
+# FP16: fmov h1, #0.12500000
# CHECK: fmov s1, #0.12500000
# CHECK: fmov d1, #0.12500000
# CHECK: fmov d1, #-0.48437500
# CHECK: fmov d1, #0.48437500
+0x41 0x40 0xe0 0x1e
0x41 0x40 0x20 0x1e
0x41 0x40 0x60 0x1e
+# FP16: fmov h1, h2
# CHECK: fmov s1, s2
# CHECK: fmov d1, d2
@@ -199,45 +254,59 @@
# Floating-point round to integral
#-----------------------------------------------------------------------------
+0x41 0x40 0xe6 0x1e
0x41 0x40 0x26 0x1e
0x41 0x40 0x66 0x1e
+# FP16: frinta h1, h2
# CHECK: frinta s1, s2
# CHECK: frinta d1, d2
+0x41 0xc0 0xe7 0x1e
0x41 0xc0 0x27 0x1e
0x41 0xc0 0x67 0x1e
+# FP16: frinti h1, h2
# CHECK: frinti s1, s2
# CHECK: frinti d1, d2
+0x41 0x40 0xe5 0x1e
0x41 0x40 0x25 0x1e
0x41 0x40 0x65 0x1e
+# FP16: frintm h1, h2
# CHECK: frintm s1, s2
# CHECK: frintm d1, d2
+0x41 0x40 0xe4 0x1e
0x41 0x40 0x24 0x1e
0x41 0x40 0x64 0x1e
+# FP16: frintn h1, h2
# CHECK: frintn s1, s2
# CHECK: frintn d1, d2
+0x41 0xc0 0xe4 0x1e
0x41 0xc0 0x24 0x1e
0x41 0xc0 0x64 0x1e
+# FP16: frintp h1, h2
# CHECK: frintp s1, s2
# CHECK: frintp d1, d2
+0x41 0x40 0xe7 0x1e
0x41 0x40 0x27 0x1e
0x41 0x40 0x67 0x1e
+# FP16: frintx h1, h2
# CHECK: frintx s1, s2
# CHECK: frintx d1, d2
+0x41 0xc0 0xe5 0x1e
0x41 0xc0 0x25 0x1e
0x41 0xc0 0x65 0x1e
+# FP16: frintz h1, h2
# CHECK: frintz s1, s2
# CHECK: frintz d1, d2
diff --git a/test/MC/Disassembler/AArch64/armv8.1a-pan.txt b/test/MC/Disassembler/AArch64/armv8.1a-pan.txt
index 2af5c2aa21ef..22dc5fd58948 100644
--- a/test/MC/Disassembler/AArch64/armv8.1a-pan.txt
+++ b/test/MC/Disassembler/AArch64/armv8.1a-pan.txt
@@ -2,9 +2,11 @@
0x9f,0x40,0x00,0xd5
0x9f,0x41,0x00,0xd5
+0x9f,0x42,0x00,0xd5
0x65,0x42,0x18,0xd5
0x6d,0x42,0x38,0xd5
# CHECK: msr PAN, #0
# CHECK: msr PAN, #1
+# CHECK-NOT: msr PAN, #2
# CHECK: msr PAN, x5
# CHECK: mrs x13, PAN
diff --git a/test/MC/Disassembler/AArch64/armv8.2a-at.txt b/test/MC/Disassembler/AArch64/armv8.2a-at.txt
new file mode 100644
index 000000000000..81841f2c1302
--- /dev/null
+++ b/test/MC/Disassembler/AArch64/armv8.2a-at.txt
@@ -0,0 +1,9 @@
+# RUN: llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8.2a --disassemble < %s | FileCheck %s
+# RUN: llvm-mc -triple aarch64-none-linux-gnu -mattr=-v8.2a --disassemble < %s | FileCheck %s --check-prefix=NO_V82
+
+[0x01,0x79,0x08,0xd5]
+[0x22,0x79,0x08,0xd5]
+# CHECK: at s1e1rp, x1
+# CHECK: at s1e1wp, x2
+# NO_V82: sys #0, c7, c9, #0, x1
+# NO_V82: sys #0, c7, c9, #1, x2
diff --git a/test/MC/Disassembler/AArch64/armv8.2a-mmfr2.txt b/test/MC/Disassembler/AArch64/armv8.2a-mmfr2.txt
new file mode 100644
index 000000000000..071412672b16
--- /dev/null
+++ b/test/MC/Disassembler/AArch64/armv8.2a-mmfr2.txt
@@ -0,0 +1,4 @@
+# RUN: llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8.2a --disassemble < %s | FileCheck %s
+
+[0x43,0x07,0x38,0xd5]
+# CHECK: mrs x3, ID_AA64MMFR2_EL1
diff --git a/test/MC/Disassembler/AArch64/armv8.2a-persistent-memory.txt b/test/MC/Disassembler/AArch64/armv8.2a-persistent-memory.txt
new file mode 100644
index 000000000000..58f1f81d83e2
--- /dev/null
+++ b/test/MC/Disassembler/AArch64/armv8.2a-persistent-memory.txt
@@ -0,0 +1,6 @@
+# RUN: llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8.2a --disassemble < %s | FileCheck %s
+# RUN: llvm-mc -triple aarch64-none-linux-gnu --disassemble < %s | FileCheck --check-prefix=NO_V82 %s
+
+[0x27,0x7c,0x0b,0xd5]
+# CHECK: dc cvap, x7
+# NO_V82: sys #3, c7, c12, #1, x7
diff --git a/test/MC/Disassembler/AArch64/armv8.2a-statistical-profiling.txt b/test/MC/Disassembler/AArch64/armv8.2a-statistical-profiling.txt
new file mode 100644
index 000000000000..217424cc46e0
--- /dev/null
+++ b/test/MC/Disassembler/AArch64/armv8.2a-statistical-profiling.txt
@@ -0,0 +1,87 @@
+# RUN: llvm-mc -triple aarch64-none-linux-gnu -mattr=+spe --disassemble < %s | FileCheck %s
+# RUN: llvm-mc -triple aarch64-none-linux-gnu --disassemble < %s | FileCheck --check-prefix=NO_SPE %s
+
+[0x3f,0x22,0x03,0xd5]
+# CHECK: psb csync
+# NO_SPE: hint #0x11
+
+[0x00,0x9a,0x18,0xd5]
+[0x20,0x9a,0x18,0xd5]
+[0x60,0x9a,0x18,0xd5]
+[0xe0,0x9a,0x18,0xd5]
+[0x00,0x99,0x1c,0xd5]
+[0x00,0x99,0x1d,0xd5]
+[0x00,0x99,0x18,0xd5]
+[0x40,0x99,0x18,0xd5]
+[0x60,0x99,0x18,0xd5]
+[0x80,0x99,0x18,0xd5]
+[0xa0,0x99,0x18,0xd5]
+[0xc0,0x99,0x18,0xd5]
+[0xe0,0x99,0x18,0xd5]
+# CHECK: msr PMBLIMITR_EL1, x0
+# NO_SPE: msr S3_0_C9_C10_0, x0
+# CHECK: msr PMBPTR_EL1, x0
+# NO_SPE: msr S3_0_C9_C10_1, x0
+# CHECK: msr PMBSR_EL1, x0
+# NO_SPE: msr S3_0_C9_C10_3, x0
+# CHECK: msr PMBIDR_EL1, x0
+# NO_SPE: msr S3_0_C9_C10_7, x0
+# CHECK: msr PMSCR_EL2, x0
+# NO_SPE: msr S3_4_C9_C9_0, x0
+# CHECK: msr PMSCR_EL12, x0
+# NO_SPE: msr S3_5_C9_C9_0, x0
+# CHECK: msr PMSCR_EL1, x0
+# NO_SPE: msr S3_0_C9_C9_0, x0
+# CHECK: msr PMSICR_EL1, x0
+# NO_SPE: msr S3_0_C9_C9_2, x0
+# CHECK: msr PMSIRR_EL1, x0
+# NO_SPE: msr S3_0_C9_C9_3, x0
+# CHECK: msr PMSFCR_EL1, x0
+# NO_SPE: msr S3_0_C9_C9_4, x0
+# CHECK: msr PMSEVFR_EL1, x0
+# NO_SPE: msr S3_0_C9_C9_5, x0
+# CHECK: msr PMSLATFR_EL1, x0
+# NO_SPE: msr S3_0_C9_C9_6, x0
+# CHECK: msr PMSIDR_EL1, x0
+# NO_SPE: msr S3_0_C9_C9_7, x0
+
+[0x00,0x9a,0x38,0xd5]
+[0x20,0x9a,0x38,0xd5]
+[0x60,0x9a,0x38,0xd5]
+[0xe0,0x9a,0x38,0xd5]
+[0x00,0x99,0x3c,0xd5]
+[0x00,0x99,0x3d,0xd5]
+[0x00,0x99,0x38,0xd5]
+[0x40,0x99,0x38,0xd5]
+[0x60,0x99,0x38,0xd5]
+[0x80,0x99,0x38,0xd5]
+[0xa0,0x99,0x38,0xd5]
+[0xc0,0x99,0x38,0xd5]
+[0xe0,0x99,0x38,0xd5]
+
+# CHECK: mrs x0, PMBLIMITR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C10_0
+# CHECK: mrs x0, PMBPTR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C10_1
+# CHECK: mrs x0, PMBSR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C10_3
+# CHECK: mrs x0, PMBIDR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C10_7
+# CHECK: mrs x0, PMSCR_EL2
+# NO_SPE: mrs x0, S3_4_C9_C9_0
+# CHECK: mrs x0, PMSCR_EL12
+# NO_SPE: mrs x0, S3_5_C9_C9_0
+# CHECK: mrs x0, PMSCR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C9_0
+# CHECK: mrs x0, PMSICR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C9_2
+# CHECK: mrs x0, PMSIRR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C9_3
+# CHECK: mrs x0, PMSFCR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C9_4
+# CHECK: mrs x0, PMSEVFR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C9_5
+# CHECK: mrs x0, PMSLATFR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C9_6
+# CHECK: mrs x0, PMSIDR_EL1
+# NO_SPE: mrs x0, S3_0_C9_C9_7
diff --git a/test/MC/Disassembler/AArch64/armv8.2a-uao.txt b/test/MC/Disassembler/AArch64/armv8.2a-uao.txt
new file mode 100644
index 000000000000..b8300f4c7264
--- /dev/null
+++ b/test/MC/Disassembler/AArch64/armv8.2a-uao.txt
@@ -0,0 +1,19 @@
+# RUN: llvm-mc -triple aarch64-none-linux-gnu -mattr=+v8.2a --disassemble < %s | FileCheck %s
+# RUN: llvm-mc -triple aarch64-none-linux-gnu --disassemble < %s 2>&1 | FileCheck --check-prefix=NO_V82A %s
+
+[0x7f,0x40,0x00,0xd5]
+[0x7f,0x41,0x00,0xd5]
+[0x7f,0x42,0x00,0xd5]
+# CHECK: msr UAO, #0
+# CHECK: msr UAO, #1
+# CHECK: msr S0_0_C4_C2_3, xzr
+# NO_V82A: msr S0_0_C4_C0_3, xzr
+# NO_V82A: msr S0_0_C4_C1_3, xzr
+# NO_V82A: msr S0_0_C4_C2_3, xzr
+
+[0x81,0x42,0x18,0xd5]
+[0x82,0x42,0x38,0xd5]
+# CHECK: msr UAO, x1
+# CHECK: mrs x2, UAO
+# NO_V82A: msr S3_0_C4_C2_4, x1
+# NO_V82A: mrs x2, S3_0_C4_C2_4
diff --git a/test/MC/Disassembler/AArch64/basic-a64-instructions.txt b/test/MC/Disassembler/AArch64/basic-a64-instructions.txt
index 615d9ba19ca8..185f0c1124a6 100644
--- a/test/MC/Disassembler/AArch64/basic-a64-instructions.txt
+++ b/test/MC/Disassembler/AArch64/basic-a64-instructions.txt
@@ -1,5 +1,6 @@
# RUN: llvm-mc -triple=aarch64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s
# RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8 -disassemble < %s | FileCheck %s
+# RUN: llvm-mc -triple=arm64 -mattr=+fp-armv8,+fullfp16 -disassemble < %s | FileCheck %s --check-prefix=CHECK --check-prefix=FP16
#------------------------------------------------------------------------------
# Add/sub (immediate)
@@ -1516,6 +1517,20 @@
# Floating-point <-> fixed-point conversion
#------------------------------------------------------------------------------
+# FP16: fcvtzs w3, h5, #1
+# FP16: fcvtzs wzr, h20, #13
+# FP16: fcvtzs w19, h0, #32
+0xa3 0xfc 0xd8 0x1e
+0x9f 0xce 0xd8 0x1e
+0x13 0x80 0xd8 0x1e
+
+# FP16: fcvtzs x3, h5, #1
+# FP16: fcvtzs x12, h30, #45
+# FP16: fcvtzs x19, h0, #64
+0xa3 0xfc 0xd8 0x9e
+0xcc 0x4f 0xd8 0x9e
+0x13 0x00 0xd8 0x9e
+
# CHECK: fcvtzs w3, s5, #1
# CHECK: fcvtzs wzr, s20, #13
# CHECK: fcvtzs w19, s0, #32
@@ -1544,6 +1559,20 @@
0xcc 0x4f 0x58 0x9e
0x13 0x00 0x58 0x9e
+# FP16: fcvtzu w3, h5, #1
+# FP16: fcvtzu wzr, h20, #13
+# FP16: fcvtzu w19, h0, #32
+0xa3 0xfc 0xd9 0x1e
+0x9f 0xce 0xd9 0x1e
+0x13 0x80 0xd9 0x1e
+
+# FP16: fcvtzu x3, h5, #1
+# FP16: fcvtzu x12, h30, #45
+# FP16: fcvtzu x19, h0, #64
+0xa3 0xfc 0xd9 0x9e
+0xcc 0x4f 0xd9 0x9e
+0x13 0x00 0xd9 0x9e
+
# CHECK: fcvtzu w3, s5, #1
# CHECK: fcvtzu wzr, s20, #13
# CHECK: fcvtzu w19, s0, #32
@@ -1572,6 +1601,20 @@
0xcc 0x4f 0x59 0x9e
0x13 0x00 0x59 0x9e
+# FP16: scvtf h23, w19, #1
+# FP16: scvtf h31, wzr, #20
+# FP16: scvtf h14, w0, #32
+0x77 0xfe 0xc2 0x1e
+0xff 0xb3 0xc2 0x1e
+0x0e 0x80 0xc2 0x1e
+
+# FP16: scvtf h23, x19, #1
+# FP16: scvtf h31, xzr, #20
+# FP16: scvtf h14, x0, #64
+0x77 0xfe 0xc2 0x9e
+0xff 0xb3 0xc2 0x9e
+0x0e 0x00 0xc2 0x9e
+
# CHECK: scvtf s23, w19, #1
# CHECK: scvtf s31, wzr, #20
# CHECK: scvtf s14, w0, #32
@@ -1600,6 +1643,20 @@
0xff 0xb3 0x42 0x9e
0x0e 0x00 0x42 0x9e
+# FP16: ucvtf h23, w19, #1
+# FP16: ucvtf h31, wzr, #20
+# FP16: ucvtf h14, w0, #32
+0x77 0xfe 0xc3 0x1e
+0xff 0xb3 0xc3 0x1e
+0x0e 0x80 0xc3 0x1e
+
+# FP16: ucvtf h23, x19, #1
+# FP16: ucvtf h31, xzr, #20
+# FP16: ucvtf h14, x0, #64
+0x77 0xfe 0xc3 0x9e
+0xff 0xb3 0xc3 0x9e
+0x0e 0x00 0xc3 0x9e
+
# CHECK: ucvtf s23, w19, #1
# CHECK: ucvtf s31, wzr, #20
# CHECK: ucvtf s14, w0, #32
@@ -1631,6 +1688,61 @@
#------------------------------------------------------------------------------
# Floating-point <-> integer conversion
#------------------------------------------------------------------------------
+
+# FP16: fcvtns w3, h31
+# FP16: fcvtns xzr, h12
+# FP16: fcvtnu wzr, h12
+# FP16: fcvtnu x0, h0
+0xe3 0x3 0xe0 0x1e
+0x9f 0x1 0xe0 0x9e
+0x9f 0x1 0xe1 0x1e
+0x0 0x0 0xe1 0x9e
+
+# FP16: fcvtps wzr, h9
+# FP16: fcvtps x12, h20
+# FP16: fcvtpu w30, h23
+# FP16: fcvtpu x29, h3
+0x3f 0x1 0xe8 0x1e
+0x8c 0x2 0xe8 0x9e
+0xfe 0x2 0xe9 0x1e
+0x7d 0x0 0xe9 0x9e
+
+# FP16: fcvtms w2, h3
+# FP16: fcvtms x4, h5
+# FP16: fcvtmu w6, h7
+# FP16: fcvtmu x8, h9
+0x62 0x0 0xf0 0x1e
+0xa4 0x0 0xf0 0x9e
+0xe6 0x0 0xf1 0x1e
+0x28 0x1 0xf1 0x9e
+
+# FP16: fcvtzs w10, h11
+# FP16: fcvtzs x12, h13
+# FP16: fcvtzu w14, h15
+# FP16: fcvtzu x15, h16
+0x6a 0x1 0xf8 0x1e
+0xac 0x1 0xf8 0x9e
+0xee 0x1 0xf9 0x1e
+0xf 0x2 0xf9 0x9e
+
+# FP16: scvtf h17, w18
+# FP16: scvtf h19, x20
+# FP16: ucvtf h21, w22
+# FP16: scvtf h23, x24
+0x51 0x2 0xe2 0x1e
+0x93 0x2 0xe2 0x9e
+0xd5 0x2 0xe3 0x1e
+0x17 0x3 0xe2 0x9e
+
+# FP16: fcvtas w25, h26
+# FP16: fcvtas x27, h28
+# FP16: fcvtau w29, h30
+# FP16: fcvtau xzr, h0
+0x59 0x3 0xe4 0x1e
+0x9b 0x3 0xe4 0x9e
+0xdd 0x3 0xe5 0x1e
+0x1f 0x0 0xe5 0x9e
+
# CHECK: fcvtns w3, s31
# CHECK: fcvtns xzr, s12
# CHECK: fcvtnu wzr, s12
@@ -4172,12 +4284,16 @@
# CHECK: mrs x12, {{s3_7_c15_c1_5|S3_7_C15_C1_5}}
# CHECK: mrs x13, {{s3_2_c11_c15_7|S3_2_C11_C15_7}}
+# CHECK: mrs xzr, {{s0_0_c4_c0_0|S0_0_C4_C0_0}}
# CHECK: msr {{s3_0_c15_c0_0|S3_0_C15_C0_0}}, x12
# CHECK: msr {{s3_7_c11_c13_7|S3_7_C11_C13_7}}, x5
+# CHECK: msr {{s0_0_c4_c0_0|S0_0_C4_C0_0}}, xzr
0xac 0xf1 0x3f 0xd5
0xed 0xbf 0x3a 0xd5
+0x1f 0x40 0x20 0xd5
0x0c 0xf0 0x18 0xd5
0xe5 0xbd 0x1f 0xd5
+0x1f 0x40 0x00 0xd5
#------------------------------------------------------------------------------
# Test and branch (immediate)
diff --git a/test/MC/Disassembler/AArch64/fullfp16-neg.txt b/test/MC/Disassembler/AArch64/fullfp16-neg.txt
new file mode 100644
index 000000000000..4feb20c10939
--- /dev/null
+++ b/test/MC/Disassembler/AArch64/fullfp16-neg.txt
@@ -0,0 +1,145 @@
+# RUN: not llvm-mc -disassemble -triple=aarch64 -mattr=+neon,-fullfp16 < %s 2>&1 | FileCheck %s
+# RUN: not llvm-mc -disassemble -triple=aarch64 -mattr=-neon,-fullfp16 < %s 2>&1 | FileCheck %s
+
+[0x41,0xc0,0xe0,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x28,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x18,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x10,0xc3,0x1f]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x48,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x68,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x58,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x78,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x90,0xc3,0x1f]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x08,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x40,0xe1,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x10,0xe3,0x1f]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x90,0xe3,0x1f]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x88,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xc0,0xe1,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x38,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x04,0xe2,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x30,0x04,0xe2,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x20,0xe2,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x28,0x20,0xe0,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x30,0x20,0xe2,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x38,0x20,0xe0,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x0c,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe4,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe4,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe5,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe5,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf0,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf0,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf1,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf1,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe0,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe0,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe1,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe1,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe8,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe8,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe9,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe9,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf8,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xd8,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf8,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xd8,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf9,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xd9,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xf9,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xd9,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe2,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xc2,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe2,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xc2,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xc3,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe3,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xfc,0xc3,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe7,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe6,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe7,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x00,0xe6,0x9e]
+# CHECK: warning: invalid instruction encoding
+[0x01,0x10,0xe8,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x01,0x10,0xe8,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0xe2,0x03,0xe7,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x40,0xe0,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x40,0xe6,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xc0,0xe7,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x40,0xe5,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x40,0xe4,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xc0,0xe4,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0x40,0xe7,0x1e]
+# CHECK: warning: invalid instruction encoding
+[0x41,0xc0,0xe5,0x1e]
+# CHECK: warning: invalid instruction encoding
+
+# CHECK-NOT: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/AArch64/fullfp16-neon-neg.txt b/test/MC/Disassembler/AArch64/fullfp16-neon-neg.txt
new file mode 100644
index 000000000000..8b7e1c878002
--- /dev/null
+++ b/test/MC/Disassembler/AArch64/fullfp16-neon-neg.txt
@@ -0,0 +1,382 @@
+# RUN: not llvm-mc -disassemble -triple=aarch64 -mattr=+neon,-fullfp16 < %s 2>&1 | FileCheck %s
+# RUN: not llvm-mc -disassemble -triple=aarch64 -mattr=-neon,-fullfp16 < %s 2>&1 | FileCheck %s
+# RUN: not llvm-mc -disassemble -triple=aarch64 -mattr=-neon,+fullfp16 < %s 2>&1 | FileCheck %s
+
+[0x00,0xf8,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xf8,0xf8,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xd8,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x88,0x79,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0x79,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0x79,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x88,0x79,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x88,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xd8,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xf8,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xf8,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xf8,0xf8,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xd8,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x88,0x79,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0x79,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0x79,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x88,0x79,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x88,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0x98,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xd8,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x00,0xf8,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x10,0x22,0x0f]
+# CHECK: warning: invalid instruction encoding
+[0x03,0x11,0x12,0x4f]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x50,0x22,0x0f]
+# CHECK: warning: invalid instruction encoding
+[0x03,0x51,0x12,0x4f]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x90,0x22,0x0f]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x90,0x22,0x4f]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x90,0x22,0x2f]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x90,0x22,0x6f]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x14,0xc2,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0xc8,0x30,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0xc8,0xb0,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0xf8,0x30,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0xf8,0xb0,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x14,0x42,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x14,0x42,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x14,0x42,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x14,0x42,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x14,0xc2,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x14,0xc2,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0x27,0x50,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0x24,0x4f,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x03,0x25,0x4c,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xbf,0x27,0x5c,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x03,0x25,0x4c,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xbf,0x27,0x5c,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0x27,0xd0,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0x24,0xcf,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0x27,0xd0,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0x24,0xcf,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0xdb,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0xd8,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0xdb,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0xd8,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x03,0xc9,0xf8,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xbf,0xcb,0xf8,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x03,0xc9,0xf8,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xbf,0xcb,0xf8,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0xcb,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0xc8,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0xcb,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0xc8,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x83,0xda,0xf8,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x01,0xd9,0xf8,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x83,0xda,0xf8,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x01,0xd9,0xf8,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x50,0xe8,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x8f,0xe8,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x50,0xe8,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x8f,0xe8,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0x2f,0x50,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0x2c,0x4f,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0x2f,0x50,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0x2c,0x4f,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x03,0x2d,0xcc,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xbf,0x2f,0xdc,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x03,0x2d,0xcc,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xbf,0x2f,0xdc,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xe0,0x3f,0xd0,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xe4,0x3c,0xcf,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x03,0x3d,0x4c,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xbf,0x3f,0x5c,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x34,0x42,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xff,0x35,0x50,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xea,0x35,0xd6,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xa3,0x34,0xc6,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x04,0x42,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xff,0x05,0x50,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0xea,0x05,0xd6,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0xa3,0x04,0xc6,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x34,0x42,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x34,0x42,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0xea,0x35,0xd6,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xea,0x35,0xd6,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x04,0x42,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x04,0x42,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0xea,0x05,0xd6,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0xea,0x05,0xd6,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x0c,0x42,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x0c,0x42,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x0c,0xc2,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x0c,0xc2,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x1d,0x17,0xd4,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x18,0x11,0x5f]
+# CHECK: warning: invalid instruction encoding
+[0x62,0x58,0x14,0x5f]
+# CHECK: warning: invalid instruction encoding
+[0x20,0x98,0x11,0x5f]
+# CHECK: warning: invalid instruction encoding
+[0x46,0x98,0x18,0x7f]
+# CHECK: warning: invalid instruction encoding
+[0x95,0xfd,0x1f,0x5f]
+# CHECK: warning: invalid instruction encoding
+[0x95,0xfd,0x1f,0x7f]
+# CHECK: warning: invalid instruction encoding
+[0xac,0xc9,0x79,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xac,0xc9,0x79,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xb9,0x79,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xac,0xb9,0x79,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xa9,0x79,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xac,0xa9,0x79,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xa9,0xf9,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xac,0xa9,0xf9,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0xac,0xb9,0xf9,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xac,0xb9,0xf9,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0x25,0x4c,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xd9,0xf8,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xd9,0xf8,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0x25,0x4c,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xc9,0xf8,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xc9,0xf8,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0x25,0xcc,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xc9,0xf8,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xc9,0xf8,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xd9,0xf8,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xd9,0xf8,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xe9,0xf8,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0xe9,0xf8,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0x2d,0x4c,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x6a,0x2d,0xcc,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0xd4,0x1e,0x4f,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x15,0x3e,0x4d,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xb5,0x3c,0xcc,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xd3,0xd9,0xf9,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x52,0xf9,0xf9,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xd9,0xf9,0x7e]
+# CHECK: warning: invalid instruction encoding
+[0x72,0xd8,0x30,0x5e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xf8,0xf8,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xf9,0xf8,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xf8,0xf8,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xf9,0xf8,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0x88,0x79,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0x89,0x79,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0x88,0x79,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0x89,0x79,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0x88,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0x89,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0x98,0x79,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0x99,0x79,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0x98,0x79,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0x99,0x79,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0x98,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0x99,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0x98,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0x99,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xa8,0x79,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xa9,0x79,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xa8,0x79,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xa9,0x79,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xa8,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xa9,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xa8,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xa9,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xb8,0x79,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xb9,0x79,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xb8,0x79,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xb9,0x79,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xb8,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xb9,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xb8,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xb9,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xc8,0x79,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xc9,0x79,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xc8,0x79,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xc9,0x79,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xd8,0xf9,0x0e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xd9,0xf9,0x4e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xd8,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xd9,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+[0x04,0xf8,0xf9,0x2e]
+# CHECK: warning: invalid instruction encoding
+[0x06,0xf9,0xf9,0x6e]
+# CHECK: warning: invalid instruction encoding
+
+# CHECK-NOT: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/ARM/fullfp16-neon-arm-neg.txt b/test/MC/Disassembler/ARM/fullfp16-neon-arm-neg.txt
new file mode 100644
index 000000000000..9c8be171d287
--- /dev/null
+++ b/test/MC/Disassembler/ARM/fullfp16-neon-arm-neg.txt
@@ -0,0 +1,274 @@
+# RUN: not llvm-mc -disassemble -triple armv8a-none-eabi -mattr=-fullfp16,+neon -show-encoding < %s 2>&1 | FileCheck %s
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0d,0x11,0xf2]
+[0x44,0x0d,0x12,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0d,0x31,0xf2]
+[0x44,0x0d,0x32,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0d,0x11,0xf3]
+[0x54,0x0d,0x12,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x63,0x19,0x92,0xf2]
+[0x6e,0x89,0x9a,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0d,0x11,0xf2]
+[0x54,0x0d,0x12,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x67,0x51,0x96,0xf2]
+[0x6f,0xa1,0x9c,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0d,0x31,0xf2]
+[0x54,0x0d,0x32,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x67,0x55,0x96,0xf2]
+[0x6f,0xa5,0x9c,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0c,0x11,0xf2]
+[0x54,0x0c,0x12,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0c,0x31,0xf2]
+[0x54,0x0c,0x32,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x04,0x2e,0x13,0xf2]
+[0x48,0x4e,0x16,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x03,0x25,0xb5,0xf3]
+[0x46,0x45,0xb5,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x04,0x2e,0x13,0xf3]
+[0x48,0x4e,0x16,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x83,0x24,0xb5,0xf3]
+[0xc6,0x44,0xb5,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x04,0x2e,0x33,0xf3]
+[0x48,0x4e,0x36,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x03,0x24,0xb5,0xf3]
+[0x46,0x44,0xb5,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x83,0x25,0xb5,0xf3]
+[0xc6,0x45,0xb5,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x03,0x26,0xb5,0xf3]
+[0x46,0x46,0xb5,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0e,0x11,0xf3]
+[0x54,0x0e,0x12,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0e,0x31,0xf3]
+[0x54,0x0e,0x32,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0d,0x31,0xf3]
+[0x44,0x0d,0x32,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x07,0xb5,0xf3]
+[0x42,0x07,0xb5,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0f,0x11,0xf2]
+[0x44,0x0f,0x12,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0f,0x31,0xf2]
+[0x44,0x0f,0x32,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0f,0x11,0xf3]
+[0x54,0x0f,0x12,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0f,0x31,0xf3]
+[0x54,0x0f,0x32,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0d,0x11,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0f,0x11,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+[0x02,0x0f,0x31,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x05,0xb7,0xf3]
+[0x42,0x05,0xb7,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0f,0x11,0xf2]
+[0x54,0x0f,0x12,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x81,0x05,0xb7,0xf3]
+[0xc2,0x05,0xb7,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x12,0x0f,0x31,0xf2]
+[0x54,0x0f,0x32,0xf2]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x81,0x07,0xb5,0xf3]
+[0xc2,0x07,0xb5,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x07,0xb7,0xf3]
+[0x81,0x07,0xb7,0xf3]
+[0x01,0x06,0xb7,0xf3]
+[0x81,0x06,0xb7,0xf3]
+[0x42,0x07,0xb7,0xf3]
+[0xc2,0x07,0xb7,0xf3]
+[0x42,0x06,0xb7,0xf3]
+[0xc2,0x06,0xb7,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x00,0xb7,0xf3]
+[0x42,0x00,0xb7,0xf3]
+[0x81,0x00,0xb7,0xf3]
+[0xc2,0x00,0xb7,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x03,0xb7,0xf3]
+[0x42,0x03,0xb7,0xf3]
+[0x81,0x03,0xb7,0xf3]
+[0xc2,0x03,0xb7,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x01,0xb7,0xf3]
+[0x42,0x01,0xb7,0xf3]
+[0x81,0x01,0xb7,0xf3]
+[0xc2,0x01,0xb7,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x02,0xb7,0xf3]
+[0x42,0x02,0xb7,0xf3]
+[0x81,0x02,0xb7,0xf3]
+[0xc2,0x02,0xb7,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0x0d,0xbf,0xf2]
+[0x11,0x0d,0xbe,0xf3]
+[0x11,0x0c,0xbd,0xf2]
+[0x11,0x0c,0xbc,0xf3]
+[0x52,0x0d,0xbb,0xf2]
+[0x52,0x0d,0xba,0xf3]
+[0x52,0x0c,0xb9,0xf2]
+[0x52,0x0c,0xb8,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x05,0xb6,0xf3]
+[0x42,0x05,0xb6,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x81,0x06,0xb6,0xf3]
+[0xc2,0x06,0xb6,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x01,0x04,0xb6,0xf3]
+[0x42,0x04,0xb6,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x81,0x07,0xb6,0xf3]
+[0xc2,0x07,0xb6,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x81,0x04,0xb6,0xf3]
+[0xc2,0x04,0xb6,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x81,0x05,0xb6,0xf3]
+[0xc2,0x05,0xb6,0xf3]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x20,0x0d,0xc7,0xf2]
+[0x20,0x0f,0xc7,0xf2]
+[0x70,0x0f,0xc7,0xf2]
+
+# CHECK-NOT: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/ARM/fullfp16-neon-arm.txt b/test/MC/Disassembler/ARM/fullfp16-neon-arm.txt
new file mode 100644
index 000000000000..232bd641f059
--- /dev/null
+++ b/test/MC/Disassembler/ARM/fullfp16-neon-arm.txt
@@ -0,0 +1,309 @@
+# RUN: not llvm-mc -disassemble -triple armv8a-none-eabi -mattr=+fullfp16,+neon -show-encoding < %s 2>%t | FileCheck %s
+# RUN FileCheck %s < %t --check-prefix=STDERR
+
+# CHECK: vadd.f16 d0, d1, d2
+# CHECK: vadd.f16 q0, q1, q2
+[0x02,0x0d,0x11,0xf2]
+[0x44,0x0d,0x12,0xf2]
+
+# CHECK: vsub.f16 d0, d1, d2
+# CHECK: vsub.f16 q0, q1, q2
+[0x02,0x0d,0x31,0xf2]
+[0x44,0x0d,0x32,0xf2]
+
+# CHECK: vmul.f16 d0, d1, d2
+# CHECK: vmul.f16 q0, q1, q2
+[0x12,0x0d,0x11,0xf3]
+[0x54,0x0d,0x12,0xf3]
+
+# CHECK: vmul.f16 d1, d2, d3[2]
+# CHECK: vmul.f16 q4, q5, d6[3]
+[0x63,0x19,0x92,0xf2]
+[0x6e,0x89,0x9a,0xf3]
+
+# CHECK: vmla.f16 d0, d1, d2
+# CHECK: vmla.f16 q0, q1, q2
+[0x12,0x0d,0x11,0xf2]
+[0x54,0x0d,0x12,0xf2]
+
+# CHECK: vmla.f16 d5, d6, d7[2]
+# CHECK: vmla.f16 q5, q6, d7[3]
+[0x67,0x51,0x96,0xf2]
+[0x6f,0xa1,0x9c,0xf3]
+
+# CHECK: vmls.f16 d0, d1, d2
+# CHECK: vmls.f16 q0, q1, q2
+[0x12,0x0d,0x31,0xf2]
+[0x54,0x0d,0x32,0xf2]
+
+# CHECK: vmls.f16 d5, d6, d7[2]
+# CHECK: vmls.f16 q5, q6, d7[3]
+[0x67,0x55,0x96,0xf2]
+[0x6f,0xa5,0x9c,0xf3]
+
+# CHECK: vfma.f16 d0, d1, d2
+# CHECK: vfma.f16 q0, q1, q2
+[0x12,0x0c,0x11,0xf2]
+[0x54,0x0c,0x12,0xf2]
+
+# CHECK: vfms.f16 d0, d1, d2
+# CHECK: vfms.f16 q0, q1, q2
+[0x12,0x0c,0x31,0xf2]
+[0x54,0x0c,0x32,0xf2]
+
+# CHECK: vceq.f16 d2, d3, d4
+# CHECK: vceq.f16 q2, q3, q4
+[0x04,0x2e,0x13,0xf2]
+[0x48,0x4e,0x16,0xf2]
+
+# CHECK: vceq.f16 d2, d3, #0
+# CHECK: vceq.f16 q2, q3, #0
+[0x03,0x25,0xb5,0xf3]
+[0x46,0x45,0xb5,0xf3]
+
+# CHECK: vcge.f16 d2, d3, d4
+# CHECK: vcge.f16 q2, q3, q4
+[0x04,0x2e,0x13,0xf3]
+[0x48,0x4e,0x16,0xf3]
+
+# CHECK: vcge.f16 d2, d3, #0
+# CHECK: vcge.f16 q2, q3, #0
+[0x83,0x24,0xb5,0xf3]
+[0xc6,0x44,0xb5,0xf3]
+
+# CHECK: vcgt.f16 d2, d3, d4
+# CHECK: vcgt.f16 q2, q3, q4
+[0x04,0x2e,0x33,0xf3]
+[0x48,0x4e,0x36,0xf3]
+
+# CHECK: vcgt.f16 d2, d3, #0
+# CHECK: vcgt.f16 q2, q3, #0
+[0x03,0x24,0xb5,0xf3]
+[0x46,0x44,0xb5,0xf3]
+
+# CHECK: vcle.f16 d2, d3, #0
+# CHECK: vcle.f16 q2, q3, #0
+[0x83,0x25,0xb5,0xf3]
+[0xc6,0x45,0xb5,0xf3]
+
+# CHECK: vclt.f16 d2, d3, #0
+# CHECK: vclt.f16 q2, q3, #0
+[0x03,0x26,0xb5,0xf3]
+[0x46,0x46,0xb5,0xf3]
+
+# CHECK: vacge.f16 d0, d1, d2
+# CHECK: vacge.f16 q0, q1, q2
+[0x12,0x0e,0x11,0xf3]
+[0x54,0x0e,0x12,0xf3]
+
+# CHECK: vacgt.f16 d0, d1, d2
+# CHECK: vacgt.f16 q0, q1, q2
+[0x12,0x0e,0x31,0xf3]
+[0x54,0x0e,0x32,0xf3]
+
+# CHECK: vabd.f16 d0, d1, d2
+# CHECK: vabd.f16 q0, q1, q2
+[0x02,0x0d,0x31,0xf3]
+[0x44,0x0d,0x32,0xf3]
+
+# CHECK: vabs.f16 d0, d1
+# CHECK: vabs.f16 q0, q1
+[0x01,0x07,0xb5,0xf3]
+[0x42,0x07,0xb5,0xf3]
+
+# CHECK: vmax.f16 d0, d1, d2
+# CHECK: vmax.f16 q0, q1, q2
+[0x02,0x0f,0x11,0xf2]
+[0x44,0x0f,0x12,0xf2]
+
+# CHECK: vmin.f16 d0, d1, d2
+# CHECK: vmin.f16 q0, q1, q2
+[0x02,0x0f,0x31,0xf2]
+[0x44,0x0f,0x32,0xf2]
+
+# CHECK: vmaxnm.f16 d0, d1, d2
+# CHECK: vmaxnm.f16 q0, q1, q2
+[0x12,0x0f,0x11,0xf3]
+[0x54,0x0f,0x12,0xf3]
+
+# CHECK: vminnm.f16 d0, d1, d2
+# CHECK: vminnm.f16 q0, q1, q2
+[0x12,0x0f,0x31,0xf3]
+[0x54,0x0f,0x32,0xf3]
+
+# CHECK: vpadd.f16 d0, d1, d2
+[0x02,0x0d,0x11,0xf3]
+
+# CHECK: vpmax.f16 d0, d1, d2
+[0x02,0x0f,0x11,0xf3]
+
+# CHECK: vpmin.f16 d0, d1, d2
+[0x02,0x0f,0x31,0xf3]
+
+# CHECK: vrecpe.f16 d0, d1
+# CHECK: vrecpe.f16 q0, q1
+[0x01,0x05,0xb7,0xf3]
+[0x42,0x05,0xb7,0xf3]
+
+# CHECK: vrecps.f16 d0, d1, d2
+# CHECK: vrecps.f16 q0, q1, q2
+[0x12,0x0f,0x11,0xf2]
+[0x54,0x0f,0x12,0xf2]
+
+# CHECK: vrsqrte.f16 d0, d1
+# CHECK: vrsqrte.f16 q0, q1
+[0x81,0x05,0xb7,0xf3]
+[0xc2,0x05,0xb7,0xf3]
+
+# CHECK: vrsqrts.f16 d0, d1, d2
+# CHECK: vrsqrts.f16 q0, q1, q2
+[0x12,0x0f,0x31,0xf2]
+[0x54,0x0f,0x32,0xf2]
+
+# CHECK: vneg.f16 d0, d1
+# CHECK: vneg.f16 q0, q1
+[0x81,0x07,0xb5,0xf3]
+[0xc2,0x07,0xb5,0xf3]
+
+# CHECK: vcvt.s16.f16 d0, d1
+# CHECK: vcvt.u16.f16 d0, d1
+# CHECK: vcvt.f16.s16 d0, d1
+# CHECK: vcvt.f16.u16 d0, d1
+# CHECK: vcvt.s16.f16 q0, q1
+# CHECK: vcvt.u16.f16 q0, q1
+# CHECK: vcvt.f16.s16 q0, q1
+# CHECK: vcvt.f16.u16 q0, q1
+[0x01,0x07,0xb7,0xf3]
+[0x81,0x07,0xb7,0xf3]
+[0x01,0x06,0xb7,0xf3]
+[0x81,0x06,0xb7,0xf3]
+[0x42,0x07,0xb7,0xf3]
+[0xc2,0x07,0xb7,0xf3]
+[0x42,0x06,0xb7,0xf3]
+[0xc2,0x06,0xb7,0xf3]
+
+# CHECK: vcvta.s16.f16 d0, d1
+# CHECK: vcvta.s16.f16 q0, q1
+# CHECK: vcvta.u16.f16 d0, d1
+# CHECK: vcvta.u16.f16 q0, q1
+[0x01,0x00,0xb7,0xf3]
+[0x42,0x00,0xb7,0xf3]
+[0x81,0x00,0xb7,0xf3]
+[0xc2,0x00,0xb7,0xf3]
+
+# CHECK: vcvtm.s16.f16 d0, d1
+# CHECK: vcvtm.s16.f16 q0, q1
+# CHECK: vcvtm.u16.f16 d0, d1
+# CHECK: vcvtm.u16.f16 q0, q1
+[0x01,0x03,0xb7,0xf3]
+[0x42,0x03,0xb7,0xf3]
+[0x81,0x03,0xb7,0xf3]
+[0xc2,0x03,0xb7,0xf3]
+
+# CHECK: vcvtn.s16.f16 d0, d1
+# CHECK: vcvtn.s16.f16 q0, q1
+# CHECK: vcvtn.u16.f16 d0, d1
+# CHECK: vcvtn.u16.f16 q0, q1
+[0x01,0x01,0xb7,0xf3]
+[0x42,0x01,0xb7,0xf3]
+[0x81,0x01,0xb7,0xf3]
+[0xc2,0x01,0xb7,0xf3]
+
+# CHECK: vcvtp.s16.f16 d0, d1
+# CHECK: vcvtp.s16.f16 q0, q1
+# CHECK: vcvtp.u16.f16 d0, d1
+# CHECK: vcvtp.u16.f16 q0, q1
+[0x01,0x02,0xb7,0xf3]
+[0x42,0x02,0xb7,0xf3]
+[0x81,0x02,0xb7,0xf3]
+[0xc2,0x02,0xb7,0xf3]
+
+# CHECK: vcvt.s16.f16 d0, d1, #1
+# CHECK: vcvt.u16.f16 d0, d1, #2
+# CHECK: vcvt.f16.s16 d0, d1, #3
+# CHECK: vcvt.f16.u16 d0, d1, #4
+# CHECK: vcvt.s16.f16 q0, q1, #5
+# CHECK: vcvt.u16.f16 q0, q1, #6
+# CHECK: vcvt.f16.s16 q0, q1, #7
+# CHECK: vcvt.f16.u16 q0, q1, #8
+[0x11,0x0d,0xbf,0xf2]
+[0x11,0x0d,0xbe,0xf3]
+[0x11,0x0c,0xbd,0xf2]
+[0x11,0x0c,0xbc,0xf3]
+[0x52,0x0d,0xbb,0xf2]
+[0x52,0x0d,0xba,0xf3]
+[0x52,0x0c,0xb9,0xf2]
+[0x52,0x0c,0xb8,0xf3]
+
+# CHECK: vrinta.f16 d0, d1
+# CHECK: vrinta.f16 q0, q1
+[0x01,0x05,0xb6,0xf3]
+[0x42,0x05,0xb6,0xf3]
+
+# CHECK: vrintm.f16 d0, d1
+# CHECK: vrintm.f16 q0, q1
+[0x81,0x06,0xb6,0xf3]
+[0xc2,0x06,0xb6,0xf3]
+
+# CHECK: vrintn.f16 d0, d1
+# CHECK: vrintn.f16 q0, q1
+[0x01,0x04,0xb6,0xf3]
+[0x42,0x04,0xb6,0xf3]
+
+# CHECK: vrintp.f16 d0, d1
+# CHECK: vrintp.f16 q0, q1
+[0x81,0x07,0xb6,0xf3]
+[0xc2,0x07,0xb6,0xf3]
+
+# CHECK: vrintx.f16 d0, d1
+# CHECK: vrintx.f16 q0, q1
+[0x81,0x04,0xb6,0xf3]
+[0xc2,0x04,0xb6,0xf3]
+
+# CHECK: vrintz.f16 d0, d1
+# CHECK: vrintz.f16 q0, q1
+[0x81,0x05,0xb6,0xf3]
+[0xc2,0x05,0xb6,0xf3]
+
+# Existing VMOV(immediate, Advanced SIMD) instructions within the encoding
+# space of the new FP16 VCVT(between floating - point and fixed - point,
+# Advanced SIMD):
+# 4 -- Q
+# 2 -- VMOV op
+# 1 -- VCVT op
+# 2 -- VCVT FP size
+[0x10,0x0c,0xc7,0xf2]
+[0x10,0x0d,0xc7,0xf2]
+[0x10,0x0e,0xc7,0xf2]
+[0x10,0x0f,0xc7,0xf2]
+[0x20,0x0c,0xc7,0xf2]
+[0x20,0x0d,0xc7,0xf2]
+[0x20,0x0e,0xc7,0xf2]
+[0x20,0x0f,0xc7,0xf2]
+[0x50,0x0c,0xc7,0xf2]
+[0x50,0x0d,0xc7,0xf2]
+[0x50,0x0e,0xc7,0xf2]
+[0x50,0x0f,0xc7,0xf2]
+[0x70,0x0c,0xc7,0xf2]
+[0x70,0x0d,0xc7,0xf2]
+[0x70,0x0e,0xc7,0xf2]
+[0x70,0x0f,0xc7,0xf2]
+# CHECK: vmov.i32 d16, #0x70ff
+# CHECK: vmov.i32 d16, #0x70ffff
+# CHECK: vmov.i8 d16, #0x70
+# CHECK: vmov.f32 d16, #1.000000e+00
+# CHECK: vmull.s8 q8, d7, d16
+# STDERR: warning: invalid instruction encoding
+# STDERR-NEXT: [0x20,0x0d,0xc7,0xf2]
+# CHECK: vmull.p8 q8, d7, d16
+# STDERR: warning: invalid instruction encoding
+# STDERR-NEXT: [0x20,0x0f,0xc7,0xf2]
+# CHECK: vmov.i32 q8, #0x70ff
+# CHECK: vmov.i32 q8, #0x70ffff
+# CHECK: vmov.i8 q8, #0x70
+# CHECK: vmov.f32 q8, #1.000000e+00
+# CHECK: vmvn.i32 q8, #0x70ff
+# CHECK: vmvn.i32 q8, #0x70ffff
+# CHECK: vmov.i64 q8, #0xffffff0000000
+# STDERR: warning: invalid instruction encoding
+# STDERR-NEXT: [0x70,0x0f,0xc7,0xf2]
diff --git a/test/MC/Disassembler/ARM/fullfp16-neon-thumb-neg.txt b/test/MC/Disassembler/ARM/fullfp16-neon-thumb-neg.txt
new file mode 100644
index 000000000000..f7561bb4096e
--- /dev/null
+++ b/test/MC/Disassembler/ARM/fullfp16-neon-thumb-neg.txt
@@ -0,0 +1,274 @@
+# RUN: not llvm-mc -disassemble -triple thumbv8a-none-eabi -mattr=-fullfp16,+neon,+thumb-mode -show-encoding < %s 2>&1 | FileCheck %s
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xef,0x02,0x0d]
+[0x12,0xef,0x44,0x0d]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xef,0x02,0x0d]
+[0x32,0xef,0x44,0x0d]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xff,0x12,0x0d]
+[0x12,0xff,0x54,0x0d]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x92,0xef,0x63,0x19]
+[0x9a,0xff,0x6e,0x89]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xef,0x12,0x0d]
+[0x12,0xef,0x54,0x0d]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x96,0xef,0x67,0x51]
+[0x9c,0xff,0x6f,0xa1]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xef,0x12,0x0d]
+[0x32,0xef,0x54,0x0d]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x96,0xef,0x67,0x55]
+[0x9c,0xff,0x6f,0xa5]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xef,0x12,0x0c]
+[0x12,0xef,0x54,0x0c]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xef,0x12,0x0c]
+[0x32,0xef,0x54,0x0c]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x13,0xef,0x04,0x2e]
+[0x16,0xef,0x48,0x4e]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb5,0xff,0x03,0x25]
+[0xb5,0xff,0x46,0x45]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x13,0xff,0x04,0x2e]
+[0x16,0xff,0x48,0x4e]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb5,0xff,0x83,0x24]
+[0xb5,0xff,0xc6,0x44]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x33,0xff,0x04,0x2e]
+[0x36,0xff,0x48,0x4e]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb5,0xff,0x03,0x24]
+[0xb5,0xff,0x46,0x44]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb5,0xff,0x83,0x25]
+[0xb5,0xff,0xc6,0x45]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb5,0xff,0x03,0x26]
+[0xb5,0xff,0x46,0x46]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xff,0x12,0x0e]
+[0x12,0xff,0x54,0x0e]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xff,0x12,0x0e]
+[0x32,0xff,0x54,0x0e]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xff,0x02,0x0d]
+[0x32,0xff,0x44,0x0d]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb5,0xff,0x01,0x07]
+[0xb5,0xff,0x42,0x07]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xef,0x02,0x0f]
+[0x12,0xef,0x44,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xef,0x02,0x0f]
+[0x32,0xef,0x44,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xff,0x12,0x0f]
+[0x12,0xff,0x54,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xff,0x12,0x0f]
+[0x32,0xff,0x54,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+[0x11,0xff,0x02,0x0d]
+
+# CHECK: warning: invalid instruction encoding
+[0x11,0xff,0x02,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+[0x31,0xff,0x02,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb7,0xff,0x01,0x05]
+[0xb7,0xff,0x42,0x05]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x11,0xef,0x12,0x0f]
+[0x12,0xef,0x54,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb7,0xff,0x81,0x05]
+[0xb7,0xff,0xc2,0x05]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0x31,0xef,0x12,0x0f]
+[0x32,0xef,0x54,0x0f]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb5,0xff,0x81,0x07]
+[0xb5,0xff,0xc2,0x07]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb7,0xff,0x01,0x07]
+[0xb7,0xff,0x81,0x07]
+[0xb7,0xff,0x01,0x06]
+[0xb7,0xff,0x81,0x06]
+[0xb7,0xff,0x42,0x07]
+[0xb7,0xff,0xc2,0x07]
+[0xb7,0xff,0x42,0x06]
+[0xb7,0xff,0xc2,0x06]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb7,0xff,0x01,0x00]
+[0xb7,0xff,0x42,0x00]
+[0xb7,0xff,0x81,0x00]
+[0xb7,0xff,0xc2,0x00]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb7,0xff,0x01,0x03]
+[0xb7,0xff,0x42,0x03]
+[0xb7,0xff,0x81,0x03]
+[0xb7,0xff,0xc2,0x03]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb7,0xff,0x01,0x01]
+[0xb7,0xff,0x42,0x01]
+[0xb7,0xff,0x81,0x01]
+[0xb7,0xff,0xc2,0x01]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb7,0xff,0x01,0x02]
+[0xb7,0xff,0x42,0x02]
+[0xb7,0xff,0x81,0x02]
+[0xb7,0xff,0xc2,0x02]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xbf,0xef,0x11,0x0d]
+[0xbe,0xff,0x11,0x0d]
+[0xbd,0xef,0x11,0x0c]
+[0xbc,0xff,0x11,0x0c]
+[0xbb,0xef,0x52,0x0d]
+[0xba,0xff,0x52,0x0d]
+[0xb9,0xef,0x52,0x0c]
+[0xb8,0xff,0x52,0x0c]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xff,0x01,0x05]
+[0xb6,0xff,0x42,0x05]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xff,0x81,0x06]
+[0xb6,0xff,0xc2,0x06]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xff,0x01,0x04]
+[0xb6,0xff,0x42,0x04]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xff,0x81,0x07]
+[0xb6,0xff,0xc2,0x07]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xff,0x81,0x04]
+[0xb6,0xff,0xc2,0x04]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xb6,0xff,0x81,0x05]
+[0xb6,0xff,0xc2,0x05]
+
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+# CHECK: warning: invalid instruction encoding
+[0xc7,0xef,0x20,0x0d]
+[0xc7,0xef,0x20,0x0f]
+[0xc7,0xef,0x70,0x0f]
+
+# CHECK-NOT: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/ARM/fullfp16-neon-thumb.txt b/test/MC/Disassembler/ARM/fullfp16-neon-thumb.txt
new file mode 100644
index 000000000000..a776232b7147
--- /dev/null
+++ b/test/MC/Disassembler/ARM/fullfp16-neon-thumb.txt
@@ -0,0 +1,309 @@
+# RUN: not llvm-mc -disassemble -triple thumbv8a-none-eabi -mattr=+fullfp16,+neon,+thumb-mode -show-encoding < %s 2>%t | FileCheck %s
+# RUN FileCheck %s < %t --check-prefix=STDERR
+
+# CHECK: vadd.f16 d0, d1, d2
+# CHECK: vadd.f16 q0, q1, q2
+[0x11,0xef,0x02,0x0d]
+[0x12,0xef,0x44,0x0d]
+
+# CHECK: vsub.f16 d0, d1, d2
+# CHECK: vsub.f16 q0, q1, q2
+[0x31,0xef,0x02,0x0d]
+[0x32,0xef,0x44,0x0d]
+
+# CHECK: vmul.f16 d0, d1, d2
+# CHECK: vmul.f16 q0, q1, q2
+[0x11,0xff,0x12,0x0d]
+[0x12,0xff,0x54,0x0d]
+
+# CHECK: vmul.f16 d1, d2, d3[2]
+# CHECK: vmul.f16 q4, q5, d6[3]
+[0x92,0xef,0x63,0x19]
+[0x9a,0xff,0x6e,0x89]
+
+# CHECK: vmla.f16 d0, d1, d2
+# CHECK: vmla.f16 q0, q1, q2
+[0x11,0xef,0x12,0x0d]
+[0x12,0xef,0x54,0x0d]
+
+# CHECK: vmla.f16 d5, d6, d7[2]
+# CHECK: vmla.f16 q5, q6, d7[3]
+[0x96,0xef,0x67,0x51]
+[0x9c,0xff,0x6f,0xa1]
+
+# CHECK: vmls.f16 d0, d1, d2
+# CHECK: vmls.f16 q0, q1, q2
+[0x31,0xef,0x12,0x0d]
+[0x32,0xef,0x54,0x0d]
+
+# CHECK: vmls.f16 d5, d6, d7[2]
+# CHECK: vmls.f16 q5, q6, d7[3]
+[0x96,0xef,0x67,0x55]
+[0x9c,0xff,0x6f,0xa5]
+
+# CHECK: vfma.f16 d0, d1, d2
+# CHECK: vfma.f16 q0, q1, q2
+[0x11,0xef,0x12,0x0c]
+[0x12,0xef,0x54,0x0c]
+
+# CHECK: vfms.f16 d0, d1, d2
+# CHECK: vfms.f16 q0, q1, q2
+[0x31,0xef,0x12,0x0c]
+[0x32,0xef,0x54,0x0c]
+
+# CHECK: vceq.f16 d2, d3, d4
+# CHECK: vceq.f16 q2, q3, q4
+[0x13,0xef,0x04,0x2e]
+[0x16,0xef,0x48,0x4e]
+
+# CHECK: vceq.f16 d2, d3, #0
+# CHECK: vceq.f16 q2, q3, #0
+[0xb5,0xff,0x03,0x25]
+[0xb5,0xff,0x46,0x45]
+
+# CHECK: vcge.f16 d2, d3, d4
+# CHECK: vcge.f16 q2, q3, q4
+[0x13,0xff,0x04,0x2e]
+[0x16,0xff,0x48,0x4e]
+
+# CHECK: vcge.f16 d2, d3, #0
+# CHECK: vcge.f16 q2, q3, #0
+[0xb5,0xff,0x83,0x24]
+[0xb5,0xff,0xc6,0x44]
+
+# CHECK: vcgt.f16 d2, d3, d4
+# CHECK: vcgt.f16 q2, q3, q4
+[0x33,0xff,0x04,0x2e]
+[0x36,0xff,0x48,0x4e]
+
+# CHECK: vcgt.f16 d2, d3, #0
+# CHECK: vcgt.f16 q2, q3, #0
+[0xb5,0xff,0x03,0x24]
+[0xb5,0xff,0x46,0x44]
+
+# CHECK: vcle.f16 d2, d3, #0
+# CHECK: vcle.f16 q2, q3, #0
+[0xb5,0xff,0x83,0x25]
+[0xb5,0xff,0xc6,0x45]
+
+# CHECK: vclt.f16 d2, d3, #0
+# CHECK: vclt.f16 q2, q3, #0
+[0xb5,0xff,0x03,0x26]
+[0xb5,0xff,0x46,0x46]
+
+# CHECK: vacge.f16 d0, d1, d2
+# CHECK: vacge.f16 q0, q1, q2
+[0x11,0xff,0x12,0x0e]
+[0x12,0xff,0x54,0x0e]
+
+# CHECK: vacgt.f16 d0, d1, d2
+# CHECK: vacgt.f16 q0, q1, q2
+[0x31,0xff,0x12,0x0e]
+[0x32,0xff,0x54,0x0e]
+
+# CHECK: vabd.f16 d0, d1, d2
+# CHECK: vabd.f16 q0, q1, q2
+[0x31,0xff,0x02,0x0d]
+[0x32,0xff,0x44,0x0d]
+
+# CHECK: vabs.f16 d0, d1
+# CHECK: vabs.f16 q0, q1
+[0xb5,0xff,0x01,0x07]
+[0xb5,0xff,0x42,0x07]
+
+# CHECK: vmax.f16 d0, d1, d2
+# CHECK: vmax.f16 q0, q1, q2
+[0x11,0xef,0x02,0x0f]
+[0x12,0xef,0x44,0x0f]
+
+# CHECK: vmin.f16 d0, d1, d2
+# CHECK: vmin.f16 q0, q1, q2
+[0x31,0xef,0x02,0x0f]
+[0x32,0xef,0x44,0x0f]
+
+# CHECK: vmaxnm.f16 d0, d1, d2
+# CHECK: vmaxnm.f16 q0, q1, q2
+[0x11,0xff,0x12,0x0f]
+[0x12,0xff,0x54,0x0f]
+
+# CHECK: vminnm.f16 d0, d1, d2
+# CHECK: vminnm.f16 q0, q1, q2
+[0x31,0xff,0x12,0x0f]
+[0x32,0xff,0x54,0x0f]
+
+# CHECK: vpadd.f16 d0, d1, d2
+[0x11,0xff,0x02,0x0d]
+
+# CHECK: vpmax.f16 d0, d1, d2
+[0x11,0xff,0x02,0x0f]
+
+# CHECK: vpmin.f16 d0, d1, d2
+[0x31,0xff,0x02,0x0f]
+
+# CHECK: vrecpe.f16 d0, d1
+# CHECK: vrecpe.f16 q0, q1
+[0xb7,0xff,0x01,0x05]
+[0xb7,0xff,0x42,0x05]
+
+# CHECK: vrecps.f16 d0, d1, d2
+# CHECK: vrecps.f16 q0, q1, q2
+[0x11,0xef,0x12,0x0f]
+[0x12,0xef,0x54,0x0f]
+
+# CHECK: vrsqrte.f16 d0, d1
+# CHECK: vrsqrte.f16 q0, q1
+[0xb7,0xff,0x81,0x05]
+[0xb7,0xff,0xc2,0x05]
+
+# CHECK: vrsqrts.f16 d0, d1, d2
+# CHECK: vrsqrts.f16 q0, q1, q2
+[0x31,0xef,0x12,0x0f]
+[0x32,0xef,0x54,0x0f]
+
+# CHECK: vneg.f16 d0, d1
+# CHECK: vneg.f16 q0, q1
+[0xb5,0xff,0x81,0x07]
+[0xb5,0xff,0xc2,0x07]
+
+# CHECK: vcvt.s16.f16 d0, d1
+# CHECK: vcvt.u16.f16 d0, d1
+# CHECK: vcvt.f16.s16 d0, d1
+# CHECK: vcvt.f16.u16 d0, d1
+# CHECK: vcvt.s16.f16 q0, q1
+# CHECK: vcvt.u16.f16 q0, q1
+# CHECK: vcvt.f16.s16 q0, q1
+# CHECK: vcvt.f16.u16 q0, q1
+[0xb7,0xff,0x01,0x07]
+[0xb7,0xff,0x81,0x07]
+[0xb7,0xff,0x01,0x06]
+[0xb7,0xff,0x81,0x06]
+[0xb7,0xff,0x42,0x07]
+[0xb7,0xff,0xc2,0x07]
+[0xb7,0xff,0x42,0x06]
+[0xb7,0xff,0xc2,0x06]
+
+# CHECK: vcvta.s16.f16 d0, d1
+# CHECK: vcvta.s16.f16 q0, q1
+# CHECK: vcvta.u16.f16 d0, d1
+# CHECK: vcvta.u16.f16 q0, q1
+[0xb7,0xff,0x01,0x00]
+[0xb7,0xff,0x42,0x00]
+[0xb7,0xff,0x81,0x00]
+[0xb7,0xff,0xc2,0x00]
+
+# CHECK: vcvtm.s16.f16 d0, d1
+# CHECK: vcvtm.s16.f16 q0, q1
+# CHECK: vcvtm.u16.f16 d0, d1
+# CHECK: vcvtm.u16.f16 q0, q1
+[0xb7,0xff,0x01,0x03]
+[0xb7,0xff,0x42,0x03]
+[0xb7,0xff,0x81,0x03]
+[0xb7,0xff,0xc2,0x03]
+
+# CHECK: vcvtn.s16.f16 d0, d1
+# CHECK: vcvtn.s16.f16 q0, q1
+# CHECK: vcvtn.u16.f16 d0, d1
+# CHECK: vcvtn.u16.f16 q0, q1
+[0xb7,0xff,0x01,0x01]
+[0xb7,0xff,0x42,0x01]
+[0xb7,0xff,0x81,0x01]
+[0xb7,0xff,0xc2,0x01]
+
+# CHECK: vcvtp.s16.f16 d0, d1
+# CHECK: vcvtp.s16.f16 q0, q1
+# CHECK: vcvtp.u16.f16 d0, d1
+# CHECK: vcvtp.u16.f16 q0, q1
+[0xb7,0xff,0x01,0x02]
+[0xb7,0xff,0x42,0x02]
+[0xb7,0xff,0x81,0x02]
+[0xb7,0xff,0xc2,0x02]
+
+# CHECK: vcvt.s16.f16 d0, d1, #1
+# CHECK: vcvt.u16.f16 d0, d1, #2
+# CHECK: vcvt.f16.s16 d0, d1, #3
+# CHECK: vcvt.f16.u16 d0, d1, #4
+# CHECK: vcvt.s16.f16 q0, q1, #5
+# CHECK: vcvt.u16.f16 q0, q1, #6
+# CHECK: vcvt.f16.s16 q0, q1, #7
+# CHECK: vcvt.f16.u16 q0, q1, #8
+[0xbf,0xef,0x11,0x0d]
+[0xbe,0xff,0x11,0x0d]
+[0xbd,0xef,0x11,0x0c]
+[0xbc,0xff,0x11,0x0c]
+[0xbb,0xef,0x52,0x0d]
+[0xba,0xff,0x52,0x0d]
+[0xb9,0xef,0x52,0x0c]
+[0xb8,0xff,0x52,0x0c]
+
+# CHECK: vrinta.f16 d0, d1
+# CHECK: vrinta.f16 q0, q1
+[0xb6,0xff,0x01,0x05]
+[0xb6,0xff,0x42,0x05]
+
+# CHECK: vrintm.f16 d0, d1
+# CHECK: vrintm.f16 q0, q1
+[0xb6,0xff,0x81,0x06]
+[0xb6,0xff,0xc2,0x06]
+
+# CHECK: vrintn.f16 d0, d1
+# CHECK: vrintn.f16 q0, q1
+[0xb6,0xff,0x01,0x04]
+[0xb6,0xff,0x42,0x04]
+
+# CHECK: vrintp.f16 d0, d1
+# CHECK: vrintp.f16 q0, q1
+[0xb6,0xff,0x81,0x07]
+[0xb6,0xff,0xc2,0x07]
+
+# CHECK: vrintx.f16 d0, d1
+# CHECK: vrintx.f16 q0, q1
+[0xb6,0xff,0x81,0x04]
+[0xb6,0xff,0xc2,0x04]
+
+# CHECK: vrintz.f16 d0, d1
+# CHECK: vrintz.f16 q0, q1
+[0xb6,0xff,0x81,0x05]
+[0xb6,0xff,0xc2,0x05]
+
+# Existing VMOV(immediate, Advanced SIMD) instructions within the encoding
+# space of the new FP16 VCVT(between floating - point and fixed - point,
+# Advanced SIMD):
+# 1 -- VCVT op
+# 2 -- VCVT FP size
+# 4 -- Q
+# 2 -- VMOV op
+[0xc7,0xef,0x10,0x0c]
+[0xc7,0xef,0x10,0x0d]
+[0xc7,0xef,0x10,0x0e]
+[0xc7,0xef,0x10,0x0f]
+[0xc7,0xef,0x20,0x0c]
+[0xc7,0xef,0x20,0x0d]
+[0xc7,0xef,0x20,0x0e]
+[0xc7,0xef,0x20,0x0f]
+[0xc7,0xef,0x50,0x0c]
+[0xc7,0xef,0x50,0x0d]
+[0xc7,0xef,0x50,0x0e]
+[0xc7,0xef,0x50,0x0f]
+[0xc7,0xef,0x70,0x0c]
+[0xc7,0xef,0x70,0x0d]
+[0xc7,0xef,0x70,0x0e]
+[0xc7,0xef,0x70,0x0f]
+# CHECK: vmov.i32 d16, #0x70ff
+# CHECK: vmov.i32 d16, #0x70ffff
+# CHECK: vmov.i8 d16, #0x70
+# CHECK: vmov.f32 d16, #1.000000e+00
+# CHECK: vmull.s8 q8, d7, d16
+# STDERR: warning: invalid instruction encoding
+# STDERR-NEXT: [0x20,0x0d,0xc7,0xf2]
+# CHECK: vmull.p8 q8, d7, d16
+# STDERR: warning: invalid instruction encoding
+# STDERR-NEXT: [0x20,0x0f,0xc7,0xf2]
+# CHECK: vmov.i32 q8, #0x70ff
+# CHECK: vmov.i32 q8, #0x70ffff
+# CHECK: vmov.i8 q8, #0x70
+# CHECK: vmov.f32 q8, #1.000000e+00
+# CHECK: vmvn.i32 q8, #0x70ff
+# CHECK: vmvn.i32 q8, #0x70ffff
+# CHECK: vmov.i64 q8, #0xffffff0000000
+# STDERR: warning: invalid instruction encoding
+# STDERR-NEXT: [0x70,0x0f,0xc7,0xf2]
diff --git a/test/MC/Disassembler/ARM/invalid-thumbv7.txt b/test/MC/Disassembler/ARM/invalid-thumbv7.txt
index 5257633e579f..512fc5d237e1 100644
--- a/test/MC/Disassembler/ARM/invalid-thumbv7.txt
+++ b/test/MC/Disassembler/ARM/invalid-thumbv7.txt
@@ -1,4 +1,5 @@
-# RUN: not llvm-mc -disassemble %s -mcpu cortex-a8 -triple thumbv7 2>&1 | FileCheck %s
+# RUN: not llvm-mc -disassemble %s -mcpu cortex-a8 -triple thumbv7 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-V7
+# RUN: not llvm-mc -disassemble %s -mcpu cortex-a53 -triple thumbv8 2>&1 | FileCheck %s
# This file is checking Thumbv7 encodings which are globally invalid, usually due
# to the constraints of the instructions not being met. For example invalid
@@ -359,10 +360,22 @@
# 32-bit Thumb STM instructions cannot have a writeback register which appears
# in the list.
-[0xa1,0xe8,0x07,0x04]
+[0xa1 0xe8 0x07 0x04]
# CHECK: warning: potentially undefined instruction encoding
-# CHECK-NEXT: [0xa1,0xe8,0x07,0x04]
+# CHECK-NEXT: [0xa1 0xe8 0x07 0x04]
-[0x21,0xe9,0x07,0x04]
+[0x21 0xe9 0x07 0x04]
# CHECK: warning: potentially undefined instruction encoding
-# CHECK-NEXT: [0x21,0xe9,0x07,0x04]
+# CHECK-NEXT: [0x21 0xe9 0x07 0x04]
+
+#------------------------------------------------------------------------------
+# SP is invalid as rGPR before ARMv8
+#------------------------------------------------------------------------------
+
+[0x00 0xf0 0x00 0x0d]
+# CHECK-V7: warning: potentially undefined instruction encoding
+# CHECK-V7-NEXT: [0x00 0xf0 0x00 0x0d]
+
+[0x63 0xeb 0x2d 0x46]
+# CHECK-V7: warning: potentially undefined instruction encoding
+# CHECK-V7-NEXT: [0x63 0xeb 0x2d 0x46]
diff --git a/test/MC/Disassembler/ARM/thumb-v8.txt b/test/MC/Disassembler/ARM/thumb-v8.txt
index eb5ffea7d667..1bcf654a4795 100644
--- a/test/MC/Disassembler/ARM/thumb-v8.txt
+++ b/test/MC/Disassembler/ARM/thumb-v8.txt
@@ -1,4 +1,5 @@
-# RUN: llvm-mc -disassemble -triple thumbv8 -mattr=+db -show-encoding < %s | FileCheck %s
+# RUN: llvm-mc -disassemble -triple thumbv8 -mattr=+db -show-encoding 2>%t < %s | FileCheck %s
+# RUN: FileCheck -allow-empty -check-prefix=STDERR < %t %s
0x80 0xba
# CHECK: hlt #0
@@ -26,3 +27,10 @@
# CHECK: dmb oshld
# CHECK: dmb nshld
# CHECK: dmb ld
+
+[0x00 0xf0 0x00 0x0d]
+[0x63 0xeb 0x2d 0x46]
+# CHECK: and sp, r0, #0
+# CHECK: sbc.w r6, r3, sp, asr #16
+
+# STDERR-NOT: warning
diff --git a/test/MC/Disassembler/Hexagon/invalid_packet.txt b/test/MC/Disassembler/Hexagon/invalid_packet.txt
new file mode 100644
index 000000000000..8ce0ca90dc5c
--- /dev/null
+++ b/test/MC/Disassembler/Hexagon/invalid_packet.txt
@@ -0,0 +1,4 @@
+# RUN: llvm-mc -triple=hexagon -disassemble < %s 2>&1 | FileCheck %s
+
+#CHECK: warning: invalid instruction encoding
+0x00 0x40 0x20 0x6c 0x00 0xc0 0x00 0x7f \ No newline at end of file
diff --git a/test/MC/Disassembler/Hexagon/j.txt b/test/MC/Disassembler/Hexagon/j.txt
index 0c2cc7a4cf34..661670e2a614 100644
--- a/test/MC/Disassembler/Hexagon/j.txt
+++ b/test/MC/Disassembler/Hexagon/j.txt
@@ -11,149 +11,149 @@
# Compare and jump
0x00 0xc0 0x89 0x11
-# CHECK: p0 = cmp.eq(r9,#-1); if (p0.new) jump:nt
+# CHECK: p0 = cmp.eq(r17,#-1); if (p0.new) jump:nt
0x00 0xc1 0x89 0x11
-# CHECK: p0 = cmp.gt(r9,#-1); if (p0.new) jump:nt
+# CHECK: p0 = cmp.gt(r17,#-1); if (p0.new) jump:nt
0x00 0xc3 0x89 0x11
-# CHECK: p0 = tstbit(r9, #0); if (p0.new) jump:nt
+# CHECK: p0 = tstbit(r17, #0); if (p0.new) jump:nt
0x00 0xe0 0x89 0x11
-# CHECK: p0 = cmp.eq(r9,#-1); if (p0.new) jump:t
+# CHECK: p0 = cmp.eq(r17,#-1); if (p0.new) jump:t
0x00 0xe1 0x89 0x11
-# CHECK: p0 = cmp.gt(r9,#-1); if (p0.new) jump:t
+# CHECK: p0 = cmp.gt(r17,#-1); if (p0.new) jump:t
0x00 0xe3 0x89 0x11
-# CHECK: p0 = tstbit(r9, #0); if (p0.new) jump:t
+# CHECK: p0 = tstbit(r17, #0); if (p0.new) jump:t
0x00 0xc0 0xc9 0x11
-# CHECK: p0 = cmp.eq(r9,#-1); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.eq(r17,#-1); if (!p0.new) jump:nt
0x00 0xc1 0xc9 0x11
-# CHECK: p0 = cmp.gt(r9,#-1); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.gt(r17,#-1); if (!p0.new) jump:nt
0x00 0xc3 0xc9 0x11
-# CHECK: p0 = tstbit(r9, #0); if (!p0.new) jump:nt
+# CHECK: p0 = tstbit(r17, #0); if (!p0.new) jump:nt
0x00 0xe0 0xc9 0x11
-# CHECK: p0 = cmp.eq(r9,#-1); if (!p0.new) jump:t
+# CHECK: p0 = cmp.eq(r17,#-1); if (!p0.new) jump:t
0x00 0xe1 0xc9 0x11
-# CHECK: p0 = cmp.gt(r9,#-1); if (!p0.new) jump:t
+# CHECK: p0 = cmp.gt(r17,#-1); if (!p0.new) jump:t
0x00 0xe3 0xc9 0x11
-# CHECK: p0 = tstbit(r9, #0); if (!p0.new) jump:t
+# CHECK: p0 = tstbit(r17, #0); if (!p0.new) jump:t
0x00 0xd5 0x09 0x10
-# CHECK: p0 = cmp.eq(r9, #21); if (p0.new) jump:nt
+# CHECK: p0 = cmp.eq(r17, #21); if (p0.new) jump:nt
0x00 0xf5 0x09 0x10
-# CHECK: p0 = cmp.eq(r9, #21); if (p0.new) jump:t
+# CHECK: p0 = cmp.eq(r17, #21); if (p0.new) jump:t
0x00 0xd5 0x49 0x10
-# CHECK: p0 = cmp.eq(r9, #21); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.eq(r17, #21); if (!p0.new) jump:nt
0x00 0xf5 0x49 0x10
-# CHECK: p0 = cmp.eq(r9, #21); if (!p0.new) jump:t
+# CHECK: p0 = cmp.eq(r17, #21); if (!p0.new) jump:t
0x00 0xd5 0x89 0x10
-# CHECK: p0 = cmp.gt(r9, #21); if (p0.new) jump:nt
+# CHECK: p0 = cmp.gt(r17, #21); if (p0.new) jump:nt
0x00 0xf5 0x89 0x10
-# CHECK: p0 = cmp.gt(r9, #21); if (p0.new) jump:t
+# CHECK: p0 = cmp.gt(r17, #21); if (p0.new) jump:t
0x00 0xd5 0xc9 0x10
-# CHECK: p0 = cmp.gt(r9, #21); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.gt(r17, #21); if (!p0.new) jump:nt
0x00 0xf5 0xc9 0x10
-# CHECK: p0 = cmp.gt(r9, #21); if (!p0.new) jump:t
+# CHECK: p0 = cmp.gt(r17, #21); if (!p0.new) jump:t
0x00 0xd5 0x09 0x11
-# CHECK: p0 = cmp.gtu(r9, #21); if (p0.new) jump:nt
+# CHECK: p0 = cmp.gtu(r17, #21); if (p0.new) jump:nt
0x00 0xf5 0x09 0x11
-# CHECK: p0 = cmp.gtu(r9, #21); if (p0.new) jump:t
+# CHECK: p0 = cmp.gtu(r17, #21); if (p0.new) jump:t
0x00 0xd5 0x49 0x11
-# CHECK: p0 = cmp.gtu(r9, #21); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.gtu(r17, #21); if (!p0.new) jump:nt
0x00 0xf5 0x49 0x11
-# CHECK: p0 = cmp.gtu(r9, #21); if (!p0.new) jump:t
+# CHECK: p0 = cmp.gtu(r17, #21); if (!p0.new) jump:t
0x00 0xc0 0x89 0x13
-# CHECK: p1 = cmp.eq(r9,#-1); if (p1.new) jump:nt
+# CHECK: p1 = cmp.eq(r17,#-1); if (p1.new) jump:nt
0x00 0xc1 0x89 0x13
-# CHECK: p1 = cmp.gt(r9,#-1); if (p1.new) jump:nt
+# CHECK: p1 = cmp.gt(r17,#-1); if (p1.new) jump:nt
0x00 0xc3 0x89 0x13
-# CHECK: p1 = tstbit(r9, #0); if (p1.new) jump:nt
+# CHECK: p1 = tstbit(r17, #0); if (p1.new) jump:nt
0x00 0xe0 0x89 0x13
-# CHECK: p1 = cmp.eq(r9,#-1); if (p1.new) jump:t
+# CHECK: p1 = cmp.eq(r17,#-1); if (p1.new) jump:t
0x00 0xe1 0x89 0x13
-# CHECK: p1 = cmp.gt(r9,#-1); if (p1.new) jump:t
+# CHECK: p1 = cmp.gt(r17,#-1); if (p1.new) jump:t
0x00 0xe3 0x89 0x13
-# CHECK: p1 = tstbit(r9, #0); if (p1.new) jump:t
+# CHECK: p1 = tstbit(r17, #0); if (p1.new) jump:t
0x00 0xc0 0xc9 0x13
-# CHECK: p1 = cmp.eq(r9,#-1); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.eq(r17,#-1); if (!p1.new) jump:nt
0x00 0xc1 0xc9 0x13
-# CHECK: p1 = cmp.gt(r9,#-1); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.gt(r17,#-1); if (!p1.new) jump:nt
0x00 0xc3 0xc9 0x13
-# CHECK: p1 = tstbit(r9, #0); if (!p1.new) jump:nt
+# CHECK: p1 = tstbit(r17, #0); if (!p1.new) jump:nt
0x00 0xe0 0xc9 0x13
-# CHECK: p1 = cmp.eq(r9,#-1); if (!p1.new) jump:t
+# CHECK: p1 = cmp.eq(r17,#-1); if (!p1.new) jump:t
0x00 0xe1 0xc9 0x13
-# CHECK: p1 = cmp.gt(r9,#-1); if (!p1.new) jump:t
+# CHECK: p1 = cmp.gt(r17,#-1); if (!p1.new) jump:t
0x00 0xe3 0xc9 0x13
-# CHECK: p1 = tstbit(r9, #0); if (!p1.new) jump:t
+# CHECK: p1 = tstbit(r17, #0); if (!p1.new) jump:t
0x00 0xd5 0x09 0x12
-# CHECK: p1 = cmp.eq(r9, #21); if (p1.new) jump:nt
+# CHECK: p1 = cmp.eq(r17, #21); if (p1.new) jump:nt
0x00 0xf5 0x09 0x12
-# CHECK: p1 = cmp.eq(r9, #21); if (p1.new) jump:t
+# CHECK: p1 = cmp.eq(r17, #21); if (p1.new) jump:t
0x00 0xd5 0x49 0x12
-# CHECK: p1 = cmp.eq(r9, #21); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.eq(r17, #21); if (!p1.new) jump:nt
0x00 0xf5 0x49 0x12
-# CHECK: p1 = cmp.eq(r9, #21); if (!p1.new) jump:t
+# CHECK: p1 = cmp.eq(r17, #21); if (!p1.new) jump:t
0x00 0xd5 0x89 0x12
-# CHECK: p1 = cmp.gt(r9, #21); if (p1.new) jump:nt
+# CHECK: p1 = cmp.gt(r17, #21); if (p1.new) jump:nt
0x00 0xf5 0x89 0x12
-# CHECK: p1 = cmp.gt(r9, #21); if (p1.new) jump:t
+# CHECK: p1 = cmp.gt(r17, #21); if (p1.new) jump:t
0x00 0xd5 0xc9 0x12
-# CHECK: p1 = cmp.gt(r9, #21); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.gt(r17, #21); if (!p1.new) jump:nt
0x00 0xf5 0xc9 0x12
-# CHECK: p1 = cmp.gt(r9, #21); if (!p1.new) jump:t
+# CHECK: p1 = cmp.gt(r17, #21); if (!p1.new) jump:t
0x00 0xd5 0x09 0x13
-# CHECK: p1 = cmp.gtu(r9, #21); if (p1.new) jump:nt
+# CHECK: p1 = cmp.gtu(r17, #21); if (p1.new) jump:nt
0x00 0xf5 0x09 0x13
-# CHECK: p1 = cmp.gtu(r9, #21); if (p1.new) jump:t
+# CHECK: p1 = cmp.gtu(r17, #21); if (p1.new) jump:t
0x00 0xd5 0x49 0x13
-# CHECK: p1 = cmp.gtu(r9, #21); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.gtu(r17, #21); if (!p1.new) jump:nt
0x00 0xf5 0x49 0x13
-# CHECK: p1 = cmp.gtu(r9, #21); if (!p1.new) jump:t
+# CHECK: p1 = cmp.gtu(r17, #21); if (!p1.new) jump:t
0x00 0xcd 0x09 0x14
-# CHECK: p0 = cmp.eq(r9, r13); if (p0.new) jump:nt
+# CHECK: p0 = cmp.eq(r17, r21); if (p0.new) jump:nt
0x00 0xdd 0x09 0x14
-# CHECK: p1 = cmp.eq(r9, r13); if (p1.new) jump:nt
+# CHECK: p1 = cmp.eq(r17, r21); if (p1.new) jump:nt
0x00 0xed 0x09 0x14
-# CHECK: p0 = cmp.eq(r9, r13); if (p0.new) jump:t
+# CHECK: p0 = cmp.eq(r17, r21); if (p0.new) jump:t
0x00 0xfd 0x09 0x14
-# CHECK: p1 = cmp.eq(r9, r13); if (p1.new) jump:t
+# CHECK: p1 = cmp.eq(r17, r21); if (p1.new) jump:t
0x00 0xcd 0x49 0x14
-# CHECK: p0 = cmp.eq(r9, r13); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.eq(r17, r21); if (!p0.new) jump:nt
0x00 0xdd 0x49 0x14
-# CHECK: p1 = cmp.eq(r9, r13); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.eq(r17, r21); if (!p1.new) jump:nt
0x00 0xed 0x49 0x14
-# CHECK: p0 = cmp.eq(r9, r13); if (!p0.new) jump:t
+# CHECK: p0 = cmp.eq(r17, r21); if (!p0.new) jump:t
0x00 0xfd 0x49 0x14
-# CHECK: p1 = cmp.eq(r9, r13); if (!p1.new) jump:t
+# CHECK: p1 = cmp.eq(r17, r21); if (!p1.new) jump:t
0x00 0xcd 0x89 0x14
-# CHECK: p0 = cmp.gt(r9, r13); if (p0.new) jump:nt
+# CHECK: p0 = cmp.gt(r17, r21); if (p0.new) jump:nt
0x00 0xdd 0x89 0x14
-# CHECK: p1 = cmp.gt(r9, r13); if (p1.new) jump:nt
+# CHECK: p1 = cmp.gt(r17, r21); if (p1.new) jump:nt
0x00 0xed 0x89 0x14
-# CHECK: p0 = cmp.gt(r9, r13); if (p0.new) jump:t
+# CHECK: p0 = cmp.gt(r17, r21); if (p0.new) jump:t
0x00 0xfd 0x89 0x14
-# CHECK: p1 = cmp.gt(r9, r13); if (p1.new) jump:t
+# CHECK: p1 = cmp.gt(r17, r21); if (p1.new) jump:t
0x00 0xcd 0xc9 0x14
-# CHECK: p0 = cmp.gt(r9, r13); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.gt(r17, r21); if (!p0.new) jump:nt
0x00 0xdd 0xc9 0x14
-# CHECK: p1 = cmp.gt(r9, r13); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.gt(r17, r21); if (!p1.new) jump:nt
0x00 0xed 0xc9 0x14
-# CHECK: p0 = cmp.gt(r9, r13); if (!p0.new) jump:t
+# CHECK: p0 = cmp.gt(r17, r21); if (!p0.new) jump:t
0x00 0xfd 0xc9 0x14
-# CHECK: p1 = cmp.gt(r9, r13); if (!p1.new) jump:t
+# CHECK: p1 = cmp.gt(r17, r21); if (!p1.new) jump:t
0x00 0xcd 0x09 0x15
-# CHECK: p0 = cmp.gtu(r9, r13); if (p0.new) jump:nt
+# CHECK: p0 = cmp.gtu(r17, r21); if (p0.new) jump:nt
0x00 0xdd 0x09 0x15
-# CHECK: p1 = cmp.gtu(r9, r13); if (p1.new) jump:nt
+# CHECK: p1 = cmp.gtu(r17, r21); if (p1.new) jump:nt
0x00 0xed 0x09 0x15
-# CHECK: p0 = cmp.gtu(r9, r13); if (p0.new) jump:t
+# CHECK: p0 = cmp.gtu(r17, r21); if (p0.new) jump:t
0x00 0xfd 0x09 0x15
-# CHECK: p1 = cmp.gtu(r9, r13); if (p1.new) jump:t
+# CHECK: p1 = cmp.gtu(r17, r21); if (p1.new) jump:t
0x00 0xcd 0x49 0x15
-# CHECK: p0 = cmp.gtu(r9, r13); if (!p0.new) jump:nt
+# CHECK: p0 = cmp.gtu(r17, r21); if (!p0.new) jump:nt
0x00 0xdd 0x49 0x15
-# CHECK: p1 = cmp.gtu(r9, r13); if (!p1.new) jump:nt
+# CHECK: p1 = cmp.gtu(r17, r21); if (!p1.new) jump:nt
0x00 0xed 0x49 0x15
-# CHECK: p0 = cmp.gtu(r9, r13); if (!p0.new) jump:t
+# CHECK: p0 = cmp.gtu(r17, r21); if (!p0.new) jump:t
0x00 0xfd 0x49 0x15
-# CHECK: p1 = cmp.gtu(r9, r13); if (!p1.new) jump:t
+# CHECK: p1 = cmp.gtu(r17, r21); if (!p1.new) jump:t
# Jump to address
0x22 0xc0 0x00 0x58
@@ -197,6 +197,6 @@
# Transfer and jump
0x00 0xd5 0x09 0x16
-# CHECK: r9 = #21 ; jump
+# CHECK: r17 = #21 ; jump
0x00 0xc9 0x0d 0x17
-# CHECK: r9 = r13 ; jump
+# CHECK: r17 = r21 ; jump
diff --git a/test/MC/Disassembler/Hexagon/ld.txt b/test/MC/Disassembler/Hexagon/ld.txt
index 15c23b644886..56e00fd94f56 100644
--- a/test/MC/Disassembler/Hexagon/ld.txt
+++ b/test/MC/Disassembler/Hexagon/ld.txt
@@ -4,12 +4,18 @@
# Load doubleword
0x90 0xff 0xd5 0x3a
# CHECK: r17:16 = memd(r21 + r31<<#3)
-0x10 0xc5 0xc0 0x49
-# CHECK: r17:16 = memd(##320)
+0xb0 0xc2 0xc0 0x49
+# CHECK: r17:16 = memd(#168)
+0x02 0x40 0x00 0x00 0x10 0xc5 0xc0 0x49
+# CHECK: r17:16 = memd(##168)
+0xd0 0xc0 0xd5 0x91
+# CHECK: r17:16 = memd(r21 + #48)
0xb0 0xe0 0xd5 0x99
# CHECK: r17:16 = memd(r21 ++ #40:circ(m1))
0x10 0xe2 0xd5 0x99
# CHECK: r17:16 = memd(r21 ++ I:circ(m1))
+0x00 0x40 0x00 0x00 0x70 0xd7 0xd5 0x9b
+# CHECK: r17:16 = memd(r21 = ##31)
0xb0 0xc0 0xd5 0x9b
# CHECK: r17:16 = memd(r21++#40)
0x10 0xe0 0xd5 0x9d
@@ -53,6 +59,8 @@
0x91 0xff 0x15 0x3a
# CHECK: r17 = memb(r21 + r31<<#3)
0xb1 0xc2 0x00 0x49
+# CHECK: r17 = memb(#21)
+0x00 0x40 0x00 0x00 0xb1 0xc2 0x00 0x49
# CHECK: r17 = memb(##21)
0xf1 0xc3 0x15 0x91
# CHECK: r17 = memb(r21 + #31)
@@ -60,6 +68,8 @@
# CHECK: r17 = memb(r21 ++ #5:circ(m1))
0x11 0xe2 0x15 0x99
# CHECK: r17 = memb(r21 ++ I:circ(m1))
+0x00 0x40 0x00 0x00 0x71 0xd7 0x15 0x9b
+# CHECK: r17 = memb(r21 = ##31)
0xb1 0xc0 0x15 0x9b
# CHECK: r17 = memb(r21++#5)
0x11 0xe0 0x15 0x9d
@@ -99,17 +109,37 @@
# CHECK: p3 = r5
# CHECK-NEXT: if (!p3.new) r17 = memb(r21++#5)
+# Load byte into shifted vector
+0xf0 0xc3 0x95 0x90
+# CHECK: r17:16 = memb_fifo(r21 + #31)
+0xb0 0xe0 0x95 0x98
+# CHECK: r17:16 = memb_fifo(r21 ++ #5:circ(m1))
+0x10 0xe2 0x95 0x98
+# CHECK: r17:16 = memb_fifo(r21 ++ I:circ(m1))
+
+# Load half into shifted vector
+0xf0 0xc3 0x55 0x90
+# CHECK: r17:16 = memh_fifo(r21 + #62)
+0xb0 0xe0 0x55 0x98
+# CHECK: r17:16 = memh_fifo(r21 ++ #10:circ(m1))
+0x10 0xe2 0x55 0x98
+# CHECK: r17:16 = memh_fifo(r21 ++ I:circ(m1))
+
# Load halfword
0x91 0xff 0x55 0x3a
# CHECK: r17 = memh(r21 + r31<<#3)
-0x51 0xc5 0x40 0x49
-# CHECK: r17 = memh(##84)
+0xb1 0xc2 0x40 0x49
+# CHECK: r17 = memh(#42)
+0x00 0x40 0x00 0x00 0x51 0xc5 0x40 0x49
+# CHECK: r17 = memh(##42)
0xf1 0xc3 0x55 0x91
# CHECK: r17 = memh(r21 + #62)
0xb1 0xe0 0x55 0x99
# CHECK: r17 = memh(r21 ++ #10:circ(m1))
0x11 0xe2 0x55 0x99
# CHECK: r17 = memh(r21 ++ I:circ(m1))
+0x00 0x40 0x00 0x00 0x71 0xd7 0x55 0x9b
+# CHECK: r17 = memh(r21 = ##31)
0xb1 0xc0 0x55 0x9b
# CHECK: r17 = memh(r21++#10)
0x11 0xe0 0x55 0x9d
@@ -138,11 +168,23 @@
0x03 0x40 0x45 0x85 0xb1 0xfe 0x55 0x9b
# CHECK: p3 = r5
# CHECK-NEXT: if (!p3.new) r17 = memh(r21++#10)
+0xf1 0xdb 0x55 0x41
+# CHECK: if (p3) r17 = memh(r21 + #62)
+0xf1 0xdb 0x55 0x45
+# CHECK: if (!p3) r17 = memh(r21 + #62)
+0x03 0x40 0x45 0x85 0xf1 0xdb 0x55 0x43
+# CHECK: p3 = r5
+# CHECK-NEXT: if (p3.new) r17 = memh(r21 + #62)
+0x03 0x40 0x45 0x85 0xf1 0xdb 0x55 0x47
+# CHECK: p3 = r5
+# CHECK-NEXT: if (!p3.new) r17 = memh(r21 + #62)
# Load unsigned byte
0x91 0xff 0x35 0x3a
# CHECK: r17 = memub(r21 + r31<<#3)
0xb1 0xc2 0x20 0x49
+# CHECK: r17 = memub(#21)
+0x00 0x40 0x00 0x00 0xb1 0xc2 0x20 0x49
# CHECK: r17 = memub(##21)
0xf1 0xc3 0x35 0x91
# CHECK: r17 = memub(r21 + #31)
@@ -150,6 +192,8 @@
# CHECK: r17 = memub(r21 ++ #5:circ(m1))
0x11 0xe2 0x35 0x99
# CHECK: r17 = memub(r21 ++ I:circ(m1))
+0x00 0x40 0x00 0x00 0x71 0xd7 0x35 0x9b
+# CHECK: r17 = memub(r21 = ##31)
0xb1 0xc0 0x35 0x9b
# CHECK: r17 = memub(r21++#5)
0x11 0xe0 0x35 0x9d
@@ -192,14 +236,18 @@
# Load unsigned halfword
0x91 0xff 0x75 0x3a
# CHECK: r17 = memuh(r21 + r31<<#3)
-0x51 0xc5 0x60 0x49
-# CHECK: r17 = memuh(##84)
+0xb1 0xc2 0x60 0x49
+# CHECK: r17 = memuh(#42)
+0x00 0x40 0x00 0x00 0x51 0xc5 0x60 0x49
+# CHECK: r17 = memuh(##42)
0xb1 0xc2 0x75 0x91
# CHECK: r17 = memuh(r21 + #42)
0xb1 0xe0 0x75 0x99
# CHECK: r17 = memuh(r21 ++ #10:circ(m1))
0x11 0xe2 0x75 0x99
# CHECK: r17 = memuh(r21 ++ I:circ(m1))
+0x00 0x40 0x00 0x00 0x71 0xd7 0x75 0x9b
+# CHECK: r17 = memuh(r21 = ##31)
0xb1 0xc0 0x75 0x9b
# CHECK: r17 = memuh(r21++#10)
0x11 0xe0 0x75 0x9d
@@ -242,14 +290,18 @@
# Load word
0x91 0xff 0x95 0x3a
# CHECK: r17 = memw(r21 + r31<<#3)
-0x91 0xc2 0x80 0x49
-# CHECK: r17 = memw(##80)
+0xb1 0xc2 0x80 0x49
+# CHECK: r17 = memw(#84)
+0x01 0x40 0x00 0x00 0x91 0xc2 0x80 0x49
+# CHECK: r17 = memw(##84)
0xb1 0xc2 0x95 0x91
# CHECK: r17 = memw(r21 + #84)
0xb1 0xe0 0x95 0x99
# CHECK: r17 = memw(r21 ++ #20:circ(m1))
0x11 0xe2 0x95 0x99
# CHECK: r17 = memw(r21 ++ I:circ(m1))
+0x00 0x40 0x00 0x00 0x71 0xd7 0x95 0x9b
+# CHECK: r17 = memw(r21 = ##31)
0xb1 0xc0 0x95 0x9b
# CHECK: r17 = memw(r21++#20)
0x11 0xe0 0x95 0x9d
@@ -338,14 +390,36 @@
# CHECK: r17:16 = memubh(r21 ++ #20:circ(m1))
0x10 0xe2 0xb5 0x98
# CHECK: r17:16 = memubh(r21 ++ I:circ(m1))
+0x00 0x40 0x00 0x00 0x71 0xd7 0x35 0x9a
+# CHECK: r17 = membh(r21 = ##31)
0xb1 0xc0 0x35 0x9a
# CHECK: r17 = membh(r21++#10)
+0x00 0x40 0x00 0x00 0x71 0xd7 0x75 0x9a
+# CHECK: r17 = memubh(r21 = ##31)
0xb1 0xc0 0x75 0x9a
# CHECK: r17 = memubh(r21++#10)
+0x00 0x40 0x00 0x00 0x70 0xd7 0xb5 0x9a
+# CHECK: r17:16 = memubh(r21 = ##31)
0xb0 0xc0 0xb5 0x9a
# CHECK: r17:16 = memubh(r21++#20)
+0x00 0x40 0x00 0x00 0x70 0xd7 0xf5 0x9a
+# CHECK: r17:16 = membh(r21 = ##31)
0xb0 0xc0 0xf5 0x9a
# CHECK: r17:16 = membh(r21++#20)
+0x00 0x40 0x00 0x00 0xf1 0xf7 0x35 0x9c
+# CHECK: r17 = membh(r21<<#3 + ##31)
+0x11 0xe0 0x35 0x9c
+# CHECK: r17 = membh(r21++m1)
+0x00 0x40 0x00 0x00 0xf1 0xf7 0x75 0x9c
+# CHECK: r17 = memubh(r21<<#3 + ##31)
+0x11 0xe0 0x75 0x9c
+# CHECK: r17 = memubh(r21++m1)
+0x00 0x40 0x00 0x00 0xf0 0xf7 0xf5 0x9c
+# CHECK: r17:16 = membh(r21<<#3 + ##31)
+0x10 0xe0 0xf5 0x9c
+# CHECK: r17:16 = membh(r21++m1)
+0x00 0x40 0x00 0x00 0xf0 0xf7 0xb5 0x9c
+# CHECK: r17:16 = memubh(r21<<#3 + ##31)
0x11 0xe0 0x35 0x9c
# CHECK: r17 = membh(r21++m1)
0x11 0xe0 0x75 0x9c
diff --git a/test/MC/Disassembler/Hexagon/lit.local.cfg b/test/MC/Disassembler/Hexagon/lit.local.cfg
index 6500d4dd7d5a..ba72ff632d4e 100644
--- a/test/MC/Disassembler/Hexagon/lit.local.cfg
+++ b/test/MC/Disassembler/Hexagon/lit.local.cfg
@@ -1,3 +1,3 @@
-if not 'Hexagon' in config.root.targets:
- config.unsupported = True
-
+if not 'Hexagon' in config.root.targets:
+ config.unsupported = True
+
diff --git a/test/MC/Disassembler/Hexagon/nv_j.txt b/test/MC/Disassembler/Hexagon/nv_j.txt
index a6773c3f3c56..2135b5a039f6 100644
--- a/test/MC/Disassembler/Hexagon/nv_j.txt
+++ b/test/MC/Disassembler/Hexagon/nv_j.txt
@@ -4,133 +4,133 @@
# Jump to address conditioned on new register value
0x11 0x40 0x71 0x70 0x92 0xd5 0x02 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.eq(r2.new, r21)) jump:nt
+# CHECK-NEXT: if (cmp.eq(r17.new, r21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x02 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.eq(r2.new, r21)) jump:t
+# CHECK-NEXT: if (cmp.eq(r17.new, r21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x42 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.eq(r2.new, r21)) jump:nt
+# CHECK-NEXT: if (!cmp.eq(r17.new, r21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x42 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.eq(r2.new, r21)) jump:t
+# CHECK-NEXT: if (!cmp.eq(r17.new, r21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x82 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r2.new, r21)) jump:nt
+# CHECK-NEXT: if (cmp.gt(r17.new, r21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x82 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r2.new, r21)) jump:t
+# CHECK-NEXT: if (cmp.gt(r17.new, r21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0xc2 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r2.new, r21)) jump:nt
+# CHECK-NEXT: if (!cmp.gt(r17.new, r21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0xc2 0x20
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r2.new, r21)) jump:t
+# CHECK-NEXT: if (!cmp.gt(r17.new, r21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x02 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gtu(r2.new, r21)) jump:nt
+# CHECK-NEXT: if (cmp.gtu(r17.new, r21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x02 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gtu(r2.new, r21)) jump:t
+# CHECK-NEXT: if (cmp.gtu(r17.new, r21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x42 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gtu(r2.new, r21)) jump:nt
+# CHECK-NEXT: if (!cmp.gtu(r17.new, r21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x42 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gtu(r2.new, r21)) jump:t
+# CHECK-NEXT: if (!cmp.gtu(r17.new, r21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x82 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r21, r2.new)) jump:nt
+# CHECK-NEXT: if (cmp.gt(r21, r17.new)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x82 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r21, r2.new)) jump:t
+# CHECK-NEXT: if (cmp.gt(r21, r17.new)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0xc2 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r21, r2.new)) jump:nt
+# CHECK-NEXT: if (!cmp.gt(r21, r17.new)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0xc2 0x21
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r21, r2.new)) jump:t
+# CHECK-NEXT: if (!cmp.gt(r21, r17.new)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x02 0x22
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gtu(r21, r2.new)) jump:nt
+# CHECK-NEXT: if (cmp.gtu(r21, r17.new)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x02 0x22
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gtu(r21, r2.new)) jump:t
+# CHECK-NEXT: if (cmp.gtu(r21, r17.new)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x42 0x22
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gtu(r21, r2.new)) jump:nt
+# CHECK-NEXT: if (!cmp.gtu(r21, r17.new)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x42 0x22
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gtu(r21, r2.new)) jump:t
+# CHECK-NEXT: if (!cmp.gtu(r21, r17.new)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x02 0x24
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.eq(r2.new, #21)) jump:nt
+# CHECK-NEXT: if (cmp.eq(r17.new, #21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x02 0x24
# CHECK: r17 = r17
-# CHECK-NETX: if (cmp.eq(r2.new, #21)) jump:t
+# CHECK-NETX: if (cmp.eq(r17.new, #21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x42 0x24
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.eq(r2.new, #21)) jump:nt
+# CHECK-NEXT: if (!cmp.eq(r17.new, #21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x42 0x24
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.eq(r2.new, #21)) jump:t
+# CHECK-NEXT: if (!cmp.eq(r17.new, #21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x82 0x24
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r2.new, #21)) jump:nt
+# CHECK-NEXT: if (cmp.gt(r17.new, #21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x82 0x24
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r2.new, #21)) jump:t
+# CHECK-NEXT: if (cmp.gt(r17.new, #21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0xc2 0x24
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r2.new, #21)) jump:nt
+# CHECK-NEXT: if (!cmp.gt(r17.new, #21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0xc2 0x24
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r2.new, #21)) jump:t
+# CHECK-NEXT: if (!cmp.gt(r17.new, #21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x02 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gtu(r2.new, #21)) jump:nt
+# CHECK-NEXT: if (cmp.gtu(r17.new, #21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x02 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gtu(r2.new, #21)) jump:t
+# CHECK-NEXT: if (cmp.gtu(r17.new, #21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xd5 0x42 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gtu(r2.new, #21)) jump:nt
+# CHECK-NEXT: if (!cmp.gtu(r17.new, #21)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xf5 0x42 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gtu(r2.new, #21)) jump:t
+# CHECK-NEXT: if (!cmp.gtu(r17.new, #21)) jump:t
0x11 0x40 0x71 0x70 0x92 0xc0 0x82 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (tstbit(r2.new, #0)) jump:nt
+# CHECK-NEXT: if (tstbit(r17.new, #0)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xe0 0x82 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (tstbit(r2.new, #0)) jump:t
+# CHECK-NEXT: if (tstbit(r17.new, #0)) jump:t
0x11 0x40 0x71 0x70 0x92 0xc0 0xc2 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (!tstbit(r2.new, #0)) jump:nt
+# CHECK-NEXT: if (!tstbit(r17.new, #0)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xe0 0xc2 0x25
# CHECK: r17 = r17
-# CHECK-NEXT: if (!tstbit(r2.new, #0)) jump:t
+# CHECK-NEXT: if (!tstbit(r17.new, #0)) jump:t
0x11 0x40 0x71 0x70 0x92 0xc0 0x02 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.eq(r2.new, #-1)) jump:nt
+# CHECK-NEXT: if (cmp.eq(r17.new, #-1)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xe0 0x02 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.eq(r2.new, #-1)) jump:t
+# CHECK-NEXT: if (cmp.eq(r17.new, #-1)) jump:t
0x11 0x40 0x71 0x70 0x92 0xc0 0x42 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.eq(r2.new, #-1)) jump:nt
+# CHECK-NEXT: if (!cmp.eq(r17.new, #-1)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xe0 0x42 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.eq(r2.new, #-1)) jump:t
+# CHECK-NEXT: if (!cmp.eq(r17.new, #-1)) jump:t
0x11 0x40 0x71 0x70 0x92 0xc0 0x82 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r2.new, #-1)) jump:nt
+# CHECK-NEXT: if (cmp.gt(r17.new, #-1)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xe0 0x82 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (cmp.gt(r2.new, #-1)) jump:t
+# CHECK-NEXT: if (cmp.gt(r17.new, #-1)) jump:t
0x11 0x40 0x71 0x70 0x92 0xc0 0xc2 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r2.new, #-1)) jump:nt
+# CHECK-NEXT: if (!cmp.gt(r17.new, #-1)) jump:nt
0x11 0x40 0x71 0x70 0x92 0xe0 0xc2 0x26
# CHECK: r17 = r17
-# CHECK-NEXT: if (!cmp.gt(r2.new, #-1)) jump:t
+# CHECK-NEXT: if (!cmp.gt(r17.new, #-1)) jump:t
diff --git a/test/MC/Disassembler/Hexagon/nv_st.txt b/test/MC/Disassembler/Hexagon/nv_st.txt
index ef49455b80b1..3a767f33b36a 100644
--- a/test/MC/Disassembler/Hexagon/nv_st.txt
+++ b/test/MC/Disassembler/Hexagon/nv_st.txt
@@ -4,200 +4,209 @@
# Store new-value byte
0x1f 0x40 0x7f 0x70 0x82 0xf5 0xb1 0x3b
# CHECK: r31 = r31
-# CHECK-NEXT: memb(r17 + r21<<#3) = r2.new
+# CHECK-NEXT: memb(r17 + r21<<#3) = r31.new
+0x1f 0x40 0x7f 0x70 0x11 0xc2 0xa0 0x48
+# CHECK: r31 = r31
+# CHECK-NEXT: memb(#17) = r31.new
0x1f 0x40 0x7f 0x70 0x15 0xc2 0xb1 0xa1
# CHECK: r31 = r31
-# CHECK-NEXT: memb(r17+#21) = r2.new
+# CHECK-NEXT: memb(r17+#21) = r31.new
0x1f 0x40 0x7f 0x70 0x02 0xe2 0xb1 0xa9
# CHECK: r31 = r31
-# CHECK-NEXT: memb(r17 ++ I:circ(m1)) = r2.new
+# CHECK-NEXT: memb(r17 ++ I:circ(m1)) = r31.new
0x1f 0x40 0x7f 0x70 0x28 0xe2 0xb1 0xa9
# CHECK: r31 = r31
-# CHECK-NEXT: memb(r17 ++ #5:circ(m1)) = r2.new
+# CHECK-NEXT: memb(r17 ++ #5:circ(m1)) = r31.new
0x1f 0x40 0x7f 0x70 0x28 0xc2 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: memb(r17++#5) = r2.new
+# CHECK-NEXT: memb(r17++#5) = r31.new
0x1f 0x40 0x7f 0x70 0x00 0xe2 0xb1 0xad
# CHECK: r31 = r31
-# CHECK-NEXT: memb(r17++m1) = r2.new
+# CHECK-NEXT: memb(r17++m1) = r31.new
0x1f 0x40 0x7f 0x70 0x00 0xe2 0xb1 0xaf
# CHECK: r31 = r31
-# CHECK-NEXT: memb(r17 ++ m1:brev) = r2.new
+# CHECK-NEXT: memb(r17 ++ m1:brev) = r31.new
# Store new-value byte conditionally
0x1f 0x40 0x7f 0x70 0xe2 0xf5 0xb1 0x34
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memb(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (p3) memb(r17+r21<<#3) = r31.new
0x1f 0x40 0x7f 0x70 0xe2 0xf5 0xb1 0x35
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memb(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (!p3) memb(r17+r21<<#3) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xe2 0xf5 0xb1 0x36
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memb(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (p3.new) memb(r17+r21<<#3) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xe2 0xf5 0xb1 0x37
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memb(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (!p3.new) memb(r17+r21<<#3) = r31.new
0x1f 0x40 0x7f 0x70 0xab 0xc2 0xb1 0x40
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memb(r17+#21) = r2.new
+# CHECK-NEXT: if (p3) memb(r17+#21) = r31.new
0x1f 0x40 0x7f 0x70 0xab 0xc2 0xb1 0x44
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memb(r17+#21) = r2.new
+# CHECK-NEXT: if (!p3) memb(r17+#21) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xc2 0xb1 0x42
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memb(r17+#21) = r2.new
+# CHECK-NEXT: if (p3.new) memb(r17+#21) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xc2 0xb1 0x46
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memb(r17+#21) = r2.new
+# CHECK-NEXT: if (!p3.new) memb(r17+#21) = r31.new
0x1f 0x40 0x7f 0x70 0x2b 0xe2 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memb(r17++#5) = r2.new
+# CHECK-NEXT: if (p3) memb(r17++#5) = r31.new
0x1f 0x40 0x7f 0x70 0x2f 0xe2 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memb(r17++#5) = r2.new
+# CHECK-NEXT: if (!p3) memb(r17++#5) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xe2 0xb1 0xab
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memb(r17++#5) = r2.new
+# CHECK-NEXT: if (p3.new) memb(r17++#5) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xaf 0xe2 0xb1 0xab
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memb(r17++#5) = r2.new
+# CHECK-NEXT: if (!p3.new) memb(r17++#5) = r31.new
# Store new-value halfword
0x1f 0x40 0x7f 0x70 0x8a 0xf5 0xb1 0x3b
# CHECK: r31 = r31
-# CHECK-NEXT: memh(r17 + r21<<#3) = r2.new
+# CHECK-NEXT: memh(r17 + r21<<#3) = r31.new
+0x1f 0x40 0x7f 0x70 0x15 0xca 0xa0 0x48
+# CHECK: r31 = r31
+# CHECK-NEXT: memh(#42) = r31.new
0x1f 0x40 0x7f 0x70 0x15 0xca 0xb1 0xa1
# CHECK: r31 = r31
-# CHECK-NEXT: memh(r17+#42) = r2.new
+# CHECK-NEXT: memh(r17+#42) = r31.new
0x1f 0x40 0x7f 0x70 0x02 0xea 0xb1 0xa9
# CHECK: r31 = r31
-# CHECK-NEXT: memh(r17 ++ I:circ(m1)) = r2.new
+# CHECK-NEXT: memh(r17 ++ I:circ(m1)) = r31.new
0x1f 0x40 0x7f 0x70 0x28 0xea 0xb1 0xa9
# CHECK: r31 = r31
-# CHECK-NEXT: memh(r17 ++ #10:circ(m1)) = r2.new
+# CHECK-NEXT: memh(r17 ++ #10:circ(m1)) = r31.new
0x1f 0x40 0x7f 0x70 0x28 0xca 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: memh(r17++#10) = r2.new
+# CHECK-NEXT: memh(r17++#10) = r31.new
0x1f 0x40 0x7f 0x70 0x00 0xea 0xb1 0xad
# CHECK: r31 = r31
-# CHECK-NEXT: memh(r17++m1) = r2.new
+# CHECK-NEXT: memh(r17++m1) = r31.new
0x1f 0x40 0x7f 0x70 0x00 0xea 0xb1 0xaf
# CHECK: r31 = r31
-# CHECK-NEXT: memh(r17 ++ m1:brev) = r2.new
+# CHECK-NEXT: memh(r17 ++ m1:brev) = r31.new
# Store new-value halfword conditionally
0x1f 0x40 0x7f 0x70 0xea 0xf5 0xb1 0x34
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memh(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (p3) memh(r17+r21<<#3) = r31.new
0x1f 0x40 0x7f 0x70 0xea 0xf5 0xb1 0x35
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memh(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (!p3) memh(r17+r21<<#3) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xea 0xf5 0xb1 0x36
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memh(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (p3.new) memh(r17+r21<<#3) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xea 0xf5 0xb1 0x37
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memh(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (!p3.new) memh(r17+r21<<#3) = r31.new
0x1f 0x40 0x7f 0x70 0xab 0xca 0xb1 0x40
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memh(r17+#42) = r2.new
+# CHECK-NEXT: if (p3) memh(r17+#42) = r31.new
0x1f 0x40 0x7f 0x70 0xab 0xca 0xb1 0x44
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memh(r17+#42) = r2.new
+# CHECK-NEXT: if (!p3) memh(r17+#42) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xca 0xb1 0x42
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memh(r17+#42) = r2.new
+# CHECK-NEXT: if (p3.new) memh(r17+#42) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xca 0xb1 0x46
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memh(r17+#42) = r2.new
+# CHECK-NEXT: if (!p3.new) memh(r17+#42) = r31.new
0x1f 0x40 0x7f 0x70 0x2b 0xea 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memh(r17++#10) = r2.new
+# CHECK-NEXT: if (p3) memh(r17++#10) = r31.new
0x1f 0x40 0x7f 0x70 0x2f 0xea 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memh(r17++#10) = r2.new
+# CHECK-NEXT: if (!p3) memh(r17++#10) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xea 0xb1 0xab
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memh(r17++#10) = r2.new
+# CHECK-NEXT: if (p3.new) memh(r17++#10) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xaf 0xea 0xb1 0xab
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memh(r17++#10) = r2.new
+# CHECK-NEXT: if (!p3.new) memh(r17++#10) = r31.new
# Store new-value word
0x1f 0x40 0x7f 0x70 0x92 0xf5 0xb1 0x3b
# CHECK: r31 = r31
-# CHECK-NEXT: memw(r17 + r21<<#3) = r2.new
-0x1f 0x40 0x7f 0x70 0x15 0xd2 0xb1 0xa1
+# CHECK-NEXT: memw(r17 + r21<<#3) = r31.new
+0x1f 0x40 0x7f 0x70 0x15 0xd2 0xa0 0x48
# CHECK: r31 = r31
-# CHECK-NEXT: memw(r17+#84) = r2.new
-0x1f 0x40 0x7f 0x70 0x28 0xf2 0xb1 0xa9
+# CHECK-NEXT: memw(#84) = r31.new
+0x1f 0x40 0x7f 0x70 0x15 0xd2 0xb1 0xa1
# CHECK: r31 = r31
-# CHECK-NEXT: memw(r17 ++ #20:circ(m1)) = r2.new
+# CHECK-NEXT: memw(r17+#84) = r31.new
0x1f 0x40 0x7f 0x70 0x02 0xf2 0xb1 0xa9
# CHECK: r31 = r31
-# CHECK-NEXT: memw(r17 ++ I:circ(m1)) = r2.new
+# CHECK-NEXT: memw(r17 ++ I:circ(m1)) = r31.new
+0x1f 0x40 0x7f 0x70 0x28 0xf2 0xb1 0xa9
+# CHECK: r31 = r31
+# CHECK-NEXT: memw(r17 ++ #20:circ(m1)) = r31.new
0x1f 0x40 0x7f 0x70 0x28 0xd2 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: memw(r17++#20) = r2.new
+# CHECK-NEXT: memw(r17++#20) = r31.new
0x1f 0x40 0x7f 0x70 0x00 0xf2 0xb1 0xad
# CHECK: r31 = r31
-# CHECK-NEXT: memw(r17++m1) = r2.new
+# CHECK-NEXT: memw(r17++m1) = r31.new
0x1f 0x40 0x7f 0x70 0x00 0xf2 0xb1 0xaf
# CHECK: r31 = r31
-# CHECK-NEXT: memw(r17 ++ m1:brev) = r2.new
+# CHECK-NEXT: memw(r17 ++ m1:brev) = r31.new
# Store new-value word conditionally
0x1f 0x40 0x7f 0x70 0xf2 0xf5 0xb1 0x34
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memw(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (p3) memw(r17+r21<<#3) = r31.new
0x1f 0x40 0x7f 0x70 0xf2 0xf5 0xb1 0x35
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memw(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (!p3) memw(r17+r21<<#3) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xf2 0xf5 0xb1 0x36
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memw(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (p3.new) memw(r17+r21<<#3) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xf2 0xf5 0xb1 0x37
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memw(r17+r21<<#3) = r2.new
+# CHECK-NEXT: if (!p3.new) memw(r17+r21<<#3) = r31.new
0x1f 0x40 0x7f 0x70 0xab 0xd2 0xb1 0x40
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memw(r17+#84) = r2.new
+# CHECK-NEXT: if (p3) memw(r17+#84) = r31.new
0x1f 0x40 0x7f 0x70 0xab 0xd2 0xb1 0x44
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memw(r17+#84) = r2.new
+# CHECK-NEXT: if (!p3) memw(r17+#84) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xd2 0xb1 0x42
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memw(r17+#84) = r2.new
+# CHECK-NEXT: if (p3.new) memw(r17+#84) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xd2 0xb1 0x46
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memw(r17+#84) = r2.new
+# CHECK-NEXT: if (!p3.new) memw(r17+#84) = r31.new
0x1f 0x40 0x7f 0x70 0x2b 0xf2 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: if (p3) memw(r17++#20) = r2.new
+# CHECK-NEXT: if (p3) memw(r17++#20) = r31.new
0x1f 0x40 0x7f 0x70 0x2f 0xf2 0xb1 0xab
# CHECK: r31 = r31
-# CHECK-NEXT: if (!p3) memw(r17++#20) = r2.new
+# CHECK-NEXT: if (!p3) memw(r17++#20) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xab 0xf2 0xb1 0xab
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (p3.new) memw(r17++#20) = r2.new
+# CHECK-NEXT: if (p3.new) memw(r17++#20) = r31.new
0x03 0x40 0x45 0x85 0x1f 0x40 0x7f 0x70 0xaf 0xf2 0xb1 0xab
# CHECK: p3 = r5
# CHECK-NEXT: r31 = r31
-# CHECK-NEXT: if (!p3.new) memw(r17++#20) = r2.new
+# CHECK-NEXT: if (!p3.new) memw(r17++#20) = r31.new
diff --git a/test/MC/Disassembler/Hexagon/st.txt b/test/MC/Disassembler/Hexagon/st.txt
index 3b809d3465a8..6d9074a05ef7 100644
--- a/test/MC/Disassembler/Hexagon/st.txt
+++ b/test/MC/Disassembler/Hexagon/st.txt
@@ -5,7 +5,9 @@
0x9e 0xf5 0xd1 0x3b
# CHECK: memd(r17 + r21<<#3) = r31:30
0x28 0xd4 0xc0 0x48
-# CHECK: memd(##320) = r21:20
+# CHECK: memd(#320) = r21:20
+0x02 0x40 0x00 0x00 0x28 0xd4 0xc0 0x48
+# CHECK: memd(##168) = r21:20
0x15 0xd4 0xd1 0xa1
# CHECK: memd(r17+#168) = r21:20
0x02 0xf4 0xd1 0xa9
@@ -14,6 +16,8 @@
# CHECK: memd(r17 ++ #40:circ(m1)) = r21:20
0x28 0xd4 0xd1 0xab
# CHECK: memd(r17++#40) = r21:20
+0x00 0x40 0x00 0x00 0xd5 0xfe 0xd1 0xad
+# CHECK: memd(r17<<#3 + ##21) = r31:30
0x00 0xf4 0xd1 0xad
# CHECK: memd(r17++m1) = r21:20
0x00 0xf4 0xd1 0xaf
@@ -50,6 +54,16 @@
0x03 0x40 0x45 0x85 0xaf 0xf4 0xd1 0xab
# CHECK: p3 = r5
# CHECK-NEXT: if (!p3.new) memd(r17++#40) = r21:20
+0x02 0x40 0x00 0x00 0xc3 0xd4 0xc2 0xaf
+# CHECK: if (p3) memd(##168) = r21:20
+0x02 0x40 0x00 0x00 0xc7 0xd4 0xc2 0xaf
+# CHECK: if (!p3) memd(##168) = r21:20
+0x03 0x40 0x45 0x85 0x02 0x40 0x00 0x00 0xc3 0xf4 0xc2 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (p3.new) memd(##168) = r21:20
+0x03 0x40 0x45 0x85 0x02 0x40 0x00 0x00 0xc7 0xf4 0xc2 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (!p3.new) memd(##168) = r21:20
# Store byte
0x9f 0xf5 0x11 0x3b
@@ -57,6 +71,8 @@
0x9f 0xca 0x11 0x3c
# CHECK: memb(r17+#21)=#31
0x15 0xd5 0x00 0x48
+# CHECK: memb(#21) = r21
+0x00 0x40 0x00 0x00 0x15 0xd5 0x00 0x48
# CHECK: memb(##21) = r21
0x15 0xd5 0x11 0xa1
# CHECK: memb(r17+#21) = r21
@@ -66,6 +82,8 @@
# CHECK: memb(r17 ++ #5:circ(m1)) = r21
0x28 0xd5 0x11 0xab
# CHECK: memb(r17++#5) = r21
+0x00 0x40 0x00 0x00 0xd5 0xff 0x11 0xad
+# CHECK: memb(r17<<#3 + ##21) = r31
0x00 0xf5 0x11 0xad
# CHECK: memb(r17++m1) = r21
0x00 0xf5 0x11 0xaf
@@ -112,6 +130,16 @@
0x03 0x40 0x45 0x85 0xaf 0xf5 0x11 0xab
# CHECK: p3 = r5
# CHECK-NEXT: if (!p3.new) memb(r17++#5) = r21
+0x00 0x40 0x00 0x00 0xab 0xd5 0x01 0xaf
+# CHECK: if (p3) memb(##21) = r21
+0x00 0x40 0x00 0x00 0xaf 0xd5 0x01 0xaf
+# CHECK: if (!p3) memb(##21) = r21
+0x03 0x40 0x45 0x85 0x00 0x40 0x00 0x00 0xab 0xf5 0x01 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (p3.new) memb(##21) = r21
+0x03 0x40 0x45 0x85 0x00 0x40 0x00 0x00 0xaf 0xf5 0x01 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (!p3.new) memb(##21) = r21
# Store halfword
0x9f 0xf5 0x51 0x3b
@@ -120,10 +148,14 @@
# CHECK: memh(r17 + r21<<#3) = r31.h
0x95 0xcf 0x31 0x3c
# CHECK: memh(r17+#62)=#21
+0x00 0x40 0x00 0x00 0x2a 0xd5 0x40 0x48
+# CHECK: memh(##42) = r21
+0x00 0x40 0x00 0x00 0x2a 0xd5 0x60 0x48
+# CHECK: memh(##42) = r21.h
0x2a 0xd5 0x40 0x48
-# CHECK: memh(##84) = r21
+# CHECK: memh(#84) = r21
0x2a 0xd5 0x60 0x48
-# CHECK: memh(##84) = r21.h
+# CHECK: memh(#84) = r21.h
0x15 0xdf 0x51 0xa1
# CHECK: memh(r17+#42) = r31
0x15 0xdf 0x71 0xa1
@@ -138,8 +170,12 @@
# CHECK: memh(r17 ++ #10:circ(m1)) = r21.h
0x28 0xd5 0x51 0xab
# CHECK: memh(r17++#10) = r21
+0x00 0x40 0x00 0x00 0xd5 0xff 0x51 0xad
+# CHECK: memh(r17<<#3 + ##21) = r31
0x28 0xd5 0x71 0xab
# CHECK: memh(r17++#10) = r21.h
+0x00 0x40 0x00 0x00 0xd5 0xff 0x71 0xad
+# CHECK: memh(r17<<#3 + ##21) = r31.h
0x00 0xf5 0x51 0xad
# CHECK: memh(r17++m1) = r21
0x00 0xf5 0x71 0xad
@@ -220,22 +256,48 @@
0x03 0x40 0x45 0x85 0xaf 0xf5 0x71 0xab
# CHECK: p3 = r5
# CHECK-NEXT: if (!p3.new) memh(r17++#10) = r21.h
+0x00 0x40 0x00 0x00 0xd3 0xd5 0x42 0xaf
+# CHECK: if (p3) memh(##42) = r21
+0x00 0x40 0x00 0x00 0xd3 0xd5 0x62 0xaf
+# CHECK: if (p3) memh(##42) = r21.h
+0x00 0x40 0x00 0x00 0xd7 0xd5 0x42 0xaf
+# CHECK: if (!p3) memh(##42) = r21
+0x00 0x40 0x00 0x00 0xd7 0xd5 0x62 0xaf
+# CHECK: if (!p3) memh(##42) = r21.h
+0x03 0x40 0x45 0x85 0x00 0x40 0x00 0x00 0xd3 0xf5 0x42 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (p3.new) memh(##42) = r21
+0x03 0x40 0x45 0x85 0x00 0x40 0x00 0x00 0xd3 0xf5 0x62 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (p3.new) memh(##42) = r21.h
+0x03 0x40 0x45 0x85 0x00 0x40 0x00 0x00 0xd7 0xf5 0x42 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (!p3.new) memh(##42) = r21
+0x03 0x40 0x45 0x85 0x00 0x40 0x00 0x00 0xd7 0xf5 0x62 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (!p3.new) memh(##42) = r21.h
# Store word
0x9f 0xf5 0x91 0x3b
# CHECK: memw(r17 + r21<<#3) = r31
0x9f 0xca 0x51 0x3c
+# CHECK: memw(r17{{ *}}+{{ *}}#84)=#31
+0x15 0xdf 0x80 0x48
+# CHECK: memw(#84) = r31
+0x01 0x40 0x00 0x00 0x14 0xd5 0x80 0x48
+# CHECK: memw(##84) = r21
+0x9f 0xca 0x51 0x3c
# CHECK: memw(r17+#84)=#31
0x15 0xdf 0x91 0xa1
# CHECK: memw(r17+#84) = r31
-0x14 0xd5 0x80 0x48
-# CHECK: memw(##80) = r21
0x02 0xf5 0x91 0xa9
# CHECK: memw(r17 ++ I:circ(m1)) = r21
0x28 0xf5 0x91 0xa9
# CHECK: memw(r17 ++ #20:circ(m1)) = r21
0x28 0xd5 0x91 0xab
# CHECK: memw(r17++#20) = r21
+0x00 0x40 0x00 0x00 0xd5 0xff 0x91 0xad
+# CHECK: memw(r17<<#3 + ##21) = r31
0x00 0xf5 0x91 0xad
# CHECK: memw(r17++m1) = r21
0x00 0xf5 0x91 0xaf
@@ -282,7 +344,17 @@
0x03 0x40 0x45 0x85 0xab 0xf5 0x91 0xab
# CHECK: p3 = r5
# CHECK-NEXT: if (p3.new) memw(r17++#20) = r21
+0x01 0x40 0x00 0x00 0xa3 0xd5 0x81 0xaf
+# CHECK: if (p3) memw(##84) = r21
+0x01 0x40 0x00 0x00 0xa7 0xd5 0x81 0xaf
+# CHECK: if (!p3) memw(##84) = r21
+0x03 0x40 0x45 0x85 0x01 0x40 0x00 0x00 0xa3 0xf5 0x81 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (p3.new) memw(##84) = r21
+0x03 0x40 0x45 0x85 0x01 0x40 0x00 0x00 0xa7 0xf5 0x81 0xaf
+# CHECK: p3 = r5
+# CHECK-NEXT: if (!p3.new) memw(##84) = r21
# Allocate stack frame
0x1f 0xc0 0x9d 0xa0
-# CHECK: allocframe(#248) \ No newline at end of file
+# CHECK: allocframe(#248)
diff --git a/test/MC/Disassembler/Hexagon/too_many_instructions.txt b/test/MC/Disassembler/Hexagon/too_many_instructions.txt
new file mode 100644
index 000000000000..2aaa22d37f91
--- /dev/null
+++ b/test/MC/Disassembler/Hexagon/too_many_instructions.txt
@@ -0,0 +1,4 @@
+# RUN: llvm-mc -triple=hexagon -disassemble < %s 2>&1 | FileCheck %s
+
+#CHECK: warning: invalid instruction encoding
+0x00 0x40 0x00 0x7f 0x00 0x40 0x00 0x7f 0x00 0x40 0x00 0x7f 0x00 0x40 0x00 0x7f 0x00 0xc0 0x00 0x7f \ No newline at end of file
diff --git a/test/MC/Disassembler/Hexagon/too_many_loop_ends.txt b/test/MC/Disassembler/Hexagon/too_many_loop_ends.txt
new file mode 100644
index 000000000000..55a6f0b3692e
--- /dev/null
+++ b/test/MC/Disassembler/Hexagon/too_many_loop_ends.txt
@@ -0,0 +1,4 @@
+# RUN: llvm-mc -triple=hexagon -disassemble < %s 2>&1 | FileCheck %s
+
+#CHECK: warning: invalid instruction encoding
+0x00 0x80 0x00 0x7f 0x00 0x80 0x00 0x7f 0x00 0x80 0x00 0x7f 0x00 0xc0 0x00 0x7f \ No newline at end of file
diff --git a/test/MC/Disassembler/Hexagon/unextendable.txt b/test/MC/Disassembler/Hexagon/unextendable.txt
new file mode 100644
index 000000000000..377c123177c6
--- /dev/null
+++ b/test/MC/Disassembler/Hexagon/unextendable.txt
@@ -0,0 +1,9 @@
+# RUN: llvm-mc -triple=hexagon -disassemble < %s 2>&1 | FileCheck %s
+
+#Invalid immediate extend duplex load/load
+#CHECK: warning: invalid instruction encoding
+0xfe 0x40 0x00 0x00 0x11 0x00 0x00 0x00
+
+#Invalid immediate extend barrier
+#CHECK: warning: invalid instruction encoding
+0xfe 0x40 0x00 0x00 0x00 0xc0 0x00 0xa8 \ No newline at end of file
diff --git a/test/MC/Disassembler/Mips/dsp/valid-el.txt b/test/MC/Disassembler/Mips/dsp/valid-el.txt
new file mode 100644
index 000000000000..56f363b62a21
--- /dev/null
+++ b/test/MC/Disassembler/Mips/dsp/valid-el.txt
@@ -0,0 +1,12 @@
+# RUN: llvm-mc -triple=mipsel-unknown-linux -mattr=+dsp -disassemble < %s | FileCheck %s
+
+0x10 0xa8 0x60 0x00 # CHECK: mfhi $21, $ac3
+0x12 0xa8 0x60 0x00 # CHECK: mflo $21, $ac3
+0x11 0x18 0xa0 0x02 # CHECK: mthi $21, $ac3
+0x13 0x18 0xa0 0x02 # CHECK: mtlo $21, $ac3
+0x8a 0x51 0x54 0x7f # CHECK: lbux $10, $20($26)
+0x0a 0x59 0x75 0x7f # CHECK: lhx $11, $21($27)
+0x0a 0x60 0x96 0x7f # CHECK: lwx $12, $22($gp)
+0xb8 0x0e 0x30 0x7c # CHECK: shilo $ac1, 3
+0xf8 0x14 0xa0 0x7c # CHECK: wrdsp $5, 2
+0xf8 0xfc 0xa0 0x7c # CHECK: wrdsp $5
diff --git a/test/MC/Disassembler/Mips/dsp/valid.txt b/test/MC/Disassembler/Mips/dsp/valid.txt
new file mode 100644
index 000000000000..e6ca900dde55
--- /dev/null
+++ b/test/MC/Disassembler/Mips/dsp/valid.txt
@@ -0,0 +1,125 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mattr=dsp | FileCheck %s
+
+ 0x7c 0x02 0x0a 0x52 # CHECK: absq_s.ph $1, $2
+ 0x7c 0x06 0x2c 0x52 # CHECK: absq_s.w $5, $6
+ 0x7d 0x09 0x3a 0x90 # CHECK: addq.ph $7, $8, $9
+ 0x7d 0x6c 0x53 0x90 # CHECK: addq_s.ph $10, $11, $12
+ 0x7d 0xcf 0x6d 0x90 # CHECK: addq_s.w $13, $14, $15
+ 0x7f 0xbe 0xe4 0x10 # CHECK: addsc $gp, $sp, $fp
+ 0x7c 0xe8 0x30 0x10 # CHECK: addu.qb $6, $7, $8
+ 0x7d 0x4b 0x49 0x10 # CHECK: addu_s.qb $9, $10, $11
+ 0x7d 0xae 0x64 0x50 # CHECK: addwc $12, $13, $14
+ 0x7c 0x1a 0xce 0xd2 # CHECK: bitrev $25, $26
+ 0x04 0x1c 0x14 0x9b # CHECK: bposge32 21104
+ 0x7f 0x7c 0x02 0x11 # CHECK: cmp.eq.ph $27, $gp
+ 0x7f 0xbe 0x02 0x51 # CHECK: cmp.lt.ph $sp, $fp
+ 0x7f 0xe1 0x02 0x91 # CHECK: cmp.le.ph $ra, $1
+ 0x7d 0x8d 0x59 0x11 # CHECK: cmpgu.eq.qb $11, $12, $13
+ 0x7d 0xf0 0x71 0x51 # CHECK: cmpgu.lt.qb $14, $15, $16
+ 0x7e 0x53 0x89 0x91 # CHECK: cmpgu.le.qb $17, $18, $19
+ 0x7e 0x95 0x00 0x11 # CHECK: cmpu.eq.qb $20, $21
+ 0x7e 0xd7 0x00 0x51 # CHECK: cmpu.lt.qb $22, $23
+ 0x7f 0x19 0x00 0x91 # CHECK: cmpu.le.qb $24, $25
+ 0x7c 0x22 0x09 0x30 # CHECK: dpaq_s.w.ph $ac1, $1, $2
+ 0x7c 0x64 0x13 0x30 # CHECK: dpaq_sa.l.w $ac2, $3, $4
+ 0x7d 0x2a 0x08 0xf0 # CHECK: dpau.h.qbl $ac1, $9, $10
+ 0x7d 0x6c 0x09 0xf0 # CHECK: dpau.h.qbr $ac1, $11, $12
+ 0x7e 0x32 0x01 0x70 # CHECK: dpsq_s.w.ph $ac0, $17, $18
+ 0x7e 0x74 0x0b 0x70 # CHECK: dpsq_sa.l.w $ac1, $19, $20
+ 0x7c 0xa6 0x02 0xf0 # CHECK: dpsu.h.qbl $ac0, $5, $6
+ 0x7c 0xe8 0x0b 0xf0 # CHECK: dpsu.h.qbr $ac1, $7, $8
+ 0x7f 0xe1 0x00 0xb8 # CHECK: extp $1, $ac0, 31
+ 0x7c 0x02 0x0a 0xb8 # CHECK: extpdp $2, $ac1, 0
+ 0x7c 0x83 0x12 0xf8 # CHECK: extpdpv $3, $ac2, $4
+ 0x7c 0xc5 0x18 0xf8 # CHECK: extpv $5, $ac3, $6
+ 0x7f 0xe7 0x00 0x38 # CHECK: extr.w $7, $ac0, 31
+ 0x7d 0xe8 0x09 0x38 # CHECK: extr_r.w $8, $ac1, 15
+ 0x7c 0xe9 0x11 0xb8 # CHECK: extr_rs.w $9, $ac2, 7
+ 0x7c 0x6a 0x1b 0xb8 # CHECK: extr_s.h $10, $ac3, 3
+ 0x7d 0x8b 0x00 0x78 # CHECK: extrv.w $11, $ac0, $12
+ 0x7d 0xcd 0x09 0x78 # CHECK: extrv_r.w $13, $ac1, $14
+ 0x7e 0x0f 0x11 0xf8 # CHECK: extrv_rs.w $15, $ac2, $16
+ 0x7e 0x51 0x1b 0xf8 # CHECK: extrv_s.h $17, $ac3, $18
+ 0x7e 0x93 0x00 0x0c # CHECK: insv $19, $20
+ 0x7f 0x54 0x51 0x8a # CHECK: lbux $10, $20($26)
+ 0x7f 0x75 0x59 0x0a # CHECK: lhx $11, $21($27)
+ 0x7f 0x96 0x60 0x0a # CHECK: lwx $12, $22($gp)
+ 0x70 0xc7 0x08 0x00 # CHECK: madd $ac1, $6, $7
+ 0x71 0x09 0x08 0x01 # CHECK: maddu $ac1, $8, $9
+ 0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
+ 0x71 0x09 0x00 0x01 # CHECK: maddu $8, $9
+ 0x7c 0x64 0x15 0x30 # CHECK: maq_s.w.phl $ac2, $3, $4
+ 0x7c 0xa6 0x1c 0x30 # CHECK: maq_sa.w.phl $ac3, $5, $6
+ 0x7c 0xe8 0x05 0xb0 # CHECK: maq_s.w.phr $ac0, $7, $8
+ 0x7d 0x2a 0x0c 0xb0 # CHECK: maq_sa.w.phr $ac1, $9, $10
+ 0x00 0x20 0x70 0x10 # CHECK: mfhi $14, $ac1
+ 0x00 0x20 0x78 0x12 # CHECK: mflo $15, $ac1
+ 0x00 0x00 0x70 0x10 # CHECK: mfhi $14
+ 0x00 0x00 0x78 0x12 # CHECK: mflo $15
+ 0x7d 0x8d 0x5c 0x90 # CHECK: modsub $11, $12, $13
+ 0x71 0x4b 0x18 0x04 # CHECK: msub $ac3, $10, $11
+ 0x71 0x8d 0x10 0x05 # CHECK: msubu $ac2, $12, $13
+ 0x71 0x4b 0x00 0x04 # CHECK: msub $10, $11
+ 0x71 0x8d 0x00 0x05 # CHECK: msubu $12, $13
+ 0x02 0x00 0x18 0x11 # CHECK: mthi $16, $ac3
+ 0x02 0x00 0x00 0x11 # CHECK: mthi $16
+ 0x7d 0xc0 0x17 0xf8 # CHECK: mthlip $14, $ac2
+ 0x02 0x20 0x10 0x13 # CHECK: mtlo $17, $ac2
+ 0x02 0x20 0x00 0x13 # CHECK: mtlo $17
+ 0x7e 0xd7 0xaf 0x10 # CHECK: muleq_s.w.phl $21, $22, $23
+ 0x7f 0x3a 0xc7 0x50 # CHECK: muleq_s.w.phr $24, $25, $26
+ 0x7f 0x9d 0xd9 0x90 # CHECK: muleu_s.ph.qbl $27, $gp, $sp
+ 0x7f 0xe1 0xf1 0xd0 # CHECK: muleu_s.ph.qbr $fp, $ra, $1
+ 0x7c 0x64 0x17 0xd0 # CHECK: mulq_rs.ph $2, $3, $4
+ 0x7e 0x11 0x01 0xb0 # CHECK: mulsaq_s.w.ph $ac0, $16, $17
+ 0x00 0x43 0x18 0x18 # CHECK: mult $ac3, $2, $3
+ 0x00 0x85 0x10 0x19 # CHECK: multu $ac2, $4, $5
+ 0x00 0x43 0x00 0x18 # CHECK: mult $2, $3
+ 0x00 0x85 0x00 0x19 # CHECK: multu $4, $5
+ 0x7e 0x74 0x93 0x91 # CHECK: packrl.ph $18, $19, $20
+ 0x7d 0xe3 0x3a 0xd1 # CHECK: pick.ph $7, $15, $3
+ 0x7c 0x88 0x10 0xd1 # CHECK: pick.qb $2, $4, $8
+ 0x7c 0x15 0xa3 0x12 # CHECK: preceq.w.phl $20, $21
+ 0x7c 0x16 0xab 0x52 # CHECK: preceq.w.phr $21, $22
+ 0x7c 0x17 0xb1 0x12 # CHECK: precequ.ph.qbl $22, $23
+ 0x7c 0x19 0xc1 0x92 # CHECK: precequ.ph.qbla $24, $25
+ 0x7c 0x18 0xb9 0x52 # CHECK: precequ.ph.qbr $23, $24
+ 0x7c 0x1a 0xc9 0xd2 # CHECK: precequ.ph.qbra $25, $26
+ 0x7c 0x1b 0xd7 0x12 # CHECK: preceu.ph.qbl $26, $27
+ 0x7c 0x1d 0xe7 0x92 # CHECK: preceu.ph.qbla $gp, $sp
+ 0x7c 0x1c 0xdf 0x52 # CHECK: preceu.ph.qbr $27, $gp
+ 0x7c 0x1e 0xef 0xd2 # CHECK: preceu.ph.qbra $sp, $fp
+ 0x7e 0x53 0x8d 0x11 # CHECK: precrq.ph.w $17, $18, $19
+ 0x7e 0x32 0x83 0x11 # CHECK: precrq.qb.ph $16, $17, $18
+ 0x7e 0x95 0x9b 0xd1 # CHECK: precrqu_s.qb.ph $19, $20, $21
+ 0x7e 0x74 0x95 0x51 # CHECK: precrq_rs.ph.w $18, $19, $20
+ 0x7c 0x40 0x0d 0x10 # CHECK: raddu.w.qb $1, $2
+ 0x7d 0x00 0x2c 0xb8 # CHECK: rddsp $5, 256
+ 0x7c 0x0c 0x12 0x92 # CHECK: repl.ph $2, 12
+ 0x7c 0x55 0x08 0x92 # CHECK: repl.qb $1, 85
+ 0x7c 0x02 0x0a 0xd2 # CHECK: replv.ph $1, $2
+ 0x7c 0x02 0x08 0xd2 # CHECK: replv.qb $1, $2
+ 0x7d 0x00 0x0e 0xb8 # CHECK: shilo $ac1, 16
+ 0x7c 0x40 0x0e 0xf8 # CHECK: shilov $ac1, $2
+ 0x7c 0x62 0x0a 0x13 # CHECK: shll.ph $1, $2, 3
+ 0x7c 0x62 0x0b 0x13 # CHECK: shll_s.ph $1, $2, 3
+ 0x7c 0x62 0x08 0x13 # CHECK: shll.qb $1, $2, 3
+ 0x7c 0x62 0x0a 0x93 # CHECK: shllv.ph $1, $2, $3
+ 0x7c 0x62 0x0b 0x93 # CHECK: shllv_s.ph $1, $2, $3
+ 0x7c 0x62 0x08 0x93 # CHECK: shllv.qb $1, $2, $3
+ 0x7c 0x62 0x0d 0x93 # CHECK: shllv_s.w $1, $2, $3
+ 0x7c 0x62 0x0d 0x13 # CHECK: shll_s.w $1, $2, 3
+ 0x7c 0x22 0x2a 0x53 # CHECK: shra.ph $5, $2, 1
+ 0x7c 0x22 0x2b 0x53 # CHECK: shra_r.ph $5, $2, 1
+ 0x7c 0x62 0x0a 0xd3 # CHECK: shrav.ph $1, $2, $3
+ 0x7c 0x62 0x0b 0xd3 # CHECK: shrav_r.ph $1, $2, $3
+ 0x7c 0x62 0x0d 0xd3 # CHECK: shrav_r.w $1, $2, $3
+ 0x7c 0x22 0x0d 0x53 # CHECK: shra_r.w $1, $2, 1
+ 0x7c 0x42 0x08 0x53 # CHECK: shrl.qb $1, $2, 2
+ 0x7c 0x62 0x08 0xd3 # CHECK: shrlv.qb $1, $2, $3
+ 0x7c 0x43 0x0a 0xd0 # CHECK: subq.ph $1, $2, $3
+ 0x7c 0x43 0x0b 0xd0 # CHECK: subq_s.ph $1, $2, $3
+ 0x7c 0x43 0x0d 0xd0 # CHECK: subq_s.w $1, $2, $3
+ 0x7c 0x43 0x08 0x50 # CHECK: subu.qb $1, $2, $3
+ 0x7c 0x43 0x09 0x50 # CHECK: subu_s.qb $1, $2, $3
+ 0x7c 0x20 0x04 0xf8 # CHECK: wrdsp $1, 0
diff --git a/test/MC/Disassembler/Mips/dspr2/valid.txt b/test/MC/Disassembler/Mips/dspr2/valid.txt
new file mode 100644
index 000000000000..b1b5a332dc56
--- /dev/null
+++ b/test/MC/Disassembler/Mips/dspr2/valid.txt
@@ -0,0 +1,173 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mattr=dspr2 | FileCheck %s
+
+ 0x7c 0x02 0x0a 0x52 # CHECK: absq_s.ph $1, $2
+ 0x7c 0x04 0x18 0x52 # CHECK: absq_s.qb $3, $4
+ 0x7c 0x06 0x2c 0x52 # CHECK: absq_s.w $5, $6
+ 0x7d 0x09 0x3a 0x90 # CHECK: addq.ph $7, $8, $9
+ 0x7d 0x6c 0x53 0x90 # CHECK: addq_s.ph $10, $11, $12
+ 0x7d 0xcf 0x6d 0x90 # CHECK: addq_s.w $13, $14, $15
+ 0x7e 0x32 0x82 0x18 # CHECK: addqh.ph $16, $17, $18
+ 0x7e 0x95 0x9a 0x98 # CHECK: addqh_r.ph $19, $20, $21
+ 0x7e 0xf8 0xb4 0x18 # CHECK: addqh.w $22, $23, $24
+ 0x7f 0x5b 0xcc 0x98 # CHECK: addqh_r.w $25, $26, $27
+ 0x7f 0xbe 0xe4 0x10 # CHECK: addsc $gp, $sp, $fp
+ 0x7c 0x22 0xfa 0x10 # CHECK: addu.ph $ra, $1, $2
+ 0x7c 0x85 0x1b 0x10 # CHECK: addu_s.ph $3, $4, $5
+ 0x7c 0xe8 0x30 0x10 # CHECK: addu.qb $6, $7, $8
+ 0x7d 0x4b 0x49 0x10 # CHECK: addu_s.qb $9, $10, $11
+ 0x7d 0xae 0x64 0x50 # CHECK: addwc $12, $13, $14
+ 0x7e 0x11 0x78 0x18 # CHECK: adduh.qb $15, $16, $17
+ 0x7e 0x74 0x90 0x98 # CHECK: adduh_r.qb $18, $19, $20
+ 0x7e 0xd5 0x00 0x31 # CHECK: append $21, $22, 0
+ 0x7f 0x17 0x1c 0x31 # CHECK: balign $23, $24, 3
+ 0x7c 0x1a 0xce 0xd2 # CHECK: bitrev $25, $26
+ 0x04 0x1c 0x14 0x9b # CHECK: bposge32 21104
+ 0x7f 0x7c 0x02 0x11 # CHECK: cmp.eq.ph $27, $gp
+ 0x7f 0xbe 0x02 0x51 # CHECK: cmp.lt.ph $sp, $fp
+ 0x7f 0xe1 0x02 0x91 # CHECK: cmp.le.ph $ra, $1
+ 0x7c 0x64 0x16 0x11 # CHECK: cmpgdu.eq.qb $2, $3, $4
+ 0x7c 0xc7 0x2e 0x51 # CHECK: cmpgdu.lt.qb $5, $6, $7
+ 0x7d 0x2a 0x46 0x91 # CHECK: cmpgdu.le.qb $8, $9, $10
+ 0x7d 0x8d 0x59 0x11 # CHECK: cmpgu.eq.qb $11, $12, $13
+ 0x7d 0xf0 0x71 0x51 # CHECK: cmpgu.lt.qb $14, $15, $16
+ 0x7e 0x53 0x89 0x91 # CHECK: cmpgu.le.qb $17, $18, $19
+ 0x7e 0x95 0x00 0x11 # CHECK: cmpu.eq.qb $20, $21
+ 0x7e 0xd7 0x00 0x51 # CHECK: cmpu.lt.qb $22, $23
+ 0x7f 0x19 0x00 0x91 # CHECK: cmpu.le.qb $24, $25
+ 0x7f 0x5b 0x00 0x30 # CHECK: dpa.w.ph $ac0, $26, $27
+ 0x7c 0x22 0x09 0x30 # CHECK: dpaq_s.w.ph $ac1, $1, $2
+ 0x7c 0x64 0x13 0x30 # CHECK: dpaq_sa.l.w $ac2, $3, $4
+ 0x7c 0xa6 0x1e 0x30 # CHECK: dpaqx_s.w.ph $ac3, $5, $6
+ 0x7c 0xe8 0x06 0xb0 # CHECK: dpaqx_sa.w.ph $ac0, $7, $8
+ 0x7d 0x2a 0x08 0xf0 # CHECK: dpau.h.qbl $ac1, $9, $10
+ 0x7d 0x6c 0x09 0xf0 # CHECK: dpau.h.qbr $ac1, $11, $12
+ 0x7d 0xae 0x12 0x30 # CHECK: dpax.w.ph $ac2, $13, $14
+ 0x7d 0xf0 0x18 0x70 # CHECK: dps.w.ph $ac3, $15, $16
+ 0x7e 0x32 0x01 0x70 # CHECK: dpsq_s.w.ph $ac0, $17, $18
+ 0x7e 0x74 0x0b 0x70 # CHECK: dpsq_sa.l.w $ac1, $19, $20
+ 0x7c 0x22 0x16 0x70 # CHECK: dpsqx_s.w.ph $ac2, $1, $2
+ 0x7c 0x64 0x1e 0xf0 # CHECK: dpsqx_sa.w.ph $ac3, $3, $4
+ 0x7c 0xa6 0x02 0xf0 # CHECK: dpsu.h.qbl $ac0, $5, $6
+ 0x7c 0xe8 0x0b 0xf0 # CHECK: dpsu.h.qbr $ac1, $7, $8
+ 0x7d 0x2a 0x12 0x70 # CHECK: dpsx.w.ph $ac2, $9, $10
+ 0x7f 0xe1 0x00 0xb8 # CHECK: extp $1, $ac0, 31
+ 0x7c 0x02 0x0a 0xb8 # CHECK: extpdp $2, $ac1, 0
+ 0x7c 0x83 0x12 0xf8 # CHECK: extpdpv $3, $ac2, $4
+ 0x7c 0xc5 0x18 0xf8 # CHECK: extpv $5, $ac3, $6
+ 0x7f 0xe7 0x00 0x38 # CHECK: extr.w $7, $ac0, 31
+ 0x7d 0xe8 0x09 0x38 # CHECK: extr_r.w $8, $ac1, 15
+ 0x7c 0xe9 0x11 0xb8 # CHECK: extr_rs.w $9, $ac2, 7
+ 0x7c 0x6a 0x1b 0xb8 # CHECK: extr_s.h $10, $ac3, 3
+ 0x7d 0x8b 0x00 0x78 # CHECK: extrv.w $11, $ac0, $12
+ 0x7d 0xcd 0x09 0x78 # CHECK: extrv_r.w $13, $ac1, $14
+ 0x7e 0x0f 0x11 0xf8 # CHECK: extrv_rs.w $15, $ac2, $16
+ 0x7e 0x51 0x1b 0xf8 # CHECK: extrv_s.h $17, $ac3, $18
+ 0x7e 0x93 0x00 0x0c # CHECK: insv $19, $20
+ 0x7f 0x54 0x51 0x8a # CHECK: lbux $10, $20($26)
+ 0x7f 0x75 0x59 0x0a # CHECK: lhx $11, $21($27)
+ 0x7f 0x96 0x60 0x0a # CHECK: lwx $12, $22($gp)
+ 0x70 0xc7 0x08 0x00 # CHECK: madd $ac1, $6, $7
+ 0x71 0x09 0x08 0x01 # CHECK: maddu $ac1, $8, $9
+ 0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
+ 0x71 0x09 0x00 0x01 # CHECK: maddu $8, $9
+ 0x7c 0x64 0x15 0x30 # CHECK: maq_s.w.phl $ac2, $3, $4
+ 0x7c 0xa6 0x1c 0x30 # CHECK: maq_sa.w.phl $ac3, $5, $6
+ 0x7c 0xe8 0x05 0xb0 # CHECK: maq_s.w.phr $ac0, $7, $8
+ 0x7d 0x2a 0x0c 0xb0 # CHECK: maq_sa.w.phr $ac1, $9, $10
+ 0x00 0x20 0x70 0x10 # CHECK: mfhi $14, $ac1
+ 0x00 0x20 0x78 0x12 # CHECK: mflo $15, $ac1
+ 0x00 0x00 0x70 0x10 # CHECK: mfhi $14
+ 0x00 0x00 0x78 0x12 # CHECK: mflo $15
+ 0x7d 0x8d 0x5c 0x90 # CHECK: modsub $11, $12, $13
+ 0x71 0x4b 0x18 0x04 # CHECK: msub $ac3, $10, $11
+ 0x71 0x8d 0x10 0x05 # CHECK: msubu $ac2, $12, $13
+ 0x71 0x4b 0x00 0x04 # CHECK: msub $10, $11
+ 0x71 0x8d 0x00 0x05 # CHECK: msubu $12, $13
+ 0x02 0x00 0x18 0x11 # CHECK: mthi $16, $ac3
+ 0x02 0x00 0x00 0x11 # CHECK: mthi $16
+ 0x7d 0xc0 0x17 0xf8 # CHECK: mthlip $14, $ac2
+ 0x02 0x20 0x10 0x13 # CHECK: mtlo $17, $ac2
+ 0x02 0x20 0x00 0x13 # CHECK: mtlo $17
+ 0x7e 0x11 0x7b 0x18 # CHECK: mul.ph $15, $16, $17
+ 0x7e 0x74 0x93 0x98 # CHECK: mul_s.ph $18, $19, $20
+ 0x7e 0xd7 0xaf 0x10 # CHECK: muleq_s.w.phl $21, $22, $23
+ 0x7f 0x3a 0xc7 0x50 # CHECK: muleq_s.w.phr $24, $25, $26
+ 0x7f 0x9d 0xd9 0x90 # CHECK: muleu_s.ph.qbl $27, $gp, $sp
+ 0x7f 0xe1 0xf1 0xd0 # CHECK: muleu_s.ph.qbr $fp, $ra, $1
+ 0x7c 0x64 0x17 0xd0 # CHECK: mulq_rs.ph $2, $3, $4
+ 0x7c 0xc7 0x2d 0xd8 # CHECK: mulq_rs.w $5, $6, $7
+ 0x7d 0x2a 0x47 0x90 # CHECK: mulq_s.ph $8, $9, $10
+ 0x7d 0x8d 0x5d 0x98 # CHECK: mulq_s.w $11, $12, $13
+ 0x7d 0xcf 0x18 0xb0 # CHECK: mulsa.w.ph $ac3, $14, $15
+ 0x7e 0x11 0x01 0xb0 # CHECK: mulsaq_s.w.ph $ac0, $16, $17
+ 0x00 0x43 0x18 0x18 # CHECK: mult $ac3, $2, $3
+ 0x00 0x85 0x10 0x19 # CHECK: multu $ac2, $4, $5
+ 0x00 0x43 0x00 0x18 # CHECK: mult $2, $3
+ 0x00 0x85 0x00 0x19 # CHECK: multu $4, $5
+ 0x7e 0x74 0x93 0x91 # CHECK: packrl.ph $18, $19, $20
+ 0x7d 0xe3 0x3a 0xd1 # CHECK: pick.ph $7, $15, $3
+ 0x7c 0x88 0x10 0xd1 # CHECK: pick.qb $2, $4, $8
+ 0x7c 0x15 0xa3 0x12 # CHECK: preceq.w.phl $20, $21
+ 0x7c 0x16 0xab 0x52 # CHECK: preceq.w.phr $21, $22
+ 0x7c 0x17 0xb1 0x12 # CHECK: precequ.ph.qbl $22, $23
+ 0x7c 0x19 0xc1 0x92 # CHECK: precequ.ph.qbla $24, $25
+ 0x7c 0x18 0xb9 0x52 # CHECK: precequ.ph.qbr $23, $24
+ 0x7c 0x1a 0xc9 0xd2 # CHECK: precequ.ph.qbra $25, $26
+ 0x7c 0x1b 0xd7 0x12 # CHECK: preceu.ph.qbl $26, $27
+ 0x7c 0x1d 0xe7 0x92 # CHECK: preceu.ph.qbla $gp, $sp
+ 0x7c 0x1c 0xdf 0x52 # CHECK: preceu.ph.qbr $27, $gp
+ 0x7c 0x1e 0xef 0xd2 # CHECK: preceu.ph.qbra $sp, $fp
+ 0x7f 0x19 0xbb 0x51 # CHECK: precr.qb.ph $23, $24, $25
+ 0x7f 0x38 0x07 0x91 # CHECK: precr_sra.ph.w $24, $25, 0
+ 0x7f 0x38 0xff 0x91 # CHECK: precr_sra.ph.w $24, $25, 31
+ 0x7f 0x59 0x07 0xd1 # CHECK: precr_sra_r.ph.w $25, $26, 0
+ 0x7f 0x59 0xff 0xd1 # CHECK: precr_sra_r.ph.w $25, $26, 31
+ 0x7e 0x53 0x8d 0x11 # CHECK: precrq.ph.w $17, $18, $19
+ 0x7e 0x32 0x83 0x11 # CHECK: precrq.qb.ph $16, $17, $18
+ 0x7e 0x95 0x9b 0xd1 # CHECK: precrqu_s.qb.ph $19, $20, $21
+ 0x7e 0x74 0x95 0x51 # CHECK: precrq_rs.ph.w $18, $19, $20
+ 0x7c 0x41 0x18 0x71 # CHECK: prepend $1, $2, 3
+ 0x7c 0x40 0x0d 0x10 # CHECK: raddu.w.qb $1, $2
+ 0x7d 0x00 0x2c 0xb8 # CHECK: rddsp $5, 256
+ 0x7c 0x0c 0x12 0x92 # CHECK: repl.ph $2, 12
+ 0x7c 0x55 0x08 0x92 # CHECK: repl.qb $1, 85
+ 0x7c 0x02 0x0a 0xd2 # CHECK: replv.ph $1, $2
+ 0x7c 0x02 0x08 0xd2 # CHECK: replv.qb $1, $2
+ 0x7d 0x00 0x0e 0xb8 # CHECK: shilo $ac1, 16
+ 0x7c 0x40 0x0e 0xf8 # CHECK: shilov $ac1, $2
+ 0x7c 0x62 0x0a 0x13 # CHECK: shll.ph $1, $2, 3
+ 0x7c 0x62 0x0b 0x13 # CHECK: shll_s.ph $1, $2, 3
+ 0x7c 0x62 0x08 0x13 # CHECK: shll.qb $1, $2, 3
+ 0x7c 0x62 0x0a 0x93 # CHECK: shllv.ph $1, $2, $3
+ 0x7c 0x62 0x0b 0x93 # CHECK: shllv_s.ph $1, $2, $3
+ 0x7c 0x62 0x08 0x93 # CHECK: shllv.qb $1, $2, $3
+ 0x7c 0x62 0x0d 0x93 # CHECK: shllv_s.w $1, $2, $3
+ 0x7c 0x62 0x0d 0x13 # CHECK: shll_s.w $1, $2, 3
+ 0x7c 0x50 0x11 0x13 # CHECK: shra.qb $2, $16, 2
+ 0x7c 0x50 0x11 0x53 # CHECK: shra_r.qb $2, $16, 2
+ 0x7c 0x22 0x2a 0x53 # CHECK: shra.ph $5, $2, 1
+ 0x7c 0x22 0x2b 0x53 # CHECK: shra_r.ph $5, $2, 1
+ 0x7c 0x62 0x0a 0xd3 # CHECK: shrav.ph $1, $2, $3
+ 0x7c 0x62 0x0b 0xd3 # CHECK: shrav_r.ph $1, $2, $3
+ 0x7c 0x62 0x09 0x93 # CHECK: shrav.qb $1, $2, $3
+ 0x7c 0x62 0x09 0xd3 # CHECK: shrav_r.qb $1, $2, $3
+ 0x7c 0x62 0x0d 0xd3 # CHECK: shrav_r.w $1, $2, $3
+ 0x7c 0x22 0x0d 0x53 # CHECK: shra_r.w $1, $2, 1
+ 0x7c 0x42 0x0e 0x53 # CHECK: shrl.ph $1, $2, 2
+ 0x7c 0x42 0x08 0x53 # CHECK: shrl.qb $1, $2, 2
+ 0x7c 0x62 0x0e 0xd3 # CHECK: shrlv.ph $1, $2, $3
+ 0x7c 0x62 0x08 0xd3 # CHECK: shrlv.qb $1, $2, $3
+ 0x7c 0x43 0x0a 0xd0 # CHECK: subq.ph $1, $2, $3
+ 0x7c 0x43 0x0b 0xd0 # CHECK: subq_s.ph $1, $2, $3
+ 0x7c 0x43 0x0d 0xd0 # CHECK: subq_s.w $1, $2, $3
+ 0x7c 0x43 0x0a 0x58 # CHECK: subqh.ph $1, $2, $3
+ 0x7c 0x43 0x0a 0xd8 # CHECK: subqh_r.ph $1, $2, $3
+ 0x7c 0x43 0x0c 0x58 # CHECK: subqh.w $1, $2, $3
+ 0x7c 0x43 0x0c 0xd8 # CHECK: subqh_r.w $1, $2, $3
+ 0x7c 0x49 0x32 0x50 # CHECK: subu.ph $6, $2, $9
+ 0x7c 0x64 0x13 0x50 # CHECK: subu_s.ph $2, $3, $4
+ 0x7c 0x43 0x08 0x50 # CHECK: subu.qb $1, $2, $3
+ 0x7c 0x43 0x09 0x50 # CHECK: subu_s.qb $1, $2, $3
+ 0x7c 0x43 0x08 0x58 # CHECK: subuh.qb $1, $2, $3
+ 0x7c 0x43 0x08 0xd8 # CHECK: subuh_r.qb $1, $2, $3
+ 0x7c 0x20 0x04 0xf8 # CHECK: wrdsp $1, 0
diff --git a/test/MC/Disassembler/Mips/eva/valid_R6-eva.txt b/test/MC/Disassembler/Mips/eva/valid_R6-eva.txt
new file mode 100644
index 000000000000..b9525ba1206f
--- /dev/null
+++ b/test/MC/Disassembler/Mips/eva/valid_R6-eva.txt
@@ -0,0 +1,38 @@
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips32r6 -mattr=eva | FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r6 -mattr=eva | FileCheck %s
+# CHECK: .text
+0x7c 0xff 0x7f 0x9b # CHECK: cachee 31, 255($7)
+0x7c 0x80 0x80 0x1b # CHECK: cachee 0, -256($4)
+0x7c 0x85 0xba 0x1b # CHECK: cachee 5, -140($4)
+0x7f 0x2a 0x80 0x2c # CHECK: lbe $10, -256($25)
+0x7d 0xed 0x7f 0xac # CHECK: lbe $13, 255($15)
+0x7d 0xcb 0x49 0x2c # CHECK: lbe $11, 146($14)
+0x7c 0x6d 0x80 0x28 # CHECK: lbue $13, -256($3)
+0x7c 0x4d 0x7f 0xa8 # CHECK: lbue $13, 255($2)
+0x7c 0x6d 0xa1 0x28 # CHECK: lbue $13, -190($3)
+0x7e 0xad 0x80 0x2d # CHECK: lhe $13, -256($21)
+0x7e 0x0c 0x7f 0xad # CHECK: lhe $12, 255($16)
+0x7e 0x0d 0x28 0xad # CHECK: lhe $13, 81($16)
+0x7c 0x72 0x80 0x29 # CHECK: lhue $18, -256($3)
+0x7c 0x72 0x7f 0xa9 # CHECK: lhue $18, 255($3)
+0x7c 0x56 0xac 0x29 # CHECK: lhue $22, -168($2)
+0x7e 0xa2 0x80 0x2e # CHECK: lle $2, -256($21)
+0x7e 0x63 0x7f 0xae # CHECK: lle $3, 255($19)
+0x7e 0xc3 0xdc 0xae # CHECK: lle $3, -71($22)
+0x7c 0x4e 0x80 0x23 # CHECK: prefe 14, -256($2)
+0x7c 0x6b 0x7f 0xa3 # CHECK: prefe 11, 255($3)
+0x7c 0x6e 0xed 0xa3 # CHECK: prefe 14, -37($3)
+0x7d 0x71 0x7f 0x9c # CHECK: sbe $17, 255($11)
+0x7d 0x51 0x80 0x1c # CHECK: sbe $17, -256($10)
+0x7d 0xd3 0x00 0x1c # CHECK: sbe $19, 0($14)
+0x7e 0x49 0x7f 0x9e # CHECK: sce $9, 255($18)
+0x7e 0xac 0x80 0x1e # CHECK: sce $12, -256($21)
+0x7e 0xed 0xf0 0x9e # CHECK: sce $13, -31($23)
+0x7d 0xee 0x7f 0x9d # CHECK: she $14, 255($15)
+0x7d 0xee 0x80 0x1d # CHECK: she $14, -256($15)
+0x7d 0x69 0x75 0x9d # CHECK: she $9, 235($11)
+0x7f 0xbf 0x7f 0x9f # CHECK: swe $ra, 255($sp)
+0x7f 0xbf 0x80 0x1f # CHECK: swe $ra, -256($sp)
+0x7f 0xbf 0xe5 0x9f # CHECK: swe $ra, -53($sp)
+0x42 0x00 0x00 0x03 # CHECK: tlbinv
+0x42 0x00 0x00 0x04 # CHECK: tlbinvf
diff --git a/test/MC/Disassembler/Mips/eva/valid_preR6-eva.txt b/test/MC/Disassembler/Mips/eva/valid_preR6-eva.txt
new file mode 100644
index 000000000000..f364433c1c4e
--- /dev/null
+++ b/test/MC/Disassembler/Mips/eva/valid_preR6-eva.txt
@@ -0,0 +1,54 @@
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips32r2 -mattr=eva | FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips32r3 -mattr=eva | FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips32r5 -mattr=eva | FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r2 -mattr=eva | FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r3 -mattr=eva | FileCheck %s
+# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r5 -mattr=eva | FileCheck %s
+# CHECK: .text
+0x7c 0xff 0x7f 0x9b # CHECK: cachee 31, 255($7)
+0x7c 0x80 0x80 0x1b # CHECK: cachee 0, -256($4)
+0x7c 0x85 0xba 0x1b # CHECK: cachee 5, -140($4)
+0x7f 0x2a 0x80 0x2c # CHECK: lbe $10, -256($25)
+0x7d 0xed 0x7f 0xac # CHECK: lbe $13, 255($15)
+0x7d 0xcb 0x49 0x2c # CHECK: lbe $11, 146($14)
+0x7c 0x6d 0x80 0x28 # CHECK: lbue $13, -256($3)
+0x7c 0x4d 0x7f 0xa8 # CHECK: lbue $13, 255($2)
+0x7c 0x6d 0xa1 0x28 # CHECK: lbue $13, -190($3)
+0x7e 0xad 0x80 0x2d # CHECK: lhe $13, -256($21)
+0x7e 0x0c 0x7f 0xad # CHECK: lhe $12, 255($16)
+0x7e 0x0d 0x28 0xad # CHECK: lhe $13, 81($16)
+0x7c 0x72 0x80 0x29 # CHECK: lhue $18, -256($3)
+0x7c 0x72 0x7f 0xa9 # CHECK: lhue $18, 255($3)
+0x7c 0x56 0xac 0x29 # CHECK: lhue $22, -168($2)
+0x7e 0xa2 0x80 0x2e # CHECK: lle $2, -256($21)
+0x7e 0x63 0x7f 0xae # CHECK: lle $3, 255($19)
+0x7e 0xc3 0xdc 0xae # CHECK: lle $3, -71($22)
+0x7d 0xf6 0x7f 0x99 # CHECK: lwle $22, 255($15)
+0x7d 0x57 0x80 0x19 # CHECK: lwle $23, -256($10)
+0x7d 0xb7 0xa8 0x19 # CHECK: lwle $23, -176($13)
+0x7f 0x80 0x7f 0x9a # CHECK: lwre $zero, 255($gp)
+0x7f 0x80 0x80 0x1a # CHECK: lwre $zero, -256($gp)
+0x7f 0x80 0xa8 0x1a # CHECK: lwre $zero, -176($gp)
+0x7c 0x4e 0x80 0x23 # CHECK: prefe 14, -256($2)
+0x7c 0x6b 0x7f 0xa3 # CHECK: prefe 11, 255($3)
+0x7c 0x6e 0xed 0xa3 # CHECK: prefe 14, -37($3)
+0x7d 0x71 0x7f 0x9c # CHECK: sbe $17, 255($11)
+0x7d 0x51 0x80 0x1c # CHECK: sbe $17, -256($10)
+0x7d 0xd3 0x00 0x1c # CHECK: sbe $19, 0($14)
+0x7e 0x49 0x7f 0x9e # CHECK: sce $9, 255($18)
+0x7e 0xac 0x80 0x1e # CHECK: sce $12, -256($21)
+0x7e 0xed 0xf0 0x9e # CHECK: sce $13, -31($23)
+0x7d 0xee 0x7f 0x9d # CHECK: she $14, 255($15)
+0x7d 0xee 0x80 0x1d # CHECK: she $14, -256($15)
+0x7d 0x69 0x75 0x9d # CHECK: she $9, 235($11)
+0x7f 0xbf 0x7f 0x9f # CHECK: swe $ra, 255($sp)
+0x7f 0xbf 0x80 0x1f # CHECK: swe $ra, -256($sp)
+0x7f 0xbf 0xe5 0x9f # CHECK: swe $ra, -53($sp)
+0x7e 0x29 0x7f 0xa1 # CHECK: swle $9, 255($17)
+0x7e 0x6a 0x80 0x21 # CHECK: swle $10, -256($19)
+0x7e 0xa8 0x41 0xa1 # CHECK: swle $8, 131($21)
+0x7d 0xb4 0x7f 0xa2 # CHECK: swre $20, 255($13)
+0x7d 0xb4 0x80 0x22 # CHECK: swre $20, -256($13)
+0x7d 0xd2 0x2b 0x22 # CHECK: swre $18, 86($14)
+0x42 0x00 0x00 0x03 # CHECK: tlbinv
+0x42 0x00 0x00 0x04 # CHECK: tlbinvf
diff --git a/test/MC/Disassembler/Mips/micromips-dsp/valid.txt b/test/MC/Disassembler/Mips/micromips-dsp/valid.txt
new file mode 100644
index 000000000000..fdd404c43492
--- /dev/null
+++ b/test/MC/Disassembler/Mips/micromips-dsp/valid.txt
@@ -0,0 +1,103 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r6 -mattr=micromips -mattr=+dsp | FileCheck %s
+
+0x00 0x64 0x11 0x3c # CHECK: absq_s.ph $3, $4
+0x00 0x64 0x21 0x3c # CHECK: absq_s.w $3, $4
+0x00 0xa4 0x18 0xcd # CHECK: addu.qb $3, $4, $5
+0x00 0xa4 0x1c 0xcd # CHECK: addu_s.qb $3, $4, $5
+0x00 0xa4 0x1b 0x85 # CHECK: addsc $3, $4, $5
+0x00 0xa4 0x1b 0xc5 # CHECK: addwc $3, $4, $5
+0x00 0xa4 0x18 0x0d # CHECK: addq.ph $3, $4, $5
+0x00 0xa4 0x1c 0x0d # CHECK: addq_s.ph $3, $4, $5
+0x00 0xa4 0x1b 0x05 # CHECK: addq_s.w $3, $4, $5
+0x00 0x65 0x42 0xbc # CHECK: dpaq_s.w.ph $ac1, $5, $3
+0x00 0x64 0x92 0xbc # CHECK: dpaq_sa.l.w $ac2, $4, $3
+0x00 0x83 0x60 0xbc # CHECK: dpau.h.qbl $ac1, $3, $4
+0x02 0xb4 0xb0 0xbc # CHECK: dpau.h.qbr $ac2, $20, $21
+0x00 0x06 0x66 0x7c # CHECK: extp $zero, $ac1, 6
+0x00 0x42 0x76 0x7c # CHECK: extpdp $2, $ac1, 2
+0x00 0x88 0xb8 0xbc # CHECK: extpdpv $4, $ac2, $8
+0x01 0xe7 0xe8 0xbc # CHECK: extpv $15, $ac3, $7
+0x03 0x7f 0xce 0x7c # CHECK: extr.w $27, $ac3, 31
+0x01 0x98 0x1e 0x7c # CHECK: extr_r.w $12, $ac0, 24
+0x03 0x69 0xee 0x7c # CHECK: extr_rs.w $27, $ac3, 9
+0x00 0x61 0xbe 0x7c # CHECK: extr_s.h $3, $ac2, 1
+0x00 0xa6 0x0e 0xbc # CHECK: extrv.w $5, $ac0, $6
+0x01 0x43 0x1e 0xbc # CHECK: extrv_r.w $10, $ac0, $3
+0x01 0xf4 0x6e 0xbc # CHECK: extrv_rs.w $15, $ac1, $20
+0x01 0x10 0xbe 0xbc # CHECK: extrv_s.h $8, $ac2, $16
+0x00 0x64 0x41 0x3c # CHECK: insv $3, $4
+0x00 0xe6 0x4a 0xbc # CHECK: madd $ac1, $6, $7
+0x01 0x28 0x1a 0xbc # CHECK: maddu $ac0, $8, $9
+0x01 0x6a 0xea 0xbc # CHECK: msub $ac3, $10, $11
+0x01 0xac 0xba 0xbc # CHECK: msubu $ac2, $12, $13
+0x00 0x62 0xcc 0xbc # CHECK: mult $ac3, $2, $3
+0x00 0xa4 0x9c 0xbc # CHECK: multu $ac2, $4, $5
+0x00 0xa4 0x19 0xad # CHECK: packrl.ph $3, $4, $5
+0x00 0xa4 0x1a 0x2d # CHECK: pick.ph $3, $4, $5
+0x00 0xa4 0x19 0xed # CHECK: pick.qb $3, $4, $5
+0x00 0x22 0x51 0x3c # CHECK: preceq.w.phl $1, $2
+0x00 0x64 0x61 0x3c # CHECK: preceq.w.phr $3, $4
+0x00 0xa6 0x71 0x3c # CHECK: precequ.ph.qbl $5, $6
+0x00 0xe8 0x73 0x3c # CHECK: precequ.ph.qbla $7, $8
+0x01 0x2a 0x91 0x3c # CHECK: precequ.ph.qbr $9, $10
+0x01 0x6c 0x93 0x3c # CHECK: precequ.ph.qbra $11, $12
+0x01 0xae 0xb1 0x3c # CHECK: preceu.ph.qbl $13, $14
+0x01 0xf0 0xb3 0x3c # CHECK: preceu.ph.qbla $15, $16
+0x02 0x32 0xd1 0x3c # CHECK: preceu.ph.qbr $17, $18
+0x02 0x74 0xd3 0x3c # CHECK: preceu.ph.qbra $19, $20
+0x01 0x49 0x40 0xed # CHECK: precrq.ph.w $8, $9, $10
+0x01 0xac 0x58 0xad # CHECK: precrq.qb.ph $11, $12, $13
+0x02 0x0f 0x71 0x6d # CHECK: precrqu_s.qb.ph $14, $15, $16
+0x02 0x72 0x89 0x2d # CHECK: precrq_rs.ph.w $17, $18, $19
+0x00 0x03 0x40 0x1d # CHECK: shilo $ac1, 3
+0x00 0x05 0x52 0x7c # CHECK: shilov $ac1, $5
+0x00 0x64 0x53 0xb5 # CHECK: shll.ph $3, $4, 5
+0x00 0x64 0x5b 0xb5 # CHECK: shll_s.ph $3, $4, 5
+0x00 0x64 0xa8 0x7c # CHECK: shll.qb $3, $4, 5
+0x00 0x85 0x18 0x0e # CHECK: shllv.ph $3, $4, $5
+0x00 0x85 0x1c 0x0e # CHECK: shllv_s.ph $3, $4, $5
+0x00 0x85 0x1b 0x95 # CHECK: shllv.qb $3, $4, $5
+0x00 0x85 0x1b 0xd5 # CHECK: shllv_s.w $3, $4, $5
+0x00 0x64 0x2b 0xf5 # CHECK: shll_s.w $3, $4, 5
+0x00 0x64 0x53 0x35 # CHECK: shra.ph $3, $4, 5
+0x00 0x64 0x57 0x35 # CHECK: shra_r.ph $3, $4, 5
+0x00 0x85 0x19 0x8d # CHECK: shrav.ph $3, $4, $5
+0x00 0x85 0x1d 0x8d # CHECK: shrav_r.ph $3, $4, $5
+0x00 0x85 0x1a 0xd5 # CHECK: shrav_r.w $3, $4, $5
+0x00 0x64 0x2a 0xf5 # CHECK: shra_r.w $3, $4, 5
+0x00 0x64 0xb8 0x7c # CHECK: shrl.qb $3, $4, 5
+0x00 0x85 0x1b 0x55 # CHECK: shrlv.qb $3, $4, $5
+0x00 0xa4 0x1a 0x0d # CHECK: subq.ph $3, $4, $5
+0x00 0xa4 0x1e 0x0d # CHECK: subq_s.ph $3, $4, $5
+0x00 0xa4 0x1b 0x45 # CHECK: subq_s.w $3, $4, $5
+0x00 0xa4 0x1a 0xcd # CHECK: subu.qb $3, $4, $5
+0x00 0xa4 0x1e 0xcd # CHECK: subu_s.qb $3, $4, $5
+0x00 0xc4 0x46 0xbc # CHECK: dpsq_s.w.ph $ac1, $4, $6
+0x00 0xc4 0x56 0xbc # CHECK: dpsq_sa.l.w $ac1, $4, $6
+0x00 0xc4 0x64 0xbc # CHECK: dpsu.h.qbl $ac1, $4, $6
+0x00 0xc4 0x74 0xbc # CHECK: dpsu.h.qbr $ac1, $4, $6
+0x00 0x62 0x08 0x25 # CHECK: muleq_s.w.phl $1, $2, $3
+0x00 0x62 0x08 0x65 # CHECK: muleq_s.w.phr $1, $2, $3
+0x00 0x62 0x08 0x95 # CHECK: muleu_s.ph.qbl $1, $2, $3
+0x00 0x62 0x08 0xd5 # CHECK: muleu_s.ph.qbr $1, $2, $3
+0x00,0x62,0x09,0x15 # CHECK: mulq_rs.ph $1, $2, $3
+0x00 0x43 0x0a 0x25 # CHECK: lbux $1, $2($3)
+0x00 0x43 0x09 0x65 # CHECK: lhx $1, $2($3)
+0x00 0x43 0x09 0xa5 # CHECK: lwx $1, $2($3)
+0x00 0x62 0x5a 0x7c # CHECK: maq_s.w.phl $ac1, $2, $3
+0x00 0x62 0x7a 0x7c # CHECK: maq_sa.w.phl $ac1, $2, $3
+0x00 0x62 0x4a 0x7c # CHECK: maq_s.w.phr $ac1, $2, $3
+0x00 0x62 0x6a 0x7c # CHECK: maq_sa.w.phr $ac1, $2, $3
+0x00 0x02 0x40 0x7c # CHECK: mfhi $2, $ac1
+0x00 0x01 0x50 0x7c # CHECK: mflo $1, $ac1
+0x00 0x01 0x60 0x7c # CHECK: mthi $1, $ac1
+0x00 0x01 0x70 0x7c # CHECK: mtlo $1, $ac1
+0x00 0x22 0xf1 0x3c # CHECK: raddu.w.qb $1, $2
+0x00 0x20 0x86 0x7c # CHECK: rddsp $1, 2
+0x02 0x00 0x08 0x3d # CHECK: repl.ph $1, 512
+0x00 0x30 0x05 0xfc # CHECK: repl.qb $1, 128
+0x00 0x22 0x03 0x3c # CHECK: replv.ph $1, $2
+0x00 0x22 0x13 0x3c # CHECK: replv.qb $1, $2
+0x00 0x01 0x82 0x7c # CHECK: mthlip $1, $ac2
+0x00 0xa7 0xd6 0x7c # CHECK: wrdsp $5
+0x00 0xa0 0x96 0x7c # CHECK: wrdsp $5, 2
diff --git a/test/MC/Disassembler/Mips/micromips-dspr2/valid.txt b/test/MC/Disassembler/Mips/micromips-dspr2/valid.txt
new file mode 100644
index 000000000000..1d9fc9e80d73
--- /dev/null
+++ b/test/MC/Disassembler/Mips/micromips-dspr2/valid.txt
@@ -0,0 +1,125 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r6 -mattr=micromips -mattr=+dspr2 | FileCheck %s
+
+0x00 0x64 0x11 0x3c # CHECK: absq_s.ph $3, $4
+0x00 0x64 0x01 0x3c # CHECK: absq_s.qb $3, $4
+0x00 0x64 0x21 0x3c # CHECK: absq_s.w $3, $4
+0x00 0xa4 0x19 0x0d # CHECK: addu.ph $3, $4, $5
+0x00 0xa4 0x18 0xcd # CHECK: addu.qb $3, $4, $5
+0x00 0xa4 0x1d 0x0d # CHECK: addu_s.ph $3, $4, $5
+0x00 0xa4 0x1c 0xcd # CHECK: addu_s.qb $3, $4, $5
+0x00 0xa4 0x19 0x4d # CHECK: adduh.qb $3, $4, $5
+0x00 0xa4 0x1d 0x4d # CHECK: adduh_r.qb $3, $4, $5
+0x00 0xa4 0x1b 0x85 # CHECK: addsc $3, $4, $5
+0x00 0xa4 0x1b 0xc5 # CHECK: addwc $3, $4, $5
+0x00 0xa4 0x18 0x0d # CHECK: addq.ph $3, $4, $5
+0x00 0xa4 0x1c 0x0d # CHECK: addq_s.ph $3, $4, $5
+0x00 0xa4 0x1b 0x05 # CHECK: addq_s.w $3, $4, $5
+0x00 0xa4 0x18 0x4d # CHECK: addqh.ph $3, $4, $5
+0x00 0xa4 0x18 0x8d # CHECK: addqh.w $3, $4, $5
+0x00 0xa4 0x1c 0x4d # CHECK: addqh_r.ph $3, $4, $5
+0x00 0xa4 0x1c 0x8d # CHECK: addqh_r.w $3, $4, $5
+0x00 0x43 0x00 0xbc # CHECK: dpa.w.ph $ac0, $3, $2
+0x00 0x65 0x42 0xbc # CHECK: dpaq_s.w.ph $ac1, $5, $3
+0x00 0x64 0x92 0xbc # CHECK: dpaq_sa.l.w $ac2, $4, $3
+0x00 0xec 0xe2 0xbc # CHECK: dpaqx_s.w.ph $ac3, $12, $7
+0x00 0xc5 0x32 0xbc # CHECK: dpaqx_sa.w.ph $ac0, $5, $6
+0x00 0x83 0x60 0xbc # CHECK: dpau.h.qbl $ac1, $3, $4
+0x02 0xb4 0xb0 0xbc # CHECK: dpau.h.qbr $ac2, $20, $21
+0x00 0x22 0xd0 0xbc # CHECK: dpax.w.ph $ac3, $2, $1
+0x00 0x06 0x66 0x7c # CHECK: extp $zero, $ac1, 6
+0x00 0x42 0x76 0x7c # CHECK: extpdp $2, $ac1, 2
+0x00 0x88 0xb8 0xbc # CHECK: extpdpv $4, $ac2, $8
+0x01 0xe7 0xe8 0xbc # CHECK: extpv $15, $ac3, $7
+0x03 0x7f 0xce 0x7c # CHECK: extr.w $27, $ac3, 31
+0x01 0x98 0x1e 0x7c # CHECK: extr_r.w $12, $ac0, 24
+0x03 0x69 0xee 0x7c # CHECK: extr_rs.w $27, $ac3, 9
+0x00 0x61 0xbe 0x7c # CHECK: extr_s.h $3, $ac2, 1
+0x00 0xa6 0x0e 0xbc # CHECK: extrv.w $5, $ac0, $6
+0x01 0x43 0x1e 0xbc # CHECK: extrv_r.w $10, $ac0, $3
+0x01 0xf4 0x6e 0xbc # CHECK: extrv_rs.w $15, $ac1, $20
+0x01 0x10 0xbe 0xbc # CHECK: extrv_s.h $8, $ac2, $16
+0x00 0x64 0x41 0x3c # CHECK: insv $3, $4
+0x00 0xe6 0x4a 0xbc # CHECK: madd $ac1, $6, $7
+0x01 0x28 0x1a 0xbc # CHECK: maddu $ac0, $8, $9
+0x01 0x6a 0xea 0xbc # CHECK: msub $ac3, $10, $11
+0x01 0xac 0xba 0xbc # CHECK: msubu $ac2, $12, $13
+0x00 0x62 0xcc 0xbc # CHECK: mult $ac3, $2, $3
+0x00 0xa4 0x9c 0xbc # CHECK: multu $ac2, $4, $5
+0x00 0xa4 0x19 0xad # CHECK: packrl.ph $3, $4, $5
+0x00 0xa4 0x1a 0x2d # CHECK: pick.ph $3, $4, $5
+0x00 0xa4 0x19 0xed # CHECK: pick.qb $3, $4, $5
+0x00 0x22 0x51 0x3c # CHECK: preceq.w.phl $1, $2
+0x00 0x64 0x61 0x3c # CHECK: preceq.w.phr $3, $4
+0x00 0xa6 0x71 0x3c # CHECK: precequ.ph.qbl $5, $6
+0x00 0xe8 0x73 0x3c # CHECK: precequ.ph.qbla $7, $8
+0x01 0x2a 0x91 0x3c # CHECK: precequ.ph.qbr $9, $10
+0x01 0x6c 0x93 0x3c # CHECK: precequ.ph.qbra $11, $12
+0x01 0xae 0xb1 0x3c # CHECK: preceu.ph.qbl $13, $14
+0x01 0xf0 0xb3 0x3c # CHECK: preceu.ph.qbla $15, $16
+0x02 0x32 0xd1 0x3c # CHECK: preceu.ph.qbr $17, $18
+0x02 0x74 0xd3 0x3c # CHECK: preceu.ph.qbra $19, $20
+0x00 0x62 0x08 0x6d # CHECK: precr.qb.ph $1, $2, $3
+0x00 0x85 0x0b 0xcd # CHECK: precr_sra.ph.w $4, $5, 1
+0x00 0xc7 0x17 0xcd # CHECK: precr_sra_r.ph.w $6, $7, 2
+0x01 0x49 0x40 0xed # CHECK: precrq.ph.w $8, $9, $10
+0x01 0xac 0x58 0xad # CHECK: precrq.qb.ph $11, $12, $13
+0x02 0x0f 0x71 0x6d # CHECK: precrqu_s.qb.ph $14, $15, $16
+0x02 0x72 0x89 0x2d # CHECK: precrq_rs.ph.w $17, $18, $19
+0x00 0x03 0x40 0x1d # CHECK: shilo $ac1, 3
+0x00 0x05 0x52 0x7c # CHECK: shilov $ac1, $5
+0x00 0x64 0x53 0xb5 # CHECK: shll.ph $3, $4, 5
+0x00 0x64 0x5b 0xb5 # CHECK: shll_s.ph $3, $4, 5
+0x00 0x64 0xa8 0x7c # CHECK: shll.qb $3, $4, 5
+0x00 0x85 0x18 0x0e # CHECK: shllv.ph $3, $4, $5
+0x00 0x85 0x1c 0x0e # CHECK: shllv_s.ph $3, $4, $5
+0x00 0x85 0x1b 0x95 # CHECK: shllv.qb $3, $4, $5
+0x00 0x85 0x1b 0xd5 # CHECK: shllv_s.w $3, $4, $5
+0x00 0x64 0x2b 0xf5 # CHECK: shll_s.w $3, $4, 5
+0x00 0x64 0x53 0x35 # CHECK: shra.ph $3, $4, 5
+0x00 0x64 0xa1 0xfc # CHECK: shra.qb $3, $4, 5
+0x00 0x64 0x57 0x35 # CHECK: shra_r.ph $3, $4, 5
+0x00 0x64 0xb1 0xfc # CHECK: shra_r.qb $3, $4, 5
+0x00 0x85 0x19 0x8d # CHECK: shrav.ph $3, $4, $5
+0x00 0x85 0x19 0xcd # CHECK: shrav.qb $3, $4, $5
+0x00 0x85 0x1d 0x8d # CHECK: shrav_r.ph $3, $4, $5
+0x00 0x85 0x1d 0xcd # CHECK: shrav_r.qb $3, $4, $5
+0x00 0x85 0x1a 0xd5 # CHECK: shrav_r.w $3, $4, $5
+0x00 0x64 0x2a 0xf5 # CHECK: shra_r.w $3, $4, 5
+0x00 0x64 0x53 0xfc # CHECK: shrl.ph $3, $4, 5
+0x00 0x64 0xb8 0x7c # CHECK: shrl.qb $3, $4, 5
+0x00 0x85 0x1b 0x15 # CHECK: shrlv.ph $3, $4, $5
+0x00 0x85 0x1b 0x55 # CHECK: shrlv.qb $3, $4, $5
+0x00 0xa4 0x1a 0x0d # CHECK: subq.ph $3, $4, $5
+0x00 0xa4 0x1e 0x0d # CHECK: subq_s.ph $3, $4, $5
+0x00 0xa4 0x1b 0x45 # CHECK: subq_s.w $3, $4, $5
+0x00 0xa4 0x1a 0x4d # CHECK: subqh.ph $3, $4, $5
+0x00 0xa4 0x1e 0x4d # CHECK: subqh_r.ph $3, $4, $5
+0x00 0xa4 0x1a 0x8d # CHECK: subqh.w $3, $4, $5
+0x00 0xa4 0x1e 0x8d # CHECK: subqh_r.w $3, $4, $5
+0x00 0xa4 0x1b 0x0d # CHECK: subu.ph $3, $4, $5
+0x00 0xa4 0x1f 0x0d # CHECK: subu_s.ph $3, $4, $5
+0x00 0xa4 0x1a 0xcd # CHECK: subu.qb $3, $4, $5
+0x00 0xa4 0x1e 0xcd # CHECK: subu_s.qb $3, $4, $5
+0x00 0xa4 0x1b 0x4d # CHECK: subuh.qb $3, $4, $5
+0x00 0xa4 0x1f 0x4d # CHECK: subuh_r.qb $3, $4, $5
+0x00 0xc4 0x46 0xbc # CHECK: dpsq_s.w.ph $ac1, $4, $6
+0x00 0xc4 0x56 0xbc # CHECK: dpsq_sa.l.w $ac1, $4, $6
+0x00 0xc4 0x64 0xbc # CHECK: dpsu.h.qbl $ac1, $4, $6
+0x00 0xc4 0x74 0xbc # CHECK: dpsu.h.qbr $ac1, $4, $6
+0x00 0xc4 0x44 0xbc # CHECK: dps.w.ph $ac1, $4, $6
+0x00 0xc4 0x66 0xbc # CHECK: dpsqx_s.w.ph $ac1, $4, $6
+0x00 0xc4 0x76 0xbc # CHECK: dpsqx_sa.w.ph $ac1, $4, $6
+0x00 0xc4 0x54 0xbc # CHECK: dpsx.w.ph $ac1, $4, $6
+0x00 0x62 0x08 0x2d # CHECK: mul.ph $1, $2, $3
+0x00 0x62 0x0c 0x2d # CHECK: mul_s.ph $1, $2, $3
+0x00 0x62 0x09 0x95 # CHECK: mulq_rs.w $1, $2, $3
+0x00 0x62 0x09 0x55 # CHECK: mulq_s.ph $1, $2, $3
+0x00 0x62 0x09 0xd5 # CHECK: mulq_s.w $1, $2, $3
+0x00 0x62 0x08 0x25 # CHECK: muleq_s.w.phl $1, $2, $3
+0x00 0x62 0x08 0x65 # CHECK: muleq_s.w.phr $1, $2, $3
+0x00 0x62 0x08 0x95 # CHECK: muleu_s.ph.qbl $1, $2, $3
+0x00 0x62 0x08 0xd5 # CHECK: muleu_s.ph.qbr $1, $2, $3
+0x00,0x62,0x09,0x15 # CHECK: mulq_rs.ph $1, $2, $3
+0x00 0x22 0x1a 0x55 # CHECK: prepend $1, $2, 3
+0x00 0xa7 0xd6 0x7c # CHECK: wrdsp $5
+0x00 0xa0 0x96 0x7c # CHECK: wrdsp $5, 2
diff --git a/test/MC/Disassembler/Mips/micromips32r3/invalid.txt b/test/MC/Disassembler/Mips/micromips32r3/invalid.txt
new file mode 100644
index 000000000000..fcaa6169e669
--- /dev/null
+++ b/test/MC/Disassembler/Mips/micromips32r3/invalid.txt
@@ -0,0 +1,4 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mattr=micromips \
+# RUN: 2>&1 | FileCheck %s
+
+0x21 0xe2 0x5c 0x71 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/micromips_le.txt b/test/MC/Disassembler/Mips/micromips32r3/valid-el.txt
index 3058bd061066..d6c7de4e3a53 100644
--- a/test/MC/Disassembler/Mips/micromips_le.txt
+++ b/test/MC/Disassembler/Mips/micromips32r3/valid-el.txt
@@ -1,342 +1,191 @@
# RUN: llvm-mc --disassemble %s -triple=mipsel-unknown-linux -mattr=micromips \
# RUN: | FileCheck %s
-0xe6 0x00 0x10 0x49 # CHECK: add $9, $6, $7
-
-0x26 0x11 0x67 0x45 # CHECK: addi $9, $6, 17767
-
-0x26 0x31 0x67 0xc5 # CHECK: addiu $9, $6, -15001
-
-0x26 0x11 0x67 0x45 # CHECK: addi $9, $6, 17767
-
-0x26 0x31 0x67 0xc5 # CHECK: addiu $9, $6, -15001
-
0xf9 0x4f # CHECK: addiusp -16
-
0xff 0x4f # CHECK: addiusp -1028
-
0xfd 0x4f # CHECK: addiusp -1032
-
0x01 0x4c # CHECK: addiusp 1024
-
0x03 0x4c # CHECK: addiusp 1028
-
-0xe6 0x00 0x50 0x49 # CHECK: addu $9, $6, $7
-
0x29 0x2c # CHECK: andi16 $16, $2, 31
-
+0x05 0x47 # CHECK: jraddiusp 20
+0x42 0x07 # CHECK: addu16 $6, $17, $4
+0xb1 0x06 # CHECK: subu16 $5, $16, $3
+0x82 0x44 # CHECK: and16 $16, $2
+0x0b 0x44 # CHECK: not16 $17, $3
+0xc4 0x44 # CHECK: or16 $16, $4
+0x4d 0x44 # CHECK: xor16 $17, $5
+0x8a 0x25 # CHECK: sll16 $3, $16, 5
+0x1d 0x26 # CHECK: srl16 $4, $17, 6
+0x94 0x09 # CHECK: lbu16 $3, 4($17)
+0x8f 0x09 # CHECK: lbu16 $3, -1($16)
+0x82 0x29 # CHECK: lhu16 $3, 4($16)
+0x12 0x6a # CHECK: lw16 $4, 8($17)
+0x84 0x89 # CHECK: sb16 $3, 4($16)
+0x14 0xaa # CHECK: sh16 $4, 8($17)
+0x11 0xea # CHECK: sw16 $4, 4($17)
+0x11 0xe8 # CHECK: sw16 $zero, 4($17)
+0x09 0x46 # CHECK: mfhi $9
+0x49 0x46 # CHECK: mflo $9
+0x21 0x0f # CHECK: move $25, $1
+0xa9 0x45 # CHECK: jrc $9
+0xc9 0x45 # CHECK: jalr $9
+0xe9 0x45 # CHECK: jalrs16 $9
+0x89 0x45 # CHECK: jr16 $9
+0xff 0xed # CHECK: li16 $3, -1
+0xfe 0xed # CHECK: li16 $3, 126
+0x83 0x6f # CHECK: addiur1sp $7, 4
+0x7e 0x6f # CHECK: addiur2 $6, $7, -1
+0x76 0x6f # CHECK: addiur2 $6, $7, 12
+0xfc 0x4c # CHECK: addius5 $7, -2
+0x00 0x0c # CHECK: nop
+0x68 0x48 # CHECK: lw $3, 32($sp)
+0x9f 0xc8 # CHECK: sw $4, 124($sp)
+0x0a 0x8f # CHECK: beqz16 $6, 20
+0x0a 0xaf # CHECK: bnez16 $6, 20
+0x42 0xcc # CHECK: b16 132
+0x88 0x65 # CHECK: lw $3, 32($gp)
+0x12 0x45 # CHECK: lwm16 $16, $17, $ra, 8($sp)
+0x52 0x45 # CHECK: swm16 $16, $17, $ra, 8($sp)
+0x88 0x46 # CHECK: break16 8
+0xce 0x46 # CHECK: sdbbp16 14
+0x34 0x84 # CHECK: movep $5, $6, $2, $3
+0xe6 0x00 0x10 0x49 # CHECK: add $9, $6, $7
+0x26 0x11 0x67 0x45 # CHECK: addi $9, $6, 17767
+0x26 0x31 0x67 0xc5 # CHECK: addiu $9, $6, -15001
+0x26 0x11 0x67 0x45 # CHECK: addi $9, $6, 17767
+0x26 0x31 0x67 0xc5 # CHECK: addiu $9, $6, -15001
+0xe6 0x00 0x50 0x49 # CHECK: addu $9, $6, $7
0xe6 0x00 0x90 0x49 # CHECK: sub $9, $6, $7
-
0xa3 0x00 0xd0 0x21 # CHECK: subu $4, $3, $5
-
0xe0 0x00 0x90 0x31 # CHECK: sub $6, $zero, $7
-
0xe0 0x00 0xd0 0x31 # CHECK: subu $6, $zero, $7
-
0x08 0x00 0x50 0x39 # CHECK: addu $7, $8, $zero
-
0xa3 0x00 0x50 0x1b # CHECK: slt $3, $3, $5
-
0x63 0x90 0x67 0x00 # CHECK: slti $3, $3, 103
-
0x63 0x90 0x67 0x00 # CHECK: slti $3, $3, 103
-
0x63 0xb0 0x67 0x00 # CHECK: sltiu $3, $3, 103
-
0xa3 0x00 0x90 0x1b # CHECK: sltu $3, $3, $5
-
0xa9 0x41 0x67 0x45 # CHECK: lui $9, 17767
-
0xe6 0x00 0x50 0x4a # CHECK: and $9, $6, $7
-
0x26 0xd1 0x67 0x45 # CHECK: andi $9, $6, 17767
-
0x26 0xd1 0x67 0x45 # CHECK: andi $9, $6, 17767
-
0xa4 0x00 0x90 0x1a # CHECK: or $3, $4, $5
-
0x26 0x51 0x67 0x45 # CHECK: ori $9, $6, 17767
-
0xa3 0x00 0x10 0x1b # CHECK: xor $3, $3, $5
-
0x26 0x71 0x67 0x45 # CHECK: xori $9, $6, 17767
-
0x26 0x71 0x67 0x45 # CHECK: xori $9, $6, 17767
-
0xe6 0x00 0xd0 0x4a # CHECK: nor $9, $6, $7
-
0x08 0x00 0xd0 0x3a # CHECK: not $7, $8
-
0xe6 0x00 0x10 0x4a # CHECK: mul $9, $6, $7
-
0xe9 0x00 0x3c 0x8b # CHECK: mult $9, $7
-
0xe9 0x00 0x3c 0x9b # CHECK: multu $9, $7
-
0xe9 0x00 0x3c 0xab # CHECK: div $zero, $9, $7
-
0xe9 0x00 0x3c 0xbb # CHECK: divu $zero, $9, $7
-
0x83 0x00 0x00 0x38 # CHECK: sll $4, $3, 7
-
0x65 0x00 0x10 0x10 # CHECK: sllv $2, $3, $5
-
0x83 0x00 0x80 0x38 # CHECK: sra $4, $3, 7
-
0x65 0x00 0x90 0x10 # CHECK: srav $2, $3, $5
-
0x83 0x00 0x40 0x38 # CHECK: srl $4, $3, 7
-
0x65 0x00 0x50 0x10 # CHECK: srlv $2, $3, $5
-
0x26 0x01 0xc0 0x38 # CHECK: rotr $9, $6, 7
-
0xc7 0x00 0xd0 0x48 # CHECK: rotrv $9, $6, $7
-
0xa4 0x1c 0x08 0x00 # CHECK: lb $5, 8($4)
-
0xc4 0x14 0x08 0x00 # CHECK: lbu $6, 8($4)
-
0x44 0x3c 0x08 0x00 # CHECK: lh $2, 8($4)
-
0x82 0x34 0x08 0x00 # CHECK: lhu $4, 8($2)
-
0xc5 0xfc 0x04 0x00 # CHECK: lw $6, 4($5)
-
0xdd 0xfc 0x7b 0x00 # CHECK: lw $6, 123($sp)
-
0xa4 0x18 0x08 0x00 # CHECK: sb $5, 8($4)
-
0x44 0x38 0x08 0x00 # CHECK: sh $2, 8($4)
-
0xa6 0xf8 0x04 0x00 # CHECK: sw $5, 4($6)
-
0xbd 0xf8 0x7b 0x00 # CHECK: sw $5, 123($sp)
-
0x44 0x60 0x08 0xe0 # CHECK: lwu $2, 8($4)
-
0x85 0x60 0x10 0x00 # CHECK: lwl $4, 16($5)
-
0x85 0x60 0x10 0x10 # CHECK: lwr $4, 16($5)
-
0x85 0x60 0x10 0x80 # CHECK: swl $4, 16($5)
-
0x85 0x60 0x10 0x90 # CHECK: swr $4, 16($5)
-
0xe6 0x00 0x58 0x48 # CHECK: movz $9, $6, $7
-
0xe6 0x00 0x18 0x48 # CHECK: movn $9, $6, $7
-
0x26 0x55 0x7b 0x09 # CHECK: movt $9, $6, $fcc0
-
0x26 0x55 0x7b 0x01 # CHECK: movf $9, $6, $fcc0
-
0x06 0x00 0x7c 0x2d # CHECK: mthi $6
-
0x06 0x00 0x7c 0x0d # CHECK: mfhi $6
-
0x06 0x00 0x7c 0x3d # CHECK: mtlo $6
-
0x06 0x00 0x7c 0x1d # CHECK: mflo $6
-
0xa4 0x00 0x3c 0xcb # CHECK: madd $4, $5
-
0xa4 0x00 0x3c 0xdb # CHECK: maddu $4, $5
-
0xa4 0x00 0x3c 0xeb # CHECK: msub $4, $5
-
0xa4 0x00 0x3c 0xfb # CHECK: msubu $4, $5
-
0x26 0x01 0x3c 0x5b # CHECK: clz $9, $6
-
0x26 0x01 0x3c 0x4b # CHECK: clo $9, $6
-
0x26 0x01 0x3c 0x2b # CHECK: seb $9, $6
-
0x26 0x01 0x3c 0x3b # CHECK: seh $9, $6
-
0x26 0x01 0x3c 0x7b # CHECK: wsbh $9, $6
-
0x26 0x01 0xec 0x30 # CHECK: ext $9, $6, 3, 7
-
0x26 0x01 0xcc 0x48 # CHECK: ins $9, $6, 3, 7
-
0x00 0xd4 0x98 0x02 # CHECK: j 1328
-
0x00 0xf4 0x98 0x02 # CHECK: jal 1328
-
0xe6 0x03 0x3c 0x0f # CHECK: jalr $ra, $6
-
0x07 0x00 0x3c 0x0f # CHECK: jr $7
-
-0x05 0x47 # CHECK: jraddiusp 20
-
0xc9 0x94 0x9a 0x02 # CHECK: beq $9, $6, 1332
-
0x46 0x40 0x9a 0x02 # CHECK: bgez $6, 1332
-
0x66 0x40 0x9a 0x02 # CHECK: bgezal $6, 1332
-
0x26 0x40 0x9a 0x02 # CHECK: bltzal $6, 1332
-
0xc6 0x40 0x9a 0x02 # CHECK: bgtz $6, 1332
-
0x86 0x40 0x9a 0x02 # CHECK: blez $6, 1332
-
0xc9 0xb4 0x9a 0x02 # CHECK: bne $9, $6, 1332
-
0x06 0x40 0x9a 0x02 # CHECK: bltz $6, 1332
-
-0x28 0x01 0x3c 0x00 # CHECK: teq $8, $9, 0
-
-0x28 0x01 0x3c 0x02 # CHECK: tge $8, $9, 0
-
-0x28 0x01 0x3c 0x04 # CHECK: tgeu $8, $9, 0
-
-0x28 0x01 0x3c 0x08 # CHECK: tlt $8, $9, 0
-
-0x28 0x01 0x3c 0x0a # CHECK: tltu $8, $9, 0
-
-0x28 0x01 0x3c 0x0c # CHECK: tne $8, $9, 0
-
+0x28 0x01 0x3c 0x00 # CHECK: teq $8, $9
+0x28 0x01 0x3c 0x02 # CHECK: tge $8, $9
+0x28 0x01 0x3c 0x04 # CHECK: tgeu $8, $9
+0x28 0x01 0x3c 0x08 # CHECK: tlt $8, $9
+0x28 0x01 0x3c 0x0a # CHECK: tltu $8, $9
+0x28 0x01 0x3c 0x0c # CHECK: tne $8, $9
0xc9 0x41 0x67 0x45 # CHECK: teqi $9, 17767
-
0x29 0x41 0x67 0x45 # CHECK: tgei $9, 17767
-
0x69 0x41 0x67 0x45 # CHECK: tgeiu $9, 17767
-
0x09 0x41 0x67 0x45 # CHECK: tlti $9, 17767
-
0x49 0x41 0x67 0x45 # CHECK: tltiu $9, 17767
-
0x89 0x41 0x67 0x45 # CHECK: tnei $9, 17767
-
0x25 0x20 0x08 0x60 # CHECK: cache 1, 8($5)
-
0x25 0x60 0x08 0x20 # CHECK: pref 1, 8($5)
-
0x00 0x00 0x00 0x08 # CHECK: ssnop
-
0x00 0x00 0x00 0x18 # CHECK: ehb
-
0x00 0x00 0x00 0x28 # CHECK: pause
-
0x44 0x60 0x08 0x30 # CHECK: ll $2, 8($4)
-
0x44 0x60 0x08 0xb0 # CHECK: sc $2, 8($4)
-
0x64 0x00 0x18 0x11 # CHECK: lwxs $2, $3($4)
-
0x66 0x42 0x9a 0x02 # CHECK: bgezals $6, 1332
-
0x26 0x42 0x9a 0x02 # CHECK: bltzals $6, 1332
-
0xe9 0x40 0x9a 0x02 # CHECK: beqzc $9, 1332
-
0xa9 0x40 0x9a 0x02 # CHECK: bnezc $9, 1332
-
0x00 0x74 0x98 0x02 # CHECK: jals 1328
-
0xe6 0x03 0x3c 0x4f # CHECK: jalrs $ra, $6
-
0x44 0x20 0x08 0x50 # CHECK: lwm32 $16, $17, 8($4)
-
+0x3b 0x21 0x84 0x59 # CHECK: lwm32 $16, $17, $18, $19, $20, $21, $22, $23, $fp, -1660($27)
0x44 0x20 0x08 0xd0 # CHECK: swm32 $16, $17, 8($4)
-
0x04 0x22 0x08 0x90 # CHECK: swp $16, 8($4)
-
0x04 0x22 0x08 0x10 # CHECK: lwp $16, 8($4)
-
0x00 0x00 0x00 0x00 # CHECK: nop
-
0x00 0x79 0x05 0x00 # CHECK: addiupc $2, 20
-
0xbf 0x7b 0xff 0xff # CHECK: addiupc $7, 16777212
-
0xc0 0x7b 0x00 0x00 # CHECK: addiupc $7, -16777216
-
-0x42 0x07 # CHECK: addu16 $6, $17, $4
-
-0xb1 0x06 # CHECK: subu16 $5, $16, $3
-
-0x82 0x44 # CHECK: and16 $16, $2
-
-0x0b 0x44 # CHECK: not16 $17, $3
-
-0xc4 0x44 # CHECK: or16 $16, $4
-
-0x4d 0x44 # CHECK: xor16 $17, $5
-
-0x8a 0x25 # CHECK: sll16 $3, $16, 5
-
-0x1d 0x26 # CHECK: srl16 $4, $17, 6
-
-0x94 0x09 # CHECK: lbu16 $3, 4($17)
-
-0x8f 0x09 # CHECK: lbu16 $3, -1($16)
-
-0x82 0x29 # CHECK: lhu16 $3, 4($16)
-
-0x12 0x6a # CHECK: lw16 $4, 8($17)
-
-0x84 0x89 # CHECK: sb16 $3, 4($16)
-
-0x14 0xaa # CHECK: sh16 $4, 8($17)
-
-0x11 0xea # CHECK: sw16 $4, 4($17)
-
-0x11 0xe8 # CHECK: sw16 $zero, 4($17)
-
-0x09 0x46 # CHECK: mfhi $9
-
-0x49 0x46 # CHECK: mflo $9
-
-0x21 0x0f # CHECK: move $25, $1
-
-0xa9 0x45 # CHECK: jrc $9
-
-0xc9 0x45 # CHECK: jalr $9
-
-0xe9 0x45 # CHECK: jalrs16 $9
-
-0x89 0x45 # CHECK: jr16 $9
-
-0xff 0xed # CHECK: li16 $3, -1
-
-0xfe 0xed # CHECK: li16 $3, 126
-
-0x83 0x6f # CHECK: addiur1sp $7, 4
-
-0x7e 0x6f # CHECK: addiur2 $6, $7, -1
-
-0x76 0x6f # CHECK: addiur2 $6, $7, 12
-
-0xfc 0x4c # CHECK: addius5 $7, -2
-
-0x00 0x0c # CHECK: nop
-
-0x68 0x48 # CHECK: lw $3, 32($sp)
-
-0x9f 0xc8 # CHECK: sw $4, 124($sp)
-
-0x0a 0x8f # CHECK: beqz16 $6, 20
-
-0x0a 0xaf # CHECK: bnez16 $6, 20
-
-0x42 0xcc # CHECK: b16 132
-
-0x88 0x65 # CHECK: lw $3, 32($gp)
-
-0x12 0x45 # CHECK: lwm16 $16, $17, $ra, 8($sp)
-
-0x52 0x45 # CHECK: swm16 $16, $17, $ra, 8($sp)
-
-0x88 0x46 # CHECK: break16 8
-
-0xce 0x46 # CHECK: sdbbp16 14
-
-0x34 0x84 # CHECK: movep $5, $6, $2, $3
-
0x00 0x00 0x7c 0x57 # CHECK: ei
-
0x0a 0x00 0x7c 0x57 # CHECK: ei $10
+0x25 0x60 0x08 0xa6 # CHECK: cachee 1, 8($5)
+0x25 0x60 0x08 0xa4 # CHECK: prefe 1, 8($5)
+0x65 0x54 0xa0 0x09 # CHECK: prefx 1, $3($5)
+0x82 0x60 0x08 0x62 # CHECK: lhue $4, 8($2)
+0x82 0x60 0x08 0x68 # CHECK: lbe $4, 8($2)
+0x82 0x60 0x08 0x60 # CHECK: lbue $4, 8($2)
+0x82 0x60 0x08 0x6a # CHECK: lhe $4, 8($2)
+0x82 0x60 0x08 0x6e # CHECK: lwe $4, 8($2)
+0xa4 0x60 0x08 0xa8 # CHECK: sbe $5, 8($4)
+0xa4 0x60 0x08 0xaa # CHECK: she $5, 8($4)
+0xa4 0x60 0x08 0xae # CHECK: swe $5, 8($4)
+0x03 0x63 0x05 0xa2 # CHECK: swre $24, 5($3)
+0x03 0x63 0x05 0xa0 # CHECK: swle $24, 5($3)
+0x03 0x63 0x05 0x66 # CHECK: lwre $24, 5($3)
+0x04 0x63 0x02 0x64 # CHECK: lwle $24, 2($4)
+0x44 0x60 0x08 0x6c # CHECK: lle $2, 8($4)
+0x44 0x60 0x08 0xac # CHECK: sce $2, 8($4)
diff --git a/test/MC/Disassembler/Mips/micromips.txt b/test/MC/Disassembler/Mips/micromips32r3/valid.txt
index 5809ac28113c..030afb36723d 100644
--- a/test/MC/Disassembler/Mips/micromips.txt
+++ b/test/MC/Disassembler/Mips/micromips32r3/valid.txt
@@ -1,342 +1,191 @@
# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mattr=micromips \
# RUN: | FileCheck %s
-0x00 0xe6 0x49 0x10 # CHECK: add $9, $6, $7
-
-0x11 0x26 0x45 0x67 # CHECK: addi $9, $6, 17767
-
-0x31 0x26 0xc5 0x67 # CHECK: addiu $9, $6, -15001
-
-0x11 0x26 0x45 0x67 # CHECK: addi $9, $6, 17767
-
-0x31 0x26 0xc5 0x67 # CHECK: addiu $9, $6, -15001
-
0x4f 0xf9 # CHECK: addiusp -16
-
0x4f 0xff # CHECK: addiusp -1028
-
0x4f 0xfd # CHECK: addiusp -1032
-
0x4c 0x01 # CHECK: addiusp 1024
-
0x4c 0x03 # CHECK: addiusp 1028
-
+0x2c 0x29 # CHECK: andi16 $16, $2, 31
+0x47 0x05 # CHECK: jraddiusp 20
+0x07 0x42 # CHECK: addu16 $6, $17, $4
+0x06 0xb1 # CHECK: subu16 $5, $16, $3
+0x44 0x82 # CHECK: and16 $16, $2
+0x44 0x0b # CHECK: not16 $17, $3
+0x44 0xc4 # CHECK: or16 $16, $4
+0x44 0x4d # CHECK: xor16 $17, $5
+0x25 0x8a # CHECK: sll16 $3, $16, 5
+0x26 0x1d # CHECK: srl16 $4, $17, 6
+0x09 0x94 # CHECK: lbu16 $3, 4($17)
+0x09 0x8f # CHECK: lbu16 $3, -1($16)
+0x29 0x82 # CHECK: lhu16 $3, 4($16)
+0x6a 0x12 # CHECK: lw16 $4, 8($17)
+0x89 0x84 # CHECK: sb16 $3, 4($16)
+0xaa 0x14 # CHECK: sh16 $4, 8($17)
+0xea 0x11 # CHECK: sw16 $4, 4($17)
+0xe8 0x11 # CHECK: sw16 $zero, 4($17)
+0x46 0x09 # CHECK: mfhi $9
+0x46 0x49 # CHECK: mflo $9
+0x0f 0x21 # CHECK: move $25, $1
+0x45 0xa9 # CHECK: jrc $9
+0x45 0xc9 # CHECK: jalr $9
+0x45 0xe9 # CHECK: jalrs16 $9
+0x45 0x89 # CHECK: jr16 $9
+0xed 0xff # CHECK: li16 $3, -1
+0xed 0xfe # CHECK: li16 $3, 126
+0x6f 0x83 # CHECK: addiur1sp $7, 4
+0x6f 0x7e # CHECK: addiur2 $6, $7, -1
+0x6f 0x76 # CHECK: addiur2 $6, $7, 12
+0x4c 0xfc # CHECK: addius5 $7, -2
+0x0c 0x00 # CHECK: nop
+0x48 0x68 # CHECK: lw $3, 32($sp)
+0xc8 0x9f # CHECK: sw $4, 124($sp)
+0x8f 0x0a # CHECK: beqz16 $6, 20
+0xaf 0x0a # CHECK: bnez16 $6, 20
+0xcc 0x42 # CHECK: b16 132
+0x65 0x88 # CHECK: lw $3, 32($gp)
+0x45 0x12 # CHECK: lwm16 $16, $17, $ra, 8($sp)
+0x45 0x52 # CHECK: swm16 $16, $17, $ra, 8($sp)
+0x46 0x88 # CHECK: break16 8
+0x46 0xce # CHECK: sdbbp16 14
+0x84 0x34 # CHECK: movep $5, $6, $2, $3
+0x00 0xe6 0x49 0x10 # CHECK: add $9, $6, $7
+0x11 0x26 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x31 0x26 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x11 0x26 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x31 0x26 0xc5 0x67 # CHECK: addiu $9, $6, -15001
0x00 0xe6 0x49 0x50 # CHECK: addu $9, $6, $7
-
0x00 0xe6 0x49 0x90 # CHECK: sub $9, $6, $7
-
0x00 0xa3 0x21 0xd0 # CHECK: subu $4, $3, $5
-
0x00 0xe0 0x31 0x90 # CHECK: sub $6, $zero, $7
-
0x00 0xe0 0x31 0xd0 # CHECK: subu $6, $zero, $7
-
0x00 0x08 0x39 0x50 # CHECK: addu $7, $8, $zero
-
0x00 0xa3 0x1b 0x50 # CHECK: slt $3, $3, $5
-
0x90 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
-
0x90 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
-
0xb0 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
-
0x00 0xa3 0x1b 0x90 # CHECK: sltu $3, $3, $5
-
0x41 0xa9 0x45 0x67 # CHECK: lui $9, 17767
-
0x00 0xe6 0x4a 0x50 # CHECK: and $9, $6, $7
-
0xd1 0x26 0x45 0x67 # CHECK: andi $9, $6, 17767
-
0xd1 0x26 0x45 0x67 # CHECK: andi $9, $6, 17767
-
-0x2c 0x29 # CHECK: andi16 $16, $2, 31
-
0x00 0xa4 0x1a 0x90 # CHECK: or $3, $4, $5
-
0x51 0x26 0x45 0x67 # CHECK: ori $9, $6, 17767
-
0x00 0xa3 0x1b 0x10 # CHECK: xor $3, $3, $5
-
0x71 0x26 0x45 0x67 # CHECK: xori $9, $6, 17767
-
0x71 0x26 0x45 0x67 # CHECK: xori $9, $6, 17767
-
0x00 0xe6 0x4a 0xd0 # CHECK: nor $9, $6, $7
-
0x00 0x08 0x3a 0xd0 # CHECK: not $7, $8
-
0x00 0xe6 0x4a 0x10 # CHECK: mul $9, $6, $7
-
0x00 0xe9 0x8b 0x3c # CHECK: mult $9, $7
-
0x00 0xe9 0x9b 0x3c # CHECK: multu $9, $7
-
-0x00 0xe9 0xab 0x3c # CHECK-EB: div $zero, $9, $7
-
-0x00 0xe9 0xbb 0x3c # CHECK-EB: divu $zero, $9, $7
-
+0x00 0xe9 0xab 0x3c # CHECK: div $zero, $9, $7
+0x00 0xe9 0xbb 0x3c # CHECK: divu $zero, $9, $7
0x00 0x83 0x38 0x00 # CHECK: sll $4, $3, 7
-
0x00 0x65 0x10 0x10 # CHECK: sllv $2, $3, $5
-
0x00 0x83 0x38 0x80 # CHECK: sra $4, $3, 7
-
0x00 0x65 0x10 0x90 # CHECK: srav $2, $3, $5
-
0x00 0x83 0x38 0x40 # CHECK: srl $4, $3, 7
-
0x00 0x65 0x10 0x50 # CHECK: srlv $2, $3, $5
-
0x01 0x26 0x38 0xc0 # CHECK: rotr $9, $6, 7
-
0x00 0xc7 0x48 0xd0 # CHECK: rotrv $9, $6, $7
-
0x1c 0xa4 0x00 0x08 # CHECK: lb $5, 8($4)
-
0x14 0xc4 0x00 0x08 # CHECK: lbu $6, 8($4)
-
0x3c 0x44 0x00 0x08 # CHECK: lh $2, 8($4)
-
0x34 0x82 0x00 0x08 # CHECK: lhu $4, 8($2)
-
0xfc 0xc5 0x00 0x04 # CHECK: lw $6, 4($5)
-
0xfc 0xdd 0x00 0x7b # CHECK: lw $6, 123($sp)
-
0x18 0xa4 0x00 0x08 # CHECK: sb $5, 8($4)
-
0x38 0x44 0x00 0x08 # CHECK: sh $2, 8($4)
-
0xf8 0xa6 0x00 0x04 # CHECK: sw $5, 4($6)
-
0xf8 0xbd 0x00 0x7b # CHECK: sw $5, 123($sp)
-
0x60 0x44 0xe0 0x08 # CHECK: lwu $2, 8($4)
-
0x60 0x85 0x00 0x10 # CHECK: lwl $4, 16($5)
-
0x60 0x85 0x10 0x10 # CHECK: lwr $4, 16($5)
-
0x60 0x85 0x80 0x10 # CHECK: swl $4, 16($5)
-
0x60 0x85 0x90 0x10 # CHECK: swr $4, 16($5)
-
0x00 0xe6 0x48 0x58 # CHECK: movz $9, $6, $7
-
0x00 0xe6 0x48 0x18 # CHECK: movn $9, $6, $7
-
0x55 0x26 0x09 0x7b # CHECK: movt $9, $6, $fcc0
-
0x55 0x26 0x01 0x7b # CHECK: movf $9, $6, $fcc0
-
0x00 0x06 0x2d 0x7c # CHECK: mthi $6
-
0x00 0x06 0x0d 0x7c # CHECK: mfhi $6
-
0x00 0x06 0x3d 0x7c # CHECK: mtlo $6
-
0x00 0x06 0x1d 0x7c # CHECK: mflo $6
-
0x00 0xa4 0xcb 0x3c # CHECK: madd $4, $5
-
0x00 0xa4 0xdb 0x3c # CHECK: maddu $4, $5
-
0x00 0xa4 0xeb 0x3c # CHECK: msub $4, $5
-
0x00 0xa4 0xfb 0x3c # CHECK: msubu $4, $5
-
0x01 0x26 0x5b 0x3c # CHECK: clz $9, $6
-
0x01 0x26 0x4b 0x3c # CHECK: clo $9, $6
-
0x01 0x26 0x2b 0x3c # CHECK: seb $9, $6
-
0x01 0x26 0x3b 0x3c # CHECK: seh $9, $6
-
0x01 0x26 0x7b 0x3c # CHECK: wsbh $9, $6
-
0x01 0x26 0x30 0xec # CHECK: ext $9, $6, 3, 7
-
0x01 0x26 0x48 0xcc # CHECK: ins $9, $6, 3, 7
-
0xd4 0x00 0x02 0x98 # CHECK: j 1328
-
0xf4 0x00 0x02 0x98 # CHECK: jal 1328
-
0x03 0xe6 0x0f 0x3c # CHECK: jalr $ra, $6
-
0x00 0x07 0x0f 0x3c # CHECK: jr $7
-
-0x47 0x05 # CHECK: jraddiusp 20
-
0x94 0xc9 0x02 0x9a # CHECK: beq $9, $6, 1332
-
0x40 0x46 0x02 0x9a # CHECK: bgez $6, 1332
-
0x40 0x66 0x02 0x9a # CHECK: bgezal $6, 1332
-
0x40 0x26 0x02 0x9a # CHECK: bltzal $6, 1332
-
0x40 0xc6 0x02 0x9a # CHECK: bgtz $6, 1332
-
0x40 0x86 0x02 0x9a # CHECK: blez $6, 1332
-
0xb4 0xc9 0x02 0x9a # CHECK: bne $9, $6, 1332
-
0x40 0x06 0x02 0x9a # CHECK: bltz $6, 1332
-
-0x01 0x28 0x00 0x3c # CHECK: teq $8, $9, 0
-
-0x01 0x28 0x02 0x3c # CHECK: tge $8, $9, 0
-
-0x01 0x28 0x04 0x3c # CHECK: tgeu $8, $9, 0
-
-0x01 0x28 0x08 0x3c # CHECK: tlt $8, $9, 0
-
-0x01 0x28 0x0a 0x3c # CHECK: tltu $8, $9, 0
-
-0x01 0x28 0x0c 0x3c # CHECK: tne $8, $9, 0
-
-0x41,0xc9,0x45,0x67 # CHECK: teqi $9, 17767
-
+0x01 0x28 0x00 0x3c # CHECK: teq $8, $9
+0x01 0x28 0x02 0x3c # CHECK: tge $8, $9
+0x01 0x28 0x04 0x3c # CHECK: tgeu $8, $9
+0x01 0x28 0x08 0x3c # CHECK: tlt $8, $9
+0x01 0x28 0x0a 0x3c # CHECK: tltu $8, $9
+0x01 0x28 0x0c 0x3c # CHECK: tne $8, $9
+0x41 0xc9 0x45 0x67 # CHECK: teqi $9, 17767
0x41 0x29 0x45 0x67 # CHECK: tgei $9, 17767
-
0x41 0x69 0x45 0x67 # CHECK: tgeiu $9, 17767
-
0x41 0x09 0x45 0x67 # CHECK: tlti $9, 17767
-
0x41 0x49 0x45 0x67 # CHECK: tltiu $9, 17767
-
0x41 0x89 0x45 0x67 # CHECK: tnei $9, 17767
-
0x20 0x25 0x60 0x08 # CHECK: cache 1, 8($5)
-
0x60 0x25 0x20 0x08 # CHECK: pref 1, 8($5)
-
0x00 0x00 0x08 0x00 # CHECK: ssnop
-
0x00 0x00 0x18 0x00 # CHECK: ehb
-
0x00 0x00 0x28 0x00 # CHECK: pause
-
0x60 0x44 0x30 0x08 # CHECK: ll $2, 8($4)
-
0x60 0x44 0xb0 0x08 # CHECK: sc $2, 8($4)
-
0x00 0x64 0x11 0x18 # CHECK: lwxs $2, $3($4)
-
0x42 0x66 0x02 0x9a # CHECK: bgezals $6, 1332
-
0x42 0x26 0x02 0x9a # CHECK: bltzals $6, 1332
-
0x40 0xe9 0x02 0x9a # CHECK: beqzc $9, 1332
-
0x40 0xa9 0x02 0x9a # CHECK: bnezc $9, 1332
-
0x74 0x00 0x02 0x98 # CHECK: jals 1328
-
0x03 0xe6 0x4f 0x3c # CHECK: jalrs $ra, $6
-
0x20 0x44 0x50 0x08 # CHECK: lwm32 $16, $17, 8($4)
-
+0x21 0x3b 0x59 0x84 # CHECK: lwm32 $16, $17, $18, $19, $20, $21, $22, $23, $fp, -1660($27)
0x20 0x44 0xd0 0x08 # CHECK: swm32 $16, $17, 8($4)
-
0x22 0x04 0x90 0x08 # CHECK: swp $16, 8($4)
-
0x22 0x04 0x10 0x08 # CHECK: lwp $16, 8($4)
-
0x00 0x00 0x00 0x00 # CHECK: nop
-
0x79 0x00 0x00 0x05 # CHECK: addiupc $2, 20
-
0x7b 0xbf 0xff 0xff # CHECK: addiupc $7, 16777212
-
0x7b 0xc0 0x00 0x00 # CHECK: addiupc $7, -16777216
-
-0x07 0x42 # CHECK: addu16 $6, $17, $4
-
-0x06 0xb1 # CHECK: subu16 $5, $16, $3
-
-0x44 0x82 # CHECK: and16 $16, $2
-
-0x44 0x0b # CHECK: not16 $17, $3
-
-0x44 0xc4 # CHECK: or16 $16, $4
-
-0x44 0x4d # CHECK: xor16 $17, $5
-
-0x25 0x8a # CHECK: sll16 $3, $16, 5
-
-0x26 0x1d # CHECK: srl16 $4, $17, 6
-
-0x09 0x94 # CHECK: lbu16 $3, 4($17)
-
-0x09 0x8f # CHECK: lbu16 $3, -1($16)
-
-0x29 0x82 # CHECK: lhu16 $3, 4($16)
-
-0x6a 0x12 # CHECK: lw16 $4, 8($17)
-
-0x89 0x84 # CHECK: sb16 $3, 4($16)
-
-0xaa 0x14 # CHECK: sh16 $4, 8($17)
-
-0xea 0x11 # CHECK: sw16 $4, 4($17)
-
-0xe8 0x11 # CHECK: sw16 $zero, 4($17)
-
-0x46 0x09 # CHECK: mfhi $9
-
-0x46 0x49 # CHECK: mflo $9
-
-0x0f 0x21 # CHECK: move $25, $1
-
-0x45 0xa9 # CHECK: jrc $9
-
-0x45 0xc9 # CHECK: jalr $9
-
-0x45 0xe9 # CHECK: jalrs16 $9
-
-0x45 0x89 # CHECK: jr16 $9
-
-0xed 0xff # CHECK: li16 $3, -1
-
-0xed 0xfe # CHECK: li16 $3, 126
-
-0x6f 0x83 # CHECK: addiur1sp $7, 4
-
-0x6f 0x7e # CHECK: addiur2 $6, $7, -1
-
-0x6f 0x76 # CHECK: addiur2 $6, $7, 12
-
-0x4c 0xfc # CHECK: addius5 $7, -2
-
-0x0c 0x00 # CHECK: nop
-
-0x48 0x68 # CHECK: lw $3, 32($sp)
-
-0xc8 0x9f # CHECK: sw $4, 124($sp)
-
-0x8f 0x0a # CHECK: beqz16 $6, 20
-
-0xaf 0x0a # CHECK: bnez16 $6, 20
-
-0xcc 0x42 # CHECK: b16 132
-
-0x65 0x88 # CHECK: lw $3, 32($gp)
-
-0x45 0x12 # CHECK: lwm16 $16, $17, $ra, 8($sp)
-
-0x45 0x52 # CHECK: swm16 $16, $17, $ra, 8($sp)
-
-0x46 0x88 # CHECK: break16 8
-
-0x46 0xce # CHECK: sdbbp16 14
-
-0x84 0x34 # CHECK: movep $5, $6, $2, $3
-
0x00 0x00 0x57 0x7c # CHECK: ei
-
0x00 0x0a 0x57 0x7c # CHECK: ei $10
+0x60 0x25 0xa6 0x08 # CHECK: cachee 1, 8($5)
+0x60 0x25 0xa4 0x08 # CHECK: prefe 1, 8($5)
+0x54 0x65 0x09 0xa0 # CHECK: prefx 1, $3($5)
+0x60 0x82 0x62 0x08 # CHECK: lhue $4, 8($2)
+0x60 0x82 0x68 0x08 # CHECK: lbe $4, 8($2)
+0x60 0x82 0x60 0x08 # CHECK: lbue $4, 8($2)
+0x60 0x82 0x6a 0x08 # CHECK: lhe $4, 8($2)
+0x60 0x82 0x6e 0x08 # CHECK: lwe $4, 8($2)
+0x60 0xa4 0xa8 0x08 # CHECK: sbe $5, 8($4)
+0x60 0xa4 0xaa 0x08 # CHECK: she $5, 8($4)
+0x60 0xa4 0xae 0x08 # CHECK: swe $5, 8($4)
+0x63 0x03 0xa2 0x05 # CHECK: swre $24, 5($3)
+0x63 0x03 0xa0 0x05 # CHECK: swle $24, 5($3)
+0x63 0x03 0x66 0x05 # CHECK: lwre $24, 5($3)
+0x63 0x04 0x64 0x02 # CHECK: lwle $24, 2($4)
+0x60 0x44 0x6c 0x08 # CHECK: lle $2, 8($4)
+0x60 0x44 0xac 0x08 # CHECK: sce $2, 8($4)
diff --git a/test/MC/Disassembler/Mips/micromips32r6.txt b/test/MC/Disassembler/Mips/micromips32r6.txt
deleted file mode 100644
index a2691ee6bc3a..000000000000
--- a/test/MC/Disassembler/Mips/micromips32r6.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r6 -mattr=micromips | FileCheck %s
-
-0x00 0xa4 0x19 0x10 # CHECK: add $3, $4, $5
-
-0x30 0x64 0x04 0xd2 # CHECK: addiu $3, $4, 1234
-
-0x00 0xa4 0x19 0x50 # CHECK: addu $3, $4, $5
-
-0x78 0x80 0x00 0x19 # CHECK: addiupc $4, 100
-
-0x78 0x7f 0x00 0x38 # CHECK: aluipc $3, 56
-
-0x78 0x7e 0xff 0xff # CHECK: auipc $3, -1
-
-0x00 0x43 0x24 0x1f # CHECK: align $4, $2, $3, 2
-
-0x00 0xa4 0x1a 0x50 # CHECK: and $3, $4, $5
-
-0xd0 0x64 0x04 0xd2 # CHECK: andi $3, $4, 1234
-
-0x10 0x62 0xff 0xe9 # CHECK: aui $3, $2, -23
-
-0x74 0x40 0x02 0x9a # CHECK: beqzalc $2, 1332
-
-0x7c 0x40 0x02 0x9a # CHECK: bnezalc $2, 1332
-
-0xc0 0x42 0x02 0x9a # CHECK: bgezalc $2, 1332
-
-0xe0 0x40 0x02 0x9a # CHECK: bgtzalc $2, 1332
-
-0xe0 0x42 0x02 0x9a # CHECK: bltzalc $2, 1332
-
-0xc0 0x40 0x02 0x9a # CHECK: blezalc $2, 1332
-
-0xb4 0x37 0x96 0xb8 # CHECK: balc 14572256
-
-0x94 0x37 0x96 0xb8 # CHECK: bc 14572256
-
-0x00 0x44 0x0b 0x3c # CHECK: bitswap $4, $2
-
-0x00 0x00 0x00 0x07 # CHECK: break
-
-0x00 0x07 0x00 0x07 # CHECK: break 7
-
-0x00 0x07 0x01 0x47 # CHECK: break 7, 5
-
-0x20 0x25 0x60 0x08 # CHECK: cache 1, 8($5)
-
-0x01 0x65 0x4b 0x3c # CHECK: clo $11, $5
-
-0x03 0x80 0xe8 0x50 # CHECK: clz $sp, $gp
-
-0x00 0xa4 0x19 0x18 # CHECK: div $3, $4, $5
-
-0x00 0xa4 0x19 0x98 # CHECK: divu $3, $4, $5
-
-0x00 0x00 0x18 0x00 # CHECK: ehb
-
-0x00 0x00 0x57 0x7c # CHECK: ei
-
-0x00 0x0a 0x57 0x7c # CHECK: ei $10
-
-0x00 0x00 0xf3 0x7c # CHECK: eret
-
-0x00 0x01 0xf3 0x7c # CHECK: eretnc
-
-0x80 0x05 0x01 0x00 # CHECK: jialc $5, 256
-
-0xa0 0x05 0x01 0x00 # CHECK: jic $5, 256
-
-0x78 0x48 0x00 0x43 # CHECK: lwpc $2, 268
-
-0x00 0x43 0x26 0x0f # CHECK: lsa $2, $3, $4, 3
-
-0x00 0xa4 0x19 0x58 # CHECK: mod $3, $4, $5
-
-0x00 0xa4 0x19 0xd8 # CHECK: modu $3, $4, $5
-
-0x00 0xa4 0x18 0x18 # CHECK: mul $3, $4, $5
-
-0x00 0xa4 0x18 0x58 # CHECK: muh $3, $4, $5
-
-0x00 0xa4 0x18 0x98 # CHECK: mulu $3, $4, $5
-
-0x00 0xa4,0x18,0xd8 # CHECK: muhu $3, $4, $5
-
-0x00 0x00 0x00 0x00 # CHECK: nop
-
-0x00 0xa4 0x1a 0xd0 # CHECK: nor $3, $4, $5
-
-0x00,0xa4,0x1a,0x90 # CHECK: or $3, $4, $5
-
-0x50 0x64 0x04 0xd2 # CHECK: ori $3, $4, 1234
-
-0x60 0x25 0x20 0x08 # CHECK: pref 1, 8($5)
-
-0x00 0x83 0x11 0x40 # CHECK: seleqz $2, $3, $4
-
-0x00 0x83 0x11 0x80 # CHECK: selnez $2, $3, $4
-
-0x00 0x83 0x38 0x00 # CHECK: sll $4, $3, 7
-
-0x00 0xa4 0x19 0x90 # CHECK: sub $3, $4, $5
-
-0x00 0xa4 0x19 0xd0 # CHECK: subu $3, $4, $5
-
-0x00 0xa4 0x1b 0x10 # CHECK: xor $3, $4, $5
-
-0x70 0x64 0x04 0xd2 # CHECK: xori $3, $4, 1234
-
-0x00 0x64 0x2b 0x3c # CHECK: seb $3, $4
-
-0x00 0x64 0x3b 0x3c # CHECK: seh $3, $4
-
diff --git a/test/MC/Disassembler/Mips/micromips32r6/valid.txt b/test/MC/Disassembler/Mips/micromips32r6/valid.txt
new file mode 100644
index 000000000000..b8e69f833a03
--- /dev/null
+++ b/test/MC/Disassembler/Mips/micromips32r6/valid.txt
@@ -0,0 +1,258 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r6 -mattr=micromips | FileCheck %s
+
+0x6f 0x83 # CHECK: addiur1sp $7, 4
+0x6f 0x7e # CHECK: addiur2 $6, $7, -1
+0x6f 0x76 # CHECK: addiur2 $6, $7, 12
+0x4c 0xfc # CHECK: addius5 $7, -2
+0x4f 0xff # CHECK: addiusp -1028
+0x4f 0xfd # CHECK: addiusp -1032
+0x4c 0x01 # CHECK: addiusp 1024
+0x4c 0x03 # CHECK: addiusp 1028
+0x4f 0xf9 # CHECK: addiusp -16
+0xcc 0x42 # CHECK: bc16 132
+0x8f 0x0a # CHECK: beqzc16 $6, 20
+0xaf 0x0a # CHECK: bnezc16 $6, 20
+0x45 0x2b # CHECK: jalr $9
+0x45 0x23 # CHECK: jrc16 $9
+0x44 0xb3 # CHECK: jrcaddiusp 20
+0x65 0x88 # CHECK: lw $3, 32($gp)
+0x48 0x66 # CHECK: lw $3, 24($sp)
+0x6a 0x12 # CHECK: lw16 $4, 8($17)
+0x29 0x82 # CHECK: lhu16 $3, 4($16)
+0x09 0x94 # CHECK: lbu16 $3, 4($17)
+0x09 0x9f # CHECK: lbu16 $3, -1($17)
+0x04 0xcc # CHECK: addu16 $6, $17, $4
+0x44 0x21 # CHECK: and16 $16, $2
+0x2e 0x56 # CHECK: andi16 $4, $5, 8
+0x46 0x70 # CHECK: not16 $4, $7
+0x45 0xf9 # CHECK: or16 $3, $7
+0x25 0xe0 # CHECK: sll16 $3, $6, 8
+0x25 0xe1 # CHECK: srl16 $3, $6, 8
+0x00 0xa4 0x19 0x10 # CHECK: add $3, $4, $5
+0x30 0x64 0x04 0xd2 # CHECK: addiu $3, $4, 1234
+0x00 0xa4 0x19 0x50 # CHECK: addu $3, $4, $5
+0x78 0x80 0x00 0x19 # CHECK: addiupc $4, 100
+0x78 0x7f 0x00 0x38 # CHECK: aluipc $3, 56
+0x78 0x7e 0xff 0xff # CHECK: auipc $3, -1
+0x00 0x43 0x24 0x1f # CHECK: align $4, $2, $3, 2
+0x00 0xa4 0x1a 0x50 # CHECK: and $3, $4, $5
+0xd0 0x64 0x04 0xd2 # CHECK: andi $3, $4, 1234
+0x10 0x62 0xff 0xe9 # CHECK: aui $3, $2, -23
+0x74 0x40 0x02 0x9a # CHECK: beqzalc $2, 1332
+0x7c 0x40 0x02 0x9a # CHECK: bnezalc $2, 1332
+0xc0 0x42 0x02 0x9a # CHECK: bgezalc $2, 1332
+0xe0 0x40 0x02 0x9a # CHECK: bgtzalc $2, 1332
+0xe0 0x42 0x02 0x9a # CHECK: bltzalc $2, 1332
+0xc0 0x40 0x02 0x9a # CHECK: blezalc $2, 1332
+0xb4 0x37 0x96 0xb8 # CHECK: balc 7286128
+0x94 0x37 0x96 0xb8 # CHECK: bc 7286128
+0x00 0x44 0x0b 0x3c # CHECK: bitswap $4, $2
+0x00 0x00 0x00 0x07 # CHECK: break
+0x00 0x07 0x00 0x07 # CHECK: break 7
+0x00 0x07 0x01 0x47 # CHECK: break 7, 5
+0x20 0x25 0x60 0x08 # CHECK: cache 1, 8($5)
+0x01 0x65 0x4b 0x3c # CHECK: clo $11, $5
+0x03 0x80 0xe8 0x50 # CHECK: clz $sp, $gp
+0x00 0x00 0xe3 0x7c # CHECK: deret
+0x00 0xa4 0x19 0x18 # CHECK: div $3, $4, $5
+0x00 0xa4 0x19 0x98 # CHECK: divu $3, $4, $5
+0x00 0x00 0x18 0x00 # CHECK: ehb
+0x00 0x00 0x57 0x7c # CHECK: ei
+0x00 0x0a 0x57 0x7c # CHECK: ei $10
+0x00 0x00 0xf3 0x7c # CHECK: eret
+0x00 0x01 0xf3 0x7c # CHECK: eretnc
+0x80 0x05 0x01 0x00 # CHECK: jialc $5, 256
+0xa0 0x05 0x01 0x00 # CHECK: jic $5, 256
+0x78 0x48 0x00 0x43 # CHECK: lwpc $2, 268
+0x00 0x43 0x26 0x0f # CHECK: lsa $2, $3, $4, 4
+0x00 0xa4 0x19 0x58 # CHECK: mod $3, $4, $5
+0x00 0xa4 0x19 0xd8 # CHECK: modu $3, $4, $5
+0x00 0xa4 0x18 0x18 # CHECK: mul $3, $4, $5
+0x00 0xa4 0x18 0x58 # CHECK: muh $3, $4, $5
+0x00 0xa4 0x18 0x98 # CHECK: mulu $3, $4, $5
+0x00 0xa4 0x18 0xd8 # CHECK: muhu $3, $4, $5
+0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0xa4 0x1a 0xd0 # CHECK: nor $3, $4, $5
+0x00 0xa4 0x1a 0x90 # CHECK: or $3, $4, $5
+0x50 0x64 0x04 0xd2 # CHECK: ori $3, $4, 1234
+0x60 0x25 0x20 0x08 # CHECK: pref 1, 8($5)
+0x00 0x83 0x11 0x40 # CHECK: seleqz $2, $3, $4
+0x00 0x83 0x11 0x80 # CHECK: selnez $2, $3, $4
+0x00 0x83 0x38 0x00 # CHECK: sll $4, $3, 7
+0x00 0xa4 0x19 0x90 # CHECK: sub $3, $4, $5
+0x00 0xa4 0x19 0xd0 # CHECK: subu $3, $4, $5
+0x00 0x64 0xf1 0x7c # CHECK: wrpgpr $3, $4
+0x00 0x64 0x7b 0x3c # CHECK: wsbh $3, $4
+0x00 0xa4 0x1b 0x10 # CHECK: xor $3, $4, $5
+0x70 0x64 0x04 0xd2 # CHECK: xori $3, $4, 1234
+0x18 0x85 0x00 0x06 # CHECK: sb $4, 6($5)
+0x60 0x85 0xa8 0x06 # CHECK: sbe $4, 6($5)
+0x60 0x85 0xac 0x06 # CHECK: sce $4, 6($5)
+0x38 0x85 0x00 0x06 # CHECK: sh $4, 6($5)
+0x60 0x85 0xaa 0x06 # CHECK: she $4, 6($5)
+0x60 0x85 0x6c 0x06 # CHECK: lle $4, 6($5)
+0x60 0x85 0x6e 0x06 # CHECK: lwe $4, 6($5)
+0xfc 0x85 0x00 0x06 # CHECK: lw $4, 6($5)
+0x10 0xc0 0x45 0x67 # CHECK: lui $6, 17767
+0x00 0x64 0x2b 0x3c # CHECK: seb $3, $4
+0x00 0x64 0x3b 0x3c # CHECK: seh $3, $4
+0xf8 0xa6 0x00 0x04 # CHECK: sw $5, 4($6)
+0x60 0xa4 0xae 0x08 # CHECK: swe $5, 8($4)
+0x54 0xa4 0x18 0x30 # CHECK: add.s $f3, $f4, $f5
+0x54 0xc4 0x11 0x30 # CHECK: add.d $f2, $f4, $f6
+0x54 0xa4 0x18 0x70 # CHECK: sub.s $f3, $f4, $f5
+0x54 0xc4 0x11 0x70 # CHECK: sub.d $f2, $f4, $f6
+0x54 0xa4 0x18 0xb0 # CHECK: mul.s $f3, $f4, $f5
+0x54 0xc4 0x11 0xb0 # CHECK: mul.d $f2, $f4, $f6
+0x54 0xa4 0x18 0xf0 # CHECK: div.s $f3, $f4, $f5
+0x54 0xc4 0x11 0xf0 # CHECK: div.d $f2, $f4, $f6
+0x54 0xa4 0x19 0xb8 # CHECK: maddf.s $f3, $f4, $f5
+0x54 0xa4 0x1b 0xb8 # CHECK: maddf.d $f3, $f4, $f5
+0x54 0xa4 0x19 0xf8 # CHECK: msubf.s $f3, $f4, $f5
+0x54 0xa4 0x1b 0xf8 # CHECK: msubf.d $f3, $f4, $f5
+0x54 0xc7 0x00 0x7b # CHECK: mov.s $f6, $f7
+0x54 0x86 0x20 0x7b # CHECK: mov.d $f4, $f6
+0x54 0xc7 0x0b 0x7b # CHECK: neg.s $f6, $f7
+0x54 0x86 0x2b 0x7b # CHECK: neg.d $f4, $f6
+0x54 0x64 0x28 0x0b # CHECK: max.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x0b # CHECK: max.d $f5, $f4, $f3
+0x54 0x64 0x28 0x2b # CHECK: maxa.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x2b # CHECK: maxa.d $f5, $f4, $f3
+0x54 0x64 0x28 0x03 # CHECK: min.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x03 # CHECK: min.d $f5, $f4, $f3
+0x54 0x64 0x28 0x23 # CHECK: mina.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x23 # CHECK: mina.d $f5, $f4, $f3
+0x54 0x83 0x10 0x05 # CHECK: cmp.af.s $f2, $f3, $f4
+0x54 0x83 0x10 0x45 # CHECK: cmp.un.s $f2, $f3, $f4
+0x54 0x83 0x10 0x85 # CHECK: cmp.eq.s $f2, $f3, $f4
+0x54 0x83 0x10 0xc5 # CHECK: cmp.ueq.s $f2, $f3, $f4
+0x54 0x83 0x11 0x05 # CHECK: cmp.lt.s $f2, $f3, $f4
+0x54 0x83 0x11 0x45 # CHECK: cmp.ult.s $f2, $f3, $f4
+0x54 0x83 0x11 0x85 # CHECK: cmp.le.s $f2, $f3, $f4
+0x54 0x83 0x11 0xc5 # CHECK: cmp.ule.s $f2, $f3, $f4
+0x54 0x83 0x12 0x05 # CHECK: cmp.saf.s $f2, $f3, $f4
+0x54 0x83 0x12 0x45 # CHECK: cmp.sun.s $f2, $f3, $f4
+0x54 0x83 0x12 0x85 # CHECK: cmp.seq.s $f2, $f3, $f4
+0x54 0x83 0x12 0xc5 # CHECK: cmp.sueq.s $f2, $f3, $f4
+0x54 0x83 0x13 0x05 # CHECK: cmp.slt.s $f2, $f3, $f4
+0x54 0x83 0x13 0x45 # CHECK: cmp.sult.s $f2, $f3, $f4
+0x54 0x83 0x13 0x85 # CHECK: cmp.sle.s $f2, $f3, $f4
+0x54 0x83 0x13 0xc5 # CHECK: cmp.sule.s $f2, $f3, $f4
+0x54 0x83 0x10 0x15 # CHECK: cmp.af.d $f2, $f3, $f4
+0x54 0x83 0x10 0x55 # CHECK: cmp.un.d $f2, $f3, $f4
+0x54 0x83 0x10 0x95 # CHECK: cmp.eq.d $f2, $f3, $f4
+0x54 0x83 0x10 0xd5 # CHECK: cmp.ueq.d $f2, $f3, $f4
+0x54 0x83 0x11 0x15 # CHECK: cmp.lt.d $f2, $f3, $f4
+0x54 0x83 0x11 0x55 # CHECK: cmp.ult.d $f2, $f3, $f4
+0x54 0x83 0x11 0x95 # CHECK: cmp.le.d $f2, $f3, $f4
+0x54 0x83 0x11 0xd5 # CHECK: cmp.ule.d $f2, $f3, $f4
+0x54 0x83 0x12 0x15 # CHECK: cmp.saf.d $f2, $f3, $f4
+0x54 0x83 0x12 0x55 # CHECK: cmp.sun.d $f2, $f3, $f4
+0x54 0x83 0x12 0x95 # CHECK: cmp.seq.d $f2, $f3, $f4
+0x54 0x83 0x12 0xd5 # CHECK: cmp.sueq.d $f2, $f3, $f4
+0x54 0x83 0x13 0x15 # CHECK: cmp.slt.d $f2, $f3, $f4
+0x54 0x83 0x13 0x55 # CHECK: cmp.sult.d $f2, $f3, $f4
+0x54 0x83 0x13 0x95 # CHECK: cmp.sle.d $f2, $f3, $f4
+0x54 0x83 0x13 0xd5 # CHECK: cmp.sule.d $f2, $f3, $f4
+0x54 0x64 0x01 0x3b # CHECK: cvt.l.s $f3, $f4
+0x54 0x64 0x41 0x3b # CHECK: cvt.l.d $f3, $f4
+0x54 0x64 0x09 0x3b # CHECK: cvt.w.s $f3, $f4
+0x54 0x64 0x49 0x3b # CHECK: cvt.w.d $f3, $f4
+0x54 0x44 0x13 0x7b # CHECK: cvt.d.s $f2, $f4
+0x54 0x44 0x33 0x7b # CHECK: cvt.d.w $f2, $f4
+0x54 0x44 0x53 0x7b # CHECK: cvt.d.l $f2, $f4
+0x54 0x44 0x1b 0x7b # CHECK: cvt.s.d $f2, $f4
+0x54 0x64 0x3b 0x7b # CHECK: cvt.s.w $f3, $f4
+0x54 0x64 0x5b 0x7b # CHECK: cvt.s.l $f3, $f4
+0x54 0x65 0x03 0x7b # CHECK: abs.s $f3, $f5
+0x54 0x44 0x23 0x7b # CHECK: abs.d $f2, $f4
+0x54 0x65 0x03 0x3b # CHECK: floor.l.s $f3, $f5
+0x54 0x44 0x43 0x3b # CHECK: floor.l.d $f2, $f4
+0x54 0x65 0x0b 0x3b # CHECK: floor.w.s $f3, $f5
+0x54 0x44 0x4b 0x3b # CHECK: floor.w.d $f2, $f4
+0x54 0x65 0x13 0x3b # CHECK: ceil.l.s $f3, $f5
+0x54 0x44 0x53 0x3b # CHECK: ceil.l.d $f2, $f4
+0x54 0x65 0x1b 0x3b # CHECK: ceil.w.s $f3, $f5
+0x54 0x44 0x5b 0x3b # CHECK: ceil.w.d $f2, $f4
+0x54 0x65 0x23 0x3b # CHECK: trunc.l.s $f3, $f5
+0x54 0x44 0x63 0x3b # CHECK: trunc.l.d $f2, $f4
+0x54 0x65 0x2b 0x3b # CHECK: trunc.w.s $f3, $f5
+0x54 0x44 0x6b 0x3b # CHECK: trunc.w.d $f2, $f4
+0x54 0x65 0x0a 0x3b # CHECK: sqrt.s $f3, $f5
+0x54 0x44 0x4a 0x3b # CHECK: sqrt.d $f2, $f4
+0x54 0x65 0x02 0x3b # CHECK: rsqrt.s $f3, $f5
+0x54 0x44 0x42 0x3b # CHECK: rsqrt.d $f2, $f4
+0x60 0x25 0xa6 0x08 # CHECK: cachee 1, 8($5)
+0x60 0x25 0xa4 0x08 # CHECK: prefe 1, 8($5)
+0x01 0x28 0x00 0x3c # CHECK: teq $8, $9
+0x00 0xe5 0xf0 0x3c # CHECK: teq $5, $7, 15
+0x01 0x47 0x02 0x3c # CHECK: tge $7, $10
+0x02 0x67 0xf2 0x3c # CHECK: tge $7, $19, 15
+0x03 0x96 0x04 0x3c # CHECK: tgeu $22, $gp
+0x01 0xd4 0xf4 0x3c # CHECK: tgeu $20, $14, 15
+0x01 0xaf 0x08 0x3c # CHECK: tlt $15, $13
+0x02 0x62 0xf8 0x3c # CHECK: tlt $2, $19, 15
+0x02 0x0b 0x0a 0x3c # CHECK: tltu $11, $16
+0x03 0xb0 0xfa 0x3c # CHECK: tltu $16, $sp, 15
+0x02 0x26 0x0c 0x3c # CHECK: tne $6, $17
+0x01 0x07 0xfc 0x3c # CHECK: tne $7, $8, 15
+0x65 0x88 # CHECK: lw $3, 32($gp)
+0x48 0x66 # CHECK: lw $3, 24($sp)
+0x6a 0x12 # CHECK: lw16 $4, 8($17)
+0x29 0x82 # CHECK: lhu16 $3, 4($16)
+0x09 0x94 # CHECK: lbu16 $3, 4($17)
+0x09 0x9f # CHECK: lbu16 $3, -1($17)
+0x04 0xcc # CHECK: addu16 $6, $17, $4
+0x44 0x21 # CHECK: and16 $16, $2
+0x2e 0x56 # CHECK: andi16 $4, $5, 8
+0x46 0x70 # CHECK: not16 $4, $7
+0x45 0xf9 # CHECK: or16 $3, $7
+0x25 0xe0 # CHECK: sll16 $3, $6, 8
+0x25 0xe1 # CHECK: srl16 $3, $6, 8
+0x46 0x1B # CHECK: break16 8
+0xed 0xff # CHECK: li16 $3, -1
+0x0c 0x65 # CHECK: move16 $3, $5
+0x46 0x3b # CHECK: sdbbp16 8
+0x04 0x3b # CHECK: subu16 $5, $16, $3
+0x44 0xd8 # CHECK: xor16 $17, $5
+0x1c 0x85 0x00 0x08 # CHECK: lb $4, 8($5)
+0x14 0x85 0x00 0x08 # CHECK: lbu $4, 8($5)
+0x60 0x85 0x68 0x08 # CHECK: lbe $4, 8($5)
+0x60 0x85 0x60 0x08 # CHECK: lbue $4, 8($5)
+0x00 0x00 0x28 0x00 # CHECK: pause
+0x00 0xbd 0x11 0xc0 # CHECK: rdhwr $5, $29, 2
+0x00 0xbd 0x01 0xc0 # CHECK: rdhwr $5, $29
+0x00 0x00 0x93 0x7c # CHECK: wait
+0x00 0x11 0x93 0x7c # CHECK: wait 17
+0x00 0x00 0x08 0x00 # CHECK: ssnop
+0x00 0x00 0x6b 0x7c # CHECK: sync
+0x00 0x11 0x6b 0x7c # CHECK: sync 17
+0x41 0x85 0x00 0x08 # CHECK: synci 8($5)
+0x00 0x69 0xe1 0x7c # CHECK: rdpgpr $3, $9
+0x00 0x00 0xdb 0x7c # CHECK: sdbbp
+0x00 0x22 0xdb 0x7c # CHECK: sdbbp 34
+0x45 0x22 # CHECK: lwm16 $16, $17, $ra, 8($sp)
+0x89 0x84 # CHECK: sb16 $3, 4($16)
+0xaa 0x14 # CHECK: sh16 $4, 8($17)
+0xc8 0x9f # CHECK: sw $4, 124($sp)
+0xea 0x11 # CHECK: sw16 $4, 4($17)
+0xe8 0x11 # CHECK: sw16 $zero, 4($17)
+0x45 0x2a # CHECK: swm16 $16, $17, $ra, 8($sp)
+0x54 0x44 0x12 0x3b # CHECK: recip.s $f2, $f4
+0x54 0x44 0x52 0x3b # CHECK: recip.d $f2, $f4
+0x54 0x82 0x00 0x20 # CHECK: rint.s $f2, $f4
+0x54 0x82 0x02 0x20 # CHECK: rint.d $f2, $f4
+0x54 0x44 0x33 0x3b # CHECK: round.l.s $f2, $f4
+0x54 0x44 0x73 0x3b # CHECK: round.l.d $f2, $f4
+0x54 0x44 0x3b 0x3b # CHECK: round.w.s $f2, $f4
+0x54 0x44 0x7b 0x3b # CHECK: round.w.d $f2, $f4
+0x54 0x41 0x08 0xb8 # CHECK: sel.s $f1, $f1, $f2
+0x54 0x82 0x02 0xb8 # CHECK: sel.d $f0, $f2, $f4
+0x54 0x62 0x08 0x38 # CHECK: seleqz.s $f1, $f2, $f3
+0x55 0x04 0x12 0x38 # CHECK: seleqz.d $f2, $f4, $f8
+0x54 0x62 0x08 0x78 # CHECK: selnez.s $f1, $f2, $f3
+0x55 0x04 0x12 0x78 # CHECK: selnez.d $f2, $f4, $f8
+0x54 0x62 0x00 0x60 # CHECK: class.s $f2, $f3
+0x54 0x82 0x02 0x60 # CHECK: class.d $f2, $f4
+0x00 0x00 0x47 0x7c # CHECK: di
+0x00 0x0f 0x47 0x7c # CHECK: di $15
diff --git a/test/MC/Disassembler/Mips/micromips64r6/valid.txt b/test/MC/Disassembler/Mips/micromips64r6/valid.txt
new file mode 100644
index 000000000000..4f2325fe7ce1
--- /dev/null
+++ b/test/MC/Disassembler/Mips/micromips64r6/valid.txt
@@ -0,0 +1,171 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips64r6 -mattr=micromips | FileCheck %s
+
+0x6f 0x83 # CHECK: addiur1sp $7, 4
+0x6f 0x7e # CHECK: addiur2 $6, $7, -1
+0x6f 0x76 # CHECK: addiur2 $6, $7, 12
+0x4c 0xfc # CHECK: addius5 $7, -2
+0x4f 0xff # CHECK: addiusp -1028
+0x4f 0xfd # CHECK: addiusp -1032
+0x4c 0x01 # CHECK: addiusp 1024
+0x4c 0x03 # CHECK: addiusp 1028
+0x4f 0xf9 # CHECK: addiusp -16
+0xcc 0x42 # CHECK: bc16 132
+0x8f 0x0a # CHECK: beqzc16 $6, 20
+0xaf 0x0a # CHECK: bnezc16 $6, 20
+0x65 0x88 # CHECK: lw $3, 32($gp)
+0x48 0x66 # CHECK: lw $3, 24($sp)
+0x6a 0x12 # CHECK: lw16 $4, 8($17)
+0x29 0x82 # CHECK: lhu16 $3, 4($16)
+0x09 0x94 # CHECK: lbu16 $3, 4($17)
+0x09 0x9f # CHECK: lbu16 $3, -1($17)
+0x45 0x2b # CHECK: jalr $9
+0x45 0x23 # CHECK: jrc16 $9
+0x44 0xb3 # CHECK: jrcaddiusp 20
+0xf0 0x64 0x00 0x05 # CHECK: daui $3, $4, 5
+0x42 0x23 0x00 0x04 # CHECK: dahi $3, 4
+0x42 0x03 0x00 0x04 # CHECK: dati $3, 4
+0x59 0x26 0x30 0xec # CHECK: dext $9, $6, 3, 7
+0x59 0x26 0x30 0xe4 # CHECK: dextm $9, $6, 3, 7
+0x59 0x26 0x30 0xd4 # CHECK: dextu $9, $6, 3, 7
+0x58 0x43 0x25 0x1c # CHECK: dalign $4, $2, $3, 5
+0x58 0x64 0x29 0x18 # CHECK: ddiv $3, $4, $5
+0x58 0x64 0x29 0x58 # CHECK: dmod $3, $4, $5
+0x58 0x64 0x29 0x98 # CHECK: ddivu $3, $4, $5
+0x58 0x64 0x29 0xd8 # CHECK: dmodu $3, $4, $5
+0x54 0xa4 0x18 0x30 # CHECK: add.s $f3, $f4, $f5
+0x54 0xc4 0x11 0x30 # CHECK: add.d $f2, $f4, $f6
+0x54 0xa4 0x18 0x70 # CHECK: sub.s $f3, $f4, $f5
+0x54 0xc4 0x11 0x70 # CHECK: sub.d $f2, $f4, $f6
+0x54 0xa4 0x18 0xb0 # CHECK: mul.s $f3, $f4, $f5
+0x54 0xc4 0x11 0xb0 # CHECK: mul.d $f2, $f4, $f6
+0x54 0xa4 0x18 0xf0 # CHECK: div.s $f3, $f4, $f5
+0x54 0xc4 0x11 0xf0 # CHECK: div.d $f2, $f4, $f6
+0x54 0xa4 0x19 0xb8 # CHECK: maddf.s $f3, $f4, $f5
+0x54 0xa4 0x1b 0xb8 # CHECK: maddf.d $f3, $f4, $f5
+0x54 0xa4 0x19 0xf8 # CHECK: msubf.s $f3, $f4, $f5
+0x54 0xa4 0x1b 0xf8 # CHECK: msubf.d $f3, $f4, $f5
+0x54 0xc7 0x00 0x7b # CHECK: mov.s $f6, $f7
+0x54 0x86 0x20 0x7b # CHECK: mov.d $f4, $f6
+0x54 0xc7 0x0b 0x7b # CHECK: neg.s $f6, $f7
+0x54 0x86 0x2b 0x7b # CHECK: neg.d $f4, $f6
+0x54 0x64 0x28 0x0b # CHECK: max.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x0b # CHECK: max.d $f5, $f4, $f3
+0x54 0x64 0x28 0x2b # CHECK: maxa.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x2b # CHECK: maxa.d $f5, $f4, $f3
+0x54 0x64 0x28 0x03 # CHECK: min.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x03 # CHECK: min.d $f5, $f4, $f3
+0x54 0x64 0x28 0x23 # CHECK: mina.s $f5, $f4, $f3
+0x54 0x64 0x2a 0x23 # CHECK: mina.d $f5, $f4, $f3
+0x54 0x83 0x10 0x05 # CHECK: cmp.af.s $f2, $f3, $f4
+0x54 0x83 0x10 0x45 # CHECK: cmp.un.s $f2, $f3, $f4
+0x54 0x83 0x10 0x85 # CHECK: cmp.eq.s $f2, $f3, $f4
+0x54 0x83 0x10 0xc5 # CHECK: cmp.ueq.s $f2, $f3, $f4
+0x54 0x83 0x11 0x05 # CHECK: cmp.lt.s $f2, $f3, $f4
+0x54 0x83 0x11 0x45 # CHECK: cmp.ult.s $f2, $f3, $f4
+0x54 0x83 0x11 0x85 # CHECK: cmp.le.s $f2, $f3, $f4
+0x54 0x83 0x11 0xc5 # CHECK: cmp.ule.s $f2, $f3, $f4
+0x54 0x83 0x12 0x05 # CHECK: cmp.saf.s $f2, $f3, $f4
+0x54 0x83 0x12 0x45 # CHECK: cmp.sun.s $f2, $f3, $f4
+0x54 0x83 0x12 0x85 # CHECK: cmp.seq.s $f2, $f3, $f4
+0x54 0x83 0x12 0xc5 # CHECK: cmp.sueq.s $f2, $f3, $f4
+0x54 0x83 0x13 0x05 # CHECK: cmp.slt.s $f2, $f3, $f4
+0x54 0x83 0x13 0x45 # CHECK: cmp.sult.s $f2, $f3, $f4
+0x54 0x83 0x13 0x85 # CHECK: cmp.sle.s $f2, $f3, $f4
+0x54 0x83 0x13 0xc5 # CHECK: cmp.sule.s $f2, $f3, $f4
+0x54 0x83 0x10 0x15 # CHECK: cmp.af.d $f2, $f3, $f4
+0x54 0x83 0x10 0x55 # CHECK: cmp.un.d $f2, $f3, $f4
+0x54 0x83 0x10 0x95 # CHECK: cmp.eq.d $f2, $f3, $f4
+0x54 0x83 0x10 0xd5 # CHECK: cmp.ueq.d $f2, $f3, $f4
+0x54 0x83 0x11 0x15 # CHECK: cmp.lt.d $f2, $f3, $f4
+0x54 0x83 0x11 0x55 # CHECK: cmp.ult.d $f2, $f3, $f4
+0x54 0x83 0x11 0x95 # CHECK: cmp.le.d $f2, $f3, $f4
+0x54 0x83 0x11 0xd5 # CHECK: cmp.ule.d $f2, $f3, $f4
+0x54 0x83 0x12 0x15 # CHECK: cmp.saf.d $f2, $f3, $f4
+0x54 0x83 0x12 0x55 # CHECK: cmp.sun.d $f2, $f3, $f4
+0x54 0x83 0x12 0x95 # CHECK: cmp.seq.d $f2, $f3, $f4
+0x54 0x83 0x12 0xd5 # CHECK: cmp.sueq.d $f2, $f3, $f4
+0x54 0x83 0x13 0x15 # CHECK: cmp.slt.d $f2, $f3, $f4
+0x54 0x83 0x13 0x55 # CHECK: cmp.sult.d $f2, $f3, $f4
+0x54 0x83 0x13 0x95 # CHECK: cmp.sle.d $f2, $f3, $f4
+0x54 0x83 0x13 0xd5 # CHECK: cmp.sule.d $f2, $f3, $f4
+0x54 0x64 0x01 0x3b # CHECK: cvt.l.s $f3, $f4
+0x54 0x64 0x41 0x3b # CHECK: cvt.l.d $f3, $f4
+0x54 0x64 0x09 0x3b # CHECK: cvt.w.s $f3, $f4
+0x54 0x64 0x49 0x3b # CHECK: cvt.w.d $f3, $f4
+0x54 0x44 0x13 0x7b # CHECK: cvt.d.s $f2, $f4
+0x54 0x44 0x33 0x7b # CHECK: cvt.d.w $f2, $f4
+0x54 0x44 0x53 0x7b # CHECK: cvt.d.l $f2, $f4
+0x54 0x44 0x1b 0x7b # CHECK: cvt.s.d $f2, $f4
+0x54 0x64 0x3b 0x7b # CHECK: cvt.s.w $f3, $f4
+0x54 0x64 0x5b 0x7b # CHECK: cvt.s.l $f3, $f4
+0x54 0x65 0x03 0x7b # CHECK: abs.s $f3, $f5
+0x54 0x44 0x23 0x7b # CHECK: abs.d $f2, $f4
+0x54 0x65 0x03 0x3b # CHECK: floor.l.s $f3, $f5
+0x54 0x44 0x43 0x3b # CHECK: floor.l.d $f2, $f4
+0x54 0x65 0x0b 0x3b # CHECK: floor.w.s $f3, $f5
+0x54 0x44 0x4b 0x3b # CHECK: floor.w.d $f2, $f4
+0x54 0x65 0x13 0x3b # CHECK: ceil.l.s $f3, $f5
+0x54 0x44 0x53 0x3b # CHECK: ceil.l.d $f2, $f4
+0x54 0x65 0x1b 0x3b # CHECK: ceil.w.s $f3, $f5
+0x54 0x44 0x5b 0x3b # CHECK: ceil.w.d $f2, $f4
+0x54 0x65 0x23 0x3b # CHECK: trunc.l.s $f3, $f5
+0x54 0x44 0x63 0x3b # CHECK: trunc.l.d $f2, $f4
+0x54 0x65 0x2b 0x3b # CHECK: trunc.w.s $f3, $f5
+0x54 0x44 0x6b 0x3b # CHECK: trunc.w.d $f2, $f4
+0x54 0x65 0x0a 0x3b # CHECK: sqrt.s $f3, $f5
+0x54 0x44 0x4a 0x3b # CHECK: sqrt.d $f2, $f4
+0x54 0x65 0x02 0x3b # CHECK: rsqrt.s $f3, $f5
+0x54 0x44 0x42 0x3b # CHECK: rsqrt.d $f2, $f4
+0x01 0x28 0x00 0x3c # CHECK: teq $8, $9
+0x00 0xe5 0xf0 0x3c # CHECK: teq $5, $7, 15
+0x01 0x47 0x02 0x3c # CHECK: tge $7, $10
+0x02 0x67 0xf2 0x3c # CHECK: tge $7, $19, 15
+0x03 0x96 0x04 0x3c # CHECK: tgeu $22, $gp
+0x01 0xd4 0xf4 0x3c # CHECK: tgeu $20, $14, 15
+0x01 0xaf 0x08 0x3c # CHECK: tlt $15, $13
+0x02 0x62 0xf8 0x3c # CHECK: tlt $2, $19, 15
+0x02 0x0b 0x0a 0x3c # CHECK: tltu $11, $16
+0x03 0xb0 0xfa 0x3c # CHECK: tltu $16, $sp, 15
+0x02 0x26 0x0c 0x3c # CHECK: tne $6, $17
+0x01 0x07 0xfc 0x3c # CHECK: tne $7, $8, 15
+0x60 0x25 0xa6 0x08 # CHECK: cachee 1, 8($5)
+0x00 0x64 0xf1 0x7c # CHECK: wrpgpr $3, $4
+0x00 0x64 0x7b 0x3c # CHECK: wsbh $3, $4
+0x65 0x88 # CHECK: lw $3, 32($gp)
+0x48 0x66 # CHECK: lw $3, 24($sp)
+0x6a 0x12 # CHECK: lw16 $4, 8($17)
+0x29 0x82 # CHECK: lhu16 $3, 4($16)
+0x09 0x94 # CHECK: lbu16 $3, 4($17)
+0x09 0x9f # CHECK: lbu16 $3, -1($17)
+0x46 0x1B # CHECK: break16 8
+0xed 0xff # CHECK: li16 $3, -1
+0x0c 0x65 # CHECK: move16 $3, $5
+0x46 0x3b # CHECK: sdbbp16 8
+0x04 0x3b # CHECK: subu16 $5, $16, $3
+0x44 0xd8 # CHECK: xor16 $17, $5
+0x45 0x22 # CHECK: lwm16 $16, $17, $ra, 8($sp)
+0x89 0x84 # CHECK: sb16 $3, 4($16)
+0xaa 0x14 # CHECK: sh16 $4, 8($17)
+0xc8 0x9f # CHECK: sw $4, 124($sp)
+0xea 0x11 # CHECK: sw16 $4, 4($17)
+0xe8 0x11 # CHECK: sw16 $zero, 4($17)
+0x45 0x2a # CHECK: swm16 $16, $17, $ra, 8($sp)
+0x54 0x44 0x12 0x3b # CHECK: recip.s $f2, $f4
+0x54 0x44 0x52 0x3b # CHECK: recip.d $f2, $f4
+0x54 0x82 0x00 0x20 # CHECK: rint.s $f2, $f4
+0x54 0x82 0x02 0x20 # CHECK: rint.d $f2, $f4
+0x54 0x44 0x33 0x3b # CHECK: round.l.s $f2, $f4
+0x54 0x44 0x73 0x3b # CHECK: round.l.d $f2, $f4
+0x54 0x44 0x3b 0x3b # CHECK: round.w.s $f2, $f4
+0x54 0x44 0x7b 0x3b # CHECK: round.w.d $f2, $f4
+0x54 0x41 0x08 0xb8 # CHECK: sel.s $f1, $f1, $f2
+0x54 0x82 0x02 0xb8 # CHECK: sel.d $f0, $f2, $f4
+0x54 0x62 0x08 0x38 # CHECK: seleqz.s $f1, $f2, $f3
+0x55 0x04 0x12 0x38 # CHECK: seleqz.d $f2, $f4, $f8
+0x54 0x62 0x08 0x78 # CHECK: selnez.s $f1, $f2, $f3
+0x55 0x04 0x12 0x78 # CHECK: selnez.d $f2, $f4, $f8
+0x54 0x62 0x00 0x60 # CHECK: class.s $f2, $f3
+0x54 0x82 0x02 0x60 # CHECK: class.d $f2, $f4
+0x00 0x00 0xe3 0x7c # CHECK: deret
+0x00 0x00 0x47 0x7c # CHECK: di
+0x00 0x0f 0x47 0x7c # CHECK: di $15
diff --git a/test/MC/Disassembler/Mips/mips-dsp.txt b/test/MC/Disassembler/Mips/mips-dsp.txt
deleted file mode 100644
index 3f60ae1f8e65..000000000000
--- a/test/MC/Disassembler/Mips/mips-dsp.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# RUN: llvm-mc -triple=mipsel-unknown-linux -mattr=+dsp -disassemble < %s | FileCheck %s
-
-# CHECK: mfhi $21, $ac3
-0x10 0xa8 0x60 0x00
-
-# CHECK: mflo $21, $ac3
-0x12 0xa8 0x60 0x00
-
-# CHECK: mthi $21, $ac3
-0x11 0x18 0xa0 0x02
-
-# CHECK: mtlo $21, $ac3
-0x13 0x18 0xa0 0x02
-
-# CHECK: lbux $10, $20($26)
-0x8a 0x51 0x54 0x7f
-
-# CHECK: lhx $11, $21($27)
-0x0a 0x59 0x75 0x7f
-
-# CHECK: lwx $12, $22($gp)
-0x0a 0x60 0x96 0x7f
diff --git a/test/MC/Disassembler/Mips/mips1/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips1/invalid-xfail.txt
new file mode 100644
index 000000000000..c53091363965
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips1/invalid-xfail.txt
@@ -0,0 +1,11 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips1 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips1/invalid.txt b/test/MC/Disassembler/Mips/mips1/invalid.txt
new file mode 100644
index 000000000000..a8fc4228f269
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips1/invalid.txt
@@ -0,0 +1,45 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips1 2>&1 | FileCheck %s
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+0x00 0x11 0x00 0x0f # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x00 0x30 0xc0 0x42 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x00 0xab 0x09 0x4a # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x02 0x80 0x44 0xf0 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x02 0xc5 0x40 0x01 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x03 0x21 0x22 0xd5 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x03 0xa0 0x08 0x13 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x04 0x1c 0x63 0xee # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x40 0x3c 0x00 0x5d # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x42 0x02 0x00 0x27 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x42 0x1d 0x60 0x25 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x43 0xa2 0x00 0x18 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x44 0x20 0x86 0x06 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x44 0xe6 0xd0 0x04 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x03 0x80 0x00 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0xe9 0xce 0x01 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x00 0x03 0x7a # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x00 0x1a 0xa5 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x00 0x78 0x4f # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x00 0xe5 0xe1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x00 0xe6 0xcc # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x20 0x75 0x46 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x21 0xaa 0x00 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x21 0xaa 0x11 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x30 0x14 0xc1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x46 0x3c 0xe8 0x3b # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x4c 0x00 0x3b 0x00 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x4d 0x09 0x92 0x01 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x4d 0x20 0x03 0x21 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x4d 0x20 0x03 0x8d # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x56 0x28 0x40 0x0d # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x5e 0x03 0xc8 0x13 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x73 0x11 0x00 0x01 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x75 0x68 0x90 0xf3 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x7d 0x00 0xa0 0x71 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0xbe 0x03 0x46 0x40 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0xd8 0x07 0x44 0x00 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0xde 0xe3 0x06 0xef # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0xe0 0x46 0x3b 0x29 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0xf7 0x06 0xdc 0xef # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips1/valid-mips1-el.txt b/test/MC/Disassembler/Mips/mips1/valid-mips1-el.txt
index dba949acd66a..869d909621a1 100644
--- a/test/MC/Disassembler/Mips/mips1/valid-mips1-el.txt
+++ b/test/MC/Disassembler/Mips/mips1/valid-mips1-el.txt
@@ -58,6 +58,8 @@
0x12 0x88 0x00 0x00 # CHECK: mflo $17
0x06 0x75 0x20 0x46 # CHECK: mov.d $f20, $f14
0x86 0xd8 0x00 0x46 # CHECK: mov.s $f2, $f27
+0x25 0xf0 0x80 0x00 # CHECK: move $fp, $4
+0x25 0xc8 0xc0 0x00 # CHECK: move $25, $6
0x21 0xf0 0x80 0x00 # CHECK: move $fp, $4
0x21 0xc8 0xc0 0x00 # CHECK: move $25, $6
0x00 0x48 0x9e 0x44 # CHECK: mtc1 $fp, $f9
diff --git a/test/MC/Disassembler/Mips/mips1/valid-mips1.txt b/test/MC/Disassembler/Mips/mips1/valid-mips1.txt
index 59e702e17e1c..a34327aaa766 100644
--- a/test/MC/Disassembler/Mips/mips1/valid-mips1.txt
+++ b/test/MC/Disassembler/Mips/mips1/valid-mips1.txt
@@ -16,11 +16,13 @@
0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
@@ -43,6 +45,9 @@
0x04 0x11 0x14 0x9b # CHECK: bal 21104
0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x08 0x00 0x00 0x01 # CHECK: j 4
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
diff --git a/test/MC/Disassembler/Mips/mips1/valid-xfail.txt b/test/MC/Disassembler/Mips/mips1/valid-xfail.txt
index 759097cc3751..615bf51addfa 100644
--- a/test/MC/Disassembler/Mips/mips1/valid-xfail.txt
+++ b/test/MC/Disassembler/Mips/mips1/valid-xfail.txt
@@ -1,4 +1,12 @@
# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips1 | FileCheck %s
# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips2/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips2/invalid-xfail.txt
new file mode 100644
index 000000000000..b3fd1c49edc4
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips2/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips2 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt b/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt
index 806040937b77..5bdf8f17eb68 100644
--- a/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt
+++ b/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt
@@ -74,6 +74,8 @@
0x86 0xd8 0x00 0x46 # CHECK: mov.s $f2, $f27
0x21 0xf0 0x80 0x00 # CHECK: move $fp, $4
0x21 0xc8 0xc0 0x00 # CHECK: move $25, $6
+0x25 0xf0 0x80 0x00 # CHECK: move $fp, $4
+0x25 0xc8 0xc0 0x00 # CHECK: move $25, $6
0x00 0x48 0x9e 0x44 # CHECK: mtc1 $fp, $f9
0x11 0x00 0x20 0x02 # CHECK: mthi $17
0x13 0x00 0xa0 0x03 # CHECK: mtlo $sp
diff --git a/test/MC/Disassembler/Mips/mips2/valid-mips2.txt b/test/MC/Disassembler/Mips/mips2/valid-mips2.txt
index 268bb2900903..570f8ddb47c3 100644
--- a/test/MC/Disassembler/Mips/mips2/valid-mips2.txt
+++ b/test/MC/Disassembler/Mips/mips2/valid-mips2.txt
@@ -1,9 +1,15 @@
# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips2 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
0x00 0x00 0x00 0xc0 # CHECK: ehb
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
0x00 0x00 0x88 0x12 # CHECK: mflo $17
0x00 0x00 0x98 0x10 # CHECK: mfhi $19
0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
@@ -14,11 +20,15 @@
0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
@@ -26,6 +36,8 @@
0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
@@ -38,6 +50,7 @@
0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
@@ -53,9 +66,11 @@
0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
0x04 0x11 0x14 0x9b # CHECK: bal 21104
0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
@@ -65,6 +80,9 @@
0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
@@ -78,7 +96,9 @@
0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x42 0x00 0x00 0x01 # CHECK: tlbr
0x42 0x00 0x00 0x02 # CHECK: tlbwi
0x42 0x00 0x00 0x06 # CHECK: tlbwr
diff --git a/test/MC/Disassembler/Mips/mips2/valid-xfail.txt b/test/MC/Disassembler/Mips/mips2/valid-xfail.txt
new file mode 100644
index 000000000000..5497515d0090
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips2/valid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips2 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips3/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips3/invalid-xfail.txt
new file mode 100644
index 000000000000..cfb7d801e911
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips3/invalid-xfail.txt
@@ -0,0 +1,14 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips3 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0xce 0x00 0x00 0x00 # pref 0, 0($16) # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt b/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt
index 98ce16bb7429..6ffe7748e950 100644
--- a/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt
+++ b/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt
@@ -118,6 +118,8 @@
0x86 0xd8 0x00 0x46 # CHECK: mov.s $f2, $f27
0x21 0xf0 0x80 0x00 # CHECK: move $fp, $4
0x21 0xc8 0xc0 0x00 # CHECK: move $25, $6
+0x25 0xf0 0x80 0x00 # CHECK: move $fp, $4
+0x25 0xc8 0xc0 0x00 # CHECK: move $25, $6
0x00 0x48 0x9e 0x44 # CHECK: mtc1 $fp, $f9
0x11 0x00 0x20 0x02 # CHECK: mthi $17
0x13 0x00 0xa0 0x03 # CHECK: mtlo $sp
diff --git a/test/MC/Disassembler/Mips/mips3/valid-mips3.txt b/test/MC/Disassembler/Mips/mips3/valid-mips3.txt
index 2a38b19092f0..db83b50aa01a 100644
--- a/test/MC/Disassembler/Mips/mips3/valid-mips3.txt
+++ b/test/MC/Disassembler/Mips/mips3/valid-mips3.txt
@@ -1,12 +1,19 @@
# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips3 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x04 0xb8 # CHECK: dsll $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
0x00 0x00 0x88 0x12 # CHECK: mflo $17
0x00 0x00 0x98 0x10 # CHECK: mfhi $19
0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
@@ -21,6 +28,8 @@
0x00 0x06 0x9d 0xfe # CHECK: dsrl32 $19, $6, 23
0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
0x00 0x12 0xe2 0xbb # CHECK: dsra $gp, $18, 10
0x00 0x12 0xe2 0xbf # CHECK: dsra32 $gp, $18, 10
@@ -30,11 +39,14 @@
0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x1c 0xe2 0xbb # CHECK: dsra $gp, $gp, 10
0x00 0x1c 0xe2 0xbf # CHECK: dsra32 $gp, $gp, 10
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
0x00 0x3f 0x98 0x2c # CHECK: dadd $19, $1, $ra
0x00 0x3f 0x98 0x2d # CHECK: daddu $19, $1, $ra
0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x2d # CHECK: move $fp, $4
0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
@@ -44,6 +56,9 @@
0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
0x00 0xba 0x28 0x2f # CHECK: dsubu $5, $5, $26
0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
+0x00 0xc0 0xc8 0x2d # CHECK: move $25, $6
0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
@@ -59,6 +74,7 @@
0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
@@ -81,9 +97,11 @@
0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
0x04 0x11 0x14 0x9b # CHECK: bal 21104
0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
@@ -93,6 +111,9 @@
0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
@@ -106,7 +127,10 @@
0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
+0x3a 0x00 0x27 0x12 # CHECK: xori $zero, $16, 10002
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x42 0x00 0x00 0x01 # CHECK: tlbr
0x42 0x00 0x00 0x02 # CHECK: tlbwi
0x42 0x00 0x00 0x06 # CHECK: tlbwr
@@ -195,6 +219,7 @@
0xb5 0x8b 0xb0 0x39 # CHECK: sdr $11, -20423($12)
0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
0xbc 0xa1 0x00 0x08 # CHECK: cache 1, 8($5)
+0xbf 0x00 0xe2 0x1c # CHECK: cache 0, -7652($24)
0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
diff --git a/test/MC/Disassembler/Mips/mips3/valid-xfail.txt b/test/MC/Disassembler/Mips/mips3/valid-xfail.txt
new file mode 100644
index 000000000000..cd685deda2e5
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips3/valid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips3 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips32/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips32/invalid-xfail.txt
new file mode 100644
index 000000000000..77d2a152d439
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips32/valid-mips32-el.txt b/test/MC/Disassembler/Mips/mips32/valid-mips32-el.txt
index f2299732a80e..0801ad7fe61b 100644
--- a/test/MC/Disassembler/Mips/mips32/valid-mips32-el.txt
+++ b/test/MC/Disassembler/Mips/mips32/valid-mips32-el.txt
@@ -7,7 +7,9 @@
0x67 0x45 0xc9 0x20 # CHECK: addi $9, $6, 17767
0x67 0xc5 0xc9 0x24 # CHECK: addiu $9, $6, -15001
0x21 0x48 0xc7 0x00 # CHECK: addu $9, $6, $7
+0x21 0xf0 0x80 0x00 # CHECK: move $fp, $4
0x24 0x48 0xc7 0x00 # CHECK: and $9, $6, $7
+0x25 0xf0 0x80 0x00 # CHECK: move $fp, $4
0x67 0x45 0xc9 0x30 # CHECK: andi $9, $6, 17767
0x4c 0x01 0x00 0x10 # CHECK: b 1332
0x4c 0x01 0x00 0x45 # CHECK: bc1f 1332
@@ -87,11 +89,20 @@
0x00 0x00 0xc7 0x70 # CHECK: madd $6, $7
0x01 0x00 0xc7 0x70 # CHECK: maddu $6, $7
0x01 0x78 0x08 0x40 # CHECK: mfc0 $8, $15, 1
+0x04 0x80 0x08 0x40 # CHECK: mfc0 $8, $16, 4
0x00 0x38 0x06 0x44 # CHECK: mfc1 $6, $f7
0x10 0x28 0x00 0x00 # CHECK: mfhi $5
0x12 0x28 0x00 0x00 # CHECK: mflo $5
0x86 0x41 0x20 0x46 # CHECK: mov.d $f6, $f8
0x86 0x39 0x00 0x46 # CHECK: mov.s $f6, $f7
+0x25,0x38,0x00,0x01 # CHECK: move $7, $8
+0x25,0x18,0x40,0x00 # CHECK: move $3, $2
+0x01,0x18,0x5c,0x00 # CHECK: movf $3, $2, $fcc7
+0x11,0x11,0x3c,0x46 # CHECK: movf.d $f4, $f2, $fcc7
+0x11,0x11,0x1c,0x46 # CHECK: movf.s $f4, $f2, $fcc7
+0x01,0x18,0x5d,0x00 # CHECK: movt $3, $2, $fcc7
+0x11,0x11,0x3d,0x46 # CHECK: movt.d $f4, $f2, $fcc7
+0x11,0x11,0x1d,0x46 # CHECK: movt.s $f4, $f2, $fcc7
0x04 0x00 0xc7 0x70 # CHECK: msub $6, $7
0x05 0x00 0xc7 0x70 # CHECK: msubu $6, $7
0x01 0x78 0x89 0x40 # CHECK: mtc0 $9, $15, 1
diff --git a/test/MC/Disassembler/Mips/mips32/valid-mips32.txt b/test/MC/Disassembler/Mips/mips32/valid-mips32.txt
index 09f1e56fff43..f71b2a16fcfc 100644
--- a/test/MC/Disassembler/Mips/mips32/valid-mips32.txt
+++ b/test/MC/Disassembler/Mips/mips32/valid-mips32.txt
@@ -1,11 +1,39 @@
# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux | FileCheck %s
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
0x00 0x03 0x21 0xc2 # CHECK: srl $4, $3, 7
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
@@ -15,23 +43,80 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -39,24 +124,55 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
0x40 0x08 0x78 0x01 # CHECK: mfc0 $8, $15, 1
0x40 0x08 0x80 0x04 # CHECK: mfc0 $8, $16, 4
0x40 0x89 0x78 0x01 # CHECK: mtc0 $9, $15, 1
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
0x46 0x00 0x39 0x85 # CHECK: abs.s $f6, $f7
0x46 0x00 0x39 0x86 # CHECK: mov.s $f6, $f7
@@ -67,6 +183,17 @@
0x46 0x00 0x39 0x8f # CHECK: floor.w.s $f6, $f7
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -85,10 +212,17 @@
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -98,6 +232,14 @@
0x46 0x20 0x73 0x0f # CHECK: floor.w.d $f12, $f14
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -117,15 +259,29 @@
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
0x70 0xc7 0x00 0x01 # CHECK: maddu $6, $7
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
0x74 0x00 0x01 0x4c # CHECK: jalx 1328
@@ -134,25 +290,49 @@
# CHECK: rdhwr $5, $29
# CHECK: .set pop
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
diff --git a/test/MC/Disassembler/Mips/mips32/valid-xfail.txt b/test/MC/Disassembler/Mips/mips32/valid-xfail.txt
new file mode 100644
index 000000000000..9a72e0583964
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32/valid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips32_le.txt b/test/MC/Disassembler/Mips/mips32_le.txt
deleted file mode 100644
index c019c41bd120..000000000000
--- a/test/MC/Disassembler/Mips/mips32_le.txt
+++ /dev/null
@@ -1,450 +0,0 @@
-# RUN: llvm-mc --disassemble %s -triple=mipsel-unknown-linux | FileCheck %s
-# CHECK: abs.d $f12, $f14
-0x05 0x73 0x20 0x46
-
-# CHECK: abs.s $f6, $f7
-0x85 0x39 0x00 0x46
-
-# CHECK: add $9, $6, $7
-0x20 0x48 0xc7 0x00
-
-# CHECK: add.d $f8, $f12, $f14
-0x00 0x62 0x2e 0x46
-
-# CHECK: add.s $f9, $f6, $f7
-0x40 0x32 0x07 0x46
-
-# CHECK: addi $9, $6, 17767
-0x67 0x45 0xc9 0x20
-
-# CHECK: addiu $9, $6, -15001
-0x67 0xc5 0xc9 0x24
-
-# CHECK: addu $9, $6, $7
-0x21 0x48 0xc7 0x00
-
-# CHECK: and $9, $6, $7
-0x24 0x48 0xc7 0x00
-
-# CHECK: andi $9, $6, 17767
-0x67 0x45 0xc9 0x30
-
-# CHECK: b 1332
-0x4c 0x01 0x00 0x10
-
-# CHECK: bc1f 1332
-0x4c 0x01 0x00 0x45
-
-# CHECK: bc1f $fcc7, 1332
-0x4c 0x01 0x1c 0x45
-
-# CHECK: bc1t 1332
-0x4c 0x01 0x01 0x45
-
-# CHECK: bc1t $fcc7, 1332
-0x4c 0x01 0x1d 0x45
-
-# CHECK: beq $9, $6, 1332
-0x4c 0x01 0x26 0x11
-
-# CHECK: bgez $6, 1332
-0x4c 0x01 0xc1 0x04
-
-# CHECK: bgezal $6, 1332
-0x4c 0x01 0xd1 0x04
-
-# CHECK: bgtz $6, 1332
-0x4c 0x01 0xc0 0x1c
-
-# CHECK: blez $6, 1332
-0x4c 0x01 0xc0 0x18
-
-# CHECK: bne $9, $6, 1332
-0x4c 0x01 0x26 0x15
-
-# CHECK: c.eq.d $f12, $f14
-0x32 0x60 0x2e 0x46
-
-# CHECK: c.eq.s $f6, $f7
-0x32 0x30 0x07 0x46
-
-# CHECK: c.f.d $f12, $f14
-0x30 0x60 0x2e 0x46
-
-# CHECK: c.f.s $f6, $f7
-0x30 0x30 0x07 0x46
-
-# CHECK: c.le.d $f12, $f14
-0x3e 0x60 0x2e 0x46
-
-# CHECK: c.le.s $f6, $f7
-0x3e 0x30 0x07 0x46
-
-# CHECK: c.lt.d $f12, $f14
-0x3c 0x60 0x2e 0x46
-
-# CHECK: c.lt.s $f6, $f7
-0x3c 0x30 0x07 0x46
-
-# CHECK: c.nge.d $f12, $f14
-0x3d 0x60 0x2e 0x46
-
-# CHECK: c.nge.s $f6, $f7
-0x3d 0x30 0x07 0x46
-
-# CHECK: c.ngl.d $f12, $f14
-0x3b 0x60 0x2e 0x46
-
-# CHECK: c.ngl.s $f6, $f7
-0x3b 0x30 0x07 0x46
-
-# CHECK: c.ngle.d $f12, $f14
-0x39 0x60 0x2e 0x46
-
-# CHECK: c.ngle.s $f6, $f7
-0x39 0x30 0x07 0x46
-
-# CHECK: c.ngt.d $f12, $f14
-0x3f 0x60 0x2e 0x46
-
-# CHECK: c.ngt.s $f6, $f7
-0x3f 0x30 0x07 0x46
-
-# CHECK: c.ole.d $f12, $f14
-0x36 0x60 0x2e 0x46
-
-# CHECK: c.ole.s $f6, $f7
-0x36 0x30 0x07 0x46
-
-# CHECK: c.olt.d $f12, $f14
-0x34 0x60 0x2e 0x46
-
-# CHECK: c.olt.s $f6, $f7
-0x34 0x30 0x07 0x46
-
-# CHECK: c.seq.d $f12, $f14
-0x3a 0x60 0x2e 0x46
-
-# CHECK: c.seq.s $f6, $f7
-0x3a 0x30 0x07 0x46
-
-# CHECK: c.sf.d $f12, $f14
-0x38 0x60 0x2e 0x46
-
-# CHECK: c.sf.s $f6, $f7
-0x38 0x30 0x07 0x46
-
-# CHECK: c.ueq.d $f12, $f14
-0x33 0x60 0x2e 0x46
-
-# CHECK: c.ueq.s $f28, $f18
-0x33 0xe0 0x12 0x46
-
-# CHECK: c.ule.d $f12, $f14
-0x37 0x60 0x2e 0x46
-
-# CHECK: c.ule.s $f6, $f7
-0x37 0x30 0x07 0x46
-
-# CHECK: c.ult.d $f12, $f14
-0x35 0x60 0x2e 0x46
-
-# CHECK: c.ult.s $f6, $f7
-0x35 0x30 0x07 0x46
-
-# CHECK: c.un.d $f12, $f14
-0x31 0x60 0x2e 0x46
-
-# CHECK: c.un.s $f6, $f7
-0x31 0x30 0x07 0x46
-
-# CHECK: ceil.w.d $f12, $f14
-0x0e 0x73 0x20 0x46
-
-# CHECK: ceil.w.s $f6, $f7
-0x8e 0x39 0x00 0x46
-
-# CHECK: cfc1 $6, $7
-0x00 0x38 0x46 0x44
-
-# CHECK: clo $6, $7
-0x21 0x30 0xe6 0x70
-
-# CHECK: clz $6, $7
-0x20 0x30 0xe6 0x70
-
-# CHECK: ctc1 $6, $7
-0x00 0x38 0xc6 0x44
-
-# CHECK: cvt.d.s $f6, $f7
-0xa1 0x39 0x00 0x46
-
-# CHECK: cvt.d.w $f12, $f14
-0x21 0x73 0x80 0x46
-
-# CHECK: cvt.s.d $f12, $f14
-0x20 0x73 0x20 0x46
-
-# CHECK: cvt.s.w $f6, $f7
-0xa0 0x39 0x80 0x46
-
-# CHECK: cvt.w.d $f12, $f14
-0x24 0x73 0x20 0x46
-
-# CHECK: cvt.w.s $f6, $f7
-0xa4 0x39 0x00 0x46
-
-# CHECK: floor.w.d $f12, $f14
-0x0f 0x73 0x20 0x46
-
-# CHECK: floor.w.s $f6, $f7
-0x8f 0x39 0x00 0x46
-
-# CHECK: j 1328
-0x4c 0x01 0x00 0x08
-
-# CHECK: jal 1328
-0x4c 0x01 0x00 0x0c
-
-# CHECK: jalx 1328
-0x4c 0x01 0x00 0x74
-
-# CHECK: jalr $7
-0x09 0xf8 0xe0 0x00
-
-# CHECK: jr $7
-0x08 0x00 0xe0 0x00
-
-# CHECK: lb $4, 9158($5)
-0xc6 0x23 0xa4 0x80
-
-# CHECK: lbu $4, 6($5)
-0x06 0x00 0xa4 0x90
-
-# CHECK: ldc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xd4
-
-# CHECK: lh $4, 12($5)
-0x0c 0x00 0xa4 0x84
-
-# CHECK: lh $4, 12($5)
-0x0c 0x00 0xa4 0x84
-
-# CHECK: ll $9, 9158($7)
-0xc6 0x23 0xe9 0xc0
-
-# CHECK: lui $6, 17767
-0x67 0x45 0x06 0x3c
-
-# CHECK: lw $4, 24($5)
-0x18 0x00 0xa4 0x8c
-
-# CHECK: lwc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xc4
-
-# CHECK: lwl $2, 3($4)
-0x03 0x00 0x82 0x88
-
-# CHECK: lwr $3, 16($5)
-0x10 0x00 0xa3 0x98
-
-# CHECK: madd $6, $7
-0x00 0x00 0xc7 0x70
-
-# CHECK: maddu $6, $7
-0x01 0x00 0xc7 0x70
-
-# CHECK: mfc0 $8, $16, 4
-0x04 0x80 0x08 0x40
-
-# CHECK: mfc1 $6, $f7
-0x00 0x38 0x06 0x44
-
-# CHECK: mfhi $5
-0x10 0x28 0x00 0x00
-
-# CHECK: mflo $5
-0x12 0x28 0x00 0x00
-
-# CHECK: mov.d $f6, $f8
-0x86 0x41 0x20 0x46
-
-# CHECK: mov.s $f6, $f7
-0x86 0x39 0x00 0x46
-
-# CHECK: move $7, $8
-0x21,0x38,0x00,0x01
-
-# CHECK: move $3, $2
-0x25,0x18,0x40,0x00
-
-# CHECK: movf $3, $2, $fcc7
-0x01,0x18,0x5c,0x00
-
-# CHECK: movf.d $f4, $f2, $fcc7
-0x11,0x11,0x3c,0x46
-
-# CHECK: movf.s $f4, $f2, $fcc7
-0x11,0x11,0x1c,0x46
-
-# CHECK: movt $3, $2, $fcc7
-0x01,0x18,0x5d,0x00
-
-# CHECK: movt.d $f4, $f2, $fcc7
-0x11,0x11,0x3d,0x46
-
-# CHECK: movt.s $f4, $f2, $fcc7
-0x11,0x11,0x1d,0x46
-
-# CHECK: msub $6, $7
-0x04 0x00 0xc7 0x70
-
-# CHECK: msubu $6, $7
-0x05 0x00 0xc7 0x70
-
-# CHECK: mtc0 $9, $15, 1
-0x01 0x78 0x89 0x40
-
-# CHECK: mtc1 $6, $f7
-0x00 0x38 0x86 0x44
-
-# CHECK: mthi $7
-0x11 0x00 0xe0 0x00
-
-# CHECK: mtlo $7
-0x13 0x00 0xe0 0x00
-
-# CHECK: mul.d $f8, $f12, $f14
-0x02 0x62 0x2e 0x46
-
-# CHECK: mul.s $f9, $f6, $f7
-0x42 0x32 0x07 0x46
-
-# CHECK: mul $9, $6, $7
-0x02 0x48 0xc7 0x70
-
-# CHECK: mult $3, $5
-0x18 0x00 0x65 0x00
-
-# CHECK: multu $3, $5
-0x19 0x00 0x65 0x00
-
-# CHECK: neg.d $f12, $f14
-0x07 0x73 0x20 0x46
-
-# CHECK: neg.s $f6, $f7
-0x87 0x39 0x00 0x46
-
-# CHECK: nop
-0x00 0x00 0x00 0x00
-
-# CHECK: nor $9, $6, $7
-0x27 0x48 0xc7 0x00
-
-# CHECK: or $3, $3, $5
-0x25 0x18 0x65 0x00
-
-# CHECK: ori $9, $6, 17767
-0x67 0x45 0xc9 0x34
-
-# CHECK: round.w.d $f12, $f14
-0x0c 0x73 0x20 0x46
-
-# CHECK: round.w.s $f6, $f7
-0x8c 0x39 0x00 0x46
-
-# CHECK: sb $4, 9158($5)
-0xc6 0x23 0xa4 0xa0
-
-# CHECK: sb $4, 6($5)
-0x06 0x00 0xa4 0xa0
-
-# CHECK: sc $9, 9158($7)
-0xc6 0x23 0xe9 0xe0
-
-# CHECK: sdc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xf4
-
-# CHECK: sh $4, 9158($5)
-0xc6 0x23 0xa4 0xa4
-
-# CHECK: sll $4, $3, 7
-0xc0 0x21 0x03 0x00
-
-# CHECK: sllv $2, $3, $5
-0x04 0x10 0xa3 0x00
-
-# CHECK: slt $3, $3, $5
-0x2a 0x18 0x65 0x00
-
-# CHECK: slti $3, $3, 103
-0x67 0x00 0x63 0x28
-
-# CHECK: sltiu $3, $3, 103
-0x67 0x00 0x63 0x2c
-
-# CHECK: sltu $3, $3, $5
-0x2b 0x18 0x65 0x00
-
-# CHECK: sqrt.d $f12, $f14
-0x04 0x73 0x20 0x46
-
-# CHECK: sqrt.s $f6, $f7
-0x84 0x39 0x00 0x46
-
-# CHECK: sra $4, $3, 7
-0xc3 0x21 0x03 0x00
-
-# CHECK: srav $2, $3, $5
-0x07 0x10 0xa3 0x00
-
-# CHECK: srl $4, $3, 7
-0xc2 0x21 0x03 0x00
-
-# CHECK: srlv $2, $3, $5
-0x06 0x10 0xa3 0x00
-
-# CHECK: sub.d $f8, $f12, $f14
-0x01 0x62 0x2e 0x46
-
-# CHECK: sub.s $f9, $f6, $f7
-0x41 0x32 0x07 0x46
-
-# CHECK: sub $9, $6, $7
-0x22 0x48 0xc7 0x00
-
-# CHECK: subu $4, $3, $5
-0x23 0x20 0x65 0x00
-
-# CHECK: sw $4, 24($5)
-0x18 0x00 0xa4 0xac
-
-# CHECK: swc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xe4
-
-# CHECK: swl $4, 16($5)
-0x10 0x00 0xa4 0xa8
-
-# CHECK: swr $6, 16($7)
-0x10 0x00 0xe6 0xb8
-
-# CHECK: sync 7
-0xcf 0x01 0x00 0x00
-
-# CHECK: trunc.w.d $f12, $f14
-0x0d 0x73 0x20 0x46
-
-# CHECK: trunc.w.s $f6, $f7
-0x8d 0x39 0x00 0x46
-
-# CHECK: xor $3, $3, $5
-0x26 0x18 0x65 0x00
-
-# CHECK: xori $9, $6, 17767
-0x67 0x45 0xc9 0x38
-
-# CHECK: .set push
-# CHECK: .set mips32r2
-# CHECK: rdhwr $5, $29
-# CHECK: .set pop
-0x3b 0xe8 0x05 0x7c
diff --git a/test/MC/Disassembler/Mips/mips32r2/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips32r2/invalid-xfail.txt
new file mode 100644
index 000000000000..82503c05b718
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32r2/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32r2 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2-el.txt b/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2-el.txt
index c487b6d0e960..82a883557e87 100644
--- a/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2-el.txt
+++ b/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2-el.txt
@@ -102,6 +102,7 @@
0x60 0x98 0xf9 0x4f # CHECK: madd.s $f1, $f31, $f19, $f25
0x01 0x00 0xc7 0x70 # CHECK: maddu $6, $7
0x01 0x78 0x08 0x40 # CHECK: mfc0 $8, $15, 1
+0x04 0x80 0x08 0x40 # CHECK: mfc0 $8, $16, 4
0x00 0x38 0x06 0x44 # CHECK: mfc1 $6, $f7
0x10 0x28 0x00 0x00 # CHECK: mfhi $5
0x00 0xc0 0x7e 0x44 # CHECK: mfhc1 $fp, $f24
@@ -172,3 +173,4 @@
0xa0 0x30 0x07 0x7c # CHECK: wsbh $6, $7
0x26 0x18 0x65 0x00 # CHECK: xor $3, $3, $5
0x67 0x45 0xc9 0x38 # CHECK: xori $9, $6, 17767
+0x4c 0x1d 0x7f 0x06 # CHECK: synci 7500($19)
diff --git a/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt b/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt
index d01384752907..acce76bcfddd 100644
--- a/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt
+++ b/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt
@@ -3,13 +3,43 @@
# an effect on the disassembler behaviour.
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips32r2 | FileCheck %s
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
0x00 0x03 0x21 0xc2 # CHECK: srl $4, $3, 7
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x26 0x49 0xc2 # CHECK: rotr $9, $6, 7
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
+0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
+0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
0x00 0x65 0x00 0x19 # CHECK: multu $3, $5
0x00 0x65 0x18 0x25 # CHECK: or $3, $3, $5
@@ -17,25 +47,82 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
0x00 0xe6 0x48 0x46 # CHECK: rotrv $9, $6, $7
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
0x07 0xdf 0xe8 0x07 # CHECK: synci -6137($fp)
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -43,12 +130,28 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
0x40 0x08 0x78 0x01 # CHECK: mfc0 $8, $15, 1
0x40 0x08 0x80 0x04 # CHECK: mfc0 $8, $16, 4
@@ -57,16 +160,31 @@
0x41 0x60 0x60 0x20 # CHECK: ei
0x41 0x6e 0x60 0x20 # CHECK: ei $14
0x41 0x7e 0x60 0x00 # CHECK: di $fp
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x7e 0xc0 0x00 # CHECK: mfhc1 $fp, $f24
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
0x44 0xe0 0x80 0x00 # CHECK: mthc1 $zero, $f16
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
0x46 0x00 0x39 0x85 # CHECK: abs.s $f6, $f7
0x46 0x00 0x39 0x86 # CHECK: mov.s $f6, $f7
@@ -78,6 +196,17 @@
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
0x46 0x00 0x39 0xa5 # CHECK: cvt.l.s $f6, $f7
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -96,8 +225,17 @@
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
+0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
+0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -108,6 +246,14 @@
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
0x46 0x20 0x73 0x25 # CHECK: cvt.l.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -127,8 +273,19 @@
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
+0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
+0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
0x4c 0x52 0xf2 0xa9 # CHECK: msub.d $f10, $f2, $f30, $f18
0x4c 0xa6 0x00 0x05 # CHECK: luxc1 $f0, $6($5)
0x4c 0xac 0xc8 0x30 # CHECK: nmadd.s $f0, $f5, $f25, $f12
@@ -143,34 +300,72 @@
0x4f 0x04 0x98 0x78 # CHECK: nmsub.s $f1, $f24, $f19, $f4
0x4f 0x24 0x40 0x09 # CHECK: sdxc1 $f8, $4($25)
0x4f 0xf9 0x98 0x60 # CHECK: madd.s $f1, $f31, $f19, $f25
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
0x70 0xc7 0x00 0x01 # CHECK: maddu $6, $7
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
0x74 0x00 0x01 0x4c # CHECK: jalx 1328
+0x7c 0x05 0xe8 0x3b # CHECK: .set push
+ # CHECK: .set mips32r2
+ # CHECK: rdhwr $5, $29
+ # CHECK: .set pop
0x7c 0x07 0x30 0xa0 # CHECK: wsbh $6, $7
0x7c 0x07 0x34 0x20 # CHECK: seb $6, $7
0x7c 0x07 0x36 0x20 # CHECK: seh $6, $7
+0x7d 0x07 0x30 0x00 # CHECK: ext $7, $8, 0, 7
0x7d 0x33 0x61 0x84 # CHECK: ins $19, $9, 6, 7
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
+0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
+0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
+0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
+0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
diff --git a/test/MC/Disassembler/Mips/mips32r2/valid-xfail.txt b/test/MC/Disassembler/Mips/mips32r2/valid-xfail.txt
new file mode 100644
index 000000000000..c10faca4d32c
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32r2/valid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32r2 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips32r2_le.txt b/test/MC/Disassembler/Mips/mips32r2_le.txt
deleted file mode 100644
index faaed7cb3453..000000000000
--- a/test/MC/Disassembler/Mips/mips32r2_le.txt
+++ /dev/null
@@ -1,459 +0,0 @@
-# RUN: llvm-mc --disassemble %s -triple=mipsel-unknown-linux -mcpu=mips32r2 | FileCheck %s
-# CHECK: abs.d $f12, $f14
-0x05 0x73 0x20 0x46
-
-# CHECK: abs.s $f6, $f7
-0x85 0x39 0x00 0x46
-
-# CHECK: add $9, $6, $7
-0x20 0x48 0xc7 0x00
-
-# CHECK: add.d $f8, $f12, $f14
-0x00 0x62 0x2e 0x46
-
-# CHECK: add.s $f9, $f6, $f7
-0x40 0x32 0x07 0x46
-
-# CHECK: addi $9, $6, 17767
-0x67 0x45 0xc9 0x20
-
-# CHECK: addiu $9, $6, -15001
-0x67 0xc5 0xc9 0x24
-
-# CHECK: addu $9, $6, $7
-0x21 0x48 0xc7 0x00
-
-# CHECK: and $9, $6, $7
-0x24 0x48 0xc7 0x00
-
-# CHECK: andi $9, $6, 17767
-0x67 0x45 0xc9 0x30
-
-# CHECK: b 1332
-0x4c 0x01 0x00 0x10
-
-# CHECK: bc1f 1332
-0x4c 0x01 0x00 0x45
-
-# CHECK: bc1f $fcc7, 1332
-0x4c 0x01 0x1c 0x45
-
-# CHECK: bc1t 1332
-0x4c 0x01 0x01 0x45
-
-# CHECK: bc1t $fcc7, 1332
-0x4c 0x01 0x1d 0x45
-
-# CHECK: beq $9, $6, 1332
-0x4c 0x01 0x26 0x11
-
-# CHECK: bgez $6, 1332
-0x4c 0x01 0xc1 0x04
-
-# CHECK: bgezal $6, 1332
-0x4c 0x01 0xd1 0x04
-
-# CHECK: bgtz $6, 1332
-0x4c 0x01 0xc0 0x1c
-
-# CHECK: blez $6, 1332
-0x4c 0x01 0xc0 0x18
-
-# CHECK: bne $9, $6, 1332
-0x4c 0x01 0x26 0x15
-
-# CHECK: c.eq.d $f12, $f14
-0x32 0x60 0x2e 0x46
-
-# CHECK: c.eq.s $f6, $f7
-0x32 0x30 0x07 0x46
-
-# CHECK: c.f.d $f12, $f14
-0x30 0x60 0x2e 0x46
-
-# CHECK: c.f.s $f6, $f7
-0x30 0x30 0x07 0x46
-
-# CHECK: c.le.d $f12, $f14
-0x3e 0x60 0x2e 0x46
-
-# CHECK: c.le.s $f6, $f7
-0x3e 0x30 0x07 0x46
-
-# CHECK: c.lt.d $f12, $f14
-0x3c 0x60 0x2e 0x46
-
-# CHECK: c.lt.s $f6, $f7
-0x3c 0x30 0x07 0x46
-
-# CHECK: c.nge.d $f12, $f14
-0x3d 0x60 0x2e 0x46
-
-# CHECK: c.nge.s $f6, $f7
-0x3d 0x30 0x07 0x46
-
-# CHECK: c.ngl.d $f12, $f14
-0x3b 0x60 0x2e 0x46
-
-# CHECK: c.ngl.s $f6, $f7
-0x3b 0x30 0x07 0x46
-
-# CHECK: c.ngle.d $f12, $f14
-0x39 0x60 0x2e 0x46
-
-# CHECK: c.ngle.s $f6, $f7
-0x39 0x30 0x07 0x46
-
-# CHECK: c.ngt.d $f12, $f14
-0x3f 0x60 0x2e 0x46
-
-# CHECK: c.ngt.s $f6, $f7
-0x3f 0x30 0x07 0x46
-
-# CHECK: c.ole.d $f12, $f14
-0x36 0x60 0x2e 0x46
-
-# CHECK: c.ole.s $f6, $f7
-0x36 0x30 0x07 0x46
-
-# CHECK: c.olt.d $f12, $f14
-0x34 0x60 0x2e 0x46
-
-# CHECK: c.olt.s $f6, $f7
-0x34 0x30 0x07 0x46
-
-# CHECK: c.seq.d $f12, $f14
-0x3a 0x60 0x2e 0x46
-
-# CHECK: c.seq.s $f6, $f7
-0x3a 0x30 0x07 0x46
-
-# CHECK: c.sf.d $f12, $f14
-0x38 0x60 0x2e 0x46
-
-# CHECK: c.sf.s $f6, $f7
-0x38 0x30 0x07 0x46
-
-# CHECK: c.ueq.d $f12, $f14
-0x33 0x60 0x2e 0x46
-
-# CHECK: c.ueq.s $f28, $f18
-0x33 0xe0 0x12 0x46
-
-# CHECK: c.ule.d $f12, $f14
-0x37 0x60 0x2e 0x46
-
-# CHECK: c.ule.s $f6, $f7
-0x37 0x30 0x07 0x46
-
-# CHECK: c.ult.d $f12, $f14
-0x35 0x60 0x2e 0x46
-
-# CHECK: c.ult.s $f6, $f7
-0x35 0x30 0x07 0x46
-
-# CHECK: c.un.d $f12, $f14
-0x31 0x60 0x2e 0x46
-
-# CHECK: c.un.s $f6, $f7
-0x31 0x30 0x07 0x46
-
-# CHECK: ceil.w.d $f12, $f14
-0x0e 0x73 0x20 0x46
-
-# CHECK: ceil.w.s $f6, $f7
-0x8e 0x39 0x00 0x46
-
-# CHECK: cfc1 $6, $7
-0x00 0x38 0x46 0x44
-
-# CHECK: clo $6, $7
-0x21 0x30 0xe6 0x70
-
-# CHECK: clz $6, $7
-0x20 0x30 0xe6 0x70
-
-# CHECK: ctc1 $6, $7
-0x00 0x38 0xc6 0x44
-
-# CHECK: cvt.d.s $f6, $f7
-0xa1 0x39 0x00 0x46
-
-# CHECK: cvt.d.w $f12, $f14
-0x21 0x73 0x80 0x46
-
-# CHECK: cvt.l.d $f12, $f14
-0x25 0x73 0x20 0x46
-
-# CHECK: cvt.l.s $f6, $f7
-0xa5 0x39 0x00 0x46
-
-# CHECK: cvt.s.d $f12, $f14
-0x20 0x73 0x20 0x46
-
-# CHECK: cvt.s.w $f6, $f7
-0xa0 0x39 0x80 0x46
-
-# CHECK: cvt.w.d $f12, $f14
-0x24 0x73 0x20 0x46
-
-# CHECK: cvt.w.s $f6, $f7
-0xa4 0x39 0x00 0x46
-
-# CHECK: floor.w.d $f12, $f14
-0x0f 0x73 0x20 0x46
-
-# CHECK: floor.w.s $f6, $f7
-0x8f 0x39 0x00 0x46
-
-# CHECK: ins $19, $9, 6, 7
-0x84 0x61 0x33 0x7d
-
-# CHECK: j 1328
-0x4c 0x01 0x00 0x08
-
-# CHECK: jal 1328
-0x4c 0x01 0x00 0x0c
-
-# CHECK: jalx 1328
-0x4c 0x01 0x00 0x74
-
-# CHECK: jalr $7
-0x09 0xf8 0xe0 0x00
-
-# CHECK: jr $7
-0x08 0x00 0xe0 0x00
-
-# CHECK: lb $4, 9158($5)
-0xc6 0x23 0xa4 0x80
-
-# CHECK: lbu $4, 6($5)
-0x06 0x00 0xa4 0x90
-
-# CHECK: ldc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xd4
-
-# CHECK: lh $4, 12($5)
-0x0c 0x00 0xa4 0x84
-
-# CHECK: lh $4, 12($5)
-0x0c 0x00 0xa4 0x84
-
-# CHECK: ll $9, 9158($7)
-0xc6 0x23 0xe9 0xc0
-
-# CHECK: lui $6, 17767
-0x67 0x45 0x06 0x3c
-
-# CHECK: luxc1 $f0, $6($5)
-0x05 0x00 0xa6 0x4c
-
-# CHECK: lw $4, 24($5)
-0x18 0x00 0xa4 0x8c
-
-# CHECK: lwc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xc4
-
-# CHECK: lwl $2, 3($4)
-0x03 0x00 0x82 0x88
-
-# CHECK: lwr $3, 16($5)
-0x10 0x00 0xa3 0x98
-
-# CHECK: lwxc1 $f20, $12($14)
-0x00 0x05 0xcc 0x4d
-
-# CHECK: madd $6, $7
-0x00 0x00 0xc7 0x70
-
-# CHECK: maddu $6, $7
-0x01 0x00 0xc7 0x70
-
-# CHECK: mfc0 $8, $16, 4
-0x04 0x80 0x08 0x40
-
-# CHECK: mfc1 $6, $f7
-0x00 0x38 0x06 0x44
-
-# CHECK: mfhi $5
-0x10 0x28 0x00 0x00
-
-# CHECK: mflo $5
-0x12 0x28 0x00 0x00
-
-# CHECK: mov.d $f6, $f8
-0x86 0x41 0x20 0x46
-
-# CHECK: mov.s $f6, $f7
-0x86 0x39 0x00 0x46
-
-# CHECK: msub $6, $7
-0x04 0x00 0xc7 0x70
-
-# CHECK: msubu $6, $7
-0x05 0x00 0xc7 0x70
-
-# CHECK: mtc0 $9, $15, 1
-0x01 0x78 0x89 0x40
-
-# CHECK: mtc1 $6, $f7
-0x00 0x38 0x86 0x44
-
-# CHECK: mthi $7
-0x11 0x00 0xe0 0x00
-
-# CHECK: mtlo $7
-0x13 0x00 0xe0 0x00
-
-# CHECK: mul.d $f8, $f12, $f14
-0x02 0x62 0x2e 0x46
-
-# CHECK: mul.s $f9, $f6, $f7
-0x42 0x32 0x07 0x46
-
-# CHECK: mul $9, $6, $7
-0x02 0x48 0xc7 0x70
-
-# CHECK: mult $3, $5
-0x18 0x00 0x65 0x00
-
-# CHECK: multu $3, $5
-0x19 0x00 0x65 0x00
-
-# CHECK: neg.d $f12, $f14
-0x07 0x73 0x20 0x46
-
-# CHECK: neg.s $f6, $f7
-0x87 0x39 0x00 0x46
-
-# CHECK: nop
-0x00 0x00 0x00 0x00
-
-# CHECK: nor $9, $6, $7
-0x27 0x48 0xc7 0x00
-
-# CHECK: or $3, $3, $5
-0x25 0x18 0x65 0x00
-
-# CHECK: ori $9, $6, 17767
-0x67 0x45 0xc9 0x34
-
-# CHECK: rotr $9, $6, 7
-0xc2 0x49 0x26 0x00
-
-# CHECK: rotrv $9, $6, $7
-0x46 0x48 0xe6 0x00
-
-# CHECK: round.w.d $f12, $f14
-0x0c 0x73 0x20 0x46
-
-# CHECK: round.w.s $f6, $f7
-0x8c 0x39 0x00 0x46
-
-# CHECK: sb $4, 9158($5)
-0xc6 0x23 0xa4 0xa0
-
-# CHECK: sb $4, 6($5)
-0x06 0x00 0xa4 0xa0
-
-# CHECK: sc $9, 9158($7)
-0xc6 0x23 0xe9 0xe0
-
-# CHECK: sdc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xf4
-
-# CHECK: seb $6, $7
-0x20 0x34 0x07 0x7c
-
-# CHECK: seh $6, $7
-0x20 0x36 0x07 0x7c
-
-# CHECK: sh $4, 9158($5)
-0xc6 0x23 0xa4 0xa4
-
-# CHECK: sll $4, $3, 7
-0xc0 0x21 0x03 0x00
-
-# CHECK: sllv $2, $3, $5
-0x04 0x10 0xa3 0x00
-
-# CHECK: slt $3, $3, $5
-0x2a 0x18 0x65 0x00
-
-# CHECK: slti $3, $3, 103
-0x67 0x00 0x63 0x28
-
-# CHECK: sltiu $3, $3, 103
-0x67 0x00 0x63 0x2c
-
-# CHECK: sltu $3, $3, $5
-0x2b 0x18 0x65 0x00
-
-# CHECK: sqrt.d $f12, $f14
-0x04 0x73 0x20 0x46
-
-# CHECK: sqrt.s $f6, $f7
-0x84 0x39 0x00 0x46
-
-# CHECK: sra $4, $3, 7
-0xc3 0x21 0x03 0x00
-
-# CHECK: srav $2, $3, $5
-0x07 0x10 0xa3 0x00
-
-# CHECK: srl $4, $3, 7
-0xc2 0x21 0x03 0x00
-
-# CHECK: srlv $2, $3, $5
-0x06 0x10 0xa3 0x00
-
-# CHECK: sub.d $f8, $f12, $f14
-0x01 0x62 0x2e 0x46
-
-# CHECK: sub.s $f9, $f6, $f7
-0x41 0x32 0x07 0x46
-
-# CHECK: sub $9, $6, $7
-0x22 0x48 0xc7 0x00
-
-# CHECK: subu $4, $3, $5
-0x23 0x20 0x65 0x00
-
-# CHECK: suxc1 $f4, $24($5)
-0x0d 0x20 0xb8 0x4c
-
-# CHECK: sw $4, 24($5)
-0x18 0x00 0xa4 0xac
-
-# CHECK: swc1 $f9, 9158($7)
-0xc6 0x23 0xe9 0xe4
-
-# CHECK: swl $4, 16($5)
-0x10 0x00 0xa4 0xa8
-
-# CHECK: swr $6, 16($7)
-0x10 0x00 0xe6 0xb8
-
-# CHECK: swxc1 $f26, $18($22)
-0x08 0xd0 0xd2 0x4e
-
-# CHECK: sync 7
-0xcf 0x01 0x00 0x00
-
-# CHECK: trunc.w.d $f12, $f14
-0x0d 0x73 0x20 0x46
-
-# CHECK: trunc.w.s $f6, $f7
-0x8d 0x39 0x00 0x46
-
-# CHECK: wsbh $6, $7
-0xa0 0x30 0x07 0x7c
-
-# CHECK: xor $3, $3, $5
-0x26 0x18 0x65 0x00
-
-# CHECK: xori $9, $6, 17767
-0x67 0x45 0xc9 0x38
-
-# CHECK: synci 7500($19)
-0x4c 0x1d 0x7f 0x06
diff --git a/test/MC/Disassembler/Mips/mips32r3/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips32r3/invalid-xfail.txt
new file mode 100644
index 000000000000..0d259902d68d
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32r3/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32r3 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt b/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt
index cf9e98675d25..18dbd9ea7a40 100644
--- a/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt
+++ b/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt
@@ -1,12 +1,42 @@
# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r3 | FileCheck %s
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
0x00 0x03 0x21 0xc2 # CHECK: srl $4, $3, 7
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x26 0x49 0xc2 # CHECK: rotr $9, $6, 7
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
+0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
+0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
0x00 0x65 0x00 0x19 # CHECK: multu $3, $5
0x00 0x65 0x18 0x25 # CHECK: or $3, $3, $5
@@ -14,24 +44,82 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
0x00 0xe6 0x48 0x46 # CHECK: rotrv $9, $6, $7
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
+0x07 0xdf 0xe8 0x07 # CHECK: synci -6137($fp)
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -39,29 +127,61 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
0x40 0x08 0x78 0x01 # CHECK: mfc0 $8, $15, 1
+0x40 0x08 0x80 0x04 # CHECK: mfc0 $8, $16, 4
0x40 0x89 0x78 0x01 # CHECK: mtc0 $9, $15, 1
0x41 0x60 0x60 0x00 # CHECK: di
0x41 0x60 0x60 0x20 # CHECK: ei
0x41 0x6e 0x60 0x20 # CHECK: ei $14
0x41 0x7e 0x60 0x00 # CHECK: di $fp
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x7e 0xc0 0x00 # CHECK: mfhc1 $fp, $f24
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
0x44 0xe0 0x80 0x00 # CHECK: mthc1 $zero, $f16
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
0x46 0x00 0x39 0x85 # CHECK: abs.s $f6, $f7
0x46 0x00 0x39 0x86 # CHECK: mov.s $f6, $f7
@@ -73,6 +193,17 @@
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
0x46 0x00 0x39 0xa5 # CHECK: cvt.l.s $f6, $f7
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -91,8 +222,17 @@
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
+0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
+0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -103,6 +243,14 @@
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
0x46 0x20 0x73 0x25 # CHECK: cvt.l.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -122,8 +270,19 @@
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
+0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
+0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
0x4c 0x52 0xf2 0xa9 # CHECK: msub.d $f10, $f2, $f30, $f18
0x4c 0xa6 0x00 0x05 # CHECK: luxc1 $f0, $6($5)
0x4c 0xac 0xc8 0x30 # CHECK: nmadd.s $f0, $f5, $f25, $f12
@@ -138,34 +297,72 @@
0x4f 0x04 0x98 0x78 # CHECK: nmsub.s $f1, $f24, $f19, $f4
0x4f 0x24 0x40 0x09 # CHECK: sdxc1 $f8, $4($25)
0x4f 0xf9 0x98 0x60 # CHECK: madd.s $f1, $f31, $f19, $f25
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
0x70 0xc7 0x00 0x01 # CHECK: maddu $6, $7
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
0x74 0x00 0x01 0x4c # CHECK: jalx 1328
+0x7c 0x05 0xe8 0x3b # CHECK: .set push
+ # CHECK: .set mips32r2
+ # CHECK: rdhwr $5, $29
+ # CHECK: .set pop
0x7c 0x07 0x30 0xa0 # CHECK: wsbh $6, $7
0x7c 0x07 0x34 0x20 # CHECK: seb $6, $7
0x7c 0x07 0x36 0x20 # CHECK: seh $6, $7
+0x7d 0x07 0x30 0x00 # CHECK: ext $7, $8, 0, 7
0x7d 0x33 0x61 0x84 # CHECK: ins $19, $9, 6, 7
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
+0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
+0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
+0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
+0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
diff --git a/test/MC/Disassembler/Mips/mips32r3/valid-xfail.txt b/test/MC/Disassembler/Mips/mips32r3/valid-xfail.txt
new file mode 100644
index 000000000000..03836adaa31f
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32r3/valid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32r3 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips32r5/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips32r5/invalid-xfail.txt
new file mode 100644
index 000000000000..871e45f63f4c
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32r5/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32r5 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt b/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt
index 282f3a2b0544..8b553cfab2cc 100644
--- a/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt
+++ b/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt
@@ -1,12 +1,42 @@
# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r5 | FileCheck %s
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
0x00 0x03 0x21 0xc2 # CHECK: srl $4, $3, 7
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x26 0x49 0xc2 # CHECK: rotr $9, $6, 7
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
+0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
+0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
0x00 0x65 0x00 0x19 # CHECK: multu $3, $5
0x00 0x65 0x18 0x25 # CHECK: or $3, $3, $5
@@ -14,24 +44,82 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
0x00 0xe6 0x48 0x46 # CHECK: rotrv $9, $6, $7
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
+0x07 0xdf 0xe8 0x07 # CHECK: synci -6137($fp)
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -39,29 +127,61 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
0x40 0x08 0x78 0x01 # CHECK: mfc0 $8, $15, 1
+0x40 0x08 0x80 0x04 # CHECK: mfc0 $8, $16, 4
0x40 0x89 0x78 0x01 # CHECK: mtc0 $9, $15, 1
0x41 0x60 0x60 0x00 # CHECK: di
0x41 0x60 0x60 0x20 # CHECK: ei
0x41 0x6e 0x60 0x20 # CHECK: ei $14
0x41 0x7e 0x60 0x00 # CHECK: di $fp
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x7e 0xc0 0x00 # CHECK: mfhc1 $fp, $f24
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
0x44 0xe0 0x80 0x00 # CHECK: mthc1 $zero, $f16
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
0x46 0x00 0x39 0x85 # CHECK: abs.s $f6, $f7
0x46 0x00 0x39 0x86 # CHECK: mov.s $f6, $f7
@@ -73,6 +193,17 @@
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
0x46 0x00 0x39 0xa5 # CHECK: cvt.l.s $f6, $f7
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -88,11 +219,21 @@
0x46 0x07 0x30 0x3d # CHECK: c.nge.s $f6, $f7
0x46 0x07 0x30 0x3e # CHECK: c.le.s $f6, $f7
0x46 0x07 0x30 0x3f # CHECK: c.ngt.s $f6, $f7
+0x42 0x00 0x00 0x58 # CHECK: eretnc
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
+0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
+0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -103,6 +244,14 @@
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
0x46 0x20 0x73 0x25 # CHECK: cvt.l.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -122,8 +271,19 @@
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
+0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
+0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
0x4c 0x52 0xf2 0xa9 # CHECK: msub.d $f10, $f2, $f30, $f18
0x4c 0xa6 0x00 0x05 # CHECK: luxc1 $f0, $6($5)
0x4c 0xac 0xc8 0x30 # CHECK: nmadd.s $f0, $f5, $f25, $f12
@@ -138,34 +298,72 @@
0x4f 0x04 0x98 0x78 # CHECK: nmsub.s $f1, $f24, $f19, $f4
0x4f 0x24 0x40 0x09 # CHECK: sdxc1 $f8, $4($25)
0x4f 0xf9 0x98 0x60 # CHECK: madd.s $f1, $f31, $f19, $f25
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
0x70 0xc7 0x00 0x01 # CHECK: maddu $6, $7
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
0x74 0x00 0x01 0x4c # CHECK: jalx 1328
+0x7c 0x05 0xe8 0x3b # CHECK: .set push
+ # CHECK: .set mips32r2
+ # CHECK: rdhwr $5, $29
+ # CHECK: .set pop
0x7c 0x07 0x30 0xa0 # CHECK: wsbh $6, $7
0x7c 0x07 0x34 0x20 # CHECK: seb $6, $7
0x7c 0x07 0x36 0x20 # CHECK: seh $6, $7
+0x7d 0x07 0x30 0x00 # CHECK: ext $7, $8, 0, 7
0x7d 0x33 0x61 0x84 # CHECK: ins $19, $9, 6, 7
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
+0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
+0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
+0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
+0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
diff --git a/test/MC/Disassembler/Mips/mips32r5/valid-xfail.txt b/test/MC/Disassembler/Mips/mips32r5/valid-xfail.txt
new file mode 100644
index 000000000000..c99ec7159872
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips32r5/valid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips32r5 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt
index 94dc3a2645d9..4164988b2b8f 100644
--- a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt
+++ b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt
@@ -80,7 +80,7 @@
0x9b 0x10 0x64 0x00 # CHECK: divu $2, $3, $4
0x20 0x60 0x6e 0x41 # CHECK: ei $14
0x20 0x60 0x60 0x41 # CHECK: ei
-0xc5 0x10 0x64 0x00 # CHECK: lsa $2, $3, $4, 3
+0xc5 0x10 0x64 0x00 # CHECK: lsa $2, $3, $4, 4
0x43 0x00 0x48 0xec # CHECK: lwpc $2, 268
0x43 0x00 0x50 0xec # CHECK: lwupc $2, 268
0x01 0x78 0x08 0x40 # CHECK: mfc0 $8, $15, 1
diff --git a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt
index e1721b934835..6af02fc61b86 100644
--- a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt
+++ b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt
@@ -12,7 +12,7 @@
0x00 0x64 0x10 0x99 # CHECK: mulu $2, $3, $4
0x00 0x64 0x10 0x9a # CHECK: div $2, $3, $4
0x00 0x64 0x10 0x9b # CHECK: divu $2, $3, $4
-0x00 0x64 0x10 0xc5 # CHECK: lsa $2, $3, $4, 3
+0x00 0x64 0x10 0xc5 # CHECK: lsa $2, $3, $4, 4
0x00 0x64 0x10 0xd8 # CHECK: muh $2, $3, $4
0x00 0x64 0x10 0xd9 # CHECK: muhu $2, $3, $4
0x00 0x64 0x10 0xda # CHECK: mod $2, $3, $4
@@ -126,6 +126,7 @@
0x46 0xa4 0x18 0x8d # CHECK: cmp.sult.d $f2, $f3, $f4
0x46 0xa4 0x18 0x8e # CHECK: cmp.sle.d $f2, $f3, $f4
0x46 0xa4 0x18 0x8f # CHECK: cmp.sule.d $f2, $f3, $f4
+0x42 0x00 0x00 0x58 # CHECK: eretnc
# FIXME: The encode/decode functions are not inverses of each other.
# The immediate should be 8 but the disassembler currently emits 12
0x49 0x20 0x00 0x02 # CHECK: bc2eqz $0, 12
diff --git a/test/MC/Disassembler/Mips/mips4/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips4/invalid-xfail.txt
new file mode 100644
index 000000000000..6bef06228c10
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips4/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips4 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt b/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt
index 0c9e2f1b742f..1d1044d32055 100644
--- a/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt
+++ b/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt
@@ -126,6 +126,8 @@
0xd1 0x2d 0x18 0x46 # CHECK: movf.s $f23, $f5, $fcc6
0x21 0xf0 0x80 0x00 # CHECK: move $fp, $4
0x21 0xc8 0xc0 0x00 # CHECK: move $25, $6
+0x25 0xf0 0x80 0x00 # CHECK: move $fp, $4
+0x25 0xc8 0xc0 0x00 # CHECK: move $25, $6
0x0b 0x18 0x30 0x02 # CHECK: movn $3, $17, $16
0xd3 0xae 0x3a 0x46 # CHECK: movn.d $f27, $f21, $26
0x13 0x03 0x17 0x46 # CHECK: movn.s $f12, $f0, $23
diff --git a/test/MC/Disassembler/Mips/mips4/valid-mips4.txt b/test/MC/Disassembler/Mips/mips4/valid-mips4.txt
index 207f4087791d..5e8253dfef2d 100644
--- a/test/MC/Disassembler/Mips/mips4/valid-mips4.txt
+++ b/test/MC/Disassembler/Mips/mips4/valid-mips4.txt
@@ -1,12 +1,19 @@
# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips4 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x04 0xb8 # CHECK: dsll $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
0x00 0x00 0x88 0x12 # CHECK: mflo $17
0x00 0x00 0x98 0x10 # CHECK: mfhi $19
0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
@@ -21,6 +28,8 @@
0x00 0x06 0x9d 0xfe # CHECK: dsrl32 $19, $6, 23
0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
0x00 0x12 0xe2 0xbb # CHECK: dsra $gp, $18, 10
0x00 0x12 0xe2 0xbf # CHECK: dsra32 $gp, $18, 10
@@ -30,11 +39,14 @@
0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x1c 0xe2 0xbb # CHECK: dsra $gp, $gp, 10
0x00 0x1c 0xe2 0xbf # CHECK: dsra32 $gp, $gp, 10
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
0x00 0x3f 0x98 0x2c # CHECK: dadd $19, $1, $ra
0x00 0x3f 0x98 0x2d # CHECK: daddu $19, $1, $ra
0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x2d # CHECK: move $fp, $4
0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
@@ -44,6 +56,9 @@
0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
0x00 0xba 0x28 0x2f # CHECK: dsubu $5, $5, $26
0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
+0x00 0xc0 0xc8 0x2d # CHECK: move $25, $6
0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
@@ -60,6 +75,7 @@
0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
0x02 0x30 0x18 0x0b # CHECK: movn $3, $17, $16
0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
@@ -85,9 +101,11 @@
0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
0x04 0x11 0x14 0x9b # CHECK: bal 21104
0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
@@ -97,6 +115,9 @@
0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
@@ -110,7 +131,10 @@
0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
+0x3a 0x00 0x27 0x12 # CHECK: xori $zero, $16, 10002
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x42 0x00 0x00 0x01 # CHECK: tlbr
0x42 0x00 0x00 0x02 # CHECK: tlbwi
0x42 0x00 0x00 0x06 # CHECK: tlbwr
@@ -184,7 +208,10 @@
0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
0x46 0xa0 0x81 0x21 # CHECK: cvt.d.l $f4, $f16
0x46 0xa0 0xf3 0xe0 # CHECK: cvt.s.l $f15, $f30
+0x4c 0x20 0x01 0x01 # CHECK: ldxc1 $f4, $zero($1)
+0x4c 0x21 0x00 0x28 # CHECK: msub.s $f0, $f1, $f0, $f1
0x4d 0xca 0x58 0x09 # CHECK: sdxc1 $f11, $10($14)
+0x4e 0x20 0x3e 0xb9 # CHECK: nmsub.d $f26, $f17, $f7, $f0
0x4f 0x4c 0x98 0x08 # CHECK: swxc1 $f19, $12($26)
0x4f 0xd1 0x03 0x00 # CHECK: lwxc1 $f12, $17($fp)
0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
@@ -214,9 +241,11 @@
0xb5 0x8b 0xb0 0x39 # CHECK: sdr $11, -20423($12)
0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
0xbc 0xa1 0x00 0x08 # CHECK: cache 1, 8($5)
+0xbf 0x00 0xe2 0x1c # CHECK: cache 0, -7652($24)
0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
+0xcc 0x20 0x00 0x00 # CHECK: pref 0, 0($1)
0xcc 0xa1 0x00 0x08 # CHECK: pref 1, 8($5)
0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
diff --git a/test/MC/Disassembler/Mips/mips4/valid-xfail.txt b/test/MC/Disassembler/Mips/mips4/valid-xfail.txt
new file mode 100644
index 000000000000..159e7111d39a
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips4/valid-xfail.txt
@@ -0,0 +1,16 @@
+# RUN: llvm-mc %s -triple=mips-unknown-linux -disassemble -mcpu=mips4 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0x27 0xc7 0xf2 # CHECK: beql $1, $7, -57400
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0x53 0x2a 0x02 0x1e # CHECK: beql $25, $10, 2168
+0x53 0x80 0x21 0x73 # CHECK: beql $gp, $zero, 34252
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips64/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips64/invalid-xfail.txt
new file mode 100644
index 000000000000..bbc7ff43d468
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips64/valid-mips64-el.txt b/test/MC/Disassembler/Mips/mips64/valid-mips64-el.txt
index 2d52216fddaa..1cd7b0bcebab 100644
--- a/test/MC/Disassembler/Mips/mips64/valid-mips64-el.txt
+++ b/test/MC/Disassembler/Mips/mips64/valid-mips64-el.txt
@@ -148,6 +148,8 @@
0x00 0x38 0x06 0x44 # CHECK: mfc1 $6, $f7
0x10 0x28 0x00 0x00 # CHECK: mfhi $5
0x12 0x28 0x00 0x00 # CHECK: mflo $5
+0x25 0x78 0xe0 0x03 # CEHCK: move $15, $ra
+0x2d 0x78 0xe0 0x03 # CEHCK: move $15, $ra
0x86 0x41 0x20 0x46 # CHECK: mov.d $f6, $f8
0x86 0x39 0x00 0x46 # CHECK: mov.s $f6, $f7
0x04 0x00 0xc7 0x70 # CHECK: msub $6, $7
@@ -218,3 +220,31 @@
0x04 0x00 0x43 0xcc # CHECK: pref 3, 4($2)
0xc6 0x23 0xe9 0xe8 # CHECK: swc2 $9, 9158($7)
0xca 0x23 0xc8 0xc8 # CHECK: lwc2 $8, 9162($6)
+0xcd 0x7c 0x4b 0x67 # CHECK: daddiu $11, $26, 31949
+0x2d 0xd0 0x2b 0x00 # CHECK: daddu $26, $1, $11
+0x1e 0x00 0x56 0x03 # CHECK: ddiv $zero, $26, $22
+0x1f 0x00 0x38 0x01 # CHECK: ddivu $zero, $9, $24
+0x00 0x70 0x22 0x44 # CHECK: dmfc1 $2, $f14
+0x00 0x28 0xb7 0x44 # CHECK: dmtc1 $23, $f5
+0x1c 0x00 0x7a 0x01 # CHECK: dmult $11, $26
+0x1d 0x00 0xed 0x02 # CHECK: dmultu $23, $13
+0x78 0x1c 0x18 0x00 # CHECK: dsll $3, $24, 17
+0x14 0xe0 0x1b 0x03 # CHECK: dsllv $gp, $27, $24
+0xbb 0x0f 0x01 0x00 # CHECK: dsra $1, $1, 30
+0x17 0x08 0xc1 0x03 # CHECK: dsrav $1, $1, $fp
+0x3a 0x56 0x1c 0x00 # CHECK: dsrl $10, $gp, 24
+0x16 0xe0 0xea 0x02 # CHECK: dsrlv $gp, $10, $23
+0x2f 0xe0 0x78 0x03 # CHECK: dsubu $gp, $27, $24
+0xcd 0xc4 0x3b 0x8c # CHECK: lw $27, -15155($1)
+0x01 0x00 0x01 0x3c # CHECK: lui $1, 1
+0x2e 0xf9 0x63 0x9c # CHECK: lwu $3, -1746($3)
+0x01 0x00 0x1f 0x3c # CHECK: lui $ra, 1
+0xc9 0xc4 0x3a 0xac # CHECK: sw $26, -15159($1)
+0x76 0x0f 0x1a 0xdc # CHECK: ld $26, 3958($zero)
+0x67 0x45 0x06 0xfc # CHECK: sd $6, 17767($zero)
+0x05 0x00 0xa6 0x4c # CHECK: luxc1 $f0, $6($5)
+0x00 0x05 0xcc 0x4d # CHECK: lwxc1 $f20, $12($14)
+0x0d 0x20 0xb8 0x4c # CHECK: suxc1 $f4, $24($5)
+0x08 0xd0 0xd2 0x4e # CHECK: swxc1 $f26, $18($22)
+0x81 0x00 0x42 0x4d # CHECK: ldxc1 $f2, $2($10)
+0x09 0x40 0x24 0x4f # CHECK: sdxc1 $f8, $4($25)
diff --git a/test/MC/Disassembler/Mips/mips64/valid-mips64.txt b/test/MC/Disassembler/Mips/mips64/valid-mips64.txt
index 6cbf5d3206b0..2ba1ecdf5b8e 100644
--- a/test/MC/Disassembler/Mips/mips64/valid-mips64.txt
+++ b/test/MC/Disassembler/Mips/mips64/valid-mips64.txt
@@ -1,12 +1,31 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux | FileCheck %s
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
0x00 0x00 0x04 0xb8 # CHECK: dsll $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
0x00 0x01 0x0f 0xbb # CHECK: dsra $1, $1, 30
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x10 0x2e # CHECK: dneg $2, $3
0x00 0x03 0x10 0x2f # CHECK: dnegu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
@@ -14,18 +33,29 @@
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
0x00 0x06 0x9d 0xfa # CHECK: dsrl $19, $6, 23
0x00 0x06 0x9d 0xfe # CHECK: dsrl32 $19, $6, 23
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
0x00 0x12 0xe2 0xbb # CHECK: dsra $gp, $18, 10
0x00 0x12 0xe2 0xbf # CHECK: dsra32 $gp, $18, 10
0x00 0x13 0x9d 0xfa # CHECK: dsrl $19, $19, 23
0x00 0x13 0x9d 0xfe # CHECK: dsrl32 $19, $19, 23
0x00 0x14 0x04 0xb8 # CHECK: dsll $zero, $20, 18
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x18 0x1c 0x78 # CHECK: dsll $3, $24, 17
0x00 0x1c 0x56 0x3a # CHECK: dsrl $10, $gp, 24
0x00 0x1c 0xe2 0xbb # CHECK: dsra $gp, $gp, 10
0x00 0x1c 0xe2 0xbf # CHECK: dsra32 $gp, $gp, 10
0x00 0x2b 0xd0 0x2d # CHECK: daddu $26, $1, $11
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
0x00 0x3f 0x98 0x2c # CHECK: dadd $19, $1, $ra
0x00 0x3f 0x98 0x2d # CHECK: daddu $19, $1, $ra
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
+0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
+0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
0x00 0x65 0x00 0x19 # CHECK: multu $3, $5
0x00 0x65 0x18 0x25 # CHECK: or $3, $3, $5
@@ -33,43 +63,102 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
0x00 0xa6 0x00 0x1d # CHECK: dmultu $5, $6
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xba 0x28 0x2f # CHECK: dsubu $5, $5, $26
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
0x01 0x38 0x00 0x1f # CHECK: ddivu $zero, $9, $24
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
0x01 0x7a 0x00 0x1c # CHECK: dmult $11, $26
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
0x02 0x11 0x00 0x1f # CHECK: ddivu $zero, $16, $17
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
0x02 0xc8 0x38 0x2e # CHECK: dsub $7, $22, $8
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
0x02 0xe9 0x00 0x1c # CHECK: dmult $23, $9
0x02 0xea 0xe0 0x16 # CHECK: dsrlv $gp, $10, $23
0x02 0xed 0x00 0x1d # CHECK: dmultu $23, $13
0x03 0x1b 0xe0 0x14 # CHECK: dsllv $gp, $27, $24
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
0x03 0x53 0x00 0x1e # CHECK: ddiv $zero, $26, $19
0x03 0x56 0x00 0x1e # CHECK: ddiv $zero, $26, $22
0x03 0x78 0xe0 0x2f # CHECK: dsubu $gp, $27, $24
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
0x03 0xc1 0x08 0x17 # CHECK: dsrav $1, $1, $fp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x03 0xe0 0x78 0x25 # CHECK: move $15, $ra
+0x03 0xe0 0x78 0x2d # CHECK: move $15, $ra
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -77,12 +166,28 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x3c 0x01 0x00 0x01 # CHECK: lui $1, 1
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
0x3c 0x1f 0x00 0x01 # CHECK: lui $ra, 1
@@ -91,18 +196,33 @@
0x40 0x38 0x50 0x00 # CHECK: dmfc0 $24, $10, 0
0x40 0x89 0x78 0x01 # CHECK: mtc0 $9, $15, 1
0x40 0xa4 0x50 0x00 # CHECK: dmtc0 $4, $10, 0
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
0x44 0x22 0x70 0x00 # CHECK: dmfc1 $2, $f14
0x44 0x2c 0x68 0x00 # CHECK: dmfc1 $12, $f13
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xb0 0x70 0x00 # CHECK: dmtc1 $16, $f14
0x44 0xb7 0x28 0x00 # CHECK: dmtc1 $23, $f5
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x2b 0x0b # CHECK: floor.l.s $f12, $f5
0x46 0x00 0x2e 0x48 # CHECK: round.l.s $f25, $f5
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
@@ -115,8 +235,20 @@
0x46 0x00 0x39 0x8f # CHECK: floor.w.s $f6, $f7
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
+0x46 0x00 0x46 0xa5 # CHECK: cvt.l.s $f26, $f8
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
0x46 0x00 0x6c 0x8a # CHECK: ceil.l.s $f18, $f13
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
0x46 0x00 0xff 0x09 # CHECK: trunc.l.s $f28, $f31
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -135,11 +267,20 @@
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
+0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
+0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
0x46 0x20 0x0b 0x08 # CHECK: round.l.d $f12, $f1
0x46 0x20 0x18 0x4a # CHECK: ceil.l.d $f1, $f3
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x3e 0x8b # CHECK: floor.l.d $f26, $f7
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -149,7 +290,15 @@
0x46 0x20 0x73 0x0f # CHECK: floor.w.d $f12, $f14
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
0x46 0x20 0xbd 0xc9 # CHECK: trunc.l.d $f23, $f23
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -169,8 +318,27 @@
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
+0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
+0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
+0x48 0x20 0x50 0x00 # CHECK: dmfc2 $zero, $10, 0
+0x48 0xa4 0x50 0x00 # CHECK: dmtc2 $4, $10, 0
+0x4d 0x0c 0xe0 0x21 # CHECK: madd.d $f0, $f8, $f28, $f12
+0x4d 0xbb 0x0d 0xe0 # CHECK: madd.s $f23, $f13, $f1, $f27
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x46 0xa0 0x81 0x21 # CHECK: cvt.d.l $f4, $f16
0x46 0xa0 0xf3 0xe0 # CHECK: cvt.s.l $f15, $f30
0x4c 0xa6 0x00 0x05 # CHECK: luxc1 $f0, $6($5)
@@ -206,6 +374,7 @@
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xd2 0x90 0x25 # CHECK: dclo $18, $6
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
@@ -216,39 +385,63 @@
# CHECK: rdhwr $5, $29
# CHECK: .set pop
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
0x8c 0x3b 0xc4 0xcd # CHECK: lw $27, -15155($1)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
0x9c 0x63 0xf9 0x2e # CHECK: lwu $3, -1746($3)
0x9c 0x73 0xa1 0xea # CHECK: lwu $19, -24086($3)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
0xac 0x3a 0xc4 0xc9 # CHECK: sw $26, -15159($1)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb3 0xc7 0xae 0x1f # CHECK: sdl $7, -20961($fp)
0xb5 0x8b 0xb0 0x39 # CHECK: sdr $11, -20423($12)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd3 0xe0 0xc6 0x70 # CHECK: lld $zero, -14736($ra)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
0xd9 0x03 0x23 0xca # CHECK: ldc2 $3, 9162($8)
0xdc 0x1a 0x0f 0x76 # CHECK: ld $26, 3958($zero)
0xde 0x3d 0x90 0x1b # CHECK: ld $sp, -28645($17)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf3 0xaf 0xdf 0xcd # CHECK: scd $15, -8243($sp)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
0xf8 0xe9 0x23 0xc6 # CHECK: sdc2 $9, 9158($7)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
0xfc 0x06 0x45 0x67 # CHECK: sd $6, 17767($zero)
0xfd 0x4c 0x16 0xcb # CHECK: sd $12, 5835($10)
diff --git a/test/MC/Disassembler/Mips/mips64/valid-xfail.txt b/test/MC/Disassembler/Mips/mips64/valid-xfail.txt
new file mode 100644
index 000000000000..4cc762e87492
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64/valid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips64_le.txt b/test/MC/Disassembler/Mips/mips64_le.txt
deleted file mode 100644
index 0d3d2faf1312..000000000000
--- a/test/MC/Disassembler/Mips/mips64_le.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-# RUN: llvm-mc --disassemble %s -triple=mips64el-unknown-linux | FileCheck %s
-# CHECK: daddiu $11, $26, 31949
-0xcd 0x7c 0x4b 0x67
-
-# CHECK: daddu $26, $1, $11
-0x2d 0xd0 0x2b 0x00
-
-# CHECK: ddiv $zero, $26, $22
-0x1e 0x00 0x56 0x03
-
-# CHECK: ddivu $zero, $9, $24
-0x1f 0x00 0x38 0x01
-
-# CHECK: dmfc1 $2, $f14
-0x00 0x70 0x22 0x44
-
-# CHECK: dmtc1 $23, $f5
-0x00 0x28 0xb7 0x44
-
-# CHECK: dmult $11, $26
-0x1c 0x00 0x7a 0x01
-
-# CHECK: dmultu $23, $13
-0x1d 0x00 0xed 0x02
-
-# CHECK: dsll $3, $24, 17
-0x78 0x1c 0x18 0x00
-
-# CHECK: dsllv $gp, $27, $24
-0x14 0xe0 0x1b 0x03
-
-# CHECK: dsra $1, $1, 30
-0xbb 0x0f 0x01 0x00
-
-# CHECK: dsrav $1, $1, $fp
-0x17 0x08 0xc1 0x03
-
-# CHECK: dsrl $10, $gp, 24
-0x3a 0x56 0x1c 0x00
-
-# CHECK: dsrlv $gp, $10, $23
-0x16 0xe0 0xea 0x02
-
-# CHECK: dsubu $gp, $27, $24
-0x2f 0xe0 0x78 0x03
-
-# CHECK: lw $27, -15155($1)
-0xcd 0xc4 0x3b 0x8c
-
-# CHECK: lui $1, 1
-0x01 0x00 0x01 0x3c
-
-# CHECK: lwu $3, -1746($3)
-0x2e 0xf9 0x63 0x9c
-
-# CHECK: lui $ra, 1
-0x01 0x00 0x1f 0x3c
-
-# CHECK: sw $26, -15159($1)
-0xc9 0xc4 0x3a 0xac
-
-# CHECK: ld $26, 3958($zero)
-0x76 0x0f 0x1a 0xdc
-
-# CHECK: sd $6, 17767($zero)
-0x67 0x45 0x06 0xfc
-
-# CHECK: luxc1 $f0, $6($5)
-0x05 0x00 0xa6 0x4c
-
-# CHECK: lwxc1 $f20, $12($14)
-0x00 0x05 0xcc 0x4d
-
-# CHECK: suxc1 $f4, $24($5)
-0x0d 0x20 0xb8 0x4c
-
-# CHECK: swxc1 $f26, $18($22)
-0x08 0xd0 0xd2 0x4e
-
-# CHECK: ldxc1 $f2, $2($10)
-0x81 0x00 0x42 0x4d
-
-# CHECK: sdxc1 $f8, $4($25)
-0x09 0x40 0x24 0x4f
diff --git a/test/MC/Disassembler/Mips/mips64r2/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips64r2/invalid-xfail.txt
new file mode 100644
index 000000000000..9a320be22b40
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64r2/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64r2 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2-el.txt b/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2-el.txt
index 2c6859f27faa..3f2b7615eb31 100644
--- a/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2-el.txt
+++ b/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2-el.txt
@@ -168,6 +168,8 @@
0x10 0x28 0x00 0x00 # CHECK: mfhi $5
0x00 0xc0 0x7e 0x44 # CHECK: mfhc1 $fp, $f24
0x12 0x28 0x00 0x00 # CHECK: mflo $5
+0x25 0x78 0xe0 0x03 # CHECK: move $15, $ra
+0x2d 0x78 0xe0 0x03 # CHECK: move $15, $ra
0x86 0x41 0x20 0x46 # CHECK: mov.d $f6, $f8
0x86 0x39 0x00 0x46 # CHECK: mov.s $f6, $f7
0x04 0x00 0xc7 0x70 # CHECK: msub $6, $7
@@ -239,3 +241,33 @@
0xa0 0x30 0x07 0x7c # CHECK: wsbh $6, $7
0x26 0x18 0x65 0x00 # CHECK: xor $3, $3, $5
0x67 0x45 0xc9 0x38 # CHECK: xori $9, $6, 17767
+0xcd 0x7c 0x4b 0x67 # CHECK: daddiu $11, $26, 31949
+0x2d 0xd0 0x2b 0x00 # CHECK: daddu $26, $1, $11
+0x1e 0x00 0x56 0x03 # CHECK: ddiv $zero, $26, $22
+0x1f 0x00 0x38 0x01 # CHECK: ddivu $zero, $9, $24
+0x00 0x70 0x22 0x44 # CHECK: dmfc1 $2, $f14
+0x00 0x28 0xb7 0x44 # CHECK: dmtc1 $23, $f5
+0x1c 0x00 0x7a 0x01 # CHECK: dmult $11, $26
+0x1d 0x00 0xed 0x02 # CHECK: dmultu $23, $13
+0x78 0x1c 0x18 0x00 # CHECK: dsll $3, $24, 17
+0x14 0xe0 0x1b 0x03 # CHECK: dsllv $gp, $27, $24
+0xbb 0x0f 0x01 0x00 # CHECK: dsra $1, $1, 30
+0x17 0x08 0xc1 0x03 # CHECK: dsrav $1, $1, $fp
+0x3a 0x56 0x1c 0x00 # CHECK: dsrl $10, $gp, 24
+0x16 0xe0 0xea 0x02 # CHECK: dsrlv $gp, $10, $23
+0x2f 0xe0 0x78 0x03 # CHECK: dsubu $gp, $27, $24
+0xcd 0xc4 0x3b 0x8c # CHECK: lw $27, -15155($1)
+0x01 0x00 0x01 0x3c # CHECK: lui $1, 1
+0x2e 0xf9 0x63 0x9c # CHECK: lwu $3, -1746($3)
+0x01 0x00 0x1f 0x3c # CHECK: lui $ra, 1
+0xc9 0xc4 0x3a 0xac # CHECK: sw $26, -15159($1)
+0x76 0x0f 0x1a 0xdc # CHECK: ld $26, 3958($zero)
+0x67 0x45 0x06 0xfc # CHECK: sd $6, 17767($zero)
+0x25 0x48 0x09 0x73 # CHECK: dclo $9, $24
+0x24 0xd0 0x3a 0x71 # CHECK: dclz $26, $9
+0x43 0xf7 0x87 0x7f # CHECK: dext $7, $gp, 29, 31
+0xc7 0x7b 0x94 0x7f # CHECK: dins $20, $gp, 15, 1
+0xa4 0x38 0x1c 0x7c # CHECK: dsbh $7, $gp
+0x64 0x19 0x0e 0x7c # CHECK: dshd $3, $14
+0xba 0xa1 0x3b 0x00 # CHECK: drotr $20, $27, 6
+0x56 0xc0 0xb7 0x00 # CHECK: drotrv $24, $23, $5
diff --git a/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt b/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt
index 0c6e10ee37ce..ac9d2b808622 100644
--- a/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt
+++ b/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt
@@ -4,13 +4,32 @@
# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips64r2 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
0x00 0x00 0x04 0xb8 # CHECK: dsll $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
0x00 0x01 0x0f 0xbb # CHECK: dsra $1, $1, 30
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x10 0x2e # CHECK: dneg $2, $3
0x00 0x03 0x10 0x2f # CHECK: dnegu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
@@ -18,11 +37,17 @@
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
0x00 0x06 0x9d 0xfa # CHECK: dsrl $19, $6, 23
0x00 0x06 0x9d 0xfe # CHECK: dsrl32 $19, $6, 23
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
0x00 0x12 0xe2 0xbb # CHECK: dsra $gp, $18, 10
0x00 0x12 0xe2 0xbf # CHECK: dsra32 $gp, $18, 10
0x00 0x13 0x9d 0xfa # CHECK: dsrl $19, $19, 23
0x00 0x13 0x9d 0xfe # CHECK: dsrl32 $19, $19, 23
0x00 0x14 0x04 0xb8 # CHECK: dsll $zero, $20, 18
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
0x00 0x18 0x1c 0x78 # CHECK: dsll $3, $24, 17
0x00 0x1c 0x56 0x3a # CHECK: dsrl $10, $gp, 24
0x00 0x1c 0xe2 0xbb # CHECK: dsra $gp, $gp, 10
@@ -33,9 +58,14 @@
0x00 0x2b 0xd0 0x2d # CHECK: daddu $26, $1, $11
0x00 0x2e 0x0b 0xfa # CHECK: drotr $1, $14, 15
0x00 0x2e 0x0b 0xfe # CHECK: drotr32 $1, $14, 15
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
0x00 0x3b 0xa1 0xba # CHECK: drotr $20, $27, 6
0x00 0x3f 0x98 0x2c # CHECK: dadd $19, $1, $ra
0x00 0x3f 0x98 0x2d # CHECK: daddu $19, $1, $ra
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
+0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
+0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
0x00 0x65 0x00 0x19 # CHECK: multu $3, $5
0x00 0x65 0x18 0x25 # CHECK: or $3, $3, $5
@@ -43,46 +73,106 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
0x00 0xa6 0x00 0x1d # CHECK: dmultu $5, $6
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
0x00 0xb7 0xc0 0x56 # CHECK: drotrv $24, $23, $5
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xba 0x28 0x2f # CHECK: dsubu $5, $5, $26
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
0x00 0xe6 0x48 0x46 # CHECK: rotrv $9, $6, $7
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
0x01 0x38 0x00 0x1f # CHECK: ddivu $zero, $9, $24
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
0x01 0x7a 0x00 0x1c # CHECK: dmult $11, $26
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
0x01 0xee 0x08 0x56 # CHECK: drotrv $1, $14, $15
0x02 0x11 0x00 0x1f # CHECK: ddivu $zero, $16, $17
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
0x02 0xc8 0x38 0x2e # CHECK: dsub $7, $22, $8
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
0x02 0xe9 0x00 0x1c # CHECK: dmult $23, $9
0x02 0xea 0xe0 0x16 # CHECK: dsrlv $gp, $10, $23
0x02 0xed 0x00 0x1d # CHECK: dmultu $23, $13
0x03 0x1b 0xe0 0x14 # CHECK: dsllv $gp, $27, $24
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
0x03 0x53 0x00 0x1e # CHECK: ddiv $zero, $26, $19
0x03 0x56 0x00 0x1e # CHECK: ddiv $zero, $26, $22
0x03 0x78 0xe0 0x2f # CHECK: dsubu $gp, $27, $24
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
0x03 0xc1 0x08 0x17 # CHECK: dsrav $1, $1, $fp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x03 0xe0 0x78 0x25 # CHECK: move $15, $ra
+0x03 0xe0 0x78 0x2d # CHECK: move $15, $ra
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x7f 0x47 0xc0 # CHECK: synci 18368($3)
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -90,16 +180,33 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
0x3c 0x01 0x00 0x01 # CHECK: lui $1, 1
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
0x3c 0x1f 0x00 0x01 # CHECK: lui $ra, 1
0x40 0x08 0x78 0x01 # CHECK: mfc0 $8, $15, 1
+0x40 0x08 0x80 0x04 # CHECK: mfc0 $8, $16, 4
0x40 0x38 0x50 0x00 # CHECK: dmfc0 $24, $10, 0
0x40 0x89 0x78 0x01 # CHECK: mtc0 $9, $15, 1
0x40 0xa4 0x50 0x00 # CHECK: dmtc0 $4, $10, 0
@@ -107,20 +214,35 @@
0x41 0x60 0x60 0x20 # CHECK: ei
0x41 0x6e 0x60 0x20 # CHECK: ei $14
0x41 0x7e 0x60 0x00 # CHECK: di $fp
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
0x44 0x22 0x70 0x00 # CHECK: dmfc1 $2, $f14
0x44 0x2c 0x68 0x00 # CHECK: dmfc1 $12, $f13
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x7e 0xc0 0x00 # CHECK: mfhc1 $fp, $f24
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xb0 0x70 0x00 # CHECK: dmtc1 $16, $f14
0x44 0xb7 0x28 0x00 # CHECK: dmtc1 $23, $f5
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
0x44 0xe0 0x80 0x00 # CHECK: mthc1 $zero, $f16
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x2b 0x0b # CHECK: floor.l.s $f12, $f5
0x46 0x00 0x2e 0x48 # CHECK: round.l.s $f25, $f5
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
@@ -134,8 +256,20 @@
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
0x46 0x00 0x39 0xa5 # CHECK: cvt.l.s $f6, $f7
+0x46 0x00 0x46 0xa5 # CHECK: cvt.l.s $f26, $f8
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
0x46 0x00 0x6c 0x8a # CHECK: ceil.l.s $f18, $f13
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
0x46 0x00 0xff 0x09 # CHECK: trunc.l.s $f28, $f31
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -154,11 +288,20 @@
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
+0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
+0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
0x46 0x20 0x0b 0x08 # CHECK: round.l.d $f12, $f1
0x46 0x20 0x18 0x4a # CHECK: ceil.l.d $f1, $f3
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x3e 0x8b # CHECK: floor.l.d $f26, $f7
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -169,7 +312,15 @@
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
0x46 0x20 0x73 0x25 # CHECK: cvt.l.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
0x46 0x20 0xbd 0xc9 # CHECK: trunc.l.d $f23, $f23
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -189,19 +340,44 @@
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
+0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
+0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
+0x48 0x20 0x50 0x00 # CHECK: dmfc2 $zero, $10, 0
+0x48 0xa4 0x50 0x00 # CHECK: dmtc2 $4, $10, 0
+0x4d 0x0c 0xe0 0x21 # CHECK: madd.d $f0, $f8, $f28, $f12
+0x4d 0xbb 0x0d 0xe0 # CHECK: madd.s $f23, $f13, $f1, $f27
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x46 0xa0 0x81 0x21 # CHECK: cvt.d.l $f4, $f16
0x46 0xa0 0xf3 0xe0 # CHECK: cvt.s.l $f15, $f30
0x4c 0xa6 0x00 0x05 # CHECK: luxc1 $f0, $6($5)
0x4c 0xac 0xc8 0x30 # CHECK: nmadd.s $f0, $f5, $f25, $f12
0x4c 0xb8 0x20 0x0d # CHECK: suxc1 $f4, $24($5)
+0x4d 0x42 0x00 0x81 # CHECK: ldxc1 $f2, $2($10)
+0x4d 0xbb 0x60 0x0d # CHECK: suxc1 $f12, $27($13)
+0x4d 0xca 0x58 0x09 # CHECK: sdxc1 $f11, $10($14)
0x4d 0xcc 0x05 0x00 # CHECK: lwxc1 $f20, $12($14)
0x4d 0xf7 0x02 0x01 # CHECK: ldxc1 $f8, $23($15)
0x4e 0x70 0x53 0x28 # CHECK: msub.s $f12, $f19, $f10, $f16
+0x4e 0xb6 0x04 0xc5 # CHECK: luxc1 $f19, $22($21)
0x4e 0xd2 0xd0 0x08 # CHECK: swxc1 $f26, $18($22)
0x4f 0x04 0x98 0x78 # CHECK: nmsub.s $f1, $f24, $f19, $f4
0x4f 0x24 0x40 0x09 # CHECK: sdxc1 $f8, $4($25)
+0x4f 0x4c 0x98 0x08 # CHECK: swxc1 $f19, $12($26)
+0x4f 0xd1 0x03 0x00 # CHECK: lwxc1 $f12, $17($fp)
0x4f 0xf9 0x98 0x60 # CHECK: madd.s $f1, $f31, $f19, $f25
0x62 0x9d 0x6c 0x39 # CHECK: daddi $sp, $20, 27705
0x62 0x9d 0x93 0xc7 # CHECK: daddi $sp, $20, -27705
@@ -216,6 +392,7 @@
0x66 0x73 0x69 0x3f # CHECK: daddiu $19, $19, 26943
0x66 0xda 0xee 0x16 # CHECK: daddiu $26, $22, -4586
0x67 0x4b 0x7c 0xcd # CHECK: daddiu $11, $26, 31949
+0x67 0xbd 0xff 0xe0 # CHECK: daddiu $sp, $sp, -32
0x6b 0x18 0xef 0xb9 # CHECK: ldl $24, -4167($24)
0x6e 0x8e 0x89 0x6a # CHECK: ldr $14, -30358($20)
0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
@@ -223,6 +400,7 @@
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xd2 0x90 0x25 # CHECK: dclo $18, $6
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
@@ -230,6 +408,10 @@
0x73 0x09 0x48 0x25 # CHECK: dclo $9, $24
0x73 0x30 0x80 0x24 # CHECK: dclz $16, $25
0x74 0x00 0x01 0x4c # CHECK: jalx 1328
+0x7c 0x05 0xe8 0x3b # CHECK: .set push
+ # CHECK: .set mips32r2
+ # CHECK: rdhwr $5, $29
+ # CHECK: .set pop
0x7c 0x07 0x30 0xa0 # CHECK: wsbh $6, $7
0x7c 0x07 0x34 0x20 # CHECK: seb $6, $7
0x7c 0x07 0x36 0x20 # CHECK: seh $6, $7
@@ -241,33 +423,63 @@
0x7f 0x87 0xf7 0x43 # CHECK: dext $7, $gp, 29, 31
0x7f 0x94 0x7b 0xc7 # CHECK: dins $20, $gp, 15, 1
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
0x8c 0x3b 0xc4 0xcd # CHECK: lw $27, -15155($1)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
0x9c 0x63 0xf9 0x2e # CHECK: lwu $3, -1746($3)
0x9c 0x73 0xa1 0xea # CHECK: lwu $19, -24086($3)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
0xac 0x3a 0xc4 0xc9 # CHECK: sw $26, -15159($1)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb3 0xc7 0xae 0x1f # CHECK: sdl $7, -20961($fp)
0xb5 0x8b 0xb0 0x39 # CHECK: sdr $11, -20423($12)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
+0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
+0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
+0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd3 0xe0 0xc6 0x70 # CHECK: lld $zero, -14736($ra)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
+0xd9 0x03 0x23 0xca # CHECK: ldc2 $3, 9162($8)
0xdc 0x1a 0x0f 0x76 # CHECK: ld $26, 3958($zero)
0xde 0x3d 0x90 0x1b # CHECK: ld $sp, -28645($17)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
+0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf3 0xaf 0xdf 0xcd # CHECK: scd $15, -8243($sp)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
+0xf8 0xe9 0x23 0xc6 # CHECK: sdc2 $9, 9158($7)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
0xfc 0x06 0x45 0x67 # CHECK: sd $6, 17767($zero)
0xfd 0x4c 0x16 0xcb # CHECK: sd $12, 5835($10)
diff --git a/test/MC/Disassembler/Mips/mips64r2/valid-xfail.txt b/test/MC/Disassembler/Mips/mips64r2/valid-xfail.txt
new file mode 100644
index 000000000000..84d2c4728c7c
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64r2/valid-xfail.txt
@@ -0,0 +1,14 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64r2 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0x7c 0x48 0xc7 0x00 # CHECK: ext $8, $2, 28, 25
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips64r2_le.txt b/test/MC/Disassembler/Mips/mips64r2_le.txt
deleted file mode 100644
index 82e4d6ae1ce0..000000000000
--- a/test/MC/Disassembler/Mips/mips64r2_le.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-# RUN: llvm-mc --disassemble %s -triple=mips64el-unknown-linux -mattr +mips64r2 | FileCheck %s
-# CHECK: daddiu $11, $26, 31949
-0xcd 0x7c 0x4b 0x67
-
-# CHECK: daddu $26, $1, $11
-0x2d 0xd0 0x2b 0x00
-
-# CHECK: ddiv $zero, $26, $22
-0x1e 0x00 0x56 0x03
-
-# CHECK: ddivu $zero, $9, $24
-0x1f 0x00 0x38 0x01
-
-# CHECK: dmfc1 $2, $f14
-0x00 0x70 0x22 0x44
-
-# CHECK: dmtc1 $23, $f5
-0x00 0x28 0xb7 0x44
-
-# CHECK: dmult $11, $26
-0x1c 0x00 0x7a 0x01
-
-# CHECK: dmultu $23, $13
-0x1d 0x00 0xed 0x02
-
-# CHECK: dsll $3, $24, 17
-0x78 0x1c 0x18 0x00
-
-# CHECK: dsllv $gp, $27, $24
-0x14 0xe0 0x1b 0x03
-
-# CHECK: dsra $1, $1, 30
-0xbb 0x0f 0x01 0x00
-
-# CHECK: dsrav $1, $1, $fp
-0x17 0x08 0xc1 0x03
-
-# CHECK: dsrl $10, $gp, 24
-0x3a 0x56 0x1c 0x00
-
-# CHECK: dsrlv $gp, $10, $23
-0x16 0xe0 0xea 0x02
-
-# CHECK: dsubu $gp, $27, $24
-0x2f 0xe0 0x78 0x03
-
-# CHECK: lw $27, -15155($1)
-0xcd 0xc4 0x3b 0x8c
-
-# CHECK: lui $1, 1
-0x01 0x00 0x01 0x3c
-
-# CHECK: lwu $3, -1746($3)
-0x2e 0xf9 0x63 0x9c
-
-# CHECK: lui $ra, 1
-0x01 0x00 0x1f 0x3c
-
-# CHECK: sw $26, -15159($1)
-0xc9 0xc4 0x3a 0xac
-
-# CHECK: ld $26, 3958($zero)
-0x76 0x0f 0x1a 0xdc
-
-# CHECK: sd $6, 17767($zero)
-0x67 0x45 0x06 0xfc
-
-# CHECK: dclo $9, $24
-0x25 0x48 0x09 0x73
-
-# CHECK: dclz $26, $9
-0x24 0xd0 0x3a 0x71
-
-# CHECK: dext $7, $gp, 29, 31
-0x43 0xf7 0x87 0x7f
-
-# CHECK: dins $20, $gp, 15, 1
-0xc7 0x7b 0x94 0x7f
-
-# CHECK: dsbh $7, $gp
-0xa4 0x38 0x1c 0x7c
-
-# CHECK: dshd $3, $14
-0x64 0x19 0x0e 0x7c
-
-# CHECK: drotr $20, $27, 6
-0xba 0xa1 0x3b 0x00
-
-# CHECK: drotrv $24, $23, $5
-0x56 0xc0 0xb7 0x00
diff --git a/test/MC/Disassembler/Mips/mips64r3/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips64r3/invalid-xfail.txt
new file mode 100644
index 000000000000..d53830876ca3
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64r3/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64r3 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3-el.txt b/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3-el.txt
index 88e9c262a0ee..7d59ef6d3e03 100644
--- a/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3-el.txt
+++ b/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3-el.txt
@@ -165,6 +165,8 @@
0x10 0x28 0x00 0x00 # CHECK: mfhi $5
0x00 0xc0 0x7e 0x44 # CHECK: mfhc1 $fp, $f24
0x12 0x28 0x00 0x00 # CHECK: mflo $5
+0x25 0x78 0xe0 0x03 # CEHCK: move $15, $ra
+0x2d 0x78 0xe0 0x03 # CEHCK: move $15, $ra
0x86 0x41 0x20 0x46 # CHECK: mov.d $f6, $f8
0x86 0x39 0x00 0x46 # CHECK: mov.s $f6, $f7
0x04 0x00 0xc7 0x70 # CHECK: msub $6, $7
diff --git a/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt b/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt
index 82405f357bf4..31b9f66bce12 100644
--- a/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt
+++ b/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt
@@ -1,12 +1,32 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r3 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
0x00 0x00 0x04 0xb8 # CHECK: dsll $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
+0x00 0x01 0x0f 0xbb # CHECK: dsra $1, $1, 30
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x10 0x2e # CHECK: dneg $2, $3
0x00 0x03 0x10 0x2f # CHECK: dnegu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
@@ -14,20 +34,35 @@
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
0x00 0x06 0x9d 0xfa # CHECK: dsrl $19, $6, 23
0x00 0x06 0x9d 0xfe # CHECK: dsrl32 $19, $6, 23
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
0x00 0x12 0xe2 0xbb # CHECK: dsra $gp, $18, 10
0x00 0x12 0xe2 0xbf # CHECK: dsra32 $gp, $18, 10
0x00 0x13 0x9d 0xfa # CHECK: dsrl $19, $19, 23
0x00 0x13 0x9d 0xfe # CHECK: dsrl32 $19, $19, 23
0x00 0x14 0x04 0xb8 # CHECK: dsll $zero, $20, 18
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
+0x00 0x18 0x1c 0x78 # CHECK: dsll $3, $24, 17
+0x00 0x1c 0x56 0x3a # CHECK: dsrl $10, $gp, 24
0x00 0x1c 0xe2 0xbb # CHECK: dsra $gp, $gp, 10
0x00 0x1c 0xe2 0xbf # CHECK: dsra32 $gp, $gp, 10
0x00 0x21 0x0b 0xfa # CHECK: drotr $1, $1, 15
0x00 0x21 0x0b 0xfe # CHECK: drotr32 $1, $1, 15
0x00 0x26 0x49 0xc2 # CHECK: rotr $9, $6, 7
+0x00 0x2b 0xd0 0x2d # CHECK: daddu $26, $1, $11
0x00 0x2e 0x0b 0xfa # CHECK: drotr $1, $14, 15
0x00 0x2e 0x0b 0xfe # CHECK: drotr32 $1, $14, 15
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
+0x00 0x3b 0xa1 0xba # CHECK: drotr $20, $27, 6
0x00 0x3f 0x98 0x2c # CHECK: dadd $19, $1, $ra
0x00 0x3f 0x98 0x2d # CHECK: daddu $19, $1, $ra
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
+0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
+0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
0x00 0x65 0x00 0x19 # CHECK: multu $3, $5
0x00 0x65 0x18 0x25 # CHECK: or $3, $3, $5
@@ -35,37 +70,106 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
0x00 0xa6 0x00 0x1d # CHECK: dmultu $5, $6
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
+0x00 0xb7 0xc0 0x56 # CHECK: drotrv $24, $23, $5
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xba 0x28 0x2f # CHECK: dsubu $5, $5, $26
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
0x00 0xe6 0x48 0x46 # CHECK: rotrv $9, $6, $7
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
+0x01 0x38 0x00 0x1f # CHECK: ddivu $zero, $9, $24
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
+0x01 0x7a 0x00 0x1c # CHECK: dmult $11, $26
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
0x01 0xee 0x08 0x56 # CHECK: drotrv $1, $14, $15
0x02 0x11 0x00 0x1f # CHECK: ddivu $zero, $16, $17
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
0x02 0xc8 0x38 0x2e # CHECK: dsub $7, $22, $8
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
0x02 0xe9 0x00 0x1c # CHECK: dmult $23, $9
+0x02 0xea 0xe0 0x16 # CHECK: dsrlv $gp, $10, $23
+0x02 0xed 0x00 0x1d # CHECK: dmultu $23, $13
+0x03 0x1b 0xe0 0x14 # CHECK: dsllv $gp, $27, $24
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
0x03 0x53 0x00 0x1e # CHECK: ddiv $zero, $26, $19
+0x03 0x56 0x00 0x1e # CHECK: ddiv $zero, $26, $22
+0x03 0x78 0xe0 0x2f # CHECK: dsubu $gp, $27, $24
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xc1 0x08 0x17 # CHECK: dsrav $1, $1, $fp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x03 0xe0 0x78 0x25 # CHECK: move $15, $ra
+0x03 0xe0 0x78 0x2d # CHECK: move $15, $ra
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x7f 0x47 0xc0 # CHECK: synci 18368($3)
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -73,14 +177,34 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3a 0x00 0x3a 0x21 # CHECK: xori $zero, $16, 14881
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
+0x3c 0x01 0x00 0x01 # CHECK: lui $1, 1
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
+0x3c 0x1f 0x00 0x01 # CHECK: lui $ra, 1
0x40 0x08 0x78 0x01 # CHECK: mfc0 $8, $15, 1
+0x40 0x08 0x80 0x04 # CHECK: mfc0 $8, $16, 4
0x40 0x38 0x50 0x00 # CHECK: dmfc0 $24, $10, 0
0x40 0x89 0x78 0x01 # CHECK: mtc0 $9, $15, 1
0x40 0xa4 0x50 0x00 # CHECK: dmtc0 $4, $10, 0
@@ -88,18 +212,35 @@
0x41 0x60 0x60 0x20 # CHECK: ei
0x41 0x6e 0x60 0x20 # CHECK: ei $14
0x41 0x7e 0x60 0x00 # CHECK: di $fp
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
+0x44 0x22 0x70 0x00 # CHECK: dmfc1 $2, $f14
0x44 0x2c 0x68 0x00 # CHECK: dmfc1 $12, $f13
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x7e 0xc0 0x00 # CHECK: mfhc1 $fp, $f24
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xb0 0x70 0x00 # CHECK: dmtc1 $16, $f14
+0x44 0xb7 0x28 0x00 # CHECK: dmtc1 $23, $f5
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
0x44 0xe0 0x80 0x00 # CHECK: mthc1 $zero, $f16
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x2b 0x0b # CHECK: floor.l.s $f12, $f5
0x46 0x00 0x2e 0x48 # CHECK: round.l.s $f25, $f5
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
@@ -113,8 +254,20 @@
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
0x46 0x00 0x39 0xa5 # CHECK: cvt.l.s $f6, $f7
+0x46 0x00 0x46 0xa5 # CHECK: cvt.l.s $f26, $f8
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
0x46 0x00 0x6c 0x8a # CHECK: ceil.l.s $f18, $f13
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
0x46 0x00 0xff 0x09 # CHECK: trunc.l.s $f28, $f31
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -133,11 +286,20 @@
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
+0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
+0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
0x46 0x20 0x0b 0x08 # CHECK: round.l.d $f12, $f1
0x46 0x20 0x18 0x4a # CHECK: ceil.l.d $f1, $f3
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x3e 0x8b # CHECK: floor.l.d $f26, $f7
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -148,7 +310,15 @@
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
0x46 0x20 0x73 0x25 # CHECK: cvt.l.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
0x46 0x20 0xbd 0xc9 # CHECK: trunc.l.d $f23, $f23
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -168,19 +338,44 @@
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
+0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
+0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
+0x48 0x20 0x50 0x00 # CHECK: dmfc2 $zero, $10, 0
+0x48 0xa4 0x50 0x00 # CHECK: dmtc2 $4, $10, 0
+0x4d 0x0c 0xe0 0x21 # CHECK: madd.d $f0, $f8, $f28, $f12
+0x4d 0xbb 0x0d 0xe0 # CHECK: madd.s $f23, $f13, $f1, $f27
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x46 0xa0 0x81 0x21 # CHECK: cvt.d.l $f4, $f16
0x46 0xa0 0xf3 0xe0 # CHECK: cvt.s.l $f15, $f30
0x4c 0xa6 0x00 0x05 # CHECK: luxc1 $f0, $6($5)
0x4c 0xac 0xc8 0x30 # CHECK: nmadd.s $f0, $f5, $f25, $f12
0x4c 0xb8 0x20 0x0d # CHECK: suxc1 $f4, $24($5)
+0x4d 0x42 0x00 0x81 # CHECK: ldxc1 $f2, $2($10)
+0x4d 0xbb 0x60 0x0d # CHECK: suxc1 $f12, $27($13)
+0x4d 0xca 0x58 0x09 # CHECK: sdxc1 $f11, $10($14)
0x4d 0xcc 0x05 0x00 # CHECK: lwxc1 $f20, $12($14)
0x4d 0xf7 0x02 0x01 # CHECK: ldxc1 $f8, $23($15)
0x4e 0x70 0x53 0x28 # CHECK: msub.s $f12, $f19, $f10, $f16
+0x4e 0xb6 0x04 0xc5 # CHECK: luxc1 $f19, $22($21)
0x4e 0xd2 0xd0 0x08 # CHECK: swxc1 $f26, $18($22)
0x4f 0x04 0x98 0x78 # CHECK: nmsub.s $f1, $f24, $f19, $f4
0x4f 0x24 0x40 0x09 # CHECK: sdxc1 $f8, $4($25)
+0x4f 0x4c 0x98 0x08 # CHECK: swxc1 $f19, $12($26)
+0x4f 0xd1 0x03 0x00 # CHECK: lwxc1 $f12, $17($fp)
0x4f 0xf9 0x98 0x60 # CHECK: madd.s $f1, $f31, $f19, $f25
0x62 0x9d 0x6c 0x39 # CHECK: daddi $sp, $20, 27705
0x62 0x9d 0x93 0xc7 # CHECK: daddi $sp, $20, -27705
@@ -194,6 +389,8 @@
0x65 0xce 0x11 0xea # CHECK: daddiu $14, $14, 4586
0x66 0x73 0x69 0x3f # CHECK: daddiu $19, $19, 26943
0x66 0xda 0xee 0x16 # CHECK: daddiu $26, $22, -4586
+0x67 0x4b 0x7c 0xcd # CHECK: daddiu $11, $26, 31949
+0x67 0xbd 0xff 0xe0 # CHECK: daddiu $sp, $sp, -32
0x6b 0x18 0xef 0xb9 # CHECK: ldl $24, -4167($24)
0x6e 0x8e 0x89 0x6a # CHECK: ldr $14, -30358($20)
0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
@@ -201,40 +398,86 @@
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xd2 0x90 0x25 # CHECK: dclo $18, $6
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
+0x71 0x3a 0xd0 0x24 # CHECK: dclz $26, $9
+0x73 0x09 0x48 0x25 # CHECK: dclo $9, $24
0x73 0x30 0x80 0x24 # CHECK: dclz $16, $25
0x74 0x00 0x01 0x4c # CHECK: jalx 1328
+0x7c 0x05 0xe8 0x3b # CHECK: .set push
+ # CHECK: .set mips32r2
+ # CHECK: rdhwr $5, $29
+ # CHECK: .set pop
0x7c 0x07 0x30 0xa0 # CHECK: wsbh $6, $7
0x7c 0x07 0x34 0x20 # CHECK: seb $6, $7
0x7c 0x07 0x36 0x20 # CHECK: seh $6, $7
0x7c 0x0e 0x18 0xa4 # CHECK: dsbh $3, $14
+0x7c 0x0e 0x19 0x64 # CHECK: dshd $3, $14
+0x7c 0x1c 0x38 0xa4 # CHECK: dsbh $7, $gp
0x7c 0x1d 0x11 0x64 # CHECK: dshd $2, $sp
0x7d 0x33 0x61 0x84 # CHECK: ins $19, $9, 6, 7
+0x7f 0x87 0xf7 0x43 # CHECK: dext $7, $gp, 29, 31
+0x7f 0x94 0x7b 0xc7 # CHECK: dins $20, $gp, 15, 1
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
+0x8c 0x3b 0xc4 0xcd # CHECK: lw $27, -15155($1)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
+0x9c 0x63 0xf9 0x2e # CHECK: lwu $3, -1746($3)
0x9c 0x73 0xa1 0xea # CHECK: lwu $19, -24086($3)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
+0xac 0x3a 0xc4 0xc9 # CHECK: sw $26, -15159($1)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb3 0xc7 0xae 0x1f # CHECK: sdl $7, -20961($fp)
0xb5 0x8b 0xb0 0x39 # CHECK: sdr $11, -20423($12)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
+0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
+0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
+0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd3 0xe0 0xc6 0x70 # CHECK: lld $zero, -14736($ra)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
+0xd9 0x03 0x23 0xca # CHECK: ldc2 $3, 9162($8)
+0xdc 0x1a 0x0f 0x76 # CHECK: ld $26, 3958($zero)
0xde 0x3d 0x90 0x1b # CHECK: ld $sp, -28645($17)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
+0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf3 0xaf 0xdf 0xcd # CHECK: scd $15, -8243($sp)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
+0xf8 0xe9 0x23 0xc6 # CHECK: sdc2 $9, 9158($7)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
+0xfc 0x06 0x45 0x67 # CHECK: sd $6, 17767($zero)
0xfd 0x4c 0x16 0xcb # CHECK: sd $12, 5835($10)
diff --git a/test/MC/Disassembler/Mips/mips64r3/valid-xfail.txt b/test/MC/Disassembler/Mips/mips64r3/valid-xfail.txt
new file mode 100644
index 000000000000..4b85968a5370
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64r3/valid-xfail.txt
@@ -0,0 +1,14 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64r3 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0x7c 0x48 0xc7 0x00 # CHECK: ext $8, $2, 28, 25
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips64r5/invalid-xfail.txt b/test/MC/Disassembler/Mips/mips64r5/invalid-xfail.txt
new file mode 100644
index 000000000000..3ca183b2d31e
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64r5/invalid-xfail.txt
@@ -0,0 +1,13 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64r5 | FileCheck %s
+# XFAIL: *
+
+# Start with a valid instruction. Otherwise llvm-mc gives up immediately.
+0x00 0x00 0x00 0x00
+
+# CHECK: .text
+0x45 0x06 0x00 0x82 # bc1fl $fcc1, 520 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x07 0xd8 0x01 # bc1tl $fcc1, -40956 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x08 0x14 0x02 # bc1f $fcc2, 20488 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x45 0x09 0x01 0x01 # bc1t $fcc2, 1028 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x00 0x00 0x01 # mfc2 $zero, $0, 1 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
+0x48 0x86 0x00 0x04 # mtc2 $6, $0, 4 # CHECK: :[[@LINE]]:1: warning: invalid instruction encoding
diff --git a/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5-el.txt b/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5-el.txt
index bd709d228794..ee6ad1c71945 100644
--- a/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5-el.txt
+++ b/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5-el.txt
@@ -165,6 +165,8 @@
0x10 0x28 0x00 0x00 # CHECK: mfhi $5
0x00 0xc0 0x7e 0x44 # CHECK: mfhc1 $fp, $f24
0x12 0x28 0x00 0x00 # CHECK: mflo $5
+0x25 0x78 0xe0 0x03 # CEHCK: move $15, $ra
+0x2d 0x78 0xe0 0x03 # CEHCK: move $15, $ra
0x86 0x41 0x20 0x46 # CHECK: mov.d $f6, $f8
0x86 0x39 0x00 0x46 # CHECK: mov.s $f6, $f7
0x04 0x00 0xc7 0x70 # CHECK: msub $6, $7
diff --git a/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt b/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt
index 1b30144acab4..1fa0e629b375 100644
--- a/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt
+++ b/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt
@@ -1,12 +1,32 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r5 | FileCheck %s
# CHECK: .text
0x00 0x00 0x00 0x00 # CHECK: nop
+0x00 0x00 0x00 0x09 # CHECK: jr $zero
+0x00 0x00 0x00 0x0c # CHECK: syscall
+0x00 0x00 0x00 0x0d # CHECK: break
+0x00 0x00 0x00 0x0f # CHECK: sync
+0x00 0x00 0x00 0x20 # CHECK: add $zero, $zero, $zero
+0x00 0x00 0x00 0x40 # CHECK: ssnop
+0x00 0x00 0x00 0x80 # CHECK: sll $zero, $zero, 2
+0x00 0x00 0x00 0xc0 # CHECK: ehb
0x00 0x00 0x01 0xcf # CHECK: sync 7
0x00 0x00 0x04 0xb8 # CHECK: dsll $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
0x00 0x00 0x04 0xbc # CHECK: dsll32 $zero, $zero, 18
+0x00 0x00 0x28 0x09 # CHECK: jalr $5, $zero
0x00 0x00 0x28 0x10 # CHECK: mfhi $5
0x00 0x00 0x28 0x12 # CHECK: mflo $5
+0x00 0x00 0x3c 0x80 # CHECK: sll $7, $zero, 18
+0x00 0x00 0x72 0x0d # CHECK: break 0, 456
+0x00 0x00 0x88 0x12 # CHECK: mflo $17
+0x00 0x00 0x98 0x10 # CHECK: mfhi $19
+0x00 0x00 0xe8 0x10 # CHECK: mfhi $sp
+0x00 0x01 0x0f 0xbb # CHECK: dsra $1, $1, 30
+0x00 0x02 0x10 0x23 # CHECK: negu $2, $2
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x02 0x11 0xc2 # CHECK: srl $2, $2, 7
+0x00 0x03 0x00 0x34 # CHECK: teq $zero, $3
+0x00 0x03 0x10 0x23 # CHECK: negu $2, $3
0x00 0x03 0x10 0x2e # CHECK: dneg $2, $3
0x00 0x03 0x10 0x2f # CHECK: dnegu $2, $3
0x00 0x03 0x21 0xc0 # CHECK: sll $4, $3, 7
@@ -14,20 +34,35 @@
0x00 0x03 0x21 0xc3 # CHECK: sra $4, $3, 7
0x00 0x06 0x9d 0xfa # CHECK: dsrl $19, $6, 23
0x00 0x06 0x9d 0xfe # CHECK: dsrl32 $19, $6, 23
+0x00 0x07 0x38 0x27 # CHECK: nor $7, $zero, $7
+0x00 0x07 0x3c 0x80 # CHECK: sll $7, $7, 18
+0x00 0x08 0xe8 0x22 # CHECK: neg $sp, $8
+0x00 0x10 0x00 0x80 # CHECK: sll $zero, $16, 2
+0x00 0x11 0x8b 0xc3 # CHECK: sra $17, $17, 15
0x00 0x12 0xe2 0xbb # CHECK: dsra $gp, $18, 10
0x00 0x12 0xe2 0xbf # CHECK: dsra32 $gp, $18, 10
0x00 0x13 0x9d 0xfa # CHECK: dsrl $19, $19, 23
0x00 0x13 0x9d 0xfe # CHECK: dsrl32 $19, $19, 23
0x00 0x14 0x04 0xb8 # CHECK: dsll $zero, $20, 18
+0x00 0x17 0x8b 0xc3 # CHECK: sra $17, $23, 15
+0x00 0x18 0x1c 0x78 # CHECK: dsll $3, $24, 17
+0x00 0x1c 0x56 0x3a # CHECK: dsrl $10, $gp, 24
0x00 0x1c 0xe2 0xbb # CHECK: dsra $gp, $gp, 10
0x00 0x1c 0xe2 0xbf # CHECK: dsra32 $gp, $gp, 10
0x00 0x21 0x0b 0xfa # CHECK: drotr $1, $1, 15
0x00 0x21 0x0b 0xfe # CHECK: drotr32 $1, $1, 15
0x00 0x26 0x49 0xc2 # CHECK: rotr $9, $6, 7
+0x00 0x2b 0xd0 0x2d # CHECK: daddu $26, $1, $11
0x00 0x2e 0x0b 0xfa # CHECK: drotr $1, $14, 15
0x00 0x2e 0x0b 0xfe # CHECK: drotr32 $1, $14, 15
+0x00 0x3a 0x3a 0xcc # CHECK: syscall 59627
+0x00 0x3b 0xa1 0xba # CHECK: drotr $20, $27, 6
0x00 0x3f 0x98 0x2c # CHECK: dadd $19, $1, $ra
0x00 0x3f 0x98 0x2d # CHECK: daddu $19, $1, $ra
+0x00 0x4c 0xb8 0x24 # CHECK: and $23, $2, $12
+0x00 0x53 0x21 0x72 # CHECK: tlt $2, $19, 133
+0x00 0x5c 0x18 0x01 # CHECK: movf $3, $2, $fcc7
+0x00 0x5d 0x18 0x01 # CHECK: movt $3, $2, $fcc7
0x00 0x65 0x00 0x18 # CHECK: mult $3, $5
0x00 0x65 0x00 0x19 # CHECK: multu $3, $5
0x00 0x65 0x18 0x25 # CHECK: or $3, $3, $5
@@ -35,37 +70,106 @@
0x00 0x65 0x18 0x2a # CHECK: slt $3, $3, $5
0x00 0x65 0x18 0x2b # CHECK: sltu $3, $3, $5
0x00 0x65 0x20 0x23 # CHECK: subu $4, $3, $5
+0x00 0x80 0xf0 0x21 # CHECK: move $fp, $4
+0x00 0x80 0xf0 0x25 # CHECK: move $fp, $4
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
+0x00 0x86 0x48 0x21 # CHECK: addu $9, $4, $6
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x94 0xc8 0x06 # CHECK: srlv $25, $20, $4
+0x00 0x9e 0x90 0x26 # CHECK: xor $18, $4, $fp
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
0x00 0xa3 0x10 0x04 # CHECK: sllv $2, $3, $5
0x00 0xa3 0x10 0x06 # CHECK: srlv $2, $3, $5
0x00 0xa3 0x10 0x07 # CHECK: srav $2, $3, $5
0x00 0xa6 0x00 0x1d # CHECK: dmultu $5, $6
+0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
+0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
+0x00 0xb7 0xc0 0x56 # CHECK: drotrv $24, $23, $5
+0x00 0xc0 0xc8 0x21 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x25 # CHECK: move $25, $6
+0x00 0xc0 0xc8 0x27 # CHECK: not $25, $6
0x00 0xba 0x28 0x2f # CHECK: dsubu $5, $5, $26
0x00 0xc7 0x48 0x20 # CHECK: add $9, $6, $7
0x00 0xc7 0x48 0x21 # CHECK: addu $9, $6, $7
0x00 0xc7 0x48 0x22 # CHECK: sub $9, $6, $7
0x00 0xc7 0x48 0x24 # CHECK: and $9, $6, $7
0x00 0xc7 0x48 0x27 # CHECK: nor $9, $6, $7
+0x00 0xd1 0x00 0x36 # CHECK: tne $6, $17
0x00 0xe0 0x00 0x08 # CHECK: jr $7
0x00 0xe0 0x00 0x11 # CHECK: mthi $7
0x00 0xe0 0x00 0x13 # CHECK: mtlo $7
0x00 0xe0 0xf8 0x09 # CHECK: jalr $7
+0x00 0xe0 0xf8 0x0b # CHECK: movn $ra, $7, $zero
0x00 0xe6 0x48 0x46 # CHECK: rotrv $9, $6, $7
+0x00 0xe8 0xdd 0x76 # CHECK: tne $7, $8, 885
+0x00 0xea 0x00 0x30 # CHECK: tge $7, $10
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x20 0x38 0x04 # CHECK: sllv $7, $zero, $9
+0x01 0x32 0x00 0x19 # CHECK: multu $9, $18
+0x01 0x38 0x00 0x1f # CHECK: ddivu $zero, $9, $24
+0x01 0x70 0x00 0x33 # CHECK: tltu $11, $16
+0x01 0x7a 0x00 0x1c # CHECK: dmult $11, $26
+0x01 0x7b 0xb8 0x2a # CHECK: slt $23, $11, $27
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
0x01 0x94 0x00 0x14 # CHECK: dsllv $zero, $20, $12
+0x01 0xed 0x00 0x32 # CHECK: tlt $15, $13
0x01 0xee 0x08 0x56 # CHECK: drotrv $1, $14, $15
0x02 0x11 0x00 0x1f # CHECK: ddivu $zero, $16, $17
+0x02 0x1d 0x60 0x25 # CHECK: or $12, $16, $sp
+0x02 0x1d 0xfe 0x33 # CHECK: tltu $16, $sp, 1016
+0x02 0x20 0x00 0x11 # CHECK: mthi $17
+0x02 0x27 0x00 0x0d # CHECK: break 551
+0x02 0x45 0xb8 0x20 # CHECK: add $23, $18, $5
+0x02 0x6c 0xb0 0x22 # CHECK: sub $22, $19, $12
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x72 0xe0 0x17 # CHECK: dsrav $gp, $18, $19
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
0x02 0x86 0x98 0x16 # CHECK: dsrlv $19, $6, $20
+0x02 0x8e 0x5e 0xf1 # CHECK: tgeu $20, $14, 379
+0x02 0xab 0xa0 0x2b # CHECK: sltu $20, $21, $11
0x02 0xc8 0x38 0x2e # CHECK: dsub $7, $22, $8
+0x02 0xd6 0xe8 0x23 # CHECK: subu $sp, $22, $22
+0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
0x02 0xe9 0x00 0x1c # CHECK: dmult $23, $9
+0x02 0xea 0xe0 0x16 # CHECK: dsrlv $gp, $10, $23
+0x02 0xed 0x00 0x1d # CHECK: dmultu $23, $13
+0x03 0x1b 0xe0 0x14 # CHECK: dsllv $gp, $27, $24
+0x03 0x20 0x00 0x13 # CHECK: mtlo $25
+0x03 0x2b 0x00 0x1a # CHECK: div $zero, $25, $11
+0x03 0x2f 0x00 0x1b # CHECK: divu $zero, $25, $15
0x03 0x53 0x00 0x1e # CHECK: ddiv $zero, $26, $19
+0x03 0x56 0x00 0x1e # CHECK: ddiv $zero, $26, $22
+0x03 0x78 0xe0 0x2f # CHECK: dsubu $gp, $27, $24
+0x03 0x9a 0x00 0x19 # CHECK: multu $gp, $26
+0x03 0xa0 0x00 0x13 # CHECK: mtlo $sp
+0x03 0xa2 0x00 0x18 # CHECK: mult $sp, $2
+0x03 0xb4 0x00 0x18 # CHECK: mult $sp, $20
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xb7 0x88 0x07 # CHECK: srav $17, $23, $sp
+0x03 0xc1 0x08 0x17 # CHECK: dsrav $1, $1, $fp
+0x03 0xcd 0x23 0xcd # CHECK: break 973, 143
+0x03 0xe0 0x78 0x25 # CHECK: move $15, $ra
+0x03 0xe0 0x78 0x2d # CHECK: move $15, $ra
+0x04 0x11 0x14 0x9b # CHECK: bal 21104
+0x04 0x7f 0x47 0xc0 # CHECK: synci 18368($3)
+0x04 0x83 0xf9 0x4d # CHECK: bgezl $4, -6856
0x04 0xc1 0x01 0x4c # CHECK: bgez $6, 1332
+0x04 0xd0 0x14 0x9b # CHECK: bltzal $6, 21104
0x04 0xd1 0x01 0x4c # CHECK: bgezal $6, 1332
+0x04 0xd1 0x14 0x9b # CHECK: bgezal $6, 21104
+0x04 0xd2 0x00 0x7a # CHECK: bltzall $6, 492
+0x05 0x8e 0x8c 0x31 # CHECK: tnei $12, 35889
+0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x06 0x22 0xf6 0x45 # CHECK: bltzl $17, -9960
+0x06 0x28 0x13 0xa1 # CHECK: tgei $17, 5025
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, 48032
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, 36915
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
+0x09 0x33 0x00 0x2a # CHECK: j 80478376
+0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
0x0c 0x00 0x01 0x4c # CHECK: jal 1328
0x10 0x00 0x01 0x4c # CHECK: b 1332
0x11 0x26 0x01 0x4c # CHECK: beq $9, $6, 1332
@@ -73,14 +177,33 @@
0x18 0xc0 0x01 0x4c # CHECK: blez $6, 1332
0x1c 0xc0 0x01 0x4c # CHECK: bgtz $6, 1332
0x20 0xc9 0x45 0x67 # CHECK: addi $9, $6, 17767
+0x21 0x08 0xff 0xfe # CHECK: addi $8, $8, -2
+0x21 0x2d 0x66 0xd2 # CHECK: addi $13, $9, 26322
+0x21 0xad 0xe6 0x90 # CHECK: addi $13, $13, -6512
+0x21 0xc9 0x3b 0x48 # CHECK: addi $9, $14, 15176
+0x22 0x36 0x0c 0x36 # CHECK: addi $22, $17, 3126
+0x23 0x18 0xe3 0xe7 # CHECK: addi $24, $24, -7193
+0x24 0x00 0x8b 0x3f # CHECK: addiu $zero, $zero, -29889
+0x24 0x01 0x8b 0xb3 # CHECK: addiu $1, $zero, -29773
0x24 0xc9 0xc5 0x67 # CHECK: addiu $9, $6, -15001
+0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x28 0x63 0x00 0x67 # CHECK: slti $3, $3, 103
+0x29 0x51 0x25 0x11 # CHECK: slti $17, $10, 9489
0x2c 0x63 0x00 0x67 # CHECK: sltiu $3, $3, 103
+0x2f 0x38 0xc3 0x55 # CHECK: sltiu $24, $25, -15531
+0x2f 0x39 0xc3 0x55 # CHECK: sltiu $25, $25, -15531
+0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x30 0xc9 0x45 0x67 # CHECK: andi $9, $6, 17767
+0x34 0x42 0x00 0x00 # CHECK: ori $2, $2, 0
+0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
0x34 0xc9 0x45 0x67 # CHECK: ori $9, $6, 17767
0x38 0xc9 0x45 0x67 # CHECK: xori $9, $6, 17767
+0x3c 0x00 0x00 0x80 # CHECK: lui $zero, 128
+0x3c 0x01 0x00 0x01 # CHECK: lui $1, 1
0x3c 0x06 0x45 0x67 # CHECK: lui $6, 17767
+0x3c 0x1f 0x00 0x01 # CHECK: lui $ra, 1
0x40 0x08 0x78 0x01 # CHECK: mfc0 $8, $15, 1
+0x40 0x08 0x80 0x04 # CHECK: mfc0 $8, $16, 4
0x40 0x38 0x50 0x00 # CHECK: dmfc0 $24, $10, 0
0x40 0x89 0x78 0x01 # CHECK: mtc0 $9, $15, 1
0x40 0xa4 0x50 0x00 # CHECK: dmtc0 $4, $10, 0
@@ -88,18 +211,35 @@
0x41 0x60 0x60 0x20 # CHECK: ei
0x41 0x6e 0x60 0x20 # CHECK: ei $14
0x41 0x7e 0x60 0x00 # CHECK: di $fp
+0x42 0x00 0x00 0x01 # CHECK: tlbr
+0x42 0x00 0x00 0x02 # CHECK: tlbwi
+0x42 0x00 0x00 0x06 # CHECK: tlbwr
+0x42 0x00 0x00 0x08 # CHECK: tlbp
+0x42 0x00 0x00 0x18 # CHECK: eret
+0x42 0x00 0x00 0x20 # CHECK: wait
0x44 0x06 0x38 0x00 # CHECK: mfc1 $6, $f7
+0x44 0x07 0xd8 0x00 # CHECK: mfc1 $7, $f27
+0x44 0x22 0x70 0x00 # CHECK: dmfc1 $2, $f14
0x44 0x2c 0x68 0x00 # CHECK: dmfc1 $12, $f13
0x44 0x46 0x38 0x00 # CHECK: cfc1 $6, $7
+0x44 0x51 0xa8 0x00 # CHECK: cfc1 $17, $21
0x44 0x7e 0xc0 0x00 # CHECK: mfhc1 $fp, $f24
0x44 0x86 0x38 0x00 # CHECK: mtc1 $6, $f7
+0x44 0x9e 0x48 0x00 # CHECK: mtc1 $fp, $f9
0x44 0xb0 0x70 0x00 # CHECK: dmtc1 $16, $f14
+0x44 0xb7 0x28 0x00 # CHECK: dmtc1 $23, $f5
0x44 0xc6 0x38 0x00 # CHECK: ctc1 $6, $7
+0x44 0xc6 0xd0 0x00 # CHECK: ctc1 $6, $26
0x44 0xe0 0x80 0x00 # CHECK: mthc1 $zero, $f16
+0x45 0x00 0x00 0x01 # CHECK: bc1f 8
0x45 0x00 0x01 0x4c # CHECK: bc1f 1332
+0x45 0x01 0x00 0x01 # CHECK: bc1t 8
0x45 0x01 0x01 0x4c # CHECK: bc1t 1332
+0x45 0x02 0x00 0x0c # CHECK: bc1fl 52
+0x45 0x03 0xf7 0xf4 # CHECK: bc1tl -8236
0x45 0x1c 0x01 0x4c # CHECK: bc1f $fcc7, 1332
0x45 0x1d 0x01 0x4c # CHECK: bc1t $fcc7, 1332
+0x46 0x00 0x08 0x04 # CHECK: sqrt.s $f0, $f1
0x46 0x00 0x2b 0x0b # CHECK: floor.l.s $f12, $f5
0x46 0x00 0x2e 0x48 # CHECK: round.l.s $f25, $f5
0x46 0x00 0x39 0x84 # CHECK: sqrt.s $f6, $f7
@@ -113,8 +253,20 @@
0x46 0x00 0x39 0xa1 # CHECK: cvt.d.s $f6, $f7
0x46 0x00 0x39 0xa4 # CHECK: cvt.w.s $f6, $f7
0x46 0x00 0x39 0xa5 # CHECK: cvt.l.s $f6, $f7
+0x46 0x00 0x46 0xa5 # CHECK: cvt.l.s $f26, $f8
+0x46 0x00 0x4a 0x0f # CHECK: floor.w.s $f8, $f9
0x46 0x00 0x6c 0x8a # CHECK: ceil.l.s $f18, $f13
+0x46 0x00 0x78 0x47 # CHECK: neg.s $f1, $f15
+0x46 0x00 0x82 0x45 # CHECK: abs.s $f9, $f16
+0x46 0x00 0xa1 0x8e # CHECK: ceil.w.s $f6, $f20
+0x46 0x00 0xc5 0x24 # CHECK: cvt.w.s $f20, $f24
+0x46 0x00 0xc5 0x53 # CHECK: movn.s $f21, $f24, $zero
+0x46 0x00 0xd8 0x86 # CHECK: mov.s $f2, $f27
+0x46 0x00 0xe5 0xa1 # CHECK: cvt.d.s $f22, $f28
+0x46 0x00 0xe6 0xcc # CHECK: round.w.s $f27, $f28
+0x46 0x00 0xf7 0x0d # CHECK: trunc.w.s $f28, $f30
0x46 0x00 0xff 0x09 # CHECK: trunc.l.s $f28, $f31
+0x46 0x02 0x57 0x82 # CHECK: mul.s $f30, $f10, $f2
0x46 0x07 0x30 0x30 # CHECK: c.f.s $f6, $f7
0x46 0x07 0x30 0x31 # CHECK: c.un.s $f6, $f7
0x46 0x07 0x30 0x32 # CHECK: c.eq.s $f6, $f7
@@ -133,11 +285,20 @@
0x46 0x07 0x32 0x40 # CHECK: add.s $f9, $f6, $f7
0x46 0x07 0x32 0x41 # CHECK: sub.s $f9, $f6, $f7
0x46 0x07 0x32 0x42 # CHECK: mul.s $f9, $f6, $f7
+0x46 0x0f 0x29 0x03 # CHECK: div.s $f4, $f5, $f15
0x46 0x12 0xe0 0x33 # CHECK: c.ueq.s $f28, $f18
+0x46 0x16 0x70 0x38 # CHECK: c.sf.s $f14, $f22
+0x46 0x16 0xb5 0xc1 # CHECK: sub.s $f23, $f22, $f22
+0x46 0x18 0xaa 0x00 # CHECK: add.s $f8, $f21, $f24
+0x46 0x1c 0x11 0x11 # CHECK: movf.s $f4, $f2, $fcc7
+0x46 0x1d 0x11 0x11 # CHECK: movt.s $f4, $f2, $fcc7
0x46 0x20 0x0b 0x08 # CHECK: round.l.d $f12, $f1
0x46 0x20 0x18 0x4a # CHECK: ceil.l.d $f1, $f3
+0x46 0x20 0x21 0x8c # CHECK: round.w.d $f6, $f4
0x46 0x20 0x3e 0x8b # CHECK: floor.l.d $f26, $f7
0x46 0x20 0x41 0x86 # CHECK: mov.d $f6, $f8
+0x46 0x20 0x46 0xa0 # CHECK: cvt.s.d $f26, $f8
+0x46 0x20 0x53 0x8f # CHECK: floor.w.d $f14, $f10
0x46 0x20 0x73 0x04 # CHECK: sqrt.d $f12, $f14
0x46 0x20 0x73 0x05 # CHECK: abs.d $f12, $f14
0x46 0x20 0x73 0x07 # CHECK: neg.d $f12, $f14
@@ -148,7 +309,15 @@
0x46 0x20 0x73 0x20 # CHECK: cvt.s.d $f12, $f14
0x46 0x20 0x73 0x24 # CHECK: cvt.w.d $f12, $f14
0x46 0x20 0x73 0x25 # CHECK: cvt.l.d $f12, $f14
+0x46 0x20 0x75 0x06 # CHECK: mov.d $f20, $f14
+0x46 0x20 0x75 0x24 # CHECK: cvt.w.d $f20, $f14
+0x46 0x20 0x75 0x8d # CHECK: trunc.w.d $f22, $f14
+0x46 0x20 0x96 0x87 # CHECK: neg.d $f26, $f18
+0x46 0x20 0xb4 0x04 # CHECK: sqrt.d $f16, $f22
0x46 0x20 0xbd 0xc9 # CHECK: trunc.l.d $f23, $f23
+0x46 0x20 0xc1 0x85 # CHECK: abs.d $f6, $f24
+0x46 0x20 0xc2 0xce # CHECK: ceil.w.d $f11, $f24
+0x46 0x20 0xf0 0x38 # CHECK: c.sf.d $f30, $f0
0x46 0x2e 0x60 0x30 # CHECK: c.f.d $f12, $f14
0x46 0x2e 0x60 0x31 # CHECK: c.un.d $f12, $f14
0x46 0x2e 0x60 0x32 # CHECK: c.eq.d $f12, $f14
@@ -165,22 +334,48 @@
0x46 0x2e 0x60 0x3d # CHECK: c.nge.d $f12, $f14
0x46 0x2e 0x60 0x3e # CHECK: c.le.d $f12, $f14
0x46 0x2e 0x60 0x3f # CHECK: c.ngt.d $f12, $f14
+0x42 0x00 0x00 0x58 # CHECK: eretnc
0x46 0x2e 0x62 0x00 # CHECK: add.d $f8, $f12, $f14
0x46 0x2e 0x62 0x01 # CHECK: sub.d $f8, $f12, $f14
0x46 0x2e 0x62 0x02 # CHECK: mul.d $f8, $f12, $f14
+0x46 0x30 0x00 0x39 # CHECK: c.ngle.d $f0, $f16
+0x46 0x30 0x14 0x81 # CHECK: sub.d $f18, $f2, $f16
+0x46 0x30 0xa5 0x02 # CHECK: mul.d $f20, $f20, $f16
+0x46 0x3a 0xa7 0x03 # CHECK: div.d $f28, $f20, $f26
+0x46 0x3a 0xb1 0x13 # CHECK: movn.d $f4, $f22, $26
+0x46 0x3c 0x11 0x11 # CHECK: movf.d $f4, $f2, $fcc7
+0x46 0x3c 0x30 0x00 # CHECK: add.d $f0, $f6, $f28
+0x46 0x3c 0xe0 0x3b # CHECK: c.ngl.d $f28, $f28
+0x46 0x3d 0x11 0x11 # CHECK: movt.d $f4, $f2, $fcc7
0x46 0x80 0x39 0xa0 # CHECK: cvt.s.w $f6, $f7
+0x46 0x80 0x5e 0xa1 # CHECK: cvt.d.w $f26, $f11
0x46 0x80 0x73 0x21 # CHECK: cvt.d.w $f12, $f14
+0x46 0x80 0x7d 0xa0 # CHECK: cvt.s.w $f22, $f15
+0x48 0x20 0x50 0x00 # CHECK: dmfc2 $zero, $10, 0
+0x48 0xa4 0x50 0x00 # CHECK: dmtc2 $4, $10, 0
+0x4d 0x0c 0xe0 0x21 # CHECK: madd.d $f0, $f8, $f28, $f12
+0x4d 0xbb 0x0d 0xe0 # CHECK: madd.s $f23, $f13, $f1, $f27
+0x51 0xd3 0x0c 0x40 # CHECK: beql $14, $19, 12548
+0x57 0x94 0x04 0xfc # CHECK: bnel $gp, $20, 5108
+0x58 0xc0 0x02 0xe7 # CHECK: blezl $6, 2976
+0x5d 0x40 0xfc 0x59 # CHECK: bgtzl $10, -3736
0x46 0xa0 0x81 0x21 # CHECK: cvt.d.l $f4, $f16
0x46 0xa0 0xf3 0xe0 # CHECK: cvt.s.l $f15, $f30
0x4c 0xa6 0x00 0x05 # CHECK: luxc1 $f0, $6($5)
0x4c 0xac 0xc8 0x30 # CHECK: nmadd.s $f0, $f5, $f25, $f12
0x4c 0xb8 0x20 0x0d # CHECK: suxc1 $f4, $24($5)
+0x4d 0x42 0x00 0x81 # CHECK: ldxc1 $f2, $2($10)
+0x4d 0xbb 0x60 0x0d # CHECK: suxc1 $f12, $27($13)
+0x4d 0xca 0x58 0x09 # CHECK: sdxc1 $f11, $10($14)
0x4d 0xcc 0x05 0x00 # CHECK: lwxc1 $f20, $12($14)
0x4d 0xf7 0x02 0x01 # CHECK: ldxc1 $f8, $23($15)
0x4e 0x70 0x53 0x28 # CHECK: msub.s $f12, $f19, $f10, $f16
+0x4e 0xb6 0x04 0xc5 # CHECK: luxc1 $f19, $22($21)
0x4e 0xd2 0xd0 0x08 # CHECK: swxc1 $f26, $18($22)
0x4f 0x04 0x98 0x78 # CHECK: nmsub.s $f1, $f24, $f19, $f4
0x4f 0x24 0x40 0x09 # CHECK: sdxc1 $f8, $4($25)
+0x4f 0x4c 0x98 0x08 # CHECK: swxc1 $f19, $12($26)
+0x4f 0xd1 0x03 0x00 # CHECK: lwxc1 $f12, $17($fp)
0x4f 0xf9 0x98 0x60 # CHECK: madd.s $f1, $f31, $f19, $f25
0x62 0x9d 0x6c 0x39 # CHECK: daddi $sp, $20, 27705
0x62 0x9d 0x93 0xc7 # CHECK: daddi $sp, $20, -27705
@@ -194,6 +389,8 @@
0x65 0xce 0x11 0xea # CHECK: daddiu $14, $14, 4586
0x66 0x73 0x69 0x3f # CHECK: daddiu $19, $19, 26943
0x66 0xda 0xee 0x16 # CHECK: daddiu $26, $22, -4586
+0x67 0x4b 0x7c 0xcd # CHECK: daddiu $11, $26, 31949
+0x67 0xbd 0xff 0xe0 # CHECK: daddiu $sp, $sp, -32
0x6b 0x18 0xef 0xb9 # CHECK: ldl $24, -4167($24)
0x6e 0x8e 0x89 0x6a # CHECK: ldr $14, -30358($20)
0x70 0xc7 0x00 0x00 # CHECK: madd $6, $7
@@ -201,40 +398,87 @@
0x70 0xc7 0x00 0x04 # CHECK: msub $6, $7
0x70 0xc7 0x00 0x05 # CHECK: msubu $6, $7
0x70 0xc7 0x48 0x02 # CHECK: mul $9, $6, $7
+0x70 0xc7 0x7d 0x3f # CHECK: sdbbp 204276
0x70 0xd2 0x90 0x25 # CHECK: dclo $18, $6
0x70 0xe6 0x30 0x20 # CHECK: clz $6, $7
0x70 0xe6 0x30 0x21 # CHECK: clo $6, $7
+0x71 0x3a 0xd0 0x24 # CHECK: dclz $26, $9
+0x73 0x09 0x48 0x25 # CHECK: dclo $9, $24
0x73 0x30 0x80 0x24 # CHECK: dclz $16, $25
0x74 0x00 0x01 0x4c # CHECK: jalx 1328
+0x7c 0x05 0xe8 0x3b # CHECK: .set push
+ # CHECK: .set mips32r2
+ # CHECK: rdhwr $5, $29
+ # CHECK: .set pop
0x7c 0x07 0x30 0xa0 # CHECK: wsbh $6, $7
0x7c 0x07 0x34 0x20 # CHECK: seb $6, $7
0x7c 0x07 0x36 0x20 # CHECK: seh $6, $7
0x7c 0x0e 0x18 0xa4 # CHECK: dsbh $3, $14
+0x7c 0x0e 0x19 0x64 # CHECK: dshd $3, $14
+0x7c 0x1c 0x38 0xa4 # CHECK: dsbh $7, $gp
0x7c 0x1d 0x11 0x64 # CHECK: dshd $2, $sp
0x7d 0x33 0x61 0x84 # CHECK: ins $19, $9, 6, 7
+0x7f 0x87 0xf7 0x43 # CHECK: dext $7, $gp, 29, 31
+0x7f 0x94 0x7b 0xc7 # CHECK: dins $20, $gp, 15, 1
0x80 0xa4 0x23 0xc6 # CHECK: lb $4, 9158($5)
+0x81 0x58 0xc7 0x4d # CHECK: lb $24, -14515($10)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
0x84 0xa4 0x00 0x0c # CHECK: lh $4, 12($5)
+0x86 0xab 0xde 0x94 # CHECK: lh $11, -8556($21)
0x88 0x82 0x00 0x03 # CHECK: lwl $2, 3($4)
+0x89 0xf4 0xef 0x79 # CHECK: lwl $20, -4231($15)
+0x8c 0x3b 0xc4 0xcd # CHECK: lw $27, -15155($1)
0x8c 0xa4 0x00 0x18 # CHECK: lw $4, 24($5)
+0x8c 0xa8 0x16 0x2a # CHECK: lw $8, 5674($5)
+0x90 0x68 0x75 0xf3 # CHECK: lbu $8, 30195($3)
0x90 0xa4 0x00 0x06 # CHECK: lbu $4, 6($5)
+0x94 0x53 0xa6 0xbd # CHECK: lhu $19, -22851($2)
0x98 0xa3 0x00 0x10 # CHECK: lwr $3, 16($5)
+0x9b 0x80 0xb5 0x35 # CHECK: lwr $zero, -19147($gp)
+0x9c 0x63 0xf9 0x2e # CHECK: lwu $3, -1746($3)
0x9c 0x73 0xa1 0xea # CHECK: lwu $19, -24086($3)
0xa0 0xa4 0x00 0x06 # CHECK: sb $4, 6($5)
0xa0 0xa4 0x23 0xc6 # CHECK: sb $4, 9158($5)
+0xa1 0xd6 0xb2 0x6f # CHECK: sb $22, -19857($14)
0xa4 0xa4 0x23 0xc6 # CHECK: sh $4, 9158($5)
+0xa5 0xee 0xe5 0xd0 # CHECK: sh $14, -6704($15)
0xa8 0xa4 0x00 0x10 # CHECK: swl $4, 16($5)
+0xaa 0x6f 0x35 0x7e # CHECK: swl $15, 13694($19)
+0xac 0x3a 0xc4 0xc9 # CHECK: sw $26, -15159($1)
0xac 0xa4 0x00 0x18 # CHECK: sw $4, 24($5)
+0xaf 0xbf 0xd8 0x50 # CHECK: sw $ra, -10160($sp)
0xb3 0xc7 0xae 0x1f # CHECK: sdl $7, -20961($fp)
0xb5 0x8b 0xb0 0x39 # CHECK: sdr $11, -20423($12)
0xb8 0xe6 0x00 0x10 # CHECK: swr $6, 16($7)
+0xb9 0xd1 0x98 0x22 # CHECK: swr $17, -26590($14)
+0xbc 0x61 0x00 0x02 # CHECK: cache 1, 2($3)
+0xbc 0x80 0xb7 0xd2 # CHECK: cache 0, -18478($4)
0xc0 0xe9 0x23 0xc6 # CHECK: ll $9, 9158($7)
+0xc2 0x42 0xe3 0x67 # CHECK: ll $2, -7321($18)
0xc4 0xe9 0x23 0xc6 # CHECK: lwc1 $f9, 9158($7)
+0xc7 0x50 0x27 0xf1 # CHECK: lwc1 $f16, 10225($26)
+0xc8 0xc8 0x23 0xca # CHECK: lwc2 $8, 9162($6)
+0xc8 0xd2 0xfc 0xb7 # CHECK: lwc2 $18, -841($6)
+0xcc 0x43 0x00 0x04 # CHECK: pref 3, 4($2)
+0xcf 0x00 0x00 0x00 # CHECK: pref 0, 0($24)
0xd3 0xe0 0xc6 0x70 # CHECK: lld $zero, -14736($ra)
0xd4 0xe9 0x23 0xc6 # CHECK: ldc1 $f9, 9158($7)
+0xd6 0x0a 0x40 0x07 # CHECK: ldc1 $f10, 16391($16)
+0xd8 0x07 0x34 0x20 # CHECK: ldc2 $7, 13344($zero)
+0xd8 0x28 0xad 0x43 # CHECK: ldc2 $8, -21181($1)
+0xd9 0x03 0x23 0xca # CHECK: ldc2 $3, 9162($8)
+0xdc 0x1a 0x0f 0x76 # CHECK: ld $26, 3958($zero)
0xde 0x3d 0x90 0x1b # CHECK: ld $sp, -28645($17)
0xe0 0xe9 0x23 0xc6 # CHECK: sc $9, 9158($7)
+0xe2 0x6f 0x49 0xd8 # CHECK: sc $15, 18904($19)
0xe4 0xe9 0x23 0xc6 # CHECK: swc1 $f9, 9158($7)
+0xe7 0x06 0xde 0xef # CHECK: swc1 $f6, -8465($24)
+0xe8 0xe9 0x23 0xc6 # CHECK: swc2 $9, 9158($7)
+0xea 0x19 0x61 0x30 # CHECK: swc2 $25, 24880($16)
0xf3 0xaf 0xdf 0xcd # CHECK: scd $15, -8243($sp)
0xf4 0xe9 0x23 0xc6 # CHECK: sdc1 $f9, 9158($7)
+0xf5 0xbe 0x77 0x6e # CHECK: sdc1 $f30, 30574($13)
+0xf8 0xe9 0x23 0xc6 # CHECK: sdc2 $9, 9158($7)
+0xfa 0x54 0x5a 0x75 # CHECK: sdc2 $20, 23157($18)
+0xfc 0x06 0x45 0x67 # CHECK: sd $6, 17767($zero)
0xfd 0x4c 0x16 0xcb # CHECK: sd $12, 5835($10)
diff --git a/test/MC/Disassembler/Mips/mips64r5/valid-xfail.txt b/test/MC/Disassembler/Mips/mips64r5/valid-xfail.txt
new file mode 100644
index 000000000000..e1fc42c94380
--- /dev/null
+++ b/test/MC/Disassembler/Mips/mips64r5/valid-xfail.txt
@@ -0,0 +1,14 @@
+# RUN: llvm-mc %s -triple=mips64-unknown-linux -disassemble -mcpu=mips64r5 | FileCheck %s
+# XFAIL: *
+0x10 0x00 0x00 0x02 # CHECK: b 8
+0x10 0x00 0x00 0x05 # CHECK: b 20
+0x10 0x00 0x28 0x09 # CHECK: b 40996
+0x10 0x04 0x14 0xe1 # CHECK: beq $zero, $4, 21380
+0x11 0x00 0x00 0xc3 # CHECK: beqz $8, 780
+0x12 0x88 0x00 0x16 # CHECK: beq $20, $8, 88
+0x15 0x00 0x88 0x13 # CHECK: bnez $8, -122804
+0x15 0x8a 0x9f 0x89 # CHECK: bne $12, $10, -98780
+0x50 0xc7 0x07 0xf2 # CHECK: beql $6, $7, 8136
+0x7c 0x48 0xc7 0x00 # CHECK: ext $8, $2, 28, 25
+0xc2 0x44 0xe3 0x67 # CHECK: lwc0 $4, -7321($18)
+0xe2 0x64 0x49 0xd8 # CHECK: swc0 $4, 18904($19)
diff --git a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt
index 157e33593e37..08f5e04ab4fa 100644
--- a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt
+++ b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt
@@ -91,7 +91,7 @@
0x00 0x60 0x7e 0x41 # CHECK: di $fp
0x9a 0x10 0x64 0x00 # CHECK: div $2, $3, $4
0x9b 0x10 0x64 0x00 # CHECK: divu $2, $3, $4
-0xd5 0x10 0x64 0x00 # CHECK: dlsa $2, $3, $4, 3
+0xd5 0x10 0x64 0x00 # CHECK: dlsa $2, $3, $4, 4
0x00 0x50 0x38 0x40 # CHECK: dmfc0 $24, $10, 0
0xde 0x10 0x64 0x00 # CHECK: dmod $2, $3, $4
0xdf 0x10 0x64 0x00 # CHECK: dmodu $2, $3, $4
@@ -111,7 +111,7 @@
0x48 0x3c 0x58 0xec # CHECK: ldpc $2, 123456
0xb6 0xb3 0x42 0x7e # CHECK: ll $2, -153($18)
0x37 0x38 0xe0 0x7f # CHECK: lld $zero, 112($ra)
-0xc5 0x10 0x64 0x00 # CHECK: lsa $2, $3, $4, 3
+0xc5 0x10 0x64 0x00 # CHECK: lsa $2, $3, $4, 4
0xb7 0x34 0x52 0x49 # CHECK: lwc2 $18, -841($6)
0x43 0x00 0x48 0xec # CHECK: lwpc $2, 268
0x43 0x00 0x50 0xec # CHECK: lwupc $2, 268
@@ -128,6 +128,8 @@
0x1e 0x10 0x04 0x46 # CHECK: mina.s $f0, $f2, $f4
0xda 0x10 0x64 0x00 # CHECK: mod $2, $3, $4
0xdb 0x10 0x64 0x00 # CHECK: modu $2, $3, $4
+0x25 0x78 0xe0 0x03 # CHECK: move $15, $ra
+0x2d 0x78 0xe0 0x03 # CHECK: move $15, $ra
0x01 0x78 0x89 0x40 # CHECK: mtc0 $9, $15, 1
0x99 0x18 0x24 0x46 # CHECK: msubf.d $f2, $f3, $f4
0x99 0x18 0x04 0x46 # CHECK: msubf.s $f2, $f3, $f4
diff --git a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt
index 45379d9c8988..7fa27a7c5420 100644
--- a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt
+++ b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt
@@ -18,8 +18,8 @@
0x00 0x64 0x10 0x9d # CHECK: dmulu $2, $3, $4
0x00 0x64 0x10 0x9e # CHECK: ddiv $2, $3, $4
0x00 0x64 0x10 0x9f # CHECK: ddivu $2, $3, $4
-0x00 0x64 0x10 0xc5 # CHECK: lsa $2, $3, $4, 3
-0x00 0x64 0x10 0xd5 # CHECK: dlsa $2, $3, $4, 3
+0x00 0x64 0x10 0xc5 # CHECK: lsa $2, $3, $4, 4
+0x00 0x64 0x10 0xd5 # CHECK: dlsa $2, $3, $4, 4
0x00 0x64 0x10 0xd8 # CHECK: muh $2, $3, $4
0x00 0x64 0x10 0xd9 # CHECK: muhu $2, $3, $4
0x00 0x64 0x10 0xda # CHECK: mod $2, $3, $4
@@ -45,6 +45,8 @@
0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
0x03 0x20 0x80 0x52 # CHECK: dclz $16, $25
0x03 0x80 0xe8 0x50 # CHECK: clz $sp, $gp
+0x03 0xe0 0x78 0x25 # CHECK: move $15, $ra
+0x03 0xe0 0x78 0x2d # CHECK: move $15, $ra
0x04 0x11 0x14 0x9b # CHECK: bal 21104
0x04 0x66 0x56 0x78 # CHECK: dahi $3, 22136
0x04 0x7e 0xab 0xcd # CHECK: dati $3, -21555
@@ -143,6 +145,7 @@
0x46 0xa4 0x18 0x8d # CHECK: cmp.sult.d $f2, $f3, $f4
0x46 0xa4 0x18 0x8e # CHECK: cmp.sle.d $f2, $f3, $f4
0x46 0xa4 0x18 0x8f # CHECK: cmp.sule.d $f2, $f3, $f4
+0x42 0x00 0x00 0x58 # CHECK: eretnc
# FIXME: The encode/decode functions are not inverses of each other.
# The immediate should be 8 but the disassembler currently emits 12
0x49 0x20 0x00 0x02 # CHECK: bc2eqz $0, 12
diff --git a/test/MC/Disassembler/Mips/msa/test_elm.txt b/test/MC/Disassembler/Mips/msa/test_elm.txt
index 832587b23412..e7322858b8c9 100644
--- a/test/MC/Disassembler/Mips/msa/test_elm.txt
+++ b/test/MC/Disassembler/Mips/msa/test_elm.txt
@@ -5,7 +5,6 @@
0x78 0xb1 0x2d 0x99 # CHECK: copy_s.w $22, $w5[1]
0x78 0xc4 0xa5 0x99 # CHECK: copy_u.b $22, $w20[4]
0x78 0xe0 0x25 0x19 # CHECK: copy_u.h $20, $w4[0]
-0x78 0xf2 0x6f 0x99 # CHECK: copy_u.w $fp, $w13[2]
0x78 0x04 0xe8 0x19 # CHECK: sldi.b $w0, $w29[4]
0x78 0x20 0x8a 0x19 # CHECK: sldi.h $w8, $w17[0]
0x78 0x32 0xdd 0x19 # CHECK: sldi.w $w20, $w27[2]
diff --git a/test/MC/Disassembler/Mips/msa/test_elm_msa64.txt b/test/MC/Disassembler/Mips/msa/test_elm_msa64.txt
index 70c831ac2743..bd4e64faa0c2 100644
--- a/test/MC/Disassembler/Mips/msa/test_elm_msa64.txt
+++ b/test/MC/Disassembler/Mips/msa/test_elm_msa64.txt
@@ -1,6 +1,3 @@
# RUN: llvm-mc --disassemble %s -triple=mips64-unknown-linux -mcpu=mips64r2 -mattr=+msa | FileCheck %s
-# CHECK: copy_s.d $19, $w31[0]
-0x78 0xb8 0xfc 0xd9
-# CHECK: copy_u.d $18, $w29[1]
-0x78 0xf9 0xec 0x99
+0x78 0xb8 0xfc 0xd9 # CHECK: copy_s.d $19, $w31[0]
diff --git a/test/MC/Disassembler/PowerPC/ppc64-encoding.txt b/test/MC/Disassembler/PowerPC/ppc64-encoding.txt
index f235c242fbce..74023340d500 100644
--- a/test/MC/Disassembler/PowerPC/ppc64-encoding.txt
+++ b/test/MC/Disassembler/PowerPC/ppc64-encoding.txt
@@ -508,10 +508,10 @@
# CHECK: extsh. 2, 3
0x7c 0x62 0x07 0x35
-# CHECK: cntlz 2, 3
+# CHECK: cntlzw 2, 3
0x7c 0x62 0x00 0x34
-# CHECK: cntlz. 2, 3
+# CHECK: cntlzw. 2, 3
0x7c 0x62 0x00 0x35
# CHECK: popcntw 2, 3
diff --git a/test/MC/Disassembler/PowerPC/ppc64le-encoding.txt b/test/MC/Disassembler/PowerPC/ppc64le-encoding.txt
index f154e00ff51c..9ddc286d8aaa 100644
--- a/test/MC/Disassembler/PowerPC/ppc64le-encoding.txt
+++ b/test/MC/Disassembler/PowerPC/ppc64le-encoding.txt
@@ -508,10 +508,10 @@
# CHECK: extsh. 2, 3
0x35 0x07 0x62 0x7c
-# CHECK: cntlz 2, 3
+# CHECK: cntlzw 2, 3
0x34 0x00 0x62 0x7c
-# CHECK: cntlz. 2, 3
+# CHECK: cntlzw. 2, 3
0x35 0x00 0x62 0x7c
# CHECK: popcntw 2, 3
diff --git a/test/MC/Disassembler/PowerPC/vsx.txt b/test/MC/Disassembler/PowerPC/vsx.txt
index 6f4ba6f6b9ac..37fd17b015ab 100644
--- a/test/MC/Disassembler/PowerPC/vsx.txt
+++ b/test/MC/Disassembler/PowerPC/vsx.txt
@@ -57,6 +57,9 @@
# CHECK: xscvdpsp 7, 27
0xf0 0xe0 0xdc 0x24
+# CHECK: xscvdpspn 7, 27
+0xf0 0xe0 0xdc 0x2c
+
# CHECK: xscvdpsxds 7, 27
0xf0 0xe0 0xdd 0x60
@@ -72,9 +75,18 @@
# CHECK: xscvspdp 7, 27
0xf0 0xe0 0xdd 0x24
+# CHECK: xscvspdpn 7, 27
+0xf0 0xe0 0xdd 0x2c
+
+# CHECK: xscvsxdsp 7, 27
+0xf0 0xe0 0xdc 0xe0
+
# CHECK: xscvsxddp 7, 27
0xf0 0xe0 0xdd 0xe0
+# CHECK: xscvuxdsp 7, 27
+0xf0 0xe0 0xdc 0xa0
+
# CHECK: xscvuxddp 7, 27
0xf0 0xe0 0xdd 0xa0
diff --git a/test/MC/Disassembler/Sparc/sparc-mem.txt b/test/MC/Disassembler/Sparc/sparc-mem.txt
index 5f8886ef8b76..04a0365cc7c1 100644
--- a/test/MC/Disassembler/Sparc/sparc-mem.txt
+++ b/test/MC/Disassembler/Sparc/sparc-mem.txt
@@ -221,3 +221,27 @@
# CHECK: swapa [%g1] 131, %o2
0xd4 0xf8 0x50 0x60
+
+# CHECK: ldd [%i0+%l6], %o2
+0xd4 0x1e 0x00 0x16
+
+# CHECK: ldd [%i0+32], %o2
+0xd4 0x1e 0x20 0x20
+
+# CHECK: ldd [%g1], %o2
+0xd4 0x18 0x60 0x00
+
+# CHECK: ldd [%g1], %o2
+0xd4 0x18 0x40 0x00
+
+# CHECK: std %o2, [%i0+%l6]
+0xd4 0x3e 0x00 0x16
+
+# CHECK: std %o2, [%i0+32]
+0xd4 0x3e 0x20 0x20
+
+# CHECK: std %o2, [%g1]
+0xd4 0x38 0x60 0x00
+
+# CHECK: std %o2, [%g1]
+0xd4 0x38 0x40 0x00
diff --git a/test/MC/Disassembler/Sparc/sparc-v9.txt b/test/MC/Disassembler/Sparc/sparc-v9.txt
new file mode 100644
index 000000000000..b8ca01ce04ee
--- /dev/null
+++ b/test/MC/Disassembler/Sparc/sparc-v9.txt
@@ -0,0 +1,4 @@
+# RUN: llvm-mc --disassemble %s -triple=sparcv9-unknown-linux | FileCheck %s
+
+# CHECK: popc %g1, %g2
+0x85 0x70 0x00 0x01
diff --git a/test/MC/Disassembler/SystemZ/insns.txt b/test/MC/Disassembler/SystemZ/insns.txt
index 9d3f2b08743a..17c3a45b3e41 100644
--- a/test/MC/Disassembler/SystemZ/insns.txt
+++ b/test/MC/Disassembler/SystemZ/insns.txt
@@ -7537,7 +7537,79 @@
# CHECK: stcy %r0, -524288
0xe3 0x00 0x00 0x00 0x80 0x72
-# CHECK: stcy %r0, -1
+# CHECK: stck 0
+0xb2 0x05 0x00 0x00
+
+# CHECK: stck 0(%r1)
+0xb2 0x05 0x10 0x00
+
+#CHECK: stck 0(%r15)
+0xb2 0x05 0xf0 0x00
+
+#CHECK: stck 4095
+0xb2 0x05 0x0f 0xff
+
+#CHECK: stck 4095(%r1)
+0xb2 0x05 0x1f 0xff
+
+#CHECK: stck 4095(%r15)
+0xb2 0x05 0xff 0xff
+
+# CHECK: stckf 0
+0xb2 0x7c 0x00 0x00
+
+# CHECK: stckf 0(%r1)
+0xb2 0x7c 0x10 0x00
+
+#CHECK: stckf 0(%r15)
+0xb2 0x7c 0xf0 0x00
+
+#CHECK: stckf 4095
+0xb2 0x7c 0x0f 0xff
+
+#CHECK: stckf 4095(%r1)
+0xb2 0x7c 0x1f 0xff
+
+#CHECK: stckf 4095(%r15)
+0xb2 0x7c 0xff 0xff
+
+# CHECK: stcke 0
+0xb2 0x78 0x00 0x00
+
+# CHECK: stcke 0(%r1)
+0xb2 0x78 0x10 0x00
+
+#CHECK: stcke 0(%r15)
+0xb2 0x78 0xf0 0x00
+
+#CHECK: stcke 4095
+0xb2 0x78 0x0f 0xff
+
+#CHECK: stcke 4095(%r1)
+0xb2 0x78 0x1f 0xff
+
+#CHECK: stcke 4095(%r15)
+0xb2 0x78 0xff 0xff
+
+# CHECK: stfle 0
+0xb2 0xb0 0x00 0x00
+
+# CHECK: stfle 0(%r1)
+0xb2 0xb0 0x10 0x00
+
+#CHECK: stfle 0(%r15)
+0xb2 0xb0 0xf0 0x00
+
+#CHECK: stfle 4095
+0xb2 0xb0 0x0f 0xff
+
+#CHECK: stfle 4095(%r1)
+0xb2 0xb0 0x1f 0xff
+
+#CHECK: stfle 4095(%r15)
+0xb2 0xb0 0xff 0xff
+
+# CHECK: stcy %r0, -1
0xe3 0x00 0x0f 0xff 0xff 0x72
# CHECK: stcy %r0, 0
diff --git a/test/MC/Disassembler/X86/x86-64.txt b/test/MC/Disassembler/X86/x86-64.txt
index 065b2a57c844..13e36df002a4 100644
--- a/test/MC/Disassembler/X86/x86-64.txt
+++ b/test/MC/Disassembler/X86/x86-64.txt
@@ -302,6 +302,117 @@
# CHECK: movq %rax, 1515870810
0x67, 0x48 0xa3 0x5a 0x5a 0x5a 0x5a
+# CHECK: callq -32769
+0x66 0xe8 0xff 0x7f 0xff 0xff
+
+# CHECK: callq -32769
+0x66 0x66 0x48 0xe8 0xff 0x7f 0xff 0xff
+
+# CHECK: jmp -32769
+0xe9 0xff 0x7f 0xff 0xff
+
+# CHECK: jmp -32769
+0x66 0xe9 0xff 0x7f 0xff 0xff
+
+# CHECK: jmp -32769
+0x66 0x66 0x48 0xe9 0xff 0x7f 0xff 0xff
+
+# CHECK: jb -32769
+0x0f 0x82 0xff 0x7f 0xff 0xff
+
+# CHECK: jb -32769
+0x66 0x0f 0x82 0xff 0x7f 0xff 0xff
+
+# CHECK: jae -32769
+0x0f 0x83 0xff 0x7f 0xff 0xff
+
+# CHECK: jae -32769
+0x66 0x0f 0x83 0xff 0x7f 0xff 0xff
+
+# CHECK: je -32769
+0x0f 0x84 0xff 0x7f 0xff 0xff
+
+# CHECK: je -32769
+0x66 0x0f 0x84 0xff 0x7f 0xff 0xff
+
+# CHECK: jne -32769
+0x0f 0x85 0xff 0x7f 0xff 0xff
+
+# CHECK: jne -32769
+0x66 0x0f 0x85 0xff 0x7f 0xff 0xff
+
+# CHECK: jbe -32769
+0x0f 0x86 0xff 0x7f 0xff 0xff
+
+# CHECK: jbe -32769
+0x66 0x0f 0x86 0xff 0x7f 0xff 0xff
+
+# CHECK: ja -32769
+0x0f 0x87 0xff 0x7f 0xff 0xff
+
+# CHECK: ja -32769
+0x66 0x0f 0x87 0xff 0x7f 0xff 0xff
+
+# CHECK: js -32769
+0x0f 0x88 0xff 0x7f 0xff 0xff
+
+# CHECK: js -32769
+0x66 0x0f 0x88 0xff 0x7f 0xff 0xff
+
+# CHECK: jns -32769
+0x0f 0x89 0xff 0x7f 0xff 0xff
+
+# CHECK: jns -32769
+0x66 0x0f 0x89 0xff 0x7f 0xff 0xff
+
+# CHECK: jp -32769
+0x0f 0x8a 0xff 0x7f 0xff 0xff
+
+# CHECK: jp -32769
+0x66 0x0f 0x8a 0xff 0x7f 0xff 0xff
+
+# CHECK: jnp -32769
+0x0f 0x8b 0xff 0x7f 0xff 0xff
+
+# CHECK: jnp -32769
+0x66 0x0f 0x8b 0xff 0x7f 0xff 0xff
+
+# CHECK: jl -32769
+0x0f 0x8c 0xff 0x7f 0xff 0xff
+
+# CHECK: jl -32769
+0x66 0x0f 0x8c 0xff 0x7f 0xff 0xff
+
+# CHECK: jge -32769
+0x0f 0x8d 0xff 0x7f 0xff 0xff
+
+# CHECK: jge -32769
+0x66 0x0f 0x8d 0xff 0x7f 0xff 0xff
+
+# CHECK: jle -32769
+0x0f 0x8e 0xff 0x7f 0xff 0xff
+
+# CHECK: jle -32769
+0x66 0x0f 0x8e 0xff 0x7f 0xff 0xff
+
+# CHECK: jg -32769
+0x0f 0x8f 0xff 0x7f 0xff 0xff
+
+# CHECK: jg -32769
+0x66 0x0f 0x8f 0xff 0x7f 0xff 0xff
+
+# CHECK: lcallw *-32769(%rip)
+0x66 0xff 0x1d 0xff 0x7f 0xff 0xff
+
+# CHECK: ljmpw *-32769(%rip)
+0x66 0xff 0x2d 0xff 0x7f 0xff 0xff
+
+# CHECK: psubsb (%rdx), %mm3
+0x0f 0xe8 0x1a
+
+# CHECK: psubsb (%rdx), %xmm3
+0x66 0x0f 0xe8 0x1a
+
# CHECK: addq 255(%rip), %rbx
0x49, 0x03, 0x1d, 0xff, 0x00, 0x00, 0x00