diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
| commit | 5825a6c9d82b813d983b688da5f1ce18c90f774f (patch) | |
| tree | a5be1a1c3968ff57d387523f95e46bcb2797c121 /src/cpu/o3/thread_state.hh | |
| parent | 7f39644609e19ada9e94c9bbb09c3e625fa6e8ed (diff) | |
| parent | bfd5eb2b08dad700d085a637d5e16a61dcc530d7 (diff) | |
| download | gem5-5825a6c9d82b813d983b688da5f1ce18c90f774f.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix
configs/example/fs.py:
configs/example/se.py:
src/mem/tport.hh:
Hand merge.
--HG--
extra : convert_revision : b9df95534d43b3b311f24ae24717371d03d615bf
Diffstat (limited to 'src/cpu/o3/thread_state.hh')
| -rw-r--r-- | src/cpu/o3/thread_state.hh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cpu/o3/thread_state.hh b/src/cpu/o3/thread_state.hh index 5fe7bb94d..d8720b3ab 100644 --- a/src/cpu/o3/thread_state.hh +++ b/src/cpu/o3/thread_state.hh @@ -77,7 +77,7 @@ struct O3ThreadState : public ThreadState { #if FULL_SYSTEM O3ThreadState(O3CPU *_cpu, int _thread_num) - : ThreadState(-1, _thread_num), + : ThreadState(_cpu, -1, _thread_num), cpu(_cpu), inSyscall(0), trapPending(0) { if (cpu->params->profile) { @@ -95,9 +95,8 @@ struct O3ThreadState : public ThreadState { profilePC = 3; } #else - O3ThreadState(O3CPU *_cpu, int _thread_num, Process *_process, int _asid, - MemObject *mem) - : ThreadState(-1, _thread_num, _process, _asid, mem), + O3ThreadState(O3CPU *_cpu, int _thread_num, Process *_process, int _asid) + : ThreadState(_cpu, -1, _thread_num, _process, _asid), cpu(_cpu), inSyscall(0), trapPending(0) { } #endif |