sim: Remove the unused SimObject::regFormulas method

Simulation objects normally register derived statistics, presumably
what regFormulas originally was meant for, in regStats(). This patch
removes regRegformulas since there is no need to have a separate
method call to register formulas.

diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index 0f742a3a210758aa7fe537ba83f07bc0d00244e4..ae6b2035e0949bb6dd76e2da880fcad4b45ea463 100644 (file)
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -597,7 +597,6 @@ class SimObject(object):
     void loadState(Checkpoint *cp);
     void initState();
     void regStats();
-    void regFormulas();
     void resetStats();
     void startup();
 
@@ -707,7 +706,7 @@ class SimObject(object):
         # If the attribute exists on the C++ object, transparently
         # forward the reference there.  This is typically used for
         # SWIG-wrapped methods such as init(), regStats(),
-        # regFormulas(), resetStats(), startup(), drain(), and
+        # resetStats(), startup(), drain(), and
         # resume().
         if self._ccObject and hasattr(self._ccObject, attr):
             return getattr(self._ccObject, attr)

diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 99e3ec98942ef488ae675ffff036e1e9901a7d58..9cb647a6b0dd2ef4bb78b38dfeede61116cd3872 100644 (file)
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -110,7 +110,6 @@ def instantiate(ckpt_dir=None):
 
     # Do a third pass to initialize statistics
     for obj in root.descendants(): obj.regStats()
-    for obj in root.descendants(): obj.regFormulas()
 
     # We're done registering statistics.  Enable the stats package now.
     stats.enable()

diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index 95bc6bf8466f8052577f2f34201600df5f44531d..422f5095aa15bc63f2f0bb6775747941e56f0d1a 100644 (file)
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -104,11 +104,6 @@ SimObject::regStats()
 {
 }
 
-void
-SimObject::regFormulas()
-{
-}
-
 void
 SimObject::resetStats()
 {

diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh
index 4388ff584b5aecb9ad1294fd6d058974b79f802c..bbd97557f176f5f149cc2f132339c058881a14b8 100644 (file)
--- a/src/sim/sim_object.hh
+++ b/src/sim/sim_object.hh
@@ -126,7 +126,6 @@ class SimObject : public EventManager, public Serializable
 
     // register statistics for this object
     virtual void regStats();
-    virtual void regFormulas();
     virtual void resetStats();
 
     /**