diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b284a7ee8d6..7a8f664995e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-05  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/mips/mips4-fp.d: Reformat.
+
 2010-07-05  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* gas/mips/beq.d: Reformat.
diff --git a/gas/testsuite/gas/mips/mips4-fp.d b/gas/testsuite/gas/mips/mips4-fp.d
index ca11be85493..8082d611245 100644
--- a/gas/testsuite/gas/mips/mips4-fp.d
+++ b/gas/testsuite/gas/mips/mips4-fp.d
@@ -5,44 +5,44 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> bc1f	00000000+ <text_label>
-0+0004 <[^>]*> nop
-0+0008 <[^>]*> bc1f	\$fcc1,00000000+ <text_label>
-0+000c <[^>]*> nop
-0+0010 <[^>]*> bc1fl	\$fcc1,00000000+ <text_label>
-0+0014 <[^>]*> nop
-0+0018 <[^>]*> bc1t	\$fcc1,00000000+ <text_label>
-0+001c <[^>]*> nop
-0+0020 <[^>]*> bc1tl	\$fcc2,00000000+ <text_label>
-0+0024 <[^>]*> nop
-0+0028 <[^>]*> c.f.d	\$f4,\$f6
-0+002c <[^>]*> c.f.d	\$fcc1,\$f4,\$f6
-0+0030 <[^>]*> ldxc1	\$f2,a0\(a1\)
-0+0034 <[^>]*> lwxc1	\$f2,a0\(a1\)
-0+0038 <[^>]*> madd.d	\$f0,\$f2,\$f4,\$f6
-0+003c <[^>]*> madd.s	\$f10,\$f8,\$f2,\$f0
-0+0040 <[^>]*> movf	a0,a1,\$fcc4
-0+0044 <[^>]*> movf.d	\$f4,\$f6,\$fcc0
-0+0048 <[^>]*> movf.s	\$f4,\$f6,\$fcc0
-0+004c <[^>]*> movn.d	\$f4,\$f6,a2
-0+0050 <[^>]*> movn.s	\$f4,\$f6,a2
-0+0054 <[^>]*> movt	a0,a1,\$fcc4
-0+0058 <[^>]*> movt.d	\$f4,\$f6,\$fcc0
-0+005c <[^>]*> movt.s	\$f4,\$f6,\$fcc0
-0+0060 <[^>]*> movz.d	\$f4,\$f6,a2
-0+0064 <[^>]*> movz.s	\$f4,\$f6,a2
-0+0068 <[^>]*> msub.d	\$f0,\$f2,\$f4,\$f6
-0+006c <[^>]*> msub.s	\$f0,\$f2,\$f4,\$f6
-0+0070 <[^>]*> nmadd.d	\$f0,\$f2,\$f4,\$f6
-0+0074 <[^>]*> nmadd.s	\$f0,\$f2,\$f4,\$f6
-0+0078 <[^>]*> nmsub.d	\$f0,\$f2,\$f4,\$f6
-0+007c <[^>]*> nmsub.s	\$f0,\$f2,\$f4,\$f6
-0+0080 <[^>]*> prefx	0x4,a0\(a1\)
-0+0084 <[^>]*> recip.d	\$f4,\$f6
-0+0088 <[^>]*> recip.s	\$f4,\$f6
-0+008c <[^>]*> rsqrt.d	\$f4,\$f6
-0+0090 <[^>]*> rsqrt.s	\$f4,\$f6
-0+0094 <[^>]*> sdxc1	\$f4,a0\(a1\)
-0+0098 <[^>]*> swxc1	\$f4,a0\(a1\)
-	...
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> bc1f	0+0000 <text_label>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bc1f	\$fcc1,0+0000 <text_label>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bc1fl	\$fcc1,0+0000 <text_label>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bc1t	\$fcc1,0+0000 <text_label>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> bc1tl	\$fcc2,0+0000 <text_label>
+[0-9a-f]+ <[^>]*> nop
+[0-9a-f]+ <[^>]*> c.f.d	\$f4,\$f6
+[0-9a-f]+ <[^>]*> c.f.d	\$fcc1,\$f4,\$f6
+[0-9a-f]+ <[^>]*> ldxc1	\$f2,a0\(a1\)
+[0-9a-f]+ <[^>]*> lwxc1	\$f2,a0\(a1\)
+[0-9a-f]+ <[^>]*> madd.d	\$f0,\$f2,\$f4,\$f6
+[0-9a-f]+ <[^>]*> madd.s	\$f10,\$f8,\$f2,\$f0
+[0-9a-f]+ <[^>]*> movf	a0,a1,\$fcc4
+[0-9a-f]+ <[^>]*> movf.d	\$f4,\$f6,\$fcc0
+[0-9a-f]+ <[^>]*> movf.s	\$f4,\$f6,\$fcc0
+[0-9a-f]+ <[^>]*> movn.d	\$f4,\$f6,a2
+[0-9a-f]+ <[^>]*> movn.s	\$f4,\$f6,a2
+[0-9a-f]+ <[^>]*> movt	a0,a1,\$fcc4
+[0-9a-f]+ <[^>]*> movt.d	\$f4,\$f6,\$fcc0
+[0-9a-f]+ <[^>]*> movt.s	\$f4,\$f6,\$fcc0
+[0-9a-f]+ <[^>]*> movz.d	\$f4,\$f6,a2
+[0-9a-f]+ <[^>]*> movz.s	\$f4,\$f6,a2
+[0-9a-f]+ <[^>]*> msub.d	\$f0,\$f2,\$f4,\$f6
+[0-9a-f]+ <[^>]*> msub.s	\$f0,\$f2,\$f4,\$f6
+[0-9a-f]+ <[^>]*> nmadd.d	\$f0,\$f2,\$f4,\$f6
+[0-9a-f]+ <[^>]*> nmadd.s	\$f0,\$f2,\$f4,\$f6
+[0-9a-f]+ <[^>]*> nmsub.d	\$f0,\$f2,\$f4,\$f6
+[0-9a-f]+ <[^>]*> nmsub.s	\$f0,\$f2,\$f4,\$f6
+[0-9a-f]+ <[^>]*> prefx	0x4,a0\(a1\)
+[0-9a-f]+ <[^>]*> recip.d	\$f4,\$f6
+[0-9a-f]+ <[^>]*> recip.s	\$f4,\$f6
+[0-9a-f]+ <[^>]*> rsqrt.d	\$f4,\$f6
+[0-9a-f]+ <[^>]*> rsqrt.s	\$f4,\$f6
+[0-9a-f]+ <[^>]*> sdxc1	\$f4,a0\(a1\)
+[0-9a-f]+ <[^>]*> swxc1	\$f4,a0\(a1\)
+	\.\.\.