flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 01:46:14 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assembler/gram.y
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;
}
;

12
assembler/lex.l
View File

@ -136,8 +136,16 @@ int saved_state = INITIAL;
yylval.integer = atoi(yytext + 1);
return NOTIFYREG;
}
"f"[0-9]+ {
yylval.integer = atoi(yytext + 1);
/* Unlike other registers, flagreg returns the subreg number in the lvalue
* rather than the reg number, to avoid a shift/reduce conflict in the
* predicate control.
*/
"f0.[0-9]+" {
yylval.integer = atoi(yytext + 3);
return FLAGREG;
}
"f0" {
yylval.integer = 0;
return FLAGREG;
}
[gr][0-9]+ {