projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5cd8624)
[ gas/ChangeLog ]
authorChris Demetriou <cgd@google.com>
Tue, 30 Sep 2003 21:02:08 +0000 (21:02 +0000)
committerChris Demetriou <cgd@google.com>
Tue, 30 Sep 2003 21:02:08 +0000 (21:02 +0000)
2003-09-30  Chris Demetriou  <cgd@broadcom.com>

        * config/tc-mips.c (mips_ip): Capitalize first word of
        existing condition code warning, and add condition code
        warnings for .ps instructions, and for bc1any[24][tf].

[ gas/testsuite/ChangeLog ]
2003-09-30  Chris Demetriou  <cgd@broadcom.com>

        * lib/gas-defs.exp (run_dump_test): If stderr file is specified
        and there was no stderr output, compare anyway (i.e., cause a
        test failure).
        * gas/mips/mips64-mips3d.s: Add some new instructions to test warnings.
        * gas/mips/mips64-mips3d.l: New file.
        * gas/mips/mips64-mips3d.d: Use mips64-mips3d.l, and update for
        changes to mips64-mips3d.s.
        * gas/mips/mips64-mips3d-incl.d: Likewise.
        * gas/mips/set-arch.l: New file.
        * gas/mips/set-arch.d: Specify set-arch.l as stderr output to check.
        * gas/mips/mips5.l: Make error messages match source.

gas/ChangeLog patch | blob | history
gas/config/tc-mips.c patch | blob | history
gas/testsuite/ChangeLog patch | blob | history
gas/testsuite/gas/mips/mips5.l patch | blob | history
gas/testsuite/gas/mips/mips64-mips3d-incl.d patch | blob | history
gas/testsuite/gas/mips/mips64-mips3d.d patch | blob | history
gas/testsuite/gas/mips/mips64-mips3d.l [new file with mode: 0644] patch | blob
gas/testsuite/gas/mips/mips64-mips3d.s patch | blob | history
gas/testsuite/gas/mips/set-arch.d patch | blob | history
gas/testsuite/gas/mips/set-arch.l [new file with mode: 0644] patch | blob
gas/testsuite/lib/gas-defs.exp patch | blob | history

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2369a76cde69d6812c9af7911e1aa9d9b05d2c91..3c05999e061c5d2d05e25a28581ebf678957944f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-30  Chris Demetriou  <cgd@broadcom.com>
+
+       * config/tc-mips.c (mips_ip): Capitalize first word of
+       existing condition code warning, and add condition code
+       warnings for .ps instructions, and for bc1any[24][tf].
+
 2003-09-30  Chris Demetriou  <cgd@broadcom.com>
 
        * NEWS: Mention support for MIPS64 Release 2.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 25e5a3df8dfdf8c0045809608ca75979344ff2f7..a1f2d3829d36d966b16e59f18db397c5abc178bc 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -9369,7 +9369,18 @@ do_msbd:
                }
              while (ISDIGIT (*s));
              if (regno > 7)
-               as_bad (_("invalid condition code register $fcc%d"), regno);
+               as_bad (_("Invalid condition code register $fcc%d"), regno);
+             if ((strcmp(str + strlen(str) - 3, ".ps") == 0
+                  || strcmp(str + strlen(str) - 5, "any2f") == 0
+                  || strcmp(str + strlen(str) - 5, "any2t") == 0)
+                 && (regno & 1) != 0)
+               as_warn(_("Condition code register should be even for %s, was %d"),
+                       str, regno);
+             if ((strcmp(str + strlen(str) - 5, "any4f") == 0
+                  || strcmp(str + strlen(str) - 5, "any4t") == 0)
+                 && (regno & 3) != 0)
+               as_warn(_("Condition code register should be 0 or 4 for %s, was %d"),
+                       str, regno);
              if (*args == 'N')
                ip->insn_opcode |= regno << OP_SH_BCC;
              else
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0b9887d37ea83a8223cd244c8f3e8fb0f09a0ff5..677a75d0316bde4ec70763567e71a593d7000ec4 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2003-09-30  Chris Demetriou  <cgd@broadcom.com>
+
+       * lib/gas-defs.exp (run_dump_test): If stderr file is specified
+       and there was no stderr output, compare anyway (i.e., cause a
+       test failure).
+       * gas/mips/mips64-mips3d.s: Add some new instructions to test warnings.
+       * gas/mips/mips64-mips3d.l: New file.
+       * gas/mips/mips64-mips3d.d: Use mips64-mips3d.l, and update for
+       changes to mips64-mips3d.s.
+       * gas/mips/mips64-mips3d-incl.d: Likewise.
+       * gas/mips/set-arch.l: New file.
+       * gas/mips/set-arch.d: Specify set-arch.l as stderr output to check.
+       * gas/mips/mips5.l: Make error messages match source.
+
 2003-09-30  Chris Demetriou  <cgd@broadcom.com>
 
        * gas/mips/cp0-names-mips64r2.d: New file.
diff --git a/gas/testsuite/gas/mips/mips5.l b/gas/testsuite/gas/mips/mips5.l
index 9cacb2ec57a57b3368d9d6553ac4ac6ab11cb2ee..bb6ed49ddf65a72807cb92273b0179f830ba4dd9 100644 (file)
--- a/gas/testsuite/gas/mips/mips5.l
+++ b/gas/testsuite/gas/mips/mips5.l
@@ -1,3 +1,3 @@
 .*: Assembler messages:
-.*:61: Warning: Condition flag should be even for c.eq.ps, was 3
-.*:62: Warning: Condition flag should be even for movf.ps, was 3
+.*:61: Warning: Condition code register should be even for c.eq.ps, was 3
+.*:62: Warning: Condition code register should be even for movf.ps, was 3
diff --git a/gas/testsuite/gas/mips/mips64-mips3d-incl.d b/gas/testsuite/gas/mips/mips64-mips3d-incl.d
index 5c14e280a68de93de6194507aa89012bdef4dd6e..5da2a81f24a387de4f2de3d7cc8c2baba84ad7ff 100644 (file)
--- a/gas/testsuite/gas/mips/mips64-mips3d-incl.d
+++ b/gas/testsuite/gas/mips/mips64-mips3d-incl.d
@@ -1,6 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: MIPS MIPS64 MIPS-3D ASE instructions
 #source: mips64-mips3d.s
+#stderr: mips64-mips3d.l
 
 # Check MIPS64 MIPS-3D ASE instruction assembly and disassembly
 # Same as mips64-mips3d.d, but does not need -mips3d assembler
@@ -137,4 +138,12 @@ Disassembly of section .text:
 0+01f4 <[^>]*> 4633411f        rsqrt2\.d       \$f4,\$f8,\$f19
 0+01f8 <[^>]*> 4613411f        rsqrt2\.s       \$f4,\$f8,\$f19
 0+01fc <[^>]*> 46d3411f        rsqrt2\.ps      \$f4,\$f8,\$f19
+0+0200 <[^>]*> 4524ff7f        bc1any2f        \$fcc1,0+0000 <text_label>
+0+0204 <[^>]*> 00000000        nop
+0+0208 <[^>]*> 452dff7d        bc1any2t        \$fcc3,0+0000 <text_label>
+0+020c <[^>]*> 00000000        nop
+0+0210 <[^>]*> 4544ff7b        bc1any4f        \$fcc1,0+0000 <text_label>
+0+0214 <[^>]*> 00000000        nop
+0+0218 <[^>]*> 4549ff79        bc1any4t        \$fcc2,0+0000 <text_label>
+0+021c <[^>]*> 00000000        nop
        \.\.\.
diff --git a/gas/testsuite/gas/mips/mips64-mips3d.d b/gas/testsuite/gas/mips/mips64-mips3d.d
index 3ea72d8c417a2319026cda880685306a7b812382..eb4b87f101baf23d30f6a550949ddf685a5884aa 100644 (file)
--- a/gas/testsuite/gas/mips/mips64-mips3d.d
+++ b/gas/testsuite/gas/mips/mips64-mips3d.d
@@ -1,6 +1,7 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:isa64
 #name: MIPS MIPS64 MIPS-3D ASE instructions (-mips3d flag)
 #as: -mips64 -mips3d
+#stderr: mips64-mips3d.l
 
 # Check MIPS64 MIPS-3D ASE instruction assembly and disassembly
 
@@ -135,4 +136,12 @@ Disassembly of section .text:
 0+01f4 <[^>]*> 4633411f        rsqrt2\.d       \$f4,\$f8,\$f19
 0+01f8 <[^>]*> 4613411f        rsqrt2\.s       \$f4,\$f8,\$f19
 0+01fc <[^>]*> 46d3411f        rsqrt2\.ps      \$f4,\$f8,\$f19
+0+0200 <[^>]*> 4524ff7f        bc1any2f        \$fcc1,0+0000 <text_label>
+0+0204 <[^>]*> 00000000        nop
+0+0208 <[^>]*> 452dff7d        bc1any2t        \$fcc3,0+0000 <text_label>
+0+020c <[^>]*> 00000000        nop
+0+0210 <[^>]*> 4544ff7b        bc1any4f        \$fcc1,0+0000 <text_label>
+0+0214 <[^>]*> 00000000        nop
+0+0218 <[^>]*> 4549ff79        bc1any4t        \$fcc2,0+0000 <text_label>
+0+021c <[^>]*> 00000000        nop
        \.\.\.
diff --git a/gas/testsuite/gas/mips/mips64-mips3d.l b/gas/testsuite/gas/mips/mips64-mips3d.l
new file mode 100644 (file)
index 0000000..22c80e9
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips64-mips3d.l
@@ -0,0 +1,5 @@
+.*: Assembler messages:
+.*:150: Warning: Condition code register should be even for bc1any2f, was 1
+.*:152: Warning: Condition code register should be even for bc1any2t, was 3
+.*:154: Warning: Condition code register should be 0 or 4 for bc1any4f, was 1
+.*:156: Warning: Condition code register should be 0 or 4 for bc1any4t, was 2
diff --git a/gas/testsuite/gas/mips/mips64-mips3d.s b/gas/testsuite/gas/mips/mips64-mips3d.s
index 9c08dfbbbfed0784c2a96f54aeb7f08e086d985d..2ba487827d73c3cb921232f31393605d68508aec 100644 (file)
--- a/gas/testsuite/gas/mips/mips64-mips3d.s
+++ b/gas/testsuite/gas/mips/mips64-mips3d.s
@@ -147,5 +147,14 @@ text_label:
        rsqrt2.s        $f4, $f8, $f19
        rsqrt2.ps       $f4, $f8, $f19
 
+       bc1any2f        $fcc1, text_label       # warns
+       nop
+       bc1any2t        $fcc3, text_label       # warns
+       nop
+       bc1any4f        $fcc1, text_label       # warns
+       nop
+       bc1any4t        $fcc2, text_label       # warns
+       nop
+
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
       .space  8
diff --git a/gas/testsuite/gas/mips/set-arch.d b/gas/testsuite/gas/mips/set-arch.d
index 40e6a8f442bf36a6f8206a75b90348482ae4f67e..2e04b293ad65faef9fdbc451683542788c35a022 100644 (file)
--- a/gas/testsuite/gas/mips/set-arch.d
+++ b/gas/testsuite/gas/mips/set-arch.d
@@ -1,5 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -mmips:sb1 -M gpr-names=32
 #name: .set arch=FOO
+#stderr: set-arch.l
 
 dump\.o:     file format .*mips
 
diff --git a/gas/testsuite/gas/mips/set-arch.l b/gas/testsuite/gas/mips/set-arch.l
new file mode 100644 (file)
index 0000000..e6cd723
--- /dev/null
+++ b/gas/testsuite/gas/mips/set-arch.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+.*:146: Warning: Condition code register should be even for c.eq.ps, was 3
+.*:147: Warning: Condition code register should be even for movf.ps, was 3
diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index c82bd8ab023703cb3c85a9a67bad01a52ad415d2..682987defe76021ca070013fdd9bc656f14034c9 100644 (file)
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -411,7 +411,7 @@ proc run_dump_test { name {extra_options {}} } {
     catch "exec $srcdir/lib/run $AS $ASFLAGS $opts(as) -o dump.o $sourcefile" comp_output
     set comp_output [prune_warnings $comp_output]
 
-    if ![string match "" $comp_output] then {
+    if { ![string match "" $comp_output] || $opts(stderr) != "" } then {
        if { $opts(stderr) == "" }  then {
            send_log "$comp_output\n"
            verbose "$comp_output" 3