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
This commit is contained in:
Korey Sewell
2009-05-12 15:01:14 -04:00
parent 5127ea226a
commit f41df0ee08
7 changed files with 7 additions and 11 deletions

View File

@@ -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')