Merge zizzer.eecs.umich.edu:/bk/newmem/

into  zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops

--HG--
extra : convert_revision : 966246877ac1f1e6c2675d413b0b405cccfecbeb

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

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()