diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-09-04 17:14:07 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-09-04 17:14:07 -0700 |
| commit | c39aea440c884f0abb29ecc2293fd6df608bc00c (patch) | |
| tree | 21642bd3db3f2e10989cb6c5cf34892b9efe6267 /src/python/m5/__init__.py | |
| parent | 1233dbb9981ad27abeb22f9dcba20bd77abab041 (diff) | |
| download | gem5-c39aea440c884f0abb29ecc2293fd6df608bc00c.tar.xz | |
More Python hacking to deal with config.py split
and resulting recursive import trickiness.
--HG--
extra : convert_revision : 1ea93861eb8d260c9f3920dda0b8106db3e03705
Diffstat (limited to 'src/python/m5/__init__.py')
| -rw-r--r-- | src/python/m5/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py index bd2efac09..c37abbac9 100644 --- a/src/python/m5/__init__.py +++ b/src/python/m5/__init__.py @@ -71,8 +71,6 @@ build_env.update(defines.m5_build_env) env = smartdict.SmartDict() env.update(os.environ) -from main import options, arguments, main - # The final hook to generate .ini files. Called from the user script # once the config is built. def instantiate(root): @@ -206,5 +204,7 @@ def switchCpus(cpuList): # you can get the wrong result if foo is only partially imported # at the point you do that (i.e., because foo is in the middle of # importing *you*). +from main import options import objects import params +from SimObject import resolveSimObject |