style: [patch 1/22] use /r/3648/ to reorganize includes

24 files changed, 53 insertions, 30 deletions

diff --git a/src/sim/arguments.cc b/src/sim/arguments.cc
index 6d45e3b3d..5d6ded9ee 100644
--- a/src/sim/arguments.cc
+++ b/src/sim/arguments.cc
@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "sim/arguments.hh"
+
 #include "arch/utility.hh"
 #include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
-#include "sim/arguments.hh"
 
 Arguments::Data::~Data()
 {
diff --git a/src/sim/backtrace_glibc.cc b/src/sim/backtrace_glibc.cc
index 584f9f30e..a2958a6a1 100644
--- a/src/sim/backtrace_glibc.cc
+++ b/src/sim/backtrace_glibc.cc
@@ -37,12 +37,11 @@
  * Authors: Andreas Sandberg
  */
 
-#include "sim/backtrace.hh"
-
 #include <execinfo.h>
 #include <unistd.h>
 
 #include "base/atomicio.hh"
+#include "sim/backtrace.hh"
 
 #define SAFE_MSG(m)                                             \
     do {                                                        \
diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc
index 9865c4d11..5b05ced9b 100644
--- a/src/sim/clock_domain.cc
+++ b/src/sim/clock_domain.cc
@@ -42,6 +42,8 @@
  *          Stephan Diestelhorst
  */
 
+#include "sim/clock_domain.hh"
+
 #include <algorithm>
 #include <functional>
 
@@ -49,9 +51,8 @@
 #include "params/ClockDomain.hh"
 #include "params/DerivedClockDomain.hh"
 #include "params/SrcClockDomain.hh"
-#include "sim/clock_domain.hh"
-#include "sim/voltage_domain.hh"
 #include "sim/clocked_object.hh"
+#include "sim/voltage_domain.hh"
 
 void
 ClockDomain::regStats()
diff --git a/src/sim/core.cc b/src/sim/core.cc
index 1333c8b22..279012f9b 100644
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -31,12 +31,13 @@
  *          Steve Reinhardt
  */
 
+#include "sim/core.hh"
+
 #include <iostream>
 #include <string>
 
 #include "base/callback.hh"
 #include "base/output.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 
 using namespace std;
diff --git a/src/sim/cxx_manager.cc b/src/sim/cxx_manager.cc
index e0b209aa4..a679c6105 100644
--- a/src/sim/cxx_manager.cc
+++ b/src/sim/cxx_manager.cc
@@ -37,13 +37,14 @@
  * Authors: Andrew Bardsley
  */
 
+#include "sim/cxx_manager.hh"
+
 #include <cstdlib>
 #include <sstream>
 
 #include "base/str.hh"
 #include "debug/CxxConfig.hh"
 #include "mem/mem_object.hh"
-#include "sim/cxx_manager.hh"
 #include "sim/serialize.hh"
 
 CxxConfigManager::CxxConfigManager(CxxConfigFileBase &configFile_) :
diff --git a/src/sim/debug.cc b/src/sim/debug.cc
index 9fab75108..b8291c862 100644
--- a/src/sim/debug.cc
+++ b/src/sim/debug.cc
@@ -29,16 +29,17 @@
  *          Steve Reinhardt
  */
 
+#include "sim/debug.hh"
+
 #include <string>
 #include <vector>
 
 #include "base/debug.hh"
-#include "sim/debug.hh"
+#include "cpu/pc_event.hh"
 #include "sim/eventq_impl.hh"
 #include "sim/global_event.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
-#include "cpu/pc_event.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc
index f11e3f118..254720c5f 100644
--- a/src/sim/dvfs_handler.cc
+++ b/src/sim/dvfs_handler.cc
@@ -39,6 +39,8 @@
  *          Stephan Diestelhorst
  */
 
+#include "sim/dvfs_handler.hh"
+
 #include <set>
 #include <utility>
 
@@ -46,7 +48,6 @@
 #include "debug/DVFS.hh"
 #include "params/DVFSHandler.hh"
 #include "sim/clock_domain.hh"
-#include "sim/dvfs_handler.hh"
 #include "sim/stat_control.hh"
 #include "sim/voltage_domain.hh"
 
diff --git a/src/sim/faults.cc b/src/sim/faults.cc
index abcad6d3c..93e766526 100644
--- a/src/sim/faults.cc
+++ b/src/sim/faults.cc
@@ -29,13 +29,14 @@
  *          Gabe Black
  */
 
+#include "sim/faults.hh"
+
 #include "arch/isa_traits.hh"
 #include "base/misc.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Fault.hh"
 #include "mem/page_table.hh"
-#include "sim/faults.hh"
 #include "sim/full_system.hh"
 #include "sim/process.hh"
 
diff --git a/src/sim/init.cc b/src/sim/init.cc
index 2e1dd629c..d46e76324 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -41,6 +41,8 @@
  * Authors: Nathan Binkert
  */
 
+#include "sim/init.hh"
+
 #include <Python.h>
 
 #include <marshal.h>
@@ -56,10 +58,10 @@
 #include "config/have_protobuf.hh"
 #include "sim/async.hh"
 #include "sim/core.hh"
-#include "sim/init.hh"
 
 #if HAVE_PROTOBUF
 #include <google/protobuf/stubs/common.h>
+
 #endif
 
 using namespace std;
diff --git a/src/sim/probe/probe.cc b/src/sim/probe/probe.cc
index 600d9dcc4..5f20f7861 100644
--- a/src/sim/probe/probe.cc
+++ b/src/sim/probe/probe.cc
@@ -37,9 +37,10 @@
  * Authors: Matt Horsnell
  */
 
-#include "debug/ProbeVerbose.hh"
 #include "sim/probe/probe.hh"
 
+#include "debug/ProbeVerbose.hh"
+
 ProbePoint::ProbePoint(ProbeManager *manager, const std::string& _name)
     : name(_name)
 {
diff --git a/src/sim/process.cc b/src/sim/process.cc
index ef3ab9ecd..1272949a1 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -43,6 +43,8 @@
  *          Ali Saidi
  */
 
+#include "sim/process.hh"
+
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -50,19 +52,18 @@
 #include <map>
 #include <string>
 
+#include "base/intmath.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
-#include "base/intmath.hh"
 #include "base/statistics.hh"
 #include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
-#include "mem/page_table.hh"
 #include "mem/multi_level_page_table.hh"
+#include "mem/page_table.hh"
 #include "mem/se_translating_port_proxy.hh"
 #include "params/LiveProcess.hh"
 #include "params/Process.hh"
 #include "sim/debug.hh"
-#include "sim/process.hh"
 #include "sim/process_impl.hh"
 #include "sim/stats.hh"
 #include "sim/syscall_emul.hh"
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index eed332747..8c2d26b00 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -41,6 +41,8 @@
  * Authors: Nathan Binkert
  */
 
+#include "sim/pseudo_inst.hh"
+
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -50,9 +52,9 @@
 #include <vector>
 
 #include "arch/kernel_stats.hh"
+#include "arch/pseudo_inst.hh"
 #include "arch/utility.hh"
 #include "arch/vtophys.hh"
-#include "arch/pseudo_inst.hh"
 #include "base/debug.hh"
 #include "base/output.hh"
 #include "config/the_isa.hh"
@@ -68,7 +70,6 @@
 #include "sim/full_system.hh"
 #include "sim/initparam_keys.hh"
 #include "sim/process.hh"
-#include "sim/pseudo_inst.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
diff --git a/src/sim/py_interact.cc b/src/sim/py_interact.cc
index 7e6527e81..8acff40dd 100644
--- a/src/sim/py_interact.cc
+++ b/src/sim/py_interact.cc
@@ -29,10 +29,10 @@
  *          Steve Reinhardt
  */
 
-#include <Python.h>
-
 #include "sim/py_interact.hh"
 
+#include <Python.h>
+
 void
 py_interact()
 {
diff --git a/src/sim/root.cc b/src/sim/root.cc
index 7647ca5b7..6787564dd 100644
--- a/src/sim/root.cc
+++ b/src/sim/root.cc
@@ -31,12 +31,13 @@
  *          Gabe Black
  */
 
+#include "sim/root.hh"
+
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
 #include "debug/TimeSync.hh"
 #include "sim/full_system.hh"
-#include "sim/root.hh"
 
 Root *Root::_root = NULL;
 
diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc
index d2e699c28..f06aaf899 100644
--- a/src/sim/serialize.cc
+++ b/src/sim/serialize.cc
@@ -45,6 +45,8 @@
  *          Andreas Sandberg
  */
 
+#include "sim/serialize.hh"
+
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -63,7 +65,6 @@
 #include "base/trace.hh"
 #include "debug/Checkpoint.hh"
 #include "sim/eventq.hh"
-#include "sim/serialize.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
 #include "sim/sim_object.hh"
diff --git a/src/sim/sim_events.cc b/src/sim/sim_events.cc
index cfd08f7ac..23da8fd8d 100644
--- a/src/sim/sim_events.cc
+++ b/src/sim/sim_events.cc
@@ -42,12 +42,13 @@
  * Authors: Nathan Binkert
  */
 
+#include "sim/sim_events.hh"
+
 #include <string>
 
 #include "base/callback.hh"
 #include "base/hostinfo.hh"
 #include "sim/eventq_impl.hh"
-#include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
 #include "sim/stats.hh"
 
diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index af0ef3c2f..0ccc36b35 100644
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -30,6 +30,8 @@
  *          Nathan Binkert
  */
 
+#include "sim/sim_object.hh"
+
 #include <cassert>
 
 #include "base/callback.hh"
@@ -40,7 +42,6 @@
 #include "base/types.hh"
 #include "debug/Checkpoint.hh"
 #include "sim/probe/probe.hh"
-#include "sim/sim_object.hh"
 #include "sim/stats.hh"
 
 using namespace std;
diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc
index e0b80bbe8..c6eb2ddf6 100644
--- a/src/sim/simulate.cc
+++ b/src/sim/simulate.cc
@@ -31,6 +31,8 @@
  *          Steve Reinhardt
  */
 
+#include "sim/simulate.hh"
+
 #include <mutex>
 #include <thread>
 
@@ -41,7 +43,6 @@
 #include "sim/eventq_impl.hh"
 #include "sim/sim_events.hh"
 #include "sim/sim_exit.hh"
-#include "sim/simulate.hh"
 #include "sim/stat_control.hh"
 
 //! Mutex for handling async events.
diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index 75e717bfa..6324b36ef 100644
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -46,6 +46,8 @@
 // This file will contain default statistics for the simulator that
 // don't really belong to a specific simulator object
 
+#include "sim/stat_control.hh"
+
 #include <fstream>
 #include <iostream>
 #include <list>
@@ -56,7 +58,6 @@
 #include "base/time.hh"
 #include "cpu/base.hh"
 #include "sim/global_event.hh"
-#include "sim/stat_control.hh"
 
 using namespace std;
 
diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 889a98364..73961e8b7 100644
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -44,6 +44,9 @@
 #ifndef __SIM_STAT_CONTROL_HH__
 #define __SIM_STAT_CONTROL_HH__
 
+#include "base/types.hh"
+#include "sim/core.hh"
+
 namespace Stats {
 
 double statElapsedTime();
diff --git a/src/sim/sub_system.cc b/src/sim/sub_system.cc
index 8fc930b99..2ccdc6bdd 100644
--- a/src/sim/sub_system.cc
+++ b/src/sim/sub_system.cc
@@ -40,7 +40,6 @@
 #include "sim/sub_system.hh"
 
 #include "params/SubSystem.hh"
-#include "sim/sub_system.hh"
 #include "sim/power/power_model.hh"
 #include "sim/power/thermal_domain.hh"
 
diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index 9c3f50bb3..499cd2557 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -29,6 +29,8 @@
  *          Ali Saidi
  */
 
+#include "sim/syscall_emul.hh"
+
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -47,7 +49,6 @@
 #include "mem/page_table.hh"
 #include "sim/process.hh"
 #include "sim/sim_exit.hh"
-#include "sim/syscall_emul.hh"
 #include "sim/system.hh"
 
 using namespace std;
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 9f240c9bc..c0fb08318 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -45,6 +45,8 @@
  *          Rick Strong
  */
 
+#include "sim/system.hh"
+
 #include "arch/remote_gdb.hh"
 #include "arch/utility.hh"
 #include "base/loader/object_file.hh"
@@ -60,7 +62,6 @@
 #include "sim/byteswap.hh"
 #include "sim/debug.hh"
 #include "sim/full_system.hh"
-#include "sim/system.hh"
 
 /**
  * To avoid linking errors with LTO, only include the header if we
@@ -68,6 +69,7 @@
  */
 #if THE_ISA != NULL_ISA
 #include "kern/kernel_stats.hh"
+
 #endif
 
 using namespace std;
diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc
index 61715dfbc..0c5b65d6a 100644
--- a/src/sim/voltage_domain.cc
+++ b/src/sim/voltage_domain.cc
@@ -38,13 +38,14 @@
  *          Akash Bagdia
  */
 
+#include "sim/voltage_domain.hh"
+
 #include <algorithm>
 
 #include "base/statistics.hh"
 #include "debug/VoltageDomain.hh"
 #include "params/VoltageDomain.hh"
 #include "sim/sim_object.hh"
-#include "sim/voltage_domain.hh"
 
 VoltageDomain::VoltageDomain(const Params *p)
     : SimObject(p), voltageOpPoints(p->voltage), _perfLevel(0)