* config/bfin-parse.y (asm_1): Fix a typo.

	testsuite/
	* gas/bfin/expected_comparison_errors.l: Expect error on Line 13.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 30d4c6277fb8ec96a0d4ee7fafd7b009cab7af3c..204d8bff2e8db2dc6ed913fb4d39658001d8d03e 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-03  Jie Zhang  <jie.zhang@analog.com>
+
+       * config/bfin-parse.y (asm_1): Fix a typo.
+
 2009-09-03  Jie Zhang  <jie.zhang@analog.com>
 
        * config/bfin-parse.y (asm_1): Add LOOP_BEGIN and LOOP_END.

diff --git a/gas/config/bfin-parse.y b/gas/config/bfin-parse.y
index 719edafd5d4b278cd200587e8a3859c34705ec77..81bfef8b5281d589cc50bb38bf00010e9042dd11 100644 (file)
--- a/gas/config/bfin-parse.y
+++ b/gas/config/bfin-parse.y
@@ -1643,7 +1643,7 @@ asm_1:
        | CCREG ASSIGN REG _ASSIGN_ASSIGN REG
        {
          if ((IS_DREG ($3) && IS_DREG ($5))
-             || (IS_PREG ($3) && IS_PREG ($3)))
+             || (IS_PREG ($3) && IS_PREG ($5)))
            {
              notethat ("CCflag: CC = dpregs == dpregs\n");
              $$ = CCFLAG (&$3, $5.regno & CODE_MASK, 0, 0, IS_PREG ($3) ? 1 : 0);

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f75cb127420de3816c4a07692d7e8a38ebdb4179..13c83336edea1bf5cd98c8ea078af9547d34b4ef 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-03  Jie Zhang  <jie.zhang@analog.com>
+
+       * gas/bfin/expected_comparison_errors.l: Expect error on Line 13.
+
 2009-09-03  Jie Zhang  <jie.zhang@analog.com>
 
        * gas/bfin/loop.s, gas/bfin/loop.d: New test.

diff --git a/gas/testsuite/gas/bfin/expected_comparison_errors.l b/gas/testsuite/gas/bfin/expected_comparison_errors.l
index 0582ecd28143cf34aa77cf7e46d79397faacf919..1653d640a5e47e63e13d5300b3f2a8b0da9f4010 100644 (file)
--- a/gas/testsuite/gas/bfin/expected_comparison_errors.l
+++ b/gas/testsuite/gas/bfin/expected_comparison_errors.l
@@ -11,6 +11,7 @@
 .*:10: Error: Bad register in comparison. Input text was P0.
 .*:11: Error: Bad register in comparison.
 .*:12: Error: Bad register in comparison.
+.*:13: Error: Bad register in comparison. Input text was R0.
 .*:14: Error: Bad register in comparison.
 .*:15: Error: Bad register in comparison.
 .*:16: Error: Bad register in comparison.