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

15 files changed, 28 insertions, 15 deletions

diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index 8bb781c13..8a6e469f2 100644
--- a/src/arch/alpha/faults.cc
+++ b/src/arch/alpha/faults.cc
@@ -29,15 +29,16 @@
  *          Kevin Lim
  */
 
-#include "arch/alpha/ev5.hh"
 #include "arch/alpha/faults.hh"
+
+#include "arch/alpha/ev5.hh"
 #include "arch/alpha/tlb.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
-#include "sim/process.hh"
 #include "sim/full_system.hh"
+#include "sim/process.hh"
 
 namespace AlphaISA {
 
diff --git a/src/arch/alpha/freebsd/system.cc b/src/arch/alpha/freebsd/system.cc
index 303d5f762..4599c70b0 100644
--- a/src/arch/alpha/freebsd/system.cc
+++ b/src/arch/alpha/freebsd/system.cc
@@ -36,6 +36,7 @@
  */
 
 #include "arch/alpha/freebsd/system.hh"
+
 #include "arch/alpha/system.hh"
 #include "arch/isa_traits.hh"
 #include "arch/vtophys.hh"
diff --git a/src/arch/alpha/idle_event.cc b/src/arch/alpha/idle_event.cc
index bb68782e7..85e1d4410 100644
--- a/src/arch/alpha/idle_event.cc
+++ b/src/arch/alpha/idle_event.cc
@@ -30,6 +30,7 @@
  */
 
 #include "arch/alpha/idle_event.hh"
+
 #include "arch/alpha/kernel_stats.hh"
 #include "cpu/thread_context.hh"
 
diff --git a/src/arch/alpha/ipr.cc b/src/arch/alpha/ipr.cc
index 502ada5eb..909f15385 100644
--- a/src/arch/alpha/ipr.cc
+++ b/src/arch/alpha/ipr.cc
@@ -28,11 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/alpha/ipr.hh"
+
 #include <cassert>
 #include <cstring>
 
-#include "arch/alpha/ipr.hh"
-
 namespace AlphaISA {
 
 md_ipr_names MiscRegIndexToIpr[NumInternalProcRegs] = {
diff --git a/src/arch/alpha/isa.cc b/src/arch/alpha/isa.cc
index 8240037cc..fd2dda67c 100644
--- a/src/arch/alpha/isa.cc
+++ b/src/arch/alpha/isa.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/alpha/isa.hh"
+
 #include <cassert>
 
-#include "arch/alpha/isa.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
 #include "params/AlphaISA.hh"
diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc
index ada79c757..fed8b09e4 100644
--- a/src/arch/alpha/kernel_stats.cc
+++ b/src/arch/alpha/kernel_stats.cc
@@ -29,13 +29,14 @@
  *          Nathan Binkert
  */
 
+#include "arch/alpha/kernel_stats.hh"
+
 #include <map>
 #include <stack>
 #include <string>
 
-#include "arch/generic/linux/threadinfo.hh"
-#include "arch/alpha/kernel_stats.hh"
 #include "arch/alpha/osfpal.hh"
+#include "arch/generic/linux/threadinfo.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/Context.hh"
diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index ebe06510d..9a26bb9b8 100644
--- a/src/arch/alpha/linux/process.cc
+++ b/src/arch/alpha/linux/process.cc
@@ -29,9 +29,10 @@
  *          Ali Saidi
  */
 
-#include "arch/alpha/linux/linux.hh"
 #include "arch/alpha/linux/process.hh"
+
 #include "arch/alpha/isa_traits.hh"
+#include "arch/alpha/linux/linux.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/SyscallVerbose.hh"
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index 80d13cdfa..3ecf42f0b 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -41,6 +41,7 @@
  */
 
 #include "arch/alpha/linux/system.hh"
+
 #include "arch/alpha/idle_event.hh"
 #include "arch/alpha/system.hh"
 #include "arch/generic/linux/threadinfo.hh"
diff --git a/src/arch/alpha/pagetable.cc b/src/arch/alpha/pagetable.cc
index f2b1147f7..30d8b3367 100644
--- a/src/arch/alpha/pagetable.cc
+++ b/src/arch/alpha/pagetable.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/alpha/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace AlphaISA {
diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 9e298f0c6..be286e30e 100644
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -29,8 +29,9 @@
  *          Ali Saidi
  */
 
-#include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/process.hh"
+
+#include "arch/alpha/isa_traits.hh"
 #include "base/loader/elf_object.hh"
 #include "base/loader/object_file.hh"
 #include "base/misc.hh"
diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index f32d49e97..8c01005da 100644
--- a/src/arch/alpha/remote_gdb.cc
+++ b/src/arch/alpha/remote_gdb.cc
@@ -117,15 +117,15 @@
  * "Stub" to allow remote cpu to debug over a serial line using gdb.
  */
 
+#include "arch/alpha/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
 #include <string>
 
-
 #include "arch/alpha/decoder.hh"
 #include "arch/alpha/regredir.hh"
-#include "arch/alpha/remote_gdb.hh"
 #include "arch/alpha/utility.hh"
 #include "arch/alpha/vtophys.hh"
 #include "base/intmath.hh"
@@ -138,8 +138,8 @@
 #include "debug/GDBMisc.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
-#include "sim/system.hh"
 #include "sim/full_system.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace AlphaISA;
diff --git a/src/arch/alpha/stacktrace.cc b/src/arch/alpha/stacktrace.cc
index f48955715..1dc5956c7 100644
--- a/src/arch/alpha/stacktrace.cc
+++ b/src/arch/alpha/stacktrace.cc
@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "arch/alpha/stacktrace.hh"
+
 #include <string>
 
 #include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/stacktrace.hh"
 #include "arch/alpha/vtophys.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
diff --git a/src/arch/alpha/system.cc b/src/arch/alpha/system.cc
index d2be5492f..302942981 100644
--- a/src/arch/alpha/system.cc
+++ b/src/arch/alpha/system.cc
@@ -29,10 +29,11 @@
  *          Nathan Binkert
  */
 
+#include "arch/alpha/system.hh"
+
 #include <sys/signal.h>
 
 #include "arch/alpha/ev5.hh"
-#include "arch/alpha/system.hh"
 #include "arch/vtophys.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
diff --git a/src/arch/alpha/utility.cc b/src/arch/alpha/utility.cc
index 2dfe00f96..de4b4e34d 100644
--- a/src/arch/alpha/utility.cc
+++ b/src/arch/alpha/utility.cc
@@ -30,6 +30,7 @@
  */
 
 #include "arch/alpha/utility.hh"
+
 #include "arch/alpha/vtophys.hh"
 #include "mem/fs_translating_port_proxy.hh"
 #include "sim/full_system.hh"
diff --git a/src/arch/alpha/vtophys.cc b/src/arch/alpha/vtophys.cc
index 8ca23fce2..baf30418a 100644
--- a/src/arch/alpha/vtophys.cc
+++ b/src/arch/alpha/vtophys.cc
@@ -30,10 +30,11 @@
  *          Ali Saidi
  */
 
+#include "arch/alpha/vtophys.hh"
+
 #include <string>
 
 #include "arch/alpha/ev5.hh"
-#include "arch/alpha/vtophys.hh"
 #include "base/chunk_generator.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"