Change SamplingCPU to Sampler.

--HG--
extra : convert_revision : ddba327a572804954adcebfff1182b97d474c020

diff --git a/arch/alpha/pseudo_inst.cc b/arch/alpha/pseudo_inst.cc
index ff34aa19d72197f6cd3485656b65a3f608a5227c..b541dc4464d989ea5f63c364f451eef37c96d0d7 100644 (file)
--- a/arch/alpha/pseudo_inst.cc
+++ b/arch/alpha/pseudo_inst.cc
@@ -49,7 +49,7 @@
 
 using namespace std;
 
-extern SamplingCPU *SampCPU;
+extern Sampler *SampCPU;
 
 using namespace Stats;
 

diff --git a/cpu/base.cc b/cpu/base.cc
index 91ddc165eb221ead3fdfbf85496ce9cffcdcb4c3..38431006e52376a4b067e22a0dc69f7e832cc3e0 100644 (file)
--- a/cpu/base.cc
+++ b/cpu/base.cc
@@ -203,7 +203,7 @@ BaseCPU::registerExecContexts()
 
 
 void
-BaseCPU::switchOut(SamplingCPU *sampler)
+BaseCPU::switchOut(Sampler *sampler)
 {
     panic("This CPU doesn't support sampling!");
 }

diff --git a/cpu/base.hh b/cpu/base.hh
index 0cb81e93beac5f383ed7ed63821cf45631e6d316..9c030be1ca932767c3cbe6e0f7374cabacab449f 100644 (file)
--- a/cpu/base.hh
+++ b/cpu/base.hh
@@ -126,7 +126,7 @@ class BaseCPU : public SimObject
 
     /// Prepare for another CPU to take over execution.  When it is
     /// is ready (drained pipe) it signals the sampler.
-    virtual void switchOut(SamplingCPU *);
+    virtual void switchOut(Sampler *);
 
     /// Take over execution from the given CPU.  Used for warm-up and
     /// sampling.

diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc
index 306398ac2ef1617b0d9fc08221b9b9f474c7c9d0..8e26342d5b603c5022450e28901f2a6f1086f466 100644 (file)
--- a/cpu/simple/cpu.cc
+++ b/cpu/simple/cpu.cc
@@ -148,7 +148,7 @@ SimpleCPU::~SimpleCPU()
 }
 
 void
-SimpleCPU::switchOut(SamplingCPU *s)
+SimpleCPU::switchOut(Sampler *s)
 {
     sampler = s;
     if (status() == DcacheMissStall) {

diff --git a/cpu/simple/cpu.hh b/cpu/simple/cpu.hh
index 9a0c2952adbafac9dfd1bb4f609a36389a32b63b..1d2ca79cb9513e26a6cd43ef91a4187c0a8e7cee 100644 (file)
--- a/cpu/simple/cpu.hh
+++ b/cpu/simple/cpu.hh
@@ -145,7 +145,7 @@ class SimpleCPU : public BaseCPU
     // execution context
     ExecContext *xc;
 
-    void switchOut(SamplingCPU *s);
+    void switchOut(Sampler *s);
     void takeOverFrom(BaseCPU *oldCPU);
 
 #ifdef FULL_SYSTEM
@@ -169,7 +169,7 @@ class SimpleCPU : public BaseCPU
     // Pointer to the sampler that is telling us to switchover.
     // Used to signal the completion of the pipe drain and schedule
     // the next switchover
-    SamplingCPU *sampler;
+    Sampler *sampler;
 
     StaticInstPtr<TheISA> curStaticInst;