From 90aea5198313fe5b548f31badc714a63aa0dffce Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 22 Aug 2006 14:46:39 -0700 Subject: [PATCH] Fix translation of saturate value, and wire conditionalmod to 0 for now. --- assembler/gram.y | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/assembler/gram.y b/assembler/gram.y index 0ac75c15..f956720e 100644 --- a/assembler/gram.y +++ b/assembler/gram.y @@ -143,8 +143,8 @@ unaryinstruction: dst srcaccimm instoptions { $$.header.opcode = $2; - $$.header.saturate = $3; - $$.header.destreg__conditionalmod = $4; + $$.header.destreg__conditionalmod = $3; + $$.header.saturate = $4; $$.header.execution_size = $5; set_instruction_dest(&$$, &$6); set_instruction_src0(&$$, &$7); @@ -160,8 +160,8 @@ binaryinstruction: dst src srcimm instoptions { $$.header.opcode = $2; - $$.header.saturate = $3; - $$.header.destreg__conditionalmod = $4; + $$.header.destreg__conditionalmod = $3; + $$.header.saturate = $4; $$.header.execution_size = $5; set_instruction_dest(&$$, &$6); set_instruction_src0(&$$, &$7); @@ -178,8 +178,8 @@ binaryaccinstruction: dst srcacc srcimm instoptions { $$.header.opcode = $2; - $$.header.saturate = $3; - $$.header.destreg__conditionalmod = $4; + $$.header.destreg__conditionalmod = $3; + $$.header.saturate = $4; $$.header.execution_size = $5; set_instruction_dest(&$$, &$6); set_instruction_src0(&$$, &$7); @@ -477,7 +477,7 @@ saturate: /* empty */ { $$ = BRW_INSTRUCTION_NORMAL; } | DOT SATURATE { $$ = BRW_INSTRUCTION_SATURATE; } ; -conditionalmodifier: +conditionalmodifier: { $$ = 0; } ; /* 1.4.13: Instruction options */