Merge zizzer.eecs.umich.edu:/bk/newmem/

into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22

diff --cc src/cpu/checker/cpu.hh
Simple merge

diff --cc src/cpu/o3/alpha/cpu_builder.cc
Simple merge

diff --cc src/cpu/o3/alpha/cpu_impl.hh
Simple merge

diff --cc src/cpu/o3/mips/cpu_impl.hh
Simple merge

diff --cc src/cpu/ozone/cpu.hh
Simple merge

diff --cc src/cpu/ozone/cpu_builder.cc
Simple merge

diff --cc src/cpu/ozone/cpu_impl.hh
Simple merge

diff --cc src/cpu/ozone/simple_params.hh
Simple merge

diff --cc src/cpu/ozone/thread_state.hh
Simple merge

diff --cc src/cpu/simple/atomic.cc
Simple merge

diff --cc src/cpu/simple/base.hh
index 5c8d569bbf9e6bb49dff7fd23f052100e557c2fe,f382158ddf1a39a15fa11386dc2e9e73572d9499..d13be2877d1dadbbeaad39571858bf263fe6679c
--- 1/src/cpu/simple/base.hh
--- 2/src/cpu/simple/base.hh
+++ b/src/cpu/simple/base.hh
@@@ -98,10 -93,9 +96,9 @@@ class BaseSimpleCPU : public BaseCP
    public:
      struct Params : public BaseCPU::Params
      {
-         MemObject *mem;
  #if FULL_SYSTEM
 -        AlphaITB *itb;
 -        AlphaDTB *dtb;
 +        TheISA::ITB *itb;
 +        TheISA::DTB *dtb;
  #else
          Process *process;
  #endif

diff --cc src/cpu/simple/timing.cc
Simple merge

diff --cc src/cpu/simple_thread.cc
index 95018ff8c84c9cb5d96a320c1167a5e8078322c5,c89a13eef30445ff8529ccd2b5cb3f41839e12b1..d4e5f82306942a29f4bc737f7979eab51a564aee
--- 1/src/cpu/simple_thread.cc
--- 2/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@@ -60,9 -60,9 +60,9 @@@ using namespace std
  // constructor
  #if FULL_SYSTEM
  SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, System *_sys,
 -                           AlphaITB *_itb, AlphaDTB *_dtb,
 +                           TheISA::ITB *_itb, TheISA::DTB *_dtb,
                             bool use_kernel_stats)
-     : ThreadState(-1, _thread_num), cpu(_cpu), system(_sys), itb(_itb),
+     : ThreadState(_cpu, -1, _thread_num), cpu(_cpu), system(_sys), itb(_itb),
        dtb(_dtb)
  
  {

diff --cc src/cpu/simple_thread.hh
index 20f7f0d1c189d53a51342b663eed4e10ecda2c7c,f002cbdceb33caa07f991d6306db796f66ae861c..b654c130e827c281badeb3e5f12f0620bfa06c95
--- 1/src/cpu/simple_thread.hh
--- 2/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@@ -114,11 -114,10 +114,10 @@@ class SimpleThread : public ThreadStat
      // constructor: initialize SimpleThread from given process structure
  #if FULL_SYSTEM
      SimpleThread(BaseCPU *_cpu, int _thread_num, System *_system,
 -                 AlphaITB *_itb, AlphaDTB *_dtb,
 +                 TheISA::ITB *_itb, TheISA::DTB *_dtb,
                   bool use_kernel_stats = true);
  #else
-     SimpleThread(BaseCPU *_cpu, int _thread_num, Process *_process, int _asid,
-                  MemObject *memobj);
+     SimpleThread(BaseCPU *_cpu, int _thread_num, Process *_process, int _asid);
  #endif
  
      SimpleThread();

diff --cc src/mem/bus.hh
Simple merge