Merge with head.

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

diff --git a/src/base/traceflags.py b/src/base/traceflags.py
index dd5ade5afb0da446f636c708910be24244ea0657..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',
@@ -77,6 +78,20 @@ baseFlags = [
     'EthernetPIO',
     'EthernetSM',
     'Event',
+    'ExecEnable',
+    'ExecCPSeq',
+    'ExecEffAddr',
+    'ExecFetchSeq',
+    'ExecIntRegs',
+    'ExecIntel',
+    'ExecLegion',
+    'ExecOpClass',
+    'ExecRegDelta',
+    'ExecResult',
+    'ExecSpeculative',
+    'ExecSymbol',
+    'ExecThread',
+    'ExecTicks',
     'FE',
     'Fault',
     'Fetch',
@@ -102,7 +117,7 @@ baseFlags = [
     'ISP',
     'IdeCtrl',
     'IdeDisk',
-    'InstExec',
+    'Iob',
     'Interrupt',
     'LLSC',
     'LSQ',
@@ -114,6 +129,8 @@ baseFlags = [
     'Mbox',
     'MemDepUnit',
     'MemoryAccess',
+    'MemTest',
+    'MipsPRA',
     'O3CPU',
     'OzoneCPU',
     'OzoneLSQ',
@@ -123,6 +140,7 @@ baseFlags = [
     'PciConfigAll',
     'Pipeline',
     'Printf',
+    'Predecoder',
     'Quiesce',
     'ROB',
     'Regs',
@@ -155,6 +173,7 @@ baseFlags = [
     'VtoPhys',
     'WriteBarrier',
     'Writeback',
+    'X86',
     ]
 
 #
@@ -173,6 +192,9 @@ compoundFlagMap = {
                          'EthernetSM', 'EthernetCksum' ],
     'EthernetNoData' : [ 'Ethernet', 'EthernetPIO', 'EthernetDesc',
                          'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
+    'Exec'           : [ 'ExecEnable', 'ExecTicks', 'ExecOpClass',
+                         'ExecThread', 'ExecEffAddr', 'ExecResult',
+                         'ExecSymbol' ],
     'GDBAll'         : [ 'GDBMisc', 'GDBAcc', 'GDBRead', 'GDBWrite', 'GDBSend',
                          'GDBRecv', 'GDBExtra' ],
     'IdeAll'         : [ 'IdeCtrl', 'IdeDisk' ],
@@ -237,7 +259,7 @@ def gen_hh(filename):
     print >>hhfile, '''
         // The remaining enum values are *not* valid indices for Trace::flags.
         // They are "compound" flags, which correspond to sets of base
-        // flags, and are used only by TraceParamContext::setFlags().
+        // flags, and are used by changeFlag.
     ''',
 
     for flag in compoundFlags:
@@ -262,7 +284,7 @@ def gen_hh(filename):
     /* namespace Trace */ }
 
     #endif // __BASE_TRACE_FLAGS_HH__
-    ''',
+    \n''',
 
     hhfile.close()
 
@@ -331,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')