diff options
| author | Jonathan <[email protected]> | 2018-05-25 09:32:49 -0700 |
|---|---|---|
| committer | Jonathan <[email protected]> | 2018-05-25 09:32:49 -0700 |
| commit | 7e08538246f386a8e4ce0686d3f6eafff99f23cc (patch) | |
| tree | 9572dfe12eb8dec3a40c79f2a7d7d483ddd62057 | |
| parent | ba24d67b395f2d8f862a4cce0c8f9a21d6ebb7db (diff) | |
fixed merge issue
| -rw-r--r-- | src/cuda-sim/instructions.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc index d362231..35d1782 100644 --- a/src/cuda-sim/instructions.cc +++ b/src/cuda-sim/instructions.cc @@ -2366,12 +2366,12 @@ void decode_space( memory_space_t &space, ptx_thread_info *thread, const operand type_info_key ti = t->get_key(); if( ti.is_param_kernel() ) space = param_space_kernel; - else if( ti.is_param_local() ) + else if( ti.is_param_local() ) { space = param_space_local; } else if( ti.is_reg() ) { space = param_space_kernel; - } + } else { printf("GPGPU-Sim PTX: ERROR ** cannot resolve .param space for '%s'\n", s->name().c_str() ); abort(); |
