changeset 67a6ea624776 in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=67a6ea624776 description: traceflags: fix --trace-help
diffstat: 3 files changed, 19 insertions(+), 18 deletions(-) src/python/m5/main.py | 13 ------------- src/python/m5/trace.py | 11 ++++++----- src/python/m5/util/__init__.py | 13 +++++++++++++ diffs (73 lines): diff -r 98f6215dffce -r 67a6ea624776 src/python/m5/main.py --- a/src/python/m5/main.py Sun Feb 15 20:38:49 2009 -0800 +++ b/src/python/m5/main.py Sun Feb 15 20:39:12 2009 -0800 @@ -38,19 +38,6 @@ __all__ = [ 'options', 'arguments', 'main' ] -def print_list(items, indent=4): - line = ' ' * indent - for i,item in enumerate(items): - if len(line) + len(item) > 76: - print line - line = ' ' * indent - - if i < len(items) - 1: - line += '%s, ' % item - else: - line += item - print line - usage="%prog [m5 options] script.py [script options]" version="%prog 2.0" brief_copyright=''' diff -r 98f6215dffce -r 67a6ea624776 src/python/m5/trace.py --- a/src/python/m5/trace.py Sun Feb 15 20:38:49 2009 -0800 +++ b/src/python/m5/trace.py Sun Feb 15 20:39:12 2009 -0800 @@ -28,6 +28,7 @@ import internal import traceflags as flags +import util from internal.trace import clear, output, set, ignore @@ -36,13 +37,13 @@ def help(): print "Base Flags:" - for flag in trace.flags.basic: - print " %s: %s" % (flag, trace.flags.descriptions[flag]) + for flag in flags.basic: + print " %s: %s" % (flag, flags.descriptions[flag]) print print "Compound Flags:" - for flag in trace.flags.compound: + for flag in flags.compound: if flag == 'All': continue - print " %s: %s" % (flag, trace.flags.descriptions[flag]) - print_list(trace.flags.compoundMap[flag], indent=8) + print " %s: %s" % (flag, flags.descriptions[flag]) + util.print_list(flags.compoundMap[flag], indent=8) print diff -r 98f6215dffce -r 67a6ea624776 src/python/m5/util/__init__.py --- a/src/python/m5/util/__init__.py Sun Feb 15 20:38:49 2009 -0800 +++ b/src/python/m5/util/__init__.py Sun Feb 15 20:39:12 2009 -0800 @@ -30,3 +30,16 @@ from misc import * from multidict import multidict import jobfile + +def print_list(items, indent=4): + line = ' ' * indent + for i,item in enumerate(items): + if len(line) + len(item) > 76: + print line + line = ' ' * indent + + if i < len(items) - 1: + line += '%s, ' % item + else: + line += item + print line _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev