diff options
author | Nathan Binkert <binkertn@umich.edu> | 2006-12-21 15:49:16 -0800 |
---|---|---|
committer | Nathan Binkert <binkertn@umich.edu> | 2006-12-21 15:49:16 -0800 |
commit | 2cb2b508020bfcdaccbf7225f621bcdfd330c7bd (patch) | |
tree | 65132feaedf13591442d04e53e63bffe161e8955 /src/sim/main.cc | |
parent | 9aecfb3e3bfe1b85db9468bad287f22a2eb9bd4e (diff) | |
download | gem5-2cb2b508020bfcdaccbf7225f621bcdfd330c7bd.tar.xz |
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
Diffstat (limited to 'src/sim/main.cc')
-rw-r--r-- | src/sim/main.cc | 9 |
1 files changed, 2 insertions, 7 deletions
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()"); |