Add rules for more registers, and use some for destinations.

2 files changed, 230 insertions, 25 deletions

diff --git a/assembler/gram.y b/assembler/gram.y
index 1dea59d4..ea39e7ef 100644
--- a/assembler/gram.y
+++ b/assembler/gram.y
@@ -63,8 +63,10 @@
 
 %token <integer> ALIGN1 ALIGN16 MASK_DISABLE EOT
 
-%token <integer> GENREG MSGREG ACCREG ADDRESSREG
-%token FLAGREG CONTROLREG IPREG
+%token <integer> GENREG MSGREG ADDRESSREG ACCREG FLAGREG
+%token <integer> MASKREG AMASK IMASK LMASK CMASK
+%token <integer> MASKSTACKREG LMS IMS MASKSTACKDEPTHREG IMSD LMSD
+%token <integer> NOTIFYREG STATEREG CONTROLREG IPREG
 
 %token <integer> MOV FRC RNDU RNDD RNDE RNDZ NOT LZD
 %token <integer> MUL MAC MACH LINE SAD2 SADA2 DP4 DPH DP3 DP2
@@ -102,7 +104,9 @@
 %type <integer> math_function math_signed math_scalar
 %type <region> region
 %type <direct_gen_reg> directgenreg directmsgreg addrreg accreg flagreg maskreg
-%type <direct_gen_reg> nullreg
+%type <direct_gen_reg> maskstackreg maskstackdepthreg notifyreg
+%type <direct_gen_reg> statereg controlreg ipreg nullreg dstoperandex_typed
+%type <integer> mask_subreg maskstack_subreg maskstackdepth_subreg
 %type <imm32> imm32
 
 %%
@@ -382,22 +386,43 @@ dstoperand:	dstreg dstregion regtype
 		}
 ;
 
-dstoperandex:	accreg dstregion regtype
+/* The dstoperandex returns an instruction with just the destination register
+ * filled in.
+ */
+dstoperandex:	dstoperandex_typed dstregion regtype
 		{
-		  /* Returns an instruction with just the destination register
-		   * filled in.
-		   */
 		  $$.bits1.da1.dest_reg_file = $1.reg_file;
 		  $$.bits1.da1.dest_reg_nr = $1.reg_nr;
 		  $$.bits1.da1.dest_subreg_nr = $1.subreg_nr;
 		  $$.bits1.da1.dest_horiz_stride = $2;
 		  $$.bits1.da1.dest_reg_type = $3;
 		}
+		| maskstackreg
+		{
+		  $$.bits1.da1.dest_reg_file = $1.reg_file;
+		  $$.bits1.da1.dest_reg_nr = $1.reg_nr;
+		  $$.bits1.da1.dest_subreg_nr = $1.subreg_nr;
+		  $$.bits1.da1.dest_horiz_stride = 1;
+		  $$.bits1.da1.dest_reg_type = BRW_REGISTER_TYPE_UW;
+		}
+		| controlreg
+		{
+		  $$.bits1.da1.dest_reg_file = $1.reg_file;
+		  $$.bits1.da1.dest_reg_nr = $1.reg_nr;
+		  $$.bits1.da1.dest_subreg_nr = $1.subreg_nr;
+		  $$.bits1.da1.dest_horiz_stride = 1;
+		  $$.bits1.da1.dest_reg_type = BRW_REGISTER_TYPE_UD;
+		}
+		| ipreg
+		{
+		  $$.bits1.da1.dest_reg_file = $1.reg_file;
+		  $$.bits1.da1.dest_reg_nr = $1.reg_nr;
+		  $$.bits1.da1.dest_subreg_nr = $1.subreg_nr;
+		  $$.bits1.da1.dest_horiz_stride = 1;
+		  $$.bits1.da1.dest_reg_type = BRW_REGISTER_TYPE_UD;
+		}
 		| nullreg
 		{
-		  /* Returns an instruction with just the destination register
-		   * filled in.
-		   */
 		  $$.bits1.da1.dest_reg_file = $1.reg_file;
 		  $$.bits1.da1.dest_reg_nr = $1.reg_nr;
 		  $$.bits1.da1.dest_subreg_nr = $1.subreg_nr;
@@ -406,6 +431,9 @@ dstoperandex:	accreg dstregion regtype
 		}
 ;
 
+dstoperandex_typed: accreg | flagreg | addrreg | maskreg
+;
+
 /* XXX: indirectgenreg, directmsgreg, indirectmsgreg */
 dstreg:		directgenreg
 		{
@@ -468,7 +496,7 @@ imm32reg:	imm32 srcimmtype
 		}
 ;
 
-/* XXX: srcaccoperandex, accreg regtype */
+/* XXX: accreg regtype */
 directsrcaccoperand:	directsrcoperand
 ;
 
@@ -509,9 +537,6 @@ subregnum:	DOT INTEGER
 /* 1.4.5: Register files and register numbers */
 directgenreg:	GENREG subregnum
 		{
-		  /* Returns an instruction with just the destination register
-		   * fields filled in.
-		   */
 		  $$.reg_file = BRW_GENERAL_REGISTER_FILE;
 		  $$.reg_nr = $1;
 		  $$.subreg_nr = $2;
@@ -519,20 +544,22 @@ directgenreg:	GENREG subregnum
 
 directmsgreg:	MSGREG subregnum
 		{
-		  /* Returns an instruction with just the destination register
-		   * fields filled in.
-		   */
 		  $$.reg_file = BRW_MESSAGE_REGISTER_FILE;
 		  $$.reg_nr = $1;
 		  $$.subreg_nr = $2;
 		}
 ;
 
+addrreg:	ADDRESSREG subregnum
+		{
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_ADDRESS | $1;
+		  $$.subreg_nr = $2;
+		}
+;
+
 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);
@@ -544,15 +571,141 @@ accreg:		ACCREG subregnum
 		}
 ;
 
-addrreg:	ADDRESSREG subregnum
+flagreg:	FLAGREG subregnum
 		{
-		  /* Returns an instruction with just the destination register
-		   * fields filled in.
-		   */
+		  if ($1 > 0) {
+		    fprintf(stderr,
+			    "flag register number %d out of range", $1);
+		    YYERROR;
+		  }
 		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
-		  $$.reg_nr = BRW_ARF_ADDRESS | $1;
+		  $$.reg_nr = BRW_ARF_FLAG | $1;
+		  $$.subreg_nr = $2;
+		}
+;
+
+maskreg:	MASKREG subregnum
+		{
+		  if ($1 > 0) {
+		    fprintf(stderr,
+			    "mask register number %d out of range", $1);
+		    YYERROR;
+		  }
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_MASK;
+		  $$.subreg_nr = $2;
+		}
+		| mask_subreg
+		{
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_MASK;
+		  $$.subreg_nr = $1;
+		}
+;
+
+mask_subreg:	AMASK | IMASK | LMASK | CMASK
+;
+
+maskstackreg:	MASKSTACKREG subregnum
+		{
+		  if ($1 > 0) {
+		    fprintf(stderr,
+			    "mask stack register number %d out of range", $1);
+		    YYERROR;
+		  }
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_MASK_STACK;
 		  $$.subreg_nr = $2;
 		}
+		| maskstack_subreg
+		{
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_MASK_STACK;
+		  $$.subreg_nr = $1;
+		}
+;
+
+maskstack_subreg: IMS | LMS
+;
+
+maskstackdepthreg: MASKSTACKDEPTHREG subregnum
+		{
+		  if ($1 > 0) {
+		    fprintf(stderr,
+			    "mask stack register number %d out of range", $1);
+		    YYERROR;
+		  }
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_MASK_STACK_DEPTH;
+		  $$.subreg_nr = $2;
+		}
+		| maskstackdepth_subreg
+		{
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_MASK_STACK_DEPTH;
+		  $$.subreg_nr = $1;
+		}
+;
+
+maskstackdepth_subreg: IMSD | LMSD
+;
+
+notifyreg:	NOTIFYREG
+		{
+		  if ($1 > 1) {
+		    fprintf(stderr,
+			    "notification register number %d out of range",
+			    $1);
+		    YYERROR;
+		  }
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_NOTIFICATION_COUNT;
+		  $$.subreg_nr = 0;
+		}
+;
+
+statereg:	STATEREG subregnum
+		{
+		  if ($1 > 0) {
+		    fprintf(stderr,
+			    "state register number %d out of range", $1);
+		    YYERROR;
+		  }
+		  if ($2 > 1) {
+		    fprintf(stderr,
+			    "state subregister number %d out of range", $1);
+		    YYERROR;
+		  }
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_STATE | $1;
+		  $$.subreg_nr = $2;
+		}
+;
+
+controlreg:	CONTROLREG subregnum
+		{
+		  if ($1 > 0) {
+		    fprintf(stderr,
+			    "control register number %d out of range", $1);
+		    YYERROR;
+		  }
+		  if ($2 > 2) {
+		    fprintf(stderr,
+			    "control subregister number %d out of range", $1);
+		    YYERROR;
+		  }
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_CONTROL | $1;
+		  $$.subreg_nr = $2;
+		}
+;
+
+ipreg:		IPREG
+		{
+		  $$.reg_file = BRW_ARCHITECTURE_REGISTER_FILE;
+		  $$.reg_nr = BRW_ARF_IP;
+		  $$.subreg_nr = 0;
+		}
 ;
 
 nullreg:	NULL_TOKEN
diff --git a/assembler/lex.l b/assembler/lex.l
index ab418da2..b5b4f725 100644
--- a/assembler/lex.l
+++ b/assembler/lex.l
@@ -119,6 +119,22 @@ int saved_state = INITIAL;
 	yylval.integer = atoi(yytext + 1);
 	return MSGREG;
 }
+"mask"[0-9]+ {
+	yylval.integer = atoi(yytext + 1);
+	return MASKREG;
+}
+"ms"[0-9]+ {
+	yylval.integer = atoi(yytext + 1);
+	return MASKSTACKREG;
+}
+"msd"[0-9]+ {
+	yylval.integer = atoi(yytext + 1);
+	return MASKSTACKDEPTHREG;
+}
+"n"[0-9]+ {
+	yylval.integer = atoi(yytext + 1);
+	return NOTIFYREG;
+}
 "f"[0-9]+ {
 	yylval.integer = atoi(yytext + 1);
 	return FLAGREG;
@@ -131,9 +147,45 @@ int saved_state = INITIAL;
 	yylval.integer = atoi(yytext + 1);
 	return CONTROLREG;
 }
+"sr"[0-9]+ {
+	yylval.integer = atoi(yytext + 1);
+	return STATEREG;
+}
 "ip" {
 	return IPREG;
 }
+"amask" {
+	yylval.integer = BRW_AMASK;
+	return AMASK;
+}
+"imask" {
+	yylval.integer = BRW_IMASK;
+	return IMASK;
+}
+"lmask" {
+	yylval.integer = BRW_LMASK;
+	return LMASK;
+}
+"cmask" {
+	yylval.integer = BRW_CMASK;
+	return CMASK;
+}
+"imsd" {
+	yylval.integer = 0;
+	return IMSD;
+}
+"lmsd" {
+	yylval.integer = 1;
+	return LMSD;
+}
+"ims" {
+	yylval.integer = 0;
+	return IMS;
+}
+"lms" {
+	yylval.integer = 16;
+	return LMS;
+}
 
  /*
   * Lexing of register types should probably require the ":" symbol specified