summaryrefslogtreecommitdiff
path: root/src/cpu/cpu_models.py
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-07-06 12:19:29 -0400
committerKorey Sewell <ksewell@umich.edu>2006-07-06 12:19:29 -0400
commita35898c18d1a86707252a9502966b9c384b454f3 (patch)
treecb89ee2569c27889c67668bba2e920208cd13124 /src/cpu/cpu_models.py
parenteceba1405a70db1a1bc5538af99baca8fef422b6 (diff)
parent03fa13b27ce461886dceef82af0d3e994b5b9288 (diff)
downloadgem5-a35898c18d1a86707252a9502966b9c384b454f3.tar.xz
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3 --HG-- extra : convert_revision : 2f08ea52ef54118d42aa590c0d86aa0cc7988713
Diffstat (limited to 'src/cpu/cpu_models.py')
-rw-r--r--src/cpu/cpu_models.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/cpu/cpu_models.py b/src/cpu/cpu_models.py
index 1add32745..5b0c6c4da 100644
--- 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' })