includes: sort all includes

24 files changed, 33 insertions, 34 deletions

diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 01d43f338..4150adba6 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -43,9 +43,9 @@
  */
 
 #include "arch/arm/faults.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "base/trace.hh"
+#include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 
 namespace ArmISA
 {
diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh
index 8df8d0abf..234d8cfec 100644
--- a/src/arch/arm/faults.hh
+++ b/src/arch/arm/faults.hh
@@ -47,9 +47,9 @@
 
 #include "arch/arm/miscregs.hh"
 #include "arch/arm/types.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
 #include "sim/faults.hh"
-#include "base/misc.hh"
 
 // The design of the "name" and "vect" functions is in sim/faults.hh
 
diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index 28852bf89..e056856b6 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -40,9 +40,10 @@
  * Authors: Stephen Hines
  */
 
+#include <sstream>
+
 #include "arch/arm/insts/macromem.hh"
 #include "arch/arm/decoder.hh"
-#include <sstream>
 
 using namespace std;
 using namespace ArmISAInst;
diff --git a/src/arch/arm/insts/static_inst.cc b/src/arch/arm/insts/static_inst.cc
index 528111759..8306c620f 100644
--- a/src/arch/arm/insts/static_inst.cc
+++ b/src/arch/arm/insts/static_inst.cc
@@ -40,11 +40,11 @@
  * Authors: Stephen Hines
  */
 
-#include "arch/arm/faults.hh"
 #include "arch/arm/insts/static_inst.hh"
+#include "arch/arm/faults.hh"
+#include "base/loader/symtab.hh"
 #include "base/condcodes.hh"
 #include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
 
 namespace ArmISA
 {
diff --git a/src/arch/arm/insts/vfp.hh b/src/arch/arm/insts/vfp.hh
index e962704e0..57b74d040 100644
--- a/src/arch/arm/insts/vfp.hh
+++ b/src/arch/arm/insts/vfp.hh
@@ -40,11 +40,13 @@
 #ifndef __ARCH_ARM_INSTS_VFP_HH__
 #define __ARCH_ARM_INSTS_VFP_HH__
 
-#include "arch/arm/insts/misc.hh"
-#include "arch/arm/miscregs.hh"
 #include <fenv.h>
+
 #include <cmath>
 
+#include "arch/arm/insts/misc.hh"
+#include "arch/arm/miscregs.hh"
+
 namespace ArmISA
 {
 
diff --git a/src/arch/arm/intregs.hh b/src/arch/arm/intregs.hh
index 2cbed6c59..9da910106 100644
--- a/src/arch/arm/intregs.hh
+++ b/src/arch/arm/intregs.hh
@@ -40,7 +40,7 @@
  * Authors: Gabe Black
  */
 
-#include <assert.h>
+#include <cassert>
 
 #ifndef __ARCH_ARM_INTREGS_HH__
 #define __ARCH_ARM_INTREGS_HH__
diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa
index 5840cc9b2..aebce0944 100644
--- a/src/arch/arm/isa/includes.isa
+++ b/src/arch/arm/isa/includes.isa
@@ -46,8 +46,8 @@
 //
 
 output header {{
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "arch/arm/insts/branch.hh"
 #include "arch/arm/insts/macromem.hh"
@@ -67,21 +67,21 @@ output decoder {{
 #include "arch/arm/intregs.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "cpu/thread_context.hh"
 
 using namespace ArmISA;
 }};
 
 output exec {{
+#include <cmath>
+
 #include "arch/arm/faults.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 #include "base/condcodes.hh"
 #include "sim/pseudo_inst.hh"
-
-#include <cmath>
 #if defined(linux)
 #include <fenv.h>
 #endif
diff --git a/src/arch/arm/linux/atag.hh b/src/arch/arm/linux/atag.hh
index d01474ac0..b7c37dffd 100644
--- a/src/arch/arm/linux/atag.hh
+++ b/src/arch/arm/linux/atag.hh
@@ -42,6 +42,7 @@
 
 #include <cstring>
 #include <string>
+
 #include "base/types.hh"
 
 enum {
diff --git a/src/arch/arm/linux/linux.cc b/src/arch/arm/linux/linux.cc
index a26567475..1e3a1e725 100644
--- a/src/arch/arm/linux/linux.cc
+++ b/src/arch/arm/linux/linux.cc
@@ -29,10 +29,10 @@
  * Authors: Stephen Hines
  */
 
-#include "arch/arm/linux/linux.hh"
-
 #include <fcntl.h>
 
+#include "arch/arm/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable ArmLinux::openFlagTable[] = {
 #ifdef _MSC_VER
diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc
index 6b449c2e7..f17749252 100644
--- a/src/arch/arm/linux/process.cc
+++ b/src/arch/arm/linux/process.cc
@@ -46,11 +46,9 @@
 #include "arch/arm/linux/linux.hh"
 #include "arch/arm/linux/process.hh"
 #include "arch/arm/isa_traits.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 #include "sim/system.hh"
diff --git a/src/arch/arm/linux/process.hh b/src/arch/arm/linux/process.hh
index f0a81c5fc..854b0b176 100644
--- a/src/arch/arm/linux/process.hh
+++ b/src/arch/arm/linux/process.hh
@@ -33,7 +33,6 @@
 
 #include "arch/arm/process.hh"
 
-
 /// A process with emulated Arm/Linux syscalls.
 class ArmLinuxProcess : public ArmLiveProcess
 {
diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc
index 7aff2b6ef..0d34121b4 100644
--- a/src/arch/arm/linux/system.cc
+++ b/src/arch/arm/linux/system.cc
@@ -40,9 +40,9 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/arm/isa_traits.hh"
 #include "arch/arm/linux/atag.hh"
 #include "arch/arm/linux/system.hh"
+#include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
diff --git a/src/arch/arm/locked_mem.hh b/src/arch/arm/locked_mem.hh
index f902bdb49..f95542bb0 100644
--- a/src/arch/arm/locked_mem.hh
+++ b/src/arch/arm/locked_mem.hh
@@ -43,7 +43,6 @@
 #include "arch/arm/miscregs.hh"
 #include "mem/request.hh"
 
-
 namespace ArmISA
 {
 template <class XC>
diff --git a/src/arch/arm/pagetable.hh b/src/arch/arm/pagetable.hh
index 46322046f..6d84fbf7b 100644
--- a/src/arch/arm/pagetable.hh
+++ b/src/arch/arm/pagetable.hh
@@ -47,7 +47,6 @@
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
 #include "config/full_system.hh"
-
 #include "sim/serialize.hh"
 
 namespace ArmISA {
diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh
index e650d52d6..188f675bb 100644
--- a/src/arch/arm/predecoder.hh
+++ b/src/arch/arm/predecoder.hh
@@ -47,8 +47,8 @@
 
 #include <cassert>
 
-#include "arch/arm/types.hh"
 #include "arch/arm/miscregs.hh"
+#include "arch/arm/types.hh"
 #include "base/types.hh"
 
 class ThreadContext;
diff --git a/src/arch/arm/process.hh b/src/arch/arm/process.hh
index 8816b765d..26a59323f 100644
--- a/src/arch/arm/process.hh
+++ b/src/arch/arm/process.hh
@@ -33,6 +33,7 @@
 
 #include <string>
 #include <vector>
+
 #include "base/loader/object_file.hh"
 #include "sim/process.hh"
 
diff --git a/src/arch/arm/registers.hh b/src/arch/arm/registers.hh
index 30289ff27..14ec03471 100644
--- a/src/arch/arm/registers.hh
+++ b/src/arch/arm/registers.hh
@@ -43,8 +43,8 @@
 #ifndef __ARCH_ARM_REGISTERS_HH__
 #define __ARCH_ARM_REGISTERS_HH__
 
-#include "arch/arm/max_inst_regs.hh"
 #include "arch/arm/intregs.hh"
+#include "arch/arm/max_inst_regs.hh"
 #include "arch/arm/miscregs.hh"
 
 namespace ArmISA {
diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc
index bf7639575..2a4680782 100644
--- a/src/arch/arm/remote_gdb.cc
+++ b/src/arch/arm/remote_gdb.cc
@@ -139,22 +139,22 @@
 #include "arch/arm/vtophys.hh"
 #endif
 
-#include "arch/arm/utility.hh"
-#include "arch/arm/remote_gdb.hh"
+#include "arch/arm/pagetable.hh"
 #include "arch/arm/registers.hh"
+#include "arch/arm/remote_gdb.hh"
+#include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "cpu/thread_state.hh"
-#include "cpu/static_inst.hh"
+#include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/system.hh"
-#include "arch/arm/pagetable.hh"
-#include "mem/page_table.hh"
 
 using namespace std;
 using namespace ArmISA;
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index f6e265ae4..d61db4cfe 100644
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -40,9 +40,10 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/arm/system.hh"
 #include <iostream>
 
+#include "arch/arm/system.hh"
+
 using namespace std;
 using namespace Linux;
 
diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh
index c64673df5..8711e7cce 100644
--- a/src/arch/arm/system.hh
+++ b/src/arch/arm/system.hh
@@ -46,10 +46,10 @@
 #include <string>
 #include <vector>
 
+#include "kern/linux/events.hh"
 #include "params/ArmSystem.hh"
 #include "sim/sim_object.hh"
 #include "sim/system.hh"
-#include "kern/linux/events.hh"
 
 class ArmSystem : public System
 {
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 2d0e323f6..9296b951a 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -40,9 +40,9 @@
 #include "arch/arm/faults.hh"
 #include "arch/arm/table_walker.hh"
 #include "arch/arm/tlb.hh"
-#include "dev/io_device.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
+#include "dev/io_device.hh"
 #include "sim/system.hh"
 
 using namespace ArmISA;
diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh
index 96a39cc61..85db1fa77 100644
--- a/src/arch/arm/table_walker.hh
+++ b/src/arch/arm/table_walker.hh
@@ -46,7 +46,6 @@
 #include "arch/arm/tlb.hh"
 #include "mem/mem_object.hh"
 #include "mem/request.hh"
-#include "mem/request.hh"
 #include "params/ArmTableWalker.hh"
 #include "sim/eventq.hh"
 #include "sim/fault_fwd.hh"
diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh
index e60de38dd..269128c2a 100644
--- a/src/arch/arm/tlb.hh
+++ b/src/arch/arm/tlb.hh
@@ -46,9 +46,9 @@
 #include <map>
 
 #include "arch/arm/isa_traits.hh"
+#include "arch/arm/pagetable.hh"
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
-#include "arch/arm/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/ArmTLB.hh"
diff --git a/src/arch/arm/vtophys.hh b/src/arch/arm/vtophys.hh
index 12b4846ed..a85209a4a 100644
--- a/src/arch/arm/vtophys.hh
+++ b/src/arch/arm/vtophys.hh
@@ -37,7 +37,6 @@
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;