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/simple/base.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/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 af6b6f835..f382158dd 100644 --- a/src/cpu/simple/base.hh +++ b/src/cpu/simple/base.hh @@ -76,8 +76,6 @@ class BaseSimpleCPU : public BaseCPU typedef TheISA::FloatReg FloatReg; typedef TheISA::FloatRegBits FloatRegBits; - MemObject *mem; - protected: Trace::InstRecord *traceData; @@ -95,7 +93,6 @@ class BaseSimpleCPU : public BaseCPU public: struct Params : public BaseCPU::Params { - MemObject *mem; #if FULL_SYSTEM AlphaITB *itb; AlphaDTB *dtb; |