Merge saidi@zizzer.eecs.umich.edu:/bk/linux

[gem5.git] / sim / sim_object.cc

diff --git a/sim/sim_object.cc b/sim/sim_object.cc
index c55021e41ab04dde132521c97f0f85b724ad44cb..cab629f8dc0b184dd2c95ce4285dff54e9190d10 100644 (file)
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,8 @@
 #include "sim/configfile.hh"
 #include "sim/host.hh"
 #include "sim/sim_object.hh"
-#include "sim/sim_stats.hh"
+#include "sim/stats.hh"
+#include "sim/param.hh"
 
 using namespace std;
 
@@ -83,14 +84,6 @@ SimObject::resetStats()
 {
 }
 
-//
-// no default extra output
-//
-void
-SimObject::printExtraOutput(ostream &os)
-{
-}
-
 //
 // static function:
 //   call regStats() on all SimObjects and then regFormulas() on all
@@ -128,7 +121,7 @@ SimObject::regAllStats()
         (*i)->regFormulas();
     }
 
-    Statistics::registerResetCallback(&StatResetCB);
+    Stats::registerResetCallback(&StatResetCB);
 }
 
 //
@@ -161,21 +154,6 @@ SimObject::resetAllStats()
     }
 }
 
-//
-// static function: call printExtraOutput() on all SimObjects.
-//
-void
-SimObject::printAllExtraOutput(ostream &os)
-{
-    SimObjectList::iterator i = simObjectList.begin();
-    SimObjectList::iterator end = simObjectList.end();
-
-    for (; i != end; ++i) {
-        SimObject *obj = *i;
-        obj->printExtraOutput(os);
-   }
-}
-
 //
 // static function: serialize all SimObjects.
 //
@@ -191,3 +169,5 @@ SimObject::serializeAll(ostream &os)
         obj->serialize(os);
    }
 }
+
+DEFINE_SIM_OBJECT_CLASS_NAME("SimObject", SimObject)