diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-14 15:23:23 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-14 15:23:23 -0500 |
| commit | ac2c7967f69e3ffd29a1ed04a15838073dc060de (patch) | |
| tree | d24dc27dcb11414775d2971b645ef4a6fbb922d9 /src/python/m5 | |
| parent | bc4d15ddd199420d2201fd0e8bde399e51ea0d3d (diff) | |
| parent | 2f6a9454d13e44faba55b14d958f20a04bc36246 (diff) | |
| download | gem5-ac2c7967f69e3ffd29a1ed04a15838073dc060de.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : 966246877ac1f1e6c2675d413b0b405cccfecbeb
Diffstat (limited to 'src/python/m5')
| -rw-r--r-- | src/python/m5/main.py | 3 | ||||
| -rw-r--r-- | src/python/m5/objects/Root.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/python/m5/main.py b/src/python/m5/main.py index 1e224c0cf..114c668a6 100644 --- a/src/python/m5/main.py +++ b/src/python/m5/main.py @@ -275,7 +275,8 @@ def main(): objects.Statistics.text_file = options.stats_file # set debugging options - objects.Debug.break_cycles = options.debug_break + for when in options.debug_break: + internal.debug.schedBreakCycle(int(when)) # set tracing options objects.Trace.flags = options.trace_flags diff --git a/src/python/m5/objects/Root.py b/src/python/m5/objects/Root.py index 8e8d87f6d..b6123f192 100644 --- a/src/python/m5/objects/Root.py +++ b/src/python/m5/objects/Root.py @@ -5,7 +5,6 @@ from Serialize import Statreset from Statistics import Statistics from Trace import Trace from ExeTrace import ExecutionTrace -from Debug import Debug class Root(SimObject): type = 'Root' @@ -22,4 +21,3 @@ class Root(SimObject): trace = Trace() exetrace = ExecutionTrace() serialize = Serialize() - debug = Debug() |