inorder-o3: allow both to compile together

allow InOrder and O3CPU to be compiled at the same time: need to make branch prediction filed shared by both models

src/cpu/SConscript

@@ -128,6 +128,13 @@ Source('simple_thread.cc')
 Source('thread_context.cc')
 Source('thread_state.cc')
 
+if 'InOrderCPU' in env['CPU_MODELS'] or 'O3CPU' in env['CPU_MODELS']:
+    Source('btb.cc')
+    Source('tournament_pred.cc')
+    Source('2bit_local_pred.cc')
+    Source('ras.cc')
+    TraceFlag('FreeList')
+
 if env['FULL_SYSTEM']:
     SimObject('IntrControl.py')
 

src/cpu/inorder/SConscript

@@ -35,7 +35,6 @@ if 'InOrderCPU' in env['CPU_MODELS']:
 	SimObject('InOrderTrace.py')
 
 	TraceFlag('ResReqCount')
-	TraceFlag('FreeList')
 	TraceFlag('InOrderStage')
 	TraceFlag('InOrderStall')
 	TraceFlag('InOrderCPU')
@@ -81,10 +80,6 @@ if 'InOrderCPU' in env['CPU_MODELS']:
 	Source('resources/mult_div_unit.cc')
 	Source('resource_pool.cc')
 	Source('reg_dep_map.cc')
-	Source('../o3/btb.cc')
-	Source('../o3/tournament_pred.cc')
-	Source('../o3/2bit_local_pred.cc')
-	Source('../o3/ras.cc')
 	Source('thread_context.cc')
 	Source('cpu.cc')
 

src/cpu/o3/SConscript

@@ -33,11 +33,6 @@ import sys
 Import('*')
 
 if 'O3CPU' in env['CPU_MODELS'] or 'OzoneCPU' in env['CPU_MODELS']:
-    Source('2bit_local_pred.cc')
-    Source('btb.cc')
-    Source('ras.cc')
-    Source('tournament_pred.cc')
-
     TraceFlag('CommitRate')
     TraceFlag('IEW')
     TraceFlag('IQ')
@@ -69,7 +64,6 @@ if 'O3CPU' in env['CPU_MODELS']:
     Source('store_set.cc')
     Source('thread_context.cc')
 
-    TraceFlag('FreeList')
     TraceFlag('LSQ')
     TraceFlag('LSQUnit')
     TraceFlag('MemDepUnit')