MIPS/GAS/testsuite: Correct whitespace issues with Loongson tests

Remove CR characters, trailing whitespace and space characters appearing
immediately before a tab character, and replace spaces with tabs, all
across Loongson GAS tests.

	gas/
	* testsuite/gas/mips/loongson-2e.d: Correct whitespace issues.
	* testsuite/gas/mips/loongson-2f.d: Likewise.
	* testsuite/gas/mips/loongson-2f-2.d: Likewise.
	* testsuite/gas/mips/loongson-2f-3.d: Likewise.
	* testsuite/gas/mips/loongson-3a.d: Likewise.
	* testsuite/gas/mips/loongson-3a-2.d: Likewise.
	* testsuite/gas/mips/loongson-2e.s: Likewise.
	* testsuite/gas/mips/loongson-2f.s: Likewise.
	* testsuite/gas/mips/loongson-2f-3.s: Likewise.
	* testsuite/gas/mips/loongson-3a.s: Likewise.
	* testsuite/gas/mips/loongson-3a-2.s: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3106096..9cda0a6 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,17 @@
+2018-07-18  Maciej W. Rozycki  <macro@mips.com>
+
+       * testsuite/gas/mips/loongson-2e.d: Correct whitespace issues.
+       * testsuite/gas/mips/loongson-2f.d: Likewise.
+       * testsuite/gas/mips/loongson-2f-2.d: Likewise.
+       * testsuite/gas/mips/loongson-2f-3.d: Likewise.
+       * testsuite/gas/mips/loongson-3a.d: Likewise.
+       * testsuite/gas/mips/loongson-3a-2.d: Likewise.
+       * testsuite/gas/mips/loongson-2e.s: Likewise.
+       * testsuite/gas/mips/loongson-2f.s: Likewise.
+       * testsuite/gas/mips/loongson-2f-3.s: Likewise.
+       * testsuite/gas/mips/loongson-3a.s: Likewise.
+       * testsuite/gas/mips/loongson-3a-2.s: Likewise.
+
 2018-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR gas/23418

diff --git a/gas/testsuite/gas/mips/loongson-2e.d b/gas/testsuite/gas/mips/loongson-2e.d
index 59bf099..0aaf88d 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-2e.d
+++ b/gas/testsuite/gas/mips/loongson-2e.d
@@ -147,4 +147,3 @@ Disassembly of section .text:
 .*:    45604187        neg.ps  \$f6,\$f8
 .*:    457ac581        sub.ps  \$f22,\$f24,\$f26
 #pass
-

diff --git a/gas/testsuite/gas/mips/loongson-2e.s b/gas/testsuite/gas/mips/loongson-2e.s
index ceca517..2db07ee 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-2e.s
+++ b/gas/testsuite/gas/mips/loongson-2e.s
@@ -1,4 +1,4 @@
-        .text
+       .text
        .set noreorder
 
 movz_insns:
@@ -122,7 +122,7 @@ mips5_ps_insns:
        abs.ps          $f0, $f2
        add.ps          $f2, $f4, $f6
        c.eq.ps         $f8, $f10
-       c.f.ps          $f8, $f10
+       c.f.ps          $f8, $f10
        c.le.ps         $f8, $f10
        c.lt.ps         $f8, $f10
        c.nge.ps        $f8, $f10
@@ -141,4 +141,3 @@ mips5_ps_insns:
        mul.ps          $f2, $f4, $f6
        neg.ps          $f6, $f8
        sub.ps          $f22, $f24, $f26
-

diff --git a/gas/testsuite/gas/mips/loongson-2f-2.d b/gas/testsuite/gas/mips/loongson-2f-2.d
index f5267a8..0c4ec98 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-2f-2.d
+++ b/gas/testsuite/gas/mips/loongson-2f-2.d
@@ -1,10 +1,9 @@
 #as: -mfix-loongson2f-nop
 #objdump: -M reg-names=numeric -dr
-#name: ST Microelectronics Loongson-2F workarounds of nop issue 
+#name: ST Microelectronics Loongson-2F workarounds of nop issue
 
 .*:     file format .*
 
-
 Disassembly of section .text:
 
 00000000 <loongson2f_nop_insn>:

diff --git a/gas/testsuite/gas/mips/loongson-2f-3.d b/gas/testsuite/gas/mips/loongson-2f-3.d
index 99844d3..9063df1 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-2f-3.d
+++ b/gas/testsuite/gas/mips/loongson-2f-3.d
@@ -1,10 +1,9 @@
 #as: -mfix-loongson2f-jump
 #objdump: -M reg-names=numeric -dr
-#name: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue 
+#name: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue
 
 .*:     file format .*
 
-
 Disassembly of section .text:
 
 00000000 <.text>:

diff --git a/gas/testsuite/gas/mips/loongson-2f-3.s b/gas/testsuite/gas/mips/loongson-2f-3.s
index cbb73de..cdffc75 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-2f-3.s
+++ b/gas/testsuite/gas/mips/loongson-2f-3.s
@@ -13,7 +13,7 @@
 
        .set    noat
        jr      $1      # jr with at register and .set annotation
-        nop
+        nop
        .set    at
 
        j       external_label  # j with label

diff --git a/gas/testsuite/gas/mips/loongson-2f.d b/gas/testsuite/gas/mips/loongson-2f.d
index 8d1d8f7..a4e83c9 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-2f.d
+++ b/gas/testsuite/gas/mips/loongson-2f.d
@@ -147,4 +147,3 @@ Disassembly of section .text:
 .*:    46c04187        neg.ps  \$f6,\$f8
 .*:    46dac581        sub.ps  \$f22,\$f24,\$f26
 #pass
-

diff --git a/gas/testsuite/gas/mips/loongson-2f.s b/gas/testsuite/gas/mips/loongson-2f.s
index 4b47a99..2db07ee 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-2f.s
+++ b/gas/testsuite/gas/mips/loongson-2f.s
@@ -122,7 +122,7 @@ mips5_ps_insns:
        abs.ps          $f0, $f2
        add.ps          $f2, $f4, $f6
        c.eq.ps         $f8, $f10
-       c.f.ps          $f8, $f10
+       c.f.ps          $f8, $f10
        c.le.ps         $f8, $f10
        c.lt.ps         $f8, $f10
        c.nge.ps        $f8, $f10
@@ -141,4 +141,3 @@ mips5_ps_insns:
        mul.ps          $f2, $f4, $f6
        neg.ps          $f6, $f8
        sub.ps          $f22, $f24, $f26
-

diff --git a/gas/testsuite/gas/mips/loongson-3a-2.d b/gas/testsuite/gas/mips/loongson-3a-2.d
index 309db47..8ef4c8e 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-3a-2.d
+++ b/gas/testsuite/gas/mips/loongson-3a-2.d
@@ -62,4 +62,3 @@ Disassembly of section .text:
 .*:    ca15bff4        gslqc1  \$f20,\$f21,4080\(\$16\)
 .*:    ea37c036        gssqc1  \$f22,\$f23,-4096\(\$17\)
 #pass
-

diff --git a/gas/testsuite/gas/mips/loongson-3a-2.s b/gas/testsuite/gas/mips/loongson-3a-2.s
index c296b06..7e35dd3 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-3a-2.s
+++ b/gas/testsuite/gas/mips/loongson-3a-2.s
@@ -1,65 +1,64 @@
-       .text\r
-       .set noreorder\r
-\r
-       campi           $2,$3\r
-       campv           $4,$5\r
-       camwi           $6,$7,$8\r
-       ramri           $9,$10\r
-\r
-       gsle            $11,$12\r
-       gsgt            $13,$14\r
-\r
-       gslble          $2,$3,$4\r
-       gslbgt          $5,$6,$7\r
-       gslhle          $8,$9,$10\r
-       gslhgt          $11,$12,$13\r
-       gslwle          $14,$15,$16\r
-       gslwgt          $17,$18,$19\r
-       gsldle          $20,$21,$22\r
-       gsldgt          $23,$24,$25\r
-       gssble          $2,$3,$4\r
-       gssbgt          $5,$6,$7\r
-       gsshle          $8,$9,$10\r
-       gsshgt          $11,$12,$13\r
-       gsswle          $14,$15,$16\r
-       gsswgt          $17,$18,$19\r
-       gssdle          $20,$21,$22\r
-       gssdgt          $23,$24,$25\r
-\r
-       gslwlec1        $f0,$2,$3        \r
-       gslwgtc1        $f1,$4,$5  \r
-       gsldlec1        $f2,$6,$7  \r
-       gsldgtc1        $f3,$8,$9  \r
-       gsswlec1        $f4,$10,$11  \r
-       gsswgtc1        $f5,$12,$13\r
-       gssdlec1        $f6,$14,$15\r
-       gssdgtc1        $f7,$16,$17\r
-\r
-       gslwlc1         $f8,0($18)\r
-       gslwrc1         $f9,1($19) \r
-       gsldlc1         $f10,2($20) \r
-       gsldrc1         $f11,3($21)\r
-       gsswlc1         $f12,4($22)\r
-       gsswrc1         $f13,5($23)\r
-       gssdlc1         $f14,6($24)\r
-       gssdrc1         $f15,7($25)\r
-\r
-       gslbx           $2,0($3,$4)\r
-       gslhx           $5,-1($6,$7)\r
-       gslwx           $8,-2($9,$10)\r
-       gsldx           $11,-3($12,$13)\r
-       gssbx           $14,-4($15,$16)\r
-       gsshx           $17,-5($18,$19)\r
-       gsswx           $20,-6($21,$22)\r
-       gssdx           $23,-7($24,$25)\r
-\r
-       gslwxc1         $f16,127($2,$3)\r
-       gsldxc1         $f17,-128($4,$5)\r
-       gsswxc1         $f18,127($6,$7)\r
-       gssdxc1         $f19,-128($8,$9)\r
-\r
-       gslq            $10,$11,4080($12)\r
-       gssq            $13,$14,-4096($15)\r
-       gslqc1          $f20,$f21,4080($16)\r
-       gssqc1          $f22,$f23,-4096($17)\r
-\r
+       .text
+       .set noreorder
+
+       campi           $2,$3
+       campv           $4,$5
+       camwi           $6,$7,$8
+       ramri           $9,$10
+
+       gsle            $11,$12
+       gsgt            $13,$14
+
+       gslble          $2,$3,$4
+       gslbgt          $5,$6,$7
+       gslhle          $8,$9,$10
+       gslhgt          $11,$12,$13
+       gslwle          $14,$15,$16
+       gslwgt          $17,$18,$19
+       gsldle          $20,$21,$22
+       gsldgt          $23,$24,$25
+       gssble          $2,$3,$4
+       gssbgt          $5,$6,$7
+       gsshle          $8,$9,$10
+       gsshgt          $11,$12,$13
+       gsswle          $14,$15,$16
+       gsswgt          $17,$18,$19
+       gssdle          $20,$21,$22
+       gssdgt          $23,$24,$25
+
+       gslwlec1        $f0,$2,$3
+       gslwgtc1        $f1,$4,$5
+       gsldlec1        $f2,$6,$7
+       gsldgtc1        $f3,$8,$9
+       gsswlec1        $f4,$10,$11
+       gsswgtc1        $f5,$12,$13
+       gssdlec1        $f6,$14,$15
+       gssdgtc1        $f7,$16,$17
+
+       gslwlc1         $f8,0($18)
+       gslwrc1         $f9,1($19)
+       gsldlc1         $f10,2($20)
+       gsldrc1         $f11,3($21)
+       gsswlc1         $f12,4($22)
+       gsswrc1         $f13,5($23)
+       gssdlc1         $f14,6($24)
+       gssdrc1         $f15,7($25)
+
+       gslbx           $2,0($3,$4)
+       gslhx           $5,-1($6,$7)
+       gslwx           $8,-2($9,$10)
+       gsldx           $11,-3($12,$13)
+       gssbx           $14,-4($15,$16)
+       gsshx           $17,-5($18,$19)
+       gsswx           $20,-6($21,$22)
+       gssdx           $23,-7($24,$25)
+
+       gslwxc1         $f16,127($2,$3)
+       gsldxc1         $f17,-128($4,$5)
+       gsswxc1         $f18,127($6,$7)
+       gssdxc1         $f19,-128($8,$9)
+
+       gslq            $10,$11,4080($12)
+       gssq            $13,$14,-4096($15)
+       gslqc1          $f20,$f21,4080($16)
+       gssqc1          $f22,$f23,-4096($17)

diff --git a/gas/testsuite/gas/mips/loongson-3a.d b/gas/testsuite/gas/mips/loongson-3a.d
index f0eb0e3..4839ff7 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-3a.d
+++ b/gas/testsuite/gas/mips/loongson-3a.d
@@ -1,111 +1,109 @@
-#as: -march=loongson3a -mabi=o64\r
-#objdump: -M reg-names=numeric -dr\r
-#name: Loongson-3A tests\r
-\r
-.*:     file format .*\r
-\r
-Disassembly of section .text:\r
-\r
-[0-9a-f]+ <movz_insns>:\r
-.*:    0064100b        movn    \$2,\$3,\$4\r
-\r
-[0-9a-f]+ <integer_insns>:\r
-.*:    70641010        gsmult  \$2,\$3,\$4\r
-.*:    70c72812        gsmultu \$5,\$6,\$7\r
-.*:    712a4011        gsdmult \$8,\$9,\$10\r
-.*:    718d5813        gsdmultu        \$11,\$12,\$13\r
-.*:    71f07014        gsdiv   \$14,\$15,\$16\r
-.*:    72538816        gsdivu  \$17,\$18,\$19\r
-.*:    72b6a015        gsddiv  \$20,\$21,\$22\r
-.*:    7319b817        gsddivu \$23,\$24,\$25\r
-.*:    737cd01c        gsmod   \$26,\$27,\$28\r
-.*:    73dfe81e        gsmodu  \$29,\$30,\$31\r
-.*:    7064101d        gsdmod  \$2,\$3,\$4\r
-.*:    70c7281f        gsdmodu \$5,\$6,\$7\r
-\r
-[0-9a-f]+ <simd_insns>:\r
-.*:    4b420802        packsshb        \$f0,\$f1,\$f2\r
-.*:    4b2520c2        packsswh        \$f3,\$f4,\$f5\r
-.*:    4b683982        packushb        \$f6,\$f7,\$f8\r
-.*:    4bcb5240        paddb   \$f9,\$f10,\$f11\r
-.*:    4b4e6b00        paddh   \$f12,\$f13,\$f14\r
-.*:    4b7183c0        paddw   \$f15,\$f16,\$f17\r
-.*:    4bf49c80        paddd   \$f18,\$f19,\$f20\r
-.*:    4b97b540        paddsb  \$f21,\$f22,\$f23\r
-.*:    4b1ace00        paddsh  \$f24,\$f25,\$f26\r
-.*:    4bbde6c0        paddusb \$f27,\$f28,\$f29\r
-.*:    4b220800        paddush \$f0,\$f1,\$f2\r
-.*:    4be520c2        pandn   \$f3,\$f4,\$f5\r
-.*:    4b283988        pavgb   \$f6,\$f7,\$f8\r
-.*:    4b0b5248        pavgh   \$f9,\$f10,\$f11\r
-.*:    4b8e6b09        pcmpeqb \$f12,\$f13,\$f14\r
-.*:    4b5183c9        pcmpeqh \$f15,\$f16,\$f17\r
-.*:    4b149c89        pcmpeqw \$f18,\$f19,\$f20\r
-.*:    4bb7b549        pcmpgtb \$f21,\$f22,\$f23\r
-.*:    4b7ace09        pcmpgth \$f24,\$f25,\$f26\r
-.*:    4b3de6c9        pcmpgtw \$f27,\$f28,\$f29\r
-.*:    4b42080e        pextrh  \$f0,\$f1,\$f2\r
-.*:    4b8520c3        pinsrh_0        \$f3,\$f4,\$f5\r
-.*:    4ba83983        pinsrh_1        \$f6,\$f7,\$f8\r
-.*:    4bcb5243        pinsrh_2        \$f9,\$f10,\$f11\r
-.*:    4bee6b03        pinsrh_3        \$f12,\$f13,\$f14\r
-.*:    4b7183ce        pmaddhw \$f15,\$f16,\$f17\r
-.*:    4b549c88        pmaxsh  \$f18,\$f19,\$f20\r
-.*:    4b97b548        pmaxub  \$f21,\$f22,\$f23\r
-.*:    4b7ace08        pminsh  \$f24,\$f25,\$f26\r
-.*:    4bbde6c8        pminub  \$f27,\$f28,\$f29\r
-.*:    4ba0080f        pmovmskb        \$f0,\$f1\r
-.*:    4ba4188a        pmulhuh \$f2,\$f3,\$f4\r
-.*:    4b67314a        pmulhh  \$f5,\$f6,\$f7\r
-.*:    4b4a4a0a        pmullh  \$f8,\$f9,\$f10\r
-.*:    4b8d62ca        pmuluw  \$f11,\$f12,\$f13\r
-.*:    4b307b8d        pasubub \$f14,\$f15,\$f16\r
-.*:    4b80944f        biadd   \$f17,\$f18\r
-.*:    4b15a4c2        pshufh  \$f19,\$f20,\$f21\r
-.*:    4b38bd8a        psllh   \$f22,\$f23,\$f24\r
-.*:    4b1bd64a        psllw   \$f25,\$f26,\$f27\r
-.*:    4b7eef0b        psrah   \$f28,\$f29,\$f30\r
-.*:    4b42080b        psraw   \$f0,\$f1,\$f2\r
-.*:    4b2520cb        psrlh   \$f3,\$f4,\$f5\r
-.*:    4b08398b        psrlw   \$f6,\$f7,\$f8\r
-.*:    4bcb5241        psubb   \$f9,\$f10,\$f11\r
-.*:    4b4e6b01        psubh   \$f12,\$f13,\$f14\r
-.*:    4b7183c1        psubw   \$f15,\$f16,\$f17\r
-.*:    4bf49c81        psubd   \$f18,\$f19,\$f20\r
-.*:    4b97b541        psubsb  \$f21,\$f22,\$f23\r
-.*:    4b1ace01        psubsh  \$f24,\$f25,\$f26\r
-.*:    4bbde6c1        psubusb \$f27,\$f28,\$f29\r
-.*:    4b220801        psubush \$f0,\$f1,\$f2\r
-.*:    4b6520c3        punpckhbh       \$f3,\$f4,\$f5\r
-.*:    4b283983        punpckhhw       \$f6,\$f7,\$f8\r
-.*:    4bab524b        punpckhwd       \$f9,\$f10,\$f11\r
-.*:    4b4e6b03        punpcklbh       \$f12,\$f13,\$f14\r
-.*:    4b1183c3        punpcklhw       \$f15,\$f16,\$f17\r
-.*:    4b949c8b        punpcklwd       \$f18,\$f19,\$f20\r
-\r
-[0-9a-f]+ <fixed_point_insns>:\r
-.*:    4b42080c        add     \$f0,\$f1,\$f2\r
-.*:    4b0520cc        addu    \$f3,\$f4,\$f5\r
-.*:    4b68398c        dadd    \$f6,\$f7,\$f8\r
-.*:    4b4b524d        sub     \$f9,\$f10,\$f11\r
-.*:    4b0e6b0d        subu    \$f12,\$f13,\$f14\r
-.*:    4b7183cd        dsub    \$f15,\$f16,\$f17\r
-.*:    4b349c8c        or      \$f18,\$f19,\$f20\r
-.*:    4b17b54e        sll     \$f21,\$f22,\$f23\r
-.*:    4b3ace0e        dsll    \$f24,\$f25,\$f26\r
-.*:    4b9de6c2        xor     \$f27,\$f28,\$f29\r
-.*:    4ba20802        nor     \$f0,\$f1,\$f2\r
-.*:    4bc520c2        and     \$f3,\$f4,\$f5\r
-.*:    4b08398f        srl     \$f6,\$f7,\$f8\r
-.*:    4b2b524f        dsrl    \$f9,\$f10,\$f11\r
-.*:    4b4e6b0f        sra     \$f12,\$f13,\$f14\r
-.*:    4b7183cf        dsra    \$f15,\$f16,\$f17\r
-.*:    4b93900c        sequ    \$f18,\$f19\r
-.*:    4b95a00d        sltu    \$f20,\$f21\r
-.*:    4b97b00e        sleu    \$f22,\$f23\r
-.*:    4bb9c00c        seq     \$f24,\$f25\r
-.*:    4bbbd00d        slt     \$f26,\$f27\r
-.*:    4bbde00e        sle     \$f28,\$f29\r
-#pass\r
-\r
-\r
+#as: -march=loongson3a -mabi=o64
+#objdump: -M reg-names=numeric -dr
+#name: Loongson-3A tests
+
+.*:     file format .*
+
+Disassembly of section .text:
+
+[0-9a-f]+ <movz_insns>:
+.*:    0064100b        movn    \$2,\$3,\$4
+
+[0-9a-f]+ <integer_insns>:
+.*:    70641010        gsmult  \$2,\$3,\$4
+.*:    70c72812        gsmultu \$5,\$6,\$7
+.*:    712a4011        gsdmult \$8,\$9,\$10
+.*:    718d5813        gsdmultu        \$11,\$12,\$13
+.*:    71f07014        gsdiv   \$14,\$15,\$16
+.*:    72538816        gsdivu  \$17,\$18,\$19
+.*:    72b6a015        gsddiv  \$20,\$21,\$22
+.*:    7319b817        gsddivu \$23,\$24,\$25
+.*:    737cd01c        gsmod   \$26,\$27,\$28
+.*:    73dfe81e        gsmodu  \$29,\$30,\$31
+.*:    7064101d        gsdmod  \$2,\$3,\$4
+.*:    70c7281f        gsdmodu \$5,\$6,\$7
+
+[0-9a-f]+ <simd_insns>:
+.*:    4b420802        packsshb        \$f0,\$f1,\$f2
+.*:    4b2520c2        packsswh        \$f3,\$f4,\$f5
+.*:    4b683982        packushb        \$f6,\$f7,\$f8
+.*:    4bcb5240        paddb   \$f9,\$f10,\$f11
+.*:    4b4e6b00        paddh   \$f12,\$f13,\$f14
+.*:    4b7183c0        paddw   \$f15,\$f16,\$f17
+.*:    4bf49c80        paddd   \$f18,\$f19,\$f20
+.*:    4b97b540        paddsb  \$f21,\$f22,\$f23
+.*:    4b1ace00        paddsh  \$f24,\$f25,\$f26
+.*:    4bbde6c0        paddusb \$f27,\$f28,\$f29
+.*:    4b220800        paddush \$f0,\$f1,\$f2
+.*:    4be520c2        pandn   \$f3,\$f4,\$f5
+.*:    4b283988        pavgb   \$f6,\$f7,\$f8
+.*:    4b0b5248        pavgh   \$f9,\$f10,\$f11
+.*:    4b8e6b09        pcmpeqb \$f12,\$f13,\$f14
+.*:    4b5183c9        pcmpeqh \$f15,\$f16,\$f17
+.*:    4b149c89        pcmpeqw \$f18,\$f19,\$f20
+.*:    4bb7b549        pcmpgtb \$f21,\$f22,\$f23
+.*:    4b7ace09        pcmpgth \$f24,\$f25,\$f26
+.*:    4b3de6c9        pcmpgtw \$f27,\$f28,\$f29
+.*:    4b42080e        pextrh  \$f0,\$f1,\$f2
+.*:    4b8520c3        pinsrh_0        \$f3,\$f4,\$f5
+.*:    4ba83983        pinsrh_1        \$f6,\$f7,\$f8
+.*:    4bcb5243        pinsrh_2        \$f9,\$f10,\$f11
+.*:    4bee6b03        pinsrh_3        \$f12,\$f13,\$f14
+.*:    4b7183ce        pmaddhw \$f15,\$f16,\$f17
+.*:    4b549c88        pmaxsh  \$f18,\$f19,\$f20
+.*:    4b97b548        pmaxub  \$f21,\$f22,\$f23
+.*:    4b7ace08        pminsh  \$f24,\$f25,\$f26
+.*:    4bbde6c8        pminub  \$f27,\$f28,\$f29
+.*:    4ba0080f        pmovmskb        \$f0,\$f1
+.*:    4ba4188a        pmulhuh \$f2,\$f3,\$f4
+.*:    4b67314a        pmulhh  \$f5,\$f6,\$f7
+.*:    4b4a4a0a        pmullh  \$f8,\$f9,\$f10
+.*:    4b8d62ca        pmuluw  \$f11,\$f12,\$f13
+.*:    4b307b8d        pasubub \$f14,\$f15,\$f16
+.*:    4b80944f        biadd   \$f17,\$f18
+.*:    4b15a4c2        pshufh  \$f19,\$f20,\$f21
+.*:    4b38bd8a        psllh   \$f22,\$f23,\$f24
+.*:    4b1bd64a        psllw   \$f25,\$f26,\$f27
+.*:    4b7eef0b        psrah   \$f28,\$f29,\$f30
+.*:    4b42080b        psraw   \$f0,\$f1,\$f2
+.*:    4b2520cb        psrlh   \$f3,\$f4,\$f5
+.*:    4b08398b        psrlw   \$f6,\$f7,\$f8
+.*:    4bcb5241        psubb   \$f9,\$f10,\$f11
+.*:    4b4e6b01        psubh   \$f12,\$f13,\$f14
+.*:    4b7183c1        psubw   \$f15,\$f16,\$f17
+.*:    4bf49c81        psubd   \$f18,\$f19,\$f20
+.*:    4b97b541        psubsb  \$f21,\$f22,\$f23
+.*:    4b1ace01        psubsh  \$f24,\$f25,\$f26
+.*:    4bbde6c1        psubusb \$f27,\$f28,\$f29
+.*:    4b220801        psubush \$f0,\$f1,\$f2
+.*:    4b6520c3        punpckhbh       \$f3,\$f4,\$f5
+.*:    4b283983        punpckhhw       \$f6,\$f7,\$f8
+.*:    4bab524b        punpckhwd       \$f9,\$f10,\$f11
+.*:    4b4e6b03        punpcklbh       \$f12,\$f13,\$f14
+.*:    4b1183c3        punpcklhw       \$f15,\$f16,\$f17
+.*:    4b949c8b        punpcklwd       \$f18,\$f19,\$f20
+
+[0-9a-f]+ <fixed_point_insns>:
+.*:    4b42080c        add     \$f0,\$f1,\$f2
+.*:    4b0520cc        addu    \$f3,\$f4,\$f5
+.*:    4b68398c        dadd    \$f6,\$f7,\$f8
+.*:    4b4b524d        sub     \$f9,\$f10,\$f11
+.*:    4b0e6b0d        subu    \$f12,\$f13,\$f14
+.*:    4b7183cd        dsub    \$f15,\$f16,\$f17
+.*:    4b349c8c        or      \$f18,\$f19,\$f20
+.*:    4b17b54e        sll     \$f21,\$f22,\$f23
+.*:    4b3ace0e        dsll    \$f24,\$f25,\$f26
+.*:    4b9de6c2        xor     \$f27,\$f28,\$f29
+.*:    4ba20802        nor     \$f0,\$f1,\$f2
+.*:    4bc520c2        and     \$f3,\$f4,\$f5
+.*:    4b08398f        srl     \$f6,\$f7,\$f8
+.*:    4b2b524f        dsrl    \$f9,\$f10,\$f11
+.*:    4b4e6b0f        sra     \$f12,\$f13,\$f14
+.*:    4b7183cf        dsra    \$f15,\$f16,\$f17
+.*:    4b93900c        sequ    \$f18,\$f19
+.*:    4b95a00d        sltu    \$f20,\$f21
+.*:    4b97b00e        sleu    \$f22,\$f23
+.*:    4bb9c00c        seq     \$f24,\$f25
+.*:    4bbbd00d        slt     \$f26,\$f27
+.*:    4bbde00e        sle     \$f28,\$f29
+#pass

diff --git a/gas/testsuite/gas/mips/loongson-3a.s b/gas/testsuite/gas/mips/loongson-3a.s
index 73c00c0..0a0f71a 100644 (file)
--- a/gas/testsuite/gas/mips/loongson-3a.s
+++ b/gas/testsuite/gas/mips/loongson-3a.s
@@ -1,105 +1,103 @@
-       .text\r
-       .set noreorder\r
-\r
-movz_insns:\r
-       movnz           $2, $3, $4\r
-\r
-integer_insns:\r
-       gsmult          $2, $3, $4\r
-       gsmultu         $5, $6, $7\r
-       gsdmult         $8, $9, $10\r
-       gsdmultu        $11, $12, $13\r
-       gsdiv           $14, $15, $16\r
-       gsdivu          $17, $18, $19\r
-       gsddiv          $20, $21, $22\r
-       gsddivu         $23, $24, $25\r
-       gsmod           $26, $27, $28\r
-       gsmodu          $29, $30, $31\r
-       gsdmod          $2, $3, $4\r
-       gsdmodu         $5, $6, $7\r
-\r
-simd_insns:\r
-       packsshb        $f0, $f1, $f2\r
-       packsswh        $f3, $f4, $f5\r
-       packushb        $f6, $f7, $f8\r
-       paddb           $f9, $f10, $f11\r
-       paddh           $f12, $f13, $f14\r
-       paddw           $f15, $f16, $f17\r
-       paddd           $f18, $f19, $f20\r
-       paddsb          $f21, $f22, $f23\r
-       paddsh          $f24, $f25, $f26\r
-       paddusb         $f27, $f28, $f29\r
-       paddush         $f0, $f1, $f2\r
-       pandn           $f3, $f4, $f5\r
-       pavgb           $f6, $f7, $f8\r
-       pavgh           $f9, $f10, $f11\r
-       pcmpeqb         $f12, $f13, $f14\r
-       pcmpeqh         $f15, $f16, $f17\r
-       pcmpeqw         $f18, $f19, $f20\r
-       pcmpgtb         $f21, $f22, $f23\r
-       pcmpgth         $f24, $f25, $f26\r
-       pcmpgtw         $f27, $f28, $f29\r
-       pextrh          $f0, $f1, $f2\r
-       pinsrh_0        $f3, $f4, $f5\r
-       pinsrh_1        $f6, $f7, $f8\r
-       pinsrh_2        $f9, $f10, $f11\r
-       pinsrh_3        $f12, $f13, $f14\r
-       pmaddhw         $f15, $f16, $f17\r
-       pmaxsh          $f18, $f19, $f20\r
-       pmaxub          $f21, $f22, $f23\r
-       pminsh          $f24, $f25, $f26\r
-       pminub          $f27, $f28, $f29\r
-       pmovmskb        $f0, $f1\r
-       pmulhuh         $f2, $f3, $f4\r
-       pmulhh          $f5, $f6, $f7\r
-       pmullh          $f8, $f9, $f10\r
-       pmuluw          $f11, $f12, $f13\r
-       pasubub         $f14, $f15, $f16\r
-       biadd           $f17, $f18\r
-       pshufh          $f19, $f20, $f21\r
-       psllh           $f22, $f23, $f24\r
-       psllw           $f25, $f26, $f27\r
-       psrah           $f28, $f29, $f30\r
-       psraw           $f0, $f1, $f2\r
-       psrlh           $f3, $f4, $f5\r
-       psrlw           $f6, $f7, $f8\r
-       psubb           $f9, $f10, $f11\r
-       psubh           $f12, $f13, $f14\r
-       psubw           $f15, $f16, $f17\r
-       psubd           $f18, $f19, $f20\r
-       psubsb          $f21, $f22, $f23\r
-       psubsh          $f24, $f25, $f26\r
-       psubusb         $f27, $f28, $f29\r
-       psubush         $f0, $f1, $f2\r
-       punpckhbh       $f3, $f4, $f5\r
-       punpckhhw       $f6, $f7, $f8\r
-       punpckhwd       $f9, $f10, $f11\r
-       punpcklbh       $f12, $f13, $f14\r
-       punpcklhw       $f15, $f16, $f17\r
-       punpcklwd       $f18, $f19, $f20\r
-\r
-fixed_point_insns:\r
-       add             $f0, $f1, $f2\r
-       addu            $f3, $f4, $f5\r
-       dadd            $f6, $f7, $f8\r
-       sub             $f9, $f10, $f11\r
-       subu            $f12, $f13, $f14\r
-       dsub            $f15, $f16, $f17\r
-       or              $f18, $f19, $f20\r
-       sll             $f21, $f22, $f23\r
-       dsll            $f24, $f25, $f26\r
-       xor             $f27, $f28, $f29\r
-       nor             $f0, $f1, $f2\r
-       and             $f3, $f4, $f5\r
-       srl             $f6, $f7, $f8\r
-       dsrl            $f9, $f10, $f11\r
-       sra             $f12, $f13, $f14\r
-       dsra            $f15, $f16, $f17\r
-       sequ            $f18, $f19\r
-       sltu            $f20, $f21\r
-       sleu            $f22, $f23\r
-       seq             $f24, $f25\r
-       slt             $f26, $f27\r
-       sle             $f28, $f29\r
-\r
-\r
+       .text
+       .set noreorder
+
+movz_insns:
+       movnz           $2, $3, $4
+
+integer_insns:
+       gsmult          $2, $3, $4
+       gsmultu         $5, $6, $7
+       gsdmult         $8, $9, $10
+       gsdmultu        $11, $12, $13
+       gsdiv           $14, $15, $16
+       gsdivu          $17, $18, $19
+       gsddiv          $20, $21, $22
+       gsddivu         $23, $24, $25
+       gsmod           $26, $27, $28
+       gsmodu          $29, $30, $31
+       gsdmod          $2, $3, $4
+       gsdmodu         $5, $6, $7
+
+simd_insns:
+       packsshb        $f0, $f1, $f2
+       packsswh        $f3, $f4, $f5
+       packushb        $f6, $f7, $f8
+       paddb           $f9, $f10, $f11
+       paddh           $f12, $f13, $f14
+       paddw           $f15, $f16, $f17
+       paddd           $f18, $f19, $f20
+       paddsb          $f21, $f22, $f23
+       paddsh          $f24, $f25, $f26
+       paddusb         $f27, $f28, $f29
+       paddush         $f0, $f1, $f2
+       pandn           $f3, $f4, $f5
+       pavgb           $f6, $f7, $f8
+       pavgh           $f9, $f10, $f11
+       pcmpeqb         $f12, $f13, $f14
+       pcmpeqh         $f15, $f16, $f17
+       pcmpeqw         $f18, $f19, $f20
+       pcmpgtb         $f21, $f22, $f23
+       pcmpgth         $f24, $f25, $f26
+       pcmpgtw         $f27, $f28, $f29
+       pextrh          $f0, $f1, $f2
+       pinsrh_0        $f3, $f4, $f5
+       pinsrh_1        $f6, $f7, $f8
+       pinsrh_2        $f9, $f10, $f11
+       pinsrh_3        $f12, $f13, $f14
+       pmaddhw         $f15, $f16, $f17
+       pmaxsh          $f18, $f19, $f20
+       pmaxub          $f21, $f22, $f23
+       pminsh          $f24, $f25, $f26
+       pminub          $f27, $f28, $f29
+       pmovmskb        $f0, $f1
+       pmulhuh         $f2, $f3, $f4
+       pmulhh          $f5, $f6, $f7
+       pmullh          $f8, $f9, $f10
+       pmuluw          $f11, $f12, $f13
+       pasubub         $f14, $f15, $f16
+       biadd           $f17, $f18
+       pshufh          $f19, $f20, $f21
+       psllh           $f22, $f23, $f24
+       psllw           $f25, $f26, $f27
+       psrah           $f28, $f29, $f30
+       psraw           $f0, $f1, $f2
+       psrlh           $f3, $f4, $f5
+       psrlw           $f6, $f7, $f8
+       psubb           $f9, $f10, $f11
+       psubh           $f12, $f13, $f14
+       psubw           $f15, $f16, $f17
+       psubd           $f18, $f19, $f20
+       psubsb          $f21, $f22, $f23
+       psubsh          $f24, $f25, $f26
+       psubusb         $f27, $f28, $f29
+       psubush         $f0, $f1, $f2
+       punpckhbh       $f3, $f4, $f5
+       punpckhhw       $f6, $f7, $f8
+       punpckhwd       $f9, $f10, $f11
+       punpcklbh       $f12, $f13, $f14
+       punpcklhw       $f15, $f16, $f17
+       punpcklwd       $f18, $f19, $f20
+
+fixed_point_insns:
+       add             $f0, $f1, $f2
+       addu            $f3, $f4, $f5
+       dadd            $f6, $f7, $f8
+       sub             $f9, $f10, $f11
+       subu            $f12, $f13, $f14
+       dsub            $f15, $f16, $f17
+       or              $f18, $f19, $f20
+       sll             $f21, $f22, $f23
+       dsll            $f24, $f25, $f26
+       xor             $f27, $f28, $f29
+       nor             $f0, $f1, $f2
+       and             $f3, $f4, $f5
+       srl             $f6, $f7, $f8
+       dsrl            $f9, $f10, $f11
+       sra             $f12, $f13, $f14
+       dsra            $f15, $f16, $f17
+       sequ            $f18, $f19
+       sltu            $f20, $f21
+       sleu            $f22, $f23
+       seq             $f24, $f25
+       slt             $f26, $f27
+       sle             $f28, $f29