1 files changed, 9 insertions, 38 deletions

diff --git a/src/base/traceflags.py b/src/base/traceflags.py
index 3b7dd0f81..9797e4cb7 100644
--- a/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@ -103,49 +103,19 @@ baseFlags = [
     'IdeDisk',
     'InstExec',
     'Interrupt',
-    'LDSTQ',
+    'LSQ',
+    'LSQUnit',
     'Loader',
     'MC146818',
     'MMU',
     'MSHR',
     'Mbox',
     'MemDepUnit',
-    'OoOCPU',
-    'PCEvent',
-    'PCIA',
-    'PCIDEV',
-    'PciConfigAll',
-    'Pipeline',
-    'Printf',
-    'ROB',
-    'Regs',
-    'Rename',
-    'RenameMap',
-    'SQL',
-    'Sampler',
-    'ScsiCtrl',
-    'ScsiDisk',
-    'ScsiNone',
-    'Serialize',
-    'SimpleCPU',
-    'SimpleDisk',
-    'SimpleDiskData',
-    'Sparc',
-    'Split',
-    'Stack',
-    'StatEvents',
-    'Stats',
-    'StoreSet',
-    'Syscall',
-    'SyscallVerbose',
-    'TCPIP',
-    'TLB',
-    'Thread',
-    'Timer',
-    'Tsunami',
-    'Uart',
-    'VtoPhys',
-    'WriteBarrier',
+    'OzoneCPU',
+    'FE',
+    'IBE',
+    'BE',
+    'OzoneLSQ',
     ]
 
 #
@@ -163,7 +133,8 @@ compoundFlagMap = {
     'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' , 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
     'EthernetNoData' : [ 'Ethernet', 'EthernetPIO', 'EthernetDesc', 'EthernetIntr', 'EthernetSM', 'EthernetCksum' ],
     'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ],
-    'FullCPUAll' : [ 'Fetch', 'Decode', 'Rename', 'IEW', 'Commit', 'IQ', 'ROB', 'FreeList', 'RenameMap', 'LDSTQ', 'StoreSet', 'MemDepUnit', 'DynInst', 'FullCPU']
+    'FullCPUAll' : [ 'Fetch', 'Decode', 'Rename', 'IEW', 'Commit', 'IQ', 'ROB', 'FreeList', 'RenameMap', 'LSQ', 'LSQUnit', 'StoreSet', 'MemDepUnit', 'DynInst', 'FullCPU', 'Activity','Scoreboard','Writeback'],
+    'OzoneCPUAll' : [ 'BE', 'FE', 'IBE', 'OzoneLSQ', 'OzoneCPU']
 }
 
 #############################################################