summaryrefslogtreecommitdiff
path: root/cpu/simple
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2005-06-05 02:59:43 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2005-06-05 02:59:43 -0400
commit550003e1b7a49798ff8154eae2355f298f35d346 (patch)
tree68a4be9439dbbd880861d449d5585d1cce276d4e /cpu/simple
parentae1b184a70e3ee2b91b5e28cab2a7a4f2579327b (diff)
downloadgem5-550003e1b7a49798ff8154eae2355f298f35d346.tar.xz
Change SamplingCPU to Sampler.
--HG-- extra : convert_revision : ddba327a572804954adcebfff1182b97d474c020
Diffstat (limited to 'cpu/simple')
-rw-r--r--cpu/simple/cpu.cc2
-rw-r--r--cpu/simple/cpu.hh4
2 files changed, 3 insertions, 3 deletions
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;