summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/alpha/kernel_stats.cc4
-rw-r--r--src/arch/alpha/kernel_stats.hh6
-rw-r--r--src/arch/arm/kernel_stats.hh10
-rw-r--r--src/arch/mips/kernel_stats.hh6
-rw-r--r--src/arch/power/kernel_stats.hh5
-rw-r--r--src/arch/riscv/kernel_stats.hh6
-rw-r--r--src/arch/sparc/kernel_stats.hh5
-rw-r--r--src/arch/x86/kernel_stats.hh16
-rwxr-xr-xsrc/cpu/o3/thread_context_impl.hh2
-rw-r--r--src/cpu/simple_thread.cc2
-rw-r--r--src/kern/kernel_stats.cc2
-rw-r--r--src/kern/kernel_stats.hh5
12 files changed, 13 insertions, 56 deletions
diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc
index fed8b09e4..a1ed532d8 100644
--- a/src/arch/alpha/kernel_stats.cc
+++ b/src/arch/alpha/kernel_stats.cc
@@ -50,8 +50,8 @@ namespace Kernel {
const char *modestr[] = { "kernel", "user", "idle" };
-Statistics::Statistics(System *system)
- : ::Kernel::Statistics(system),
+Statistics::Statistics()
+ : ::Kernel::Statistics(),
idleProcess((Addr)-1), themode(kernel), lastModeTick(0)
{
}
diff --git a/src/arch/alpha/kernel_stats.hh b/src/arch/alpha/kernel_stats.hh
index 06d20e6fa..3b2b5a0c0 100644
--- a/src/arch/alpha/kernel_stats.hh
+++ b/src/arch/alpha/kernel_stats.hh
@@ -40,11 +40,7 @@
#include "cpu/static_inst.hh"
#include "kern/kernel_stats.hh"
-class BaseCPU;
class ThreadContext;
-class FnEvent;
-// What does kernel stats expect is included?
-class System;
namespace AlphaISA {
namespace Kernel {
@@ -73,7 +69,7 @@ class Statistics : public ::Kernel::Statistics
Stats::Scalar _swap_context;
public:
- Statistics(System *system);
+ Statistics();
void regStats(const std::string &name);
diff --git a/src/arch/arm/kernel_stats.hh b/src/arch/arm/kernel_stats.hh
index be5c25bd5..dd184f805 100644
--- a/src/arch/arm/kernel_stats.hh
+++ b/src/arch/arm/kernel_stats.hh
@@ -31,23 +31,15 @@
#ifndef __ARCH_ARM_KERNEL_STATS_HH__
#define __ARCH_ARM_KERNEL_STATS_HH__
-#include <map>
-#include <stack>
-#include <string>
-#include <vector>
-
#include "kern/kernel_stats.hh"
namespace ArmISA {
namespace Kernel {
-enum cpu_mode { hypervisor, kernel, user, idle, cpu_mode_num };
-extern const char *modestr[];
-
class Statistics : public ::Kernel::Statistics
{
public:
- Statistics(System *system) : ::Kernel::Statistics(system)
+ Statistics() : ::Kernel::Statistics()
{}
};
diff --git a/src/arch/mips/kernel_stats.hh b/src/arch/mips/kernel_stats.hh
index 5cf6087c8..abb964a71 100644
--- a/src/arch/mips/kernel_stats.hh
+++ b/src/arch/mips/kernel_stats.hh
@@ -37,17 +37,13 @@
namespace MipsISA {
namespace Kernel {
-enum cpu_mode { kernel, user, idle, cpu_mode_num };
-extern const char *modestr[];
-
class Statistics : public ::Kernel::Statistics
{
public:
- Statistics(System *system) : ::Kernel::Statistics(system)
+ Statistics() : ::Kernel::Statistics()
{}
};
-
} // namespace MipsISA::Kernel
} // namespace MipsISA
diff --git a/src/arch/power/kernel_stats.hh b/src/arch/power/kernel_stats.hh
index b4d9a69b6..1ae77d910 100644
--- a/src/arch/power/kernel_stats.hh
+++ b/src/arch/power/kernel_stats.hh
@@ -36,13 +36,10 @@
namespace PowerISA {
namespace Kernel {
-enum cpu_mode { hypervisor, kernel, user, idle, cpu_mode_num };
-extern const char *modestr[];
-
class Statistics : public ::Kernel::Statistics
{
public:
- Statistics(System *system) : ::Kernel::Statistics(system)
+ Statistics() : ::Kernel::Statistics()
{}
};
diff --git a/src/arch/riscv/kernel_stats.hh b/src/arch/riscv/kernel_stats.hh
index 6cb6ed068..a796075f5 100644
--- a/src/arch/riscv/kernel_stats.hh
+++ b/src/arch/riscv/kernel_stats.hh
@@ -37,17 +37,13 @@
namespace RiscvISA {
namespace Kernel {
-enum cpu_mode { kernel, user, idle, cpu_mode_num };
-extern const char *modestr[];
-
class Statistics : public ::Kernel::Statistics
{
public:
- Statistics(System *system) : ::Kernel::Statistics(system)
+ Statistics() : ::Kernel::Statistics()
{}
};
-
} // namespace RiscvISA::Kernel
} // namespace RiscvISA
diff --git a/src/arch/sparc/kernel_stats.hh b/src/arch/sparc/kernel_stats.hh
index 3d4c677a0..9c13e520a 100644
--- a/src/arch/sparc/kernel_stats.hh
+++ b/src/arch/sparc/kernel_stats.hh
@@ -41,13 +41,10 @@
namespace SparcISA {
namespace Kernel {
-enum cpu_mode { hypervisor, kernel, user, idle, cpu_mode_num };
-extern const char *modestr[];
-
class Statistics : public ::Kernel::Statistics
{
public:
- Statistics(System *system) : ::Kernel::Statistics(system)
+ Statistics() : ::Kernel::Statistics()
{}
};
diff --git a/src/arch/x86/kernel_stats.hh b/src/arch/x86/kernel_stats.hh
index e5b9a0c95..1a821a0e9 100644
--- a/src/arch/x86/kernel_stats.hh
+++ b/src/arch/x86/kernel_stats.hh
@@ -45,24 +45,10 @@
namespace X86ISA {
namespace Kernel {
-enum cpu_mode {
- ring0,
- ring1,
- ring2,
- ring3,
- kernel = ring0,
- user = ring3,
- idle,
- //What is this next one for?
- cpu_mode_num
-};
-
-extern const char *modestr[];
-
class Statistics : public ::Kernel::Statistics
{
public:
- Statistics(System * system) : ::Kernel::Statistics(system)
+ Statistics() : ::Kernel::Statistics()
{}
};
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh
index 2d109aea9..fdaa35134 100755
--- a/src/cpu/o3/thread_context_impl.hh
+++ b/src/cpu/o3/thread_context_impl.hh
@@ -134,7 +134,7 @@ void
O3ThreadContext<Impl>::regStats(const std::string &name)
{
if (FullSystem) {
- thread->kernelStats = new TheISA::Kernel::Statistics(cpu->system);
+ thread->kernelStats = new TheISA::Kernel::Statistics();
thread->kernelStats->regStats(name + ".kern");
}
}
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 7c3568cb3..c775983f8 100644
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -100,7 +100,7 @@ SimpleThread::SimpleThread(BaseCPU *_cpu, int _thread_num, System *_sys,
profilePC = 3;
if (use_kernel_stats)
- kernelStats = new TheISA::Kernel::Statistics(system);
+ kernelStats = new TheISA::Kernel::Statistics();
}
SimpleThread::~SimpleThread()
diff --git a/src/kern/kernel_stats.cc b/src/kern/kernel_stats.cc
index f7f57af29..37677c1fc 100644
--- a/src/kern/kernel_stats.cc
+++ b/src/kern/kernel_stats.cc
@@ -41,7 +41,7 @@ using namespace Stats;
namespace Kernel {
-Statistics::Statistics(System *system)
+Statistics::Statistics()
: iplLast(0), iplLastTick(0)
{
}
diff --git a/src/kern/kernel_stats.hh b/src/kern/kernel_stats.hh
index efaf70611..d516baaec 100644
--- a/src/kern/kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
@@ -34,13 +34,10 @@
#include <string>
-#include "config/the_isa.hh"
#include "sim/serialize.hh"
#include "sim/stats.hh"
// What does kernel stats expect is included?
-class System;
-
namespace Kernel {
class Statistics : public Serializable
@@ -63,7 +60,7 @@ class Statistics : public Serializable
Tick iplLastTick;
public:
- Statistics(System *system);
+ Statistics();
virtual ~Statistics() {}
const std::string name() const { return myname; }