diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/bfin-parse.y | 42 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/bfin/expected_comparison_errors.l | 17 | ||||
| -rw-r--r-- | gas/testsuite/gas/bfin/expected_comparison_errors.s | 6 |
5 files changed, 48 insertions, 27 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index c4fa8bb..de02970 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,10 @@ 2009-09-01 Jie Zhang <jie.zhang@analog.com> + * config/bfin-parse.y (asm_1): Only PREG and DREG are allowed + in comparison. + +2009-09-01 Jie Zhang <jie.zhang@analog.com> + 2007-09-28 Bernd Schmidt <bernd.schmidt@analog.com> * config/tc-bfin.c (bfin_fix_adjustable): Partially revert the 2007-08-23 change; BFD_RELOC_BFIN_GOT is not adjustable. diff --git a/gas/config/bfin-parse.y b/gas/config/bfin-parse.y index d22f774..66978f7 100644 --- a/gas/config/bfin-parse.y +++ b/gas/config/bfin-parse.y @@ -1623,16 +1623,20 @@ asm_1: } | CCREG ASSIGN REG LESS_THAN REG iu_or_nothing { - if (REG_CLASS($3) == REG_CLASS($5)) + if ((IS_DREG ($3) && IS_DREG ($5)) + || (IS_PREG ($3) && IS_PREG ($5))) { notethat ("CCflag: CC = dpregs < dpregs\n"); $$ = CCFLAG (&$3, $5.regno & CODE_MASK, $6.r0, 0, IS_PREG ($3) ? 1 : 0); } else - return yyerror ("Compare only of same register class"); + return yyerror ("Bad register in comparison"); } | CCREG ASSIGN REG LESS_THAN expr iu_or_nothing { + if (!IS_DREG ($3) && !IS_PREG ($3)) + return yyerror ("Bad register in comparison"); + if (($6.r0 == 1 && IS_IMM ($5, 3)) || ($6.r0 == 3 && IS_UIMM ($5, 3))) { @@ -1644,16 +1648,20 @@ asm_1: } | CCREG ASSIGN REG _ASSIGN_ASSIGN REG { - if (REG_CLASS($3) == REG_CLASS($5)) + if ((IS_DREG ($3) && IS_DREG($5)) + || (IS_PREG ($3) && IS_PREG ($3))) { notethat ("CCflag: CC = dpregs == dpregs\n"); $$ = CCFLAG (&$3, $5.regno & CODE_MASK, 0, 0, IS_PREG ($3) ? 1 : 0); } else - return yyerror ("Compare only of same register class"); + return yyerror ("Bad register in comparison"); } | CCREG ASSIGN REG _ASSIGN_ASSIGN expr { + if (!IS_DREG ($3) && !IS_PREG ($3)) + return yyerror ("Bad register in comparison"); + if (IS_IMM ($5, 3)) { notethat ("CCflag: CC = dpregs == imm3\n"); @@ -1674,34 +1682,26 @@ asm_1: } | CCREG ASSIGN REG _LESS_THAN_ASSIGN REG iu_or_nothing { - if (REG_CLASS($3) == REG_CLASS($5)) + if ((IS_DREG ($3) && IS_DREG ($5)) + || (IS_PREG ($3) && IS_PREG ($5))) { - notethat ("CCflag: CC = pregs <= pregs (..)\n"); + notethat ("CCflag: CC = dpregs <= dpregs (..)\n"); $$ = CCFLAG (&$3, $5.regno & CODE_MASK, 1 + $6.r0, 0, IS_PREG ($3) ? 1 : 0); } else - return yyerror ("Compare only of same register class"); + return yyerror ("Bad register in comparison"); } | CCREG ASSIGN REG _LESS_THAN_ASSIGN expr iu_or_nothing { + if (!IS_DREG ($3) && !IS_PREG ($3)) + return yyerror ("Bad register in comparison"); + if (($6.r0 == 1 && IS_IMM ($5, 3)) || ($6.r0 == 3 && IS_UIMM ($5, 3))) { - if (IS_DREG ($3)) - { - notethat ("CCflag: CC = dregs <= (u)imm3\n"); - /* x y opc I G */ - $$ = CCFLAG (&$3, imm3 ($5), 1 + $6.r0, 1, 0); - } - else if (IS_PREG ($3)) - { - notethat ("CCflag: CC = pregs <= (u)imm3\n"); - /* x y opc I G */ - $$ = CCFLAG (&$3, imm3 ($5), 1 + $6.r0, 1, 1); - } - else - return yyerror ("Dreg or Preg expected"); + notethat ("CCflag: CC = dpregs <= (u)imm3\n"); + $$ = CCFLAG (&$3, imm3 ($5), 1 + $6.r0, 1, IS_PREG ($3) ? 1 : 0); } else return yyerror ("Bad constant value"); diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 7089122..051d53c 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2009-09-01 Jie Zhang <jie.zhang@analog.com> + * gas/bfin/expected_comparison_errors.s: Add more cases. + * gas/bfin/expected_comparison_errors.l: Update accordingly. + +2009-09-01 Jie Zhang <jie.zhang@analog.com> + * gas/bfin/stack2.s: Add pop multiple instruction with a label on the same line. * gas/bfin/stack2.d: Adjust accordingly. diff --git a/gas/testsuite/gas/bfin/expected_comparison_errors.l b/gas/testsuite/gas/bfin/expected_comparison_errors.l index 12569f3..0582ecd 100644 --- a/gas/testsuite/gas/bfin/expected_comparison_errors.l +++ b/gas/testsuite/gas/bfin/expected_comparison_errors.l @@ -8,9 +8,14 @@ .*:7: Error: AREGs are in bad order or same. Input text was a0. .*:8: Error: AREGs are in bad order or same. Input text was a1. .*:9: Error: AREGs are in bad order or same. Input text was a0. -.*:10: Error: Compare only of same register class. Input text was P0. -.*:11: Error: Compare only of same register class. -.*:12: Error: Compare only of same register class. -.*:13: Error: Compare only of same register class. Input text was R0. -.*:14: Error: Compare only of same register class. -.*:15: Error: Compare only of same register class. +.*:10: Error: Bad register in comparison. Input text was P0. +.*:11: Error: Bad register in comparison. +.*:12: Error: Bad register in comparison. +.*:14: Error: Bad register in comparison. +.*:15: Error: Bad register in comparison. +.*:16: Error: Bad register in comparison. +.*:17: Error: Bad register in comparison. Input text was I0. +.*:18: Error: Bad register in comparison. +.*:19: Error: Bad register in comparison. +.*:20: Error: Bad register in comparison. +.*:21: Error: Bad register in comparison. diff --git a/gas/testsuite/gas/bfin/expected_comparison_errors.s b/gas/testsuite/gas/bfin/expected_comparison_errors.s index d08967b..99a9359 100644 --- a/gas/testsuite/gas/bfin/expected_comparison_errors.s +++ b/gas/testsuite/gas/bfin/expected_comparison_errors.s @@ -13,3 +13,9 @@ CC = P0 == R0; CC = P0 < R0; CC = P0 <= R0; + CC = I0 == 0; + CC = I0 == I0; + CC = I0 < 0; + CC = I0 < I0; + CC = I0 <= 0; + CC = I0 <= I0; |