diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | src/arch/SConscript | 2 | ||||
| -rw-r--r-- | src/cpu/cpu_models.py | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index bcbc8f1ff..5f01c6a53 100644 --- a/SConstruct +++ b/SConstruct @@ -199,7 +199,7 @@ env['ALL_ISA_LIST'] = ['alpha', 'sparc', 'mips'] # Define the universe of supported CPU models env['ALL_CPU_LIST'] = ['AtomicSimpleCPU', 'TimingSimpleCPU', - 'FastCPU', 'FullCPU', 'AlphaFullCPU'] + 'FullCPU', 'AlphaFullCPU'] # Sticky options get saved in the options file so they persist from # one invocation to the next (unless overridden, in which case the new diff --git a/src/arch/SConscript b/src/arch/SConscript index 06b8e8dde..9c193207f 100644 --- a/src/arch/SConscript +++ b/src/arch/SConscript @@ -132,7 +132,7 @@ def isa_desc_emitter(target, source, env): return (isa_desc_gen_files, [isa_parser, cpu_models_file] + source) # Pieces are in place, so create the builder. -isa_desc_builder = Builder(action='python $SOURCES $TARGET.dir $CPU_MODELS', +isa_desc_builder = Builder(action='python2.4 $SOURCES $TARGET.dir $CPU_MODELS', emitter = isa_desc_emitter) env.Append(BUILDERS = { 'ISADesc' : isa_desc_builder }) diff --git a/src/cpu/cpu_models.py b/src/cpu/cpu_models.py index 30cbabde1..8d0a15f61 100644 --- a/src/cpu/cpu_models.py +++ b/src/cpu/cpu_models.py @@ -62,9 +62,6 @@ CpuModel('AtomicSimpleCPU', 'atomic_simple_cpu_exec.cc', CpuModel('TimingSimpleCPU', 'timing_simple_cpu_exec.cc', '#include "cpu/simple/timing.hh"', { 'CPU_exec_context': 'TimingSimpleCPU' }) -CpuModel('FastCPU', 'fast_cpu_exec.cc', - '#include "cpu/fast/cpu.hh"', - { 'CPU_exec_context': 'FastCPU' }) CpuModel('FullCPU', 'full_cpu_exec.cc', '#include "encumbered/cpu/full/dyn_inst.hh"', { 'CPU_exec_context': 'DynInst' }) |