From 7e08538246f386a8e4ce0686d3f6eafff99f23cc Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 25 May 2018 09:32:49 -0700 Subject: fixed merge issue --- src/cuda-sim/instructions.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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(); -- cgit v1.3