[committed,02/18] microMIPS/opcodes: Refer FPRs rather than FCRs with DMTC1

Message ID alpine.DEB.2.21.2105271517210.11113@angie.orcam.me.uk
State New
Headers show
Series
  • MIPS coprocessor opcodes handling fixes
Related show

Commit Message

Maciej W. Rozycki May 29, 2021, 1:36 a.m.
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.
---
 gas/testsuite/gas/mips/micromips-compact.d        |  128 +++++++++++-----------
 gas/testsuite/gas/mips/micromips-insn32.d         |  128 +++++++++++-----------
 gas/testsuite/gas/mips/micromips-noinsn32.d       |  128 +++++++++++-----------
 gas/testsuite/gas/mips/micromips-trap.d           |  128 +++++++++++-----------
 gas/testsuite/gas/mips/micromips.d                |  128 +++++++++++-----------
 gas/testsuite/gas/mips/micromips@isa-override-1.d |    2 
 opcodes/micromips-opc.c                           |    2 
 7 files changed, 322 insertions(+), 322 deletions(-)

binutils-umips-opcodes-dmtc1.diff

Patch

Index: binutils-gdb/gas/testsuite/gas/mips/micromips-compact.d
===================================================================
--- binutils-gdb.orig/gas/testsuite/gas/mips/micromips-compact.d
+++ binutils-gdb/gas/testsuite/gas/mips/micromips-compact.d
@@ -6765,70 +6765,70 @@ 
 [ 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
Index: binutils-gdb/gas/testsuite/gas/mips/micromips-insn32.d
===================================================================
--- binutils-gdb.orig/gas/testsuite/gas/mips/micromips-insn32.d
+++ binutils-gdb/gas/testsuite/gas/mips/micromips-insn32.d
@@ -6789,70 +6789,70 @@ 
 [ 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
Index: binutils-gdb/gas/testsuite/gas/mips/micromips-noinsn32.d
===================================================================
--- binutils-gdb.orig/gas/testsuite/gas/mips/micromips-noinsn32.d
+++ binutils-gdb/gas/testsuite/gas/mips/micromips-noinsn32.d
@@ -6766,70 +6766,70 @@ 
 [ 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
Index: binutils-gdb/gas/testsuite/gas/mips/micromips-trap.d
===================================================================
--- binutils-gdb.orig/gas/testsuite/gas/mips/micromips-trap.d
+++ binutils-gdb/gas/testsuite/gas/mips/micromips-trap.d
@@ -6757,70 +6757,70 @@ 
 [ 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
Index: binutils-gdb/gas/testsuite/gas/mips/micromips.d
===================================================================
--- binutils-gdb.orig/gas/testsuite/gas/mips/micromips.d
+++ binutils-gdb/gas/testsuite/gas/mips/micromips.d
@@ -6844,70 +6844,70 @@ 
 [ 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
Index: binutils-gdb/gas/testsuite/gas/mips/micromips@isa-override-1.d
===================================================================
--- binutils-gdb.orig/gas/testsuite/gas/mips/micromips@isa-override-1.d
+++ binutils-gdb/gas/testsuite/gas/mips/micromips@isa-override-1.d
@@ -28,7 +28,7 @@ 
 [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
Index: binutils-gdb/opcodes/micromips-opc.c
===================================================================
--- binutils-gdb.orig/opcodes/micromips-opc.c
+++ binutils-gdb/opcodes/micromips-opc.c
@@ -633,8 +633,8 @@  const struct mips_opcode micromips_opcod
 {"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 },