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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user