summaryrefslogtreecommitdiff
path: root/src/cuda-sim/ptx.y
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2010-07-17 16:53:43 -0800
committerTor Aamodt <[email protected]>2010-07-17 16:53:43 -0800
commitc5677a028d56b84dfe5939f78a71e0e60373a0ed (patch)
tree7db88eddba683ff5326297e4fa93f4a5d01f7bf2 /src/cuda-sim/ptx.y
parent766dceb168cbd8269828a310a924863020edc9ae (diff)
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]
Diffstat (limited to 'src/cuda-sim/ptx.y')
-rw-r--r--src/cuda-sim/ptx.y6
1 files changed, 3 insertions, 3 deletions
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
;