From 7a8dda49a4ec33be17bbd101ebd68e02562b9c3d Mon Sep 17 00:00:00 2001 From: Brandon Potter Date: Wed, 9 Nov 2016 14:27:37 -0600 Subject: style: [patch 1/22] use /r/3648/ to reorganize includes --- src/cpu/activity.cc | 3 ++- src/cpu/base.cc | 5 +++-- src/cpu/checker/cpu.cc | 3 ++- src/cpu/dummy_checker.cc | 1 + src/cpu/exetrace.cc | 3 ++- src/cpu/func_unit.cc | 3 ++- src/cpu/inteltrace.cc | 3 ++- src/cpu/intr_control.cc | 3 ++- src/cpu/kvm/base.cc | 5 ++--- src/cpu/kvm/perfevent.cc | 2 +- src/cpu/kvm/timer.cc | 8 +++++--- src/cpu/kvm/vm.cc | 5 +++-- src/cpu/kvm/x86_cpu.cc | 7 ++++--- src/cpu/minor/activity.cc | 3 ++- src/cpu/minor/cpu.cc | 3 ++- src/cpu/minor/decode.cc | 1 + src/cpu/minor/dyn_inst.cc | 5 +++-- src/cpu/minor/execute.cc | 3 ++- src/cpu/minor/fetch1.cc | 3 ++- src/cpu/minor/fetch2.cc | 3 ++- src/cpu/minor/func_unit.cc | 3 ++- src/cpu/minor/lsq.cc | 3 ++- src/cpu/minor/pipeline.cc | 3 ++- src/cpu/minor/scoreboard.cc | 3 ++- src/cpu/nativetrace.cc | 3 ++- src/cpu/o3/base_dyn_inst.cc | 2 +- src/cpu/o3/checker.cc | 3 ++- src/cpu/o3/cpu.cc | 6 ++++-- src/cpu/o3/deriv.cc | 3 ++- src/cpu/o3/free_list.cc | 3 ++- src/cpu/o3/fu_pool.cc | 3 ++- src/cpu/o3/probe/simple_trace.cc | 3 ++- src/cpu/o3/regfile.cc | 2 +- src/cpu/o3/rename_map.cc | 3 ++- src/cpu/o3/scoreboard.cc | 3 ++- src/cpu/o3/store_set.cc | 3 ++- src/cpu/o3/thread_context.cc | 3 ++- src/cpu/pc_event.cc | 3 ++- src/cpu/pred/2bit_local.cc | 3 ++- src/cpu/pred/bi_mode.cc | 3 ++- src/cpu/pred/btb.cc | 3 ++- src/cpu/pred/tournament.cc | 3 ++- src/cpu/profile.cc | 5 +++-- src/cpu/quiesce_event.cc | 3 ++- src/cpu/simple/atomic.cc | 5 +++-- src/cpu/simple/base.cc | 5 +++-- src/cpu/simple/probes/simpoint.cc | 3 ++- src/cpu/simple/timing.cc | 6 +++--- src/cpu/simple_thread.cc | 3 ++- src/cpu/static_inst.cc | 3 ++- src/cpu/testers/directedtest/DirectedGenerator.cc | 1 + src/cpu/testers/directedtest/InvalidateGenerator.cc | 3 ++- src/cpu/testers/directedtest/RubyDirectedTester.cc | 3 ++- src/cpu/testers/directedtest/SeriesRequestGenerator.cc | 3 ++- .../testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc | 3 ++- src/cpu/testers/memtest/memtest.cc | 3 ++- src/cpu/testers/rubytest/Check.cc | 3 ++- src/cpu/testers/rubytest/CheckTable.cc | 3 ++- src/cpu/testers/rubytest/RubyTester.cc | 3 ++- src/cpu/thread_context.cc | 3 ++- src/cpu/thread_state.cc | 3 ++- src/cpu/timing_expr.cc | 3 ++- 62 files changed, 132 insertions(+), 74 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/activity.cc b/src/cpu/activity.cc index 87875c683..84eaf8452 100644 --- a/src/cpu/activity.cc +++ b/src/cpu/activity.cc @@ -28,9 +28,10 @@ * Authors: Kevin Lim */ +#include "cpu/activity.hh" + #include -#include "cpu/activity.hh" #include "cpu/timebuf.hh" #include "debug/Activity.hh" diff --git a/src/cpu/base.cc b/src/cpu/base.cc index aaf5a7a93..10b8ce297 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -45,18 +45,19 @@ * Rick Strong */ +#include "cpu/base.hh" + #include #include #include #include "arch/tlb.hh" -#include "base/loader/symtab.hh" #include "base/cprintf.hh" +#include "base/loader/symtab.hh" #include "base/misc.hh" #include "base/output.hh" #include "base/trace.hh" #include "cpu/checker/cpu.hh" -#include "cpu/base.hh" #include "cpu/cpuevent.hh" #include "cpu/profile.hh" #include "cpu/thread_context.hh" diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc index 9aae8b812..b22fb2a45 100644 --- a/src/cpu/checker/cpu.cc +++ b/src/cpu/checker/cpu.cc @@ -41,13 +41,14 @@ * Geoffrey Blake */ +#include "cpu/checker/cpu.hh" + #include #include #include "arch/generic/tlb.hh" #include "arch/kernel_stats.hh" #include "arch/vtophys.hh" -#include "cpu/checker/cpu.hh" #include "cpu/base.hh" #include "cpu/simple_thread.hh" #include "cpu/static_inst.hh" diff --git a/src/cpu/dummy_checker.cc b/src/cpu/dummy_checker.cc index aa4d45e2f..f9077bee0 100644 --- a/src/cpu/dummy_checker.cc +++ b/src/cpu/dummy_checker.cc @@ -38,6 +38,7 @@ */ #include "cpu/dummy_checker.hh" + #include "params/DummyChecker.hh" //////////////////////////////////////////////////////////////////////// diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc index dfd39d7cc..bbde89c00 100644 --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -31,6 +31,8 @@ * Steve Raasch */ +#include "cpu/exetrace.hh" + #include #include "arch/isa_traits.hh" @@ -38,7 +40,6 @@ #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 "debug/ExecAll.hh" diff --git a/src/cpu/func_unit.cc b/src/cpu/func_unit.cc index 3c2f1049d..d5d564050 100644 --- a/src/cpu/func_unit.cc +++ b/src/cpu/func_unit.cc @@ -28,10 +28,11 @@ * Authors: Steve Raasch */ +#include "cpu/func_unit.hh" + #include #include "base/misc.hh" -#include "cpu/func_unit.hh" using namespace std; diff --git a/src/cpu/inteltrace.cc b/src/cpu/inteltrace.cc index 05bdc64d0..c36f63920 100644 --- a/src/cpu/inteltrace.cc +++ b/src/cpu/inteltrace.cc @@ -31,11 +31,12 @@ * Steve Raasch */ +#include "cpu/inteltrace.hh" + #include #include "config/the_isa.hh" #include "cpu/exetrace.hh" -#include "cpu/inteltrace.hh" #include "cpu/static_inst.hh" using namespace std; diff --git a/src/cpu/intr_control.cc b/src/cpu/intr_control.cc index ca24495f4..9e842d03a 100644 --- a/src/cpu/intr_control.cc +++ b/src/cpu/intr_control.cc @@ -29,12 +29,13 @@ * Ron Dreslinski */ +#include "cpu/intr_control.hh" + #include #include #include "base/trace.hh" #include "cpu/base.hh" -#include "cpu/intr_control.hh" #include "cpu/thread_context.hh" #include "debug/IntrControl.hh" #include "sim/sim_object.hh" diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc index ddf80dbaa..723feda44 100644 --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -37,6 +37,8 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/base.hh" + #include #include #include @@ -48,7 +50,6 @@ #include "arch/mmapped_ipr.hh" #include "arch/utility.hh" -#include "cpu/kvm/base.hh" #include "debug/Checkpoint.hh" #include "debug/Drain.hh" #include "debug/Kvm.hh" @@ -58,8 +59,6 @@ #include "sim/process.hh" #include "sim/system.hh" -#include - /* Used by some KVM macros */ #define PAGE_SIZE pageSize diff --git a/src/cpu/kvm/perfevent.cc b/src/cpu/kvm/perfevent.cc index acc2af04b..5738b8eca 100644 --- a/src/cpu/kvm/perfevent.cc +++ b/src/cpu/kvm/perfevent.cc @@ -37,11 +37,11 @@ * Authors: Andreas Sandberg */ +#include #include #include #include #include -#include #include #include diff --git a/src/cpu/kvm/timer.cc b/src/cpu/kvm/timer.cc index cb48046f7..03b31bd3f 100644 --- a/src/cpu/kvm/timer.cc +++ b/src/cpu/kvm/timer.cc @@ -37,15 +37,17 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/timer.hh" + +#include +#include + #include #include #include -#include -#include #include "base/misc.hh" #include "base/trace.hh" -#include "cpu/kvm/timer.hh" #include "debug/KvmTimer.hh" /* According to timer_create(2), the value SIGEV_THREAD_ID can be used diff --git a/src/cpu/kvm/vm.cc b/src/cpu/kvm/vm.cc index 39bce32f4..d3ab8c45a 100644 --- a/src/cpu/kvm/vm.cc +++ b/src/cpu/kvm/vm.cc @@ -38,17 +38,18 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/vm.hh" + +#include #include #include #include #include -#include #include #include #include -#include "cpu/kvm/vm.hh" #include "debug/Kvm.hh" #include "params/KvmVM.hh" #include "sim/system.hh" diff --git a/src/cpu/kvm/x86_cpu.cc b/src/cpu/kvm/x86_cpu.cc index f8f66af2f..bdbdadf71 100644 --- a/src/cpu/kvm/x86_cpu.cc +++ b/src/cpu/kvm/x86_cpu.cc @@ -28,18 +28,19 @@ * Authors: Andreas Sandberg */ +#include "cpu/kvm/x86_cpu.hh" + #include #include #include #include -#include "arch/x86/regs/msr.hh" +#include "arch/registers.hh" #include "arch/x86/cpuid.hh" +#include "arch/x86/regs/msr.hh" #include "arch/x86/utility.hh" -#include "arch/registers.hh" #include "cpu/kvm/base.hh" -#include "cpu/kvm/x86_cpu.hh" #include "debug/Drain.hh" #include "debug/Kvm.hh" #include "debug/KvmContext.hh" diff --git a/src/cpu/minor/activity.cc b/src/cpu/minor/activity.cc index 8e322d3e7..4a4f9d71c 100644 --- a/src/cpu/minor/activity.cc +++ b/src/cpu/minor/activity.cc @@ -37,9 +37,10 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/activity.hh" + #include -#include "cpu/minor/activity.hh" #include "cpu/minor/trace.hh" namespace Minor diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc index 016a60f47..ae4fda6f6 100644 --- a/src/cpu/minor/cpu.cc +++ b/src/cpu/minor/cpu.cc @@ -37,8 +37,9 @@ * Authors: Andrew Bardsley */ -#include "arch/utility.hh" #include "cpu/minor/cpu.hh" + +#include "arch/utility.hh" #include "cpu/minor/dyn_inst.hh" #include "cpu/minor/fetch1.hh" #include "cpu/minor/pipeline.hh" diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc index a8a33d989..390ca5f11 100644 --- a/src/cpu/minor/decode.cc +++ b/src/cpu/minor/decode.cc @@ -38,6 +38,7 @@ */ #include "cpu/minor/decode.hh" + #include "cpu/minor/pipeline.hh" #include "debug/Decode.hh" diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc index 5d54f6913..16af15bd7 100644 --- a/src/cpu/minor/dyn_inst.cc +++ b/src/cpu/minor/dyn_inst.cc @@ -37,14 +37,15 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/dyn_inst.hh" + #include #include #include "arch/isa.hh" #include "arch/registers.hh" -#include "cpu/minor/dyn_inst.hh" -#include "cpu/minor/trace.hh" #include "cpu/base.hh" +#include "cpu/minor/trace.hh" #include "cpu/reg_class.hh" #include "debug/MinorExecute.hh" #include "enums/OpClass.hh" diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc index f5f006733..a38a7677a 100644 --- a/src/cpu/minor/execute.cc +++ b/src/cpu/minor/execute.cc @@ -37,12 +37,13 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/execute.hh" + #include "arch/locked_mem.hh" #include "arch/registers.hh" #include "arch/utility.hh" #include "cpu/minor/cpu.hh" #include "cpu/minor/exec_context.hh" -#include "cpu/minor/execute.hh" #include "cpu/minor/fetch1.hh" #include "cpu/minor/lsq.hh" #include "cpu/op_class.hh" diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc index f47f54962..0620fee1e 100644 --- a/src/cpu/minor/fetch1.cc +++ b/src/cpu/minor/fetch1.cc @@ -37,12 +37,13 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/fetch1.hh" + #include #include #include #include "base/cast.hh" -#include "cpu/minor/fetch1.hh" #include "cpu/minor/pipeline.hh" #include "debug/Drain.hh" #include "debug/Fetch.hh" diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc index 15d362da7..986f1f2ae 100644 --- a/src/cpu/minor/fetch2.cc +++ b/src/cpu/minor/fetch2.cc @@ -37,11 +37,12 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/fetch2.hh" + #include #include "arch/decoder.hh" #include "arch/utility.hh" -#include "cpu/minor/fetch2.hh" #include "cpu/minor/pipeline.hh" #include "cpu/pred/bpred_unit.hh" #include "debug/Branch.hh" diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc index aeee5cc44..a9248ba96 100644 --- a/src/cpu/minor/func_unit.cc +++ b/src/cpu/minor/func_unit.cc @@ -37,11 +37,12 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/func_unit.hh" + #include #include #include -#include "cpu/minor/func_unit.hh" #include "debug/MinorTiming.hh" #include "enums/OpClass.hh" diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc index 476f9d474..3b70c53aa 100644 --- a/src/cpu/minor/lsq.cc +++ b/src/cpu/minor/lsq.cc @@ -37,6 +37,8 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/lsq.hh" + #include #include @@ -45,7 +47,6 @@ #include "cpu/minor/cpu.hh" #include "cpu/minor/exec_context.hh" #include "cpu/minor/execute.hh" -#include "cpu/minor/lsq.hh" #include "cpu/minor/pipeline.hh" #include "debug/Activity.hh" #include "debug/MinorMem.hh" diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc index 8c04e3949..08dc3db74 100644 --- a/src/cpu/minor/pipeline.cc +++ b/src/cpu/minor/pipeline.cc @@ -37,13 +37,14 @@ * Authors: Andrew Bardsley */ +#include "cpu/minor/pipeline.hh" + #include #include "cpu/minor/decode.hh" #include "cpu/minor/execute.hh" #include "cpu/minor/fetch1.hh" #include "cpu/minor/fetch2.hh" -#include "cpu/minor/pipeline.hh" #include "debug/Drain.hh" #include "debug/MinorCPU.hh" #include "debug/MinorTrace.hh" diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc index f6b1f7944..4de3f9522 100644 --- a/src/cpu/minor/scoreboard.cc +++ b/src/cpu/minor/scoreboard.cc @@ -37,8 +37,9 @@ * Authors: Andrew Bardsley */ -#include "arch/registers.hh" #include "cpu/minor/scoreboard.hh" + +#include "arch/registers.hh" #include "cpu/reg_class.hh" #include "debug/MinorScoreboard.hh" #include "debug/MinorTiming.hh" diff --git a/src/cpu/nativetrace.cc b/src/cpu/nativetrace.cc index 6d1655ba7..9b5c27021 100644 --- a/src/cpu/nativetrace.cc +++ b/src/cpu/nativetrace.cc @@ -28,8 +28,9 @@ * Authors: Gabe Black */ -#include "base/socket.hh" #include "cpu/nativetrace.hh" + +#include "base/socket.hh" #include "cpu/static_inst.hh" #include "debug/GDBMisc.hh" #include "params/NativeTrace.hh" diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc index 5cf01f230..510109d8a 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; diff --git a/src/cpu/o3/checker.cc b/src/cpu/o3/checker.cc index be685d7c2..970af5300 100644 --- a/src/cpu/o3/checker.cc +++ b/src/cpu/o3/checker.cc @@ -40,8 +40,9 @@ * Authors: Kevin Lim */ -#include "cpu/checker/cpu_impl.hh" #include "cpu/o3/checker.hh" + +#include "cpu/checker/cpu_impl.hh" #include "params/O3Checker.hh" class MemObject; diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 9bda09bf8..d85895030 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -44,14 +44,15 @@ * Rick Strong */ +#include "cpu/o3/cpu.hh" + #include "arch/kernel_stats.hh" #include "config/the_isa.hh" +#include "cpu/activity.hh" #include "cpu/checker/cpu.hh" #include "cpu/checker/thread_context.hh" -#include "cpu/o3/cpu.hh" #include "cpu/o3/isa_specific.hh" #include "cpu/o3/thread_context.hh" -#include "cpu/activity.hh" #include "cpu/quiesce_event.hh" #include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" @@ -69,6 +70,7 @@ #if THE_ISA == ALPHA_ISA #include "arch/alpha/osfpal.hh" #include "debug/Activity.hh" + #endif struct BaseCPUParams; diff --git a/src/cpu/o3/deriv.cc b/src/cpu/o3/deriv.cc index 9f41b989f..6b2af76e0 100644 --- a/src/cpu/o3/deriv.cc +++ b/src/cpu/o3/deriv.cc @@ -28,9 +28,10 @@ * Authors: Kevin Lim */ +#include "cpu/o3/deriv.hh" + #include -#include "cpu/o3/deriv.hh" #include "params/DerivO3CPU.hh" DerivO3CPU * diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc index a9544587e..d4b3a2fd3 100644 --- a/src/cpu/o3/free_list.cc +++ b/src/cpu/o3/free_list.cc @@ -29,10 +29,11 @@ * Authors: Kevin Lim */ +#include "cpu/o3/free_list.hh" + #include "arch/registers.hh" #include "base/trace.hh" #include "config/the_isa.hh" -#include "cpu/o3/free_list.hh" #include "debug/FreeList.hh" UnifiedFreeList::UnifiedFreeList(const std::string &_my_name, diff --git a/src/cpu/o3/fu_pool.cc b/src/cpu/o3/fu_pool.cc index b99eeab69..414066e40 100644 --- a/src/cpu/o3/fu_pool.cc +++ b/src/cpu/o3/fu_pool.cc @@ -40,9 +40,10 @@ * Authors: Kevin Lim */ +#include "cpu/o3/fu_pool.hh" + #include -#include "cpu/o3/fu_pool.hh" #include "cpu/func_unit.hh" using namespace std; diff --git a/src/cpu/o3/probe/simple_trace.cc b/src/cpu/o3/probe/simple_trace.cc index 35d1365cb..060b4df13 100644 --- a/src/cpu/o3/probe/simple_trace.cc +++ b/src/cpu/o3/probe/simple_trace.cc @@ -37,8 +37,9 @@ * Authors: Matt Horsnell */ -#include "base/trace.hh" #include "cpu/o3/probe/simple_trace.hh" + +#include "base/trace.hh" #include "debug/SimpleTrace.hh" void SimpleTrace::traceCommit(const O3CPUImpl::DynInstPtr &dynInst) diff --git a/src/cpu/o3/regfile.cc b/src/cpu/o3/regfile.cc index 96ce44bdd..e1d84c683 100644 --- a/src/cpu/o3/regfile.cc +++ b/src/cpu/o3/regfile.cc @@ -31,9 +31,9 @@ * Steve Reinhardt */ -#include "cpu/o3/free_list.hh" #include "cpu/o3/regfile.hh" +#include "cpu/o3/free_list.hh" PhysRegFile::PhysRegFile(unsigned _numPhysicalIntRegs, unsigned _numPhysicalFloatRegs, diff --git a/src/cpu/o3/rename_map.cc b/src/cpu/o3/rename_map.cc index b0232df20..18c20cf8c 100644 --- a/src/cpu/o3/rename_map.cc +++ b/src/cpu/o3/rename_map.cc @@ -29,9 +29,10 @@ * Authors: Kevin Lim */ +#include "cpu/o3/rename_map.hh" + #include -#include "cpu/o3/rename_map.hh" #include "debug/Rename.hh" using namespace std; diff --git a/src/cpu/o3/scoreboard.cc b/src/cpu/o3/scoreboard.cc index 11b2858da..2b2b091af 100644 --- a/src/cpu/o3/scoreboard.cc +++ b/src/cpu/o3/scoreboard.cc @@ -30,8 +30,9 @@ * Kevin Lim */ -#include "config/the_isa.hh" #include "cpu/o3/scoreboard.hh" + +#include "config/the_isa.hh" #include "debug/Scoreboard.hh" Scoreboard::Scoreboard(const std::string &_my_name, diff --git a/src/cpu/o3/store_set.cc b/src/cpu/o3/store_set.cc index acd4a8d0a..9c21fbff3 100644 --- a/src/cpu/o3/store_set.cc +++ b/src/cpu/o3/store_set.cc @@ -28,10 +28,11 @@ * Authors: Kevin Lim */ +#include "cpu/o3/store_set.hh" + #include "base/intmath.hh" #include "base/misc.hh" #include "base/trace.hh" -#include "cpu/o3/store_set.hh" #include "debug/StoreSet.hh" StoreSet::StoreSet(uint64_t clear_period, int _SSIT_size, int _LFST_size) diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc index 7ca716dd1..672491193 100755 --- a/src/cpu/o3/thread_context.cc +++ b/src/cpu/o3/thread_context.cc @@ -28,8 +28,9 @@ * Authors: Kevin Lim */ -#include "cpu/o3/impl.hh" #include "cpu/o3/thread_context.hh" + +#include "cpu/o3/impl.hh" #include "cpu/o3/thread_context_impl.hh" template class O3ThreadContext; diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc index 837b17e34..4d01ca772 100644 --- a/src/cpu/pc_event.cc +++ b/src/cpu/pc_event.cc @@ -29,6 +29,8 @@ * Steve Reinhardt */ +#include "cpu/pc_event.hh" + #include #include #include @@ -36,7 +38,6 @@ #include "base/debug.hh" #include "base/trace.hh" #include "cpu/base.hh" -#include "cpu/pc_event.hh" #include "cpu/thread_context.hh" #include "debug/PCEvent.hh" #include "sim/core.hh" diff --git a/src/cpu/pred/2bit_local.cc b/src/cpu/pred/2bit_local.cc index 6f821e94c..adbb07583 100644 --- a/src/cpu/pred/2bit_local.cc +++ b/src/cpu/pred/2bit_local.cc @@ -28,10 +28,11 @@ * Authors: Kevin Lim */ +#include "cpu/pred/2bit_local.hh" + #include "base/intmath.hh" #include "base/misc.hh" #include "base/trace.hh" -#include "cpu/pred/2bit_local.hh" #include "debug/Fetch.hh" LocalBP::LocalBP(const LocalBPParams *params) diff --git a/src/cpu/pred/bi_mode.cc b/src/cpu/pred/bi_mode.cc index 355d0d8f7..69af4584a 100644 --- a/src/cpu/pred/bi_mode.cc +++ b/src/cpu/pred/bi_mode.cc @@ -32,9 +32,10 @@ * Implementation of a bi-mode branch predictor */ +#include "cpu/pred/bi_mode.hh" + #include "base/bitfield.hh" #include "base/intmath.hh" -#include "cpu/pred/bi_mode.hh" BiModeBP::BiModeBP(const BiModeBPParams *params) : BPredUnit(params), diff --git a/src/cpu/pred/btb.cc b/src/cpu/pred/btb.cc index c7ef1959f..9de3bb499 100644 --- a/src/cpu/pred/btb.cc +++ b/src/cpu/pred/btb.cc @@ -28,9 +28,10 @@ * Authors: Kevin Lim */ +#include "cpu/pred/btb.hh" + #include "base/intmath.hh" #include "base/trace.hh" -#include "cpu/pred/btb.hh" #include "debug/Fetch.hh" DefaultBTB::DefaultBTB(unsigned _numEntries, diff --git a/src/cpu/pred/tournament.cc b/src/cpu/pred/tournament.cc index c0c1c12cf..276338151 100644 --- a/src/cpu/pred/tournament.cc +++ b/src/cpu/pred/tournament.cc @@ -40,9 +40,10 @@ * Authors: Kevin Lim */ +#include "cpu/pred/tournament.hh" + #include "base/bitfield.hh" #include "base/intmath.hh" -#include "cpu/pred/tournament.hh" TournamentBP::TournamentBP(const TournamentBPParams *params) : BPredUnit(params), diff --git a/src/cpu/profile.cc b/src/cpu/profile.cc index 79ae22ca1..7558c38fe 100644 --- a/src/cpu/profile.cc +++ b/src/cpu/profile.cc @@ -28,15 +28,16 @@ * Authors: Nathan Binkert */ +#include "cpu/profile.hh" + #include -#include "base/loader/symtab.hh" #include "base/bitfield.hh" #include "base/callback.hh" +#include "base/loader/symtab.hh" #include "base/statistics.hh" #include "base/trace.hh" #include "cpu/base.hh" -#include "cpu/profile.hh" #include "cpu/thread_context.hh" using namespace std; diff --git a/src/cpu/quiesce_event.cc b/src/cpu/quiesce_event.cc index d5c3fe240..a152448d0 100644 --- a/src/cpu/quiesce_event.cc +++ b/src/cpu/quiesce_event.cc @@ -28,8 +28,9 @@ * Authors: Kevin Lim */ -#include "cpu/base.hh" #include "cpu/quiesce_event.hh" + +#include "cpu/base.hh" #include "cpu/thread_context.hh" #include "debug/Quiesce.hh" diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index 8dd81ae0b..c09f0c526 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -41,13 +41,14 @@ * Authors: Steve Reinhardt */ +#include "cpu/simple/atomic.hh" + #include "arch/locked_mem.hh" #include "arch/mmapped_ipr.hh" #include "arch/utility.hh" #include "base/bigint.hh" #include "base/output.hh" #include "config/the_isa.hh" -#include "cpu/simple/atomic.hh" #include "cpu/exetrace.hh" #include "debug/Drain.hh" #include "debug/ExecFaulting.hh" @@ -57,8 +58,8 @@ #include "mem/physical.hh" #include "params/AtomicSimpleCPU.hh" #include "sim/faults.hh" -#include "sim/system.hh" #include "sim/full_system.hh" +#include "sim/system.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index bd6861102..77d2fb4ac 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -41,21 +41,22 @@ * Authors: Steve Reinhardt */ +#include "cpu/simple/base.hh" + #include "arch/kernel_stats.hh" #include "arch/stacktrace.hh" #include "arch/tlb.hh" #include "arch/utility.hh" #include "arch/vtophys.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/trace.hh" #include "base/types.hh" #include "config/the_isa.hh" -#include "cpu/simple/base.hh" #include "cpu/base.hh" #include "cpu/checker/cpu.hh" #include "cpu/checker/thread_context.hh" diff --git a/src/cpu/simple/probes/simpoint.cc b/src/cpu/simple/probes/simpoint.cc index 4f4b5da39..5fa4a2671 100644 --- a/src/cpu/simple/probes/simpoint.cc +++ b/src/cpu/simple/probes/simpoint.cc @@ -38,9 +38,10 @@ * Curtis Dunham */ -#include "base/output.hh" #include "cpu/simple/probes/simpoint.hh" +#include "base/output.hh" + SimPoint::SimPoint(const SimPointParams *p) : ProbeListenerObject(p), intervalSize(p->interval), diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc index 65fea15ee..43c50b948 100644 --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -41,16 +41,18 @@ * Authors: Steve Reinhardt */ +#include "cpu/simple/timing.hh" + #include "arch/locked_mem.hh" #include "arch/mmapped_ipr.hh" #include "arch/utility.hh" #include "base/bigint.hh" #include "config/the_isa.hh" -#include "cpu/simple/timing.hh" #include "cpu/exetrace.hh" #include "debug/Config.hh" #include "debug/Drain.hh" #include "debug/ExecFaulting.hh" +#include "debug/Mwait.hh" #include "debug/SimpleCPU.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" @@ -59,8 +61,6 @@ #include "sim/full_system.hh" #include "sim/system.hh" -#include "debug/Mwait.hh" - using namespace std; using namespace TheISA; diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc index 0e17c07b5..7c3568cb3 100644 --- a/src/cpu/simple_thread.cc +++ b/src/cpu/simple_thread.cc @@ -31,6 +31,8 @@ * Kevin Lim */ +#include "cpu/simple_thread.hh" + #include #include "arch/isa_traits.hh" @@ -45,7 +47,6 @@ #include "cpu/base.hh" #include "cpu/profile.hh" #include "cpu/quiesce_event.hh" -#include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" #include "mem/fs_translating_port_proxy.hh" #include "mem/se_translating_port_proxy.hh" diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc index 387cf0575..d50c9f15d 100644 --- a/src/cpu/static_inst.cc +++ b/src/cpu/static_inst.cc @@ -29,9 +29,10 @@ * Nathan Binkert */ +#include "cpu/static_inst.hh" + #include -#include "cpu/static_inst.hh" #include "sim/core.hh" StaticInstPtr StaticInst::nullStaticInstPtr; diff --git a/src/cpu/testers/directedtest/DirectedGenerator.cc b/src/cpu/testers/directedtest/DirectedGenerator.cc index 5aee2a91c..e37868b65 100644 --- a/src/cpu/testers/directedtest/DirectedGenerator.cc +++ b/src/cpu/testers/directedtest/DirectedGenerator.cc @@ -28,6 +28,7 @@ */ #include "cpu/testers/directedtest/DirectedGenerator.hh" + #include "sim/system.hh" DirectedGenerator::DirectedGenerator(const Params *p) diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.cc b/src/cpu/testers/directedtest/InvalidateGenerator.cc index 6f4877309..20ea4f904 100644 --- a/src/cpu/testers/directedtest/InvalidateGenerator.cc +++ b/src/cpu/testers/directedtest/InvalidateGenerator.cc @@ -27,8 +27,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "cpu/testers/directedtest/DirectedGenerator.hh" #include "cpu/testers/directedtest/InvalidateGenerator.hh" + +#include "cpu/testers/directedtest/DirectedGenerator.hh" #include "cpu/testers/directedtest/RubyDirectedTester.hh" #include "debug/DirectedTest.hh" diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.cc b/src/cpu/testers/directedtest/RubyDirectedTester.cc index b85031720..9b4e4543c 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.cc +++ b/src/cpu/testers/directedtest/RubyDirectedTester.cc @@ -39,8 +39,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "cpu/testers/directedtest/DirectedGenerator.hh" #include "cpu/testers/directedtest/RubyDirectedTester.hh" + +#include "cpu/testers/directedtest/DirectedGenerator.hh" #include "debug/DirectedTest.hh" #include "sim/sim_exit.hh" diff --git a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc index 62d03fbf6..966ee4974 100644 --- a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc +++ b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc @@ -27,10 +27,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/directedtest/SeriesRequestGenerator.hh" + #include "base/random.hh" #include "cpu/testers/directedtest/DirectedGenerator.hh" #include "cpu/testers/directedtest/RubyDirectedTester.hh" -#include "cpu/testers/directedtest/SeriesRequestGenerator.hh" #include "debug/DirectedTest.hh" SeriesRequestGenerator::SeriesRequestGenerator(const Params *p) diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc index f5a718697..0f8c87729 100644 --- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc +++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc @@ -28,6 +28,8 @@ * Authors: Tushar Krishna */ +#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh" + #include #include #include @@ -37,7 +39,6 @@ #include "base/misc.hh" #include "base/random.hh" #include "base/statistics.hh" -#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh" #include "debug/GarnetSyntheticTraffic.hh" #include "mem/mem_object.hh" #include "mem/packet.hh" diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc index c2c721bcf..5dc8b7427 100644 --- a/src/cpu/testers/memtest/memtest.cc +++ b/src/cpu/testers/memtest/memtest.cc @@ -42,9 +42,10 @@ * Andreas Hansson */ +#include "cpu/testers/memtest/memtest.hh" + #include "base/random.hh" #include "base/statistics.hh" -#include "cpu/testers/memtest/memtest.hh" #include "debug/MemTest.hh" #include "mem/mem_object.hh" #include "sim/sim_exit.hh" diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc index c869bd728..f685d65be 100644 --- a/src/cpu/testers/rubytest/Check.cc +++ b/src/cpu/testers/rubytest/Check.cc @@ -27,8 +27,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "base/random.hh" #include "cpu/testers/rubytest/Check.hh" + +#include "base/random.hh" #include "debug/RubyTest.hh" #include "mem/ruby/common/SubBlock.hh" diff --git a/src/cpu/testers/rubytest/CheckTable.cc b/src/cpu/testers/rubytest/CheckTable.cc index 3bdd73f27..54248095b 100644 --- a/src/cpu/testers/rubytest/CheckTable.cc +++ b/src/cpu/testers/rubytest/CheckTable.cc @@ -27,10 +27,11 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/rubytest/CheckTable.hh" + #include "base/intmath.hh" #include "base/random.hh" #include "cpu/testers/rubytest/Check.hh" -#include "cpu/testers/rubytest/CheckTable.hh" #include "debug/RubyTest.hh" CheckTable::CheckTable(int _num_writers, int _num_readers, RubyTester* _tester) diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc index 5ed6d7f66..61de05235 100644 --- a/src/cpu/testers/rubytest/RubyTester.cc +++ b/src/cpu/testers/rubytest/RubyTester.cc @@ -39,9 +39,10 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "cpu/testers/rubytest/RubyTester.hh" + #include "base/misc.hh" #include "cpu/testers/rubytest/Check.hh" -#include "cpu/testers/rubytest/RubyTester.hh" #include "debug/RubyTest.hh" #include "mem/ruby/common/SubBlock.hh" #include "sim/sim_exit.hh" diff --git a/src/cpu/thread_context.cc b/src/cpu/thread_context.cc index 691465996..cea21e790 100644 --- a/src/cpu/thread_context.cc +++ b/src/cpu/thread_context.cc @@ -41,13 +41,14 @@ * Authors: Kevin Lim */ +#include "cpu/thread_context.hh" + #include "arch/kernel_stats.hh" #include "base/misc.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "cpu/base.hh" #include "cpu/quiesce_event.hh" -#include "cpu/thread_context.hh" #include "debug/Context.hh" #include "debug/Quiesce.hh" #include "params/BaseCPU.hh" diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc index 424187613..92be17977 100644 --- a/src/cpu/thread_state.cc +++ b/src/cpu/thread_state.cc @@ -28,12 +28,13 @@ * Authors: Kevin Lim */ +#include "cpu/thread_state.hh" + #include "arch/kernel_stats.hh" #include "base/output.hh" #include "cpu/base.hh" #include "cpu/profile.hh" #include "cpu/quiesce_event.hh" -#include "cpu/thread_state.hh" #include "mem/fs_translating_port_proxy.hh" #include "mem/port.hh" #include "mem/port_proxy.hh" diff --git a/src/cpu/timing_expr.cc b/src/cpu/timing_expr.cc index 36a643ed2..88bc5476f 100644 --- a/src/cpu/timing_expr.cc +++ b/src/cpu/timing_expr.cc @@ -37,9 +37,10 @@ * Authors: Andrew Bardsley */ -#include "base/intmath.hh" #include "cpu/timing_expr.hh" +#include "base/intmath.hh" + TimingExprEvalContext::TimingExprEvalContext(const StaticInstPtr &inst_, ThreadContext *thread_, TimingExprLet *let_) : -- cgit v1.2.3