summaryrefslogtreecommitdiff
path: root/src/sim/main.cc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-11-14 15:23:23 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-11-14 15:23:23 -0500
commitac2c7967f69e3ffd29a1ed04a15838073dc060de (patch)
treed24dc27dcb11414775d2971b645ef4a6fbb922d9 /src/sim/main.cc
parentbc4d15ddd199420d2201fd0e8bde399e51ea0d3d (diff)
parent2f6a9454d13e44faba55b14d958f20a04bc36246 (diff)
downloadgem5-ac2c7967f69e3ffd29a1ed04a15838073dc060de.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops --HG-- extra : convert_revision : 966246877ac1f1e6c2675d413b0b405cccfecbeb
Diffstat (limited to 'src/sim/main.cc')
-rw-r--r--src/sim/main.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sim/main.cc b/src/sim/main.cc
index 6037283a4..17209ac20 100644
--- a/src/sim/main.cc
+++ b/src/sim/main.cc
@@ -119,6 +119,7 @@ abortHandler(int sigtype)
extern "C" {
void init_main();
+void init_debug();
}
int
@@ -157,8 +158,9 @@ main(int argc, char **argv)
Py_Initialize();
PySys_SetArgv(argc, argv);
- // initialize SWIG 'm5.internal.main' module
+ // initialize SWIG modules
init_main();
+ init_debug();
PyRun_SimpleString("import m5.main");
PyRun_SimpleString("m5.main.main()");