diff options
| author | Tor Aamodt <[email protected]> | 2010-07-17 15:22:54 -0800 |
|---|---|---|
| committer | Tor Aamodt <[email protected]> | 2010-07-17 15:22:54 -0800 |
| commit | 766dceb168cbd8269828a310a924863020edc9ae (patch) | |
| tree | 443db0e515b91a34d972d6c55f1aeca10309bdd0 /src/cuda-sim/ptx.y | |
| parent | d3d0b38b90f14660ecb6243373daa921f8ae02b1 (diff) | |
- adding new memory_space_t type to enable differentiation of different
parameter spaces (kernel parameters are conceptually different from
function parameters, but PTX only has one .param keyword)
- removing more dead code
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 6870]
Diffstat (limited to 'src/cuda-sim/ptx.y')
| -rw-r--r-- | src/cuda-sim/ptx.y | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cuda-sim/ptx.y b/src/cuda-sim/ptx.y index 5711b94..8a897ce 100644 --- a/src/cuda-sim/ptx.y +++ b/src/cuda-sim/ptx.y @@ -248,8 +248,8 @@ function_decl_header: ENTRY_DIRECTIVE { $$ = 1; g_func_decl=1; } param_list: param_entry { add_directive(); } | param_list COMMA param_entry { add_directive(); } -param_entry: PARAM_DIRECTIVE { add_space_spec(PARAM_DIRECTIVE); } variable_spec identifier_spec { add_function_arg(); } - | REG_DIRECTIVE { add_space_spec(REG_DIRECTIVE); } variable_spec identifier_spec { add_function_arg(); } +param_entry: PARAM_DIRECTIVE { add_space_spec(param_space_unclassified); } variable_spec identifier_spec { add_function_arg(); } + | REG_DIRECTIVE { add_space_spec(reg_space); } variable_spec identifier_spec { add_function_arg(); } statement_list: directive_statement { add_directive(); } | instruction_statement { add_instruction(); } @@ -309,13 +309,13 @@ space_spec: REG_DIRECTIVE { add_space_spec(REG_DIRECTIVE); } | addressable_spec ; -addressable_spec: CONST_DIRECTIVE { add_space_spec(CONST_DIRECTIVE); } - | GLOBAL_DIRECTIVE { add_space_spec(GLOBAL_DIRECTIVE); } - | LOCAL_DIRECTIVE { add_space_spec(LOCAL_DIRECTIVE); } - | PARAM_DIRECTIVE { add_space_spec(PARAM_DIRECTIVE); } - | SHARED_DIRECTIVE { add_space_spec(SHARED_DIRECTIVE); } - | SURF_DIRECTIVE { add_space_spec(SURF_DIRECTIVE); } - | TEX_DIRECTIVE { add_space_spec(TEX_DIRECTIVE); } +addressable_spec: CONST_DIRECTIVE { add_space_spec(const_space); } + | GLOBAL_DIRECTIVE { add_space_spec(global_space); } + | LOCAL_DIRECTIVE { add_space_spec(local_space); } + | PARAM_DIRECTIVE { add_space_spec(param_space_unclassified); } + | SHARED_DIRECTIVE { add_space_spec(shared_space); } + | SURF_DIRECTIVE { add_space_spec(surf_space); } + | TEX_DIRECTIVE { add_space_spec(tex_space); } ; type_spec: scalar_type |