summaryrefslogtreecommitdiff
path: root/src/sim
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-06-17 12:08:19 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-06-17 12:08:19 -0400
commitd96d28e56d39eec0baa1377779119495cfbf4701 (patch)
tree7da6fec697a03fcdb02d37fda59c70719137890f /src/sim
parent4a9c0a7dfc8aa1fcd70ec2b194691adec9ce424e (diff)
downloadgem5-d96d28e56d39eec0baa1377779119495cfbf4701.tar.xz
Rename SWIG "main" module to "cc_main" so it's
clear from the Python side that this is the interface to C++. src/SConscript: main_wrap.cc -> cc_main_wrap.cc src/python/SConscript: src/python/m5/__init__.py: src/sim/main.cc: s/main/cc_main/ src/python/m5/config.py: s/main/cc_main/ Also directly import cc_main so we don't need to put the "m5." in front all the time. --HG-- extra : convert_revision : 755552f70cf671881ff31e476c677b95ef12950d
Diffstat (limited to 'src/sim')
-rw-r--r--src/sim/main.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sim/main.cc b/src/sim/main.cc
index fc057ea6f..7a0fbfa61 100644
--- a/src/sim/main.cc
+++ b/src/sim/main.cc
@@ -166,7 +166,7 @@ sayHello(ostream &out)
}
-extern "C" { void init_main(); }
+extern "C" { void init_cc_main(); }
int
main(int argc, char **argv)
@@ -258,8 +258,8 @@ main(int argc, char **argv)
Py_Initialize();
PySys_SetArgv(argc, argv);
- // initialize SWIG 'main' module
- init_main();
+ // initialize SWIG 'cc_main' module
+ init_cc_main();
if (argc > 0) {
// extra arg(s): first is script file, remaining ones are args