includes: sort all includes

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 {

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"

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;

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"

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

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"

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"

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;

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"

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"

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 {
 

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"

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
 {

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
 

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;

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
 {

src/arch/arm/insts/vfp.hh

@@ -40,10 +40,12 @@
 #ifndef __ARCH_ARM_INSTS_VFP_HH__
 #define __ARCH_ARM_INSTS_VFP_HH__
 
+#include <fenv.h>
+
+#include <cmath>
+
 #include "arch/arm/insts/misc.hh"
 #include "arch/arm/miscregs.hh"
-#include <fenv.h>
-#include <cmath>
 
 namespace ArmISA
 {

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__

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

src/arch/arm/linux/atag.hh

@@ -42,6 +42,7 @@
 
 #include <cstring>
 #include <string>
+
 #include "base/types.hh"
 
 enum {

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

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"

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
 {

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"

src/arch/arm/locked_mem.hh

@@ -43,7 +43,6 @@
 #include "arch/arm/miscregs.hh"
 #include "mem/request.hh"
 
-
 namespace ArmISA
 {
 template <class XC>

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 {

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;

src/arch/arm/process.hh

@@ -33,6 +33,7 @@
 
 #include <string>
 #include <vector>
+
 #include "base/loader/object_file.hh"
 #include "sim/process.hh"
 

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 {

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;

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;
 

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
 {

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;

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"

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"

src/arch/arm/vtophys.hh

@@ -37,7 +37,6 @@
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 

src/arch/generic/debugfaults.hh

@@ -40,11 +40,11 @@
 #ifndef __ARCH_GENERIC_DEBUGFAULTS_HH__
 #define __ARCH_GENERIC_DEBUGFAULTS_HH__
 
+#include <string>
+
 #include "base/misc.hh"
 #include "sim/faults.hh"
 
-#include <string>
-
 namespace GenericISA
 {
 class M5DebugFault : public FaultBase

src/arch/generic/types.hh

@@ -33,8 +33,8 @@
 
 #include <iostream>
 
-#include "base/types.hh"
 #include "base/trace.hh"
+#include "base/types.hh"
 #include "sim/serialize.hh"
 
 namespace GenericISA

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;

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"

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"

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"

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;
 }};

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"
 

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

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/process.hh"
-#include "sim/system.hh"
-#include "sim/syscall_emul.hh"
 #include "sim/eventq.hh"
+#include "sim/process.hh"
+#include "sim/syscall_emul.hh"
+#include "sim/system.hh"
 
 using namespace std;
 using namespace MipsISA;

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.

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"

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
 {

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"

src/arch/mips/process.hh

@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;

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)

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
 {

src/arch/mips/tlb.cc

@@ -34,18 +34,18 @@
 #include <string>
 #include <vector>
 
-#include "arch/mips/pra_constants.hh"
-#include "arch/mips/pagetable.hh"
-#include "arch/mips/tlb.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/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;

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;
 

src/arch/mips/utility.cc

@@ -32,12 +32,12 @@
 
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
-#include "config/full_system.hh"
-#include "cpu/thread_context.hh"
-#include "cpu/static_inst.hh"
-#include "sim/serialize.hh"
 #include "base/bitfield.hh"
 #include "base/misc.hh"
+#include "config/full_system.hh"
+#include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
+#include "sim/serialize.hh"
 
 #if FULL_SYSTEM
 #include "arch/mips/registers.hh"

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"

src/arch/mips/vtophys.hh

@@ -37,7 +37,6 @@
 #include "arch/mips/isa_traits.hh"
 #include "arch/mips/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 

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
 {

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
 {

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

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

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"

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
 {

src/arch/power/process.hh

@@ -35,6 +35,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/process.hh"
 
 class LiveProcess;

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"

src/arch/power/vtophys.hh

@@ -39,7 +39,6 @@
 #include "arch/power/isa_traits.hh"
 #include "arch/power/utility.hh"
 
-
 class ThreadContext;
 class FunctionalPort;
 

src/arch/sparc/isa.hh

@@ -31,14 +31,14 @@
 #ifndef __ARCH_SPARC_ISA_HH__
 #define __ARCH_SPARC_ISA_HH__
 
+#include <ostream>
+#include <string>
+
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/types.hh"
 #include "config/full_system.hh"
 #include "cpu/cpuevent.hh"
 
-#include <string>
-#include <ostream>
-
 class Checkpoint;
 class EventManager;
 class ThreadContext;

src/arch/sparc/isa/includes.isa

@@ -35,8 +35,8 @@
 
 output header {{
 #include <cstring>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "arch/sparc/faults.hh"
 #include "arch/sparc/isa_traits.hh"
@@ -49,14 +49,14 @@ output header {{
 }};
 
 output decoder {{
-#include "base/cprintf.hh"
+#include <algorithm>
+
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
+#include "base/fenv.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
 
-#include "base/fenv.hh"
-#include <algorithm>
-
 using namespace SparcISA;
 }};
 
@@ -67,16 +67,16 @@ output exec {{
 #include "sim/pseudo_inst.hh"
 #endif
 
+#include <cmath>
 #include <limits>
 
-#include <cmath>
 #include "arch/sparc/asi.hh"
 #include "base/bigint.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-#include "sim/sim_exit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
+#include "sim/sim_exit.hh"
 
 using namespace SparcISA;
 using namespace std;

src/arch/sparc/isa_traits.hh

@@ -32,8 +32,8 @@
 #ifndef __ARCH_SPARC_ISA_TRAITS_HH__
 #define __ARCH_SPARC_ISA_TRAITS_HH__
 
-#include "arch/sparc/types.hh"
 #include "arch/sparc/sparc_traits.hh"
+#include "arch/sparc/types.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
 

src/arch/sparc/linux/linux.cc

@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/sparc/linux/linux.hh"
 #include <fcntl.h>
 
+#include "arch/sparc/linux/linux.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable SparcLinux::openFlagTable[] = {
 #ifdef _MSC_VER

src/arch/sparc/linux/process.cc

@@ -30,14 +30,12 @@
  *          Ali Saidi
  */
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/linux/process.hh"
+#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/linux/linux.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 

src/arch/sparc/locked_mem.hh

@@ -39,7 +39,6 @@
 
 #include "mem/request.hh"
 
-
 namespace SparcISA
 {
 template <class XC>

src/arch/sparc/mmapped_ipr.hh

@@ -37,11 +37,10 @@
  * ISA-specific helper functions for memory mapped IPR accesses.
  */
 
+#include "arch/sparc/tlb.hh"
 #include "config/full_system.hh"
 #include "cpu/thread_context.hh"
 #include "mem/packet.hh"
-#include "arch/sparc/tlb.hh"
-
 
 namespace SparcISA
 {

src/arch/sparc/nativetrace.cc

@@ -29,8 +29,8 @@
  */
 
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/registers.hh"
 #include "arch/sparc/nativetrace.hh"
+#include "arch/sparc/registers.hh"
 #include "cpu/thread_context.hh"
 #include "params/SparcNativeTrace.hh"
 #include "sim/byteswap.hh"

src/arch/sparc/process.cc

@@ -32,16 +32,16 @@
 #include "arch/sparc/asi.hh"
 #include "arch/sparc/handlers.hh"
 #include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/registers.hh"
 #include "arch/sparc/process.hh"
+#include "arch/sparc/registers.hh"
 #include "arch/sparc/types.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"
-#include "sim/process_impl.hh"
 #include "mem/translating_port.hh"
+#include "sim/process_impl.hh"
 #include "sim/system.hh"
 
 using namespace std;

src/arch/sparc/process.hh

@@ -34,6 +34,7 @@
 
 #include <string>
 #include <vector>
+
 #include "sim/byteswap.hh"
 #include "sim/process.hh"
 

src/arch/sparc/remote_gdb.cc

@@ -117,19 +117,19 @@
  */
 
 #include <sys/signal.h>
-
-#include <string>
 #include <unistd.h>
 
-#include "arch/vtophys.hh"
+#include <string>
+
 #include "arch/sparc/remote_gdb.hh"
+#include "arch/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "config/full_system.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/static_inst.hh"
+#include "cpu/thread_context.hh"
 #include "mem/page_table.hh"
 #include "mem/physical.hh"
 #include "mem/port.hh"

src/arch/sparc/remote_gdb.hh

@@ -34,9 +34,9 @@
 #include <map>
 
 #include "arch/sparc/types.hh"
+#include "base/pollevent.hh"
 #include "base/remote_gdb.hh"
 #include "cpu/pc_event.hh"
-#include "base/pollevent.hh"
 
 class System;
 class ThreadContext;

src/arch/sparc/solaris/process.cc

@@ -28,14 +28,12 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/solaris/process.hh"
+#include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
-
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "kern/solaris/solaris.hh"
-
 #include "sim/process.hh"
 #include "sim/syscall_emul.hh"
 

src/arch/sparc/solaris/solaris.cc

@@ -28,10 +28,10 @@
  * Authors: Ali Saidi
  */
 
-#include "arch/sparc/solaris/solaris.hh"
-
 #include <fcntl.h>
 
+#include "arch/sparc/solaris/solaris.hh"
+
 // open(2) flags translation table
 OpenFlagTransTable SparcSolaris::openFlagTable[] = {
 #ifdef _MSC_VER

src/arch/sparc/system.cc

@@ -37,7 +37,6 @@
 #include "params/SparcSystem.hh"
 #include "sim/byteswap.hh"
 
-
 using namespace BigEndianGuest;
 
 SparcSystem::SparcSystem(Params *p)

src/arch/sparc/tlb.cc

@@ -36,8 +36,8 @@
 #include "arch/sparc/tlb.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
-#include "cpu/thread_context.hh"
 #include "cpu/base.hh"
+#include "cpu/thread_context.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/system.hh"

src/arch/sparc/tlb_map.hh

@@ -31,9 +31,10 @@
 #ifndef __ARCH_SPARC_TLB_MAP_HH__
 #define __ARCH_SPARC_TLB_MAP_HH__
 
-#include "arch/sparc/pagetable.hh"
 #include <map>
 
+#include "arch/sparc/pagetable.hh"
+
 namespace SparcISA
 {
 

src/arch/sparc/types.hh

@@ -31,9 +31,9 @@
 #ifndef __ARCH_SPARC_TYPES_HH__
 #define __ARCH_SPARC_TYPES_HH__
 
+#include "arch/generic/types.hh"
 #include "base/bigint.hh"
 #include "base/types.hh"
-#include "arch/generic/types.hh"
 
 namespace SparcISA
 {

src/arch/sparc/utility.hh

@@ -34,8 +34,8 @@
 #include "arch/sparc/isa_traits.hh"
 #include "arch/sparc/registers.hh"
 #include "arch/sparc/tlb.hh"
-#include "base/misc.hh"
 #include "base/bitfield.hh"
+#include "base/misc.hh"
 #include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 #include "sim/fault_fwd.hh"

src/arch/sparc/vtophys.cc

@@ -30,10 +30,10 @@
 
 #include <string>
 
-#include "arch/sparc/vtophys.hh"
 #include "arch/sparc/tlb.hh"
-#include "base/compiler.hh"
+#include "arch/sparc/vtophys.hh"
 #include "base/chunk_generator.hh"
+#include "base/compiler.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/vport.hh"

src/arch/x86/bios/acpi.cc

@@ -39,15 +39,13 @@
 
 #include "arch/x86/bios/acpi.hh"
 #include "mem/port.hh"
+#include "params/X86ACPIRSDP.hh"
+#include "params/X86ACPIRSDT.hh"
+#include "params/X86ACPISysDescTable.hh"
+#include "params/X86ACPIXSDT.hh"
 #include "sim/byteswap.hh"
 #include "sim/sim_object.hh"
 
-#include "params/X86ACPIRSDP.hh"
-
-#include "params/X86ACPISysDescTable.hh"
-#include "params/X86ACPIRSDT.hh"
-#include "params/X86ACPIXSDT.hh"
-
 using namespace std;
 
 const char X86ISA::ACPI::RSDP::signature[] = "RSD PTR ";

src/arch/x86/bios/intelmp.hh

@@ -44,13 +44,12 @@
 #include <vector>
 
 #include "base/bitfield.hh"
-#include "sim/sim_object.hh"
-
 #include "enums/X86IntelMPAddressType.hh"
 #include "enums/X86IntelMPInterruptType.hh"
 #include "enums/X86IntelMPPolarity.hh"
 #include "enums/X86IntelMPRangeList.hh"
 #include "enums/X86IntelMPTriggerMode.hh"
+#include "sim/sim_object.hh"
 
 class FunctionalPort;
 

src/arch/x86/emulenv.hh

@@ -40,9 +40,9 @@
 #ifndef __ARCH_X86_EMULENV_HH__
 #define __ARCH_X86_EMULENV_HH__
 
-#include "arch/x86/registers.hh"
 #include "arch/x86/regs/int.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
 
 namespace X86ISA

src/arch/x86/faults.hh

@@ -40,13 +40,13 @@
 #ifndef __ARCH_X86_FAULTS_HH__
 #define __ARCH_X86_FAULTS_HH__
 
+#include <string>
+
 #include "base/bitunion.hh"
 #include "base/misc.hh"
 #include "sim/faults.hh"
 #include "sim/tlb.hh"
 
-#include <string>
-
 namespace X86ISA
 {
     // Base class for all x86 "faults" where faults is in the m5 sense

src/arch/x86/insts/badmicroop.cc

@@ -38,8 +38,8 @@
  */
 
 #include "arch/x86/insts/badmicroop.hh"
-#include "arch/x86/isa_traits.hh"
 #include "arch/x86/decoder.hh"
+#include "arch/x86/isa_traits.hh"
 
 namespace X86ISA
 {

src/arch/x86/insts/macroop.hh

@@ -40,10 +40,10 @@
 #ifndef __ARCH_X86_INSTS_MACROOP_HH__
 #define __ARCH_X86_INSTS_MACROOP_HH__
 
-#include "arch/x86/emulenv.hh"
 #include "arch/x86/insts/badmicroop.hh"
-#include "arch/x86/types.hh"
 #include "arch/x86/insts/static_inst.hh"
+#include "arch/x86/emulenv.hh"
+#include "arch/x86/types.hh"
 
 namespace X86ISA
 {

src/arch/x86/insts/microfpop.cc

@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/regs/misc.hh"
-#include <string>
 
 namespace X86ISA
 {

src/arch/x86/insts/microldstop.cc

@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/insts/microldstop.hh"
 #include <string>
 
+#include "arch/x86/insts/microldstop.hh"
+
 namespace X86ISA
 {
     std::string LdStOp::generateDisassembly(Addr pc,

src/arch/x86/insts/micromediaop.cc

@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include <string>
+
 #include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/regs/misc.hh"
-#include <string>
 
 namespace X86ISA
 {

src/arch/x86/interrupts.cc

@@ -37,9 +37,9 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/regs/apic.hh"
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/intmessage.hh"
-#include "arch/x86/regs/apic.hh"
 #include "cpu/base.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/pc.hh"

src/arch/x86/interrupts.hh

@@ -40,13 +40,13 @@
 #ifndef __ARCH_X86_INTERRUPTS_HH__
 #define __ARCH_X86_INTERRUPTS_HH__
 
+#include "arch/x86/regs/apic.hh"
 #include "arch/x86/faults.hh"
 #include "arch/x86/intmessage.hh"
-#include "arch/x86/regs/apic.hh"
 #include "base/bitfield.hh"
 #include "cpu/thread_context.hh"
-#include "dev/io_device.hh"
 #include "dev/x86/intdev.hh"
+#include "dev/io_device.hh"
 #include "params/X86LocalApic.hh"
 #include "sim/eventq.hh"
 

src/arch/x86/isa.hh

@@ -31,14 +31,14 @@
 #ifndef __ARCH_X86_ISA_HH__
 #define __ARCH_X86_ISA_HH__
 
-#include "arch/x86/registers.hh"
+#include <iostream>
+#include <string>
+
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/misc.hh"
+#include "arch/x86/registers.hh"
 #include "base/types.hh"
 
-#include <string>
-#include <iostream>
-
 class Checkpoint;
 class EventManager;
 class ThreadContext;

src/arch/x86/isa/includes.isa

@@ -50,17 +50,17 @@ let {{
 
 output header {{
 #include <cstring>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 #include "arch/generic/debugfaults.hh"
-#include "arch/x86/emulenv.hh"
 #include "arch/x86/insts/macroop.hh"
 #include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/insts/microldstop.hh"
 #include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/insts/microregop.hh"
 #include "arch/x86/insts/static_inst.hh"
+#include "arch/x86/emulenv.hh"
 #include "arch/x86/isa_traits.hh"
 #include "arch/x86/registers.hh"
 #include "arch/x86/types.hh"
@@ -73,14 +73,14 @@ using X86ISA::InstRegIndex;
 }};
 
 output decoder {{
-#include "arch/x86/faults.hh"
-#include "arch/x86/microcode_rom.hh"
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/regs/segment.hh"
+#include "arch/x86/faults.hh"
+#include "arch/x86/microcode_rom.hh"
 #include "arch/x86/tlb.hh"
-#include "base/cprintf.hh"
 #include "base/loader/symtab.hh"
+#include "base/cprintf.hh"
 #include "base/misc.hh"
 #include "cpu/thread_context.hh"  // for Jump::branchTarget()
 #include "mem/packet.hh"
@@ -106,23 +106,23 @@ output exec {{
 #include "sim/pseudo_inst.hh"
 #endif
 
+#include <cmath>
 #include <limits>
 
-#include <cmath>
+#include "arch/x86/regs/misc.hh"
 #include "arch/x86/cpuid.hh"
 #include "arch/x86/faults.hh"
-#include "arch/x86/regs/misc.hh"
 #include "arch/x86/tlb.hh"
 #include "base/bigint.hh"
 #include "base/compiler.hh"
 #include "base/condcodes.hh"
 #include "cpu/base.hh"
 #include "cpu/exetrace.hh"
-#include "sim/sim_exit.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/request.hh"
 #include "sim/pseudo_inst.hh"
+#include "sim/sim_exit.hh"
 
 using namespace X86ISA;
 using namespace std;