X86: Make initCPU and startupCPU do something basic.

[gem5.git] / src / kern / kernel_stats.hh

diff --git a/src/kern/kernel_stats.hh b/src/kern/kernel_stats.hh
index c691ad8cf16a0c30ea3f0fb3d088e741131498ed..66248c9c897068f1aff5579852fd8ff56bf8bba3 100644 (file)
--- a/src/kern/kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
@@ -32,12 +32,10 @@
 #ifndef __KERNEL_STATS_HH__
 #define __KERNEL_STATS_HH__
 
-#include <map>
-#include <stack>
 #include <string>
-#include <vector>
 
 #include "cpu/static_inst.hh"
+#include "sim/serialize.hh"
 
 class BaseCPU;
 class ThreadContext;
@@ -47,25 +45,14 @@ class System;
 
 namespace Kernel {
 
-enum cpu_mode { kernel, user, idle, cpu_mode_num };
-extern const char *modestr[];
-
 class Statistics : public Serializable
 {
-  private:
+  protected:
     std::string myname;
 
-    Addr idleProcess;
-    cpu_mode themode;
-    Tick lastModeTick;
-
-    void changeMode(cpu_mode newmode, ThreadContext *tc);
-
-  private:
+  protected:
     Stats::Scalar<> _arm;
     Stats::Scalar<> _quiesce;
-    Stats::Scalar<> _ivlb;
-    Stats::Scalar<> _ivle;
     Stats::Scalar<> _hwrei;
 
     Stats::Vector<> _iplCount;
@@ -73,23 +60,16 @@ class Statistics : public Serializable
     Stats::Vector<> _iplTicks;
     Stats::Formula _iplUsed;
 
-    Stats::Vector<> _callpal;
     Stats::Vector<> _syscall;
 //    Stats::Vector<> _faults;
 
-    Stats::Vector<> _mode;
-    Stats::Vector<> _modeGood;
-    Stats::Formula _modeFraction;
-    Stats::Vector<> _modeTicks;
-
-    Stats::Scalar<> _swap_context;
-
   private:
     int iplLast;
     Tick iplLastTick;
 
   public:
     Statistics(System *system);
+    virtual ~Statistics() {}
 
     const std::string name() const { return myname; }
     void regStats(const std::string &name);
@@ -97,15 +77,7 @@ class Statistics : public Serializable
   public:
     void arm() { _arm++; }
     void quiesce() { _quiesce++; }
-    void ivlb() { _ivlb++; }
-    void ivle() { _ivle++; }
-    void hwrei() { _hwrei++; }
     void swpipl(int ipl);
-    void mode(cpu_mode newmode, ThreadContext *tc);
-    void context(Addr oldpcbb, Addr newpcbb, ThreadContext *tc);
-    void callpal(int code, ThreadContext *tc);
-
-    void setIdleProcess(Addr idle, ThreadContext *tc);
 
   public:
     virtual void serialize(std::ostream &os);