summaryrefslogtreecommitdiff
path: root/arch/isa_parser.py
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-02-21 22:06:18 -0500
committerKorey Sewell <ksewell@umich.edu>2006-02-21 22:06:18 -0500
commit37cd6695ebdf37d6806fbb8764cfef30dce4688f (patch)
treeb447226b257e27abe166e2aa63603d7d7b4f800a /arch/isa_parser.py
parent8d80fd1477fa39ebc5bad4ca5c727b2871fd9b8d (diff)
parenta4799a89ded3b2ebddd682dbcb0f8d2dd968b68a (diff)
downloadgem5-37cd6695ebdf37d6806fbb8764cfef30dce4688f.tar.xz
Merge zizzer:/bk/multiarch
into zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/multiarch --HG-- rename : arch/alpha/alpha_memory.cc => arch/alpha/memory.cc rename : arch/alpha/alpha_memory.hh => arch/alpha/memory.hh extra : convert_revision : c641ba3c1009829b7276279b2dca441be1da5b30
Diffstat (limited to 'arch/isa_parser.py')
-rwxr-xr-xarch/isa_parser.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/isa_parser.py b/arch/isa_parser.py
index b92d267c9..7c511a8b3 100755
--- a/arch/isa_parser.py
+++ b/arch/isa_parser.py
@@ -745,9 +745,10 @@ CpuModel('FastCPU', 'fast_cpu_exec.cc',
CpuModel('FullCPU', 'full_cpu_exec.cc',
'#include "encumbered/cpu/full/dyn_inst.hh"',
{ 'CPU_exec_context': 'DynInst' })
-CpuModel('AlphaFullCPU', 'alpha_o3_exec.cc',
- '#include "cpu/o3/alpha_dyn_inst.hh"',
- { 'CPU_exec_context': 'AlphaDynInst<AlphaSimpleImpl>' })
+
+#CpuModel('AlphaFullCPU', 'alpha_o3_exec.cc',
+# '#include "cpu/o3/alpha_dyn_inst.hh"',
+# { 'CPU_exec_context': 'AlphaDynInst<AlphaSimpleImpl>' })
# Expand template with CPU-specific references into a dictionary with
# an entry for each CPU model name. The entry key is the model name