From 13c005a8af79a8481879ce099b45a1f98faae165 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sat, 4 Jun 2005 20:50:10 -0400 Subject: shuffle files around for new directory structure --HG-- rename : cpu/base_cpu.cc => cpu/base.cc rename : cpu/base_cpu.hh => cpu/base.hh rename : cpu/beta_cpu/2bit_local_pred.cc => cpu/o3/2bit_local_pred.cc rename : cpu/beta_cpu/2bit_local_pred.hh => cpu/o3/2bit_local_pred.hh rename : cpu/beta_cpu/alpha_full_cpu.cc => cpu/o3/alpha_cpu.cc rename : cpu/beta_cpu/alpha_full_cpu.hh => cpu/o3/alpha_cpu.hh rename : cpu/beta_cpu/alpha_full_cpu_builder.cc => cpu/o3/alpha_cpu_builder.cc rename : cpu/beta_cpu/alpha_full_cpu_impl.hh => cpu/o3/alpha_cpu_impl.hh rename : cpu/beta_cpu/alpha_dyn_inst.cc => cpu/o3/alpha_dyn_inst.cc rename : cpu/beta_cpu/alpha_dyn_inst.hh => cpu/o3/alpha_dyn_inst.hh rename : cpu/beta_cpu/alpha_dyn_inst_impl.hh => cpu/o3/alpha_dyn_inst_impl.hh rename : cpu/beta_cpu/alpha_impl.hh => cpu/o3/alpha_impl.hh rename : cpu/beta_cpu/alpha_params.hh => cpu/o3/alpha_params.hh rename : cpu/beta_cpu/bpred_unit.cc => cpu/o3/bpred_unit.cc rename : cpu/beta_cpu/bpred_unit.hh => cpu/o3/bpred_unit.hh rename : cpu/beta_cpu/bpred_unit_impl.hh => cpu/o3/bpred_unit_impl.hh rename : cpu/beta_cpu/btb.cc => cpu/o3/btb.cc rename : cpu/beta_cpu/btb.hh => cpu/o3/btb.hh rename : cpu/beta_cpu/comm.hh => cpu/o3/comm.hh rename : cpu/beta_cpu/commit.cc => cpu/o3/commit.cc rename : cpu/beta_cpu/commit.hh => cpu/o3/commit.hh rename : cpu/beta_cpu/commit_impl.hh => cpu/o3/commit_impl.hh rename : cpu/beta_cpu/full_cpu.cc => cpu/o3/cpu.cc rename : cpu/beta_cpu/full_cpu.hh => cpu/o3/cpu.hh rename : cpu/beta_cpu/cpu_policy.hh => cpu/o3/cpu_policy.hh rename : cpu/beta_cpu/decode.cc => cpu/o3/decode.cc rename : cpu/beta_cpu/decode.hh => cpu/o3/decode.hh rename : cpu/beta_cpu/decode_impl.hh => cpu/o3/decode_impl.hh rename : cpu/beta_cpu/fetch.cc => cpu/o3/fetch.cc rename : cpu/beta_cpu/fetch.hh => cpu/o3/fetch.hh rename : cpu/beta_cpu/fetch_impl.hh => cpu/o3/fetch_impl.hh rename : cpu/beta_cpu/free_list.cc => cpu/o3/free_list.cc rename : cpu/beta_cpu/free_list.hh => cpu/o3/free_list.hh rename : cpu/beta_cpu/iew.cc => cpu/o3/iew.cc rename : cpu/beta_cpu/iew.hh => cpu/o3/iew.hh rename : cpu/beta_cpu/iew_impl.hh => cpu/o3/iew_impl.hh rename : cpu/beta_cpu/inst_queue.cc => cpu/o3/inst_queue.cc rename : cpu/beta_cpu/inst_queue.hh => cpu/o3/inst_queue.hh rename : cpu/beta_cpu/inst_queue_impl.hh => cpu/o3/inst_queue_impl.hh rename : cpu/beta_cpu/mem_dep_unit.cc => cpu/o3/mem_dep_unit.cc rename : cpu/beta_cpu/mem_dep_unit.hh => cpu/o3/mem_dep_unit.hh rename : cpu/beta_cpu/mem_dep_unit_impl.hh => cpu/o3/mem_dep_unit_impl.hh rename : cpu/beta_cpu/ras.cc => cpu/o3/ras.cc rename : cpu/beta_cpu/ras.hh => cpu/o3/ras.hh rename : cpu/beta_cpu/regfile.hh => cpu/o3/regfile.hh rename : cpu/beta_cpu/rename.cc => cpu/o3/rename.cc rename : cpu/beta_cpu/rename.hh => cpu/o3/rename.hh rename : cpu/beta_cpu/rename_impl.hh => cpu/o3/rename_impl.hh rename : cpu/beta_cpu/rename_map.cc => cpu/o3/rename_map.cc rename : cpu/beta_cpu/rename_map.hh => cpu/o3/rename_map.hh rename : cpu/beta_cpu/rob.cc => cpu/o3/rob.cc rename : cpu/beta_cpu/rob.hh => cpu/o3/rob.hh rename : cpu/beta_cpu/rob_impl.hh => cpu/o3/rob_impl.hh rename : cpu/beta_cpu/sat_counter.cc => cpu/o3/sat_counter.cc rename : cpu/beta_cpu/sat_counter.hh => cpu/o3/sat_counter.hh rename : cpu/beta_cpu/store_set.cc => cpu/o3/store_set.cc rename : cpu/beta_cpu/store_set.hh => cpu/o3/store_set.hh rename : cpu/beta_cpu/tournament_pred.cc => cpu/o3/tournament_pred.cc rename : cpu/beta_cpu/tournament_pred.hh => cpu/o3/tournament_pred.hh rename : cpu/ooo_cpu/ooo_cpu.cc => cpu/ozone/cpu.cc rename : cpu/ooo_cpu/ooo_cpu.hh => cpu/ozone/cpu.hh rename : cpu/ooo_cpu/ooo_impl.hh => cpu/ozone/cpu_impl.hh rename : cpu/ooo_cpu/ea_list.cc => cpu/ozone/ea_list.cc rename : cpu/ooo_cpu/ea_list.hh => cpu/ozone/ea_list.hh rename : cpu/simple_cpu/simple_cpu.cc => cpu/simple/cpu.cc rename : cpu/simple_cpu/simple_cpu.hh => cpu/simple/cpu.hh rename : cpu/full_cpu/smt.hh => cpu/smt.hh rename : cpu/full_cpu/op_class.hh => encumbered/cpu/full/op_class.hh extra : convert_revision : c4a891d8d6d3e0e9e5ea56be47d851da44d8c032 --- sim/eventq.cc | 2 +- sim/main.cc | 4 ++-- sim/process.cc | 6 +++--- sim/stat_control.cc | 2 +- sim/syscall_emul.cc | 2 +- sim/syscall_emul.hh | 2 +- sim/system.cc | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sim') diff --git a/sim/eventq.cc b/sim/eventq.cc index 50158d06f..1fb8ef98a 100644 --- a/sim/eventq.cc +++ b/sim/eventq.cc @@ -33,7 +33,7 @@ #include #include -#include "cpu/full_cpu/smt.hh" +#include "cpu/smt.hh" #include "base/misc.hh" #include "sim/eventq.hh" diff --git a/sim/main.cc b/sim/main.cc index ed8bf9e63..066f5f4c3 100644 --- a/sim/main.cc +++ b/sim/main.cc @@ -49,8 +49,8 @@ #include "base/statistics.hh" #include "base/str.hh" #include "base/time.hh" -#include "cpu/base_cpu.hh" -#include "cpu/full_cpu/smt.hh" +#include "cpu/base.hh" +#include "cpu/smt.hh" #include "python/pyconfig.hh" #include "sim/async.hh" #include "sim/builder.hh" diff --git a/sim/process.cc b/sim/process.cc index 3541fd040..e7a9afa9d 100644 --- a/sim/process.cc +++ b/sim/process.cc @@ -37,10 +37,10 @@ #include "base/loader/symtab.hh" #include "base/statistics.hh" #include "cpu/exec_context.hh" -#include "cpu/full_cpu/smt.hh" -#include "cpu/full_cpu/thread.hh" +#include "cpu/smt.hh" #include "eio/eio.hh" -#include "mem/functional_mem/main_memory.hh" +#include "encumbered/cpu/full/thread.hh" +#include "encumbered/mem/functional/main.hh" #include "sim/builder.hh" #include "sim/fake_syscall.hh" #include "sim/process.hh" diff --git a/sim/stat_control.cc b/sim/stat_control.cc index 37664dc65..578073efa 100644 --- a/sim/stat_control.cc +++ b/sim/stat_control.cc @@ -39,7 +39,7 @@ #include "base/str.hh" #include "base/time.hh" #include "base/stats/output.hh" -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "sim/eventq.hh" #include "sim/sim_object.hh" #include "sim/stat_control.hh" diff --git a/sim/syscall_emul.cc b/sim/syscall_emul.cc index 13df2b7a2..5abbdfd74 100644 --- a/sim/syscall_emul.cc +++ b/sim/syscall_emul.cc @@ -34,7 +34,7 @@ #include "sim/syscall_emul.hh" #include "base/trace.hh" #include "cpu/exec_context.hh" -#include "cpu/base_cpu.hh" +#include "cpu/base.hh" #include "sim/process.hh" #include "sim/sim_events.hh" diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh index 26d3b873c..417531cc3 100644 --- a/sim/syscall_emul.hh +++ b/sim/syscall_emul.hh @@ -39,7 +39,7 @@ #include #include "base/intmath.hh" // for RoundUp -#include "mem/functional_mem/functional_memory.hh" +#include "mem/functional/functional.hh" #include "targetarch/isa_traits.hh" // for Addr #include "base/trace.hh" diff --git a/sim/system.cc b/sim/system.cc index 8844f13de..70a1b8a32 100644 --- a/sim/system.cc +++ b/sim/system.cc @@ -31,8 +31,8 @@ #include "base/remote_gdb.hh" #include "cpu/exec_context.hh" #include "kern/kernel_stats.hh" -#include "mem/functional_mem/memory_control.hh" -#include "mem/functional_mem/physical_memory.hh" +#include "mem/functional/memory_control.hh" +#include "mem/functional/physical.hh" #include "targetarch/vtophys.hh" #include "sim/builder.hh" #include "sim/system.hh" -- cgit v1.2.3