Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : f12cecd1359770061b52e9f57f2aaa809e61115c
This commit is contained in:
Steve Reinhardt 2005-06-04 23:08:49 -04:00
commit b6fa376790

View file

@ -34,14 +34,14 @@ if 'SYSTEM' not in env:
if env['SYSTEM'] == 'Simple':
from SimpleConfig import *
BaseCPU.workload = parent.workload
BaseCPU.workload = Parent.workload
SimpleStandAlone.cpu = [ CPU() for i in xrange(int(env['NP'])) ]
root = SimpleStandAlone
root = SimpleStandAlone()
elif env['SYSTEM'] == 'Detailed':
from DetailedConfig import *
BaseCPU.workload = parent.workload
BaseCPU.workload = Parent.workload
DetailedStandAlone.cpu = [ DetailedCPU() for i in xrange(int(env['NP'])) ]
root = DetailedStandAlone
root = DetailedStandAlone()
else:
panic("The SYSTEM environment variable was set to something improper.\n Use Simple or Detailed\n")