summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-07-14 17:51:29 -0400
committerKevin Lim <ktlim@umich.edu>2006-07-14 17:51:29 -0400
commit40ebf0811a5cca1de50c71d5c56216bb37a756b3 (patch)
tree792f87776e45921b77faaa612b33f1ee82f980bd /src
parent6dfaf06edf53eb80af8d2a5b1722fb399cdb814d (diff)
downloadgem5-40ebf0811a5cca1de50c71d5c56216bb37a756b3.tar.xz
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
Diffstat (limited to 'src')
-rw-r--r--src/arch/SConscript11
-rw-r--r--src/cpu/SConscript3
2 files changed, 11 insertions, 3 deletions
diff --git a/src/arch/SConscript b/src/arch/SConscript
index bc517341a..0a5962889 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -140,8 +140,15 @@ def isa_desc_emitter(target, source, env):
# Pieces are in place, so create the builder.
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 })
diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index bc4ec7923..442c190ce 100644
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -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
# it's enabled. This isn't used for anything else other than StaticInst
# headers.
-temp_cpu_list = env['CPU_MODELS']
+temp_cpu_list = env['CPU_MODELS'][:]
+
if env['USE_CHECKER']:
temp_cpu_list.append('CheckerCPU')