diff options
| author | Nathan Binkert <nate@binkert.org> | 2011-04-20 18:45:03 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2011-04-20 18:45:03 -0700 |
| commit | 99fbd18ea53417eff0c2b5afd088022b3561c89e (patch) | |
| tree | 588eb96f7c763221202f732488169cc783984a01 /src/python | |
| parent | 41680f4bada2e3b0f8a030c76ecdb6a2aa778b2e (diff) | |
| download | gem5-99fbd18ea53417eff0c2b5afd088022b3561c89e.tar.xz | |
fix some build problems from prior changesets
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/m5/main.py | 5 | ||||
| -rw-r--r-- | src/python/m5/simulate.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/python/m5/main.py b/src/python/m5/main.py index cdaecc1cc..b0034c10d 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -144,6 +144,8 @@ def interact(scope): code.InteractiveConsole(scope).interact(banner) def main(*args): + import m5 + import core import debug import defines @@ -154,7 +156,6 @@ def main(*args): from util import fatal - global options if len(args) == 0: options, arguments = parse_options() elif len(args) == 2: @@ -162,6 +163,8 @@ def main(*args): else: raise TypeError, "main() takes 0 or 2 arguments (%d given)" % len(args) + m5.options = options + def check_tracing(): if defines.TRACING_ON: return diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py index 184c2c6f7..9a5dc836d 100644 --- a/src/python/m5/simulate.py +++ b/src/python/m5/simulate.py @@ -47,7 +47,7 @@ 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 + from m5 import options root = objects.Root.getInstance() |