diff options
| author | Nathan Binkert <nate@binkert.org> | 2011-04-15 10:44:59 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2011-04-15 10:44:59 -0700 |
| commit | 8c97726266a83fda31f8a68860157f195d7466ea (patch) | |
| tree | e5d0a6a412003a26a3d57b20cf3717e123640f8f /src/python/m5/simulate.py | |
| parent | 3182913e94674fcd101ec01c7ffb8245ec3046f8 (diff) | |
| download | gem5-8c97726266a83fda31f8a68860157f195d7466ea.tar.xz | |
python: cleanup python code so stuff doesn't automatically happen at startup
this allows things to be overridden at startup (e.g. for tests)
Diffstat (limited to 'src/python/m5/simulate.py')
| -rw-r--r-- | src/python/m5/simulate.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py index cbcc00497..184c2c6f7 100644 --- a/src/python/m5/simulate.py +++ b/src/python/m5/simulate.py @@ -36,7 +36,6 @@ import sys import internal import core import stats -from main import options import SimObject import ticks import objects @@ -48,6 +47,8 @@ MaxTick = 2**63 - 1 # The final hook to generate .ini files. Called from the user script # once the config is built. def instantiate(ckpt_dir=None): + from main import options + root = objects.Root.getInstance() if not root: |