aboutsummaryrefslogtreecommitdiff
path: root/test/MC/Disassembler/Mips
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2016-07-23 20:41:05 +0000
committerDimitry Andric <dim@FreeBSD.org>2016-07-23 20:41:05 +0000
commit01095a5d43bbfde13731688ddcf6048ebb8b7721 (patch)
tree4def12e759965de927d963ac65840d663ef9d1ea /test/MC/Disassembler/Mips
parentf0f4822ed4b66e3579e92a89f368f8fb860e218e (diff)
Vendor import of llvm release_39 branch r276489:vendor/llvm/llvm-release_39-r276489
Diffstat (limited to 'test/MC/Disassembler/Mips')
-rw-r--r--test/MC/Disassembler/Mips/micromips-dsp/valid-micromips32r3.txt3
-rw-r--r--test/MC/Disassembler/Mips/micromips-dsp/valid.txt12
-rw-r--r--test/MC/Disassembler/Mips/micromips-dspr2/valid.txt16
-rw-r--r--test/MC/Disassembler/Mips/micromips-dspr3/valid.txt3
-rw-r--r--test/MC/Disassembler/Mips/micromips32r3/valid-el.txt10
-rw-r--r--test/MC/Disassembler/Mips/micromips32r3/valid.txt10
-rw-r--r--test/MC/Disassembler/Mips/micromips32r6/valid.txt87
-rw-r--r--test/MC/Disassembler/Mips/micromips64r6/valid.txt149
-rw-r--r--test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips2/valid-mips2.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips3/valid-mips3.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips32/valid-mips32.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt67
-rw-r--r--test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt81
-rw-r--r--test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips4/valid-mips4.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips64/valid-mips64.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt10
-rw-r--r--test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt69
-rw-r--r--test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt81
-rw-r--r--test/MC/Disassembler/Mips/mips64r6/valid-xfail-mips64r6.txt20
27 files changed, 538 insertions, 210 deletions
diff --git a/test/MC/Disassembler/Mips/micromips-dsp/valid-micromips32r3.txt b/test/MC/Disassembler/Mips/micromips-dsp/valid-micromips32r3.txt
new file mode 100644
index 000000000000..a4c363105f76
--- /dev/null
+++ b/test/MC/Disassembler/Mips/micromips-dsp/valid-micromips32r3.txt
@@ -0,0 +1,3 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r3 -mattr=micromips -mattr=+dsp | FileCheck %s
+
+0x43 0x60 0x00 0xab # CHECK: bposge32 342
diff --git a/test/MC/Disassembler/Mips/micromips-dsp/valid.txt b/test/MC/Disassembler/Mips/micromips-dsp/valid.txt
index fdd404c43492..f3d6f3dc0367 100644
--- a/test/MC/Disassembler/Mips/micromips-dsp/valid.txt
+++ b/test/MC/Disassembler/Mips/micromips-dsp/valid.txt
@@ -101,3 +101,15 @@
0x00 0x01 0x82 0x7c # CHECK: mthlip $1, $ac2
0x00 0xa7 0xd6 0x7c # CHECK: wrdsp $5
0x00 0xa0 0x96 0x7c # CHECK: wrdsp $5, 2
+0x00 0xc5 0x22 0x95 # CHECK: modsub $4, $5, $6
+0x00 0x43 0x3c 0xbc # CHECK: mulsaq_s.w.ph $ac0, $3, $2
+0x00 0x43 0x31 0x3c # CHECK: bitrev $2, $3
+0x00 0x62 0x00 0x05 # CHECK: cmp.eq.ph $2, $3
+0x00 0x62 0x00 0x85 # CHECK: cmp.le.ph $2, $3
+0x00 0x62 0x00 0x45 # CHECK: cmp.lt.ph $2, $3
+0x58 0x62 0x08 0xc5 # CHECK: cmpgu.eq.qb $1, $2, $3
+0x58 0x62 0x09 0x05 # CHECK: cmpgu.lt.qb $1, $2, $3
+0x58 0x62 0x09 0x45 # CHECK: cmpgu.le.qb $1, $2, $3
+0x00 0x41 0x02 0x45 # CHECK: cmpu.eq.qb $1, $2
+0x00 0x41 0x02 0x85 # CHECK: cmpu.lt.qb $1, $2
+0x00 0x41 0x02 0xc5 # CHECK: cmpu.le.qb $1, $2
diff --git a/test/MC/Disassembler/Mips/micromips-dspr2/valid.txt b/test/MC/Disassembler/Mips/micromips-dspr2/valid.txt
index 1d9fc9e80d73..2f564fcea582 100644
--- a/test/MC/Disassembler/Mips/micromips-dspr2/valid.txt
+++ b/test/MC/Disassembler/Mips/micromips-dspr2/valid.txt
@@ -123,3 +123,19 @@
0x00 0x22 0x1a 0x55 # CHECK: prepend $1, $2, 3
0x00 0xa7 0xd6 0x7c # CHECK: wrdsp $5
0x00 0xa0 0x96 0x7c # CHECK: wrdsp $5, 2
+0x00 0x64 0x2a 0x15 # CHECK: append $3, $4, 5
+0x00 0x43 0x2c 0xbc # CHECK: mulsa.w.ph $ac0, $3, $2
+0x00 0x43 0xc8 0xbc # CHECK: balign $2, $3, 3
+0x00 0x43 0x31 0x3c # CHECK: bitrev $2, $3
+0x00 0x62 0x00 0x05 # CHECK: cmp.eq.ph $2, $3
+0x00 0x62 0x00 0x85 # CHECK: cmp.le.ph $2, $3
+0x00 0x62 0x00 0x45 # CHECK: cmp.lt.ph $2, $3
+0x00 0x62 0x09 0x85 # CHECK: cmpgdu.eq.qb $1, $2, $3
+0x00 0x62 0x09 0xc5 # CHECK: cmpgdu.lt.qb $1, $2, $3
+0x00 0x62 0x0a 0x05 # CHECK: cmpgdu.le.qb $1, $2, $3
+0x58 0x62 0x08 0xc5 # CHECK: cmpgu.eq.qb $1, $2, $3
+0x58 0x62 0x09 0x05 # CHECK: cmpgu.lt.qb $1, $2, $3
+0x58 0x62 0x09 0x45 # CHECK: cmpgu.le.qb $1, $2, $3
+0x00 0x41 0x02 0x45 # CHECK: cmpu.eq.qb $1, $2
+0x00 0x41 0x02 0x85 # CHECK: cmpu.lt.qb $1, $2
+0x00 0x41 0x02 0xc5 # CHECK: cmpu.le.qb $1, $2
diff --git a/test/MC/Disassembler/Mips/micromips-dspr3/valid.txt b/test/MC/Disassembler/Mips/micromips-dspr3/valid.txt
new file mode 100644
index 000000000000..43a7cdcf79ae
--- /dev/null
+++ b/test/MC/Disassembler/Mips/micromips-dspr3/valid.txt
@@ -0,0 +1,3 @@
+# RUN: llvm-mc --disassemble %s -triple=mips-unknown-linux -mcpu=mips32r6 -mattr=micromips -mattr=+dspr3 | FileCheck %s
+
+0x43 0x20 0x00 0xab # CHECK: bposge32c 342
diff --git a/test/MC/Disassembler/Mips/micromips32r3/valid-el.txt b/test/MC/Disassembler/Mips/micromips32r3/valid-el.txt
index d6c7de4e3a53..53007a9bd042 100644
--- a/test/MC/Disassembler/Mips/micromips32r3/valid-el.txt
+++ b/test/MC/Disassembler/Mips/micromips32r3/valid-el.txt
@@ -68,12 +68,10 @@
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
@@ -189,3 +187,11 @@
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)
+0x00 0x00 0x7c 0x8b # CHECK: syscall
+0x8c 0x01 0x7c 0x8b # CHECK: syscall 396
+0xea 0xbc 0x2c 0x01 # CHECK: ldc1 $f7, 300($10)
+0x0a 0xbd 0x2c 0x01 # CHECK: ldc1 $f8, 300($10)
+0x46 0x9c 0x04 0x00 # CHECK: lwc1 $f2, 4($6)
+0xea 0xb8 0x40 0x00 # CHECK: sdc1 $f7, 64($10)
+0x46 0xb8 0x04 0x00 # CHECK: sdc1 $f2, 4($6)
+0x46 0x98 0x04 0x00 # CHECK: swc1 $f2, 4($6)
diff --git a/test/MC/Disassembler/Mips/micromips32r3/valid.txt b/test/MC/Disassembler/Mips/micromips32r3/valid.txt
index 030afb36723d..1691dbc84553 100644
--- a/test/MC/Disassembler/Mips/micromips32r3/valid.txt
+++ b/test/MC/Disassembler/Mips/micromips32r3/valid.txt
@@ -68,12 +68,10 @@
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
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
@@ -189,3 +187,11 @@
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)
+0x00 0x00 0x8b 0x7c # CHECK: syscall
+0x01 0x8c 0x8b 0x7c # CHECK: syscall 396
+0xbc 0xea 0x01 0x2c # CHECK: ldc1 $f7, 300($10)
+0xbd 0x0a 0x01 0x2c # CHECK: ldc1 $f8, 300($10)
+0x9c 0x46 0x00 0x04 # CHECK: lwc1 $f2, 4($6)
+0xb8 0x46 0x00 0x04 # CHECK: sdc1 $f2, 4($6)
+0xb8 0xea 0x00 0x40 # CHECK: sdc1 $f7, 64($10)
+0x98 0x46 0x00 0x04 # CHECK: swc1 $f2, 4($6)
diff --git a/test/MC/Disassembler/Mips/micromips32r6/valid.txt b/test/MC/Disassembler/Mips/micromips32r6/valid.txt
index b8e69f833a03..3a93a4cfd345 100644
--- a/test/MC/Disassembler/Mips/micromips32r6/valid.txt
+++ b/test/MC/Disassembler/Mips/micromips32r6/valid.txt
@@ -21,6 +21,7 @@
0x29 0x82 # CHECK: lhu16 $3, 4($16)
0x09 0x94 # CHECK: lbu16 $3, 4($17)
0x09 0x9f # CHECK: lbu16 $3, -1($17)
+0x84 0x34 # CHECK: movep $5, $6, $2, $3
0x04 0xcc # CHECK: addu16 $6, $17, $4
0x44 0x21 # CHECK: and16 $16, $2
0x2e 0x56 # CHECK: andi16 $4, $5, 8
@@ -38,12 +39,20 @@
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 0x83 0x00 0x08 # CHECK: beqc $3, $4, 16
+0xe4 0x83 0x00 0x08 # CHECK: bgec $3, $4, 16
+0xc0 0x83 0x00 0x08 # CHECK: bgeuc $3, $4, 16
+0xc4 0x83 0x00 0x08 # CHECK: bltc $3, $4, 16
+0xe0 0x83 0x00 0x08 # CHECK: bltuc $3, $4, 16
+0x7c 0x83 0x00 0x08 # CHECK: bnec $3, $4, 16
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
+0x80 0x60 0x00 0x20 # CHECK: beqzc $3, 64
+0xa0 0x60 0x00 0x20 # CHECK: bnezc $3, 64
0xb4 0x37 0x96 0xb8 # CHECK: balc 7286128
0x94 0x37 0x96 0xb8 # CHECK: bc 7286128
0x00 0x44 0x0b 0x3c # CHECK: bitswap $4, $2
@@ -63,6 +72,19 @@
0x00 0x01 0xf3 0x7c # CHECK: eretnc
0x80 0x05 0x01 0x00 # CHECK: jialc $5, 256
0xa0 0x05 0x01 0x00 # CHECK: jic $5, 256
+0x3c 0x44 0x00 0x08 # CHECK: lh $2, 8($4)
+0x60 0x82 0x6a 0x08 # CHECK: lhe $4, 8($2)
+0x34 0x82 0x00 0x08 # CHECK: lhu $4, 8($2)
+0x60 0x82 0x62 0x08 # CHECK: lhue $4, 8($2)
+0x60 0x44 0x30 0x08 # CHECK: ll $2, 8($4)
+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)
+0x01 0x26 0x38 0xc0 # CHECK: rotr $9, $6, 7
+0x00 0xc7 0x48 0xd0 # CHECK: rotrv $9, $6, $7
+0x60 0x44 0xb0 0x08 # CHECK: sc $2, 8($4)
+0x20 0x44 0xd0 0x08 # CHECK: swm32 $16, $17, 8($4)
+0x00 0x00 0x8b 0x7c # CHECK: syscall
+0x01 0x8c 0x8b 0x7c # CHECK: syscall 396
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
@@ -203,10 +225,6 @@
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
@@ -256,3 +274,64 @@
0x54 0x82 0x02 0x60 # CHECK: class.d $f2, $f4
0x00 0x00 0x47 0x7c # CHECK: di
0x00 0x0f 0x47 0x7c # CHECK: di $15
+0x00 0x00 0x43 0x7c # CHECK: tlbinv
+0x00 0x00 0x53 0x7c # CHECK: tlbinvf
+0x00 0xa9 0x02 0xfc # CHECK: mtc0 $5, $9, 0
+0x00 0xa9 0x02 0xfc # CHECK: mtc0 $5, $9
+0x00 0x22 0x3a 0xfc # CHECK: mtc0 $1, $2, 7
+0x54 0x64 0x28 0x3b # CHECK: mtc1 $3, $f4
+0x00 0xa6 0x5d 0x3c # CHECK: mtc2 $5, $6
+0x00 0xe8 0x02 0xf4 # CHECK: mthc0 $7, $8, 0
+0x00 0xe8 0x02 0xf4 # CHECK: mthc0 $7, $8
+0x01 0x2a 0x0a 0xf4 # CHECK: mthc0 $9, $10, 1
+0x55 0x6c 0x38 0x3b # CHECK: mthc1 $11, $f12
+0x01 0xae 0x9d 0x3c # CHECK: mthc2 $13, $14
+0x00 0x67 0x00 0xfc # CHECK: mfc0 $3, $7, 0
+0x00 0x67 0x18 0xfc # CHECK: mfc0 $3, $7, 3
+0x54 0xaa 0x20 0x3b # CHECK: mfc1 $5, $f10
+0x01 0xe5 0x4d 0x3c # CHECK: mfc2 $15, $5
+0x02 0x95 0x00 0xf4 # CHECK: mfhc0 $20, $21, 0
+0x00 0x22 0x08 0xf4 # CHECK: mfhc0 $1, $2, 1
+0x54 0x06 0x30 0x3b # CHECK: mfhc1 $zero, $f6
+0x02 0xf0 0x8d 0x3c # CHECK: mfhc2 $23, $16
+0x00 0x00 0x03 0x7c # CHECK: tlbp
+0x00 0x00 0x13 0x7c # CHECK: tlbr
+0x00 0x00 0x23 0x7c # CHECK: tlbwi
+0x00 0x00 0x33 0x7c # CHECK: tlbwr
+0x00 0x00 0x19 0x7c # CHECK: dvp
+0x00 0x04 0x19 0x7c # CHECK: dvp $4
+0x00 0x00 0x39 0x7c # CHECK: evp
+0x00 0x04 0x39 0x7c # CHECK: evp $4
+0x03 0xe4 0x1f 0x3c # CHECK: jalrc.hb $4
+0x00 0x85 0x1f 0x3c # CHECK: jalrc.hb $4, $5
+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
+0x22 0x04 0x10 0x08 # CHECK: lwp $16, 8($4)
+0x22 0x04 0x90 0x08 # CHECK: swp $16, 8($4)
+0x41 0x1f 0x00 0x02 # CHECK: bc1eqzc $f31, 4
+0x41 0x3f 0x00 0x02 # CHECK: bc1nezc $f31, 4
+0x41 0x5f 0x00 0x04 # CHECK: bc2eqzc $31, 8
+0x41 0x7f 0x00 0x04 # CHECK: bc2nezc $31, 8
+0x01 0x26 0x30 0xec # CHECK: ext $9, $6, 3, 7
+0x01 0x26 0x48 0xcc # CHECK: ins $9, $6, 3, 7
+0x00 0x85 0x0f 0x3c # CHECK: jalrc $4, $5
+0x03 0xe5 0x0f 0x3c # CHECK: jalrc $5
+0x74 0x44 0x00 0x0c # CHECK: bovc $2, $4, 24
+0x7c 0x44 0x00 0x0c # CHECK: bnvc $2, $4, 24
+0xd0 0x64 0x00 0x05 # CHECK: andi $3, $4, 5
+0x50 0x64 0x00 0x05 # CHECK: ori $3, $4, 5
+0x70 0x64 0x00 0x05 # CHECK: xori $3, $4, 5
+0x00 0x04 0x1a 0xd0 # CHECK: not $3, $4
+0xbc 0xea 0x01 0x2c # CHECK: ldc1 $f7, 300($10)
+0xbd 0x0a 0x01 0x2c # CHECK: ldc1 $f8, 300($10)
+0x21 0x6c 0x23 0xff # CHECK: ldc2 $11, 1023($12)
+0x9c 0x45 0x00 0x20 # CHECK: lwc1 $f2, 32($5)
+0x20 0x24 0x00 0x10 # CHECK: lwc2 $1, 16($4)
+0xb8 0xea 0x00 0x40 # CHECK: sdc1 $f7, 64($10)
+0xb9 0x0a 0x00 0x40 # CHECK: sdc1 $f8, 64($10)
+0x20 0x50 0xa0 0x08 # CHECK: sdc2 $2, 8($16)
+0x98 0xcd 0x01 0x71 # CHECK: swc1 $f6, 369($13)
+0x20 0xf1 0x83 0x09 # CHECK: swc2 $7, 777($17)
diff --git a/test/MC/Disassembler/Mips/micromips64r6/valid.txt b/test/MC/Disassembler/Mips/micromips64r6/valid.txt
index 4f2325fe7ce1..26536e6c8a3a 100644
--- a/test/MC/Disassembler/Mips/micromips64r6/valid.txt
+++ b/test/MC/Disassembler/Mips/micromips64r6/valid.txt
@@ -9,6 +9,8 @@
0x4c 0x01 # CHECK: addiusp 1024
0x4c 0x03 # CHECK: addiusp 1028
0x4f 0xf9 # CHECK: addiusp -16
+0x44 0x21 # CHECK: and16 $16, $2
+0x2e 0x56 # CHECK: andi16 $4, $5, 8
0xcc 0x42 # CHECK: bc16 132
0x8f 0x0a # CHECK: beqzc16 $6, 20
0xaf 0x0a # CHECK: bnezc16 $6, 20
@@ -21,17 +23,28 @@
0x45 0x2b # CHECK: jalr $9
0x45 0x23 # CHECK: jrc16 $9
0x44 0xb3 # CHECK: jrcaddiusp 20
+0x84 0x34 # CHECK: movep $5, $6, $2, $3
+0x45 0xf9 # CHECK: or16 $3, $7
+0x60 0x44 0x30 0x08 # CHECK: ll $2, 8($4)
+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)
+0x01 0x26 0x38 0xc0 # CHECK: rotr $9, $6, 7
+0x00 0xc7 0x48 0xd0 # CHECK: rotrv $9, $6, $7
+0x60 0x44 0xb0 0x08 # CHECK: sc $2, 8($4)
+0x20 0x44 0xd0 0x08 # CHECK: swm32 $16, $17, 8($4)
+0x00 0x00 0x8b 0x7c # CHECK: syscall
+0x01 0x8c 0x8b 0x7c # CHECK: syscall 396
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
+0x59 0x26 0x30 0xe4 # CHECK: dextm $9, $6, 3, 39
+0x59 0x26 0x30 0xd4 # CHECK: dextu $9, $6, 35, 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
+0x58 0xa4 0x19 0x18 # CHECK: ddiv $3, $4, $5
+0x58 0xa4 0x19 0x58 # CHECK: dmod $3, $4, $5
+0x58 0xa4 0x19 0x98 # CHECK: ddivu $3, $4, $5
+0x58 0xa4 0x19 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
@@ -131,6 +144,7 @@
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
+0x78 0x58 0x00 0x02 # CHECK: ldpc $2, 16
0x65 0x88 # CHECK: lw $3, 32($gp)
0x48 0x66 # CHECK: lw $3, 24($sp)
0x6a 0x12 # CHECK: lw16 $4, 8($17)
@@ -169,3 +183,126 @@
0x00 0x00 0xe3 0x7c # CHECK: deret
0x00 0x00 0x47 0x7c # CHECK: di
0x00 0x0f 0x47 0x7c # CHECK: di $15
+0x00 0x00 0x43 0x7c # CHECK: tlbinv
+0x00 0x00 0x53 0x7c # CHECK: tlbinvf
+0x58 0x82 0x20 0x34 # CHECK: dinsu $4, $2, 32, 5
+0x58 0x82 0x38 0xc4 # CHECK: dinsm $4, $2, 3, 5
+0x58 0x82 0x38 0xcc # CHECK: dins $4, $2, 3, 5
+0x00 0xa9 0x02 0xfc # CHECK: mtc0 $5, $9, 0
+0x00 0xa9 0x02 0xfc # CHECK: mtc0 $5, $9
+0x00 0x22 0x3a 0xfc # CHECK: mtc0 $1, $2, 7
+0x54 0x64 0x28 0x3b # CHECK: mtc1 $3, $f4
+0x00 0xa6 0x5d 0x3c # CHECK: mtc2 $5, $6
+0x00 0xe8 0x02 0xf4 # CHECK: mthc0 $7, $8, 0
+0x00 0xe8 0x02 0xf4 # CHECK: mthc0 $7, $8
+0x01 0x2a 0x0a 0xf4 # CHECK: mthc0 $9, $10, 1
+0x55 0x6c 0x38 0x3b # CHECK: mthc1 $11, $f12
+0x01 0xae 0x9d 0x3c # CHECK: mthc2 $13, $14
+0x59 0xf0 0x02 0xfc # CHECK: dmtc0 $15, $16, 0
+0x59 0xf0 0x02 0xfc # CHECK: dmtc0 $15, $16
+0x5a 0x32 0x2a 0xfc # CHECK: dmtc0 $17, $18, 5
+0x56 0x74 0x2c 0x3b # CHECK: dmtc1 $19, $f20
+0x02 0xb6 0x7d 0x3c # CHECK: dmtc2 $21, $22
+0x5a 0x51 0x00 0xfc # CHECK: dmfc0 $18, $17
+0x59 0x21 0x08 0xfc # CHECK: dmfc0 $9, $1, 1
+0x55 0x24 0x24 0x3b # CHECK: dmfc1 $9, $f4
+0x01 0xd2 0x6d 0x3c # CHECK: dmfc2 $14, $18
+0x58 0xe6 0x49 0x10 # CHECK: dadd $9, $6, $7
+0x5b 0xe1 0x99 0x10 # CHECK: dadd $19, $1, $ra
+0x5f 0x02 0x46 0x9f # CHECK: daddiu $24, $2, 18079
+0x5d 0x26 0xc5 0x67 # CHECK: daddiu $9, $6, -15001
+0x5d 0x29 0xc5 0x67 # CHECK: daddiu $9, $9, -15001
+0x5d 0x23 0x00 0x20 # CHECK: daddiu $9, $3, 32
+0x5f 0x56 0xee 0x16 # CHECK: daddiu $26, $22, -4586
+0x5d 0xeb 0xec 0x5f # CHECK: daddiu $15, $11, -5025
+0x5d 0xce 0x11 0xea # CHECK: daddiu $14, $14, 4586
+0x5e 0x73 0x69 0x3f # CHECK: daddiu $19, $19, 26943
+0x5d 0x7a 0x7c 0xcd # CHECK: daddiu $11, $26, 31949
+0x5f 0xbd 0xff 0xe0 # CHECK: daddiu $sp, $sp, -32
+0x59 0x61 0xd1 0x50 # CHECK: daddu $26, $1, $11
+0x5b 0xe1 0x99 0x50 # CHECK: daddu $19, $1, $ra
+0x58 0xe6 0x49 0x50 # CHECK: daddu $9, $6, $7
+0x58 0x69 0x49 0x50 # CHECK: daddu $9, $9, $3
+0x5d 0x26 0xc5 0x67 # CHECK: daddiu $9, $6, -15001
+0x5d 0x29 0x00 0x0a # CHECK: daddiu $9, $9, 10
+0x5e 0x73 0x69 0x3f # CHECK: daddiu $19, $19, 26943
+0x5f 0x02 0x46 0x9f # CHECK: daddiu $24, $2, 18079
+0x5c 0x63 0xff 0xfb # CHECK: daddiu $3, $3, -5
+0x5c 0x64 0xff 0xfb # CHECK: daddiu $3, $4, -5
+0x00 0x00 0x03 0x7c # CHECK: tlbp
+0x00 0x00 0x13 0x7c # CHECK: tlbr
+0x00 0x00 0x23 0x7c # CHECK: tlbwi
+0x00 0x00 0x33 0x7c # CHECK: tlbwr
+0x00 0x00 0x19 0x7c # CHECK: dvp
+0x00 0x04 0x19 0x7c # CHECK: dvp $4
+0x00 0x00 0x39 0x7c # CHECK: evp
+0x00 0x04 0x39 0x7c # CHECK: evp $4
+0x03 0xe4 0x1f 0x3c # CHECK: jalrc.hb $4
+0x00 0x85 0x1f 0x3c # CHECK: jalrc.hb $4, $5
+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
+0x58 0x62 0x09 0x90 # CHECK: dsub $1, $2, $3
+0x59 0xe7 0x19 0xd0 # CHECK: dsubu $3, $7, $15
+0x59 0xe0 0x39 0x90 # CHECK: dneg $7, $15
+0x59 0x40 0x51 0x90 # CHECK: dneg $10, $10
+0x59 0x60 0x09 0xd0 # CHECK: dnegu $1, $11
+0x58 0xa0 0x29 0xd0 # CHECK: dnegu $5, $5
+0x3c 0x44 0x00 0x08 # CHECK: lh $2, 8($4)
+0x60 0x82 0x6a 0x08 # CHECK: lhe $4, 8($2)
+0x34 0x82 0x00 0x08 # CHECK: lhu $4, 8($2)
+0x60 0x82 0x62 0x08 # CHECK: lhue $4, 8($2)
+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
+0x58 0xa4 0x18 0x18 # CHECK: dmul $3, $4, $5
+0x58 0xa4 0x18 0x58 # CHECK: dmuh $3, $4, $5
+0x58 0xa4 0x18 0x98 # CHECK: dmulu $3, $4, $5
+0x58 0xa4 0x18 0xd8 # CHECK: dmuhu $3, $4, $5
+0x22 0x04 0x10 0x08 # CHECK: lwp $16, 8($4)
+0x22 0x04 0x90 0x08 # CHECK: swp $16, 8($4)
+0x58 0x64 0x7b 0x3c # CHECK: dsbh $3, $4
+0x58 0x64 0xfb 0x3c # CHECK: dshd $3, $4
+0x58 0x64 0x28 0x00 # CHECK: dsll $3, $4, 5
+0x58 0x64 0x28 0x08 # CHECK: dsll32 $3, $4, 5
+0x58 0xa6 0x20 0x10 # CHECK: dsllv $4, $5, $6
+0x58 0x85 0x28 0x80 # CHECK: dsra $4, $5, 5
+0x58 0xa6 0x20 0x90 # CHECK: dsrav $4, $5, $6
+0x41 0x1f 0x00 0x02 # CHECK: bc1eqzc $f31, 4
+0x41 0x3f 0x00 0x02 # CHECK: bc1nezc $f31, 4
+0x41 0x5f 0x00 0x04 # CHECK: bc2eqzc $31, 8
+0x41 0x7f 0x00 0x04 # CHECK: bc2nezc $31, 8
+0x00 0xa4 0x1a 0x50 # CHECK: and $3, $4, $5
+0xd0 0x64 0x04 0xd2 # CHECK: andi $3, $4, 1234
+0x00 0xa4 0x1a 0x90 # CHECK: or $3, $4, $5
+0x50 0x64 0x04 0xd2 # CHECK: ori $3, $4, 1234
+0x00 0xa4 0x1b 0x10 # CHECK: xor $3, $4, $5
+0x70 0x64 0x04 0xd2 # CHECK: xori $3, $4, 1234
+0x00 0xa4 0x1a 0xd0 # CHECK: nor $3, $4, $5
+0x00 0x04 0x1a 0xd0 # CHECK: not $3, $4
+0x58 0x22 0x4b 0x3c # CHECK: dclo $1, $2
+0x58 0x22 0x5b 0x3c # CHECK: dclz $1, $2
+0x58 0xaa 0x40 0xc0 # CHECK: drotr $5, $10, 8
+0x58 0x22 0x20 0xc8 # CHECK: drotr32 $1, $2, 4
+0x58 0xc4 0x18 0xd0 # CHECK: drotrv $3, $6, $4
+0xdc 0x82 0x00 0x05 # CHECK: ld $4, 5($2)
+0x60 0x48 0x70 0x03 # CHECK: lld $2, 3($8)
+0x60 0x22 0xe0 0x0a # CHECK: lwu $1, 10($2)
+0xd8 0x83 0x00 0x05 # CHECK: sd $4, 5($3)
+0x58 0x22 0x10 0x40 # CHECK: dsrl $1, $2, 2
+0x58 0x64 0x28 0x48 # CHECK: dsrl32 $3, $4, 5
+0x58 0x63 0x08 0x50 # CHECK: dsrlv $1, $3, $3
+0xbc 0xea 0x01 0x2c # CHECK: ldc1 $f7, 300($10)
+0xbd 0x0a 0x01 0x2c # CHECK: ldc1 $f8, 300($10)
+0x21 0x6c 0x23 0xff # CHECK: ldc2 $11, 1023($12)
+0x9c 0x45 0x00 0x20 # CHECK: lwc1 $f2, 32($5)
+0x20 0x24 0x00 0x10 # CHECK: lwc2 $1, 16($4)
+0xb8 0xea 0x00 0x40 # CHECK: sdc1 $f7, 64($10)
+0xb9 0x0a 0x00 0x40 # CHECK: sdc1 $f8, 64($10)
+0x20 0x50 0xa0 0x08 # CHECK: sdc2 $2, 8($16)
+0x98 0xcd 0x01 0x71 # CHECK: swc1 $f6, 369($13)
+0x20 0xf1 0x83 0x09 # CHECK: swc2 $7, 777($17)
diff --git a/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt b/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt
index 5bdf8f17eb68..382e085acf96 100644
--- a/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt
+++ b/test/MC/Disassembler/Mips/mips2/valid-mips2-el.txt
@@ -136,11 +136,11 @@
0x22 0x98 0xd1 0xb9 # CHECK: swr $17, -26590($14)
0x34 0x00 0x03 0x00 # CHECK: teq $zero, $3
0x34 0x9b 0xa7 0x00 # CHECK: teq $5, $7, 620
-0xa0 0xbb 0xac 0x06 # CHECK: teqi $21, 48032
+0xa0 0xbb 0xac 0x06 # CHECK: teqi $21, -17504
0x30 0x00 0xea 0x00 # CHECK: tge $7, $10
0x30 0x55 0xb3 0x00 # CHECK: tge $5, $19, 340
0xa1 0x13 0x28 0x06 # CHECK: tgei $17, 5025
-0x33 0x90 0xa9 0x07 # CHECK: tgeiu $sp, 36915
+0x33 0x90 0xa9 0x07 # CHECK: tgeiu $sp, -28621
0x31 0x00 0xdc 0x02 # CHECK: tgeu $22, $gp
0xf1 0x5e 0x8e 0x02 # CHECK: tgeu $20, $14, 379
0x08 0x00 0x00 0x42 # CHECK: tlbp
@@ -149,13 +149,13 @@
0x06 0x00 0x00 0x42 # CHECK: tlbwr
0x32 0x00 0xed 0x01 # CHECK: tlt $15, $13
0x72 0x21 0x53 0x00 # CHECK: tlt $2, $19, 133
-0xbd 0xad 0xca 0x05 # CHECK: tlti $14, 44477
-0x2c 0xec 0xeb 0x07 # CHECK: tltiu $ra, 60460
+0xbd 0xad 0xca 0x05 # CHECK: tlti $14, -21059
+0x2c 0xec 0xeb 0x07 # CHECK: tltiu $ra, -5076
0x33 0x00 0x70 0x01 # CHECK: tltu $11, $16
0x33 0xfe 0x1d 0x02 # CHECK: tltu $16, $sp, 1016
0x36 0x00 0xd1 0x00 # CHECK: tne $6, $17
0x76 0xdd 0xe8 0x00 # CHECK: tne $7, $8, 885
-0x31 0x8c 0x8e 0x05 # CHECK: tnei $12, 35889
+0x31 0x8c 0x8e 0x05 # CHECK: tnei $12, -29647
0x8d 0x75 0x20 0x46 # CHECK: trunc.w.d $f22, $f14
0x0d 0xf7 0x00 0x46 # CHECK: trunc.w.s $f28, $f30
0x26 0x90 0x9e 0x00 # CHECK: xor $18, $4, $fp
diff --git a/test/MC/Disassembler/Mips/mips2/valid-mips2.txt b/test/MC/Disassembler/Mips/mips2/valid-mips2.txt
index a0b766a5dc1b..6158ea8ca026 100644
--- a/test/MC/Disassembler/Mips/mips2/valid-mips2.txt
+++ b/test/MC/Disassembler/Mips/mips2/valid-mips2.txt
@@ -72,14 +72,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x09 0x33 0x00 0x2a # CHECK: j 80478376
0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
diff --git a/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt b/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt
index 6ffe7748e950..939b79668599 100644
--- a/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt
+++ b/test/MC/Disassembler/Mips/mips3/valid-mips3-el.txt
@@ -184,11 +184,11 @@
0x22 0x98 0xd1 0xb9 # CHECK: swr $17, -26590($14)
0x34 0x00 0x03 0x00 # CHECK: teq $zero, $3
0x34 0x9b 0xa7 0x00 # CHECK: teq $5, $7, 620
-0xa0 0xbb 0xac 0x06 # CHECK: teqi $21, 48032
+0xa0 0xbb 0xac 0x06 # CHECK: teqi $21, -17504
0x30 0x00 0xea 0x00 # CHECK: tge $7, $10
0x30 0x55 0xb3 0x00 # CHECK: tge $5, $19, 340
0xa1 0x13 0x28 0x06 # CHECK: tgei $17, 5025
-0x33 0x90 0xa9 0x07 # CHECK: tgeiu $sp, 36915
+0x33 0x90 0xa9 0x07 # CHECK: tgeiu $sp, -28621
0x31 0x00 0xdc 0x02 # CHECK: tgeu $22, $gp
0xf1 0x5e 0x8e 0x02 # CHECK: tgeu $20, $14, 379
0x08 0x00 0x00 0x42 # CHECK: tlbp
@@ -197,13 +197,13 @@
0x06 0x00 0x00 0x42 # CHECK: tlbwr
0x32 0x00 0xed 0x01 # CHECK: tlt $15, $13
0x72 0x21 0x53 0x00 # CHECK: tlt $2, $19, 133
-0xbd 0xad 0xca 0x05 # CHECK: tlti $14, 44477
-0x2c 0xec 0xeb 0x07 # CHECK: tltiu $ra, 60460
+0xbd 0xad 0xca 0x05 # CHECK: tlti $14, -21059
+0x2c 0xec 0xeb 0x07 # CHECK: tltiu $ra, -5076
0x33 0x00 0x70 0x01 # CHECK: tltu $11, $16
0x33 0xfe 0x1d 0x02 # CHECK: tltu $16, $sp, 1016
0x36 0x00 0xd1 0x00 # CHECK: tne $6, $17
0x76 0xdd 0xe8 0x00 # CHECK: tne $7, $8, 885
-0x31 0x8c 0x8e 0x05 # CHECK: tnei $12, 35889
+0x31 0x8c 0x8e 0x05 # CHECK: tnei $12, -29647
0xc9 0xbd 0x20 0x46 # CHECK: trunc.l.d $f23, $f23
0x09 0xff 0x00 0x46 # CHECK: trunc.l.s $f28, $f31
0x8d 0x75 0x20 0x46 # CHECK: trunc.w.d $f22, $f14
diff --git a/test/MC/Disassembler/Mips/mips3/valid-mips3.txt b/test/MC/Disassembler/Mips/mips3/valid-mips3.txt
index fb244e2f1543..4877280000f1 100644
--- a/test/MC/Disassembler/Mips/mips3/valid-mips3.txt
+++ b/test/MC/Disassembler/Mips/mips3/valid-mips3.txt
@@ -103,14 +103,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x09 0x33 0x00 0x2a # CHECK: j 80478376
0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
diff --git a/test/MC/Disassembler/Mips/mips32/valid-mips32.txt b/test/MC/Disassembler/Mips/mips32/valid-mips32.txt
index f71b2a16fcfc..d86f9e518fae 100644
--- a/test/MC/Disassembler/Mips/mips32/valid-mips32.txt
+++ b/test/MC/Disassembler/Mips/mips32/valid-mips32.txt
@@ -105,14 +105,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt b/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt
index acce76bcfddd..7ee4f4bf7fa8 100644
--- a/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt
+++ b/test/MC/Disassembler/Mips/mips32r2/valid-mips32r2.txt
@@ -110,15 +110,15 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
0x07 0xdf 0xe8 0x07 # CHECK: synci -6137($fp)
-0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt b/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt
index 18dbd9ea7a40..8e5c16b4a337 100644
--- a/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt
+++ b/test/MC/Disassembler/Mips/mips32r3/valid-mips32r3.txt
@@ -107,15 +107,15 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
0x07 0xdf 0xe8 0x07 # CHECK: synci -6137($fp)
-0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt b/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt
index 8b553cfab2cc..afe1b695dea5 100644
--- a/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt
+++ b/test/MC/Disassembler/Mips/mips32r5/valid-mips32r5.txt
@@ -107,15 +107,15 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
0x07 0xdf 0xe8 0x07 # CHECK: synci -6137($fp)
-0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, 60460
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt
index 4164988b2b8f..34bfd769f2d3 100644
--- a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt
+++ b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6-el.txt
@@ -7,8 +7,8 @@
0xe9 0xff 0x62 0x3c # CHECK: aui $3, $2, -23
0xff 0xff 0x7e 0xec # CHECK: auipc $3, -1
0x9b 0x14 0x11 0x04 # CHECK: bal 21104
-0xb8 0x96 0x37 0xe8 # CHECK: balc 14572256
-0xb8 0x96 0x37 0xc8 # CHECK: bc 14572256
+0xb8 0x96 0x37 0xe8 # CHECK: balc 14572260
+0xb8 0x96 0x37 0xc8 # CHECK: bc 14572260
0x01 0x00 0x20 0x45 # CHECK: bc1eqz $f0, 8
0x01 0x00 0x3f 0x45 # CHECK: bc1eqz $f31, 8
0x01 0x00 0xa0 0x45 # CHECK: bc1nez $f0, 8
@@ -17,31 +17,44 @@
0x02 0x00 0x3f 0x49 # CHECK: bc2eqz $31, 12
0x02 0x00 0xa0 0x49 # CHECK: bc2nez $0, 12
0x02 0x00 0xbf 0x49 # CHECK: bc2nez $31, 12
-0x40 0x00 0xa6 0x20 # CHECK: beqc $5, $6, 256
-0x4d 0x01 0x02 0x20 # CHECK: beqzalc $2, 1332
-0x40 0x00 0xa6 0x60 # CHECK: bnec $5, $6, 256
-0x4d 0x01 0x02 0x60 # CHECK: bnezalc $2, 1332
-0x90 0x46 0xa0 0xd8 # CHECK: beqzc $5, 72256
-0x40 0x00 0x43 0x58 # CHECK: bgec $2, $3, 256
-0x40 0x00 0x43 0x18 # CHECK: bgeuc $2, $3, 256
-0x4d 0x01 0x42 0x18 # CHECK: bgezalc $2, 1332
-0x90 0x46 0xa0 0xf8 # CHECK: bnezc $5, 72256
-0x40 0x00 0xa5 0x5c # CHECK: bltzc $5, 256
-0x40 0x00 0xa5 0x58 # CHECK: bgezc $5, 256
-0x4d 0x01 0x02 0x1c # CHECK: bgtzalc $2, 1332
-0x40 0x00 0x05 0x58 # CHECK: blezc $5, 256
-0x4d 0x01 0x42 0x1c # CHECK: bltzalc $2, 1332
-0x40 0x00 0x05 0x5c # CHECK: bgtzc $5, 256
+0x40 0x00 0xa6 0x20 # CHECK: beqc $5, $6, 260
+0x4d 0x01 0x02 0x20 # CHECK: beqzalc $2, 1336
+0x40 0x00 0xa6 0x60 # CHECK: bnec $5, $6, 260
+0xfa 0xff 0x43 0x60 # CHECK: bnec $2, $3, -20
+0x4d 0x01 0x02 0x60 # CHECK: bnezalc $2, 1336
+0x90 0x46 0xa0 0xd8 # CHECK: beqzc $5, 72260
+0x40 0x00 0x43 0x58 # CHECK: bgec $2, $3, 260
+0xfa 0xff 0x43 0x58 # CHECK: bgec $2, $3, -20
+0x40 0x00 0x43 0x18 # CHECK: bgeuc $2, $3, 260
+0xfa 0xff 0x43 0x18 # CHECK: bgeuc $2, $3, -20
+0x4d 0x01 0x42 0x18 # CHECK: bgezalc $2, 1336
+0xfa 0xff 0x42 0x18 # CHECK: bgezalc $2, -20
+0x90 0x46 0xa0 0xf8 # CHECK: bnezc $5, 72260
+0x40 0x00 0xa5 0x5c # CHECK: bltzc $5, 260
+0xfa 0xff 0xa5 0x5c # CHECK: bltzc $5, -20
+0x40 0x00 0xa5 0x58 # CHECK: bgezc $5, 260
+0xfa 0xff 0xa5 0x58 # CHECK: bgezc $5, -20
+0x4d 0x01 0x02 0x1c # CHECK: bgtzalc $2, 1336
+0xfa 0xff 0x02 0x1c # CHECK: bgtzalc $2, -20
+0x40 0x00 0x05 0x58 # CHECK: blezc $5, 260
+0xfa 0xff 0x05 0x58 # CHECK: blezc $5, -20
+0x4d 0x01 0x42 0x1c # CHECK: bltzalc $2, 1336
+0xfa 0xff 0x42 0x1c # CHECK: bltzalc $2, -20
+0x40 0x00 0x05 0x5c # CHECK: bgtzc $5, 260
+0xfa 0xff 0x05 0x5c # CHECK: bgtzc $5, -20
0x20 0x20 0x02 0x7c # CHECK: bitswap $4, $2
-0x4d 0x01 0x02 0x18 # CHECK: blezalc $2, 1332
-0x40 0x00 0xa6 0x5c # CHECK: bltc $5, $6, 256
-0x40 0x00 0xa6 0x1c # CHECK: bltuc $5, $6, 256
-0x01 0x00 0x00 0x60 # CHECK: bnvc $zero, $zero, 4
-0x01 0x00 0x40 0x60 # CHECK: bnvc $2, $zero, 4
-0x01 0x00 0x82 0x60 # CHECK: bnvc $4, $2, 4
-0x01 0x00 0x00 0x20 # CHECK: bovc $zero, $zero, 4
-0x01 0x00 0x40 0x20 # CHECK: bovc $2, $zero, 4
-0x01 0x00 0x82 0x20 # CHECK: bovc $4, $2, 4
+0x4d 0x01 0x02 0x18 # CHECK: blezalc $2, 1336
+0xfa 0xff 0x02 0x18 # CHECK: blezalc $2, -20
+0x40 0x00 0xa6 0x5c # CHECK: bltc $5, $6, 260
+0xfa 0xff 0xa6 0x5c # CHECK: bltc $5, $6, -20
+0x40 0x00 0xa6 0x1c # CHECK: bltuc $5, $6, 260
+0xfa 0xff 0xa6 0x1c # CHECK: bltuc $5, $6, -20
+0x01 0x00 0x00 0x60 # CHECK: bnvc $zero, $zero, 8
+0x01 0x00 0x40 0x60 # CHECK: bnvc $2, $zero, 8
+0x01 0x00 0x82 0x60 # CHECK: bnvc $4, $2, 8
+0x01 0x00 0x00 0x20 # CHECK: bovc $zero, $zero, 8
+0x01 0x00 0x40 0x20 # CHECK: bovc $2, $zero, 8
+0x01 0x00 0x82 0x20 # CHECK: bovc $4, $2, 8
0x80 0x18 0x84 0x46 # CHECK: cmp.af.s $f2, $f3, $f4
0x80 0x18 0xa4 0x46 # CHECK: cmp.af.d $f2, $f3, $f4
0x81 0x18 0x84 0x46 # CHECK: cmp.un.s $f2, $f3, $f4
@@ -117,8 +130,10 @@
0x9b 0x20 0x00 0x46 # CHECK: class.s $f2, $f4
0x9b 0x20 0x20 0x46 # CHECK: class.d $f2, $f4
0x09 0x04 0x80 0x00 # CHECK: jr.hb $4
+0x00 0x00 0x1b 0xd8 # CHECK: jrc $27
0x09 0xfc 0x80 0x00 # CHECK: jalr.hb $4
0x09 0x24 0xa0 0x00 # CHECK: jalr.hb $4, $5
+0x00 0x00 0x19 0xf8 # CHECK: jalrc $25
0xb6 0xb3 0x42 0x7e # CHECK: ll $2, -153($18)
0x26 0xec 0x6f 0x7e # CHECK: sc $15, -40($19)
0x51 0x58 0xa0 0x00 # CHECK: clo $11, $5
diff --git a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt
index 6af02fc61b86..7266848706d3 100644
--- a/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt
+++ b/test/MC/Disassembler/Mips/mips32r6/valid-mips32r6.txt
@@ -18,8 +18,10 @@
0x00 0x64 0x10 0xda # CHECK: mod $2, $3, $4
0x00 0x64 0x10 0xdb # CHECK: modu $2, $3, $4
0x00 0x80 0x04 0x09 # CHECK: jr.hb $4
+0xd8 0x1b 0x00 0x00 # CHECK: jrc $27
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
+0xf8 0x19 0x00 0x00 # CHECK: jalrc $25
0x00 0xa0 0x58 0x51 # CHECK: clo $11, $5
0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
@@ -33,22 +35,28 @@
0x02 0xdc 0x00 0x31 # CHECK: tgeu $22, $gp
0x03 0x80 0xe8 0x50 # CHECK: clz $sp, $gp
0x04 0x11 0x14 0x9b # CHECK: bal 21104
-# FIXME: The encode/decode functions are not inverses of each other.
-0x18 0x02 0x01 0x4d # CHECK: blezalc $2, 1332
-# FIXME: The encode/decode functions are not inverses of each other.
-0x18 0x42 0x01 0x4d # CHECK: bgezalc $2, 1332
-0x18 0x43 0x00 0x40 # CHECK: bgeuc $2, $3, 256
-# FIXME: The encode/decode functions are not inverses of each other.
-0x1c 0x02 0x01 0x4d # CHECK: bgtzalc $2, 1332
-# FIXME: The encode/decode functions are not inverses of each other.
-0x1c 0x42 0x01 0x4d # CHECK: bltzalc $2, 1332
-0x1c 0xa6 0x00 0x40 # CHECK: bltuc $5, $6, 256
-0x20 0x00 0x00 0x01 # CHECK: bovc $zero, $zero, 4
-# FIXME: The encode/decode functions are not inverses of each other.
-0x20 0x02 0x01 0x4d # CHECK: beqzalc $2, 1332
-0x20 0x40 0x00 0x01 # CHECK: bovc $2, $zero, 4
-0x20 0x82 0x00 0x01 # CHECK: bovc $4, $2, 4
-0x20 0xa6 0x00 0x40 # CHECK: beqc $5, $6, 256
+# The encode/decode functions are not inverses of each other.
+0x18 0x02 0x01 0x4d # CHECK: blezalc $2, 1336
+0x18 0x02 0xff 0xfa # CHECk: blezalc $2, -20
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x18 0x42 0x01 0x4d # CHECK: bgezalc $2, 1336
+0x18 0x42 0xff 0xfa # CHECK: bgezalc $2, -20
+0x18 0x43 0x00 0x40 # CHECK: bgeuc $2, $3, 260
+0x18 0x43 0xff 0xfa # CHECK: bgeuc $2, $3, -20
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x1c 0x02 0x01 0x4d # CHECK: bgtzalc $2, 1336
+0x1c 0x02 0xff 0xfa # CHECK: bgtzalc $2, -20
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x1c 0x42 0x01 0x4d # CHECK: bltzalc $2, 1336
+0x1c 0x42 0xff 0xfa # CHECK: bltzalc $2, -20
+0x1c 0xa6 0x00 0x40 # CHECK: bltuc $5, $6, 260
+0x1c 0xa6 0xff 0xfa # CHECK: bltuc $5, $6, -20
+0x20 0x00 0x00 0x01 # CHECK: bovc $zero, $zero, 8
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x20 0x02 0x01 0x4d # CHECK: beqzalc $2, 1336
+0x20 0x40 0x00 0x01 # CHECK: bovc $2, $zero, 8
+0x20 0x82 0x00 0x01 # CHECK: bovc $4, $2, 8
+0x20 0xa6 0x00 0x40 # CHECK: beqc $5, $6, 260
0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
@@ -143,32 +151,41 @@
0x49 0xbf 0x00 0x02 # CHECK: bc2nez $31, 12
0x49 0xc8 0x0d 0x43 # CHECK: ldc2 $8, -701($1)
0x49 0xf4 0x92 0x75 # CHECK: sdc2 $20, 629($18)
-0x58 0x05 0x00 0x40 # CHECK: blezc $5, 256
-0x58 0x43 0x00 0x40 # CHECK: bgec $2, $3, 256
-0x58 0xa5 0x00 0x40 # CHECK: bgezc $5, 256
-0x5c 0x05 0x00 0x40 # CHECK: bgtzc $5, 256
-0x5c 0xa5 0x00 0x40 # CHECK: bltzc $5, 256
-0x5c 0xa6 0x00 0x40 # CHECK: bltc $5, $6, 256
-0x60 0x00 0x00 0x01 # CHECK: bnvc $zero, $zero, 4
-# FIXME: The encode/decode functions are not inverses of each other.
-0x60 0x02 0x01 0x4d # CHECK: bnezalc $2, 1332
-0x60 0x40 0x00 0x01 # CHECK: bnvc $2, $zero, 4
-0x60 0x82 0x00 0x01 # CHECK: bnvc $4, $2, 4
-0x60 0xa6 0x00 0x40 # CHECK: bnec $5, $6, 256
+0x58 0x05 0x00 0x40 # CHECK: blezc $5, 260
+0x58 0x05 0xff 0xfa # CHECk: blezc $5, -20
+0x58 0x43 0x00 0x40 # CHECK: bgec $2, $3, 260
+0x58 0x43 0xff 0xfa # CHECK: bgec $2, $3, -20
+0x58 0xa5 0x00 0x40 # CHECK: bgezc $5, 260
+0x58 0xa5 0xff 0xfa # CHECK: bgezc $5, -20
+0x5c 0x05 0x00 0x40 # CHECK: bgtzc $5, 260
+0x5c 0x05 0xff 0xfa # CHECk: bgtzc $5, -20
+0x5c 0xa5 0x00 0x40 # CHECK: bltzc $5, 260
+0x5c 0xa5 0xff 0xfa # CHECK: bltzc $5, -20
+0x5c 0xa6 0x00 0x40 # CHECK: bltc $5, $6, 260
+0x5c 0xa6 0xff 0xfa # CHECK: bltc $5, $6, -20
+0x60 0x00 0x00 0x01 # CHECK: bnvc $zero, $zero, 8
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x60 0x02 0x01 0x4d # CHECK: bnezalc $2, 1336
+0x60 0x40 0x00 0x01 # CHECK: bnvc $2, $zero, 8
+0x60 0x82 0x00 0x01 # CHECK: bnvc $4, $2, 8
+0x60 0xa6 0x00 0x40 # CHECK: bnec $5, $6, 260
+0x60 0x43 0xff 0xfa # CHECK: bnec $2, $3, -20
0x7c 0x02 0x20 0x20 # CHECK: bitswap $4, $2
0x7c 0x43 0x22 0xa0 # CHECK: align $4, $2, $3, 2
0x7c 0xa1 0x04 0x25 # CHECK: cache 1, 8($5)
0x7c 0xa1 0x04 0x35 # CHECK: pref 1, 8($5)
0x7e 0x42 0xb3 0xb6 # CHECK: ll $2, -153($18)
0x7e 0x6f 0xec 0x26 # CHECK: sc $15, -40($19)
-0xc8 0x37 0x96 0xb8 # CHECK: bc 14572256
+0xc8 0x37 0x96 0xb8 # CHECK: bc 14572260
0xd8 0x05 0x01 0x00 # CHECK: jic $5, 256
-0xd8 0xa0 0x46 0x90 # CHECK: beqzc $5, 72256
-0xe8 0x37 0x96 0xb8 # CHECK: balc 14572256
+0xd8 0xa0 0x46 0x90 # CHECK: beqzc $5, 72260
+0xd8 0x5f 0xff 0xfa # CHECK: beqzc $2, -20
+0xe8 0x37 0x96 0xb8 # CHECK: balc 14572260
0xec 0x48 0x00 0x43 # CHECK: lwpc $2, 268
0xec 0x50 0x00 0x43 # CHECK: lwupc $2, 268
0xec 0x7e 0xff 0xff # CHECK: auipc $3, -1
0xec 0x7f 0x00 0x38 # CHECK: aluipc $3, 56
0xec 0x80 0x00 0x19 # CHECK: addiupc $4, 100
0xf8 0x05 0x01 0x00 # CHECK: jialc $5, 256
-0xf8 0xa0 0x46 0x90 # CHECK: bnezc $5, 72256
+0xf8 0xa0 0x46 0x90 # CHECK: bnezc $5, 72260
+0xf8 0x5f 0xff 0xfa # CHECK: bnezc $2, -20
diff --git a/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt b/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt
index 1d1044d32055..4a3d78cde553 100644
--- a/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt
+++ b/test/MC/Disassembler/Mips/mips4/valid-mips4-el.txt
@@ -204,11 +204,11 @@
0x08 0x98 0x4c 0x4f # CHECK: swxc1 $f19, $12($26)
0x34 0x00 0x03 0x00 # CHECK: teq $zero, $3
0x34 0x9b 0xa7 0x00 # CHECK: teq $5, $7, 620
-0xa0 0xbb 0xac 0x06 # CHECK: teqi $21, 48032
+0xa0 0xbb 0xac 0x06 # CHECK: teqi $21, -17504
0x30 0x00 0xea 0x00 # CHECK: tge $7, $10
0x30 0x55 0xb3 0x00 # CHECK: tge $5, $19, 340
0xa1 0x13 0x28 0x06 # CHECK: tgei $17, 5025
-0x33 0x90 0xa9 0x07 # CHECK: tgeiu $sp, 36915
+0x33 0x90 0xa9 0x07 # CHECK: tgeiu $sp, -28621
0x31 0x00 0xdc 0x02 # CHECK: tgeu $22, $gp
0xf1 0x5e 0x8e 0x02 # CHECK: tgeu $20, $14, 379
0x08 0x00 0x00 0x42 # CHECK: tlbp
@@ -217,13 +217,13 @@
0x06 0x00 0x00 0x42 # CHECK: tlbwr
0x32 0x00 0xed 0x01 # CHECK: tlt $15, $13
0x72 0x21 0x53 0x00 # CHECK: tlt $2, $19, 133
-0xbd 0xad 0xca 0x05 # CHECK: tlti $14, 44477
-0x2c 0xec 0xeb 0x07 # CHECK: tltiu $ra, 60460
+0xbd 0xad 0xca 0x05 # CHECK: tlti $14, -21059
+0x2c 0xec 0xeb 0x07 # CHECK: tltiu $ra, -5076
0x33 0x00 0x70 0x01 # CHECK: tltu $11, $16
0x33 0xfe 0x1d 0x02 # CHECK: tltu $16, $sp, 1016
0x36 0x00 0xd1 0x00 # CHECK: tne $6, $17
0x76 0xdd 0xe8 0x00 # CHECK: tne $7, $8, 885
-0x31 0x8c 0x8e 0x05 # CHECK: tnei $12, 35889
+0x31 0x8c 0x8e 0x05 # CHECK: tnei $12, -29647
0xc9 0xbd 0x20 0x46 # CHECK: trunc.l.d $f23, $f23
0x09 0xff 0x00 0x46 # CHECK: trunc.l.s $f28, $f31
0x8d 0x75 0x20 0x46 # CHECK: trunc.w.d $f22, $f14
diff --git a/test/MC/Disassembler/Mips/mips4/valid-mips4.txt b/test/MC/Disassembler/Mips/mips4/valid-mips4.txt
index 47ab90809ec6..f225d2cc220d 100644
--- a/test/MC/Disassembler/Mips/mips4/valid-mips4.txt
+++ b/test/MC/Disassembler/Mips/mips4/valid-mips4.txt
@@ -107,14 +107,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x09 0x33 0x00 0x2a # CHECK: j 80478376
0x0b 0x2a 0xd1 0x44 # CHECK: j 212550928
diff --git a/test/MC/Disassembler/Mips/mips64/valid-mips64.txt b/test/MC/Disassembler/Mips/mips64/valid-mips64.txt
index 2ba1ecdf5b8e..5b5427db1e10 100644
--- a/test/MC/Disassembler/Mips/mips64/valid-mips64.txt
+++ b/test/MC/Disassembler/Mips/mips64/valid-mips64.txt
@@ -147,14 +147,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt b/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt
index ac9d2b808622..5de751234c81 100644
--- a/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt
+++ b/test/MC/Disassembler/Mips/mips64r2/valid-mips64r2.txt
@@ -161,14 +161,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt b/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt
index 31b9f66bce12..01c02ad82224 100644
--- a/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt
+++ b/test/MC/Disassembler/Mips/mips64r3/valid-mips64r3.txt
@@ -158,14 +158,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt b/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt
index 1fa0e629b375..12e5294d36da 100644
--- a/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt
+++ b/test/MC/Disassembler/Mips/mips64r5/valid-mips64r5.txt
@@ -158,14 +158,14 @@
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 0x8e 0x8c 0x31 # CHECK: tnei $12, -29647
0x05 0x93 0x07 0x1f # CHECK: bgezall $12, 7296
-0x05 0xca 0xad 0xbd # CHECK: tlti $14, 44477
+0x05 0xca 0xad 0xbd # CHECK: tlti $14, -21059
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
+0x06 0xac 0xbb 0xa0 # CHECK: teqi $21, -17504
+0x07 0xa9 0x90 0x33 # CHECK: tgeiu $sp, -28621
+0x07 0xeb 0xec 0x2c # CHECK: tltiu $ra, -5076
0x08 0x00 0x00 0x01 # CHECK: j 4
0x08 0x00 0x01 0x4c # CHECK: j 1328
0x09 0x33 0x00 0x2a # CHECK: j 80478376
diff --git a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt
index 08f5e04ab4fa..2515e097c96a 100644
--- a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt
+++ b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6-el.txt
@@ -7,8 +7,8 @@
0xe9 0xff 0x62 0x3c # CHECK: aui $3, $2, -23
0xff 0xff 0x7e 0xec # CHECK: auipc $3, -1
0x9b 0x14 0x11 0x04 # CHECK: bal 21104
-0xb8 0x96 0x37 0xe8 # CHECK: balc 14572256
-0xb8 0x96 0x37 0xc8 # CHECK: bc 14572256
+0xb8 0x96 0x37 0xe8 # CHECK: balc 14572260
+0xb8 0x96 0x37 0xc8 # CHECK: bc 14572260
0x01 0x00 0x20 0x45 # CHECK: bc1eqz $f0, 8
0x01 0x00 0x3f 0x45 # CHECK: bc1eqz $f31, 8
0x01 0x00 0xa0 0x45 # CHECK: bc1nez $f0, 8
@@ -17,31 +17,46 @@
0x02 0x00 0x3f 0x49 # CHECK: bc2eqz $31, 12
0x02 0x00 0xa0 0x49 # CHECK: bc2nez $0, 12
0x02 0x00 0xbf 0x49 # CHECK: bc2nez $31, 12
-0x40 0x00 0xa6 0x20 # CHECK: beqc $5, $6, 256
-0x4d 0x01 0x02 0x20 # CHECK: beqzalc $2, 1332
-0x90 0x46 0xa0 0xd8 # CHECK: beqzc $5, 72256
-0x40 0x00 0x43 0x58 # CHECK: bgec $2, $3, 256
-0x40 0x00 0x43 0x18 # CHECK: bgeuc $2, $3, 256
-0x4d 0x01 0x42 0x18 # CHECK: bgezalc $2, 1332
-0x40 0x00 0xa5 0x58 # CHECK: bgezc $5, 256
-0x4d 0x01 0x02 0x1c # CHECK: bgtzalc $2, 1332
-0x40 0x00 0x05 0x5c # CHECK: bgtzc $5, 256
+0x40 0x00 0xa6 0x20 # CHECK: beqc $5, $6, 260
+0x4d 0x01 0x02 0x20 # CHECK: beqzalc $2, 1336
+0x90 0x46 0xa0 0xd8 # CHECK: beqzc $5, 72260
+0xfa 0xff 0x5f 0xd8 # CHECK: beqzc $2, -20
+0x40 0x00 0x43 0x58 # CHECK: bgec $2, $3, 260
+0xfa 0xff 0x43 0x58 # CHECK: bgec $2, $3, -20
+0x40 0x00 0x43 0x18 # CHECK: bgeuc $2, $3, 260
+0xfa 0xff 0x43 0x18 # CHECK: bgeuc $2, $3, -20
+0x4d 0x01 0x42 0x18 # CHECK: bgezalc $2, 1336
+0xfa 0xff 0x42 0x18 # CHECK: bgezalc $2, -20
+0x40 0x00 0xa5 0x58 # CHECK: bgezc $5, 260
+0xfa 0xff 0xa5 0x58 # CHECK: bgezc $5, -20
+0x4d 0x01 0x02 0x1c # CHECK: bgtzalc $2, 1336
+0xfa 0xff 0x02 0x1c # CHECK: bgtzalc $2, -20
+0x40 0x00 0x05 0x5c # CHECK: bgtzc $5, 260
+0xfa 0xff 0x05 0x5c # CHECK: bgtzc $5, -20
0x20 0x20 0x02 0x7c # CHECK: bitswap $4, $2
-0x4d 0x01 0x02 0x18 # CHECK: blezalc $2, 1332
-0x40 0x00 0x05 0x58 # CHECK: blezc $5, 256
-0x40 0x00 0xa6 0x5c # CHECK: bltc $5, $6, 256
-0x40 0x00 0xa6 0x1c # CHECK: bltuc $5, $6, 256
-0x4d 0x01 0x42 0x1c # CHECK: bltzalc $2, 1332
-0x40 0x00 0xa5 0x5c # CHECK: bltzc $5, 256
-0x40 0x00 0xa6 0x60 # CHECK: bnec $5, $6, 256
-0x4d 0x01 0x02 0x60 # CHECK: bnezalc $2, 1332
-0x90 0x46 0xa0 0xf8 # CHECK: bnezc $5, 72256
-0x01 0x00 0x40 0x60 # CHECK: bnvc $2, $zero, 4
-0x01 0x00 0x82 0x60 # CHECK: bnvc $4, $2, 4
-0x01 0x00 0x00 0x60 # CHECK: bnvc $zero, $zero, 4
-0x01 0x00 0x40 0x20 # CHECK: bovc $2, $zero, 4
-0x01 0x00 0x82 0x20 # CHECK: bovc $4, $2, 4
-0x01 0x00 0x00 0x20 # CHECK: bovc $zero, $zero, 4
+0x4d 0x01 0x02 0x18 # CHECK: blezalc $2, 1336
+0xfa 0xff 0x02 0x18 # CHECK: blezalc $2, -20
+0x40 0x00 0x05 0x58 # CHECK: blezc $5, 260
+0xfa 0xff 0x05 0x58 # CHECK: blezc $5, -20
+0x40 0x00 0xa6 0x5c # CHECK: bltc $5, $6, 260
+0xfa 0xff 0xa6 0x5c # CHECK: bltc $5, $6, -20
+0x40 0x00 0xa6 0x1c # CHECK: bltuc $5, $6, 260
+0xfa 0xff 0xa6 0x1c # CHECK: bltuc $5, $6, -20
+0x4d 0x01 0x42 0x1c # CHECK: bltzalc $2, 1336
+0xfa 0xff 0x42 0x1c # CHECK: bltzalc $2, -20
+0x40 0x00 0xa5 0x5c # CHECK: bltzc $5, 260
+0xfa 0xff 0xa5 0x5c # CHECK: bltzc $5, -20
+0x40 0x00 0xa6 0x60 # CHECK: bnec $5, $6, 260
+0xfa 0xff 0x43 0x60 # CHECK: bnec $2, $3, -20
+0x4d 0x01 0x02 0x60 # CHECK: bnezalc $2, 1336
+0x90 0x46 0xa0 0xf8 # CHECK: bnezc $5, 72260
+0xfa 0xff 0x5f 0xf8 # CHECK: bnezc $2, -20
+0x01 0x00 0x40 0x60 # CHECK: bnvc $2, $zero, 8
+0x01 0x00 0x82 0x60 # CHECK: bnvc $4, $2, 8
+0x01 0x00 0x00 0x60 # CHECK: bnvc $zero, $zero, 8
+0x01 0x00 0x40 0x20 # CHECK: bovc $2, $zero, 8
+0x01 0x00 0x82 0x20 # CHECK: bovc $4, $2, 8
+0x01 0x00 0x00 0x20 # CHECK: bovc $zero, $zero, 8
0x25 0x04 0xa1 0x7c # CHECK: cache 1, 8($5)
0x9b 0x20 0x20 0x46 # CHECK: class.d $f2, $f4
0x9b 0x20 0x00 0x46 # CHECK: class.s $f2, $f4
@@ -104,8 +119,10 @@
0x20 0x60 0x6e 0x41 # CHECK: ei $14
0x09 0xfc 0x80 0x00 # CHECK: jalr.hb $4
0x09 0x24 0xa0 0x00 # CHECK: jalr.hb $4, $5
+0x00 0x00 0x19 0xf8 # CHECK: jalrc $25
0x00 0x01 0x05 0xf8 # CHECK: jialc $5, 256
0x00 0x01 0x05 0xd8 # CHECK: jic $5, 256
+0x00 0x00 0x1b 0xd8 # CHECK: jrc $27
0x09 0x04 0x80 0x00 # CHECK: jr.hb $4
0x43 0x0d 0xc8 0x49 # CHECK: ldc2 $8, -701($1)
0x48 0x3c 0x58 0xec # CHECK: ldpc $2, 123456
diff --git a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt
index 7fa27a7c5420..3c3750a9fed2 100644
--- a/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt
+++ b/test/MC/Disassembler/Mips/mips64r6/valid-mips64r6.txt
@@ -29,8 +29,10 @@
0x00 0x64 0x10 0xde # CHECK: dmod $2, $3, $4
0x00 0x64 0x10 0xdf # CHECK: dmodu $2, $3, $4
0x00 0x80 0x04 0x09 # CHECK: jr.hb $4
+0xd8 0x1b 0x00 0x00 # CHECK: jrc $27
0x00 0x80 0xfc 0x09 # CHECK: jalr.hb $4
0x00 0xa0 0x24 0x09 # CHECK: jalr.hb $4, $5
+0xf8 0x19 0x00 0x00 # CHECK: jalrc $25
0x00 0xa0 0x58 0x51 # CHECK: clo $11, $5
0x00 0xa7 0x9b 0x34 # CHECK: teq $5, $7, 620
0x00 0xb3 0x55 0x30 # CHECK: tge $5, $19, 340
@@ -50,22 +52,28 @@
0x04 0x11 0x14 0x9b # CHECK: bal 21104
0x04 0x66 0x56 0x78 # CHECK: dahi $3, 22136
0x04 0x7e 0xab 0xcd # CHECK: dati $3, -21555
-# FIXME: The encode/decode functions are not inverses of each other.
-0x18 0x02 0x01 0x4d # CHECK: blezalc $2, 1332
-# FIXME: The encode/decode functions are not inverses of each other.
-0x18 0x42 0x01 0x4d # CHECK: bgezalc $2, 1332
-0x18 0x43 0x00 0x40 # CHECK: bgeuc $2, $3, 256
-# FIXME: The encode/decode functions are not inverses of each other.
-0x1c 0x02 0x01 0x4d # CHECK: bgtzalc $2, 1332
-# FIXME: The encode/decode functions are not inverses of each other.
-0x1c 0x42 0x01 0x4d # CHECK: bltzalc $2, 1332
-0x1c 0xa6 0x00 0x40 # CHECK: bltuc $5, $6, 256
-0x20 0x00 0x00 0x01 # CHECK: bovc $zero, $zero, 4
-# FIXME: The encode/decode functions are not inverses of each other.
-0x20 0x02 0x01 0x4d # CHECK: beqzalc $2, 1332
-0x20 0x40 0x00 0x01 # CHECK: bovc $2, $zero, 4
-0x20 0x82 0x00 0x01 # CHECK: bovc $4, $2, 4
-0x20 0xa6 0x00 0x40 # CHECK: beqc $5, $6, 256
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x18 0x02 0x01 0x4d # CHECK: blezalc $2, 1336
+0x18 0x02 0xff 0xfa # CHECk: blezalc $2, -20
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x18 0x42 0x01 0x4d # CHECK: bgezalc $2, 1336
+0x18 0x42 0xff 0xfa # CHECK: bgezalc $2, -20
+0x18 0x43 0x00 0x40 # CHECK: bgeuc $2, $3, 260
+0x18 0x43 0xff 0xfa # CHECK: bgeuc $2, $3, -20
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x1c 0x02 0x01 0x4d # CHECK: bgtzalc $2, 1336
+0x1c 0x02 0xff 0xfa # CHECK: bgtzalc $2, -20
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x1c 0x42 0x01 0x4d # CHECK: bltzalc $2, 1336
+0x1c 0x42 0xff 0xfa # CHECK: bltzalc $2, -20
+0x1c 0xa6 0x00 0x40 # CHECK: bltuc $5, $6, 260
+0x1c 0xa6 0xff 0xfa # CHECK: bltuc $5, $6, -20
+0x20 0x00 0x00 0x01 # CHECK: bovc $zero, $zero, 8
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x20 0x02 0x01 0x4d # CHECK: beqzalc $2, 1336
+0x20 0x40 0x00 0x01 # CHECK: bovc $2, $zero, 8
+0x20 0x82 0x00 0x01 # CHECK: bovc $4, $2, 8
+0x20 0xa6 0x00 0x40 # CHECK: beqc $5, $6, 260
0x25 0x29 0x00 0x0a # CHECK: addiu $9, $9, 10
0x30 0x42 0x00 0x04 # CHECK: andi $2, $2, 4
0x34 0x42 0x00 0x04 # CHECK: ori $2, $2, 4
@@ -162,18 +170,25 @@
0x49 0xbf 0x00 0x02 # CHECK: bc2nez $31, 12
0x49 0xc8 0x0d 0x43 # CHECK: ldc2 $8, -701($1)
0x49 0xf4 0x92 0x75 # CHECK: sdc2 $20, 629($18)
-0x58 0x05 0x00 0x40 # CHECK: blezc $5, 256
-0x58 0x43 0x00 0x40 # CHECK: bgec $2, $3, 256
-0x58 0xa5 0x00 0x40 # CHECK: bgezc $5, 256
-0x5c 0x05 0x00 0x40 # CHECK: bgtzc $5, 256
-0x5c 0xa5 0x00 0x40 # CHECK: bltzc $5, 256
-0x5c 0xa6 0x00 0x40 # CHECK: bltc $5, $6, 256
-0x60 0x00 0x00 0x01 # CHECK: bnvc $zero, $zero, 4
-# FIXME: The encode/decode functions are not inverses of each other.
-0x60 0x02 0x01 0x4d # CHECK: bnezalc $2, 1332
-0x60 0x40 0x00 0x01 # CHECK: bnvc $2, $zero, 4
-0x60 0x82 0x00 0x01 # CHECK: bnvc $4, $2, 4
-0x60 0xa6 0x00 0x40 # CHECK: bnec $5, $6, 256
+0x58 0x05 0x00 0x40 # CHECK: blezc $5, 260
+0x58 0x05 0xff 0xfa # CHECk: blezc $5, -20
+0x58 0x43 0x00 0x40 # CHECK: bgec $2, $3, 260
+0x58 0x43 0xff 0xfa # CHECK: bgec $2, $3, -20
+0x58 0xa5 0x00 0x40 # CHECK: bgezc $5, 260
+0x58 0xa5 0xff 0xfa # CHECK: bgezc $5, -20
+0x5c 0x05 0x00 0x40 # CHECK: bgtzc $5, 260
+0x5c 0x05 0xff 0xfa # CHECk: bgtzc $5, -20
+0x5c 0xa5 0x00 0x40 # CHECK: bltzc $5, 260
+0x5c 0xa5 0xff 0xfa # CHECK: bltzc $5, -20
+0x5c 0xa6 0x00 0x40 # CHECK: bltc $5, $6, 260
+0x5c 0xa6 0xff 0xfa # CHECK: bltc $5, $6, -20
+0x60 0x00 0x00 0x01 # CHECK: bnvc $zero, $zero, 8
+# The encode/decode functions are not inverses of each other in the immediate case.
+0x60 0x02 0x01 0x4d # CHECK: bnezalc $2, 1336
+0x60 0x40 0x00 0x01 # CHECK: bnvc $2, $zero, 8
+0x60 0x82 0x00 0x01 # CHECK: bnvc $4, $2, 8
+0x60 0xa6 0x00 0x40 # CHECK: bnec $5, $6, 260
+0x60 0x43 0xff 0xfa # CHECK: bnec $2, $3, -20
0x74 0x62 0x12 0x34 # CHECK: daui $3, $2, 4660
0x7c 0x02 0x20 0x20 # CHECK: bitswap $4, $2
0x7c 0x02 0x20 0x24 # CHECK: dbitswap $4, $2
@@ -185,10 +200,11 @@
0x7e 0x6f 0xec 0x26 # CHECK: sc $15, -40($19)
0x7f 0xaf 0xe6 0xa7 # CHECK: scd $15, -51($sp)
0x7f 0xe0 0x38 0x37 # CHECK: lld $zero, 112($ra)
-0xc8 0x37 0x96 0xb8 # CHECK: bc 14572256
+0xc8 0x37 0x96 0xb8 # CHECK: bc 14572260
0xd8 0x05 0x01 0x00 # CHECK: jic $5, 256
-0xd8 0xa0 0x46 0x90 # CHECK: beqzc $5, 72256
-0xe8 0x37 0x96 0xb8 # CHECK: balc 14572256
+0xd8 0xa0 0x46 0x90 # CHECK: beqzc $5, 72260
+0xd8 0x5f 0xff 0xfa # CHECK: beqzc $2, -20
+0xe8 0x37 0x96 0xb8 # CHECK: balc 14572260
0xec 0x48 0x00 0x43 # CHECK: lwpc $2, 268
0xec 0x50 0x00 0x43 # CHECK: lwupc $2, 268
0xec 0x58 0x3c 0x48 # CHECK: ldpc $2, 123456
@@ -196,4 +212,5 @@
0xec 0x7f 0x00 0x38 # CHECK: aluipc $3, 56
0xec 0x80 0x00 0x19 # CHECK: addiupc $4, 100
0xf8 0x05 0x01 0x00 # CHECK: jialc $5, 256
-0xf8 0xa0 0x46 0x90 # CHECK: bnezc $5, 72256
+0xf8 0xa0 0x46 0x90 # CHECK: bnezc $5, 72260
+0xf8 0x5f 0xff 0xfa # CHECK: bnezc $2, -20
diff --git a/test/MC/Disassembler/Mips/mips64r6/valid-xfail-mips64r6.txt b/test/MC/Disassembler/Mips/mips64r6/valid-xfail-mips64r6.txt
index 8ca8b815414c..3fa9fec50637 100644
--- a/test/MC/Disassembler/Mips/mips64r6/valid-xfail-mips64r6.txt
+++ b/test/MC/Disassembler/Mips/mips64r6/valid-xfail-mips64r6.txt
@@ -3,16 +3,16 @@
#
# RUN: llvm-mc %s -disassemble -triple=mips-unknown-linux -mcpu=mips64r6 | FileCheck %s
# XFAIL: *
-0x20 0x40 0x00 0x01 # CHECK: bovc $0, $2, 4
-0x20 0x82 0x00 0x01 # CHECK: bovc $2, $4, 4
-0x60 0x40 0x00 0x01 # CHECK: bnvc $0, $2, 4
-0x60 0x82 0x00 0x01 # CHECK: bnvc $2, $4, 4
-0x20 0xc0 0x00 0x40 # CHECK: beqc $6, $zero, 256
-0x20 0xa0 0x00 0x40 # CHECK: beqc $5, $zero, 256
-0x20 0xa6 0x00 0x40 # CHECK: beqc $5, $6, 256
-0x60 0xc0 0x00 0x40 # CHECK: bnec $6, $zero, 256
-0x60 0xa0 0x00 0x40 # CHECK: bnec $5, $zero, 256
-0x60 0xa6 0x00 0x40 # CHECK: bnec $5, $6, 256
+0x20 0x40 0x00 0x01 # CHECK: bovc $0, $2, 8
+0x20 0x82 0x00 0x01 # CHECK: bovc $2, $4, 8
+0x60 0x40 0x00 0x01 # CHECK: bnvc $0, $2, 8
+0x60 0x82 0x00 0x01 # CHECK: bnvc $2, $4, 8
+0x20 0xc0 0x00 0x40 # CHECK: beqc $6, $zero, 260
+0x20 0xa0 0x00 0x40 # CHECK: beqc $5, $zero, 260
+0x20 0xa6 0x00 0x40 # CHECK: beqc $5, $6, 260
+0x60 0xc0 0x00 0x40 # CHECK: bnec $6, $zero, 260
+0x60 0xa0 0x00 0x40 # CHECK: bnec $5, $zero, 260
+0x60 0xa6 0x00 0x40 # CHECK: bnec $5, $6, 260
0x64 0x58 0x46 0x9f # CHECK: daddiu $24, $2, 18079
0x66 0x73 0x69 0x3f # CHECK: daddiu $19, $19, 26943
0x65 0x6f 0xec 0x5f # CHECK: daddiu $15, $11, -5025