summaryrefslogtreecommitdiff
path: root/src/cuda-sim
diff options
context:
space:
mode:
authortgrogers <[email protected]>2014-10-10 11:19:09 -0700
committertgrogers <[email protected]>2014-10-10 11:19:09 -0700
commit84fe1b186ef98c8820efe4a75553a5bb32b9c097 (patch)
tree0071270684430d5b5a38c679798bdc6724d06951 /src/cuda-sim
parent1757433af06e3541f17c22afa59f4a096a96f4b4 (diff)
parent540871e0107d19a069d8b574516190445e6b54c6 (diff)
Merge pull request #4 from qqldd/upstream_master
Add .gitignore file to ignore files generated after building + some MAC compilation issues,
Diffstat (limited to 'src/cuda-sim')
-rw-r--r--src/cuda-sim/ptx_sim.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cuda-sim/ptx_sim.h b/src/cuda-sim/ptx_sim.h
index 610efa2..f926e6d 100644
--- a/src/cuda-sim/ptx_sim.h
+++ b/src/cuda-sim/ptx_sim.h
@@ -470,7 +470,7 @@ private:
std::list<reg_map_t> m_debug_trace_regs_read;
bool m_enable_debug_trace;
- std::stack<class operand_info> m_breakaddrs;
+ std::stack<class operand_info, std::vector<operand_info> > m_breakaddrs;
};
addr_t generic_to_local( unsigned smid, unsigned hwtid, addr_t addr );