Fix the CheckerCPU being included via python.
src/arch/SConscript: Fixes for including the CheckerCPU if it's specified via command line. Previously the env variable was actually being modified. src/cpu/SConscript: Copy the CPU_MODELS from the env, don't create a proxy to it. --HG-- extra : convert_revision : 7d069bd93a6834ccaa1c378b2bc76dce76745c19
This commit is contained in:
parent
6dfaf06edf
commit
40ebf0811a
2 changed files with 11 additions and 3 deletions
|
@ -140,8 +140,15 @@ def isa_desc_emitter(target, source, env):
|
||||||
|
|
||||||
# Pieces are in place, so create the builder.
|
# Pieces are in place, so create the builder.
|
||||||
python = sys.executable # use same Python binary used to run scons
|
python = sys.executable # use same Python binary used to run scons
|
||||||
isa_desc_builder = Builder(action=python + ' $SOURCES $TARGET.dir $CPU_MODELS',
|
|
||||||
emitter = isa_desc_emitter)
|
# Also include the CheckerCPU as one of the models if it is being
|
||||||
|
# enabled via command line.
|
||||||
|
if env['USE_CHECKER']:
|
||||||
|
isa_desc_builder = Builder(action=python + ' $SOURCES $TARGET.dir $CPU_MODELS CheckerCPU',
|
||||||
|
emitter = isa_desc_emitter)
|
||||||
|
else:
|
||||||
|
isa_desc_builder = Builder(action=python + ' $SOURCES $TARGET.dir $CPU_MODELS',
|
||||||
|
emitter = isa_desc_emitter)
|
||||||
|
|
||||||
env.Append(BUILDERS = { 'ISADesc' : isa_desc_builder })
|
env.Append(BUILDERS = { 'ISADesc' : isa_desc_builder })
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,8 @@ virtual Fault completeAcc(uint8_t *data, %s *xc, Trace::InstRecord *traceData) c
|
||||||
# Generate a temporary CPU list, including the CheckerCPU if
|
# Generate a temporary CPU list, including the CheckerCPU if
|
||||||
# it's enabled. This isn't used for anything else other than StaticInst
|
# it's enabled. This isn't used for anything else other than StaticInst
|
||||||
# headers.
|
# headers.
|
||||||
temp_cpu_list = env['CPU_MODELS']
|
temp_cpu_list = env['CPU_MODELS'][:]
|
||||||
|
|
||||||
if env['USE_CHECKER']:
|
if env['USE_CHECKER']:
|
||||||
temp_cpu_list.append('CheckerCPU')
|
temp_cpu_list.append('CheckerCPU')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue