diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
| commit | b565660c42cbf8f9ec9442cd6c0b7d488c7816af (patch) | |
| tree | aa977395b10e164190efdd5106da54a57bc23b44 /src/cpu/ozone/thread_state.hh | |
| parent | 8dbab9f701150cf93d33f2a21d6b556507f3d617 (diff) | |
| parent | 9ef8bf74c7ab3d34889e804cb4b1e365da090d0b (diff) | |
| download | gem5-b565660c42cbf8f9ec9442cd6c0b7d488c7816af.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22
Diffstat (limited to 'src/cpu/ozone/thread_state.hh')
| -rw-r--r-- | src/cpu/ozone/thread_state.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/ozone/thread_state.hh b/src/cpu/ozone/thread_state.hh index ec51251b7..c4d16b3af 100644 --- a/src/cpu/ozone/thread_state.hh +++ b/src/cpu/ozone/thread_state.hh @@ -67,7 +67,7 @@ struct OzoneThreadState : public ThreadState { #if FULL_SYSTEM OzoneThreadState(CPUType *_cpu, int _thread_num) - : ThreadState(-1, _thread_num), + : ThreadState(_cpu, -1, _thread_num), intrflag(0), cpu(_cpu), inSyscall(0), trapPending(0) { if (cpu->params->profile) { @@ -87,8 +87,8 @@ struct OzoneThreadState : public ThreadState { } #else OzoneThreadState(CPUType *_cpu, int _thread_num, Process *_process, - int _asid, MemObject *mem) - : ThreadState(-1, _thread_num, _process, _asid, mem), + int _asid) + : ThreadState(_cpu, -1, _thread_num, _process, _asid), cpu(_cpu), inSyscall(0), trapPending(0) { miscRegFile.clear(); |