style: [patch 1/22] use /r/3648/ to reorganize includes

31 files changed, 67 insertions, 36 deletions

diff --git a/src/arch/x86/bios/acpi.cc b/src/arch/x86/bios/acpi.cc
index 4382a3d6b..4f279c87b 100644
--- a/src/arch/x86/bios/acpi.cc
+++ b/src/arch/x86/bios/acpi.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/bios/acpi.hh"
+
 #include "mem/port.hh"
 #include "params/X86ACPIRSDP.hh"
 #include "params/X86ACPIRSDT.hh"
diff --git a/src/arch/x86/bios/e820.cc b/src/arch/x86/bios/e820.cc
index c966916f5..a1daf0a04 100644
--- a/src/arch/x86/bios/e820.cc
+++ b/src/arch/x86/bios/e820.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/bios/e820.hh"
+
 #include "arch/x86/isa_traits.hh"
 #include "mem/port_proxy.hh"
 #include "sim/byteswap.hh"
diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index 98b3a6f08..8d0a9be7d 100644
--- a/src/arch/x86/bios/intelmp.cc
+++ b/src/arch/x86/bios/intelmp.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/bios/intelmp.hh"
+
 #include "arch/x86/isa_traits.hh"
 #include "base/misc.hh"
 #include "base/types.hh"
diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc
index 9072664bf..26785f5a8 100644
--- a/src/arch/x86/bios/smbios.cc
+++ b/src/arch/x86/bios/smbios.cc
@@ -41,6 +41,7 @@
  */
 
 #include "arch/x86/bios/smbios.hh"
+
 #include "arch/x86/isa_traits.hh"
 #include "base/types.hh"
 #include "mem/port_proxy.hh"
diff --git a/src/arch/x86/cpuid.cc b/src/arch/x86/cpuid.cc
index f1424cce4..c78b72030 100644
--- a/src/arch/x86/cpuid.cc
+++ b/src/arch/x86/cpuid.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/cpuid.hh"
+
 #include "base/bitfield.hh"
 #include "cpu/thread_context.hh"
 
diff --git a/src/arch/x86/decoder.cc b/src/arch/x86/decoder.cc
index 38394875d..324eb0219 100644
--- a/src/arch/x86/decoder.cc
+++ b/src/arch/x86/decoder.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/decoder.hh"
+
 #include "arch/x86/regs/misc.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/emulenv.cc b/src/arch/x86/emulenv.cc
index 49df32eca..8abfb6398 100644
--- a/src/arch/x86/emulenv.cc
+++ b/src/arch/x86/emulenv.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/emulenv.hh"
+
 #include <cassert>
 
-#include "arch/x86/emulenv.hh"
 #include "base/misc.hh"
 
 using namespace X86ISA;
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index 7724c0217..4198bcc7c 100644
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -40,8 +40,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/faults.hh"
+
+#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/isa_traits.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc
index 96125f175..21af1281b 100644
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/src/arch/x86/insts/badmicroop.cc
@@ -37,8 +37,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/insts/badmicroop.hh"
+
+#include "arch/x86/generated/decoder.hh"
 #include "arch/x86/isa_traits.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microfpop.cc b/src/arch/x86/insts/microfpop.cc
index 000cbf635..52004d9ba 100644
--- a/src/arch/x86/insts/microfpop.cc
+++ b/src/arch/x86/insts/microfpop.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/microfpop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/microfpop.hh"
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microldstop.cc b/src/arch/x86/insts/microldstop.cc
index ea38ebfe1..e99e0b9f8 100644
--- a/src/arch/x86/insts/microldstop.cc
+++ b/src/arch/x86/insts/microldstop.cc
@@ -38,10 +38,10 @@
  * Authors: Gabe Black
  */
 
-#include <string>
-
 #include "arch/x86/insts/microldstop.hh"
 
+#include <string>
+
 namespace X86ISA
 {
     std::string LdStOp::generateDisassembly(Addr pc,
diff --git a/src/arch/x86/insts/micromediaop.cc b/src/arch/x86/insts/micromediaop.cc
index fa4d3a473..dc524dafe 100644
--- a/src/arch/x86/insts/micromediaop.cc
+++ b/src/arch/x86/insts/micromediaop.cc
@@ -28,9 +28,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/micromediaop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/micromediaop.hh"
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microop.cc b/src/arch/x86/insts/microop.cc
index 35ee9efaa..923fb15b0 100644
--- a/src/arch/x86/insts/microop.cc
+++ b/src/arch/x86/insts/microop.cc
@@ -38,6 +38,7 @@
  */
 
 #include "arch/x86/insts/microop.hh"
+
 #include "arch/x86/regs/misc.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index b49cda376..5bc6e2fd8 100644
--- a/src/arch/x86/insts/microregop.cc
+++ b/src/arch/x86/insts/microregop.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/insts/microregop.hh"
+
 #include <string>
 
-#include "arch/x86/insts/microregop.hh"
 #include "arch/x86/regs/misc.hh"
 #include "base/condcodes.hh"
 #include "debug/X86.hh"
diff --git a/src/arch/x86/insts/static_inst.cc b/src/arch/x86/insts/static_inst.cc
index 709e0a610..ff425f6bf 100644
--- a/src/arch/x86/insts/static_inst.cc
+++ b/src/arch/x86/insts/static_inst.cc
@@ -39,6 +39,7 @@
  */
 
 #include "arch/x86/insts/static_inst.hh"
+
 #include "arch/x86/regs/segment.hh"
 #include "cpu/reg_class.hh"
 
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc
index 10387c07a..b869a929e 100644
--- a/src/arch/x86/interrupts.cc
+++ b/src/arch/x86/interrupts.cc
@@ -49,19 +49,20 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/interrupts.hh"
+
 #include <memory>
 
-#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 "debug/LocalApic.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/pc.hh"
 #include "dev/x86/south_bridge.hh"
 #include "mem/packet_access.hh"
-#include "sim/system.hh"
 #include "sim/full_system.hh"
+#include "sim/system.hh"
 
 int
 divideFromConf(uint32_t conf)
diff --git a/src/arch/x86/isa.cc b/src/arch/x86/isa.cc
index ad7248841..eaedfbee3 100644
--- a/src/arch/x86/isa.cc
+++ b/src/arch/x86/isa.cc
@@ -28,8 +28,9 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/decoder.hh"
 #include "arch/x86/isa.hh"
+
+#include "arch/x86/decoder.hh"
 #include "arch/x86/tlb.hh"
 #include "cpu/base.hh"
 #include "cpu/thread_context.hh"
diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc
index 8eb064ae4..88bb20483 100644
--- a/src/arch/x86/linux/process.cc
+++ b/src/arch/x86/linux/process.cc
@@ -37,9 +37,10 @@
  * Authors: Gabe Black
  */
 
-#include "arch/x86/linux/linux.hh"
 #include "arch/x86/linux/process.hh"
+
 #include "arch/x86/isa_traits.hh"
+#include "arch/x86/linux/linux.hh"
 #include "arch/x86/registers.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc
index f473af40e..fc5bc2d25 100644
--- a/src/arch/x86/linux/system.cc
+++ b/src/arch/x86/linux/system.cc
@@ -38,9 +38,10 @@
  */
 
 #include "arch/x86/linux/system.hh"
-#include "arch/x86/regs/int.hh"
-#include "arch/x86/isa_traits.hh"
+
 #include "arch/vtophys.hh"
+#include "arch/x86/isa_traits.hh"
+#include "arch/x86/regs/int.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/port_proxy.hh"
diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index d8b3564a3..d7472ef1f 100644
--- a/src/arch/x86/nativetrace.cc
+++ b/src/arch/x86/nativetrace.cc
@@ -28,10 +28,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/nativetrace.hh"
+
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/regs/float.hh"
 #include "arch/x86/regs/int.hh"
-#include "arch/x86/isa_traits.hh"
-#include "arch/x86/nativetrace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/ExecRegDelta.hh"
 #include "params/X86NativeTrace.hh"
diff --git a/src/arch/x86/pagetable.cc b/src/arch/x86/pagetable.cc
index 4e8c39eb9..a1bcee0b3 100644
--- a/src/arch/x86/pagetable.cc
+++ b/src/arch/x86/pagetable.cc
@@ -37,9 +37,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/pagetable.hh"
+
 #include <cmath>
+
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/pagetable.hh"
 #include "sim/serialize.hh"
 
 namespace X86ISA
diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc
index 5545bfa64..998ea856a 100644
--- a/src/arch/x86/pagetable_walker.cc
+++ b/src/arch/x86/pagetable_walker.cc
@@ -49,10 +49,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/pagetable_walker.hh"
+
 #include <memory>
 
 #include "arch/x86/pagetable.hh"
-#include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/tlb.hh"
 #include "arch/x86/vtophys.hh"
 #include "base/bitfield.hh"
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 4b71357b0..3a347e509 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -42,10 +42,11 @@
  *          Ali Saidi
  */
 
+#include "arch/x86/process.hh"
+
+#include "arch/x86/isa_traits.hh"
 #include "arch/x86/regs/misc.hh"
 #include "arch/x86/regs/segment.hh"
-#include "arch/x86/isa_traits.hh"
-#include "arch/x86/process.hh"
 #include "arch/x86/system.hh"
 #include "arch/x86/types.hh"
 #include "base/loader/elf_object.hh"
diff --git a/src/arch/x86/pseudo_inst.cc b/src/arch/x86/pseudo_inst.cc
index f243df73a..edba0474a 100644
--- a/src/arch/x86/pseudo_inst.cc
+++ b/src/arch/x86/pseudo_inst.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/pseudo_inst.hh"
+
 #include "arch/x86/system.hh"
 #include "debug/PseudoInst.hh"
 #include "sim/process.hh"
diff --git a/src/arch/x86/remote_gdb.cc b/src/arch/x86/remote_gdb.cc
index 99800385a..4a9140e64 100644
--- a/src/arch/x86/remote_gdb.cc
+++ b/src/arch/x86/remote_gdb.cc
@@ -40,17 +40,18 @@
  *          Boris Shingarov
  */
 
+#include "arch/x86/remote_gdb.hh"
+
 #include <sys/signal.h>
 #include <unistd.h>
 
 #include <string>
 
-#include "arch/x86/regs/int.hh"
-#include "arch/x86/regs/misc.hh"
+#include "arch/vtophys.hh"
 #include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/process.hh"
-#include "arch/x86/remote_gdb.hh"
-#include "arch/vtophys.hh"
+#include "arch/x86/regs/int.hh"
+#include "arch/x86/regs/misc.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/stacktrace.cc b/src/arch/x86/stacktrace.cc
index d887ac293..ca2a691b4 100644
--- a/src/arch/x86/stacktrace.cc
+++ b/src/arch/x86/stacktrace.cc
@@ -28,10 +28,11 @@
  * Authors: Nathan Binkert
  */
 
+#include "arch/x86/stacktrace.hh"
+
 #include <string>
 
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/stacktrace.hh"
 #include "arch/x86/vtophys.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc
index d8ea274a6..25a1bd0df 100644
--- a/src/arch/x86/system.cc
+++ b/src/arch/x86/system.cc
@@ -37,15 +37,16 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/system.hh"
+
+#include "arch/vtophys.hh"
 #include "arch/x86/bios/intelmp.hh"
 #include "arch/x86/bios/smbios.hh"
-#include "arch/x86/regs/misc.hh"
 #include "arch/x86/isa_traits.hh"
-#include "arch/x86/system.hh"
-#include "arch/vtophys.hh"
+#include "arch/x86/regs/misc.hh"
+#include "base/intmath.hh"
 #include "base/loader/object_file.hh"
 #include "base/loader/symtab.hh"
-#include "base/intmath.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "mem/port_proxy.hh"
diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index 0e0878669..2e24b20e5 100644
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -37,17 +37,18 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/tlb.hh"
+
 #include <cstring>
 #include <memory>
 
 #include "arch/generic/mmapped_ipr.hh"
-#include "arch/x86/insts/microldstop.hh"
-#include "arch/x86/regs/misc.hh"
-#include "arch/x86/regs/msr.hh"
 #include "arch/x86/faults.hh"
+#include "arch/x86/insts/microldstop.hh"
 #include "arch/x86/pagetable.hh"
 #include "arch/x86/pagetable_walker.hh"
-#include "arch/x86/tlb.hh"
+#include "arch/x86/regs/misc.hh"
+#include "arch/x86/regs/msr.hh"
 #include "arch/x86/x86_traits.hh"
 #include "base/bitfield.hh"
 #include "base/trace.hh"
diff --git a/src/arch/x86/types.cc b/src/arch/x86/types.cc
index 59f8b91de..6d7306049 100644
--- a/src/arch/x86/types.cc
+++ b/src/arch/x86/types.cc
@@ -29,6 +29,7 @@
  */
 
 #include "arch/x86/types.hh"
+
 #include "sim/serialize.hh"
 
 using namespace X86ISA;
diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index eb0247d7f..ae0a833e6 100644
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -38,10 +38,11 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/utility.hh"
+
 #include "arch/x86/interrupts.hh"
 #include "arch/x86/registers.hh"
 #include "arch/x86/tlb.hh"
-#include "arch/x86/utility.hh"
 #include "arch/x86/x86_traits.hh"
 #include "cpu/base.hh"
 #include "fputils/fp80.h"
diff --git a/src/arch/x86/vtophys.cc b/src/arch/x86/vtophys.cc
index 4bbeb7119..9b76d89a5 100644
--- a/src/arch/x86/vtophys.cc
+++ b/src/arch/x86/vtophys.cc
@@ -37,11 +37,12 @@
  * Authors: Gabe Black
  */
 
+#include "arch/x86/vtophys.hh"
+
 #include <string>
 
 #include "arch/x86/pagetable_walker.hh"
 #include "arch/x86/tlb.hh"
-#include "arch/x86/vtophys.hh"
 #include "base/trace.hh"
 #include "cpu/thread_context.hh"
 #include "debug/VtoPhys.hh"