From: Gabe Black <gblack@eecs.umich.edu>
Date: Thu, 2 Nov 2006 00:00:59 +0000 (-0500)
Subject: Merge zizzer.eecs.umich.edu:/bk/newmem/
X-Git-Tag: m5_2.0_beta2~53^2~69
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b565660c42cbf8f9ec9442cd6c0b7d488c7816af;p=gem5.git

Merge zizzer.eecs.umich.edu:/bk/newmem/
into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22
---

b565660c42cbf8f9ec9442cd6c0b7d488c7816af
diff --cc src/cpu/simple/base.hh
index 5c8d569bb,f382158dd..d13be2877
--- a/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_thread.cc
index 95018ff8c,c89a13eef..d4e5f8230
--- a/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 20f7f0d1c,f002cbdce..b654c130e
--- a/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();