diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/alpha_linux_process.cc | 4 | ||||
| -rw-r--r-- | arch/alpha/alpha_tru64_process.cc | 4 | ||||
| -rw-r--r-- | arch/alpha/arguments.cc | 2 | ||||
| -rw-r--r-- | arch/alpha/ev5.cc | 4 | ||||
| -rw-r--r-- | arch/alpha/isa_desc | 2 | ||||
| -rw-r--r-- | arch/alpha/pseudo_inst.cc | 4 | ||||
| -rw-r--r-- | arch/alpha/vtophys.cc | 2 | ||||
| -rwxr-xr-x | arch/isa_parser.py | 10 |
8 files changed, 16 insertions, 16 deletions
diff --git a/arch/alpha/alpha_linux_process.cc b/arch/alpha/alpha_linux_process.cc index 07bd5e800..09039db90 100644 --- a/arch/alpha/alpha_linux_process.cc +++ b/arch/alpha/alpha_linux_process.cc @@ -34,9 +34,9 @@ #include <sys/types.h> #include <unistd.h> -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "cpu/exec_context.hh" -#include "mem/functional_mem/functional_memory.hh" +#include "mem/functional/functional.hh" #include "sim/fake_syscall.hh" #include "sim/host.hh" #include "sim/process.hh" diff --git a/arch/alpha/alpha_tru64_process.cc b/arch/alpha/alpha_tru64_process.cc index 4d73e711f..ab8558182 100644 --- a/arch/alpha/alpha_tru64_process.cc +++ b/arch/alpha/alpha_tru64_process.cc @@ -44,9 +44,9 @@ #include "arch/alpha/alpha_common_syscall_emul.hh" #include "arch/alpha/alpha_tru64_process.hh" #include "base/trace.hh" -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "cpu/exec_context.hh" -#include "mem/functional_mem/functional_memory.hh" +#include "mem/functional/functional.hh" #include "sim/fake_syscall.hh" #include "sim/host.hh" #include "sim/process.hh" diff --git a/arch/alpha/arguments.cc b/arch/alpha/arguments.cc index 905d6b9ae..392f842fe 100644 --- a/arch/alpha/arguments.cc +++ b/arch/alpha/arguments.cc @@ -29,7 +29,7 @@ #include "arch/alpha/arguments.hh" #include "arch/alpha/vtophys.hh" #include "cpu/exec_context.hh" -#include "mem/functional_mem/physical_memory.hh" +#include "mem/functional/physical.hh" AlphaArguments::Data::~Data() { diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc index d75f4a865..9dcc9cab1 100644 --- a/arch/alpha/ev5.cc +++ b/arch/alpha/ev5.cc @@ -6,9 +6,9 @@ #include "base/kgdb.h" #include "base/remote_gdb.hh" #include "base/stats/events.hh" -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "cpu/exec_context.hh" -#include "cpu/fast_cpu/fast_cpu.hh" +#include "cpu/fast/cpu.hh" #include "kern/kernel_stats.hh" #include "sim/debug.hh" #include "sim/sim_events.hh" diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc index 0e07400d3..02b9bfa09 100644 --- a/arch/alpha/isa_desc +++ b/arch/alpha/isa_desc @@ -41,7 +41,7 @@ output exec {{ #ifdef FULL_SYSTEM #include "arch/alpha/pseudo_inst.hh" #endif -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "cpu/exetrace.hh" #include "sim/sim_exit.hh" }}; diff --git a/arch/alpha/pseudo_inst.cc b/arch/alpha/pseudo_inst.cc index a4af891af..ff34aa19d 100644 --- a/arch/alpha/pseudo_inst.cc +++ b/arch/alpha/pseudo_inst.cc @@ -35,8 +35,8 @@ #include "arch/alpha/pseudo_inst.hh" #include "arch/alpha/vtophys.hh" -#include "cpu/base_cpu.hh" -#include "cpu/sampling_cpu/sampling_cpu.hh" +#include "cpu/base.hh" +#include "cpu/sampler/sampler.hh" #include "cpu/exec_context.hh" #include "kern/kernel_stats.hh" #include "sim/param.hh" diff --git a/arch/alpha/vtophys.cc b/arch/alpha/vtophys.cc index e26721aab..b87842f49 100644 --- a/arch/alpha/vtophys.cc +++ b/arch/alpha/vtophys.cc @@ -31,7 +31,7 @@ #include "arch/alpha/vtophys.hh" #include "base/trace.hh" #include "cpu/exec_context.hh" -#include "mem/functional_mem/physical_memory.hh" +#include "mem/functional/physical.hh" using namespace std; diff --git a/arch/isa_parser.py b/arch/isa_parser.py index 0d1320ccc..d5cdd348b 100755 --- a/arch/isa_parser.py +++ b/arch/isa_parser.py @@ -628,16 +628,16 @@ class CpuModel: # CPU-model-specific information in this file. Note that the ISA # description itself should have *no* CPU-model-specific content. 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 |