From c5677a028d56b84dfe5939f78a71e0e60373a0ed Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Sat, 17 Jul 2010 16:53:43 -0800 Subject: param space updates for correct parsing (still need to allocate thread local storage for local param memory) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 6871] --- src/cuda-sim/ptx.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cuda-sim/ptx.y') diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y index 8a897ce..79f3593 100644 --- a/src/cuda-sim/ptx.y +++ b/src/cuda-sim/ptx.y @@ -224,7 +224,7 @@ input: /* empty */ | input function_decl ; -function_defn: function_decl { set_symtab($1); start_function_definition(); } LEFT_BRACE statement_list RIGHT_BRACE { end_function(); } +function_defn: function_decl { set_symtab($1); } LEFT_BRACE statement_list RIGHT_BRACE { end_function(); } | function_decl { set_symtab($1); } block_spec LEFT_BRACE statement_list RIGHT_BRACE { end_function(); } ; @@ -304,8 +304,8 @@ var_spec: space_spec align_spec: ALIGN_DIRECTIVE INT_OPERAND { add_alignment_spec($2); } -space_spec: REG_DIRECTIVE { add_space_spec(REG_DIRECTIVE); } - | SREG_DIRECTIVE { add_space_spec(SREG_DIRECTIVE); } +space_spec: REG_DIRECTIVE { add_space_spec(reg_space); } + | SREG_DIRECTIVE { add_space_spec(reg_space); } | addressable_spec ; -- cgit v1.3