* config/tc-mips.c (mips_ip): Reset s to argsStart.

        * gas/mips/tls-ill.l: Update error message.
        * gas/mips/octeon-ill.l: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1e698a9..a486228 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-22  Chao-ying Fu  <fu@mips.com>
+
+       * config/tc-mips.c (mips_ip): Reset s to argsStart.
+
 2008-07-22  Jie Zhang  <jie.zhang@analog.com>
 
        * config/tc-bfin.c (bfin_gen_loop): Remove loop symbol.

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index d12d3c4..7e39829 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -9958,7 +9958,7 @@ do_msbd:
          continue;
        }
       if (save_c)
-       *(--s) = save_c;
+       *(--argsStart) = save_c;
       insn_error = _("illegal operands");
       return;
     }

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 243b62b..83c69f6 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-22  Chao-ying Fu  <fu@mips.com>
+
+       * gas/mips/tls-ill.l: Update error message.
+       * gas/mips/octeon-ill.l: Likewise.
+
 2008-07-14  Jie Zhang  <jie.zhang@analog.com>
 
        * gas/bfin/{bit2.s, cache2.s, control_code2.s, event2.s,

diff --git a/gas/testsuite/gas/mips/octeon-ill.l b/gas/testsuite/gas/mips/octeon-ill.l
index ffb1e6d..b90eaf1 100644 (file)
--- a/gas/testsuite/gas/mips/octeon-ill.l
+++ b/gas/testsuite/gas/mips/octeon-ill.l
@@ -31,9 +31,9 @@
 .*:45: Error: expression out of range
 .*:46: Error: expression out of range
 .*:47: Error: register value used as expression
-.*:48: Error: illegal operands `dmfc2'
+.*:48: Error: illegal operands `dmfc2 \$4,\$15,4'
 .*:49: Error: register value used as expression
-.*:50: Error: illegal operands `dmtc2'
+.*:50: Error: illegal operands `dmtc2 \$22,\$7,\$4'
 .*:52: Error: Improper size \(32\)
 .*:54: Error: Improper position \(32\)
 .*:55: Error: Improper size \(29\)

diff --git a/gas/testsuite/gas/mips/tls-ill.l b/gas/testsuite/gas/mips/tls-ill.l
index 1c1e73c..f91ebb8 100644 (file)
--- a/gas/testsuite/gas/mips/tls-ill.l
+++ b/gas/testsuite/gas/mips/tls-ill.l
@@ -1,11 +1,11 @@
 .*: Assembler messages:
 .*:6: Error: bad expression
-.*:6: Error: illegal operands `addiu'
+.*:6: Error: illegal operands `addiu \$4,\$28,%dtprel\(tlsvar\)'
 .*:7: Error: bad expression
-.*:7: Error: illegal operands `addiu'
+.*:7: Error: illegal operands `addiu \$4,\$28,%tprel\(tlsvar\)'
 .*:8: Error: bad expression
 .*:8: Error: missing '\)'
-.*:8: Error: illegal operands `addiu'
+.*:8: Error: illegal operands `addiu \$4,\$28,%lo\(%gottprel\(tlsvar\)\)'
 .*:9: Error: bad expression
 .*:9: Error: missing '\)'
-.*:9: Error: illegal operands `addiu'
+.*:9: Error: illegal operands `addiu \$4,\$28,%hi\(%gottprel\(tlsvar\)\)'
\ No newline at end of file