Change SamplingCPU to Sampler.

--HG--
extra : convert_revision : ddba327a572804954adcebfff1182b97d474c020

5 files changed, 6 insertions, 6 deletions

diff --git a/arch/alpha/pseudo_inst.cc b/arch/alpha/pseudo_inst.cc
index ff34aa19d..b541dc446 100644
--- 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 91ddc165e..38431006e 100644
--- 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 0cb81e93b..9c030be1c 100644
--- 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 306398ac2..8e26342d5 100644
--- 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 9a0c2952a..1d2ca79cb 100644
--- 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;