From 2cb2b508020bfcdaccbf7225f621bcdfd330c7bd Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Thu, 21 Dec 2006 15:49:16 -0800
Subject: [PATCH] move the swig initialization calls from src/sim/main.cc to
 src/python/swig/init.cc so that it's not as easy to forget about it when you
 add a new swig module.

--HG--
extra : convert_revision : 5cc4ec0838e636aa761901effb8986de58d23e03
---
 src/SConscript          |  1 +
 src/python/swig/init.hh | 36 ++++++++++++++++++++++++++++++++++++
 src/sim/main.cc         |  9 ++-------
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 src/python/swig/init.hh

diff --git a/src/SConscript b/src/SConscript
index 178f5b345..6f323b938 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -128,6 +128,7 @@ base_sources = Split('''
 
         mem/cache/cache_builder.cc
 
+        python/swig/init.cc
         python/swig/debug_wrap.cc
         python/swig/main_wrap.cc
 
diff --git a/src/python/swig/init.hh b/src/python/swig/init.hh
new file mode 100644
index 000000000..c376f5d59
--- /dev/null
+++ b/src/python/swig/init.hh
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2000-2005 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ */
+
+#ifndef __PYTHON_SWIG_INIT_HH__
+#define __PYTHON_SWIG_INIT_HH__
+
+void init_swig();
+
+#endif // __PYTHON_SWIG_INIT_HH__
diff --git a/src/sim/main.cc b/src/sim/main.cc
index 17209ac20..04dbe1ef4 100644
--- a/src/sim/main.cc
+++ b/src/sim/main.cc
@@ -60,6 +60,7 @@
 #include "cpu/smt.hh"
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
+#include "python/swig/init.hh"
 #include "sim/async.hh"
 #include "sim/builder.hh"
 #include "sim/host.hh"
@@ -117,11 +118,6 @@ abortHandler(int sigtype)
 #endif
 }
 
-extern "C" {
-void init_main();
-void init_debug();
-}
-
 int
 main(int argc, char **argv)
 {
@@ -159,8 +155,7 @@ main(int argc, char **argv)
     PySys_SetArgv(argc, argv);
 
     // initialize SWIG modules
-    init_main();
-    init_debug();
+    init_swig();
 
     PyRun_SimpleString("import m5.main");
     PyRun_SimpleString("m5.main.main()");
-- 
2.30.2