From 475a981f6e9bdff9436ad0ecf34f83ead5a63498 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 22 May 2006 22:18:08 -0400
Subject: [PATCH] Get rid of FastCPU model. It doesn't compile, and if we
 really want this we should start over from scratch and see if we can reuse
 parts from BaseSimpleCPU (e.g., derive a FastSimpleCPU).

SConstruct:
src/arch/SConscript:
src/cpu/cpu_models.py:
    Get rid of FastCPU model.

--HG--
extra : convert_revision : f3f0362f7292bf21e8e0d4d84c475be8a9789a0c
---
 SConstruct            | 2 +-
 src/arch/SConscript   | 2 +-
 src/cpu/cpu_models.py | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index bcbc8f1fff..5f01c6a530 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 06b8e8ddef..9c193207f4 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 30cbabde1d..8d0a15f611 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' })