From 550003e1b7a49798ff8154eae2355f298f35d346 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sun, 5 Jun 2005 02:59:43 -0400 Subject: Change SamplingCPU to Sampler. --HG-- extra : convert_revision : ddba327a572804954adcebfff1182b97d474c020 --- cpu/base.cc | 2 +- cpu/base.hh | 2 +- cpu/simple/cpu.cc | 2 +- cpu/simple/cpu.hh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cpu') 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 curStaticInst; -- cgit v1.2.3