Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5/clean

[gem5.git] / arch / isa_parser.py

diff --git a/arch/isa_parser.py b/arch/isa_parser.py
index 8187cf1886d1c9fd67b65a1a9d9804c6f7d93b3a..d5cdd348b2a2e1be8111752589d7df19c42ce7a1 100755 (executable)
--- a/arch/isa_parser.py
+++ b/arch/isa_parser.py
@@ -627,20 +627,17 @@ class CpuModel:
 # Define CPU models.  The following lines should contain the only
 # CPU-model-specific information in this file.  Note that the ISA
 # description itself should have *no* CPU-model-specific content.
-CpuModel('InorderCPU', 'inorder_cpu_exec.cc',
-         '#include "cpu/inorder_cpu/inorder_cpu.hh"',
-         { 'CPU_exec_context': 'InorderCPU' })
 CpuModel('SimpleCPU', 'simple_cpu_exec.cc',
-         '#include "cpu/simple_cpu/simple_cpu.hh"',
+         '#include "cpu/simple/cpu.hh"',
          { 'CPU_exec_context': 'SimpleCPU' })
 CpuModel('FastCPU', 'fast_cpu_exec.cc',
-         '#include "cpu/fast_cpu/fast_cpu.hh"',
+         '#include "cpu/fast/cpu.hh"',
          { 'CPU_exec_context': 'FastCPU' })
 CpuModel('FullCPU', 'full_cpu_exec.cc',
-         '#include "cpu/full_cpu/dyn_inst.hh"',
+         '#include "encumbered/cpu/full/dyn_inst.hh"',
          { 'CPU_exec_context': 'DynInst' })
-CpuModel('AlphaFullCPU', 'alpha_full_cpu_exec.cc',
-         '#include "cpu/beta_cpu/alpha_dyn_inst.hh"',
+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