Minor refactoring for the SIMT Stack implementation and fixing some indentation

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14067]

1 files changed, 16 insertions, 16 deletions

diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h
index 8a08501..3bde119 100644
--- a/src/abstract_hardware_model.h
+++ b/src/abstract_hardware_model.h
@@ -219,22 +219,6 @@ typedef std::bitset<MAX_WARP_SIZE> active_mask_t;
 typedef std::bitset<MAX_WARP_SIZE_SIMT_STACK> simt_mask_t;
 typedef std::vector<address_type> addr_vector_t;
 
-enum stack_entry_type {
-    STACK_ENTRY_TYPE_NORMAL = 0,
-    STACK_ENTRY_TYPE_CALL
-};
-
-struct simt_stack_entry {
-    address_type m_pc;
-    unsigned int m_calldepth;
-    simt_mask_t m_active_mask;
-    address_type m_recvg_pc;
-    unsigned long long m_branch_div_cycle;
-    stack_entry_type m_type;
-    simt_stack_entry() :
-        m_pc(-1), m_calldepth(0), m_active_mask(), m_recvg_pc(-1), m_branch_div_cycle(0), m_type(STACK_ENTRY_TYPE_NORMAL) { };
-};
-
 class simt_stack {
 public:
     simt_stack( unsigned wid,  unsigned warpSize);
@@ -252,6 +236,22 @@ protected:
     unsigned m_warp_id;
     unsigned m_warp_size;
 
+    enum stack_entry_type {
+        STACK_ENTRY_TYPE_NORMAL = 0,
+        STACK_ENTRY_TYPE_CALL
+    };
+
+    struct simt_stack_entry {
+        address_type m_pc;
+        unsigned int m_calldepth;
+        simt_mask_t m_active_mask;
+        address_type m_recvg_pc;
+        unsigned long long m_branch_div_cycle;
+        stack_entry_type m_type;
+        simt_stack_entry() :
+            m_pc(-1), m_calldepth(0), m_active_mask(), m_recvg_pc(-1), m_branch_div_cycle(0), m_type(STACK_ENTRY_TYPE_NORMAL) { };
+    };
+
     std::deque<simt_stack_entry> m_stack;
 };