From b916cd600d109938a1621345bfc3c46da4bff4c6 Mon Sep 17 00:00:00 2001
From: Inderpreet Singh <w6o6@ece.ubc.ca>
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/abstract_hardware_model.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/abstract_hardware_model.h')

diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h
index 8d4d009..97b243e 100644
--- a/src/abstract_hardware_model.h
+++ b/src/abstract_hardware_model.h
@@ -632,6 +632,8 @@ enum divergence_support_t {
    NUM_SIMD_MODEL
 };
 
+const unsigned MAX_ACCESSES_PER_INSN_PER_THREAD = 8;
+
 class warp_inst_t: public inst_t {
 public:
     // constructors
@@ -684,6 +686,7 @@ public:
             m_per_scalar_thread.resize(m_config->warp_size);
             m_per_scalar_thread_valid=true;
         }
+        assert(num_addrs <= MAX_ACCESSES_PER_INSN_PER_THREAD);
         for(unsigned i=0; i<num_addrs; i++)
             m_per_scalar_thread[n].memreqaddr[i] = addr[i];
     }
@@ -782,11 +785,11 @@ protected:
 
     struct per_thread_info {
         per_thread_info() {
-            for(unsigned i=0; i<8; i++)
+            for(unsigned i=0; i<MAX_ACCESSES_PER_INSN_PER_THREAD; i++)
                 memreqaddr[i] = 0;
         }
         dram_callback_t callback;
-        new_addr_type memreqaddr[8]; // effective address, upto 8 different requests (to support 32B access in 8 chunks of 4B each)
+        new_addr_type memreqaddr[MAX_ACCESSES_PER_INSN_PER_THREAD]; // effective address, upto 8 different requests (to support 32B access in 8 chunks of 4B each)
     };
     bool m_per_scalar_thread_valid;
     std::vector<per_thread_info> m_per_scalar_thread;
-- 
cgit v1.3