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/simple/base.cc | |
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/simple/base.cc')
-rw-r--r-- | src/cpu/simple/base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index 253d33243..47b3b938f 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -70,13 +70,13 @@ using namespace std; using namespace TheISA; BaseSimpleCPU::BaseSimpleCPU(Params *p) - : BaseCPU(p), mem(p->mem), thread(NULL) + : BaseCPU(p), thread(NULL) { #if FULL_SYSTEM thread = new SimpleThread(this, 0, p->system, p->itb, p->dtb); #else thread = new SimpleThread(this, /* thread_num */ 0, p->process, - /* asid */ 0, mem); + /* asid */ 0); #endif // !FULL_SYSTEM thread->setStatus(ThreadContext::Suspended); |