assembler: Unify the direct and indirect register type

They are all struct brw_reg registers now.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2013-01-23 16:20:05 +00:00
parent 36f8f65aa0
commit 801b4eb1b3

View File

@ -158,8 +158,7 @@ static void brw_program_add_label(struct brw_program *p, const char *label)
struct brw_program program; struct brw_program program;
struct region region; struct region region;
struct regtype regtype; struct regtype regtype;
struct brw_reg direct_reg; struct brw_reg reg;
struct brw_reg indirect_reg;
struct condition condition; struct condition condition;
struct declared_register symbol_reg; struct declared_register symbol_reg;
imm32_t imm32; imm32_t imm32;
@ -262,13 +261,13 @@ static void brw_program_add_label(struct brw_program *p, const char *label)
%type <integer> predctrl predstate %type <integer> predctrl predstate
%type <region> region region_wh indirectregion declare_srcregion; %type <region> region region_wh indirectregion declare_srcregion;
%type <regtype> regtype %type <regtype> regtype
%type <direct_reg> directgenreg directmsgreg addrreg accreg flagreg maskreg %type <reg> directgenreg directmsgreg addrreg accreg flagreg maskreg
%type <direct_reg> maskstackreg notifyreg %type <reg> maskstackreg notifyreg
/* %type <direct_reg> maskstackdepthreg */ /* %type <reg> maskstackdepthreg */
%type <direct_reg> statereg controlreg ipreg nullreg %type <reg> statereg controlreg ipreg nullreg
%type <direct_reg> dstoperandex_typed srcarchoperandex_typed %type <reg> dstoperandex_typed srcarchoperandex_typed
%type <direct_reg> sendleadreg %type <reg> sendleadreg
%type <indirect_reg> indirectgenreg indirectmsgreg addrparam %type <reg> indirectgenreg indirectmsgreg addrparam
%type <integer> mask_subreg maskstack_subreg %type <integer> mask_subreg maskstack_subreg
%type <integer> declare_elementsize declare_dstregion declare_type %type <integer> declare_elementsize declare_dstregion declare_type
/* %type <intger> maskstackdepth_subreg */ /* %type <intger> maskstackdepth_subreg */
@ -1955,7 +1954,7 @@ indirectsrcoperand:
; ;
/* 1.4.4: Address Registers */ /* 1.4.4: Address Registers */
/* Returns a partially-completed indirect_reg consisting of the address /* Returns a partially-completed struct brw_reg consisting of the address
* register fields for register-indirect access. * register fields for register-indirect access.
*/ */
addrparam: addrreg COMMA immaddroffset addrparam: addrreg COMMA immaddroffset