summaryrefslogtreecommitdiff
path: root/src/cuda-sim/instructions.cc
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/instructions.cc
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/instructions.cc')
-rw-r--r--src/cuda-sim/instructions.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cuda-sim/instructions.cc b/src/cuda-sim/instructions.cc
index 783f97c..2b4b410 100644
--- a/src/cuda-sim/instructions.cc
+++ b/src/cuda-sim/instructions.cc
@@ -139,7 +139,7 @@ ptx_reg_t ptx_thread_info::get_operand_value( const operand_info &op )
assert( regs_iter != m_regs.back().end() );
ptx_reg_t baseaddr = regs_iter->second;
result.u64 = baseaddr.u64 + op.get_addr_offset();
- } else if ( info.is_param() ) {
+ } else if ( info.is_param_kernel() ) {
result = sym->get_address() + op.get_addr_offset();
} else if ( info.is_global() ) {
assert( op.get_addr_offset() == 0 );
@@ -1463,9 +1463,7 @@ void decode_space( memory_space_t &space, ptx_thread_info *thread, memory_space
case local_space: mem = thread->m_local_mem; break;
case tex_space: mem = g_tex_mem; break;
case surf_space: mem = g_surf_mem; break;
- case param_space_local_r:
- abort(); // finish this
- case param_space_local_w:
+ case param_space_local:
abort(); // finish this
case param_space_kernel: mem = g_param_mem; break;
case shared_space: mem = thread->m_shared_mem; break;