diff options
| author | Eric Anholt <eric@anholt.net> | 2006-08-25 09:46:18 -0700 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2013-03-04 15:54:22 +0000 |
| commit | 569990bf6b6f1d95ffa88981d0afe8b16626e4be (patch) | |
| tree | 42c1739546855837cab48d806f21d26eb3750413 /assembler/gram.y | |
| parent | 3d36079ae3f9cab993b7bbec68f6fa2fbfb60136 (diff) | |
Lex the register number with the register name.
This avoids the need for a start condition to prevent for example g1.8<0,1,0>UW
being lexed as GENREG NUMBER LANGLE etc. rather than
GENREG INTEGER DOT INTEGER LANGLE etc.
Diffstat (limited to 'assembler/gram.y')
| -rw-r--r-- | assembler/gram.y | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/assembler/gram.y b/assembler/gram.y index 0609d90a..7ed2f41b 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -63,7 +63,8 @@ %token <integer> ALIGN1 ALIGN16 MASK_DISABLE EOT -%token GENREG MSGREG ACCREG ADDRESSREG FLAGREG CONTROLREG IPREG +%token <integer> GENREG MSGREG ACCREG ADDRESSREG +%token FLAGREG CONTROLREG IPREG %token MOV %token MUL MAC MACH LINE SAD2 SADA2 DP4 DPH DP3 DP2 @@ -497,46 +498,51 @@ subregnum: DOT INTEGER ; /* 1.4.5: Register files and register numbers */ -directgenreg: GENREG INTEGER subregnum +directgenreg: GENREG subregnum { /* Returns an instruction with just the destination register * fields filled in. */ $$.reg_file = BRW_GENERAL_REGISTER_FILE; - $$.reg_nr = $2; - $$.subreg_nr = $3; + $$.reg_nr = $1; + $$.subreg_nr = $2; } -directmsgreg: MSGREG INTEGER subregnum +directmsgreg: MSGREG subregnum { /* Returns an instruction with just the destination register * fields filled in. */ $$.reg_file = BRW_MESSAGE_REGISTER_FILE; - $$.reg_nr = $2; - $$.subreg_nr = $3; + $$.reg_nr = $1; + $$.subreg_nr = $2; } ; -accreg: ACCREG INTEGER subregnum +accreg: ACCREG subregnum { /* Returns an instruction with just the destination register * fields filled in. */ + if ($1 > 1) { + fprintf(stderr, + "accumulator register number %d out of range", $1); + YYERROR; + } $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE; - $$.reg_nr = BRW_ARF_ACCUMULATOR | $2; - $$.subreg_nr = $3; + $$.reg_nr = BRW_ARF_ACCUMULATOR | $1; + $$.subreg_nr = $2; } ; -addrreg: ADDRESSREG INTEGER subregnum +addrreg: ADDRESSREG subregnum { /* Returns an instruction with just the destination register * fields filled in. */ $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE; - $$.reg_nr = BRW_ARF_ADDRESS | $2; - $$.subreg_nr = $3; + $$.reg_nr = BRW_ARF_ADDRESS | $1; + $$.subreg_nr = $2; } ; |