includes: sort all includes

20 files changed, 50 insertions, 55 deletions

diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc
index b8b02ae9e..49698eec6 100755
--- a/src/arch/mips/dsp.cc
+++ b/src/arch/mips/dsp.cc
@@ -28,13 +28,13 @@
  * Authors: Brett Miller
  */
 
-#include "arch/mips/isa_traits.hh"
 #include "arch/mips/dsp.hh"
+#include "arch/mips/isa_traits.hh"
+#include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"
 #include "sim/serialize.hh"
-#include "base/bitfield.hh"
-#include "base/misc.hh"
 
 using namespace MipsISA;
 using namespace std;
diff --git a/src/arch/mips/dsp.hh b/src/arch/mips/dsp.hh
index 1cca51384..f13431714 100755
--- a/src/arch/mips/dsp.hh
+++ b/src/arch/mips/dsp.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_MIPS_DSP_HH__
 #define __ARCH_MIPS_DSP_HH__
 
-#include "arch/mips/types.hh"
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/types.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc
index 66d8b0815..902574bac 100644
--- a/src/arch/mips/isa.cc
+++ b/src/arch/mips/isa.cc
@@ -29,8 +29,8 @@
  */
 
 #include "arch/mips/isa.hh"
-#include "arch/mips/mt_constants.hh"
 #include "arch/mips/mt.hh"
+#include "arch/mips/mt_constants.hh"
 #include "arch/mips/pra_constants.hh"
 #include "base/bitfield.hh"
 #include "cpu/base.hh"
diff --git a/src/arch/mips/isa.hh b/src/arch/mips/isa.hh
index cc075a9a6..720c7725e 100644
--- a/src/arch/mips/isa.hh
+++ b/src/arch/mips/isa.hh
@@ -31,8 +31,8 @@
 #ifndef __ARCH_MIPS_ISA_HH__
 #define __ARCH_MIPS_ISA_HH__
 
-#include <string>
 #include <queue>
+#include <string>
 #include <vector>
 
 #include "arch/mips/registers.hh"
diff --git a/src/arch/mips/isa/includes.isa b/src/arch/mips/isa/includes.isa
index d5e1448ac..b0d1aa748 100644
--- a/src/arch/mips/isa/includes.isa
+++ b/src/arch/mips/isa/includes.isa
@@ -34,9 +34,9 @@
 //
 
 output header {{
-#include <sstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <sstream>
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/types.hh"
@@ -45,20 +45,19 @@ output header {{
 }};
 
 output decoder {{
-#include "arch/mips/isa_traits.hh"
-#include "base/cprintf.hh"
-#include "base/loader/symtab.hh"
-#include "cpu/thread_context.hh"
+#include <math.h>
+
+#include "arch/mips/dsp.hh"
+#include "arch/mips/dt_constants.hh"
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/pra_constants.hh"
-#include "arch/mips/dt_constants.hh"
 #include "arch/mips/mt_constants.hh"
+#include "arch/mips/pra_constants.hh"
 #include "arch/mips/utility.hh"
-#include "arch/mips/dsp.hh"
+#include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
+#include "cpu/thread_context.hh"
 #include "mem/packet.hh"
-
-#include <math.h>
 #if defined(linux)
 #include <fenv.h>
 #endif
@@ -67,29 +66,27 @@ using namespace MipsISA;
 }};
 
 output exec {{
+#include <math.h>
+
+#include "arch/mips/dsp.hh"
+#include "arch/mips/dt_constants.hh"
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/utility.hh"
-#include "arch/mips/dsp.hh"
 #include "arch/mips/mt.hh"
-#include "arch/mips/pra_constants.hh"
-#include "arch/mips/dt_constants.hh"
 #include "arch/mips/mt_constants.hh"
-
-#include <math.h>
+#include "arch/mips/pra_constants.hh"
+#include "arch/mips/utility.hh"
 #if defined(linux)
 #include <fenv.h>
 #endif
 
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
-
-#include "sim/sim_exit.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_events.hh"
+#include "sim/sim_exit.hh"
 
 using namespace MipsISA;
 }};
diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index 648713926..4d07c5abe 100644
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -34,8 +34,8 @@
 #ifndef __ARCH_MIPS_ISA_TRAITS_HH__
 #define __ARCH_MIPS_ISA_TRAITS_HH__
 
-#include "arch/mips/types.hh"
 #include "arch/mips/mips_core_specific.hh"
+#include "arch/mips/types.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 
diff --git a/src/arch/mips/linux/linux.cc b/src/arch/mips/linux/linux.cc
index 6cfc93585..8c4e3bf8c 100644
--- a/src/arch/mips/linux/linux.cc
+++ b/src/arch/mips/linux/linux.cc
@@ -28,10 +28,10 @@
  * Authors: Korey Sewell
  */
 
-#include "arch/mips/linux/linux.hh"
-
 #include <fcntl.h>
 
+#include "arch/mips/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable MipsLinux::openFlagTable[] = {
 #ifdef _MSC_VER
diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index f3cac84e8..fa8e659b6 100644
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -36,10 +36,10 @@
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
+#include "sim/eventq.hh"
 #include "sim/process.hh"
-#include "sim/system.hh"
 #include "sim/syscall_emul.hh"
-#include "sim/eventq.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace MipsISA;
diff --git a/src/arch/mips/linux/process.hh b/src/arch/mips/linux/process.hh
index 8c45014e0..fd96be4c1 100644
--- a/src/arch/mips/linux/process.hh
+++ b/src/arch/mips/linux/process.hh
@@ -32,8 +32,8 @@
 #ifndef __MIPS_LINUX_PROCESS_HH__
 #define __MIPS_LINUX_PROCESS_HH__
 
-#include "arch/mips/process.hh"
 #include "arch/mips/linux/linux.hh"
+#include "arch/mips/process.hh"
 #include "sim/eventq.hh"
 
 /// A process with emulated Mips/Linux syscalls.
diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc
index ff07f526a..67e21574e 100644
--- a/src/arch/mips/linux/system.cc
+++ b/src/arch/mips/linux/system.cc
@@ -39,17 +39,17 @@
  * up boot time.
  */
 
-#include "arch/vtophys.hh"
-#include "arch/mips/idle_event.hh"
 #include "arch/mips/linux/system.hh"
 #include "arch/mips/linux/threadinfo.hh"
+#include "arch/mips/idle_event.hh"
 #include "arch/mips/system.hh"
+#include "arch/vtophys.hh"
 #include "base/loader/symtab.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "dev/platform.hh"
-#include "kern/linux/printk.hh"
 #include "kern/linux/events.hh"
+#include "kern/linux/printk.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/arguments.hh"
diff --git a/src/arch/mips/mt.hh b/src/arch/mips/mt.hh
index c63c65a73..f163d3240 100755
--- a/src/arch/mips/mt.hh
+++ b/src/arch/mips/mt.hh
@@ -37,16 +37,16 @@
  * ISA-specific helper functions for multithreaded execution.
  */
 
+#include <iostream>
+
 #include "arch/mips/faults.hh"
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/mt_constants.hh"
 #include "arch/mips/pra_constants.hh"
 #include "arch/mips/registers.hh"
 #include "base/bitfield.hh"
-#include "base/trace.hh"
 #include "base/misc.hh"
-
-#include <iostream>
+#include "base/trace.hh"
 
 namespace MipsISA
 {
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 26a2a0ddb..b6f21c95c 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -32,8 +32,8 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/process.hh"
-#include "base/loader/object_file.hh"
 #include "base/loader/elf_object.hh"
+#include "base/loader/object_file.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh
index a065feb8f..3f9a7aff0 100644
--- a/src/arch/mips/process.hh
+++ b/src/arch/mips/process.hh
@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;
diff --git a/src/arch/mips/system.cc b/src/arch/mips/system.cc
index 6e2ad4d5a..c1735b740 100755
--- a/src/arch/mips/system.cc
+++ b/src/arch/mips/system.cc
@@ -33,15 +33,14 @@
 
 #include "arch/mips/system.hh"
 #include "arch/vtophys.hh"
-#include "base/loader/object_file.hh"
 #include "base/loader/hex_file.hh"
+#include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
 #include "base/trace.hh"
 #include "mem/physical.hh"
 #include "params/MipsSystem.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace LittleEndianGuest;
 
 MipsSystem::MipsSystem(Params *p) : System(p)
diff --git a/src/arch/mips/system.hh b/src/arch/mips/system.hh
index cfdf316b3..128f36581 100755
--- a/src/arch/mips/system.hh
+++ b/src/arch/mips/system.hh
@@ -37,13 +37,13 @@
 #include <string>
 #include <vector>
 
-#include "sim/system.hh"
-#include "base/loader/symtab.hh"
 #include "base/loader/hex_file.hh"
+#include "base/loader/symtab.hh"
 #include "cpu/pc_event.hh"
 #include "kern/system_events.hh"
 #include "params/MipsSystem.hh"
 #include "sim/sim_object.hh"
+#include "sim/system.hh"
 
 class MipsSystem : public System
 {
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index 288c8e88e..b73eae72f 100644
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -34,18 +34,18 @@
 #include <string>
 #include <vector>
 
-#include "arch/mips/pra_constants.hh"
+#include "arch/mips/faults.hh"
 #include "arch/mips/pagetable.hh"
+#include "arch/mips/pra_constants.hh"
 #include "arch/mips/tlb.hh"
-#include "arch/mips/faults.hh"
 #include "arch/mips/utility.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
-#include "sim/process.hh"
 #include "mem/page_table.hh"
 #include "params/MipsTLB.hh"
+#include "sim/process.hh"
 
 using namespace std;
 using namespace MipsISA;
diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh
index 5c8b10263..4b1456862 100644
--- a/src/arch/mips/tlb.hh
+++ b/src/arch/mips/tlb.hh
@@ -38,15 +38,15 @@
 #include <map>
 
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/pagetable.hh"
 #include "arch/mips/utility.hh"
 #include "arch/mips/vtophys.hh"
-#include "arch/mips/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/MipsTLB.hh"
 #include "sim/fault_fwd.hh"
-#include "sim/tlb.hh"
 #include "sim/sim_object.hh"
+#include "sim/tlb.hh"
 
 class ThreadContext;
 
diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index 0859eb80f..37f71416f 100644
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -32,12 +32,12 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
+#include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "config/full_system.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "sim/serialize.hh"
-#include "base/bitfield.hh"
-#include "base/misc.hh"
 
 #if FULL_SYSTEM
 #include "arch/mips/registers.hh"
diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh
index 2f6726c59..61c43a158 100644
--- a/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@ -33,9 +33,8 @@
 
 #ifndef __ARCH_MIPS_UTILITY_HH__
 #define __ARCH_MIPS_UTILITY_HH__
-#include "config/full_system.hh"
-#include "arch/mips/types.hh"
 #include "arch/mips/isa_traits.hh"
+#include "arch/mips/types.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
diff --git a/src/arch/mips/vtophys.hh b/src/arch/mips/vtophys.hh
index 6fde36aac..5ecc30b1f 100644
--- a/src/arch/mips/vtophys.hh
+++ b/src/arch/mips/vtophys.hh
@@ -37,7 +37,6 @@
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;