Merge with head.

[gem5.git] / src / base / traceflags.py

diff --git a/src/base/traceflags.py b/src/base/traceflags.py
index a36db19636a06c8da7700bc712086bb15e38d473..8573eb9bf191b28487518c7ed8b5be080c928d12 100644 (file)
--- a/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@ -47,6 +47,7 @@ baseFlags = [
     'BusBridge',
     'Cache',
     'CachePort',
+    'CacheRepl',
     'Chains',
     'Checker',
     'Clock',
@@ -128,6 +129,8 @@ baseFlags = [
     'Mbox',
     'MemDepUnit',
     'MemoryAccess',
+    'MemTest',
+    'MipsPRA',
     'O3CPU',
     'OzoneCPU',
     'OzoneLSQ',
@@ -137,6 +140,7 @@ baseFlags = [
     'PciConfigAll',
     'Pipeline',
     'Printf',
+    'Predecoder',
     'Quiesce',
     'ROB',
     'Regs',
@@ -349,16 +353,3 @@ const char *Trace::flagStrings[] =
     print >>ccfile, '};'
 
     ccfile.close()
-
-if __name__ == '__main__':
-    # This file generates the header and source files for the flags
-    # that control the tracing facility.
-
-    import sys
-
-    if len(sys.argv) != 2:
-        print "%s: Need argument (basename of cc/hh files)" % sys.argv[0]
-        sys.exit(1)
-
-    gen_hh(sys.argv[1] + '.hh')
-    gen_cc(sys.argv[1] + '.cc')