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.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/simple/base.hh')
-rw-r--r-- | src/cpu/simple/base.hh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh index 5c8d569bb..d13be2877 100644 --- a/src/cpu/simple/base.hh +++ b/src/cpu/simple/base.hh @@ -79,8 +79,6 @@ class BaseSimpleCPU : public BaseCPU typedef TheISA::FloatReg FloatReg; typedef TheISA::FloatRegBits FloatRegBits; - MemObject *mem; - protected: Trace::InstRecord *traceData; @@ -98,7 +96,6 @@ class BaseSimpleCPU : public BaseCPU public: struct Params : public BaseCPU::Params { - MemObject *mem; #if FULL_SYSTEM TheISA::ITB *itb; TheISA::DTB *dtb; |