From b916cd600d109938a1621345bfc3c46da4bff4c6 Mon Sep 17 00:00:00 2001 From: Inderpreet Singh Date: Sun, 25 Dec 2011 22:21:01 -0800 Subject: Fix for Bug 123: Use of constant in shader_core_ctx::func_exec_inst function [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 11227] --- src/gpgpu-sim/shader.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpgpu-sim') diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index b37ceef..7ef5140 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -608,7 +608,7 @@ void shader_core_ctx::func_exec_inst( warp_inst_t &inst ) if( inst.has_callback(t) ) m_warp[inst.warp_id()].inc_n_atomic(); if (inst.space.is_local() && (inst.is_load() || inst.is_store())) { - new_addr_type localaddrs[8]; + new_addr_type localaddrs[MAX_ACCESSES_PER_INSN_PER_THREAD]; unsigned num_addrs; num_addrs = translate_local_memaddr(inst.get_addr(t), tid, m_config->n_simt_clusters*m_config->n_simt_cores_per_cluster, inst.data_size, (new_addr_type*) localaddrs ); @@ -797,7 +797,7 @@ unsigned shader_core_ctx::translate_local_memaddr( address_type localaddr, unsig assert(datasize%4 == 0); assert(datasize >= 4); - assert(datasize <= 32); // max 32B + assert(datasize/4 <= MAX_ACCESSES_PER_INSN_PER_THREAD); // max 32B assert(localaddr%4 == 0); // Required if accessing 4B per request, otherwise access will overflow into next thread's space for(unsigned i=0; i