diff options
| author | Nathan Binkert <nate@binkert.org> | 2011-04-15 10:44:06 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2011-04-15 10:44:06 -0700 |
| commit | 39a055645f77e0fa7bf49406635dba6bd65e361f (patch) | |
| tree | a7df44358c75ff2de6e6f1549755f72cddb7d735 /src/cpu | |
| parent | 50fda09ac79b2dc1aa31fbced8d19b23d683fbab (diff) | |
| download | gem5-39a055645f77e0fa7bf49406635dba6bd65e361f.tar.xz | |
includes: sort all includes
Diffstat (limited to 'src/cpu')
154 files changed, 298 insertions, 306 deletions
diff --git a/src/cpu/activity.cc b/src/cpu/activity.cc index 9c9288c4d..84f88d594 100644 --- a/src/cpu/activity.cc +++ b/src/cpu/activity.cc @@ -30,8 +30,8 @@ #include <string> -#include "cpu/timebuf.hh" #include "cpu/activity.hh" +#include "cpu/timebuf.hh" using namespace std; diff --git a/src/cpu/activity.hh b/src/cpu/activity.hh index 8d3469c4e..f119c95cc 100644 --- a/src/cpu/activity.hh +++ b/src/cpu/activity.hh @@ -31,8 +31,8 @@ #ifndef __CPU_ACTIVITY_HH__ #define __CPU_ACTIVITY_HH__ -#include "cpu/timebuf.hh" #include "base/trace.hh" +#include "cpu/timebuf.hh" /** * ActivityRecorder helper class that informs the CPU if it can switch diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 17ae65793..1d249b274 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -32,23 +32,23 @@ */ #include <iostream> -#include <string> #include <sstream> +#include <string> #include "arch/tlb.hh" -#include "base/cprintf.hh" #include "base/loader/symtab.hh" +#include "base/cprintf.hh" #include "base/misc.hh" #include "base/output.hh" #include "base/trace.hh" #include "cpu/base.hh" #include "cpu/cpuevent.hh" -#include "cpu/thread_context.hh" #include "cpu/profile.hh" +#include "cpu/thread_context.hh" #include "params/BaseCPU.hh" -#include "sim/sim_exit.hh" #include "sim/process.hh" #include "sim/sim_events.hh" +#include "sim/sim_exit.hh" #include "sim/system.hh" // Hack diff --git a/src/cpu/base.hh b/src/cpu/base.hh index 8557b5bd5..ce02889f3 100644 --- a/src/cpu/base.hh +++ b/src/cpu/base.hh @@ -41,9 +41,9 @@ #include "base/statistics.hh" #include "config/full_system.hh" #include "config/the_isa.hh" +#include "mem/mem_object.hh" #include "sim/eventq.hh" #include "sim/insttracer.hh" -#include "mem/mem_object.hh" #if FULL_SYSTEM #include "arch/interrupts.hh" diff --git a/src/cpu/base_dyn_inst_impl.hh b/src/cpu/base_dyn_inst_impl.hh index 7e4d25322..688d5c66b 100644 --- a/src/cpu/base_dyn_inst_impl.hh +++ b/src/cpu/base_dyn_inst_impl.hh @@ -42,8 +42,8 @@ #include <iostream> #include <set> -#include <string> #include <sstream> +#include <string> #include "base/cprintf.hh" #include "base/trace.hh" diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc index 079057765..0c7fe66bf 100644 --- a/src/cpu/checker/cpu.cc +++ b/src/cpu/checker/cpu.cc @@ -31,8 +31,8 @@ #include <list> #include <string> -#include "cpu/base.hh" #include "cpu/checker/cpu.hh" +#include "cpu/base.hh" #include "cpu/simple_thread.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh index efd8a4776..1e3a17a34 100644 --- a/src/cpu/checker/cpu.hh +++ b/src/cpu/checker/cpu.hh @@ -32,16 +32,16 @@ #define __CPU_CHECKER_CPU_HH__ #include <list> -#include <queue> #include <map> +#include <queue> #include "arch/types.hh" #include "base/statistics.hh" #include "config/full_system.hh" #include "cpu/base.hh" #include "cpu/base_dyn_inst.hh" -#include "cpu/simple_thread.hh" #include "cpu/pc_event.hh" +#include "cpu/simple_thread.hh" #include "cpu/static_inst.hh" #include "sim/eventq.hh" diff --git a/src/cpu/checker/cpu_impl.hh b/src/cpu/checker/cpu_impl.hh index 8197d560d..8694dae21 100644 --- a/src/cpu/checker/cpu_impl.hh +++ b/src/cpu/checker/cpu_impl.hh @@ -33,11 +33,11 @@ #include "base/refcnt.hh" #include "config/the_isa.hh" -#include "cpu/base_dyn_inst.hh" #include "cpu/checker/cpu.hh" +#include "cpu/base_dyn_inst.hh" #include "cpu/simple_thread.hh" -#include "cpu/thread_context.hh" #include "cpu/static_inst.hh" +#include "cpu/thread_context.hh" #include "sim/sim_object.hh" #include "sim/stats.hh" diff --git a/src/cpu/cpuevent.hh b/src/cpu/cpuevent.hh index 65f0e87e1..77b1d9138 100644 --- a/src/cpu/cpuevent.hh +++ b/src/cpu/cpuevent.hh @@ -32,6 +32,7 @@ #define __CPU_CPUEVENT_HH__ #include <vector> + #include "sim/eventq.hh" class ThreadContext; diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc index 760e5bd51..ea90ba7c2 100644 --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -36,11 +36,11 @@ #include "arch/isa_traits.hh" #include "arch/utility.hh" #include "base/loader/symtab.hh" +#include "config/the_isa.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" -#include "config/the_isa.hh" #include "enums/OpClass.hh" using namespace std; diff --git a/src/cpu/func_unit.hh b/src/cpu/func_unit.hh index e8238ba73..59c5ee8a0 100644 --- a/src/cpu/func_unit.hh +++ b/src/cpu/func_unit.hh @@ -36,8 +36,8 @@ #include <vector> #include "cpu/op_class.hh" -#include "params/OpDesc.hh" #include "params/FUDesc.hh" +#include "params/OpDesc.hh" #include "sim/sim_object.hh" //////////////////////////////////////////////////////////////////////////// diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc index 1c2fc6333..f7fff05d3 100644 --- a/src/cpu/inorder/cpu.cc +++ b/src/cpu/inorder/cpu.cc @@ -34,17 +34,17 @@ #include "arch/utility.hh" #include "config/full_system.hh" #include "config/the_isa.hh" -#include "cpu/activity.hh" -#include "cpu/base.hh" -#include "cpu/exetrace.hh" +#include "cpu/inorder/resources/resource_list.hh" #include "cpu/inorder/cpu.hh" #include "cpu/inorder/first_stage.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_pool.hh" -#include "cpu/inorder/resources/resource_list.hh" #include "cpu/inorder/thread_context.hh" #include "cpu/inorder/thread_state.hh" +#include "cpu/activity.hh" +#include "cpu/base.hh" +#include "cpu/exetrace.hh" #include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" #include "mem/translating_port.hh" diff --git a/src/cpu/inorder/cpu.hh b/src/cpu/inorder/cpu.hh index 403c931b2..af2fa5ced 100644 --- a/src/cpu/inorder/cpu.hh +++ b/src/cpu/inorder/cpu.hh @@ -39,23 +39,23 @@ #include <vector> #include "arch/isa_traits.hh" -#include "arch/types.hh" #include "arch/registers.hh" +#include "arch/types.hh" #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "base/types.hh" #include "config/full_system.hh" #include "config/the_isa.hh" -#include "cpu/activity.hh" -#include "cpu/base.hh" -#include "cpu/simple_thread.hh" #include "cpu/inorder/inorder_dyn_inst.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/pipeline_stage.hh" -#include "cpu/inorder/thread_state.hh" +#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/reg_dep_map.hh" +#include "cpu/inorder/thread_state.hh" #include "cpu/o3/dep_graph.hh" #include "cpu/o3/rename_map.hh" +#include "cpu/activity.hh" +#include "cpu/base.hh" +#include "cpu/simple_thread.hh" +#include "cpu/timebuf.hh" #include "mem/packet.hh" #include "mem/port.hh" #include "mem/request.hh" diff --git a/src/cpu/inorder/first_stage.cc b/src/cpu/inorder/first_stage.cc index b656ca1c7..bf57681a7 100644 --- a/src/cpu/inorder/first_stage.cc +++ b/src/cpu/inorder/first_stage.cc @@ -30,10 +30,10 @@ */ #include "base/str.hh" -#include "cpu/inorder/first_stage.hh" #include "cpu/inorder/resources/resource_list.hh" -#include "cpu/inorder/resource_pool.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/first_stage.hh" +#include "cpu/inorder/resource_pool.hh" #include "params/InOrderTrace.hh" using namespace std; diff --git a/src/cpu/inorder/first_stage.hh b/src/cpu/inorder/first_stage.hh index 26151075c..5e8aecfea 100644 --- a/src/cpu/inorder/first_stage.hh +++ b/src/cpu/inorder/first_stage.hh @@ -36,12 +36,12 @@ #include <vector> #include "base/statistics.hh" -#include "cpu/timebuf.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/comm.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/params.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/pipeline_stage.hh" +#include "cpu/inorder/pipeline_traits.hh" +#include "cpu/timebuf.hh" class InOrderCPU; diff --git a/src/cpu/inorder/inorder_cpu_builder.cc b/src/cpu/inorder/inorder_cpu_builder.cc index a19137dd8..99729577e 100644 --- a/src/cpu/inorder/inorder_cpu_builder.cc +++ b/src/cpu/inorder/inorder_cpu_builder.cc @@ -31,12 +31,12 @@ #include <string> -#include "cpu/base.hh" -#include "cpu/inst_seq.hh" -#include "cpu/static_inst.hh" #include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" +#include "cpu/base.hh" +#include "cpu/inst_seq.hh" +#include "cpu/static_inst.hh" #include "params/InOrderCPU.hh" InOrderCPU * diff --git a/src/cpu/inorder/inorder_dyn_inst.cc b/src/cpu/inorder/inorder_dyn_inst.cc index ebd7b7cbb..90134f533 100644 --- a/src/cpu/inorder/inorder_dyn_inst.cc +++ b/src/cpu/inorder/inorder_dyn_inst.cc @@ -31,16 +31,16 @@ #include <iostream> #include <set> -#include <string> #include <sstream> +#include <string> #include "arch/faults.hh" #include "base/cprintf.hh" #include "base/trace.hh" #include "config/the_isa.hh" -#include "cpu/exetrace.hh" #include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/exetrace.hh" #include "mem/request.hh" using namespace std; diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh index 830244ae8..1fbc476e8 100644 --- a/src/cpu/inorder/inorder_dyn_inst.hh +++ b/src/cpu/inorder/inorder_dyn_inst.hh @@ -47,12 +47,12 @@ #include "base/types.hh" #include "config/full_system.hh" #include "config/the_isa.hh" -#include "cpu/exetrace.hh" #include "cpu/inorder/inorder_trace.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource.hh" #include "cpu/inorder/resource_sked.hh" #include "cpu/inorder/thread_state.hh" +#include "cpu/exetrace.hh" #include "cpu/inst_seq.hh" #include "cpu/op_class.hh" #include "cpu/static_inst.hh" diff --git a/src/cpu/inorder/inorder_trace.cc b/src/cpu/inorder/inorder_trace.cc index 75f6be63d..8d40451bd 100644 --- a/src/cpu/inorder/inorder_trace.cc +++ b/src/cpu/inorder/inorder_trace.cc @@ -32,10 +32,10 @@ #include <iomanip> #include "config/the_isa.hh" -#include "cpu/exetrace.hh" #include "cpu/inorder/inorder_trace.hh" -#include "cpu/static_inst.hh" #include "cpu/inorder/pipeline_traits.hh" +#include "cpu/exetrace.hh" +#include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "params/InOrderTrace.hh" diff --git a/src/cpu/inorder/pipeline_stage.cc b/src/cpu/inorder/pipeline_stage.cc index b267ac00e..b9e21e20f 100644 --- a/src/cpu/inorder/pipeline_stage.cc +++ b/src/cpu/inorder/pipeline_stage.cc @@ -31,9 +31,9 @@ #include "base/str.hh" #include "config/the_isa.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/pipeline_stage.hh" #include "cpu/inorder/resource_pool.hh" -#include "cpu/inorder/cpu.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/pipeline_stage.hh b/src/cpu/inorder/pipeline_stage.hh index ec70fefc5..d0d9112c0 100644 --- a/src/cpu/inorder/pipeline_stage.hh +++ b/src/cpu/inorder/pipeline_stage.hh @@ -36,11 +36,11 @@ #include <vector> #include "base/statistics.hh" -#include "cpu/timebuf.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/comm.hh" -#include "params/InOrderCPU.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" +#include "cpu/timebuf.hh" +#include "params/InOrderCPU.hh" class InOrderCPU; diff --git a/src/cpu/inorder/pipeline_traits.5stage.cc b/src/cpu/inorder/pipeline_traits.5stage.cc index 50c30af1e..f15a3cb11 100644 --- a/src/cpu/inorder/pipeline_traits.5stage.cc +++ b/src/cpu/inorder/pipeline_traits.5stage.cc @@ -29,9 +29,9 @@ * */ -#include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/resources/resource_list.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; diff --git a/src/cpu/inorder/pipeline_traits.5stage.hh b/src/cpu/inorder/pipeline_traits.5stage.hh index aea6eff37..5e5ef6efd 100644 --- a/src/cpu/inorder/pipeline_traits.5stage.hh +++ b/src/cpu/inorder/pipeline_traits.5stage.hh @@ -39,7 +39,6 @@ #include "arch/isa_traits.hh" #include "cpu/inorder/params.hh" - class InOrderDynInst; /* This Namespace contains constants, typedefs, functions and diff --git a/src/cpu/inorder/pipeline_traits.9stage.cc b/src/cpu/inorder/pipeline_traits.9stage.cc index d686bb3bc..e8ff3acd4 100644 --- a/src/cpu/inorder/pipeline_traits.9stage.cc +++ b/src/cpu/inorder/pipeline_traits.9stage.cc @@ -29,9 +29,9 @@ * */ -#include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/resources/resource_list.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; diff --git a/src/cpu/inorder/pipeline_traits.9stage.hh b/src/cpu/inorder/pipeline_traits.9stage.hh index 91e537366..d4125baea 100644 --- a/src/cpu/inorder/pipeline_traits.9stage.hh +++ b/src/cpu/inorder/pipeline_traits.9stage.hh @@ -33,14 +33,13 @@ #define __CPU_INORDER_PIPELINE_IMPL_HH__ #include <list> +#include <map> #include <queue> #include <vector> -#include <map> #include "arch/isa_traits.hh" #include "cpu/inorder/params.hh" - class InOrderDynInst; /* This Namespace contains constants, typedefs, functions and diff --git a/src/cpu/inorder/pipeline_traits.9stage.smt2.cc b/src/cpu/inorder/pipeline_traits.9stage.smt2.cc index 9d2ed8e61..68c1d0eab 100644 --- a/src/cpu/inorder/pipeline_traits.9stage.smt2.cc +++ b/src/cpu/inorder/pipeline_traits.9stage.smt2.cc @@ -29,9 +29,9 @@ * */ -#include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/resources/resource_list.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; diff --git a/src/cpu/inorder/pipeline_traits.9stage.smt2.hh b/src/cpu/inorder/pipeline_traits.9stage.smt2.hh index 22da4ea0f..f620289c3 100644 --- a/src/cpu/inorder/pipeline_traits.9stage.smt2.hh +++ b/src/cpu/inorder/pipeline_traits.9stage.smt2.hh @@ -33,14 +33,13 @@ #define __CPU_INORDER_PIPELINE_IMPL_HH__ #include <list> +#include <map> #include <queue> #include <vector> -#include <map> #include "arch/isa_traits.hh" #include "cpu/inorder/params.hh" - class InOrderDynInst; /* This Namespace contains constants, typedefs, functions and diff --git a/src/cpu/inorder/pipeline_traits.hh b/src/cpu/inorder/pipeline_traits.hh index 573c0200a..dd12a8f1d 100644 --- a/src/cpu/inorder/pipeline_traits.hh +++ b/src/cpu/inorder/pipeline_traits.hh @@ -38,7 +38,6 @@ #include "arch/isa_traits.hh" #include "cpu/base.hh" - #include "params/InOrderCPU.hh" class InOrderDynInst; diff --git a/src/cpu/inorder/reg_dep_map.cc b/src/cpu/inorder/reg_dep_map.cc index 48820b50e..8eb7a3111 100644 --- a/src/cpu/inorder/reg_dep_map.cc +++ b/src/cpu/inorder/reg_dep_map.cc @@ -31,10 +31,10 @@ #include "arch/isa_traits.hh" #include "config/the_isa.hh" +#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/reg_dep_map.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" -#include "cpu/inorder/cpu.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resource.cc b/src/cpu/inorder/resource.cc index 24211532e..b72dbd14f 100644 --- a/src/cpu/inorder/resource.cc +++ b/src/cpu/inorder/resource.cc @@ -29,12 +29,12 @@ * */ -#include <vector> #include <list> +#include <vector> #include "base/str.hh" -#include "cpu/inorder/resource.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" using namespace std; Resource::Resource(string res_name, int res_id, int res_width, diff --git a/src/cpu/inorder/resource.hh b/src/cpu/inorder/resource.hh index 7899a215f..0f2cde7d1 100644 --- a/src/cpu/inorder/resource.hh +++ b/src/cpu/inorder/resource.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_RESOURCE_HH__ #define __CPU_INORDER_RESOURCE_HH__ -#include <vector> #include <list> #include <string> +#include <vector> #include "base/types.hh" -#include "cpu/inst_seq.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" +#include "cpu/inst_seq.hh" #include "sim/eventq.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/inorder/resource_pool.9stage.cc b/src/cpu/inorder/resource_pool.9stage.cc index 746d3f33b..93b0ac4e4 100644 --- a/src/cpu/inorder/resource_pool.9stage.cc +++ b/src/cpu/inorder/resource_pool.9stage.cc @@ -29,11 +29,11 @@ * */ -#include "cpu/inorder/resource_pool.hh" -#include "cpu/inorder/resources/resource_list.hh" - -#include <vector> #include <list> +#include <vector> + +#include "cpu/inorder/resources/resource_list.hh" +#include "cpu/inorder/resource_pool.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resource_pool.cc b/src/cpu/inorder/resource_pool.cc index 4e2f930ab..a9eb742f4 100644 --- a/src/cpu/inorder/resource_pool.cc +++ b/src/cpu/inorder/resource_pool.cc @@ -29,11 +29,11 @@ * */ -#include "cpu/inorder/resource_pool.hh" -#include "cpu/inorder/resources/resource_list.hh" - -#include <vector> #include <list> +#include <vector> + +#include "cpu/inorder/resources/resource_list.hh" +#include "cpu/inorder/resource_pool.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resource_pool.hh b/src/cpu/inorder/resource_pool.hh index fde38b4e9..9d9439665 100644 --- a/src/cpu/inorder/resource_pool.hh +++ b/src/cpu/inorder/resource_pool.hh @@ -32,17 +32,17 @@ #ifndef __CPU_INORDER_RESOURCE_POOL_HH__ #define __CPU_INORDER_RESOURCE_POOL_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/inst_seq.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" -#include "cpu/inorder/resource.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/params.hh" +#include "cpu/inorder/pipeline_traits.hh" +#include "cpu/inorder/resource.hh" +#include "cpu/inst_seq.hh" #include "params/InOrderCPU.hh" -#include "cpu/inorder/cpu.hh" #include "sim/eventq.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/inorder/resource_sked.cc b/src/cpu/inorder/resource_sked.cc index 4cf791228..443500870 100644 --- a/src/cpu/inorder/resource_sked.cc +++ b/src/cpu/inorder/resource_sked.cc @@ -29,12 +29,12 @@ * */ -#include "cpu/inorder/resource_sked.hh" -#include "cpu/inorder/pipeline_traits.hh" - -#include <vector> -#include <list> #include <cstdio> +#include <list> +#include <vector> + +#include "cpu/inorder/pipeline_traits.hh" +#include "cpu/inorder/resource_sked.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resource_sked.hh b/src/cpu/inorder/resource_sked.hh index bd002e161..6338e8e9b 100644 --- a/src/cpu/inorder/resource_sked.hh +++ b/src/cpu/inorder/resource_sked.hh @@ -32,9 +32,9 @@ #ifndef __CPU_INORDER_RESOURCE_SKED_HH__ #define __CPU_INORDER_RESOURCE_SKED_HH__ -#include <vector> -#include <list> #include <cstdlib> +#include <list> +#include <vector> /** ScheduleEntry class represents a single function that an instruction wants to do at any pipeline stage. For example, if an instruction diff --git a/src/cpu/inorder/resources/agen_unit.hh b/src/cpu/inorder/resources/agen_unit.hh index 7c9c5fd89..f208ec680 100644 --- a/src/cpu/inorder/resources/agen_unit.hh +++ b/src/cpu/inorder/resources/agen_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_AGEN_UNIT_HH__ #define __CPU_INORDER_AGEN_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/inorder/resource.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/params.hh" +#include "cpu/inorder/pipeline_traits.hh" +#include "cpu/inorder/resource.hh" class AGENUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/bpred_unit.hh b/src/cpu/inorder/resources/bpred_unit.hh index 3b1c0f4ef..33ca4a0c6 100644 --- a/src/cpu/inorder/resources/bpred_unit.hh +++ b/src/cpu/inorder/resources/bpred_unit.hh @@ -36,7 +36,6 @@ #include "arch/isa_traits.hh" #include "base/statistics.hh" -#include "cpu/inst_seq.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource.hh" @@ -44,6 +43,7 @@ #include "cpu/pred/btb.hh" #include "cpu/pred/ras.hh" #include "cpu/pred/tournament.hh" +#include "cpu/inst_seq.hh" #include "params/InOrderCPU.hh" /** diff --git a/src/cpu/inorder/resources/branch_predictor.hh b/src/cpu/inorder/resources/branch_predictor.hh index 00915fd0d..72b216806 100644 --- a/src/cpu/inorder/resources/branch_predictor.hh +++ b/src/cpu/inorder/resources/branch_predictor.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_BRANCH_PREDICTOR_HH__ #define __CPU_INORDER_BRANCH_PREDICTOR_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/inorder/resource.hh" -#include "cpu/inorder/inorder_dyn_inst.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resources/bpred_unit.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/pipeline_traits.hh" +#include "cpu/inorder/resource.hh" class BranchPredictor : public Resource { public: diff --git a/src/cpu/inorder/resources/cache_unit.cc b/src/cpu/inorder/resources/cache_unit.cc index e98b27d62..ce4c538da 100644 --- a/src/cpu/inorder/resources/cache_unit.cc +++ b/src/cpu/inorder/resources/cache_unit.cc @@ -29,17 +29,17 @@ * */ -#include <vector> #include <list> +#include <vector> #include "arch/isa_traits.hh" #include "arch/locked_mem.hh" -#include "arch/utility.hh" #include "arch/predecoder.hh" +#include "arch/utility.hh" #include "config/the_isa.hh" #include "cpu/inorder/resources/cache_unit.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_pool.hh" #include "mem/request.hh" diff --git a/src/cpu/inorder/resources/cache_unit.hh b/src/cpu/inorder/resources/cache_unit.hh index 1aab099e9..c4a5dc0bd 100644 --- a/src/cpu/inorder/resources/cache_unit.hh +++ b/src/cpu/inorder/resources/cache_unit.hh @@ -32,9 +32,9 @@ #ifndef __CPU_INORDER_CACHE_UNIT_HH__ #define __CPU_INORDER_CACHE_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> #include "arch/predecoder.hh" #include "arch/tlb.hh" diff --git a/src/cpu/inorder/resources/decode_unit.hh b/src/cpu/inorder/resources/decode_unit.hh index 1c4dc0523..3742af3e2 100644 --- a/src/cpu/inorder/resources/decode_unit.hh +++ b/src/cpu/inorder/resources/decode_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_DECODE_UNIT_HH__ #define __CPU_INORDER_DECODE_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" #include "cpu/inorder/reg_dep_map.hh" +#include "cpu/inorder/resource.hh" class DecodeUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc index 311add9f8..2ec340749 100644 --- a/src/cpu/inorder/resources/execution_unit.cc +++ b/src/cpu/inorder/resources/execution_unit.cc @@ -29,11 +29,12 @@ * */ -#include <vector> #include <list> +#include <vector> + #include "cpu/inorder/resources/execution_unit.hh" -#include "cpu/inorder/resource_pool.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource_pool.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/execution_unit.hh b/src/cpu/inorder/resources/execution_unit.hh index b03a6655e..ed645ec3b 100644 --- a/src/cpu/inorder/resources/execution_unit.hh +++ b/src/cpu/inorder/resources/execution_unit.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_EXECUTION_UNIT_HH__ #define __CPU_INORDER_EXECUTION_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/func_unit.hh" #include "cpu/inorder/first_stage.hh" -#include "cpu/inorder/resource.hh" #include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/resource.hh" +#include "cpu/func_unit.hh" class ExecutionUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/fetch_seq_unit.hh b/src/cpu/inorder/resources/fetch_seq_unit.hh index a258dc0e5..be3c59a13 100644 --- a/src/cpu/inorder/resources/fetch_seq_unit.hh +++ b/src/cpu/inorder/resources/fetch_seq_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_FETCH_SEQ_UNIT_HH__ #define __CPU_INORDER_FETCH_SEQ_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> #include "config/the_isa.hh" -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class FetchSeqUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/fetch_unit.cc b/src/cpu/inorder/resources/fetch_unit.cc index d6038415e..899fa8c08 100644 --- a/src/cpu/inorder/resources/fetch_unit.cc +++ b/src/cpu/inorder/resources/fetch_unit.cc @@ -29,18 +29,18 @@ * */ -#include <vector> #include <list> +#include <vector> #include "arch/isa_traits.hh" #include "arch/locked_mem.hh" -#include "arch/utility.hh" #include "arch/predecoder.hh" +#include "arch/utility.hh" #include "config/the_isa.hh" #include "cpu/inorder/resources/cache_unit.hh" #include "cpu/inorder/resources/fetch_unit.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_pool.hh" #include "mem/request.hh" diff --git a/src/cpu/inorder/resources/fetch_unit.hh b/src/cpu/inorder/resources/fetch_unit.hh index fa133b9eb..3075e726d 100644 --- a/src/cpu/inorder/resources/fetch_unit.hh +++ b/src/cpu/inorder/resources/fetch_unit.hh @@ -32,17 +32,17 @@ #ifndef __CPU_INORDER_FETCH_UNIT_HH__ #define __CPU_INORDER_FETCH_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> #include "arch/predecoder.hh" #include "arch/tlb.hh" #include "config/the_isa.hh" +#include "cpu/inorder/resources/cache_unit.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource.hh" -#include "cpu/inorder/resources/cache_unit.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "mem/port.hh" diff --git a/src/cpu/inorder/resources/graduation_unit.hh b/src/cpu/inorder/resources/graduation_unit.hh index 59631bfcb..043e375e7 100644 --- a/src/cpu/inorder/resources/graduation_unit.hh +++ b/src/cpu/inorder/resources/graduation_unit.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_GRAD_UNIT_HH__ #define __CPU_INORDER_GRAD_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class GraduationUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/inst_buffer.cc b/src/cpu/inorder/resources/inst_buffer.cc index 46f5cce72..e0405879b 100644 --- a/src/cpu/inorder/resources/inst_buffer.cc +++ b/src/cpu/inorder/resources/inst_buffer.cc @@ -29,14 +29,14 @@ * */ -#include <vector> #include <list> +#include <vector> #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resources/inst_buffer.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/inst_buffer.hh b/src/cpu/inorder/resources/inst_buffer.hh index fcbdc20df..d0047e013 100644 --- a/src/cpu/inorder/resources/inst_buffer.hh +++ b/src/cpu/inorder/resources/inst_buffer.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_INST_BUFF_UNIT_HH__ #define __CPU_INORDER_INST_BUFF_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class InstBuffer : public Resource { public: diff --git a/src/cpu/inorder/resources/mem_dep_unit.hh b/src/cpu/inorder/resources/mem_dep_unit.hh index 018593eaf..387bee0b9 100644 --- a/src/cpu/inorder/resources/mem_dep_unit.hh +++ b/src/cpu/inorder/resources/mem_dep_unit.hh @@ -32,14 +32,14 @@ #ifndef __CPU_INORDER_MEM_DEP_UNIT_HH__ #define __CPU_INORDER_MEM_DEP_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/inorder/resource.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource.hh" class MemDepUnit : public Resource { public: diff --git a/src/cpu/inorder/resources/mult_div_unit.cc b/src/cpu/inorder/resources/mult_div_unit.cc index ad8b2b47b..8fbfc231e 100644 --- a/src/cpu/inorder/resources/mult_div_unit.cc +++ b/src/cpu/inorder/resources/mult_div_unit.cc @@ -29,11 +29,12 @@ * */ -#include <vector> #include <list> +#include <vector> + #include "cpu/inorder/resources/mult_div_unit.hh" -#include "cpu/inorder/resource_pool.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/resource_pool.hh" #include "cpu/op_class.hh" using namespace std; diff --git a/src/cpu/inorder/resources/mult_div_unit.hh b/src/cpu/inorder/resources/mult_div_unit.hh index d243eebea..753bc64a6 100644 --- a/src/cpu/inorder/resources/mult_div_unit.hh +++ b/src/cpu/inorder/resources/mult_div_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_MULT_DIV_UNIT_HH__ #define __CPU_INORDER_MULT_DIV_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/func_unit.hh" -#include "cpu/op_class.hh" #include "cpu/inorder/first_stage.hh" -#include "cpu/inorder/resource.hh" #include "cpu/inorder/inorder_dyn_inst.hh" +#include "cpu/inorder/resource.hh" +#include "cpu/func_unit.hh" +#include "cpu/op_class.hh" class MDUEvent; diff --git a/src/cpu/inorder/resources/resource_list.hh b/src/cpu/inorder/resources/resource_list.hh index 5568ad470..ae6b4ecaf 100644 --- a/src/cpu/inorder/resources/resource_list.hh +++ b/src/cpu/inorder/resources/resource_list.hh @@ -32,17 +32,17 @@ #ifndef CPU_INORDER_RESOURCE_LIST_HH #define CPU_INORDER_RESOURCE_LIST_HH +#include "cpu/inorder/resources/agen_unit.hh" +#include "cpu/inorder/resources/branch_predictor.hh" #include "cpu/inorder/resources/cache_unit.hh" -#include "cpu/inorder/resources/fetch_unit.hh" -#include "cpu/inorder/resources/execution_unit.hh" -#include "cpu/inorder/resources/use_def.hh" -#include "cpu/inorder/resources/inst_buffer.hh" #include "cpu/inorder/resources/decode_unit.hh" -#include "cpu/inorder/resources/graduation_unit.hh" -#include "cpu/inorder/resources/tlb_unit.hh" +#include "cpu/inorder/resources/execution_unit.hh" #include "cpu/inorder/resources/fetch_seq_unit.hh" -#include "cpu/inorder/resources/branch_predictor.hh" -#include "cpu/inorder/resources/agen_unit.hh" +#include "cpu/inorder/resources/fetch_unit.hh" +#include "cpu/inorder/resources/graduation_unit.hh" +#include "cpu/inorder/resources/inst_buffer.hh" #include "cpu/inorder/resources/mult_div_unit.hh" +#include "cpu/inorder/resources/tlb_unit.hh" +#include "cpu/inorder/resources/use_def.hh" #endif diff --git a/src/cpu/inorder/resources/tlb_unit.cc b/src/cpu/inorder/resources/tlb_unit.cc index 9a0c9fe32..c07f6ae5f 100644 --- a/src/cpu/inorder/resources/tlb_unit.cc +++ b/src/cpu/inorder/resources/tlb_unit.cc @@ -29,15 +29,15 @@ * */ -#include <vector> #include <list> +#include <vector> #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/first_stage.hh" #include "cpu/inorder/resources/tlb_unit.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/first_stage.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/tlb_unit.hh b/src/cpu/inorder/resources/tlb_unit.hh index 904ac3eba..caccb5a9f 100644 --- a/src/cpu/inorder/resources/tlb_unit.hh +++ b/src/cpu/inorder/resources/tlb_unit.hh @@ -32,15 +32,15 @@ #ifndef __CPU_INORDER_TLB_UNIT_HH__ #define __CPU_INORDER_TLB_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> #include "config/the_isa.hh" #include "cpu/inorder/resources/inst_buffer.hh" +#include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" -#include "cpu/inorder/cpu.hh" class TLBUnit : public Resource { diff --git a/src/cpu/inorder/resources/use_def.cc b/src/cpu/inorder/resources/use_def.cc index c687024ce..8a00ab704 100644 --- a/src/cpu/inorder/resources/use_def.cc +++ b/src/cpu/inorder/resources/use_def.cc @@ -29,14 +29,14 @@ * */ -#include <vector> #include <list> +#include <vector> #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resources/use_def.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/pipeline_traits.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/use_def.hh b/src/cpu/inorder/resources/use_def.hh index 21770cec6..bd423d01a 100644 --- a/src/cpu/inorder/resources/use_def.hh +++ b/src/cpu/inorder/resources/use_def.hh @@ -32,16 +32,16 @@ #ifndef __CPU_INORDER_USE_DEF_UNIT_HH__ #define __CPU_INORDER_USE_DEF_UNIT_HH__ -#include <vector> #include <list> #include <string> +#include <vector> -#include "cpu/func_unit.hh" #include "cpu/inorder/first_stage.hh" -#include "cpu/inorder/resource.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/reg_dep_map.hh" +#include "cpu/inorder/resource.hh" +#include "cpu/func_unit.hh" class UseDefUnit : public Resource { public: diff --git a/src/cpu/inorder/thread_context.cc b/src/cpu/inorder/thread_context.cc index bbccf626a..636bcee22 100644 --- a/src/cpu/inorder/thread_context.cc +++ b/src/cpu/inorder/thread_context.cc @@ -31,8 +31,8 @@ #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/exetrace.hh" #include "cpu/inorder/thread_context.hh" +#include "cpu/exetrace.hh" using namespace TheISA; diff --git a/src/cpu/inorder/thread_context.hh b/src/cpu/inorder/thread_context.hh index 21f1e5835..d178fd1d5 100644 --- a/src/cpu/inorder/thread_context.hh +++ b/src/cpu/inorder/thread_context.hh @@ -33,10 +33,10 @@ #define __CPU_INORDER_THREAD_CONTEXT_HH__ #include "config/the_isa.hh" +#include "cpu/inorder/cpu.hh" +#include "cpu/inorder/thread_state.hh" #include "cpu/exetrace.hh" #include "cpu/thread_context.hh" -#include "cpu/inorder/thread_state.hh" -#include "cpu/inorder/cpu.hh" class TranslatingPort; diff --git a/src/cpu/inorder/thread_state.cc b/src/cpu/inorder/thread_state.cc index b3a54efb1..b17f05c7d 100644 --- a/src/cpu/inorder/thread_state.cc +++ b/src/cpu/inorder/thread_state.cc @@ -30,9 +30,9 @@ */ #include "arch/isa_traits.hh" -#include "cpu/exetrace.hh" -#include "cpu/inorder/thread_state.hh" #include "cpu/inorder/cpu.hh" +#include "cpu/inorder/thread_state.hh" +#include "cpu/exetrace.hh" using namespace TheISA; diff --git a/src/cpu/intr_control.cc b/src/cpu/intr_control.cc index de7f9245e..085dbe9ac 100644 --- a/src/cpu/intr_control.cc +++ b/src/cpu/intr_control.cc @@ -34,8 +34,8 @@ #include "base/trace.hh" #include "cpu/base.hh" -#include "cpu/thread_context.hh" #include "cpu/intr_control.hh" +#include "cpu/thread_context.hh" #include "sim/sim_object.hh" using namespace std; diff --git a/src/cpu/intr_control.hh b/src/cpu/intr_control.hh index 2a63cf608..ee7b3ea7f 100644 --- a/src/cpu/intr_control.hh +++ b/src/cpu/intr_control.hh @@ -33,13 +33,13 @@ #define __INTR_CONTROL_HH__ #include <vector> + #include "base/misc.hh" #include "cpu/base.hh" #include "params/IntrControl.hh" #include "sim/sim_object.hh" #include "sim/system.hh" - class IntrControl : public SimObject { public: diff --git a/src/cpu/nativetrace.hh b/src/cpu/nativetrace.hh index cc388d6bf..9869853c4 100644 --- a/src/cpu/nativetrace.hh +++ b/src/cpu/nativetrace.hh @@ -31,9 +31,10 @@ #ifndef __CPU_NATIVETRACE_HH__ #define __CPU_NATIVETRACE_HH__ -#include <errno.h> #include <unistd.h> +#include <cerrno> + #include "base/socket.hh" #include "base/trace.hh" #include "base/types.hh" diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc index 510109d8a..5cf01f230 100644 --- a/src/cpu/o3/base_dyn_inst.cc +++ b/src/cpu/o3/base_dyn_inst.cc @@ -28,9 +28,9 @@ * Authors: Kevin Lim */ -#include "cpu/base_dyn_inst_impl.hh" #include "cpu/o3/cpu.hh" #include "cpu/o3/isa_specific.hh" +#include "cpu/base_dyn_inst_impl.hh" // Explicit instantiation template class BaseDynInst<O3CPUImpl>; diff --git a/src/cpu/o3/bpred_unit.hh b/src/cpu/o3/bpred_unit.hh index 58b1147c9..84f2dc8c1 100644 --- a/src/cpu/o3/bpred_unit.hh +++ b/src/cpu/o3/bpred_unit.hh @@ -35,11 +35,11 @@ #include "base/statistics.hh" #include "base/types.hh" -#include "cpu/inst_seq.hh" #include "cpu/pred/2bit_local.hh" #include "cpu/pred/btb.hh" #include "cpu/pred/ras.hh" #include "cpu/pred/tournament.hh" +#include "cpu/inst_seq.hh" class DerivO3CPUParams; diff --git a/src/cpu/o3/bpred_unit_impl.hh b/src/cpu/o3/bpred_unit_impl.hh index 14d47df9f..44e6f4230 100644 --- a/src/cpu/o3/bpred_unit_impl.hh +++ b/src/cpu/o3/bpred_unit_impl.hh @@ -30,9 +30,9 @@ #include <algorithm> +#include "arch/isa_traits.hh" #include "arch/types.hh" #include "arch/utility.hh" -#include "arch/isa_traits.hh" #include "base/trace.hh" #include "base/traceflags.hh" #include "config/the_isa.hh" diff --git a/src/cpu/o3/checker_builder.cc b/src/cpu/o3/checker_builder.cc index b9afb3f9f..5d0bd2ed2 100644 --- a/src/cpu/o3/checker_builder.cc +++ b/src/cpu/o3/checker_builder.cc @@ -31,9 +31,9 @@ #include <string> #include "cpu/checker/cpu_impl.hh" -#include "cpu/inst_seq.hh" #include "cpu/o3/alpha/dyn_inst.hh" #include "cpu/o3/alpha/impl.hh" +#include "cpu/inst_seq.hh" #include "params/O3Checker.hh" #include "sim/process.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/o3/commit.cc b/src/cpu/o3/commit.cc index 637d59f52..8e3ec0635 100644 --- a/src/cpu/o3/commit.cc +++ b/src/cpu/o3/commit.cc @@ -28,7 +28,7 @@ * Authors: Kevin Lim */ -#include "cpu/o3/isa_specific.hh" #include "cpu/o3/commit_impl.hh" +#include "cpu/o3/isa_specific.hh" template class DefaultCommit<O3CPUImpl>; diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh index ff7b53440..2de381aeb 100644 --- a/src/cpu/o3/commit.hh +++ b/src/cpu/o3/commit.hh @@ -45,9 +45,9 @@ #define __CPU_O3_COMMIT_HH__ #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "cpu/exetrace.hh" #include "cpu/inst_seq.hh" +#include "cpu/timebuf.hh" class DerivO3CPUParams; diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index e35c1bf29..a48e5f046 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -45,15 +45,15 @@ #include <string> #include "arch/utility.hh" -#include "base/cp_annotate.hh" #include "base/loader/symtab.hh" -#include "cpu/timebuf.hh" +#include "base/cp_annotate.hh" #include "config/full_system.hh" #include "config/the_isa.hh" #include "config/use_checker.hh" -#include "cpu/exetrace.hh" #include "cpu/o3/commit.hh" #include "cpu/o3/thread_state.hh" +#include "cpu/exetrace.hh" +#include "cpu/timebuf.hh" #include "params/DerivO3CPU.hh" #if USE_CHECKER diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 4088f2399..565c68f7a 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -34,12 +34,12 @@ #include "config/full_system.hh" #include "config/the_isa.hh" #include "config/use_checker.hh" +#include "cpu/o3/cpu.hh" +#include "cpu/o3/isa_specific.hh" +#include "cpu/o3/thread_context.hh" #include "cpu/activity.hh" #include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" -#include "cpu/o3/isa_specific.hh" -#include "cpu/o3/cpu.hh" -#include "cpu/o3/thread_context.hh" #include "enums/MemoryMode.hh" #include "sim/core.hh" #include "sim/stat_control.hh" diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh index 69289996b..7e9c33717 100644 --- a/src/cpu/o3/cpu.hh +++ b/src/cpu/o3/cpu.hh @@ -42,21 +42,20 @@ #include "arch/types.hh" #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "config/full_system.hh" #include "config/the_isa.hh" #include "config/use_checker.hh" -#include "cpu/activity.hh" -#include "cpu/base.hh" -#include "cpu/simple_thread.hh" #include "cpu/o3/comm.hh" #include "cpu/o3/cpu_policy.hh" #include "cpu/o3/scoreboard.hh" #include "cpu/o3/thread_state.hh" +#include "cpu/activity.hh" +#include "cpu/base.hh" +#include "cpu/simple_thread.hh" +#include "cpu/timebuf.hh" //#include "cpu/o3/thread_context.hh" -#include "sim/process.hh" - #include "params/DerivO3CPU.hh" +#include "sim/process.hh" template <class> class Checker; diff --git a/src/cpu/o3/cpu_policy.hh b/src/cpu/o3/cpu_policy.hh index c06c9a201..ed0c31133 100644 --- a/src/cpu/o3/cpu_policy.hh +++ b/src/cpu/o3/cpu_policy.hh @@ -32,24 +32,22 @@ #define __CPU_O3_CPU_POLICY_HH__ #include "cpu/o3/bpred_unit.hh" +#include "cpu/o3/comm.hh" +#include "cpu/o3/commit.hh" +#include "cpu/o3/decode.hh" +#include "cpu/o3/fetch.hh" #include "cpu/o3/free_list.hh" +#include "cpu/o3/iew.hh" #include "cpu/o3/inst_queue.hh" #include "cpu/o3/lsq.hh" #include "cpu/o3/lsq_unit.hh" #include "cpu/o3/mem_dep_unit.hh" #include "cpu/o3/regfile.hh" +#include "cpu/o3/rename.hh" #include "cpu/o3/rename_map.hh" #include "cpu/o3/rob.hh" #include "cpu/o3/store_set.hh" -#include "cpu/o3/commit.hh" -#include "cpu/o3/decode.hh" -#include "cpu/o3/fetch.hh" -#include "cpu/o3/iew.hh" -#include "cpu/o3/rename.hh" - -#include "cpu/o3/comm.hh" - /** * Struct that defines the key classes to be used by the CPU. All * classes use the typedefs defined here to determine what are the diff --git a/src/cpu/o3/decode.cc b/src/cpu/o3/decode.cc index 896e38331..9722a4fcd 100644 --- a/src/cpu/o3/decode.cc +++ b/src/cpu/o3/decode.cc @@ -28,7 +28,7 @@ * Authors: Kevin Lim */ -#include "cpu/o3/isa_specific.hh" #include "cpu/o3/decode_impl.hh" +#include "cpu/o3/isa_specific.hh" template class DefaultDecode<O3CPUImpl>; diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh index 487c284e6..2e434ea02 100644 --- a/src/cpu/o3/dyn_inst.hh +++ b/src/cpu/o3/dyn_inst.hh @@ -45,10 +45,10 @@ #include "arch/isa_traits.hh" #include "config/the_isa.hh" -#include "cpu/base_dyn_inst.hh" -#include "cpu/inst_seq.hh" #include "cpu/o3/cpu.hh" #include "cpu/o3/isa_specific.hh" +#include "cpu/base_dyn_inst.hh" +#include "cpu/inst_seq.hh" class Packet; diff --git a/src/cpu/o3/fetch.cc b/src/cpu/o3/fetch.cc index d809b07e4..fb08b0957 100644 --- a/src/cpu/o3/fetch.cc +++ b/src/cpu/o3/fetch.cc @@ -28,7 +28,7 @@ * Authors: Kevin Lim */ -#include "cpu/o3/isa_specific.hh" #include "cpu/o3/fetch_impl.hh" +#include "cpu/o3/isa_specific.hh" template class DefaultFetch<O3CPUImpl>; diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh index 4a4ac0902..53f0f631e 100644 --- a/src/cpu/o3/fetch.hh +++ b/src/cpu/o3/fetch.hh @@ -44,12 +44,12 @@ #ifndef __CPU_O3_FETCH_HH__ #define __CPU_O3_FETCH_HH__ -#include "arch/utility.hh" #include "arch/predecoder.hh" +#include "arch/utility.hh" #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "config/the_isa.hh" #include "cpu/pc_event.hh" +#include "cpu/timebuf.hh" #include "cpu/translation.hh" #include "mem/packet.hh" #include "mem/port.hh" diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh index c611f0e49..806cf7916 100644 --- a/src/cpu/o3/fetch_impl.hh +++ b/src/cpu/o3/fetch_impl.hh @@ -50,8 +50,8 @@ #include "config/the_isa.hh" #include "config/use_checker.hh" #include "cpu/checker/cpu.hh" -#include "cpu/exetrace.hh" #include "cpu/o3/fetch.hh" +#include "cpu/exetrace.hh" #include "mem/packet.hh" #include "mem/request.hh" #include "params/DerivO3CPU.hh" diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc index 1144238f4..88020a0a2 100644 --- a/src/cpu/o3/free_list.cc +++ b/src/cpu/o3/free_list.cc @@ -29,7 +29,6 @@ */ #include "base/trace.hh" - #include "cpu/o3/free_list.hh" SimpleFreeList::SimpleFreeList(ThreadID activeThreads, diff --git a/src/cpu/o3/fu_pool.hh b/src/cpu/o3/fu_pool.hh index 20d742cc8..ea4b53e1a 100644 --- a/src/cpu/o3/fu_pool.hh +++ b/src/cpu/o3/fu_pool.hh @@ -36,8 +36,8 @@ #include <string> #include <vector> -#include "cpu/sched_list.hh" #include "cpu/op_class.hh" +#include "cpu/sched_list.hh" #include "params/FUPool.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/o3/iew.cc b/src/cpu/o3/iew.cc index f99be7fe0..9bf2db4d0 100644 --- a/src/cpu/o3/iew.cc +++ b/src/cpu/o3/iew.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/o3/isa_specific.hh" #include "cpu/o3/iew_impl.hh" #include "cpu/o3/inst_queue.hh" +#include "cpu/o3/isa_specific.hh" template class DefaultIEW<O3CPUImpl>; diff --git a/src/cpu/o3/iew.hh b/src/cpu/o3/iew.hh index 6599964b6..d157b4383 100644 --- a/src/cpu/o3/iew.hh +++ b/src/cpu/o3/iew.hh @@ -46,11 +46,11 @@ #include <queue> #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "config/full_system.hh" #include "cpu/o3/comm.hh" -#include "cpu/o3/scoreboard.hh" #include "cpu/o3/lsq.hh" +#include "cpu/o3/scoreboard.hh" +#include "cpu/timebuf.hh" class DerivO3CPUParams; class FUPool; diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh index 8bf3c56f4..8b1bd4d00 100644 --- a/src/cpu/o3/iew_impl.hh +++ b/src/cpu/o3/iew_impl.hh @@ -46,10 +46,10 @@ #include <queue> -#include "cpu/timebuf.hh" #include "config/the_isa.hh" #include "cpu/o3/fu_pool.hh" #include "cpu/o3/iew.hh" +#include "cpu/timebuf.hh" #include "params/DerivO3CPU.hh" using namespace std; diff --git a/src/cpu/o3/impl.hh b/src/cpu/o3/impl.hh index ffccd4a84..8905bdb1c 100644 --- a/src/cpu/o3/impl.hh +++ b/src/cpu/o3/impl.hh @@ -35,7 +35,6 @@ #include "config/the_isa.hh" #include "cpu/o3/cpu_policy.hh" - // Forward declarations. template <class Impl> class BaseO3DynInst; diff --git a/src/cpu/o3/inst_queue.cc b/src/cpu/o3/inst_queue.cc index a539066f9..cbc3d2e82 100644 --- a/src/cpu/o3/inst_queue.cc +++ b/src/cpu/o3/inst_queue.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/o3/isa_specific.hh" #include "cpu/o3/inst_queue_impl.hh" +#include "cpu/o3/isa_specific.hh" // Force instantiation of InstructionQueue. template class InstructionQueue<O3CPUImpl>; diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh index 64df35743..eb35fd285 100644 --- a/src/cpu/o3/inst_queue.hh +++ b/src/cpu/o3/inst_queue.hh @@ -49,11 +49,11 @@ #include <vector> #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "base/types.hh" -#include "cpu/inst_seq.hh" #include "cpu/o3/dep_graph.hh" +#include "cpu/inst_seq.hh" #include "cpu/op_class.hh" +#include "cpu/timebuf.hh" #include "sim/eventq.hh" class DerivO3CPUParams; diff --git a/src/cpu/o3/isa_specific.hh b/src/cpu/o3/isa_specific.hh index e9347af91..9bae3fd15 100755 --- a/src/cpu/o3/isa_specific.hh +++ b/src/cpu/o3/isa_specific.hh @@ -28,7 +28,6 @@ * Authors: Korey Sewell */ -#include "cpu/base.hh" - -#include "cpu/o3/impl.hh" #include "cpu/o3/dyn_inst.hh" +#include "cpu/o3/impl.hh" +#include "cpu/base.hh" diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh index 0ad5d51c2..14917bc16 100644 --- a/src/cpu/o3/lsq.hh +++ b/src/cpu/o3/lsq.hh @@ -35,8 +35,8 @@ #include <queue> #include "config/full_system.hh" -#include "cpu/inst_seq.hh" #include "cpu/o3/lsq_unit.hh" +#include "cpu/inst_seq.hh" #include "mem/port.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh index bdc524dec..36c2ff8c8 100644 --- a/src/cpu/o3/lsq_unit.hh +++ b/src/cpu/o3/lsq_unit.hh @@ -39,10 +39,10 @@ #include "arch/faults.hh" #include "arch/locked_mem.hh" -#include "config/full_system.hh" -#include "config/the_isa.hh" #include "base/fast_alloc.hh" #include "base/hashmap.hh" +#include "config/full_system.hh" +#include "config/the_isa.hh" #include "cpu/inst_seq.hh" #include "mem/packet.hh" #include "mem/port.hh" diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh index 70b87ff26..6a366d056 100644 --- a/src/cpu/o3/lsq_unit_impl.hh +++ b/src/cpu/o3/lsq_unit_impl.hh @@ -42,11 +42,11 @@ */ #include "arch/locked_mem.hh" +#include "base/str.hh" #include "config/the_isa.hh" #include "config/use_checker.hh" #include "cpu/o3/lsq.hh" #include "cpu/o3/lsq_unit.hh" -#include "base/str.hh" #include "mem/packet.hh" #include "mem/request.hh" diff --git a/src/cpu/o3/mem_dep_unit.cc b/src/cpu/o3/mem_dep_unit.cc index 6a14dcbff..ac0db4784 100644 --- a/src/cpu/o3/mem_dep_unit.cc +++ b/src/cpu/o3/mem_dep_unit.cc @@ -29,8 +29,8 @@ */ #include "cpu/o3/isa_specific.hh" -#include "cpu/o3/store_set.hh" #include "cpu/o3/mem_dep_unit_impl.hh" +#include "cpu/o3/store_set.hh" // Force instantation of memory dependency unit using store sets and // O3CPUImpl. diff --git a/src/cpu/o3/rename.hh b/src/cpu/o3/rename.hh index 901283111..e2472a62d 100644 --- a/src/cpu/o3/rename.hh +++ b/src/cpu/o3/rename.hh @@ -34,8 +34,8 @@ #include <list> #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "config/the_isa.hh" +#include "cpu/timebuf.hh" class DerivO3CPUParams; diff --git a/src/cpu/o3/scoreboard.hh b/src/cpu/o3/scoreboard.hh index b1c2bd026..4789e2181 100644 --- a/src/cpu/o3/scoreboard.hh +++ b/src/cpu/o3/scoreboard.hh @@ -35,6 +35,7 @@ #include <iostream> #include <utility> #include <vector> + #include "base/trace.hh" #include "base/traceflags.hh" #include "cpu/o3/comm.hh" diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc index 0d8c67643..7ca716dd1 100755 --- a/src/cpu/o3/thread_context.cc +++ b/src/cpu/o3/thread_context.cc @@ -28,9 +28,9 @@ * Authors: Kevin Lim */ +#include "cpu/o3/impl.hh" #include "cpu/o3/thread_context.hh" #include "cpu/o3/thread_context_impl.hh" -#include "cpu/o3/impl.hh" template class O3ThreadContext<O3CPUImpl>; diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh index 4e559000b..ef0fdbb4d 100755 --- a/src/cpu/o3/thread_context.hh +++ b/src/cpu/o3/thread_context.hh @@ -32,8 +32,8 @@ #define __CPU_O3_THREAD_CONTEXT_HH__ #include "config/the_isa.hh" -#include "cpu/thread_context.hh" #include "cpu/o3/isa_specific.hh" +#include "cpu/thread_context.hh" class EndQuiesceEvent; namespace Kernel { diff --git a/src/cpu/ozone/back_end.hh b/src/cpu/ozone/back_end.hh index 95e079d0d..90a336d1b 100644 --- a/src/cpu/ozone/back_end.hh +++ b/src/cpu/ozone/back_end.hh @@ -35,13 +35,13 @@ #include <queue> #include <string> -#include "sim/faults.hh" -#include "cpu/timebuf.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/rename_table.hh" #include "cpu/ozone/thread_state.hh" +#include "cpu/inst_seq.hh" +#include "cpu/timebuf.hh" #include "mem/request.hh" #include "sim/eventq.hh" +#include "sim/faults.hh" class ThreadContext; diff --git a/src/cpu/ozone/back_end_impl.hh b/src/cpu/ozone/back_end_impl.hh index fbb363a96..169f328ad 100644 --- a/src/cpu/ozone/back_end_impl.hh +++ b/src/cpu/ozone/back_end_impl.hh @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "encumbered/cpu/full/op_class.hh" #include "cpu/ozone/back_end.hh" +#include "encumbered/cpu/full/op_class.hh" template <class Impl> BackEnd<Impl>::InstQueue::InstQueue(Params *params) diff --git a/src/cpu/ozone/base_dyn_inst.cc b/src/cpu/ozone/base_dyn_inst.cc index e0570fd16..9fdb9d22e 100644 --- a/src/cpu/ozone/base_dyn_inst.cc +++ b/src/cpu/ozone/base_dyn_inst.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/base_dyn_inst_impl.hh" #include "cpu/ozone/ozone_impl.hh" +#include "cpu/base_dyn_inst_impl.hh" // Explicit instantiation template class BaseDynInst<OzoneImpl>; diff --git a/src/cpu/ozone/checker_builder.cc b/src/cpu/ozone/checker_builder.cc index 37b9f951a..6baa95658 100644 --- a/src/cpu/ozone/checker_builder.cc +++ b/src/cpu/ozone/checker_builder.cc @@ -31,9 +31,9 @@ #include <string> #include "cpu/checker/cpu_impl.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/dyn_inst.hh" #include "cpu/ozone/ozone_impl.hh" +#include "cpu/inst_seq.hh" #include "params/OzoneChecker.hh" #include "sim/process.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/ozone/cpu.hh b/src/cpu/ozone/cpu.hh index 1b196feb4..1867a4c51 100644 --- a/src/cpu/ozone/cpu.hh +++ b/src/cpu/ozone/cpu.hh @@ -34,16 +34,16 @@ #include <set> #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "config/full_system.hh" #include "config/the_isa.hh" -#include "cpu/base.hh" -#include "cpu/thread_context.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/rename_table.hh" #include "cpu/ozone/thread_state.hh" +#include "cpu/base.hh" +#include "cpu/inst_seq.hh" #include "cpu/pc_event.hh" #include "cpu/static_inst.hh" +#include "cpu/thread_context.hh" +#include "cpu/timebuf.hh" #include "mem/page_table.hh" #include "sim/eventq.hh" diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc index 9cac3a524..63b7eb6ff 100644 --- a/src/cpu/ozone/cpu_builder.cc +++ b/src/cpu/ozone/cpu_builder.cc @@ -31,10 +31,10 @@ #include <string> #include "cpu/checker/cpu.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/cpu.hh" #include "cpu/ozone/ozone_impl.hh" #include "cpu/ozone/simple_params.hh" +#include "cpu/inst_seq.hh" #include "params/DerivOzoneCPU.hh" #include "sim/process.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh index dd6c3dcf1..bb6e96ecc 100644 --- a/src/cpu/ozone/cpu_impl.hh +++ b/src/cpu/ozone/cpu_impl.hh @@ -29,28 +29,27 @@ * Nathan Binkert */ -#include "config/full_system.hh" -#include "config/use_checker.hh" - #include "arch/isa_traits.hh" // For MachInst #include "base/trace.hh" +#include "config/full_system.hh" #include "config/the_isa.hh" +#include "config/use_checker.hh" +#include "cpu/ozone/cpu.hh" #include "cpu/base.hh" -#include "cpu/simple_thread.hh" -#include "cpu/thread_context.hh" #include "cpu/exetrace.hh" -#include "cpu/ozone/cpu.hh" #include "cpu/quiesce_event.hh" +#include "cpu/simple_thread.hh" #include "cpu/static_inst.hh" +#include "cpu/thread_context.hh" #include "sim/sim_object.hh" #include "sim/stats.hh" #if FULL_SYSTEM -#include "arch/faults.hh" #include "arch/alpha/osfpal.hh" +#include "arch/faults.hh" +#include "arch/kernel_stats.hh" #include "arch/tlb.hh" #include "arch/types.hh" -#include "arch/kernel_stats.hh" #include "arch/vtophys.hh" #include "base/callback.hh" #include "cpu/profile.hh" diff --git a/src/cpu/ozone/dyn_inst.hh b/src/cpu/ozone/dyn_inst.hh index cca72ef18..c1853b1ed 100644 --- a/src/cpu/ozone/dyn_inst.hh +++ b/src/cpu/ozone/dyn_inst.hh @@ -31,17 +31,17 @@ #ifndef __CPU_OZONE_DYN_INST_HH__ #define __CPU_OZONE_DYN_INST_HH__ +#include <list> +#include <vector> + #include "arch/isa_traits.hh" #include "arch/types.hh" #include "config/full_system.hh" #include "config/the_isa.hh" -#include "cpu/base_dyn_inst.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/cpu.hh" // MUST include this #include "cpu/ozone/ozone_impl.hh" - -#include <list> -#include <vector> +#include "cpu/base_dyn_inst.hh" +#include "cpu/inst_seq.hh" template <class Impl> class OzoneDynInst : public BaseDynInst<Impl> diff --git a/src/cpu/ozone/dyn_inst_impl.hh b/src/cpu/ozone/dyn_inst_impl.hh index bfefb9428..002b39fa2 100644 --- a/src/cpu/ozone/dyn_inst_impl.hh +++ b/src/cpu/ozone/dyn_inst_impl.hh @@ -28,10 +28,10 @@ * Authors: Kevin Lim */ -#include "sim/faults.hh" #include "config/full_system.hh" #include "config/the_isa.hh" #include "cpu/ozone/dyn_inst.hh" +#include "sim/faults.hh" #if FULL_SYSTEM #include "kern/kernel_stats.hh" diff --git a/src/cpu/ozone/ea_list.cc b/src/cpu/ozone/ea_list.cc index 5ef240700..4fc6c0a5f 100644 --- a/src/cpu/ozone/ea_list.cc +++ b/src/cpu/ozone/ea_list.cc @@ -30,8 +30,8 @@ */ #include "arch/isa_traits.hh" -#include "cpu/inst_seq.hh" #include "cpu/ooo_cpu/ea_list.hh" +#include "cpu/inst_seq.hh" void EAList::addAddr(const InstSeqNum &new_sn, const Addr &new_ea) diff --git a/src/cpu/ozone/front_end.hh b/src/cpu/ozone/front_end.hh index 7f400e82a..1d200ef7d 100644 --- a/src/cpu/ozone/front_end.hh +++ b/src/cpu/ozone/front_end.hh @@ -34,11 +34,11 @@ #include <deque> #include "arch/utility.hh" -#include "cpu/timebuf.hh" #include "config/the_isa.hh" -#include "cpu/inst_seq.hh" #include "cpu/o3/bpred_unit.hh" #include "cpu/ozone/rename_table.hh" +#include "cpu/inst_seq.hh" +#include "cpu/timebuf.hh" #include "mem/port.hh" #include "mem/request.hh" #include "sim/eventq.hh" diff --git a/src/cpu/ozone/front_end_impl.hh b/src/cpu/ozone/front_end_impl.hh index d7ed0b77a..5d8919d4e 100644 --- a/src/cpu/ozone/front_end_impl.hh +++ b/src/cpu/ozone/front_end_impl.hh @@ -28,18 +28,18 @@ * Authors: Kevin Lim */ -#include "sim/faults.hh" #include "arch/isa_traits.hh" #include "arch/utility.hh" #include "base/statistics.hh" #include "config/the_isa.hh" #include "config/use_checker.hh" -#include "cpu/thread_context.hh" -#include "cpu/exetrace.hh" #include "cpu/ozone/front_end.hh" +#include "cpu/exetrace.hh" +#include "cpu/thread_context.hh" #include "mem/mem_object.hh" #include "mem/packet.hh" #include "mem/request.hh" +#include "sim/faults.hh" #if USE_CHECKER #include "cpu/checker/cpu.hh" diff --git a/src/cpu/ozone/inorder_back_end.hh b/src/cpu/ozone/inorder_back_end.hh index fcdc2a38a..5c2f9c28f 100644 --- a/src/cpu/ozone/inorder_back_end.hh +++ b/src/cpu/ozone/inorder_back_end.hh @@ -33,14 +33,14 @@ #include <list> -#include "sim/faults.hh" -#include "cpu/timebuf.hh" -#include "cpu/thread_context.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/rename_table.hh" #include "cpu/ozone/thread_state.hh" +#include "cpu/inst_seq.hh" +#include "cpu/thread_context.hh" +#include "cpu/timebuf.hh" #include "mem/request.hh" #include "sim/eventq.hh" +#include "sim/faults.hh" template <class Impl> class InorderBackEnd diff --git a/src/cpu/ozone/inorder_back_end_impl.hh b/src/cpu/ozone/inorder_back_end_impl.hh index b48e8f692..13c066fd2 100644 --- a/src/cpu/ozone/inorder_back_end_impl.hh +++ b/src/cpu/ozone/inorder_back_end_impl.hh @@ -28,11 +28,11 @@ * Authors: Kevin Lim */ -#include "sim/faults.hh" #include "arch/types.hh" #include "config/the_isa.hh" #include "cpu/ozone/inorder_back_end.hh" #include "cpu/ozone/thread_state.hh" +#include "sim/faults.hh" template <class Impl> InorderBackEnd<Impl>::InorderBackEnd(Params *params) diff --git a/src/cpu/ozone/inst_queue.cc b/src/cpu/ozone/inst_queue.cc index 7ce5d67ad..5fd41d7c6 100644 --- a/src/cpu/ozone/inst_queue.cc +++ b/src/cpu/ozone/inst_queue.cc @@ -29,9 +29,9 @@ */ #include "cpu/ozone/dyn_inst.hh" +#include "cpu/ozone/inst_queue_impl.hh" #include "cpu/ozone/ozone_impl.hh" #include "cpu/ozone/simple_impl.hh" -#include "cpu/ozone/inst_queue_impl.hh" // Force instantiation of InstructionQueue. template class InstQueue<SimpleImpl>; diff --git a/src/cpu/ozone/inst_queue.hh b/src/cpu/ozone/inst_queue.hh index fb302f01e..ef207e792 100644 --- a/src/cpu/ozone/inst_queue.hh +++ b/src/cpu/ozone/inst_queue.hh @@ -37,9 +37,9 @@ #include <vector> #include "base/statistics.hh" -#include "cpu/timebuf.hh" #include "base/types.hh" #include "cpu/inst_seq.hh" +#include "cpu/timebuf.hh" class FUPool; class MemInterface; diff --git a/src/cpu/ozone/inst_queue_impl.hh b/src/cpu/ozone/inst_queue_impl.hh index 0068f2977..f2f88760b 100644 --- a/src/cpu/ozone/inst_queue_impl.hh +++ b/src/cpu/ozone/inst_queue_impl.hh @@ -38,9 +38,8 @@ #include <vector> -#include "sim/core.hh" - #include "cpu/ozone/inst_queue.hh" +#include "sim/core.hh" #if 0 template <class Impl> InstQueue<Impl>::FUCompletion::FUCompletion(DynInstPtr &_inst, diff --git a/src/cpu/ozone/lsq_unit.cc b/src/cpu/ozone/lsq_unit.cc index e37971dba..b473513ae 100644 --- a/src/cpu/ozone/lsq_unit.cc +++ b/src/cpu/ozone/lsq_unit.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/ozone/ozone_impl.hh" #include "cpu/ozone/lsq_unit_impl.hh" +#include "cpu/ozone/ozone_impl.hh" // Force the instantiation of LDSTQ for all the implementations we care about. template class OzoneLSQ<OzoneImpl>; diff --git a/src/cpu/ozone/lsq_unit.hh b/src/cpu/ozone/lsq_unit.hh index 0216c5013..1d8328610 100644 --- a/src/cpu/ozone/lsq_unit.hh +++ b/src/cpu/ozone/lsq_unit.hh @@ -31,15 +31,15 @@ #ifndef __CPU_OZONE_LSQ_UNIT_HH__ #define __CPU_OZONE_LSQ_UNIT_HH__ +#include <algorithm> #include <map> #include <queue> -#include <algorithm> #include "arch/faults.hh" #include "arch/types.hh" +#include "base/hashmap.hh" #include "config/full_system.hh" #include "config/the_isa.hh" -#include "base/hashmap.hh" #include "cpu/inst_seq.hh" #include "mem/mem_interface.hh" //#include "mem/page_table.hh" diff --git a/src/cpu/ozone/lw_back_end.hh b/src/cpu/ozone/lw_back_end.hh index 4c6eb5fb6..adb4f276a 100644 --- a/src/cpu/ozone/lw_back_end.hh +++ b/src/cpu/ozone/lw_back_end.hh @@ -36,13 +36,13 @@ #include <set> #include <string> -#include "sim/faults.hh" -#include "cpu/timebuf.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/rename_table.hh" #include "cpu/ozone/thread_state.hh" +#include "cpu/inst_seq.hh" +#include "cpu/timebuf.hh" #include "mem/request.hh" #include "sim/eventq.hh" +#include "sim/faults.hh" template <class> class Checker; diff --git a/src/cpu/ozone/lw_lsq.cc b/src/cpu/ozone/lw_lsq.cc index 8674e83a0..79dc0db31 100644 --- a/src/cpu/ozone/lw_lsq.cc +++ b/src/cpu/ozone/lw_lsq.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/ozone/ozone_impl.hh" #include "cpu/ozone/lw_lsq_impl.hh" +#include "cpu/ozone/ozone_impl.hh" // Force the instantiation of LDSTQ for all the implementations we care about. template class OzoneLWLSQ<OzoneImpl>; diff --git a/src/cpu/ozone/lw_lsq.hh b/src/cpu/ozone/lw_lsq.hh index 9605f175e..4817622f5 100644 --- a/src/cpu/ozone/lw_lsq.hh +++ b/src/cpu/ozone/lw_lsq.hh @@ -31,17 +31,17 @@ #ifndef __CPU_OZONE_LW_LSQ_HH__ #define __CPU_OZONE_LW_LSQ_HH__ +#include <algorithm> #include <list> #include <map> #include <queue> -#include <algorithm> #include "arch/faults.hh" #include "arch/types.hh" -#include "config/full_system.hh" -#include "config/the_isa.hh" #include "base/fast_alloc.hh" #include "base/hashmap.hh" +#include "config/full_system.hh" +#include "config/the_isa.hh" #include "cpu/inst_seq.hh" #include "mem/packet.hh" #include "mem/port.hh" diff --git a/src/cpu/ozone/lw_lsq_impl.hh b/src/cpu/ozone/lw_lsq_impl.hh index 0c4e4b9c7..3bee83176 100644 --- a/src/cpu/ozone/lw_lsq_impl.hh +++ b/src/cpu/ozone/lw_lsq_impl.hh @@ -32,8 +32,8 @@ #include "base/str.hh" #include "config/the_isa.hh" #include "config/use_checker.hh" -#include "cpu/ozone/lw_lsq.hh" #include "cpu/checker/cpu.hh" +#include "cpu/ozone/lw_lsq.hh" template<class Impl> OzoneLWLSQ<Impl>::WritebackEvent::WritebackEvent(DynInstPtr &_inst, PacketPtr _pkt, diff --git a/src/cpu/ozone/ozone_base_dyn_inst.cc b/src/cpu/ozone/ozone_base_dyn_inst.cc index 5a3a69dff..0bcd31760 100644 --- a/src/cpu/ozone/ozone_base_dyn_inst.cc +++ b/src/cpu/ozone/ozone_base_dyn_inst.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/base_dyn_inst_impl.hh" #include "cpu/ozone/ozone_impl.hh" +#include "cpu/base_dyn_inst_impl.hh" // Explicit instantiation template class BaseDynInst<OzoneImpl>; diff --git a/src/cpu/ozone/ozone_impl.hh b/src/cpu/ozone/ozone_impl.hh index 2271cd68a..294aecfae 100644 --- a/src/cpu/ozone/ozone_impl.hh +++ b/src/cpu/ozone/ozone_impl.hh @@ -32,12 +32,12 @@ #define __CPU_OZONE_OZONE_IMPL_HH__ #include "cpu/o3/bpred_unit.hh" +#include "cpu/ozone/dyn_inst.hh" #include "cpu/ozone/front_end.hh" #include "cpu/ozone/inst_queue.hh" -#include "cpu/ozone/lw_lsq.hh" #include "cpu/ozone/lw_back_end.hh" +#include "cpu/ozone/lw_lsq.hh" #include "cpu/ozone/null_predictor.hh" -#include "cpu/ozone/dyn_inst.hh" #include "cpu/ozone/simple_params.hh" template <class Impl> diff --git a/src/cpu/ozone/rename_table.cc b/src/cpu/ozone/rename_table.cc index a44054b6e..4e5505ff2 100644 --- a/src/cpu/ozone/rename_table.cc +++ b/src/cpu/ozone/rename_table.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/ozone/rename_table_impl.hh" #include "cpu/ozone/ozone_impl.hh" +#include "cpu/ozone/rename_table_impl.hh" //#include "cpu/ozone/simple_impl.hh" template class RenameTable<OzoneImpl>; diff --git a/src/cpu/ozone/simple_base_dyn_inst.cc b/src/cpu/ozone/simple_base_dyn_inst.cc index fdaeaf57e..c2ac1185a 100644 --- a/src/cpu/ozone/simple_base_dyn_inst.cc +++ b/src/cpu/ozone/simple_base_dyn_inst.cc @@ -28,8 +28,8 @@ * Authors: Kevin Lim */ -#include "cpu/base_dyn_inst_impl.hh" #include "cpu/ozone/simple_impl.hh" +#include "cpu/base_dyn_inst_impl.hh" // Explicit instantiation template class BaseDynInst<SimpleImpl>; diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc index 2fc7c10d0..f4446ede3 100644 --- a/src/cpu/ozone/simple_cpu_builder.cc +++ b/src/cpu/ozone/simple_cpu_builder.cc @@ -31,10 +31,10 @@ #include <string> #include "cpu/checker/cpu.hh" -#include "cpu/inst_seq.hh" #include "cpu/ozone/cpu_impl.hh" #include "cpu/ozone/simple_impl.hh" #include "cpu/ozone/simple_params.hh" +#include "cpu/inst_seq.hh" #include "mem/cache/base.hh" #include "sim/SimpleOzoneCPU.hh" #include "sim/process.hh" diff --git a/src/cpu/ozone/simple_impl.hh b/src/cpu/ozone/simple_impl.hh index 42002180b..c18395515 100644 --- a/src/cpu/ozone/simple_impl.hh +++ b/src/cpu/ozone/simple_impl.hh @@ -33,10 +33,10 @@ #include "cpu/o3/bpred_unit.hh" #include "cpu/ozone/cpu.hh" +#include "cpu/ozone/dyn_inst.hh" #include "cpu/ozone/front_end.hh" #include "cpu/ozone/inorder_back_end.hh" #include "cpu/ozone/null_predictor.hh" -#include "cpu/ozone/dyn_inst.hh" #include "cpu/ozone/simple_params.hh" //template <class Impl> diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc index 09bd66819..40432ed93 100644 --- a/src/cpu/pc_event.cc +++ b/src/cpu/pc_event.cc @@ -38,8 +38,8 @@ #include "base/trace.hh" #include "config/full_system.hh" #include "cpu/base.hh" -#include "cpu/thread_context.hh" #include "cpu/pc_event.hh" +#include "cpu/thread_context.hh" #include "sim/core.hh" #include "sim/system.hh" diff --git a/src/cpu/profile.cc b/src/cpu/profile.cc index 4f04615e9..79ae22ca1 100644 --- a/src/cpu/profile.cc +++ b/src/cpu/profile.cc @@ -30,14 +30,14 @@ #include <string> +#include "base/loader/symtab.hh" #include "base/bitfield.hh" #include "base/callback.hh" #include "base/statistics.hh" #include "base/trace.hh" -#include "base/loader/symtab.hh" #include "cpu/base.hh" -#include "cpu/thread_context.hh" #include "cpu/profile.hh" +#include "cpu/thread_context.hh" using namespace std; diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh index dd856b5a7..8fb0e3a8e 100644 --- a/src/cpu/profile.hh +++ b/src/cpu/profile.hh @@ -34,9 +34,9 @@ #include <map> #include "arch/stacktrace.hh" +#include "base/types.hh" #include "config/the_isa.hh" #include "cpu/static_inst.hh" -#include "base/types.hh" class ThreadContext; diff --git a/src/cpu/quiesce_event.cc b/src/cpu/quiesce_event.cc index 38ffb74e4..79068985b 100644 --- a/src/cpu/quiesce_event.cc +++ b/src/cpu/quiesce_event.cc @@ -29,8 +29,8 @@ */ #include "cpu/base.hh" -#include "cpu/thread_context.hh" #include "cpu/quiesce_event.hh" +#include "cpu/thread_context.hh" EndQuiesceEvent::EndQuiesceEvent(ThreadContext *_tc) : tc(_tc) diff --git a/src/cpu/sched_list.hh b/src/cpu/sched_list.hh index 56ee2f8ec..4d3b0dd71 100644 --- a/src/cpu/sched_list.hh +++ b/src/cpu/sched_list.hh @@ -32,10 +32,10 @@ #define SCHED_LIST_HH #include <list> + #include "base/intmath.hh" #include "base/misc.hh" - // Any types you use this class for must be covered here... namespace { void ClearEntry(int &i) { i = 0; }; diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index 6aa0eb64e..c5730e137 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -33,8 +33,8 @@ #include "arch/utility.hh" #include "base/bigint.hh" #include "config/the_isa.hh" -#include "cpu/exetrace.hh" #include "cpu/simple/atomic.hh" +#include "cpu/exetrace.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "params/AtomicSimpleCPU.hh" diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index 8d7a1b119..464520309 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -42,20 +42,20 @@ #include "arch/faults.hh" #include "arch/utility.hh" +#include "base/loader/symtab.hh" #include "base/cp_annotate.hh" #include "base/cprintf.hh" #include "base/inifile.hh" -#include "base/loader/symtab.hh" #include "base/misc.hh" #include "base/pollevent.hh" #include "base/range.hh" #include "base/trace.hh" #include "base/types.hh" #include "config/the_isa.hh" +#include "cpu/simple/base.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" #include "cpu/profile.hh" -#include "cpu/simple/base.hh" #include "cpu/simple_thread.hh" #include "cpu/smt.hh" #include "cpu/static_inst.hh" diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh index 628432d76..2696cc395 100644 --- a/src/cpu/simple/base.hh +++ b/src/cpu/simple/base.hh @@ -38,8 +38,8 @@ #include "config/full_system.hh" #include "config/the_isa.hh" #include "cpu/base.hh" -#include "cpu/simple_thread.hh" #include "cpu/pc_event.hh" +#include "cpu/simple_thread.hh" #include "cpu/static_inst.hh" #include "mem/packet.hh" #include "mem/port.hh" diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc index aca48e5d4..52d4b06d2 100644 --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -45,8 +45,8 @@ #include "arch/utility.hh" #include "base/bigint.hh" #include "config/the_isa.hh" -#include "cpu/exetrace.hh" #include "cpu/simple/timing.hh" +#include "cpu/exetrace.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "params/TimingSimpleCPU.hh" diff --git a/src/cpu/simple/timing.hh b/src/cpu/simple/timing.hh index a7a3eb7c3..778506703 100644 --- a/src/cpu/simple/timing.hh +++ b/src/cpu/simple/timing.hh @@ -33,7 +33,6 @@ #include "cpu/simple/base.hh" #include "cpu/translation.hh" - #include "params/TimingSimpleCPU.hh" class TimingSimpleCPU : public BaseSimpleCPU diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh index 48077a9b9..5420519e4 100644 --- a/src/cpu/simple_thread.hh +++ b/src/cpu/simple_thread.hh @@ -66,8 +66,8 @@ namespace TheISA { #else // !FULL_SYSTEM -#include "sim/process.hh" #include "mem/page_table.hh" +#include "sim/process.hh" class TranslatingPort; #endif // FULL_SYSTEM diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc index f1ec05802..df59d1fc3 100644 --- a/src/cpu/static_inst.cc +++ b/src/cpu/static_inst.cc @@ -30,6 +30,7 @@ */ #include <iostream> + #include "cpu/static_inst.hh" #include "sim/core.hh" diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh index 20483c499..c41ac38a6 100644 --- a/src/cpu/static_inst.hh +++ b/src/cpu/static_inst.hh @@ -35,13 +35,13 @@ #include <string> #include "arch/isa_traits.hh" -#include "arch/types.hh" #include "arch/registers.hh" -#include "config/the_isa.hh" +#include "arch/types.hh" #include "base/hashmap.hh" #include "base/misc.hh" #include "base/refcnt.hh" #include "base/types.hh" +#include "config/the_isa.hh" #include "cpu/op_class.hh" #include "sim/fault_fwd.hh" diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.cc b/src/cpu/testers/directedtest/InvalidateGenerator.cc index 724702d61..3b5aa55e5 100644 --- a/src/cpu/testers/directedtest/InvalidateGenerator.cc +++ b/src/cpu/testers/directedtest/InvalidateGenerator.cc @@ -27,9 +27,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "cpu/testers/directedtest/RubyDirectedTester.hh" #include "cpu/testers/directedtest/DirectedGenerator.hh" #include "cpu/testers/directedtest/InvalidateGenerator.hh" +#include "cpu/testers/directedtest/RubyDirectedTester.hh" InvalidateGenerator::InvalidateGenerator(const Params *p) : DirectedGenerator(p) diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.hh b/src/cpu/testers/directedtest/InvalidateGenerator.hh index ab68c859f..14c47b70b 100644 --- a/src/cpu/testers/directedtest/InvalidateGenerator.hh +++ b/src/cpu/testers/directedtest/InvalidateGenerator.hh @@ -35,8 +35,8 @@ #ifndef __CPU_DIRECTEDTEST_INVALIDATEGENERATOR_HH__ #define __CPU_DIRECTEDTEST_INVALIDATEGENERATOR_HH__ -#include "cpu/testers/directedtest/RubyDirectedTester.hh" #include "cpu/testers/directedtest/DirectedGenerator.hh" +#include "cpu/testers/directedtest/RubyDirectedTester.hh" #include "mem/protocol/InvalidateGeneratorStatus.hh" #include "params/InvalidateGenerator.hh" diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.hh b/src/cpu/testers/directedtest/RubyDirectedTester.hh index bd3989c04..163c206d8 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.hh +++ b/src/cpu/testers/directedtest/RubyDirectedTester.hh @@ -31,15 +31,15 @@ #define __CPU_DIRECTEDTEST_RUBYDIRECTEDTESTER_HH__ #include <iostream> -#include <vector> #include <string> +#include <vector> -#include "mem/mem_object.hh" -#include "mem/packet.hh" #include "mem/ruby/common/DataBlock.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/common/SubBlock.hh" #include "mem/ruby/system/RubyPort.hh" +#include "mem/mem_object.hh" +#include "mem/packet.hh" #include "params/RubyDirectedTester.hh" class DirectedGenerator; diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc index 9440bfec2..758a25ea2 100644 --- a/src/cpu/testers/memtest/memtest.cc +++ b/src/cpu/testers/memtest/memtest.cc @@ -40,8 +40,8 @@ #include "base/statistics.hh" #include "cpu/testers/memtest/memtest.hh" #include "mem/mem_object.hh" -#include "mem/port.hh" #include "mem/packet.hh" +#include "mem/port.hh" #include "mem/request.hh" #include "sim/sim_events.hh" #include "sim/stats.hh" diff --git a/src/cpu/testers/memtest/memtest.hh b/src/cpu/testers/memtest/memtest.hh index bb71da355..4e489de5c 100644 --- a/src/cpu/testers/memtest/memtest.hh +++ b/src/cpu/testers/memtest/memtest.hh @@ -34,15 +34,15 @@ #include <set> -#include "base/statistics.hh" #include "base/fast_alloc.hh" +#include "base/statistics.hh" +#include "mem/mem_object.hh" +#include "mem/port.hh" #include "params/MemTest.hh" #include "sim/eventq.hh" #include "sim/sim_exit.hh" #include "sim/sim_object.hh" #include "sim/stats.hh" -#include "mem/mem_object.hh" -#include "mem/port.hh" class Packet; class MemTest : public MemObject diff --git a/src/cpu/testers/networktest/networktest.cc b/src/cpu/testers/networktest/networktest.cc index 73d9364b7..1c1555743 100644 --- a/src/cpu/testers/networktest/networktest.cc +++ b/src/cpu/testers/networktest/networktest.cc @@ -28,18 +28,18 @@ * Authors: Tushar Krishna */ +#include <cmath> #include <iomanip> #include <set> #include <string> #include <vector> -#include <cmath> #include "base/misc.hh" #include "base/statistics.hh" #include "cpu/testers/networktest/networktest.hh" #include "mem/mem_object.hh" -#include "mem/port.hh" #include "mem/packet.hh" +#include "mem/port.hh" #include "mem/request.hh" #include "sim/sim_events.hh" #include "sim/stats.hh" diff --git a/src/cpu/testers/networktest/networktest.hh b/src/cpu/testers/networktest/networktest.hh index 923f47df2..96daa5af2 100644 --- a/src/cpu/testers/networktest/networktest.hh +++ b/src/cpu/testers/networktest/networktest.hh @@ -33,15 +33,15 @@ #include <set> -#include "base/statistics.hh" #include "base/fast_alloc.hh" +#include "base/statistics.hh" +#include "mem/mem_object.hh" +#include "mem/port.hh" #include "params/NetworkTest.hh" #include "sim/eventq.hh" #include "sim/sim_exit.hh" #include "sim/sim_object.hh" #include "sim/stats.hh" -#include "mem/mem_object.hh" -#include "mem/port.hh" class Packet; class NetworkTest : public MemObject diff --git a/src/cpu/testers/rubytest/CheckTable.cc b/src/cpu/testers/rubytest/CheckTable.cc index af7467148..c2aa68a53 100644 --- a/src/cpu/testers/rubytest/CheckTable.cc +++ b/src/cpu/testers/rubytest/CheckTable.cc @@ -30,7 +30,6 @@ #include "base/intmath.hh" #include "cpu/testers/rubytest/Check.hh" #include "cpu/testers/rubytest/CheckTable.hh" -#include "cpu/testers/rubytest/CheckTable.hh" CheckTable::CheckTable(int _num_cpu_sequencers, RubyTester* _tester) : m_num_cpu_sequencers(_num_cpu_sequencers), m_tester_ptr(_tester) diff --git a/src/cpu/testers/rubytest/RubyTester.hh b/src/cpu/testers/rubytest/RubyTester.hh index 4ea5bda73..1c0147c7e 100644 --- a/src/cpu/testers/rubytest/RubyTester.hh +++ b/src/cpu/testers/rubytest/RubyTester.hh @@ -31,15 +31,15 @@ #define __CPU_RUBYTEST_RUBYTESTER_HH__ #include <iostream> -#include <vector> #include <string> +#include <vector> #include "cpu/testers/rubytest/CheckTable.hh" -#include "mem/mem_object.hh" -#include "mem/packet.hh" #include "mem/ruby/common/Global.hh" #include "mem/ruby/common/SubBlock.hh" #include "mem/ruby/system/RubyPort.hh" +#include "mem/mem_object.hh" +#include "mem/packet.hh" #include "params/RubyTester.hh" class RubyTester : public MemObject diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh index 1c70ef59a..0f7228f0c 100644 --- a/src/cpu/thread_context.hh +++ b/src/cpu/thread_context.hh @@ -31,8 +31,8 @@ #ifndef __CPU_THREAD_CONTEXT_HH__ #define __CPU_THREAD_CONTEXT_HH__ -#include <string> #include <iostream> +#include <string> #include "arch/registers.hh" #include "arch/types.hh" diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh index e0edc466e..824579852 100644 --- a/src/cpu/thread_state.hh +++ b/src/cpu/thread_state.hh @@ -33,9 +33,9 @@ #include "arch/types.hh" #include "config/the_isa.hh" +#include "cpu/base.hh" #include "cpu/profile.hh" #include "cpu/thread_context.hh" -#include "cpu/base.hh" #if !FULL_SYSTEM #include "mem/mem_object.hh" diff --git a/src/cpu/trace/opt_cpu.cc b/src/cpu/trace/opt_cpu.cc index 10e71db7b..b3a6d761b 100644 --- a/src/cpu/trace/opt_cpu.cc +++ b/src/cpu/trace/opt_cpu.cc @@ -36,8 +36,8 @@ #include <algorithm> // For heap functions. -#include "cpu/trace/opt_cpu.hh" #include "cpu/trace/reader/mem_trace_reader.hh" +#include "cpu/trace/opt_cpu.hh" #include "params/OptCPU.hh" #include "sim/sim_events.hh" diff --git a/src/cpu/trace/reader/ibm_reader.hh b/src/cpu/trace/reader/ibm_reader.hh index a72f62e03..048c5dbda 100644 --- a/src/cpu/trace/reader/ibm_reader.hh +++ b/src/cpu/trace/reader/ibm_reader.hh @@ -36,7 +36,8 @@ #ifndef __IBM_READER_HH__ #define __IBM_READER_HH__ -#include <stdio.h> +#include <cstdio> + #include "cpu/trace/reader/mem_trace_reader.hh" #include "mem/mem_req.hh" diff --git a/src/cpu/trace/reader/itx_reader.hh b/src/cpu/trace/reader/itx_reader.hh index 63a4c9ac9..8dd1c9a62 100644 --- a/src/cpu/trace/reader/itx_reader.hh +++ b/src/cpu/trace/reader/itx_reader.hh @@ -36,13 +36,12 @@ #ifndef __ITX_READER_HH__ #define __ITX_READER_HH__ -#include <stdio.h> +#include <cstdio> #include <string> #include "cpu/trace/reader/mem_trace_reader.hh" #include "mem/mem_req.hh" - /** * A memory trace reader for the Intel ITX memory trace format. */ diff --git a/src/cpu/trace/reader/mem_trace_reader.hh b/src/cpu/trace/reader/mem_trace_reader.hh index 628a3ecdc..ed69efd5b 100644 --- a/src/cpu/trace/reader/mem_trace_reader.hh +++ b/src/cpu/trace/reader/mem_trace_reader.hh @@ -35,8 +35,8 @@ #ifndef __MEM_TRACE_READER_HH__ #define __MEM_TRACE_READER_HH__ -#include "sim/sim_object.hh" #include "mem/mem_req.hh" // For MemReqPtr +#include "sim/sim_object.hh" /** * Pure virtual base class for memory trace readers. diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc index 70aa1f042..85f269121 100644 --- a/src/cpu/trace/trace_cpu.cc +++ b/src/cpu/trace/trace_cpu.cc @@ -36,8 +36,8 @@ #include <algorithm> // For min -#include "cpu/trace/trace_cpu.hh" #include "cpu/trace/reader/mem_trace_reader.hh" +#include "cpu/trace/trace_cpu.hh" #include "mem/base_mem.hh" // For PARAM constructor #include "mem/mem_interface.hh" #include "params/TraceCPU.hh" |