includes: sort all includes

12 files changed, 28 insertions, 29 deletions

diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index 38386cce1..4f84a151a 100644
--- a/src/arch/alpha/faults.cc
+++ b/src/arch/alpha/faults.cc
@@ -32,13 +32,13 @@
 #include "arch/alpha/ev5.hh"
 #include "arch/alpha/faults.hh"
 #include "arch/alpha/tlb.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/base.hh"
 #include "base/trace.hh"
+#include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 
 #if !FULL_SYSTEM
-#include "sim/process.hh"
 #include "mem/page_table.hh"
+#include "sim/process.hh"
 #endif
 
 namespace AlphaISA {
diff --git a/src/arch/alpha/isa.hh b/src/arch/alpha/isa.hh
index 500bd039b..f1bfcebec 100644
--- a/src/arch/alpha/isa.hh
+++ b/src/arch/alpha/isa.hh
@@ -31,10 +31,9 @@
 #ifndef __ARCH_ALPHA_ISA_HH__
 #define __ARCH_ALPHA_ISA_HH__
 
-#include <string.h>
-
-#include <string>
+#include <cstring>
 #include <iostream>
+#include <string>
 
 #include "arch/alpha/registers.hh"
 #include "arch/alpha/types.hh"
diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa
index 077520139..4b5678e81 100644
--- a/src/arch/alpha/isa/main.isa
+++ b/src/arch/alpha/isa/main.isa
@@ -41,16 +41,16 @@
 //
 
 output header {{
-#include <sstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <sstream>
 
 #include "arch/alpha/faults.hh"
 #include "arch/alpha/types.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/static_inst.hh"
-#include "mem/request.hh"  // some constructors use MemReq flags
 #include "mem/packet.hh"
+#include "mem/request.hh"  // some constructors use MemReq flags
 }};
 
 output decoder {{
@@ -58,9 +58,9 @@ output decoder {{
 
 #include "arch/alpha/registers.hh"
 #include "arch/alpha/regredir.hh"
+#include "base/loader/symtab.hh"
 #include "base/cprintf.hh"
 #include "base/fenv.hh"
-#include "base/loader/symtab.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
@@ -71,16 +71,16 @@ using namespace AlphaISA;
 output exec {{
 #include <math.h>
 
+#include "arch/alpha/registers.hh"
 #include "arch/alpha/regredir.hh"
 #include "base/cp_annotate.hh"
-#include "sim/pseudo_inst.hh"
-#include "arch/alpha/registers.hh"
 #include "base/fenv.hh"
 #include "config/ss_compatible_fp.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/pseudo_inst.hh"
 #include "sim/sim_exit.hh"
 
 using namespace AlphaISA;
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index 1bb8bd2cf..e7440e003 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -40,17 +40,17 @@
  * up boot time.
  */
 
-#include "arch/vtophys.hh"
-#include "arch/alpha/idle_event.hh"
 #include "arch/alpha/linux/system.hh"
 #include "arch/alpha/linux/threadinfo.hh"
+#include "arch/alpha/idle_event.hh"
 #include "arch/alpha/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/alpha/mt.hh b/src/arch/alpha/mt.hh
index 57cf90f79..03ecf8486 100644
--- a/src/arch/alpha/mt.hh
+++ b/src/arch/alpha/mt.hh
@@ -38,12 +38,12 @@
  * ISA-specific helper functions for multithreaded execution.
  */
 
+#include <iostream>
+
 #include "arch/isa_traits.hh"
 #include "base/bitfield.hh"
-#include "base/trace.hh"
 #include "base/misc.hh"
-
-#include <iostream>
+#include "base/trace.hh"
 using namespace std;
 
 namespace AlphaISA
diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 3c3fd9b25..269a7bd63 100644
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -31,8 +31,8 @@
 
 #include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/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/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index 9a2a5f23f..f05b448fa 100644
--- a/src/arch/alpha/remote_gdb.cc
+++ b/src/arch/alpha/remote_gdb.cc
@@ -127,15 +127,15 @@
 #endif
 
 #include "arch/alpha/kgdb.h"
-#include "arch/alpha/utility.hh"
 #include "arch/alpha/regredir.hh"
 #include "arch/alpha/remote_gdb.hh"
+#include "arch/alpha/utility.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"
 #include "sim/system.hh"
diff --git a/src/arch/alpha/remote_gdb.hh b/src/arch/alpha/remote_gdb.hh
index 43d0580d8..b7aef5f64 100644
--- a/src/arch/alpha/remote_gdb.hh
+++ b/src/arch/alpha/remote_gdb.hh
@@ -33,12 +33,12 @@
 
 #include <map>
 
-#include "arch/alpha/types.hh"
 #include "arch/alpha/kgdb.h"
-#include "base/remote_gdb.hh"
-#include "cpu/pc_event.hh"
+#include "arch/alpha/types.hh"
 #include "base/pollevent.hh"
+#include "base/remote_gdb.hh"
 #include "base/socket.hh"
+#include "cpu/pc_event.hh"
 
 class System;
 class ThreadContext;
diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc
index 58d54e790..6bcfffa3a 100644
--- a/src/arch/alpha/tlb.cc
+++ b/src/arch/alpha/tlb.cc
@@ -33,9 +33,9 @@
 #include <string>
 #include <vector>
 
+#include "arch/alpha/faults.hh"
 #include "arch/alpha/pagetable.hh"
 #include "arch/alpha/tlb.hh"
-#include "arch/alpha/faults.hh"
 #include "base/inifile.hh"
 #include "base/str.hh"
 #include "base/trace.hh"
diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc
index b10fea02b..96fe2725f 100644
--- a/src/arch/alpha/tru64/process.cc
+++ b/src/arch/alpha/tru64/process.cc
@@ -29,9 +29,9 @@
  *          Ali Saidi
  */
 
+#include "arch/alpha/tru64/process.hh"
 #include "arch/alpha/tru64/tru64.hh"
 #include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/tru64/process.hh"
 #include "cpu/thread_context.hh"
 #include "kern/tru64/tru64.hh"
 #include "sim/byteswap.hh"
diff --git a/src/arch/alpha/types.hh b/src/arch/alpha/types.hh
index 4713f0849..645e09105 100644
--- a/src/arch/alpha/types.hh
+++ b/src/arch/alpha/types.hh
@@ -32,8 +32,8 @@
 #ifndef __ARCH_ALPHA_TYPES_HH__
 #define __ARCH_ALPHA_TYPES_HH__
 
-#include "base/types.hh"
 #include "arch/generic/types.hh"
+#include "base/types.hh"
 
 namespace AlphaISA {
 
diff --git a/src/arch/alpha/utility.hh b/src/arch/alpha/utility.hh
index fdac8b8d1..8759b49ce 100644
--- a/src/arch/alpha/utility.hh
+++ b/src/arch/alpha/utility.hh
@@ -32,9 +32,9 @@
 #ifndef __ARCH_ALPHA_UTILITY_HH__
 #define __ARCH_ALPHA_UTILITY_HH__
 
-#include "arch/alpha/types.hh"
 #include "arch/alpha/isa_traits.hh"
 #include "arch/alpha/registers.hh"
+#include "arch/alpha/types.hh"
 #include "base/misc.hh"
 #include "config/full_system.hh"
 #include "cpu/static_inst.hh"