Merge branch 'dev-private' into dev-purdue-integration-trace

1 files changed, 253 insertions, 245 deletions

diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y
index 45392fb..a01c3c6 100644
--- a/src/cuda-sim/ptx.y
+++ b/src/cuda-sim/ptx.y
@@ -27,6 +27,18 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+%{
+typedef void * yyscan_t;
+class ptx_recognizer;
+#include "../../libcuda/gpgpu_context.h"
+%}
+
+%define api.pure full
+%parse-param {yyscan_t scanner}
+%parse-param {ptx_recognizer* recognizer}
+%lex-param {yyscan_t scanner}
+%lex-param {ptx_recognizer* recognizer}
+
 %union {
   double double_value;
   float  float_value;
@@ -217,10 +229,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	#include <stdlib.h>
 	#include <string.h>
 	#include <math.h>
-	void syntax_not_implemented();
-	extern int g_func_decl;
-	int ptx_lex(void);
-	int ptx_error(const char *);
+	void syntax_not_implemented(yyscan_t yyscanner, ptx_recognizer* recognizer);
+	int ptx_lex(YYSTYPE * yylval_param, yyscan_t yyscanner, ptx_recognizer* recognizer);
+	int ptx_error( yyscan_t yyscanner, ptx_recognizer* recognizer, const char *s );
 %}
 
 %%
@@ -231,96 +242,96 @@ input:	/* empty */
 	| input function_decl
 	;
 
-function_defn: function_decl { set_symtab($1); func_header(".skip"); } statement_block { end_function(); }
-	| function_decl { set_symtab($1); } block_spec_list { func_header(".skip"); } statement_block { end_function(); }
+function_defn: function_decl { recognizer->set_symtab($1); recognizer->func_header(".skip"); } statement_block { recognizer->end_function(); }
+	| function_decl { recognizer->set_symtab($1); } block_spec_list { recognizer->func_header(".skip"); } statement_block { recognizer->end_function(); }
 	;
 
-block_spec: MAXNTID_DIRECTIVE INT_OPERAND COMMA INT_OPERAND COMMA INT_OPERAND {func_header_info_int(".maxntid", $2);
-										func_header_info_int(",", $4);
-										func_header_info_int(",", $6); 
-                                                                                maxnt_id($2, $4, $6);}
-	| MINNCTAPERSM_DIRECTIVE INT_OPERAND { func_header_info_int(".minnctapersm", $2); printf("GPGPU-Sim: Warning: .minnctapersm ignored. \n"); }
-	| MAXNCTAPERSM_DIRECTIVE INT_OPERAND { func_header_info_int(".maxnctapersm", $2); printf("GPGPU-Sim: Warning: .maxnctapersm ignored. \n"); }
+block_spec: MAXNTID_DIRECTIVE INT_OPERAND COMMA INT_OPERAND COMMA INT_OPERAND {recognizer->func_header_info_int(".maxntid", $2);
+										recognizer->func_header_info_int(",", $4);
+										recognizer->func_header_info_int(",", $6);
+                                                                                recognizer->maxnt_id($2, $4, $6);}
+	| MINNCTAPERSM_DIRECTIVE INT_OPERAND { recognizer->func_header_info_int(".minnctapersm", $2); printf("GPGPU-Sim: Warning: .minnctapersm ignored. \n"); }
+	| MAXNCTAPERSM_DIRECTIVE INT_OPERAND { recognizer->func_header_info_int(".maxnctapersm", $2); printf("GPGPU-Sim: Warning: .maxnctapersm ignored. \n"); }
 	;
 
 block_spec_list: block_spec
 	| block_spec_list block_spec
 	;
 
-function_decl: function_decl_header LEFT_PAREN { start_function($1); func_header_info("(");} param_entry RIGHT_PAREN {func_header_info(")");} function_ident_param { $$ = reset_symtab(); }
-	| function_decl_header { start_function($1); } function_ident_param { $$ = reset_symtab(); }
-	| function_decl_header { start_function($1); add_function_name(""); g_func_decl=0; $$ = reset_symtab(); }
+function_decl: function_decl_header LEFT_PAREN { recognizer->start_function($1); recognizer->func_header_info("(");} param_entry RIGHT_PAREN {recognizer->func_header_info(")");} function_ident_param { $$ = recognizer->reset_symtab(); }
+	| function_decl_header { recognizer->start_function($1); } function_ident_param { $$ = recognizer->reset_symtab(); }
+	| function_decl_header { recognizer->start_function($1); recognizer->add_function_name(""); recognizer->g_func_decl=0; $$ = recognizer->reset_symtab(); }
 	;
 
-function_ident_param: IDENTIFIER { add_function_name($1); } LEFT_PAREN {func_header_info("(");} param_list RIGHT_PAREN { g_func_decl=0; func_header_info(")"); } 
-	| IDENTIFIER { add_function_name($1); g_func_decl=0; } 
+function_ident_param: IDENTIFIER { recognizer->add_function_name($1); } LEFT_PAREN {recognizer->func_header_info("(");} param_list RIGHT_PAREN { recognizer->g_func_decl=0; recognizer->func_header_info(")"); }
+	| IDENTIFIER { recognizer->add_function_name($1); recognizer->g_func_decl=0; }
 	;
 
-function_decl_header: ENTRY_DIRECTIVE { $$ = 1; g_func_decl=1; func_header(".entry"); }
-	| VISIBLE_DIRECTIVE ENTRY_DIRECTIVE { $$ = 1; g_func_decl=1; func_header(".entry"); }
-	| WEAK_DIRECTIVE ENTRY_DIRECTIVE { $$ = 1; g_func_decl=1; func_header(".entry"); }
-	| FUNC_DIRECTIVE { $$ = 0; g_func_decl=1; func_header(".func"); }
-	| VISIBLE_DIRECTIVE FUNC_DIRECTIVE { $$ = 0; g_func_decl=1; func_header(".func"); }
-	| WEAK_DIRECTIVE FUNC_DIRECTIVE { $$ = 0; g_func_decl=1; func_header(".func"); }
-	| EXTERN_DIRECTIVE FUNC_DIRECTIVE { $$ = 2; g_func_decl=1; func_header(".func"); }
-	| WEAK_DIRECTIVE FUNC_DIRECTIVE { $$ = 0; g_func_decl=1; func_header(".func"); }
+function_decl_header: ENTRY_DIRECTIVE { $$ = 1; recognizer->g_func_decl=1; recognizer->func_header(".entry"); }
+	| VISIBLE_DIRECTIVE ENTRY_DIRECTIVE { $$ = 1; recognizer->g_func_decl=1; recognizer->func_header(".entry"); }
+	| WEAK_DIRECTIVE ENTRY_DIRECTIVE { $$ = 1; recognizer->g_func_decl=1; recognizer->func_header(".entry"); }
+	| FUNC_DIRECTIVE { $$ = 0; recognizer->g_func_decl=1; recognizer->func_header(".func"); }
+	| VISIBLE_DIRECTIVE FUNC_DIRECTIVE { $$ = 0; recognizer->g_func_decl=1; recognizer->func_header(".func"); }
+	| WEAK_DIRECTIVE FUNC_DIRECTIVE { $$ = 0; recognizer->g_func_decl=1; recognizer->func_header(".func"); }
+	| EXTERN_DIRECTIVE FUNC_DIRECTIVE { $$ = 2; recognizer->g_func_decl=1; recognizer->func_header(".func"); }
+	| WEAK_DIRECTIVE FUNC_DIRECTIVE { $$ = 0; recognizer->g_func_decl=1; recognizer->func_header(".func"); }
 	;
 
 param_list: /*empty*/
-	| param_entry { add_directive(); }
-	| param_list COMMA {func_header_info(",");} param_entry { add_directive(); }
+	| param_entry { recognizer->add_directive(); }
+	| param_list COMMA {recognizer->func_header_info(",");} param_entry { recognizer->add_directive(); }
 
-param_entry: PARAM_DIRECTIVE { add_space_spec(param_space_unclassified,0); } variable_spec ptr_spec identifier_spec { add_function_arg(); }
-	| REG_DIRECTIVE { add_space_spec(reg_space,0); } variable_spec identifier_spec { add_function_arg(); }
+param_entry: PARAM_DIRECTIVE { recognizer->add_space_spec(param_space_unclassified,0); } variable_spec ptr_spec identifier_spec { recognizer->add_function_arg(); }
+	| REG_DIRECTIVE { recognizer->add_space_spec(reg_space,0); } variable_spec identifier_spec { recognizer->add_function_arg(); }
 
 ptr_spec: /*empty*/
         | PTR_DIRECTIVE ptr_space_spec ptr_align_spec
         | PTR_DIRECTIVE ptr_align_spec
 
-ptr_space_spec: GLOBAL_DIRECTIVE { add_ptr_spec(global_space); }
-              | LOCAL_DIRECTIVE  { add_ptr_spec(local_space); }
-              | SHARED_DIRECTIVE { add_ptr_spec(shared_space); }
-			  | CONST_DIRECTIVE { add_ptr_spec(global_space); }
+ptr_space_spec: GLOBAL_DIRECTIVE { recognizer->add_ptr_spec(global_space); }
+              | LOCAL_DIRECTIVE  { recognizer->add_ptr_spec(local_space); }
+              | SHARED_DIRECTIVE { recognizer->add_ptr_spec(shared_space); }
+			  | CONST_DIRECTIVE { recognizer->add_ptr_spec(global_space); }
 
 ptr_align_spec: ALIGN_DIRECTIVE INT_OPERAND
 
 statement_block: LEFT_BRACE statement_list RIGHT_BRACE 
 
-statement_list: directive_statement { add_directive(); }
-	| instruction_statement { add_instruction(); }
-	| statement_list directive_statement { add_directive(); }
-	| statement_list instruction_statement { add_instruction(); }
-	| statement_list {start_inst_group();} statement_block {end_inst_group();}
-	| {start_inst_group();} statement_block {end_inst_group();}
+statement_list: directive_statement { recognizer->add_directive(); }
+	| instruction_statement { recognizer->add_instruction(); }
+	| statement_list directive_statement { recognizer->add_directive(); }
+	| statement_list instruction_statement { recognizer->add_instruction(); }
+	| statement_list {recognizer->start_inst_group();} statement_block {recognizer->end_inst_group();}
+	| {recognizer->start_inst_group();} statement_block {recognizer->end_inst_group();}
 	;
 
 directive_statement: variable_declaration SEMI_COLON
-	| VERSION_DIRECTIVE DOUBLE_OPERAND { add_version_info($2, 0); }
-	| VERSION_DIRECTIVE DOUBLE_OPERAND PLUS { add_version_info($2,1); }
+	| VERSION_DIRECTIVE DOUBLE_OPERAND { recognizer->add_version_info($2, 0); }
+	| VERSION_DIRECTIVE DOUBLE_OPERAND PLUS { recognizer->add_version_info($2,1); }
 	| ADDRESS_SIZE_DIRECTIVE INT_OPERAND {/*Do nothing*/}
-	| TARGET_DIRECTIVE IDENTIFIER COMMA IDENTIFIER { target_header2($2,$4); }
-	| TARGET_DIRECTIVE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER { target_header3($2,$4,$6); }
-	| TARGET_DIRECTIVE IDENTIFIER { target_header($2); }
-	| FILE_DIRECTIVE INT_OPERAND STRING { add_file($2,$3); } 
-	| FILE_DIRECTIVE INT_OPERAND STRING COMMA INT_OPERAND COMMA INT_OPERAND { add_file($2,$3); } 	
+	| TARGET_DIRECTIVE IDENTIFIER COMMA IDENTIFIER { recognizer->target_header2($2,$4); }
+	| TARGET_DIRECTIVE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER { recognizer->target_header3($2,$4,$6); }
+	| TARGET_DIRECTIVE IDENTIFIER { recognizer->target_header($2); }
+	| FILE_DIRECTIVE INT_OPERAND STRING { recognizer->add_file($2,$3); }
+	| FILE_DIRECTIVE INT_OPERAND STRING COMMA INT_OPERAND COMMA INT_OPERAND { recognizer->add_file($2,$3); }
 	| LOC_DIRECTIVE INT_OPERAND INT_OPERAND INT_OPERAND 
-	| PRAGMA_DIRECTIVE STRING SEMI_COLON { add_pragma($2); }
+	| PRAGMA_DIRECTIVE STRING SEMI_COLON { recognizer->add_pragma($2); }
 	| function_decl SEMI_COLON {/*Do nothing*/}
 	;
 
-variable_declaration: variable_spec identifier_list { add_variables(); }
-	| variable_spec identifier_spec EQUALS initializer_list { add_variables(); }
-	| variable_spec identifier_spec EQUALS literal_operand { add_variables(); }
-	| CONSTPTR_DIRECTIVE IDENTIFIER COMMA IDENTIFIER COMMA INT_OPERAND { add_constptr($2, $4, $6); }
+variable_declaration: variable_spec identifier_list { recognizer->add_variables(); }
+	| variable_spec identifier_spec EQUALS initializer_list { recognizer->add_variables(); }
+	| variable_spec identifier_spec EQUALS literal_operand { recognizer->add_variables(); }
+	| CONSTPTR_DIRECTIVE IDENTIFIER COMMA IDENTIFIER COMMA INT_OPERAND { recognizer->add_constptr($2, $4, $6); }
 	;
 
-variable_spec: var_spec_list { set_variable_type(); }
+variable_spec: var_spec_list { recognizer->set_variable_type(); }
 
 identifier_list: identifier_spec
 	| identifier_list COMMA identifier_spec;
 
-identifier_spec: IDENTIFIER { add_identifier($1,0,NON_ARRAY_IDENTIFIER); func_header_info($1);}
-	| IDENTIFIER LEFT_ANGLE_BRACKET INT_OPERAND RIGHT_ANGLE_BRACKET { func_header_info($1); func_header_info_int("<", $3); func_header_info(">");
+identifier_spec: IDENTIFIER { recognizer->add_identifier($1,0,NON_ARRAY_IDENTIFIER); recognizer->func_header_info($1);}
+	| IDENTIFIER LEFT_ANGLE_BRACKET INT_OPERAND RIGHT_ANGLE_BRACKET { recognizer->func_header_info($1); recognizer->func_header_info_int("<", $3); recognizer->func_header_info(">");
 		int i,lbase,l;
 		char *id = NULL;
 		lbase = strlen($1);
@@ -328,12 +339,12 @@ identifier_spec: IDENTIFIER { add_identifier($1,0,NON_ARRAY_IDENTIFIER); func_he
 			l = lbase + (int)log10(i+1)+10;
 			id = (char*) malloc(l);
 			snprintf(id,l,"%s%u",$1,i);
-			add_identifier(id,0,NON_ARRAY_IDENTIFIER); 
+			recognizer->add_identifier(id,0,NON_ARRAY_IDENTIFIER);
 		}
 		free($1);
 	}
-	| IDENTIFIER LEFT_SQUARE_BRACKET RIGHT_SQUARE_BRACKET { add_identifier($1,0,ARRAY_IDENTIFIER_NO_DIM); func_header_info($1); func_header_info("["); func_header_info("]");}
-	| IDENTIFIER LEFT_SQUARE_BRACKET INT_OPERAND RIGHT_SQUARE_BRACKET { add_identifier($1,$3,ARRAY_IDENTIFIER); func_header_info($1); func_header_info_int("[",$3); func_header_info("]");}
+	| IDENTIFIER LEFT_SQUARE_BRACKET RIGHT_SQUARE_BRACKET { recognizer->add_identifier($1,0,ARRAY_IDENTIFIER_NO_DIM); recognizer->func_header_info($1); recognizer->func_header_info("["); recognizer->func_header_info("]");}
+	| IDENTIFIER LEFT_SQUARE_BRACKET INT_OPERAND RIGHT_SQUARE_BRACKET { recognizer->add_identifier($1,$3,ARRAY_IDENTIFIER); recognizer->func_header_info($1); recognizer->func_header_info_int("[",$3); recognizer->func_header_info("]");}
 	;
 
 var_spec_list: var_spec 
@@ -343,93 +354,93 @@ var_spec: space_spec
 	| type_spec
 	| align_spec
 	| VISIBLE_DIRECTIVE
-	| EXTERN_DIRECTIVE { add_extern_spec(); }
+	| EXTERN_DIRECTIVE { recognizer->add_extern_spec(); }
     | WEAK_DIRECTIVE
 	;
 
-align_spec: ALIGN_DIRECTIVE INT_OPERAND { add_alignment_spec($2); }
+align_spec: ALIGN_DIRECTIVE INT_OPERAND { recognizer->add_alignment_spec($2); }
 
-space_spec: REG_DIRECTIVE {  add_space_spec(reg_space,0); }
-	| SREG_DIRECTIVE  {  add_space_spec(reg_space,0); }
+space_spec: REG_DIRECTIVE {  recognizer->add_space_spec(reg_space,0); }
+	| SREG_DIRECTIVE  {  recognizer->add_space_spec(reg_space,0); }
 	| addressable_spec
 	;
 
-addressable_spec: CONST_DIRECTIVE {  add_space_spec(const_space,$1); }
-	| GLOBAL_DIRECTIVE 	  {  add_space_spec(global_space,0); }
-	| LOCAL_DIRECTIVE 	  {  add_space_spec(local_space,0); }
-	| PARAM_DIRECTIVE 	  {  add_space_spec(param_space_unclassified,0); }
-	| SHARED_DIRECTIVE 	  {  add_space_spec(shared_space,0); }
-	| SSTARR_DIRECTIVE    {  add_space_spec(sstarr_space,0); }
-	| SURF_DIRECTIVE 	  {  add_space_spec(surf_space,0); }
-	| TEX_DIRECTIVE 	  {  add_space_spec(tex_space,0); }
+addressable_spec: CONST_DIRECTIVE {  recognizer->add_space_spec(const_space,$1); }
+	| GLOBAL_DIRECTIVE 	  {  recognizer->add_space_spec(global_space,0); }
+	| LOCAL_DIRECTIVE 	  {  recognizer->add_space_spec(local_space,0); }
+	| PARAM_DIRECTIVE 	  {  recognizer->add_space_spec(param_space_unclassified,0); }
+	| SHARED_DIRECTIVE 	  {  recognizer->add_space_spec(shared_space,0); }
+	| SSTARR_DIRECTIVE    {  recognizer->add_space_spec(sstarr_space,0); }
+	| SURF_DIRECTIVE 	  {  recognizer->add_space_spec(surf_space,0); }
+	| TEX_DIRECTIVE 	  {  recognizer->add_space_spec(tex_space,0); }
 	;
 
 type_spec: scalar_type 
 	|  vector_spec scalar_type 
 	;
 
-vector_spec:  V2_TYPE {  add_option(V2_TYPE); func_header_info(".v2");}
-	| V3_TYPE     {  add_option(V3_TYPE); func_header_info(".v3");}
-	| V4_TYPE     {  add_option(V4_TYPE); func_header_info(".v4");}
+vector_spec:  V2_TYPE {  recognizer->add_option(V2_TYPE); recognizer->func_header_info(".v2");}
+	| V3_TYPE     {  recognizer->add_option(V3_TYPE); recognizer->func_header_info(".v3");}
+	| V4_TYPE     {  recognizer->add_option(V4_TYPE); recognizer->func_header_info(".v4");}
 	;
 
-scalar_type: S8_TYPE { add_scalar_type_spec( S8_TYPE ); }
-	| S16_TYPE   { add_scalar_type_spec( S16_TYPE ); }
-	| S32_TYPE   { add_scalar_type_spec( S32_TYPE ); }
-	| S64_TYPE   { add_scalar_type_spec( S64_TYPE ); }
-	| U8_TYPE    { add_scalar_type_spec( U8_TYPE ); }
-	| U16_TYPE   { add_scalar_type_spec( U16_TYPE ); }
-	| U32_TYPE   { add_scalar_type_spec( U32_TYPE ); }
-	| U64_TYPE   { add_scalar_type_spec( U64_TYPE ); }
-	| F16_TYPE   { add_scalar_type_spec( F16_TYPE ); }
-	| F32_TYPE   { add_scalar_type_spec( F32_TYPE ); }
-	| F64_TYPE   { add_scalar_type_spec( F64_TYPE ); }
-	| FF64_TYPE   { add_scalar_type_spec( FF64_TYPE ); }
-	| B8_TYPE    { add_scalar_type_spec( B8_TYPE );  }
-	| B16_TYPE   { add_scalar_type_spec( B16_TYPE ); }
-	| B32_TYPE   { add_scalar_type_spec( B32_TYPE ); }
-	| B64_TYPE   { add_scalar_type_spec( B64_TYPE ); }
-	| BB64_TYPE   { add_scalar_type_spec( BB64_TYPE ); }
-	| BB128_TYPE   { add_scalar_type_spec( BB128_TYPE ); }
-	| PRED_TYPE  { add_scalar_type_spec( PRED_TYPE ); }
-	| TEXREF_TYPE  { add_scalar_type_spec( TEXREF_TYPE ); }
-	| SAMPLERREF_TYPE  { add_scalar_type_spec( SAMPLERREF_TYPE ); }
-	| SURFREF_TYPE  { add_scalar_type_spec( SURFREF_TYPE ); }
+scalar_type: S8_TYPE { recognizer->add_scalar_type_spec( S8_TYPE ); }
+	| S16_TYPE   { recognizer->add_scalar_type_spec( S16_TYPE ); }
+	| S32_TYPE   { recognizer->add_scalar_type_spec( S32_TYPE ); }
+	| S64_TYPE   { recognizer->add_scalar_type_spec( S64_TYPE ); }
+	| U8_TYPE    { recognizer->add_scalar_type_spec( U8_TYPE ); }
+	| U16_TYPE   { recognizer->add_scalar_type_spec( U16_TYPE ); }
+	| U32_TYPE   { recognizer->add_scalar_type_spec( U32_TYPE ); }
+	| U64_TYPE   { recognizer->add_scalar_type_spec( U64_TYPE ); }
+	| F16_TYPE   { recognizer->add_scalar_type_spec( F16_TYPE ); }
+	| F32_TYPE   { recognizer->add_scalar_type_spec( F32_TYPE ); }
+	| F64_TYPE   { recognizer->add_scalar_type_spec( F64_TYPE ); }
+	| FF64_TYPE   { recognizer->add_scalar_type_spec( FF64_TYPE ); }
+	| B8_TYPE    { recognizer->add_scalar_type_spec( B8_TYPE );  }
+	| B16_TYPE   { recognizer->add_scalar_type_spec( B16_TYPE ); }
+	| B32_TYPE   { recognizer->add_scalar_type_spec( B32_TYPE ); }
+	| B64_TYPE   { recognizer->add_scalar_type_spec( B64_TYPE ); }
+	| BB64_TYPE   { recognizer->add_scalar_type_spec( BB64_TYPE ); }
+	| BB128_TYPE   { recognizer->add_scalar_type_spec( BB128_TYPE ); }
+	| PRED_TYPE  { recognizer->add_scalar_type_spec( PRED_TYPE ); }
+	| TEXREF_TYPE  { recognizer->add_scalar_type_spec( TEXREF_TYPE ); }
+	| SAMPLERREF_TYPE  { recognizer->add_scalar_type_spec( SAMPLERREF_TYPE ); }
+	| SURFREF_TYPE  { recognizer->add_scalar_type_spec( SURFREF_TYPE ); }
 	;
 
-initializer_list: LEFT_BRACE literal_list RIGHT_BRACE { add_array_initializer(); } 
-	| LEFT_BRACE initializer_list RIGHT_BRACE { syntax_not_implemented(); }
+initializer_list: LEFT_BRACE literal_list RIGHT_BRACE { recognizer->add_array_initializer(); }
+	| LEFT_BRACE initializer_list RIGHT_BRACE { syntax_not_implemented(scanner, recognizer); }
 
 literal_list: literal_operand
 	| literal_list COMMA literal_operand;
 
 instruction_statement:  instruction SEMI_COLON
-	| IDENTIFIER COLON { add_label($1); }    
+	| IDENTIFIER COLON { recognizer->add_label($1); }
 	| pred_spec instruction SEMI_COLON;
 
-instruction: opcode_spec LEFT_PAREN operand RIGHT_PAREN { set_return(); } COMMA operand COMMA LEFT_PAREN operand_list RIGHT_PAREN
+instruction: opcode_spec LEFT_PAREN operand RIGHT_PAREN { recognizer->set_return(); } COMMA operand COMMA LEFT_PAREN operand_list RIGHT_PAREN
 	| opcode_spec operand COMMA LEFT_PAREN operand_list RIGHT_PAREN
 	| opcode_spec operand COMMA LEFT_PAREN RIGHT_PAREN
 	| opcode_spec operand_list 
 	| opcode_spec
 	;
 
-opcode_spec: OPCODE { add_opcode($1); } option_list
-	| OPCODE { add_opcode($1); }
+opcode_spec: OPCODE { recognizer->add_opcode($1); } option_list
+	| OPCODE { recognizer->add_opcode($1); }
 
-pred_spec: PRED IDENTIFIER  { add_pred($2,0, -1); }
-	| PRED EXCLAMATION IDENTIFIER { add_pred($3,1, -1); } 
-	| PRED IDENTIFIER LT_OPTION  { add_pred($2,0,1); }
-	| PRED IDENTIFIER EQ_OPTION  { add_pred($2,0,2); }
-	| PRED IDENTIFIER LE_OPTION  { add_pred($2,0,3); }
-	| PRED IDENTIFIER NE_OPTION  { add_pred($2,0,5); }
-	| PRED IDENTIFIER GE_OPTION  { add_pred($2,0,6); }
-	| PRED IDENTIFIER EQU_OPTION  { add_pred($2,0,10); }
-	| PRED IDENTIFIER GTU_OPTION  { add_pred($2,0,12); }
-	| PRED IDENTIFIER NEU_OPTION  { add_pred($2,0,13); }
-	| PRED IDENTIFIER CF_OPTION  { add_pred($2,0,17); }
-	| PRED IDENTIFIER SF_OPTION  { add_pred($2,0,19); }
-	| PRED IDENTIFIER NSF_OPTION  { add_pred($2,0,28); }
+pred_spec: PRED IDENTIFIER  { recognizer->add_pred($2,0, -1); }
+	| PRED EXCLAMATION IDENTIFIER { recognizer->add_pred($3,1, -1); }
+	| PRED IDENTIFIER LT_OPTION  { recognizer->add_pred($2,0,1); }
+	| PRED IDENTIFIER EQ_OPTION  { recognizer->add_pred($2,0,2); }
+	| PRED IDENTIFIER LE_OPTION  { recognizer->add_pred($2,0,3); }
+	| PRED IDENTIFIER NE_OPTION  { recognizer->add_pred($2,0,5); }
+	| PRED IDENTIFIER GE_OPTION  { recognizer->add_pred($2,0,6); }
+	| PRED IDENTIFIER EQU_OPTION  { recognizer->add_pred($2,0,10); }
+	| PRED IDENTIFIER GTU_OPTION  { recognizer->add_pred($2,0,12); }
+	| PRED IDENTIFIER NEU_OPTION  { recognizer->add_pred($2,0,13); }
+	| PRED IDENTIFIER CF_OPTION  { recognizer->add_pred($2,0,17); }
+	| PRED IDENTIFIER SF_OPTION  { recognizer->add_pred($2,0,19); }
+	| PRED IDENTIFIER NSF_OPTION  { recognizer->add_pred($2,0,28); }
 	;
 
 option_list: option
@@ -441,108 +452,108 @@ option: type_spec
 	| rounding_mode
 	| wmma_spec 
 	| prmt_spec 
-	| SYNC_OPTION { add_option(SYNC_OPTION); }	
-	| ARRIVE_OPTION { add_option(ARRIVE_OPTION); }
-	| RED_OPTION { add_option(RED_OPTION); }	
-	| UNI_OPTION { add_option(UNI_OPTION); }
-	| WIDE_OPTION { add_option(WIDE_OPTION); }
-	| ANY_OPTION { add_option(ANY_OPTION); }
-	| ALL_OPTION { add_option(ALL_OPTION); }
-	| BALLOT_OPTION { add_option(BALLOT_OPTION); }
-	| GLOBAL_OPTION { add_option(GLOBAL_OPTION); }
-	| CTA_OPTION { add_option(CTA_OPTION); }
-	| SYS_OPTION { add_option(SYS_OPTION); }
-	| GEOM_MODIFIER_1D { add_option(GEOM_MODIFIER_1D); }
-	| GEOM_MODIFIER_2D { add_option(GEOM_MODIFIER_2D); }
-	| GEOM_MODIFIER_3D { add_option(GEOM_MODIFIER_3D); }
-	| SAT_OPTION { add_option(SAT_OPTION); }
- 	| FTZ_OPTION { add_option(FTZ_OPTION); } 
- 	| NEG_OPTION { add_option(NEG_OPTION); } 
-	| APPROX_OPTION { add_option(APPROX_OPTION); }
-	| FULL_OPTION { add_option(FULL_OPTION); }
-	| EXIT_OPTION { add_option(EXIT_OPTION); }
-	| ABS_OPTION { add_option(ABS_OPTION); }
+	| SYNC_OPTION { recognizer->add_option(SYNC_OPTION); }
+	| ARRIVE_OPTION { recognizer->add_option(ARRIVE_OPTION); }
+	| RED_OPTION { recognizer->add_option(RED_OPTION); }
+	| UNI_OPTION { recognizer->add_option(UNI_OPTION); }
+	| WIDE_OPTION { recognizer->add_option(WIDE_OPTION); }
+	| ANY_OPTION { recognizer->add_option(ANY_OPTION); }
+	| ALL_OPTION { recognizer->add_option(ALL_OPTION); }
+	| BALLOT_OPTION { recognizer->add_option(BALLOT_OPTION); }
+	| GLOBAL_OPTION { recognizer->add_option(GLOBAL_OPTION); }
+	| CTA_OPTION { recognizer->add_option(CTA_OPTION); }
+	| SYS_OPTION { recognizer->add_option(SYS_OPTION); }
+	| GEOM_MODIFIER_1D { recognizer->add_option(GEOM_MODIFIER_1D); }
+	| GEOM_MODIFIER_2D { recognizer->add_option(GEOM_MODIFIER_2D); }
+	| GEOM_MODIFIER_3D { recognizer->add_option(GEOM_MODIFIER_3D); }
+	| SAT_OPTION { recognizer->add_option(SAT_OPTION); }
+	| FTZ_OPTION { recognizer->add_option(FTZ_OPTION); }
+	| NEG_OPTION { recognizer->add_option(NEG_OPTION); }
+	| APPROX_OPTION { recognizer->add_option(APPROX_OPTION); }
+	| FULL_OPTION { recognizer->add_option(FULL_OPTION); }
+	| EXIT_OPTION { recognizer->add_option(EXIT_OPTION); }
+	| ABS_OPTION { recognizer->add_option(ABS_OPTION); }
 	| atomic_operation_spec ;
-	| TO_OPTION { add_option(TO_OPTION); }
-	| HALF_OPTION { add_option(HALF_OPTION); }
-	| EXTP_OPTION { add_option(EXTP_OPTION); }
-	| CA_OPTION { add_option(CA_OPTION); }
-	| CG_OPTION { add_option(CG_OPTION); }
-	| CS_OPTION { add_option(CS_OPTION); }
-	| LU_OPTION { add_option(LU_OPTION); }
-	| CV_OPTION { add_option(CV_OPTION); }
-	| WB_OPTION { add_option(WB_OPTION); }
-	| WT_OPTION { add_option(WT_OPTION); }
-	| NC_OPTION { add_option(NC_OPTION); }
-	| UP_OPTION { add_option(UP_OPTION); }
-	| DOWN_OPTION { add_option(DOWN_OPTION); }
-	| BFLY_OPTION { add_option(BFLY_OPTION); }
-	| IDX_OPTION { add_option(IDX_OPTION); }
+	| TO_OPTION { recognizer->add_option(TO_OPTION); }
+	| HALF_OPTION { recognizer->add_option(HALF_OPTION); }
+	| EXTP_OPTION { recognizer->add_option(EXTP_OPTION); }
+	| CA_OPTION { recognizer->add_option(CA_OPTION); }
+	| CG_OPTION { recognizer->add_option(CG_OPTION); }
+	| CS_OPTION { recognizer->add_option(CS_OPTION); }
+	| LU_OPTION { recognizer->add_option(LU_OPTION); }
+	| CV_OPTION { recognizer->add_option(CV_OPTION); }
+	| WB_OPTION { recognizer->add_option(WB_OPTION); }
+	| WT_OPTION { recognizer->add_option(WT_OPTION); }
+	| NC_OPTION { recognizer->add_option(NC_OPTION); }
+	| UP_OPTION { recognizer->add_option(UP_OPTION); }
+	| DOWN_OPTION { recognizer->add_option(DOWN_OPTION); }
+	| BFLY_OPTION { recognizer->add_option(BFLY_OPTION); }
+	| IDX_OPTION { recognizer->add_option(IDX_OPTION); }
 	;
 
-atomic_operation_spec: ATOMIC_AND { add_option(ATOMIC_AND); } 
-	| ATOMIC_POPC { add_option(ATOMIC_POPC); }
-	| ATOMIC_OR { add_option(ATOMIC_OR); } 
-	| ATOMIC_XOR { add_option(ATOMIC_XOR); } 
-	| ATOMIC_CAS { add_option(ATOMIC_CAS); } 
-	| ATOMIC_EXCH { add_option(ATOMIC_EXCH); } 
-	| ATOMIC_ADD { add_option(ATOMIC_ADD); } 
-	| ATOMIC_INC { add_option(ATOMIC_INC); } 
-	| ATOMIC_DEC { add_option(ATOMIC_DEC); } 
-	| ATOMIC_MIN { add_option(ATOMIC_MIN); } 
-	| ATOMIC_MAX { add_option(ATOMIC_MAX); } 
+atomic_operation_spec: ATOMIC_AND { recognizer->add_option(ATOMIC_AND); }
+	| ATOMIC_POPC { recognizer->add_option(ATOMIC_POPC); }
+	| ATOMIC_OR { recognizer->add_option(ATOMIC_OR); }
+	| ATOMIC_XOR { recognizer->add_option(ATOMIC_XOR); }
+	| ATOMIC_CAS { recognizer->add_option(ATOMIC_CAS); }
+	| ATOMIC_EXCH { recognizer->add_option(ATOMIC_EXCH); }
+	| ATOMIC_ADD { recognizer->add_option(ATOMIC_ADD); }
+	| ATOMIC_INC { recognizer->add_option(ATOMIC_INC); }
+	| ATOMIC_DEC { recognizer->add_option(ATOMIC_DEC); }
+	| ATOMIC_MIN { recognizer->add_option(ATOMIC_MIN); }
+	| ATOMIC_MAX { recognizer->add_option(ATOMIC_MAX); }
 	;
 
 rounding_mode: floating_point_rounding_mode
 	| integer_rounding_mode;
 
 
-floating_point_rounding_mode: RN_OPTION { add_option(RN_OPTION); } 
- 	| RZ_OPTION { add_option(RZ_OPTION); } 
- 	| RM_OPTION { add_option(RM_OPTION); } 
- 	| RP_OPTION { add_option(RP_OPTION); } 
+floating_point_rounding_mode: RN_OPTION { recognizer->add_option(RN_OPTION); }
+	| RZ_OPTION { recognizer->add_option(RZ_OPTION); }
+	| RM_OPTION { recognizer->add_option(RM_OPTION); }
+	| RP_OPTION { recognizer->add_option(RP_OPTION); }
 	;
 
-integer_rounding_mode: RNI_OPTION { add_option(RNI_OPTION); } 
-	| RZI_OPTION { add_option(RZI_OPTION); } 
- 	| RMI_OPTION { add_option(RMI_OPTION); } 
- 	| RPI_OPTION { add_option(RPI_OPTION); } 
+integer_rounding_mode: RNI_OPTION { recognizer->add_option(RNI_OPTION); }
+	| RZI_OPTION { recognizer->add_option(RZI_OPTION); }
+	| RMI_OPTION { recognizer->add_option(RMI_OPTION); }
+	| RPI_OPTION { recognizer->add_option(RPI_OPTION); }
 	;
 
-compare_spec:EQ_OPTION { add_option(EQ_OPTION); } 
-	| NE_OPTION { add_option(NE_OPTION); } 
-	| LT_OPTION { add_option(LT_OPTION); } 
-	| LE_OPTION { add_option(LE_OPTION); } 
-	| GT_OPTION { add_option(GT_OPTION); } 
-	| GE_OPTION { add_option(GE_OPTION); } 
-	| LO_OPTION { add_option(LO_OPTION); } 
-	| LS_OPTION { add_option(LS_OPTION); } 
-	| HI_OPTION { add_option(HI_OPTION); } 
-	| HS_OPTION  { add_option(HS_OPTION); } 
-	| EQU_OPTION { add_option(EQU_OPTION); } 
-	| NEU_OPTION { add_option(NEU_OPTION); } 
-	| LTU_OPTION { add_option(LTU_OPTION); } 
-	| LEU_OPTION { add_option(LEU_OPTION); } 
-	| GTU_OPTION { add_option(GTU_OPTION); } 
-	| GEU_OPTION { add_option(GEU_OPTION); } 
-	| NUM_OPTION { add_option(NUM_OPTION); } 
-	| NAN_OPTION { add_option(NAN_OPTION); } 
+compare_spec:EQ_OPTION { recognizer->add_option(EQ_OPTION); }
+	| NE_OPTION { recognizer->add_option(NE_OPTION); }
+	| LT_OPTION { recognizer->add_option(LT_OPTION); }
+	| LE_OPTION { recognizer->add_option(LE_OPTION); }
+	| GT_OPTION { recognizer->add_option(GT_OPTION); }
+	| GE_OPTION { recognizer->add_option(GE_OPTION); }
+	| LO_OPTION { recognizer->add_option(LO_OPTION); }
+	| LS_OPTION { recognizer->add_option(LS_OPTION); }
+	| HI_OPTION { recognizer->add_option(HI_OPTION); }
+	| HS_OPTION  { recognizer->add_option(HS_OPTION); }
+	| EQU_OPTION { recognizer->add_option(EQU_OPTION); }
+	| NEU_OPTION { recognizer->add_option(NEU_OPTION); }
+	| LTU_OPTION { recognizer->add_option(LTU_OPTION); }
+	| LEU_OPTION { recognizer->add_option(LEU_OPTION); }
+	| GTU_OPTION { recognizer->add_option(GTU_OPTION); }
+	| GEU_OPTION { recognizer->add_option(GEU_OPTION); }
+	| NUM_OPTION { recognizer->add_option(NUM_OPTION); }
+	| NAN_OPTION { recognizer->add_option(NAN_OPTION); }
 	;
 
-prmt_spec: PRMT_F4E_MODE { add_option( PRMT_F4E_MODE); }
-	|  PRMT_B4E_MODE { add_option( PRMT_B4E_MODE); }
-	|  PRMT_RC8_MODE { add_option( PRMT_RC8_MODE); }
-	|  PRMT_RC16_MODE{ add_option( PRMT_RC16_MODE);}
-	|  PRMT_ECL_MODE { add_option( PRMT_ECL_MODE); }
-	|  PRMT_ECR_MODE { add_option( PRMT_ECR_MODE); }
+prmt_spec: PRMT_F4E_MODE { recognizer->add_option( PRMT_F4E_MODE); }
+	|  PRMT_B4E_MODE { recognizer->add_option( PRMT_B4E_MODE); }
+	|  PRMT_RC8_MODE { recognizer->add_option( PRMT_RC8_MODE); }
+	|  PRMT_RC16_MODE{ recognizer->add_option( PRMT_RC16_MODE);}
+	|  PRMT_ECL_MODE { recognizer->add_option( PRMT_ECL_MODE); }
+	|  PRMT_ECR_MODE { recognizer->add_option( PRMT_ECR_MODE); }
 	;
 
-wmma_spec: WMMA_DIRECTIVE LAYOUT CONFIGURATION{add_space_spec(global_space,0);add_ptr_spec(global_space); add_wmma_option($1);add_wmma_option($2);add_wmma_option($3);}
-	| WMMA_DIRECTIVE LAYOUT LAYOUT CONFIGURATION{add_wmma_option($1);add_wmma_option($2);add_wmma_option($3);add_wmma_option($4);}
+wmma_spec: WMMA_DIRECTIVE LAYOUT CONFIGURATION{recognizer->add_space_spec(global_space,0);recognizer->add_ptr_spec(global_space); recognizer->add_wmma_option($1);recognizer->add_wmma_option($2);recognizer->add_wmma_option($3);}
+	| WMMA_DIRECTIVE LAYOUT LAYOUT CONFIGURATION{recognizer->add_wmma_option($1);recognizer->add_wmma_option($2);recognizer->add_wmma_option($3);recognizer->add_wmma_option($4);}
 	;
 
-vp_spec: WMMA_DIRECTIVE LAYOUT CONFIGURATION{add_space_spec(global_space,0);add_ptr_spec(global_space);add_wmma_option($1);add_wmma_option($2);add_wmma_option($3);}
-	| WMMA_DIRECTIVE LAYOUT LAYOUT CONFIGURATION{add_wmma_option($1);add_wmma_option($2);add_wmma_option($3);add_wmma_option($4);}
+vp_spec: WMMA_DIRECTIVE LAYOUT CONFIGURATION{recognizer->add_space_spec(global_space,0);recognizer->add_ptr_spec(global_space);recognizer->add_wmma_option($1);recognizer->add_wmma_option($2);recognizer->add_wmma_option($3);}
+	| WMMA_DIRECTIVE LAYOUT LAYOUT CONFIGURATION{recognizer->add_wmma_option($1);recognizer->add_wmma_option($2);recognizer->add_wmma_option($3);recognizer->add_wmma_option($4);}
 	;
 
 
@@ -550,80 +561,77 @@ vp_spec: WMMA_DIRECTIVE LAYOUT CONFIGURATION{add_space_spec(global_space,0);add_
 operand_list: operand
 	| operand COMMA operand_list;
 
-operand: IDENTIFIER  { add_scalar_operand( $1 ); }
-	| EXCLAMATION IDENTIFIER { add_neg_pred_operand( $2 ); }
-	| MINUS IDENTIFIER  { add_scalar_operand( $2 ); change_operand_neg(); }
+operand: IDENTIFIER  { recognizer->add_scalar_operand( $1 ); }
+	| EXCLAMATION IDENTIFIER { recognizer->add_neg_pred_operand( $2 ); }
+	| MINUS IDENTIFIER  { recognizer->add_scalar_operand( $2 ); recognizer->change_operand_neg(); }
 	| memory_operand
 	| literal_operand
 	| builtin_operand
 	| vector_operand
-	| MINUS vector_operand { change_operand_neg(); }
+	| MINUS vector_operand { recognizer->change_operand_neg(); }
 	| tex_operand
-	| IDENTIFIER PLUS INT_OPERAND { add_address_operand($1,$3); }
-	| IDENTIFIER LO_OPTION { add_scalar_operand( $1 ); change_operand_lohi(1);}
-	| MINUS IDENTIFIER LO_OPTION { add_scalar_operand( $2 ); change_operand_lohi(1); change_operand_neg();}
-	| IDENTIFIER HI_OPTION { add_scalar_operand( $1 ); change_operand_lohi(2);}
-	| MINUS IDENTIFIER HI_OPTION { add_scalar_operand( $2 ); change_operand_lohi(2); change_operand_neg();}
-	| IDENTIFIER PIPE IDENTIFIER { add_2vector_operand($1,$3); change_double_operand_type(-1);}
-	| IDENTIFIER PIPE IDENTIFIER LO_OPTION { add_2vector_operand($1,$3); change_double_operand_type(-1); change_operand_lohi(1);}
-	| IDENTIFIER PIPE IDENTIFIER HI_OPTION { add_2vector_operand($1,$3); change_double_operand_type(-1); change_operand_lohi(2);}
-	| IDENTIFIER BACKSLASH IDENTIFIER { add_2vector_operand($1,$3); change_double_operand_type(-3);}
-	| IDENTIFIER BACKSLASH IDENTIFIER LO_OPTION { add_2vector_operand($1,$3); change_double_operand_type(-3); change_operand_lohi(1);}
-	| IDENTIFIER BACKSLASH IDENTIFIER HI_OPTION { add_2vector_operand($1,$3); change_double_operand_type(-3); change_operand_lohi(2);}
+	| IDENTIFIER PLUS INT_OPERAND { recognizer->add_address_operand($1,$3); }
+	| IDENTIFIER LO_OPTION { recognizer->add_scalar_operand( $1 ); recognizer->change_operand_lohi(1);}
+	| MINUS IDENTIFIER LO_OPTION { recognizer->add_scalar_operand( $2 ); recognizer->change_operand_lohi(1); recognizer->change_operand_neg();}
+	| IDENTIFIER HI_OPTION { recognizer->add_scalar_operand( $1 ); recognizer->change_operand_lohi(2);}
+	| MINUS IDENTIFIER HI_OPTION { recognizer->add_scalar_operand( $2 ); recognizer->change_operand_lohi(2); recognizer->change_operand_neg();}
+	| IDENTIFIER PIPE IDENTIFIER { recognizer->add_2vector_operand($1,$3); recognizer->change_double_operand_type(-1);}
+	| IDENTIFIER PIPE IDENTIFIER LO_OPTION { recognizer->add_2vector_operand($1,$3); recognizer->change_double_operand_type(-1); recognizer->change_operand_lohi(1);}
+	| IDENTIFIER PIPE IDENTIFIER HI_OPTION { recognizer->add_2vector_operand($1,$3); recognizer->change_double_operand_type(-1); recognizer->change_operand_lohi(2);}
+	| IDENTIFIER BACKSLASH IDENTIFIER { recognizer->add_2vector_operand($1,$3); recognizer->change_double_operand_type(-3);}
+	| IDENTIFIER BACKSLASH IDENTIFIER LO_OPTION { recognizer->add_2vector_operand($1,$3); recognizer->change_double_operand_type(-3); recognizer->change_operand_lohi(1);}
+	| IDENTIFIER BACKSLASH IDENTIFIER HI_OPTION { recognizer->add_2vector_operand($1,$3); recognizer->change_double_operand_type(-3); recognizer->change_operand_lohi(2);}
 	;
 
-vector_operand: LEFT_BRACE IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { add_2vector_operand($2,$4); }
-		| LEFT_BRACE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { add_3vector_operand($2,$4,$6); }
-		| LEFT_BRACE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { add_4vector_operand($2,$4,$6,$8); }
-		| LEFT_BRACE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { add_8vector_operand($2,$4,$6,$8,$10,$12,$14,$16); }
-		| LEFT_BRACE IDENTIFIER RIGHT_BRACE { add_1vector_operand($2); }
+vector_operand: LEFT_BRACE IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { recognizer->add_2vector_operand($2,$4); }
+		| LEFT_BRACE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { recognizer->add_3vector_operand($2,$4,$6); }
+		| LEFT_BRACE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { recognizer->add_4vector_operand($2,$4,$6,$8); }
+		| LEFT_BRACE IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER COMMA IDENTIFIER RIGHT_BRACE { recognizer->add_8vector_operand($2,$4,$6,$8,$10,$12,$14,$16); }
+		| LEFT_BRACE IDENTIFIER RIGHT_BRACE { recognizer->add_1vector_operand($2); }
 	;
 
-tex_operand: LEFT_SQUARE_BRACKET IDENTIFIER COMMA { add_scalar_operand($2); }
+tex_operand: LEFT_SQUARE_BRACKET IDENTIFIER COMMA { recognizer->add_scalar_operand($2); }
 		vector_operand 
 	     RIGHT_SQUARE_BRACKET
 	;
 
-builtin_operand: SPECIAL_REGISTER DIMENSION_MODIFIER { add_builtin_operand($1,$2); }
-        | SPECIAL_REGISTER { add_builtin_operand($1,-1); }
+builtin_operand: SPECIAL_REGISTER DIMENSION_MODIFIER { recognizer->add_builtin_operand($1,$2); }
+        | SPECIAL_REGISTER { recognizer->add_builtin_operand($1,-1); }
 	;
 
-memory_operand : LEFT_SQUARE_BRACKET address_expression RIGHT_SQUARE_BRACKET { add_memory_operand(); }
-	| IDENTIFIER LEFT_SQUARE_BRACKET address_expression RIGHT_SQUARE_BRACKET { add_memory_operand(); change_memory_addr_space($1); }
-	| IDENTIFIER LEFT_SQUARE_BRACKET literal_operand RIGHT_SQUARE_BRACKET { change_memory_addr_space($1); }
-	| IDENTIFIER LEFT_SQUARE_BRACKET twin_operand RIGHT_SQUARE_BRACKET { change_memory_addr_space($1); add_memory_operand();}
-        | MINUS memory_operand { change_operand_neg(); }
+memory_operand : LEFT_SQUARE_BRACKET address_expression RIGHT_SQUARE_BRACKET { recognizer->add_memory_operand(); }
+	| IDENTIFIER LEFT_SQUARE_BRACKET address_expression RIGHT_SQUARE_BRACKET { recognizer->add_memory_operand(); recognizer->change_memory_addr_space($1); }
+	| IDENTIFIER LEFT_SQUARE_BRACKET literal_operand RIGHT_SQUARE_BRACKET { recognizer->change_memory_addr_space($1); }
+	| IDENTIFIER LEFT_SQUARE_BRACKET twin_operand RIGHT_SQUARE_BRACKET { recognizer->change_memory_addr_space($1); recognizer->add_memory_operand();}
+        | MINUS memory_operand { recognizer->change_operand_neg(); }
 	;
 
-twin_operand : IDENTIFIER PLUS IDENTIFIER { add_double_operand($1,$3); change_double_operand_type(1); }
-	| IDENTIFIER PLUS IDENTIFIER LO_OPTION { add_double_operand($1,$3); change_double_operand_type(1); change_operand_lohi(1); }
-	| IDENTIFIER PLUS IDENTIFIER HI_OPTION { add_double_operand($1,$3); change_double_operand_type(1); change_operand_lohi(2); }
-	| IDENTIFIER PLUS EQUALS IDENTIFIER  { add_double_operand($1,$4); change_double_operand_type(2); }
-	| IDENTIFIER PLUS EQUALS IDENTIFIER LO_OPTION { add_double_operand($1,$4); change_double_operand_type(2); change_operand_lohi(1); }
-	| IDENTIFIER PLUS EQUALS IDENTIFIER HI_OPTION { add_double_operand($1,$4); change_double_operand_type(2); change_operand_lohi(2); }
-	| IDENTIFIER PLUS EQUALS INT_OPERAND  { add_address_operand($1,$4); change_double_operand_type(3); }
+twin_operand : IDENTIFIER PLUS IDENTIFIER { recognizer->add_double_operand($1,$3); recognizer->change_double_operand_type(1); }
+	| IDENTIFIER PLUS IDENTIFIER LO_OPTION { recognizer->add_double_operand($1,$3); recognizer->change_double_operand_type(1); recognizer->change_operand_lohi(1); }
+	| IDENTIFIER PLUS IDENTIFIER HI_OPTION { recognizer->add_double_operand($1,$3); recognizer->change_double_operand_type(1); recognizer->change_operand_lohi(2); }
+	| IDENTIFIER PLUS EQUALS IDENTIFIER  { recognizer->add_double_operand($1,$4); recognizer->change_double_operand_type(2); }
+	| IDENTIFIER PLUS EQUALS IDENTIFIER LO_OPTION { recognizer->add_double_operand($1,$4); recognizer->change_double_operand_type(2); recognizer->change_operand_lohi(1); }
+	| IDENTIFIER PLUS EQUALS IDENTIFIER HI_OPTION { recognizer->add_double_operand($1,$4); recognizer->change_double_operand_type(2); recognizer->change_operand_lohi(2); }
+	| IDENTIFIER PLUS EQUALS INT_OPERAND  { recognizer->add_address_operand($1,$4); recognizer->change_double_operand_type(3); }
 	;
 
-literal_operand : INT_OPERAND { add_literal_int($1); }
-	| FLOAT_OPERAND { add_literal_float($1); }
-	| DOUBLE_OPERAND { add_literal_double($1); }
+literal_operand : INT_OPERAND { recognizer->add_literal_int($1); }
+	| FLOAT_OPERAND { recognizer->add_literal_float($1); }
+	| DOUBLE_OPERAND { recognizer->add_literal_double($1); }
 	;
 
-address_expression: IDENTIFIER { add_address_operand($1,0); }
-	| IDENTIFIER LO_OPTION { add_address_operand($1,0); change_operand_lohi(1);}
-	| IDENTIFIER HI_OPTION { add_address_operand($1,0); change_operand_lohi(2); }
-	| IDENTIFIER PLUS INT_OPERAND { add_address_operand($1,$3); }
-	| INT_OPERAND { add_address_operand2($1); }
+address_expression: IDENTIFIER { recognizer->add_address_operand($1,0); }
+	| IDENTIFIER LO_OPTION { recognizer->add_address_operand($1,0); recognizer->change_operand_lohi(1);}
+	| IDENTIFIER HI_OPTION { recognizer->add_address_operand($1,0); recognizer->change_operand_lohi(2); }
+	| IDENTIFIER PLUS INT_OPERAND { recognizer->add_address_operand($1,$3); }
+	| INT_OPERAND { recognizer->add_address_operand2($1); }
 	;
 
 %%
 
-extern int ptx_lineno;
-extern const char *g_filename;
-
-void syntax_not_implemented()
+void syntax_not_implemented(yyscan_t yyscanner, ptx_recognizer* recognizer)
 {
-	printf("Parse error (%s:%u): this syntax is not (yet) implemented:\n",g_filename,ptx_lineno);
-	ptx_error(NULL);
+	printf("Parse error (%s): this syntax is not (yet) implemented:\n", recognizer->gpgpu_ctx->g_filename);
+	ptx_error(yyscanner, recognizer, NULL);
 	abort();
 }