Merge zizzer:/bk/newmem

into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release

--HG--
extra : convert_revision : 9b5b1419e8e22bce16ed97fc02c2008ca0181afc

1 files changed, 24 insertions, 1 deletions

diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index 60a61d66e..2d4825b0e 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -64,11 +64,34 @@ def AddToPath(path):
 def setTraceFlags(option, opt_str, value, parser):
     objects.Trace.flags = value
 
+def setTraceStart(option, opt_str, value, parser):
+    objects.Trace.start = value
+
+def clearPCSymbol(option, opt_str, value, parser):
+    objects.ExecutionTrace.pc_symbol = False
+
+def clearPrintCycle(option, opt_str, value, parser):
+    objects.ExecutionTrace.print_cycle = False
+
+def statsTextFile(option, opt_str, value, parser):
+    objects.Statistics.text_file = value
+
 # Standard optparse options.  Need to be explicitly included by the
 # user script when it calls optparse.OptionParser().
 standardOptions = [
     optparse.make_option("--traceflags", type="string", action="callback",
-                         callback=setTraceFlags)
+                         callback=setTraceFlags),
+    optparse.make_option("--tracestart", type="int", action="callback",
+                         callback=setTraceStart),
+    optparse.make_option("--nopcsymbol", action="callback",
+                         callback=clearPCSymbol,
+                         help="Turn off printing PC symbols in trace output"),
+    optparse.make_option("--noprintcycle", action="callback",
+                         callback=clearPrintCycle,
+                         help="Turn off printing cycles in trace output"),
+    optparse.make_option("--statsfile", type="string", action="callback",
+                         callback=statsTextFile, metavar="FILE",
+                         help="Sets the output file for the statistics")
     ]
 
 # make a SmartDict out of the build options for our local use