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

13 files changed, 23 insertions, 12 deletions

diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc
index 8ace3cb25..c181e3021 100644
--- a/src/arch/sparc/faults.cc
+++ b/src/arch/sparc/faults.cc
@@ -29,20 +29,20 @@
  *          Kevin Lim
  */
 
+#include "arch/sparc/faults.hh"
+
 #include <algorithm>
 
-#include "arch/sparc/faults.hh"
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/process.hh"
 #include "arch/sparc/types.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
-#include "sim/full_system.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"
 
 using namespace std;
 
diff --git a/src/arch/sparc/isa.cc b/src/arch/sparc/isa.cc
index aa10a0b46..b8906e95f 100644
--- a/src/arch/sparc/isa.cc
+++ b/src/arch/sparc/isa.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/sparc/isa.hh"
+
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/decoder.hh"
-#include "arch/sparc/isa.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc
index ce6094060..fd4dd9818 100644
--- a/src/arch/sparc/linux/process.cc
+++ b/src/arch/sparc/linux/process.cc
@@ -31,6 +31,7 @@
  */
 
 #include "arch/sparc/linux/process.hh"
+
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "base/trace.hh"
diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc
index 8987aa518..509e3adb9 100644
--- a/src/arch/sparc/nativetrace.cc
+++ b/src/arch/sparc/nativetrace.cc
@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/nativetrace.hh"
+
+#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "cpu/thread_context.hh"
 #include "params/SparcNativeTrace.hh"
diff --git a/src/arch/sparc/pagetable.cc b/src/arch/sparc/pagetable.cc
index f0d2c10cf..0a14f0b80 100644
--- a/src/arch/sparc/pagetable.cc
+++ b/src/arch/sparc/pagetable.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/sparc/pagetable.hh"
+
 #include "sim/serialize.hh"
 
 namespace SparcISA
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index 09d52ae6b..f863eb018 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -29,10 +29,11 @@
  *          Ali Saidi
  */
 
+#include "arch/sparc/process.hh"
+
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/handlers.hh"
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/process.hh"
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/types.hh"
 #include "base/loader/elf_object.hh"
diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 46788af17..b7ecd3b7a 100644
--- a/src/arch/sparc/remote_gdb.cc
+++ b/src/arch/sparc/remote_gdb.cc
@@ -119,13 +119,14 @@
  * "Stub" to allow remote cpu to debug over a serial line using gdb.
  */
 
-#include <signal.h>
+#include "arch/sparc/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
+#include <csignal>
 #include <string>
 
-#include "arch/sparc/remote_gdb.hh"
 #include "arch/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc
index f929877f3..38159720a 100644
--- a/src/arch/sparc/solaris/process.cc
+++ b/src/arch/sparc/solaris/process.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/sparc/solaris/process.hh"
+
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "base/trace.hh"
diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc
index 5c7f06db3..a68b11cad 100644
--- a/src/arch/sparc/system.cc
+++ b/src/arch/sparc/system.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/sparc/system.hh"
+
 #include "arch/vtophys.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index b4a761293..51eb83ac2 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -28,12 +28,13 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/sparc/tlb.hh"
+
 #include <cstring>
 
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/faults.hh"
 #include "arch/sparc/registers.hh"
-#include "arch/sparc/tlb.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
 #include "cpu/base.hh"
diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc
index 2c100957f..274301b37 100644
--- a/src/arch/sparc/ua2005.cc
+++ b/src/arch/sparc/ua2005.cc
@@ -35,8 +35,8 @@
 #include "cpu/thread_context.hh"
 #include "debug/Quiesce.hh"
 #include "debug/Timer.hh"
-#include "sim/system.hh"
 #include "sim/full_system.hh"
+#include "sim/system.hh"
 
 using namespace SparcISA;
 using namespace std;
diff --git a/src/arch/sparc/utility.cc b/src/arch/sparc/utility.cc
index 34d4f79b3..8f997aabf 100644
--- a/src/arch/sparc/utility.cc
+++ b/src/arch/sparc/utility.cc
@@ -29,8 +29,9 @@
  *          Ali Saidi
  */
 
-#include "arch/sparc/faults.hh"
 #include "arch/sparc/utility.hh"
+
+#include "arch/sparc/faults.hh"
 #include "arch/sparc/vtophys.hh"
 #include "mem/fs_translating_port_proxy.hh"
 
diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc
index e3d4f5066..6ba62eb9c 100644
--- a/src/arch/sparc/vtophys.cc
+++ b/src/arch/sparc/vtophys.cc
@@ -28,10 +28,11 @@
  * Authors: Ali Saidi
  */
 
+#include "arch/sparc/vtophys.hh"
+
 #include <string>
 
 #include "arch/sparc/tlb.hh"
-#include "arch/sparc/vtophys.hh"
 #include "base/chunk_generator.hh"
 #include "base/compiler.hh"
 #include "base/trace.hh"