Avoid shift/reduce conflict in predicate by making flagreg and subreg 1 token.

Thanks to keithp for pointing out where the conflict was.
This commit is contained in:
Eric Anholt
2006-08-29 09:30:32 -07:00
committed by Damien Lespiau
parent 0ed5d93cc2
commit de1a889fe3
2 changed files with 13 additions and 10 deletions
+3 -8
View File
@@ -651,16 +651,11 @@ accreg: ACCREG subregnum
}
;
flagreg: FLAGREG subregnum
flagreg: FLAGREG
{
if ($1 > 0) {
fprintf(stderr,
"flag register number %d out of range", $1);
YYERROR;
}
$$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
$$.reg_nr = BRW_ARF_FLAG | $1;
$$.subreg_nr = $2;
$$.reg_nr = BRW_ARF_FLAG | 0;
$$.subreg_nr = $1;
}
;