microMIPS/opcodes: Refer FPRs rather than FCRs with DMTC1

The DMTC1 instruction operates on a floating-point general register as
its second operand, however in the disassembly of the microMIPS encoding
a floating-point control register is shown instead.  This is due to an
incorrect ordering of the two "dmtc1" entries in the opcode table, which
gives precedence to one using the `G' aka coprocessor format over one
using the `S' or floating-point register format.

The coprocessor format, or OP_REG_COPRO, is used so that GAS supports
referring to FPRs by their numbers in assembly, such as $0, $1, etc.
however in the case of CP1/FPU it is also used by the disassembler to
decode those numbers to the names of corresponding control registers.
This in turn causes nonsensical disassembly such as:

	dmtc1	a1,c1_fir

in a reference to $f0.  It has been like this ever since microMIPS ISA
support has been added.

Correct the ordering of the two entries then by swapping them with each
other, making disassembly output consistent with the regular MIPS DMTC1
instruction as well all the remaining CP1 move instructions.  Adjust all
the test cases affected accordingly.

	opcodes/
	* micromips-opc.c (micromips_opcodes): Swap the two "dmtc1"
	entries with each other.

	gas/
	* testsuite/gas/mips/micromips.d: Update disassembly according
	to "dmtc1" entry fix with opcodes.
	* testsuite/gas/mips/micromips-compact.d: Likewise.
	* testsuite/gas/mips/micromips-insn32.d: Likewise.
	* testsuite/gas/mips/micromips-noinsn32.d: Likewise.
	* testsuite/gas/mips/micromips-trap.d: Likewise.
	* testsuite/gas/mips/micromips@isa-override-1.d: Likewise.

9 files changed, 337 insertions, 322 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1eb7b39890b..3b94c5d98ed 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,15 @@
 2021-05-29  Maciej W. Rozycki  <macro@orcam.me.uk>
 
+	* testsuite/gas/mips/micromips.d: Update disassembly according
+	to "dmtc1" entry fix with opcodes.
+	* testsuite/gas/mips/micromips-compact.d: Likewise.
+	* testsuite/gas/mips/micromips-insn32.d: Likewise.
+	* testsuite/gas/mips/micromips-noinsn32.d: Likewise.
+	* testsuite/gas/mips/micromips-trap.d: Likewise.
+	* testsuite/gas/mips/micromips@isa-override-1.d: Likewise.
+
+2021-05-29  Maciej W. Rozycki  <macro@orcam.me.uk>
+
 	* config/tc-mips.c (FCSR): New macro.
 	(macro) <M_TRUNCWS, M_TRUNCWD>: Use it in place of RA.
 
diff --git a/gas/testsuite/gas/mips/micromips-compact.d b/gas/testsuite/gas/mips/micromips-compact.d
index c0fc89c48e6..34f61862faa 100644
--- a/gas/testsuite/gas/mips/micromips-compact.d
+++ b/gas/testsuite/gas/mips/micromips-compact.d
@@ -6765,70 +6765,70 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	54bd 243b 	dmfc1	a1,\$f29
 [ 0-9a-f]+:	54be 243b 	dmfc1	a1,\$f30
 [ 0-9a-f]+:	54bf 243b 	dmfc1	a1,\$f31
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
 [ 0-9a-f]+:	0040 6d3c 	dmfc2	v0,\$0
 [ 0-9a-f]+:	0041 6d3c 	dmfc2	v0,\$1
 [ 0-9a-f]+:	0042 6d3c 	dmfc2	v0,\$2
diff --git a/gas/testsuite/gas/mips/micromips-insn32.d b/gas/testsuite/gas/mips/micromips-insn32.d
index c8998c64782..f4282ffc51f 100644
--- a/gas/testsuite/gas/mips/micromips-insn32.d
+++ b/gas/testsuite/gas/mips/micromips-insn32.d
@@ -6789,70 +6789,70 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	54bd 243b 	dmfc1	a1,\$f29
 [ 0-9a-f]+:	54be 243b 	dmfc1	a1,\$f30
 [ 0-9a-f]+:	54bf 243b 	dmfc1	a1,\$f31
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
 [ 0-9a-f]+:	0040 6d3c 	dmfc2	v0,\$0
 [ 0-9a-f]+:	0041 6d3c 	dmfc2	v0,\$1
 [ 0-9a-f]+:	0042 6d3c 	dmfc2	v0,\$2
diff --git a/gas/testsuite/gas/mips/micromips-noinsn32.d b/gas/testsuite/gas/mips/micromips-noinsn32.d
index 2258cb9637c..75bfaf7db35 100644
--- a/gas/testsuite/gas/mips/micromips-noinsn32.d
+++ b/gas/testsuite/gas/mips/micromips-noinsn32.d
@@ -6766,70 +6766,70 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	54bd 243b 	dmfc1	a1,\$f29
 [ 0-9a-f]+:	54be 243b 	dmfc1	a1,\$f30
 [ 0-9a-f]+:	54bf 243b 	dmfc1	a1,\$f31
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
 [ 0-9a-f]+:	0040 6d3c 	dmfc2	v0,\$0
 [ 0-9a-f]+:	0041 6d3c 	dmfc2	v0,\$1
 [ 0-9a-f]+:	0042 6d3c 	dmfc2	v0,\$2
diff --git a/gas/testsuite/gas/mips/micromips-trap.d b/gas/testsuite/gas/mips/micromips-trap.d
index e96c4493893..68f5a028684 100644
--- a/gas/testsuite/gas/mips/micromips-trap.d
+++ b/gas/testsuite/gas/mips/micromips-trap.d
@@ -6757,70 +6757,70 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	54bd 243b 	dmfc1	a1,\$f29
 [ 0-9a-f]+:	54be 243b 	dmfc1	a1,\$f30
 [ 0-9a-f]+:	54bf 243b 	dmfc1	a1,\$f31
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
 [ 0-9a-f]+:	0040 6d3c 	dmfc2	v0,\$0
 [ 0-9a-f]+:	0041 6d3c 	dmfc2	v0,\$1
 [ 0-9a-f]+:	0042 6d3c 	dmfc2	v0,\$2
diff --git a/gas/testsuite/gas/mips/micromips.d b/gas/testsuite/gas/mips/micromips.d
index 7c24c35cc7a..86511b94cb4 100644
--- a/gas/testsuite/gas/mips/micromips.d
+++ b/gas/testsuite/gas/mips/micromips.d
@@ -6844,70 +6844,70 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	54bd 243b 	dmfc1	a1,\$f29
 [ 0-9a-f]+:	54be 243b 	dmfc1	a1,\$f30
 [ 0-9a-f]+:	54bf 243b 	dmfc1	a1,\$f31
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
-[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,c1_fir
-[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,c1_ufr
-[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$2
-[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$3
-[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,c1_unfr
-[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$5
-[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$6
-[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$7
-[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$8
-[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$9
-[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$10
-[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$11
-[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$12
-[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$13
-[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$14
-[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$15
-[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$16
-[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$17
-[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$18
-[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$19
-[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$20
-[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$21
-[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$22
-[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$23
-[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$24
-[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,c1_fccr
-[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,c1_fexr
-[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$27
-[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,c1_fenr
-[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$29
-[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$30
-[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,c1_fcsr
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
+[ 0-9a-f]+:	54a0 2c3b 	dmtc1	a1,\$f0
+[ 0-9a-f]+:	54a1 2c3b 	dmtc1	a1,\$f1
+[ 0-9a-f]+:	54a2 2c3b 	dmtc1	a1,\$f2
+[ 0-9a-f]+:	54a3 2c3b 	dmtc1	a1,\$f3
+[ 0-9a-f]+:	54a4 2c3b 	dmtc1	a1,\$f4
+[ 0-9a-f]+:	54a5 2c3b 	dmtc1	a1,\$f5
+[ 0-9a-f]+:	54a6 2c3b 	dmtc1	a1,\$f6
+[ 0-9a-f]+:	54a7 2c3b 	dmtc1	a1,\$f7
+[ 0-9a-f]+:	54a8 2c3b 	dmtc1	a1,\$f8
+[ 0-9a-f]+:	54a9 2c3b 	dmtc1	a1,\$f9
+[ 0-9a-f]+:	54aa 2c3b 	dmtc1	a1,\$f10
+[ 0-9a-f]+:	54ab 2c3b 	dmtc1	a1,\$f11
+[ 0-9a-f]+:	54ac 2c3b 	dmtc1	a1,\$f12
+[ 0-9a-f]+:	54ad 2c3b 	dmtc1	a1,\$f13
+[ 0-9a-f]+:	54ae 2c3b 	dmtc1	a1,\$f14
+[ 0-9a-f]+:	54af 2c3b 	dmtc1	a1,\$f15
+[ 0-9a-f]+:	54b0 2c3b 	dmtc1	a1,\$f16
+[ 0-9a-f]+:	54b1 2c3b 	dmtc1	a1,\$f17
+[ 0-9a-f]+:	54b2 2c3b 	dmtc1	a1,\$f18
+[ 0-9a-f]+:	54b3 2c3b 	dmtc1	a1,\$f19
+[ 0-9a-f]+:	54b4 2c3b 	dmtc1	a1,\$f20
+[ 0-9a-f]+:	54b5 2c3b 	dmtc1	a1,\$f21
+[ 0-9a-f]+:	54b6 2c3b 	dmtc1	a1,\$f22
+[ 0-9a-f]+:	54b7 2c3b 	dmtc1	a1,\$f23
+[ 0-9a-f]+:	54b8 2c3b 	dmtc1	a1,\$f24
+[ 0-9a-f]+:	54b9 2c3b 	dmtc1	a1,\$f25
+[ 0-9a-f]+:	54ba 2c3b 	dmtc1	a1,\$f26
+[ 0-9a-f]+:	54bb 2c3b 	dmtc1	a1,\$f27
+[ 0-9a-f]+:	54bc 2c3b 	dmtc1	a1,\$f28
+[ 0-9a-f]+:	54bd 2c3b 	dmtc1	a1,\$f29
+[ 0-9a-f]+:	54be 2c3b 	dmtc1	a1,\$f30
+[ 0-9a-f]+:	54bf 2c3b 	dmtc1	a1,\$f31
 [ 0-9a-f]+:	0040 6d3c 	dmfc2	v0,\$0
 [ 0-9a-f]+:	0041 6d3c 	dmfc2	v0,\$1
 [ 0-9a-f]+:	0042 6d3c 	dmfc2	v0,\$2
diff --git a/gas/testsuite/gas/mips/micromips@isa-override-1.d b/gas/testsuite/gas/mips/micromips@isa-override-1.d
index 34036968183..9218ca5cedb 100644
--- a/gas/testsuite/gas/mips/micromips@isa-override-1.d
+++ b/gas/testsuite/gas/mips/micromips@isa-override-1.d
@@ -28,7 +28,7 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 5821 8000 	dsll	at,at,0x10
 [0-9a-f]+ <[^>]*> 5021 89ab 	ori	at,at,0x89ab
 [0-9a-f]+ <[^>]*> 5821 8000 	dsll	at,at,0x10
-[0-9a-f]+ <[^>]*> 5422 2c3b 	dmtc1	at,\$2
+[0-9a-f]+ <[^>]*> 5422 2c3b 	dmtc1	at,\$f2
 [0-9a-f]+ <[^>]*> fc44 0000 	lw	v0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc64 0004 	lw	v1,4\(a0\)
 [0-9a-f]+ <[^>]*> 41a1 89ab 	lui	at,0x89ab
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7ba0c02579d..48c62e8039d 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-29  Maciej W. Rozycki  <macro@orcam.me.uk>
+
+	* micromips-opc.c (micromips_opcodes): Swap the two "dmtc1"
+	entries with each other.
+
 2021-05-27  Peter Bergner  <bergner@linux.ibm.com>
 
 	* ppc-opc.c (powerpc_opcodes) <xxmr, xxlnot>: New extended mnemonics.
diff --git a/opcodes/micromips-opc.c b/opcodes/micromips-opc.c
index 6553c29ef43..fca0b831626 100644
--- a/opcodes/micromips-opc.c
+++ b/opcodes/micromips-opc.c
@@ -633,8 +633,8 @@ const struct mips_opcode micromips_opcodes[] =
 {"dmtgc0",		"t,G,H",	0x580006fc, 0xfc00c7ff,	RD_1|WR_C0|WR_CC,	0,		0,		IVIRT64, 0 },
 {"dmfc1",		"t,S",		0x5400243b, 0xfc00ffff,	WR_1|RD_2|FP_S|LC,	0,		I3,		0,	0 },
 {"dmfc1",		"t,G",		0x5400243b, 0xfc00ffff,	WR_1|RD_2|FP_S|LC,	0,		I3,		0,	0 },
-{"dmtc1",		"t,G",		0x54002c3b, 0xfc00ffff,	RD_1|WR_2|FP_S|CM,	0,		I3,		0,	0 },
 {"dmtc1",		"t,S",		0x54002c3b, 0xfc00ffff,	RD_1|WR_2|FP_S|CM,	0,		I3,		0,	0 },
+{"dmtc1",		"t,G",		0x54002c3b, 0xfc00ffff,	RD_1|WR_2|FP_S|CM,	0,		I3,		0,	0 },
 {"dmfc2",		"t,G",		0x00006d3c, 0xfc00ffff,	WR_1|RD_C2,		0,		I3,		0,	0 },
 /*{"dmfc2",		"t,G,H",	0x58000283, 0xfc001fff,	WR_1|RD_C2,		0,		I3,		0,	0 },*/
 {"dmtc2",		"t,G",		0x00007d3c, 0xfc00ffff,	RD_1|WR_C2|WR_CC,	0,		I3,		0,	0 },