summaryrefslogtreecommitdiff
path: root/src/python/swig
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2010-07-05 21:39:38 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2010-07-05 21:39:38 -0700
commit30ce620d1d7b04387072e2dcf87530c33eb7c608 (patch)
tree04d03bbf19ffcec6691b9348b544faf0e5f80992 /src/python/swig
parent345dfd1b41729162ff31da010cce0659ce810897 (diff)
downloadgem5-30ce620d1d7b04387072e2dcf87530c33eb7c608.tar.xz
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.
Diffstat (limited to 'src/python/swig')
-rw-r--r--src/python/swig/core.i3
-rw-r--r--src/python/swig/pyobject.hh5
2 files changed, 6 insertions, 2 deletions
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();
+}