Some touchup to the reorganized includes and "using" directives.

[gem5.git] / src / cpu / cpu_models.py

diff --git a/src/cpu/cpu_models.py b/src/cpu/cpu_models.py
index 1add327458b9eb0939d081a1d53739eff595d6d9..5b0c6c4dac12140effd383fecba23ab830f7bb46 100644 (file)
--- a/src/cpu/cpu_models.py
+++ b/src/cpu/cpu_models.py
@@ -79,18 +79,6 @@ CpuModel('OzoneCPU', 'ozone_exec.cc',
 CpuModel('CheckerCPU', 'checker_cpu_exec.cc',
          '#include "cpu/checker/cpu.hh"',
          { 'CPU_exec_context': 'CheckerCPU' })
-
-# Maybe there is a more clever way to determine ISA
-# here but since the environment variable isnt passed through
-# here the easiest way is this...
-sub_template = 'not found'
-for argument in sys.argv:
-    if 'ALPHA' in argument:
-        sub_template = 'AlphaDynInst<AlphaSimpleImpl>'
-
-if sub_template == 'not found':
-    sys.exit('NO CPU_exec_context substitution defined for this ISA')
-
 CpuModel('O3CPU', 'o3_cpu_exec.cc',
          '#include "cpu/o3/isa_specific.hh"',
-         { 'CPU_exec_context': sub_template })
+         { 'CPU_exec_context': 'O3DynInst' })