diff options
| -rw-r--r-- | SConscript | 7 | ||||
| -rw-r--r-- | arch/alpha/pseudo_inst.cc | 2 | ||||
| -rw-r--r-- | cpu/base.cc | 2 | ||||
| -rw-r--r-- | cpu/base.hh | 2 | ||||
| -rw-r--r-- | cpu/o3/alpha_cpu_builder.cc | 1 | ||||
| -rw-r--r-- | cpu/simple/cpu.cc | 3 | ||||
| -rw-r--r-- | cpu/simple/cpu.hh | 4 | ||||
| -rw-r--r-- | sim/process.cc | 2 |
8 files changed, 10 insertions, 13 deletions
diff --git a/SConscript b/SConscript index f8ffaa7a8..5b96f5b4b 100644 --- a/SConscript +++ b/SConscript @@ -329,9 +329,9 @@ syscall_emulation_sources = Split(''' cpu/memtest/memtest.cc cpu/trace/opt_cpu.cc cpu/trace/trace_cpu.cc - eio/eio.cc - eio/exolex.cc - eio/libexo.cc + encumbered/eio/eio.cc + encumbered/eio/exolex.cc + encumbered/eio/libexo.cc sim/process.cc sim/syscall_emul.cc ''') @@ -350,7 +350,6 @@ targetarch_files = Split(''' faults.hh isa_fullsys_traits.hh isa_traits.hh - machine_exo.h osfpal.hh pseudo_inst.hh vptr.hh 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/o3/alpha_cpu_builder.cc b/cpu/o3/alpha_cpu_builder.cc index 6f4e4f0be..57061c052 100644 --- a/cpu/o3/alpha_cpu_builder.cc +++ b/cpu/o3/alpha_cpu_builder.cc @@ -53,7 +53,6 @@ #include "targetarch/alpha_memory.hh" #include "targetarch/vtophys.hh" #else // !FULL_SYSTEM -#include "eio/eio.hh" #include "mem/functional/functional.hh" #endif // FULL_SYSTEM diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index 306398ac2..b145e1bbd 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -67,7 +67,6 @@ #include "targetarch/alpha_memory.hh" #include "targetarch/vtophys.hh" #else // !FULL_SYSTEM -#include "eio/eio.hh" #include "mem/functional/functional.hh" #endif // FULL_SYSTEM @@ -148,7 +147,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; diff --git a/sim/process.cc b/sim/process.cc index e7a9afa9d..ab256454c 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -38,8 +38,8 @@ #include "base/statistics.hh" #include "cpu/exec_context.hh" #include "cpu/smt.hh" -#include "eio/eio.hh" #include "encumbered/cpu/full/thread.hh" +#include "encumbered/eio/eio.hh" #include "encumbered/mem/functional/main.hh" #include "sim/builder.hh" #include "sim/fake_syscall.hh" |