Remove a ton of old simplescalar crap that we no longer need.

sim/base_cpu.cc:
sim/exec_context.hh:
sim/hybrid_pred.cc:
sim/main.cc:
sim/prog.hh:
sim/sat_counter.cc:
sim/sim_object.cc:
sim/sim_object.hh:
sim/simple_cpu.cc:
    old stats begone!

--HG--
extra : convert_revision : b0173f13744466b6d9607797b57f7f9bc9bc769f

9 files changed, 5 insertions, 20 deletions

diff --git a/sim/base_cpu.cc b/sim/base_cpu.cc
index 43caa1fe4..06b2ec65c 100644
--- a/sim/base_cpu.cc
+++ b/sim/base_cpu.cc
@@ -32,7 +32,6 @@
 
 #include "base_cpu.hh"
 #include "cprintf.hh"
-#include "stats.hh"
 #include "exec_context.hh"
 #include "misc.hh"
 #include "sim_events.hh"
diff --git a/sim/exec_context.hh b/sim/exec_context.hh
index 56bce0aa9..988673a0f 100644
--- a/sim/exec_context.hh
+++ b/sim/exec_context.hh
@@ -30,7 +30,6 @@
 #define __EXEC_CONTEXT_HH__
 
 #include "host.hh"
-#include "stats.hh"
 #include "mem_req.hh"
 
 // forward declaration: see functional_memory.hh
diff --git a/sim/hybrid_pred.cc b/sim/hybrid_pred.cc
index 6a8384083..ed7f781b2 100644
--- a/sim/hybrid_pred.cc
+++ b/sim/hybrid_pred.cc
@@ -29,9 +29,7 @@
 #include <string>
 #include <sstream>
 
-#include "stats.hh"
 #include "hybrid_pred.hh"
-
 #include "statistics.hh"
 #include "sim_stats.hh"
 
diff --git a/sim/main.cc b/sim/main.cc
index 84f8e78cc..ebf96741d 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -39,7 +39,6 @@
 
 #include "host.hh"
 #include "misc.hh"
-#include "stats.hh"
 
 #include "copyright.hh"
 #include "inifile.hh"
@@ -227,7 +226,6 @@ main(int argc, char **argv)
     sayHello(cerr);
 
     // Initialize statistics database
-    init_old_stats();
     initBaseStats();
 
     vector<char *> cppArgs;
diff --git a/sim/prog.hh b/sim/prog.hh
index e04390244..0afd06ffd 100644
--- a/sim/prog.hh
+++ b/sim/prog.hh
@@ -38,11 +38,10 @@
 
 #include <list>
 
-#include "stats.hh"
+#include "isa_traits.hh"
 #include "sim_object.hh"
-
-#include "statistics.hh"
 #include "sim_stats.hh"
+#include "statistics.hh"
 
 class ExecContext;
 class FunctionalMemory;
diff --git a/sim/sat_counter.cc b/sim/sat_counter.cc
index bd1b6de0b..dc365f0f3 100644
--- a/sim/sat_counter.cc
+++ b/sim/sat_counter.cc
@@ -28,7 +28,6 @@
 
 #include <sstream>
 
-#include "stats.hh"
 #include "sat_counter.hh"
 
 #include "statistics.hh"
diff --git a/sim/sim_object.cc b/sim/sim_object.cc
index e5506ee8f..3583c30c2 100644
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@ -35,7 +35,6 @@
 #include "misc.hh"
 #include "trace.hh"
 #include "sim_stats.hh"
-#include "stats.hh"
 
 using namespace std;
 
@@ -64,11 +63,6 @@ SimObject::SimObject(const string &_name)
 // no default statistics, so nothing to do in base implementation
 //
 void
-SimObject::reg_stats(struct stat_sdb_t *sdb)
-{
-}
-
-void
 SimObject::regStats()
 {
 }
@@ -87,7 +81,9 @@ SimObject::printExtraOutput(ostream &os)
 }
 
 //
-// static function: call reg_stats() on all SimObjects.
+// static function:
+//   call regStats() on all SimObjects and then regFormulas() on all
+//   SimObjects.
 //
 void
 SimObject::regAllStats()
@@ -102,7 +98,6 @@ SimObject::regAllStats()
 #ifdef STAT_DEBUG
         cprintf("registering stats for %s\n", (*i)->name());
 #endif
-        (*i)->reg_stats(sim_sdb);
         (*i)->regStats();
     }
 
diff --git a/sim/sim_object.hh b/sim/sim_object.hh
index 051c7b304..141b58e0a 100644
--- a/sim/sim_object.hh
+++ b/sim/sim_object.hh
@@ -62,7 +62,6 @@ class SimObject : public Serializeable
     virtual ~SimObject() {}
 
     // register statistics for this object
-    virtual void reg_stats(struct stat_sdb_t *sdb);
     virtual void regStats();
     virtual void regFormulas();
 
diff --git a/sim/simple_cpu.cc b/sim/simple_cpu.cc
index 96743d0fa..41a612318 100644
--- a/sim/simple_cpu.cc
+++ b/sim/simple_cpu.cc
@@ -39,7 +39,6 @@
 #include "host.hh"
 #include "cprintf.hh"
 #include "misc.hh"
-#include "stats.hh"
 #include "smt.hh"
 
 #include "annotation.hh"