diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-10-02 14:32:02 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-10-02 14:32:02 -0400 |
| commit | e8ced44aead3b1a11ac7747b8d38ce5dba6c09d1 (patch) | |
| tree | 2453c596489fbe786e6da2e21e0b5791bcbeaf88 /src/cpu/thread_state.hh | |
| parent | e62b734b23d03c50fcd31d833f417207e4520d29 (diff) | |
| parent | f2acc3a4a303e4cc054eef62621499ebcbf8599b (diff) | |
| download | gem5-e8ced44aead3b1a11ac7747b8d38ce5dba6c09d1.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem
src/cpu/ozone/cpu_impl.hh:
Hand merged
--HG--
extra : convert_revision : f8a5b0205bcb78c8f5e109f456fe7bca80a7abac
Diffstat (limited to 'src/cpu/thread_state.hh')
| -rw-r--r-- | src/cpu/thread_state.hh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh index 6e985054f..14e033b7f 100644 --- a/src/cpu/thread_state.hh +++ b/src/cpu/thread_state.hh @@ -32,6 +32,7 @@ #define __CPU_THREAD_STATE_HH__ #include "arch/types.hh" +#include "cpu/profile.hh" #include "cpu/thread_context.hh" #if !FULL_SYSTEM @@ -191,6 +192,7 @@ struct ThreadState { // simulation only; all functional memory accesses should use // one of the FunctionalMemory pointers above. short asid; + #endif /** Current instruction the thread is committing. Only set and |