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:
@@ -30,11 +30,11 @@
|
||||
import sys, os, time, atexit, optparse
|
||||
|
||||
# import the SWIG-wrapped main C++ functions
|
||||
import main
|
||||
import cc_main
|
||||
# import a few SWIG-wrapped items (those that are likely to be used
|
||||
# directly by user scripts) completely into this module for
|
||||
# convenience
|
||||
from main import simulate, SimLoopExitEvent
|
||||
from cc_main import simulate, SimLoopExitEvent
|
||||
|
||||
# import the m5 compile options
|
||||
import defines
|
||||
@@ -70,7 +70,7 @@ def setStandardOptions(_options):
|
||||
global options
|
||||
options = _options
|
||||
# tell C++ about output directory
|
||||
main.setOutputDir(options.outdir)
|
||||
cc_main.setOutputDir(options.outdir)
|
||||
|
||||
# Callback to set trace flags. Not necessarily the best way to do
|
||||
# things in the long run (particularly if we change how these global
|
||||
@@ -206,10 +206,10 @@ def instantiate(root):
|
||||
root.print_ini()
|
||||
sys.stdout.close() # close config.ini
|
||||
sys.stdout = sys.__stdout__ # restore to original
|
||||
main.loadIniFile(resolveSimObject) # load config.ini into C++
|
||||
cc_main.loadIniFile(resolveSimObject) # load config.ini into C++
|
||||
root.createCCObject()
|
||||
root.connectPorts()
|
||||
main.finalInit()
|
||||
cc_main.finalInit()
|
||||
noDot = True # temporary until we fix dot
|
||||
if not noDot:
|
||||
dot = pydot.Dot()
|
||||
@@ -223,10 +223,10 @@ def instantiate(root):
|
||||
|
||||
# Export curTick to user script.
|
||||
def curTick():
|
||||
return main.cvar.curTick
|
||||
return cc_main.cvar.curTick
|
||||
|
||||
# register our C++ exit callback function with Python
|
||||
atexit.register(main.doExitCleanup)
|
||||
atexit.register(cc_main.doExitCleanup)
|
||||
|
||||
# This import allows user scripts to reference 'm5.objects.Foo' after
|
||||
# just doing an 'import m5' (without an 'import m5.objects'). May not
|
||||
|
||||
Reference in New Issue
Block a user