sim: fold StartupCallback into SimObject

There used to be a reason to have StartupCallback
be a separate object, but not any more.  Now
it's just confusing.

3 files changed, 7 insertions, 3 deletions

diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index 291fdc7b7..e43f90173 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -91,7 +91,7 @@ def simulate(*args, **kwargs):
     global need_resume, need_startup
 
     if need_startup:
-        internal.core.SimStartup()
+        internal.core.startupAll()
         need_startup = False
 
     for root in need_resume:
diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index 1ff2d9fe5..f7a075f74 100644
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -38,7 +38,6 @@
 #include "base/socket.hh"
 #include "base/types.hh"
 #include "sim/core.hh"
-#include "sim/startup.hh"
 
 extern const char *compileDate;
 
@@ -62,7 +61,6 @@ inline void disableAllListeners() { ListenSocket::disableAll(); }
 %include "base/types.hh"
 
 void setOutputDir(const std::string &dir);
-void SimStartup();
 void doExitCleanup();
 void disableAllListeners();
 
@@ -82,6 +80,7 @@ void unserializeAll(const std::string &cpt_dir);
 
 void initAll();
 void regAllStats();
+void startupAll();
 
 bool want_warn, warn_verbose;
 bool want_info, info_verbose;
diff --git a/src/python/swig/pyobject.hh b/src/python/swig/pyobject.hh
index bc3177f6f..01f0fd95e 100644
--- a/src/python/swig/pyobject.hh
+++ b/src/python/swig/pyobject.hh
@@ -69,3 +69,8 @@ unserializeAll(const std::string &cpt_dir)
     Serializable::unserializeAll(cpt_dir);
 }
 
+inline void
+startupAll()
+{
+    SimObject::startupAll();
+}