includes: sort all includes

9 files changed, 14 insertions, 17 deletions

diff --git a/src/arch/power/insts/floating.hh b/src/arch/power/insts/floating.hh
index deeac82cf..65906e507 100644
--- a/src/arch/power/insts/floating.hh
+++ b/src/arch/power/insts/floating.hh
@@ -33,8 +33,8 @@
 #define __ARCH_POWER_INSTS_FLOATING_HH__
 
 #include "arch/power/insts/static_inst.hh"
-#include "base/cprintf.hh"
 #include "base/bitfield.hh"
+#include "base/cprintf.hh"
 
 namespace PowerISA
 {
diff --git a/src/arch/power/insts/integer.hh b/src/arch/power/insts/integer.hh
index a7270cd38..f911eb08a 100644
--- a/src/arch/power/insts/integer.hh
+++ b/src/arch/power/insts/integer.hh
@@ -32,8 +32,8 @@
 #define __ARCH_POWER_INSTS_INTEGER_HH__
 
 #include "arch/power/insts/static_inst.hh"
-#include "base/cprintf.hh"
 #include "base/bitfield.hh"
+#include "base/cprintf.hh"
 
 namespace PowerISA
 {
diff --git a/src/arch/power/isa/includes.isa b/src/arch/power/isa/includes.isa
index 47e8c1411..a9069710b 100644
--- a/src/arch/power/isa/includes.isa
+++ b/src/arch/power/isa/includes.isa
@@ -34,15 +34,15 @@
 //
 
 output header {{
-#include <sstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <sstream>
 
 #include "arch/power/insts/branch.hh"
-#include "arch/power/insts/mem.hh"
-#include "arch/power/insts/integer.hh"
-#include "arch/power/insts/floating.hh"
 #include "arch/power/insts/condition.hh"
+#include "arch/power/insts/floating.hh"
+#include "arch/power/insts/integer.hh"
+#include "arch/power/insts/mem.hh"
 #include "arch/power/insts/misc.hh"
 #include "arch/power/insts/static_inst.hh"
 #include "arch/power/isa_traits.hh"
@@ -61,8 +61,8 @@ output decoder {{
 #include "arch/power/faults.hh"
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "cpu/thread_context.hh"
 
 using namespace PowerISA;
@@ -70,11 +70,11 @@ using std::isnan;
 }};
 
 output exec {{
+#include <cmath>
+
 #include "arch/power/faults.hh"
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
-
-#include <cmath>
 #if defined(linux)
 #include <fenv.h>
 #endif
diff --git a/src/arch/power/linux/linux.cc b/src/arch/power/linux/linux.cc
index 113f3e48e..b614c0dcb 100644
--- a/src/arch/power/linux/linux.cc
+++ b/src/arch/power/linux/linux.cc
@@ -29,10 +29,10 @@
  * Authors: Timothy M. Jones
  */
 
-#include "arch/power/linux/linux.hh"
-
 #include <fcntl.h>
 
+#include "arch/power/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable PowerLinux::openFlagTable[] = {
 #ifdef _MSC_VER
diff --git a/src/arch/power/linux/process.cc b/src/arch/power/linux/process.cc
index c2587d5e7..1c1b2827f 100644
--- a/src/arch/power/linux/process.cc
+++ b/src/arch/power/linux/process.cc
@@ -35,11 +35,9 @@
 #include "arch/power/linux/linux.hh"
 #include "arch/power/linux/process.hh"
 #include "arch/power/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/power/linux/process.hh b/src/arch/power/linux/process.hh
index bef7e8dae..c4600129e 100644
--- a/src/arch/power/linux/process.hh
+++ b/src/arch/power/linux/process.hh
@@ -35,7 +35,6 @@
 
 #include "arch/power/process.hh"
 
-
 /// A process with emulated PPC/Linux syscalls.
 class PowerLinuxProcess : public PowerLiveProcess
 {
diff --git a/src/arch/power/process.hh b/src/arch/power/process.hh
index 473b7e028..e02a30abd 100644
--- a/src/arch/power/process.hh
+++ b/src/arch/power/process.hh
@@ -35,6 +35,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;
diff --git a/src/arch/power/tlb.hh b/src/arch/power/tlb.hh
index c4e3fadaa..590477b6a 100644
--- a/src/arch/power/tlb.hh
+++ b/src/arch/power/tlb.hh
@@ -40,9 +40,9 @@
 #include <map>
 
 #include "arch/power/isa_traits.hh"
+#include "arch/power/pagetable.hh"
 #include "arch/power/utility.hh"
 #include "arch/power/vtophys.hh"
-#include "arch/power/pagetable.hh"
 #include "base/statistics.hh"
 #include "mem/request.hh"
 #include "params/PowerTLB.hh"
diff --git a/src/arch/power/vtophys.hh b/src/arch/power/vtophys.hh
index 8b88c9215..7371f38a6 100644
--- a/src/arch/power/vtophys.hh
+++ b/src/arch/power/vtophys.hh
@@ -39,7 +39,6 @@
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;