diff options
author | Nathan Binkert <binkertn@umich.edu> | 2005-02-02 21:13:01 -0500 |
---|---|---|
committer | Nathan Binkert <binkertn@umich.edu> | 2005-02-02 21:13:01 -0500 |
commit | a736a8fab6dd1ae0d5546939bc0c7fc4aec003e8 (patch) | |
tree | 8843b82f22ad52deb3b85599cca52b93b6367c35 /test/genini.py | |
parent | 45bb2bf14d501f4ccab0bb399f53f8b35f8c82e6 (diff) | |
download | gem5-a736a8fab6dd1ae0d5546939bc0c7fc4aec003e8.tar.xz |
Update config file language to take simobj and no longer use siminst
objects/AlphaConsole.mpy:
objects/AlphaTLB.mpy:
objects/BadDevice.mpy:
objects/BaseCPU.mpy:
objects/BaseCache.mpy:
objects/BaseSystem.mpy:
objects/Bus.mpy:
objects/CoherenceProtocol.mpy:
objects/Device.mpy:
objects/DiskImage.mpy:
objects/Ethernet.mpy:
objects/Ide.mpy:
objects/IntrControl.mpy:
objects/MemTest.mpy:
objects/Pci.mpy:
objects/PhysicalMemory.mpy:
objects/Platform.mpy:
objects/Process.mpy:
objects/Repl.mpy:
objects/Root.mpy:
objects/SimConsole.mpy:
objects/SimpleDisk.mpy:
objects/Tsunami.mpy:
objects/Uart.mpy:
simobj now requires a type= line if it is actually intended
to be a type
sim/pyconfig/SConscript:
keep track of the filename of embedded files for better
error messages.
sim/pyconfig/m5config.py:
Add support for the trickery done with the compiler to get the
simobj language feature added to the importer.
fix the bug that gave objects the wrong name in error messages.
test/genini.py:
Globals have been fixed and use execfile
--HG--
extra : convert_revision : b74495fd6f3479a87ecea7f1234ebb6731279b2b
Diffstat (limited to 'test/genini.py')
-rw-r--r-- | test/genini.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/genini.py b/test/genini.py index e96d7069c..db1a7a5b0 100644 --- a/test/genini.py +++ b/test/genini.py @@ -31,7 +31,7 @@ sys.path.append('..') sys.path.append('../configs/kernel') sys.path.append('../sim/pyconfig') -from importer import mpy_exec, AddToPath +from importer import mpy_exec, mpy_execfile, AddToPath from m5config import * try: @@ -51,7 +51,7 @@ except getopt.GetoptError: for arg in args: AddToPath(os.path.dirname(arg)) - mpy_exec(file(arg, 'r'), globals()) + mpy_execfile(arg) if globals().has_key('root') and isinstance(root, type) \ and issubclass(root, Root): |