diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-15 11:46:13 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-15 11:46:13 -0400 |
commit | f06d508af0ff78d7fc0e774d658cb6aedf330635 (patch) | |
tree | 1d400914f66e9ec03e34ad12a3989d3bad147d02 /src/python/m5/__init__.py | |
parent | 74b9868c786a8c58ef8fe65bebd2fd8e9573d0be (diff) | |
parent | 88e22ee081f1b0259b624fe320af22a58f144251 (diff) | |
download | gem5-f06d508af0ff78d7fc0e774d658cb6aedf330635.tar.xz |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision : 8a1cd7ff43aa4ebbfce0ff174d2f4ba3f095dd47
Diffstat (limited to 'src/python/m5/__init__.py')
-rw-r--r-- | src/python/m5/__init__.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index 2d4825b0e..f849a899b 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -103,6 +103,12 @@ build_env.update(defines.m5_build_env) env = smartdict.SmartDict() env.update(os.environ) + +# Function to provide to C++ so it can look up instances based on paths +def resolveSimObject(name): + obj = config.instanceDict[name] + return obj.getCCObject() + # The final hook to generate .ini files. Called from the user script # once the config is built. def instantiate(root): @@ -112,7 +118,10 @@ def instantiate(root): root.print_ini() sys.stdout.close() # close config.ini sys.stdout = sys.__stdout__ # restore to original - main.initialize() # load config.ini into C++ and process it + main.loadIniFile(resolveSimObject) # load config.ini into C++ + root.createCCObject() + root.connectPorts() + main.finalInit() noDot = True # temporary until we fix dot if not noDot: dot = pydot.Dot() |