style: [patch 1/22] use /r/3648/ to reorganize includes
diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc
index 8bb781c..8a6e469 100644
--- a/src/arch/alpha/faults.cc
+++ b/src/arch/alpha/faults.cc
@@ -29,15 +29,16 @@
* Kevin Lim
*/
-#include "arch/alpha/ev5.hh"
#include "arch/alpha/faults.hh"
+
+#include "arch/alpha/ev5.hh"
#include "arch/alpha/tlb.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "mem/page_table.hh"
-#include "sim/process.hh"
#include "sim/full_system.hh"
+#include "sim/process.hh"
namespace AlphaISA {
diff --git a/src/arch/alpha/freebsd/system.cc b/src/arch/alpha/freebsd/system.cc
index 303d5f7..4599c70 100644
--- a/src/arch/alpha/freebsd/system.cc
+++ b/src/arch/alpha/freebsd/system.cc
@@ -36,6 +36,7 @@
*/
#include "arch/alpha/freebsd/system.hh"
+
#include "arch/alpha/system.hh"
#include "arch/isa_traits.hh"
#include "arch/vtophys.hh"
diff --git a/src/arch/alpha/idle_event.cc b/src/arch/alpha/idle_event.cc
index bb68782..85e1d44 100644
--- a/src/arch/alpha/idle_event.cc
+++ b/src/arch/alpha/idle_event.cc
@@ -30,6 +30,7 @@
*/
#include "arch/alpha/idle_event.hh"
+
#include "arch/alpha/kernel_stats.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/alpha/ipr.cc b/src/arch/alpha/ipr.cc
index 502ada5..909f153 100644
--- a/src/arch/alpha/ipr.cc
+++ b/src/arch/alpha/ipr.cc
@@ -28,11 +28,11 @@
* Authors: Gabe Black
*/
+#include "arch/alpha/ipr.hh"
+
#include <cassert>
#include <cstring>
-#include "arch/alpha/ipr.hh"
-
namespace AlphaISA {
md_ipr_names MiscRegIndexToIpr[NumInternalProcRegs] = {
diff --git a/src/arch/alpha/isa.cc b/src/arch/alpha/isa.cc
index 8240037..fd2dda6 100644
--- a/src/arch/alpha/isa.cc
+++ b/src/arch/alpha/isa.cc
@@ -28,9 +28,10 @@
* Authors: Gabe Black
*/
+#include "arch/alpha/isa.hh"
+
#include <cassert>
-#include "arch/alpha/isa.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
#include "params/AlphaISA.hh"
diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc
index ada79c7..fed8b09 100644
--- a/src/arch/alpha/kernel_stats.cc
+++ b/src/arch/alpha/kernel_stats.cc
@@ -29,13 +29,14 @@
* Nathan Binkert
*/
+#include "arch/alpha/kernel_stats.hh"
+
#include <map>
#include <stack>
#include <string>
-#include "arch/generic/linux/threadinfo.hh"
-#include "arch/alpha/kernel_stats.hh"
#include "arch/alpha/osfpal.hh"
+#include "arch/generic/linux/threadinfo.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "debug/Context.hh"
diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index ebe0651..9a26bb9 100644
--- a/src/arch/alpha/linux/process.cc
+++ b/src/arch/alpha/linux/process.cc
@@ -29,9 +29,10 @@
* Ali Saidi
*/
-#include "arch/alpha/linux/linux.hh"
#include "arch/alpha/linux/process.hh"
+
#include "arch/alpha/isa_traits.hh"
+#include "arch/alpha/linux/linux.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "debug/SyscallVerbose.hh"
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index 80d13cd..3ecf42f 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -41,6 +41,7 @@
*/
#include "arch/alpha/linux/system.hh"
+
#include "arch/alpha/idle_event.hh"
#include "arch/alpha/system.hh"
#include "arch/generic/linux/threadinfo.hh"
diff --git a/src/arch/alpha/pagetable.cc b/src/arch/alpha/pagetable.cc
index f2b1147..30d8b33 100644
--- a/src/arch/alpha/pagetable.cc
+++ b/src/arch/alpha/pagetable.cc
@@ -29,6 +29,7 @@
*/
#include "arch/alpha/pagetable.hh"
+
#include "sim/serialize.hh"
namespace AlphaISA {
diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 9e298f0..be286e3 100644
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -29,8 +29,9 @@
* Ali Saidi
*/
-#include "arch/alpha/isa_traits.hh"
#include "arch/alpha/process.hh"
+
+#include "arch/alpha/isa_traits.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
#include "base/misc.hh"
diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index f32d49e..8c01005 100644
--- a/src/arch/alpha/remote_gdb.cc
+++ b/src/arch/alpha/remote_gdb.cc
@@ -117,15 +117,15 @@
* "Stub" to allow remote cpu to debug over a serial line using gdb.
*/
+#include "arch/alpha/remote_gdb.hh"
+
#include <sys/signal.h>
#include <unistd.h>
#include <string>
-
#include "arch/alpha/decoder.hh"
#include "arch/alpha/regredir.hh"
-#include "arch/alpha/remote_gdb.hh"
#include "arch/alpha/utility.hh"
#include "arch/alpha/vtophys.hh"
#include "base/intmath.hh"
@@ -138,8 +138,8 @@
#include "debug/GDBMisc.hh"
#include "mem/physical.hh"
#include "mem/port.hh"
-#include "sim/system.hh"
#include "sim/full_system.hh"
+#include "sim/system.hh"
using namespace std;
using namespace AlphaISA;
diff --git a/src/arch/alpha/stacktrace.cc b/src/arch/alpha/stacktrace.cc
index f489557..1dc5956 100644
--- a/src/arch/alpha/stacktrace.cc
+++ b/src/arch/alpha/stacktrace.cc
@@ -28,10 +28,11 @@
* Authors: Nathan Binkert
*/
+#include "arch/alpha/stacktrace.hh"
+
#include <string>
#include "arch/alpha/isa_traits.hh"
-#include "arch/alpha/stacktrace.hh"
#include "arch/alpha/vtophys.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
diff --git a/src/arch/alpha/system.cc b/src/arch/alpha/system.cc
index d2be549..3029429 100644
--- a/src/arch/alpha/system.cc
+++ b/src/arch/alpha/system.cc
@@ -29,10 +29,11 @@
* Nathan Binkert
*/
+#include "arch/alpha/system.hh"
+
#include <sys/signal.h>
#include "arch/alpha/ev5.hh"
-#include "arch/alpha/system.hh"
#include "arch/vtophys.hh"
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
diff --git a/src/arch/alpha/utility.cc b/src/arch/alpha/utility.cc
index 2dfe00f..de4b4e3 100644
--- a/src/arch/alpha/utility.cc
+++ b/src/arch/alpha/utility.cc
@@ -30,6 +30,7 @@
*/
#include "arch/alpha/utility.hh"
+
#include "arch/alpha/vtophys.hh"
#include "mem/fs_translating_port_proxy.hh"
#include "sim/full_system.hh"
diff --git a/src/arch/alpha/vtophys.cc b/src/arch/alpha/vtophys.cc
index 8ca23fc..baf3041 100644
--- a/src/arch/alpha/vtophys.cc
+++ b/src/arch/alpha/vtophys.cc
@@ -30,10 +30,11 @@
* Ali Saidi
*/
+#include "arch/alpha/vtophys.hh"
+
#include <string>
#include "arch/alpha/ev5.hh"
-#include "arch/alpha/vtophys.hh"
#include "base/chunk_generator.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 0a39dbb..b0d7700 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -45,9 +45,10 @@
*/
#include "arch/arm/faults.hh"
+
+#include "arch/arm/insts/static_inst.hh"
#include "arch/arm/system.hh"
#include "arch/arm/utility.hh"
-#include "arch/arm/insts/static_inst.hh"
#include "base/compiler.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index 154039a..9a3e706 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -40,10 +40,10 @@
* Authors: Stephen Hines
*/
-#include <sstream>
-
#include "arch/arm/insts/macromem.hh"
+#include <sstream>
+
#include "arch/arm/generated/decoder.hh"
#include "arch/arm/insts/neon64_mem.hh"
diff --git a/src/arch/arm/insts/mem.cc b/src/arch/arm/insts/mem.cc
index 15702ff..5582353 100644
--- a/src/arch/arm/insts/mem.cc
+++ b/src/arch/arm/insts/mem.cc
@@ -41,6 +41,7 @@
*/
#include "arch/arm/insts/mem.hh"
+
#include "base/loader/symtab.hh"
using namespace std;
diff --git a/src/arch/arm/insts/mem64.cc b/src/arch/arm/insts/mem64.cc
index 4d1fdd3..52e2fc7 100644
--- a/src/arch/arm/insts/mem64.cc
+++ b/src/arch/arm/insts/mem64.cc
@@ -38,6 +38,7 @@
*/
#include "arch/arm/insts/mem64.hh"
+
#include "arch/arm/tlb.hh"
#include "base/loader/symtab.hh"
#include "mem/request.hh"
diff --git a/src/arch/arm/insts/misc.cc b/src/arch/arm/insts/misc.cc
index 7432f43..790989d 100644
--- a/src/arch/arm/insts/misc.cc
+++ b/src/arch/arm/insts/misc.cc
@@ -39,6 +39,7 @@
*/
#include "arch/arm/insts/misc.hh"
+
#include "cpu/reg_class.hh"
std::string
diff --git a/src/arch/arm/insts/pseudo.cc b/src/arch/arm/insts/pseudo.cc
index 526369b..ab38e29 100644
--- a/src/arch/arm/insts/pseudo.cc
+++ b/src/arch/arm/insts/pseudo.cc
@@ -42,6 +42,7 @@
*/
#include "arch/arm/insts/pseudo.hh"
+
#include "cpu/exec_context.hh"
DecoderFaultInst::DecoderFaultInst(ExtMachInst _machInst)
diff --git a/src/arch/arm/insts/static_inst.cc b/src/arch/arm/insts/static_inst.cc
index 3defc07..df27ed8 100644
--- a/src/arch/arm/insts/static_inst.cc
+++ b/src/arch/arm/insts/static_inst.cc
@@ -42,10 +42,11 @@
*/
#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"
#include "cpu/reg_class.hh"
namespace ArmISA
diff --git a/src/arch/arm/interrupts.cc b/src/arch/arm/interrupts.cc
index d3ba161..3d841e9 100644
--- a/src/arch/arm/interrupts.cc
+++ b/src/arch/arm/interrupts.cc
@@ -38,6 +38,7 @@
*/
#include "arch/arm/interrupts.hh"
+
#include "arch/arm/system.hh"
ArmISA::Interrupts *
diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 4f099bf..0db6d43 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -39,10 +39,11 @@
*/
#include "arch/arm/isa.hh"
+
#include "arch/arm/pmu.hh"
#include "arch/arm/system.hh"
-#include "cpu/checker/cpu.hh"
#include "cpu/base.hh"
+#include "cpu/checker/cpu.hh"
#include "debug/Arm.hh"
#include "debug/MiscRegs.hh"
#include "dev/arm/generic_timer.hh"
diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc
index b802cd6..e511fd6 100644
--- a/src/arch/arm/kvm/base_cpu.cc
+++ b/src/arch/arm/kvm/base_cpu.cc
@@ -44,7 +44,6 @@
#include "debug/KvmInt.hh"
#include "params/BaseArmKvmCPU.hh"
-
#define INTERRUPT_ID(type, vcpu, irq) ( \
((type) << KVM_ARM_IRQ_TYPE_SHIFT) | \
((vcpu) << KVM_ARM_IRQ_VCPU_SHIFT) | \
diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc
index 48aebad..67f2589 100644
--- a/src/arch/arm/linux/process.cc
+++ b/src/arch/arm/linux/process.cc
@@ -44,9 +44,10 @@
* Giacomo Gabrielli
*/
-#include "arch/arm/linux/linux.hh"
#include "arch/arm/linux/process.hh"
+
#include "arch/arm/isa_traits.hh"
+#include "arch/arm/linux/linux.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/linux.hh"
diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc
index 311d81a..52e075d 100644
--- a/src/arch/arm/linux/system.cc
+++ b/src/arch/arm/linux/system.cc
@@ -40,9 +40,10 @@
* Authors: Ali Saidi
*/
-#include "arch/arm/linux/atag.hh"
#include "arch/arm/linux/system.hh"
+
#include "arch/arm/isa_traits.hh"
+#include "arch/arm/linux/atag.hh"
#include "arch/arm/utility.hh"
#include "arch/generic/linux/threadinfo.hh"
#include "base/loader/dtb_object.hh"
diff --git a/src/arch/arm/miscregs.cc b/src/arch/arm/miscregs.cc
index 525d448..09af405 100644
--- a/src/arch/arm/miscregs.cc
+++ b/src/arch/arm/miscregs.cc
@@ -39,8 +39,9 @@
* Giacomo Gabrielli
*/
-#include "arch/arm/isa.hh"
#include "arch/arm/miscregs.hh"
+
+#include "arch/arm/isa.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
#include "sim/full_system.hh"
diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc
index 20f13e6..fcb13fb 100644
--- a/src/arch/arm/nativetrace.cc
+++ b/src/arch/arm/nativetrace.cc
@@ -40,9 +40,10 @@
* Authors: Gabe Black
*/
+#include "arch/arm/nativetrace.hh"
+
#include "arch/arm/isa_traits.hh"
#include "arch/arm/miscregs.hh"
-#include "arch/arm/nativetrace.hh"
#include "cpu/thread_context.hh"
#include "debug/ExecRegDelta.hh"
#include "params/ArmNativeTrace.hh"
diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc
index a787b1f..cc3d3e2 100644
--- a/src/arch/arm/process.cc
+++ b/src/arch/arm/process.cc
@@ -41,8 +41,9 @@
* Ali Saidi
*/
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/process.hh"
+
+#include "arch/arm/isa_traits.hh"
#include "arch/arm/types.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc
index 42ca941..b0f6d8e 100644
--- a/src/arch/arm/remote_gdb.cc
+++ b/src/arch/arm/remote_gdb.cc
@@ -132,6 +132,8 @@
* "Stub" to allow remote cpu to debug over a serial line using gdb.
*/
+#include "arch/arm/remote_gdb.hh"
+
#include <sys/signal.h>
#include <unistd.h>
@@ -140,7 +142,6 @@
#include "arch/arm/decoder.hh"
#include "arch/arm/pagetable.hh"
#include "arch/arm/registers.hh"
-#include "arch/arm/remote_gdb.hh"
#include "arch/arm/system.hh"
#include "arch/arm/utility.hh"
#include "arch/arm/vtophys.hh"
diff --git a/src/arch/arm/stacktrace.cc b/src/arch/arm/stacktrace.cc
index 0246ffd..a7e26c6 100644
--- a/src/arch/arm/stacktrace.cc
+++ b/src/arch/arm/stacktrace.cc
@@ -28,10 +28,11 @@
* Authors: Nathan Binkert
*/
+#include "arch/arm/stacktrace.hh"
+
#include <string>
#include "arch/arm/isa_traits.hh"
-#include "arch/arm/stacktrace.hh"
#include "arch/arm/vtophys.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
diff --git a/src/arch/arm/stage2_lookup.cc b/src/arch/arm/stage2_lookup.cc
index 04d50af..82a29e8 100755
--- a/src/arch/arm/stage2_lookup.cc
+++ b/src/arch/arm/stage2_lookup.cc
@@ -38,8 +38,9 @@
* Giacomo Gabrielli
*/
-#include "arch/arm/faults.hh"
#include "arch/arm/stage2_lookup.hh"
+
+#include "arch/arm/faults.hh"
#include "arch/arm/system.hh"
#include "arch/arm/table_walker.hh"
#include "arch/arm/tlb.hh"
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index b616663..322f686 100644
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -40,14 +40,15 @@
* Authors: Ali Saidi
*/
+#include "arch/arm/system.hh"
+
#include <iostream>
-#include "arch/arm/system.hh"
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
#include "cpu/thread_context.hh"
-#include "mem/physical.hh"
#include "mem/fs_translating_port_proxy.hh"
+#include "mem/physical.hh"
#include "sim/full_system.hh"
using namespace std;
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index 6658657..85bc12c 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -50,10 +50,10 @@
#include "arch/arm/faults.hh"
#include "arch/arm/pagetable.hh"
-#include "arch/arm/system.hh"
-#include "arch/arm/table_walker.hh"
#include "arch/arm/stage2_lookup.hh"
#include "arch/arm/stage2_mmu.hh"
+#include "arch/arm/system.hh"
+#include "arch/arm/table_walker.hh"
#include "arch/arm/utility.hh"
#include "base/inifile.hh"
#include "base/str.hh"
diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index 56a21ae..1437801 100644
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -37,16 +37,17 @@
* Authors: Ali Saidi
*/
+#include "arch/arm/utility.hh"
+
#include <memory>
#include "arch/arm/faults.hh"
#include "arch/arm/isa_traits.hh"
#include "arch/arm/system.hh"
#include "arch/arm/tlb.hh"
-#include "arch/arm/utility.hh"
#include "arch/arm/vtophys.hh"
-#include "cpu/checker/cpu.hh"
#include "cpu/base.hh"
+#include "cpu/checker/cpu.hh"
#include "cpu/thread_context.hh"
#include "mem/fs_translating_port_proxy.hh"
#include "sim/full_system.hh"
diff --git a/src/arch/arm/vtophys.cc b/src/arch/arm/vtophys.cc
index 24fc5a5..8728678 100644
--- a/src/arch/arm/vtophys.cc
+++ b/src/arch/arm/vtophys.cc
@@ -43,12 +43,13 @@
* Stephen Hines
*/
+#include "arch/arm/vtophys.hh"
+
#include <string>
#include "arch/arm/faults.hh"
#include "arch/arm/table_walker.hh"
#include "arch/arm/tlb.hh"
-#include "arch/arm/vtophys.hh"
#include "base/chunk_generator.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/generic/decode_cache.cc b/src/arch/generic/decode_cache.cc
index 7211ba3..782dfca 100644
--- a/src/arch/generic/decode_cache.cc
+++ b/src/arch/generic/decode_cache.cc
@@ -29,6 +29,7 @@
*/
#include "arch/generic/decode_cache.hh"
+
#include "arch/decoder.hh"
#include "arch/types.hh"
#include "config/the_isa.hh"
diff --git a/src/arch/generic/mmapped_ipr.cc b/src/arch/generic/mmapped_ipr.cc
index 1a356a5..c908eff 100644
--- a/src/arch/generic/mmapped_ipr.cc
+++ b/src/arch/generic/mmapped_ipr.cc
@@ -29,6 +29,7 @@
*/
#include "arch/generic/mmapped_ipr.hh"
+
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/pseudo_inst.hh"
diff --git a/src/arch/generic/pseudo_inst.cc b/src/arch/generic/pseudo_inst.cc
index e914b05..46667c1 100644
--- a/src/arch/generic/pseudo_inst.cc
+++ b/src/arch/generic/pseudo_inst.cc
@@ -29,6 +29,7 @@
*/
#include "arch/generic/pseudo_inst.hh"
+
#include "base/misc.hh"
class ThreadContext;
diff --git a/src/arch/mips/bare_iron/system.cc b/src/arch/mips/bare_iron/system.cc
index ff928ac..e1f5462 100755
--- a/src/arch/mips/bare_iron/system.cc
+++ b/src/arch/mips/bare_iron/system.cc
@@ -29,6 +29,7 @@
*/
#include "arch/mips/bare_iron/system.hh"
+
#include "params/BareIronMipsSystem.hh"
BareIronMipsSystem::BareIronMipsSystem(Params *p)
diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc
index 3f6c686..c999955 100755
--- a/src/arch/mips/dsp.cc
+++ b/src/arch/mips/dsp.cc
@@ -29,6 +29,7 @@
*/
#include "arch/mips/dsp.hh"
+
#include "arch/mips/isa_traits.hh"
#include "base/bitfield.hh"
#include "base/misc.hh"
diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc
index eae6bc9..9ab1500 100644
--- a/src/arch/mips/faults.cc
+++ b/src/arch/mips/faults.cc
@@ -34,6 +34,7 @@
*/
#include "arch/mips/faults.hh"
+
#include "arch/mips/pra_constants.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
diff --git a/src/arch/mips/idle_event.cc b/src/arch/mips/idle_event.cc
index 8c98c50..a57988c 100644
--- a/src/arch/mips/idle_event.cc
+++ b/src/arch/mips/idle_event.cc
@@ -31,6 +31,7 @@
*/
#include "arch/mips/idle_event.hh"
+
#include "arch/mips/kernel_stats.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/mips/interrupts.cc b/src/arch/mips/interrupts.cc
index 98c1b8e..17bb146 100755
--- a/src/arch/mips/interrupts.cc
+++ b/src/arch/mips/interrupts.cc
@@ -32,6 +32,7 @@
*/
#include "arch/mips/interrupts.hh"
+
#include "arch/mips/isa_traits.hh"
#include "arch/mips/pra_constants.hh"
#include "base/trace.hh"
diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc
index 5090e0b..6310f67 100644
--- a/src/arch/mips/isa.cc
+++ b/src/arch/mips/isa.cc
@@ -29,6 +29,7 @@
*/
#include "arch/mips/isa.hh"
+
#include "arch/mips/mt.hh"
#include "arch/mips/mt_constants.hh"
#include "arch/mips/pra_constants.hh"
diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index c6c4018..deb6e8b 100644
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -30,9 +30,10 @@
* Korey Sewell
*/
-#include "arch/mips/linux/linux.hh"
#include "arch/mips/linux/process.hh"
+
#include "arch/mips/isa_traits.hh"
+#include "arch/mips/linux/linux.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "debug/SyscallVerbose.hh"
diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc
index dc2ac7d..4a23aae 100644
--- a/src/arch/mips/linux/system.cc
+++ b/src/arch/mips/linux/system.cc
@@ -39,8 +39,9 @@
* up boot time.
*/
-#include "arch/generic/linux/threadinfo.hh"
#include "arch/mips/linux/system.hh"
+
+#include "arch/generic/linux/threadinfo.hh"
#include "arch/mips/idle_event.hh"
#include "arch/mips/system.hh"
#include "arch/vtophys.hh"
diff --git a/src/arch/mips/pagetable.cc b/src/arch/mips/pagetable.cc
index 26d9bf4..0c1734b 100644
--- a/src/arch/mips/pagetable.cc
+++ b/src/arch/mips/pagetable.cc
@@ -32,6 +32,7 @@
*/
#include "arch/mips/pagetable.hh"
+
#include "sim/serialize.hh"
namespace MipsISA
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 6947eea..dd97fe7 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -30,8 +30,9 @@
* Korey Sewell
*/
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/process.hh"
+
+#include "arch/mips/isa_traits.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
#include "base/misc.hh"
diff --git a/src/arch/mips/remote_gdb.cc b/src/arch/mips/remote_gdb.cc
index 68d8eaa..4fa7cac 100644
--- a/src/arch/mips/remote_gdb.cc
+++ b/src/arch/mips/remote_gdb.cc
@@ -133,13 +133,14 @@
* "Stub" to allow remote cpu to debug over a serial line using gdb.
*/
+#include "arch/mips/remote_gdb.hh"
+
#include <sys/signal.h>
#include <unistd.h>
#include <string>
#include "arch/mips/decoder.hh"
-#include "arch/mips/remote_gdb.hh"
#include "arch/mips/vtophys.hh"
#include "cpu/thread_state.hh"
#include "debug/GDBAcc.hh"
diff --git a/src/arch/mips/stacktrace.cc b/src/arch/mips/stacktrace.cc
index 78457c0..f584855 100644
--- a/src/arch/mips/stacktrace.cc
+++ b/src/arch/mips/stacktrace.cc
@@ -28,10 +28,11 @@
* Authors: Nathan Binkert
*/
+#include "arch/mips/stacktrace.hh"
+
#include <string>
#include "arch/mips/isa_traits.hh"
-#include "arch/mips/stacktrace.hh"
#include "arch/mips/vtophys.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
diff --git a/src/arch/mips/system.cc b/src/arch/mips/system.cc
index c6a043e..8156747 100755
--- a/src/arch/mips/system.cc
+++ b/src/arch/mips/system.cc
@@ -32,6 +32,7 @@
*/
#include "arch/mips/system.hh"
+
#include "arch/vtophys.hh"
#include "base/loader/hex_file.hh"
#include "base/loader/object_file.hh"
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index 340c830..87a4594 100644
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -33,13 +33,14 @@
* Deyuan Guo
*/
+#include "arch/mips/tlb.hh"
+
#include <string>
#include <vector>
#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"
diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index 80047fb..c563216 100644
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -28,11 +28,12 @@
* Authors: Korey Sewell
*/
+#include "arch/mips/utility.hh"
+
#include <cmath>
#include "arch/mips/isa_traits.hh"
#include "arch/mips/registers.hh"
-#include "arch/mips/utility.hh"
#include "arch/mips/vtophys.hh"
#include "base/bitfield.hh"
#include "base/misc.hh"
@@ -41,7 +42,6 @@
#include "mem/fs_translating_port_proxy.hh"
#include "sim/serialize.hh"
-
using namespace MipsISA;
using namespace std;
diff --git a/src/arch/mips/vtophys.cc b/src/arch/mips/vtophys.cc
index 60d9bc1..237b675 100755
--- a/src/arch/mips/vtophys.cc
+++ b/src/arch/mips/vtophys.cc
@@ -31,9 +31,10 @@
* Jaidev Patwardhan
*/
+#include "arch/mips/vtophys.hh"
+
#include <string>
-#include "arch/mips/vtophys.hh"
#include "base/chunk_generator.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/power/insts/branch.cc b/src/arch/power/insts/branch.cc
index 352c4ea..f9876db 100644
--- a/src/arch/power/insts/branch.cc
+++ b/src/arch/power/insts/branch.cc
@@ -29,6 +29,7 @@
*/
#include "arch/power/insts/branch.hh"
+
#include "base/loader/symtab.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/power/insts/mem.cc b/src/arch/power/insts/mem.cc
index 447efa2..68a33c6 100644
--- a/src/arch/power/insts/mem.cc
+++ b/src/arch/power/insts/mem.cc
@@ -29,6 +29,7 @@
*/
#include "arch/power/insts/mem.hh"
+
#include "base/loader/symtab.hh"
using namespace PowerISA;
diff --git a/src/arch/power/insts/static_inst.cc b/src/arch/power/insts/static_inst.cc
index 087e1f7..db8c030 100644
--- a/src/arch/power/insts/static_inst.cc
+++ b/src/arch/power/insts/static_inst.cc
@@ -30,6 +30,7 @@
*/
#include "arch/power/insts/static_inst.hh"
+
#include "cpu/reg_class.hh"
using namespace PowerISA;
diff --git a/src/arch/power/isa.cc b/src/arch/power/isa.cc
index 0b49c97..faf6dfb 100644
--- a/src/arch/power/isa.cc
+++ b/src/arch/power/isa.cc
@@ -38,6 +38,7 @@
*/
#include "arch/power/isa.hh"
+
#include "params/PowerISA.hh"
namespace PowerISA
diff --git a/src/arch/power/linux/process.cc b/src/arch/power/linux/process.cc
index b00e02a..f9c424c 100644
--- a/src/arch/power/linux/process.cc
+++ b/src/arch/power/linux/process.cc
@@ -32,9 +32,10 @@
* Timothy M. Jones
*/
-#include "arch/power/linux/linux.hh"
#include "arch/power/linux/process.hh"
+
#include "arch/power/isa_traits.hh"
+#include "arch/power/linux/linux.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
#include "kern/linux/linux.hh"
diff --git a/src/arch/power/pagetable.cc b/src/arch/power/pagetable.cc
index 4af0b79..81314a7 100644
--- a/src/arch/power/pagetable.cc
+++ b/src/arch/power/pagetable.cc
@@ -36,6 +36,7 @@
*/
#include "arch/power/pagetable.hh"
+
#include "sim/serialize.hh"
namespace PowerISA
diff --git a/src/arch/power/process.cc b/src/arch/power/process.cc
index 10e4a85..880d7dd 100644
--- a/src/arch/power/process.cc
+++ b/src/arch/power/process.cc
@@ -30,8 +30,9 @@
* Timothy M. Jones
*/
-#include "arch/power/isa_traits.hh"
#include "arch/power/process.hh"
+
+#include "arch/power/isa_traits.hh"
#include "arch/power/types.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
diff --git a/src/arch/power/stacktrace.cc b/src/arch/power/stacktrace.cc
index f241dfe..2952c74 100644
--- a/src/arch/power/stacktrace.cc
+++ b/src/arch/power/stacktrace.cc
@@ -28,9 +28,10 @@
* Authors: Nathan Binkert
*/
+#include "arch/power/stacktrace.hh"
+
#include <string>
-#include "arch/power/stacktrace.hh"
#include "base/trace.hh"
using namespace std;
diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index 90a341d..4172778 100644
--- a/src/arch/power/tlb.cc
+++ b/src/arch/power/tlb.cc
@@ -35,12 +35,13 @@
* Timothy M. Jones
*/
+#include "arch/power/tlb.hh"
+
#include <string>
#include <vector>
#include "arch/power/faults.hh"
#include "arch/power/pagetable.hh"
-#include "arch/power/tlb.hh"
#include "arch/power/utility.hh"
#include "base/inifile.hh"
#include "base/str.hh"
diff --git a/src/arch/power/utility.cc b/src/arch/power/utility.cc
index 7be195b..c8076a6 100644
--- a/src/arch/power/utility.cc
+++ b/src/arch/power/utility.cc
@@ -33,6 +33,7 @@
*/
#include "arch/power/utility.hh"
+
#include "base/misc.hh"
namespace PowerISA {
diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc
index 8ace3cb..c181e30 100644
--- a/src/arch/sparc/faults.cc
+++ b/src/arch/sparc/faults.cc
@@ -29,20 +29,20 @@
* Kevin Lim
*/
+#include "arch/sparc/faults.hh"
+
#include <algorithm>
-#include "arch/sparc/faults.hh"
#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/process.hh"
#include "arch/sparc/types.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
-#include "sim/full_system.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "mem/page_table.hh"
-#include "sim/process.hh"
#include "sim/full_system.hh"
+#include "sim/process.hh"
using namespace std;
diff --git a/src/arch/sparc/isa.cc b/src/arch/sparc/isa.cc
index aa10a0b..b8906e9 100644
--- a/src/arch/sparc/isa.cc
+++ b/src/arch/sparc/isa.cc
@@ -28,9 +28,10 @@
* Authors: Gabe Black
*/
+#include "arch/sparc/isa.hh"
+
#include "arch/sparc/asi.hh"
#include "arch/sparc/decoder.hh"
-#include "arch/sparc/isa.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc
index ce60940..fd4dd98 100644
--- a/src/arch/sparc/linux/process.cc
+++ b/src/arch/sparc/linux/process.cc
@@ -31,6 +31,7 @@
*/
#include "arch/sparc/linux/process.hh"
+
#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
#include "base/trace.hh"
diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc
index 8987aa5..509e3ad 100644
--- a/src/arch/sparc/nativetrace.cc
+++ b/src/arch/sparc/nativetrace.cc
@@ -28,8 +28,9 @@
* Authors: Gabe Black
*/
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/nativetrace.hh"
+
+#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
#include "cpu/thread_context.hh"
#include "params/SparcNativeTrace.hh"
diff --git a/src/arch/sparc/pagetable.cc b/src/arch/sparc/pagetable.cc
index f0d2c10..0a14f0b 100644
--- a/src/arch/sparc/pagetable.cc
+++ b/src/arch/sparc/pagetable.cc
@@ -29,6 +29,7 @@
*/
#include "arch/sparc/pagetable.hh"
+
#include "sim/serialize.hh"
namespace SparcISA
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index 09d52ae..f863eb0 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -29,10 +29,11 @@
* Ali Saidi
*/
+#include "arch/sparc/process.hh"
+
#include "arch/sparc/asi.hh"
#include "arch/sparc/handlers.hh"
#include "arch/sparc/isa_traits.hh"
-#include "arch/sparc/process.hh"
#include "arch/sparc/registers.hh"
#include "arch/sparc/types.hh"
#include "base/loader/elf_object.hh"
diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 46788af..b7ecd3b 100644
--- a/src/arch/sparc/remote_gdb.cc
+++ b/src/arch/sparc/remote_gdb.cc
@@ -119,13 +119,14 @@
* "Stub" to allow remote cpu to debug over a serial line using gdb.
*/
-#include <signal.h>
+#include "arch/sparc/remote_gdb.hh"
+
#include <sys/signal.h>
#include <unistd.h>
+#include <csignal>
#include <string>
-#include "arch/sparc/remote_gdb.hh"
#include "arch/vtophys.hh"
#include "base/intmath.hh"
#include "base/remote_gdb.hh"
diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc
index f929877..3815972 100644
--- a/src/arch/sparc/solaris/process.cc
+++ b/src/arch/sparc/solaris/process.cc
@@ -29,6 +29,7 @@
*/
#include "arch/sparc/solaris/process.hh"
+
#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
#include "base/trace.hh"
diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc
index 5c7f06d..a68b11c 100644
--- a/src/arch/sparc/system.cc
+++ b/src/arch/sparc/system.cc
@@ -29,6 +29,7 @@
*/
#include "arch/sparc/system.hh"
+
#include "arch/vtophys.hh"
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index b4a7612..51eb83a 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -28,12 +28,13 @@
* Authors: Ali Saidi
*/
+#include "arch/sparc/tlb.hh"
+
#include <cstring>
#include "arch/sparc/asi.hh"
#include "arch/sparc/faults.hh"
#include "arch/sparc/registers.hh"
-#include "arch/sparc/tlb.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc
index 2c10095..274301b 100644
--- a/src/arch/sparc/ua2005.cc
+++ b/src/arch/sparc/ua2005.cc
@@ -35,8 +35,8 @@
#include "cpu/thread_context.hh"
#include "debug/Quiesce.hh"
#include "debug/Timer.hh"
-#include "sim/system.hh"
#include "sim/full_system.hh"
+#include "sim/system.hh"
using namespace SparcISA;
using namespace std;
diff --git a/src/arch/sparc/utility.cc b/src/arch/sparc/utility.cc
index 34d4f79..8f997aa 100644
--- a/src/arch/sparc/utility.cc
+++ b/src/arch/sparc/utility.cc
@@ -29,8 +29,9 @@
* Ali Saidi
*/
-#include "arch/sparc/faults.hh"
#include "arch/sparc/utility.hh"
+
+#include "arch/sparc/faults.hh"
#include "arch/sparc/vtophys.hh"
#include "mem/fs_translating_port_proxy.hh"
diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc
index e3d4f50..6ba62eb 100644
--- a/src/arch/sparc/vtophys.cc
+++ b/src/arch/sparc/vtophys.cc
@@ -28,10 +28,11 @@
* Authors: Ali Saidi
*/
+#include "arch/sparc/vtophys.hh"
+
#include <string>
#include "arch/sparc/tlb.hh"
-#include "arch/sparc/vtophys.hh"
#include "base/chunk_generator.hh"
#include "base/compiler.hh"
#include "base/trace.hh"
diff --git a/src/arch/x86/bios/acpi.cc b/src/arch/x86/bios/acpi.cc
index 4382a3d..4f279c8 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 c966916..a1daf0a 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 98b3a6f..8d0a9be 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 9072664..26785f5 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 f1424cc..c78b720 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 3839487..324eb02 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 49df32e..8abfb63 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 7724c02..4198bcc 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 96125f1..21af128 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 000cbf6..52004d9 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 ea38ebf..e99e0b9 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 fa4d3a4..dc524da 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 35ee9ef..923fb15 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 b49cda3..5bc6e2f 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 709e0a6..ff425f6 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 10387c0..b869a92 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 ad72488..eaedfbe 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 8eb064a..88bb204 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 f473af4..fc5bc2d 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 d8b3564..d7472ef 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 4e8c39e..a1bcee0 100644
--- a/src/arch/x86/pagetable.cc
+++ b/src/arch/x86/pagetable.cc
@@ -37,9 +37,11 @@
* Authors: Gabe Black
*/
-#include <cmath>
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/pagetable.hh"
+
+#include <cmath>
+
+#include "arch/x86/isa_traits.hh"
#include "sim/serialize.hh"
namespace X86ISA
diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc
index 5545bfa..998ea85 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 4b71357..3a347e5 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 f243df7..edba047 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 9980038..4a9140e 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 d887ac2..ca2a691 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 d8ea274..25a1bd0 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 0e08786..2e24b20 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 59f8b91..6d73060 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 eb0247d..ae0a833 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 4bbeb71..9b76d89 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"
diff --git a/src/base/atomicio.cc b/src/base/atomicio.cc
index 13eeca0..2913221 100644
--- a/src/base/atomicio.cc
+++ b/src/base/atomicio.cc
@@ -28,11 +28,11 @@
* Authors: Nathan Binkert
*/
+#include "base/atomicio.hh"
+
#include <cerrno>
#include <cstdio>
-#include "base/atomicio.hh"
-
ssize_t
atomic_read(int fd, void *s, size_t n)
{
diff --git a/src/base/bigint.cc b/src/base/bigint.cc
index d741e1f..ce9942c 100644
--- a/src/base/bigint.cc
+++ b/src/base/bigint.cc
@@ -28,10 +28,10 @@
* Authors: Gabe Black
*/
-#include <iostream>
-
#include "base/bigint.hh"
+#include <iostream>
+
using namespace std;
ostream & operator << (ostream & os, const Twin64_t & t)
diff --git a/src/base/cp_annotate.cc b/src/base/cp_annotate.cc
index c62398d..9209ffd 100644
--- a/src/base/cp_annotate.cc
+++ b/src/base/cp_annotate.cc
@@ -28,11 +28,12 @@
* Authors: Ali Saidi
*/
+#include "base/cp_annotate.hh"
+
#include "arch/generic/linux/threadinfo.hh"
#include "arch/utility.hh"
-#include "base/loader/object_file.hh"
#include "base/callback.hh"
-#include "base/cp_annotate.hh"
+#include "base/loader/object_file.hh"
#include "base/output.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
diff --git a/src/base/cprintf.cc b/src/base/cprintf.cc
index 2dd2ab4..5daf196 100644
--- a/src/base/cprintf.cc
+++ b/src/base/cprintf.cc
@@ -28,13 +28,13 @@
* Authors: Nathan Binkert
*/
+#include "base/cprintf.hh"
+
#include <cassert>
#include <iomanip>
#include <iostream>
#include <sstream>
-#include "base/cprintf.hh"
-
using namespace std;
namespace cp {
diff --git a/src/base/debug.cc b/src/base/debug.cc
index 6161c9e..6be9cdf 100644
--- a/src/base/debug.cc
+++ b/src/base/debug.cc
@@ -28,6 +28,8 @@
* Authors: Nathan Binkert
*/
+#include "base/debug.hh"
+
#include <sys/types.h>
#include <unistd.h>
@@ -35,7 +37,6 @@
#include <csignal>
#include "base/cprintf.hh"
-#include "base/debug.hh"
#include "base/misc.hh"
using namespace std;
diff --git a/src/base/hostinfo.cc b/src/base/hostinfo.cc
index e5a612c..43999a5 100644
--- a/src/base/hostinfo.cc
+++ b/src/base/hostinfo.cc
@@ -34,8 +34,11 @@
#include <mach/mach_init.h>
#include <mach/shared_region.h>
#include <mach/task.h>
+
#endif
+#include "base/hostinfo.hh"
+
#include <cctype>
#include <cerrno>
#include <cmath>
@@ -44,7 +47,6 @@
#include <cstring>
#include <string>
-#include "base/hostinfo.hh"
#include "base/misc.hh"
#include "base/str.hh"
#include "base/types.hh"
diff --git a/src/base/inet.cc b/src/base/inet.cc
index 866b77f..57af0e5 100644
--- a/src/base/inet.cc
+++ b/src/base/inet.cc
@@ -43,13 +43,14 @@
* Geoffrey Blake
*/
+#include "base/inet.hh"
+
#include <cstddef>
#include <cstdio>
#include <sstream>
#include <string>
#include "base/cprintf.hh"
-#include "base/inet.hh"
#include "base/types.hh"
using namespace std;
diff --git a/src/base/inifile.cc b/src/base/inifile.cc
index 80ed3eb..b0ece2e 100644
--- a/src/base/inifile.cc
+++ b/src/base/inifile.cc
@@ -29,13 +29,14 @@
* Steve Reinhardt
*/
+#include "base/inifile.hh"
+
#include <algorithm>
#include <fstream>
#include <iostream>
#include <string>
#include <vector>
-#include "base/inifile.hh"
#include "base/str.hh"
using namespace std;
diff --git a/src/base/loader/aout_object.cc b/src/base/loader/aout_object.cc
index 468b1b1..b731c9a 100644
--- a/src/base/loader/aout_object.cc
+++ b/src/base/loader/aout_object.cc
@@ -28,9 +28,10 @@
* Authors: Steve Reinhardt
*/
+#include "base/loader/aout_object.hh"
+
#include <string>
-#include "base/loader/aout_object.hh"
#include "base/loader/exec_aout.h"
#include "base/loader/symtab.hh"
#include "base/trace.hh"
diff --git a/src/base/loader/dtb_object.cc b/src/base/loader/dtb_object.cc
index 986f645..fab6a76 100644
--- a/src/base/loader/dtb_object.cc
+++ b/src/base/loader/dtb_object.cc
@@ -35,9 +35,9 @@
#include <cassert>
-#include "sim/byteswap.hh"
#include "fdt.h"
#include "libfdt.h"
+#include "sim/byteswap.hh"
ObjectFile *
DtbObject::tryFile(const std::string &fname, size_t len, uint8_t *data)
diff --git a/src/base/loader/ecoff_object.cc b/src/base/loader/ecoff_object.cc
index 1869efa..4e94ecd 100644
--- a/src/base/loader/ecoff_object.cc
+++ b/src/base/loader/ecoff_object.cc
@@ -28,9 +28,10 @@
* Authors: Steve Reinhardt
*/
+#include "base/loader/ecoff_object.hh"
+
#include <string>
-#include "base/loader/ecoff_object.hh"
#include "base/loader/symtab.hh"
#include "base/misc.hh"
#include "base/trace.hh"
diff --git a/src/base/loader/hex_file.cc b/src/base/loader/hex_file.cc
index dac013d..c803439 100755
--- a/src/base/loader/hex_file.cc
+++ b/src/base/loader/hex_file.cc
@@ -28,14 +28,15 @@
* Authors: Jaidev Patwardhan
*/
+#include "base/loader/hex_file.hh"
+
#include <cctype>
#include <cstdio>
#include <list>
#include <string>
-#include "base/loader/hex_file.hh"
-#include "base/loader/symtab.hh"
#include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
#include "mem/port_proxy.hh"
using namespace std;
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 8bafd3c..a82314e 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -29,9 +29,11 @@
* Steve Reinhardt
*/
+#include "base/loader/object_file.hh"
+
+#include <fcntl.h>
#include <sys/mman.h>
#include <sys/types.h>
-#include <fcntl.h>
#include <unistd.h>
#include <zlib.h>
@@ -39,14 +41,13 @@
#include <list>
#include <string>
+#include "base/cprintf.hh"
#include "base/loader/aout_object.hh"
#include "base/loader/dtb_object.hh"
#include "base/loader/ecoff_object.hh"
#include "base/loader/elf_object.hh"
-#include "base/loader/object_file.hh"
#include "base/loader/raw_object.hh"
#include "base/loader/symtab.hh"
-#include "base/cprintf.hh"
#include "mem/port_proxy.hh"
using namespace std;
diff --git a/src/base/loader/raw_object.cc b/src/base/loader/raw_object.cc
index 35a9527..4a04f7d 100644
--- a/src/base/loader/raw_object.cc
+++ b/src/base/loader/raw_object.cc
@@ -29,6 +29,7 @@
*/
#include "base/loader/raw_object.hh"
+
#include "base/loader/symtab.hh"
#include "base/trace.hh"
#include "debug/Loader.hh"
diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index 853d98c..ea73321 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -28,12 +28,13 @@
* Authors: Nathan Binkert
*/
+#include "base/loader/symtab.hh"
+
#include <fstream>
#include <iostream>
#include <string>
#include <vector>
-#include "base/loader/symtab.hh"
#include "base/misc.hh"
#include "base/str.hh"
#include "base/types.hh"
diff --git a/src/base/match.cc b/src/base/match.cc
index 65b7400..dc621b4 100644
--- a/src/base/match.cc
+++ b/src/base/match.cc
@@ -29,6 +29,7 @@
*/
#include "base/match.hh"
+
#include "base/str.hh"
using namespace std;
diff --git a/src/base/misc.cc b/src/base/misc.cc
index d95c2ff..644545d 100644
--- a/src/base/misc.cc
+++ b/src/base/misc.cc
@@ -41,13 +41,14 @@
* Andreas Sandberg
*/
+#include "base/misc.hh"
+
#include <cstdlib>
#include <cstring>
#include <string>
#include "base/cprintf.hh"
#include "base/hostinfo.hh"
-#include "base/misc.hh"
#include "base/output.hh"
#include "base/trace.hh"
#include "base/types.hh"
diff --git a/src/base/output.cc b/src/base/output.cc
index cb3c0b7..dc85c2a 100644
--- a/src/base/output.cc
+++ b/src/base/output.cc
@@ -44,10 +44,13 @@
* Sascha Bischoff
*/
+#include "base/output.hh"
+
+#include <dirent.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <dirent.h>
#include <unistd.h>
+#include <zfstream.h>
#include <cassert>
#include <cerrno>
@@ -55,10 +58,7 @@
#include <cstdlib>
#include <fstream>
-#include <zfstream.h>
-
#include "base/misc.hh"
-#include "base/output.hh"
using namespace std;
diff --git a/src/base/pollevent.cc b/src/base/pollevent.cc
index a6c93c1..30edb65 100644
--- a/src/base/pollevent.cc
+++ b/src/base/pollevent.cc
@@ -30,17 +30,20 @@
#include <sys/ioctl.h>
#include <sys/types.h>
+
#if defined(__sun__) || defined(__SUNPRO_CC)
#include <sys/file.h>
+
#endif
+#include "base/pollevent.hh"
+
#include <fcntl.h>
#include <unistd.h>
#include <csignal>
#include "base/misc.hh"
-#include "base/pollevent.hh"
#include "base/types.hh"
#include "sim/async.hh"
#include "sim/core.hh"
diff --git a/src/base/random.cc b/src/base/random.cc
index 2eb60c6..0121581 100644
--- a/src/base/random.cc
+++ b/src/base/random.cc
@@ -42,10 +42,11 @@
* Andreas Hansson
*/
+#include "base/random.hh"
+
#include <sstream>
#include "base/misc.hh"
-#include "base/random.hh"
#include "sim/serialize.hh"
Random::Random()
diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index a22ba9f..665dba8 100644
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -119,16 +119,17 @@
* "Stub" to allow remote cpu to debug over a serial line using gdb.
*/
-#include <signal.h>
+#include "base/remote_gdb.hh"
+
#include <sys/signal.h>
#include <unistd.h>
+#include <csignal>
#include <cstdio>
#include <string>
#include "arch/vtophys.hh"
#include "base/intmath.hh"
-#include "base/remote_gdb.hh"
#include "base/socket.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
@@ -136,8 +137,8 @@
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
#include "debug/GDBAll.hh"
-#include "mem/port.hh"
#include "mem/fs_translating_port_proxy.hh"
+#include "mem/port.hh"
#include "mem/se_translating_port_proxy.hh"
#include "sim/full_system.hh"
#include "sim/system.hh"
diff --git a/src/base/socket.cc b/src/base/socket.cc
index 01fb519..7a44437 100644
--- a/src/base/socket.cc
+++ b/src/base/socket.cc
@@ -28,6 +28,8 @@
* Authors: Nathan Binkert
*/
+#include "base/socket.hh"
+
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <sys/socket.h>
@@ -37,7 +39,6 @@
#include <cerrno>
#include "base/misc.hh"
-#include "base/socket.hh"
#include "base/types.hh"
using namespace std;
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index b1b5c92..96747f0 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -28,6 +28,8 @@
* Authors: Nathan Binkert
*/
+#include "base/statistics.hh"
+
#include <fstream>
#include <iomanip>
#include <list>
@@ -39,7 +41,6 @@
#include "base/debug.hh"
#include "base/hostinfo.hh"
#include "base/misc.hh"
-#include "base/statistics.hh"
#include "base/str.hh"
#include "base/time.hh"
#include "base/trace.hh"
diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index ae09b9b..9403ed3 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -33,23 +33,27 @@
#endif
#if defined(__sun)
-#include <math.h>
+#include <cmath>
+
#endif
#include <cassert>
+
#ifdef __SUNPRO_CC
-#include <math.h>
+#include <cmath>
+
#endif
+#include "base/stats/text.hh"
+
#include <cmath>
#include <fstream>
#include <iostream>
#include <sstream>
#include <string>
-#include "base/stats/info.hh"
-#include "base/stats/text.hh"
#include "base/cast.hh"
#include "base/misc.hh"
+#include "base/stats/info.hh"
#include "base/str.hh"
using namespace std;
diff --git a/src/base/str.cc b/src/base/str.cc
index 849bc8a..87724a9 100644
--- a/src/base/str.cc
+++ b/src/base/str.cc
@@ -28,11 +28,11 @@
* Authors: Nathan Binkert
*/
+#include "base/str.hh"
+
#include <string>
#include <vector>
-#include "base/str.hh"
-
using namespace std;
bool
diff --git a/src/base/time.cc b/src/base/time.cc
index 86a3115..5ee286b 100644
--- a/src/base/time.cc
+++ b/src/base/time.cc
@@ -28,12 +28,13 @@
* Authors: Nathan Binkert
*/
+#include "base/time.hh"
+
#include <cstdlib>
#include <ctime>
#include <iostream>
#include <sstream>
-#include "base/time.hh"
#include "config/use_posix_clock.hh"
#include "sim/core.hh"
#include "sim/serialize.hh"
diff --git a/src/base/trace.cc b/src/base/trace.cc
index ff17782..dfd9968 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -33,6 +33,8 @@
* Andrew Bardsley
*/
+#include "base/trace.hh"
+
#include <cctype>
#include <fstream>
#include <iostream>
@@ -43,7 +45,6 @@
#include "base/misc.hh"
#include "base/output.hh"
#include "base/str.hh"
-#include "base/trace.hh"
const std::string &name()
{
diff --git a/src/base/vnc/vncinput.cc b/src/base/vnc/vncinput.cc
index d97306f..5021d40 100644
--- a/src/base/vnc/vncinput.cc
+++ b/src/base/vnc/vncinput.cc
@@ -42,9 +42,10 @@
* Implementiation of a VNC input
*/
+#include "base/vnc/vncinput.hh"
+
#include <sys/types.h>
-#include "base/vnc/vncinput.hh"
#include "base/output.hh" //simout
#include "base/trace.hh"
#include "debug/VNC.hh"
diff --git a/src/base/vnc/vncserver.cc b/src/base/vnc/vncserver.cc
index 20f3bc8..216fa2f 100644
--- a/src/base/vnc/vncserver.cc
+++ b/src/base/vnc/vncserver.cc
@@ -60,8 +60,8 @@
#include <unistd.h>
#include <cerrno>
-#include <cstdio>
#include <cstddef>
+#include <cstdio>
#include "base/atomicio.hh"
#include "base/bitmap.hh"
diff --git a/src/cpu/activity.cc b/src/cpu/activity.cc
index 87875c6..84eaf84 100644
--- a/src/cpu/activity.cc
+++ b/src/cpu/activity.cc
@@ -28,9 +28,10 @@
* Authors: Kevin Lim
*/
+#include "cpu/activity.hh"
+
#include <string>
-#include "cpu/activity.hh"
#include "cpu/timebuf.hh"
#include "debug/Activity.hh"
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index aaf5a7a..10b8ce2 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -45,18 +45,19 @@
* Rick Strong
*/
+#include "cpu/base.hh"
+
#include <iostream>
#include <sstream>
#include <string>
#include "arch/tlb.hh"
-#include "base/loader/symtab.hh"
#include "base/cprintf.hh"
+#include "base/loader/symtab.hh"
#include "base/misc.hh"
#include "base/output.hh"
#include "base/trace.hh"
#include "cpu/checker/cpu.hh"
-#include "cpu/base.hh"
#include "cpu/cpuevent.hh"
#include "cpu/profile.hh"
#include "cpu/thread_context.hh"
diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index 9aae8b8..b22fb2a 100644
--- a/src/cpu/checker/cpu.cc
+++ b/src/cpu/checker/cpu.cc
@@ -41,13 +41,14 @@
* Geoffrey Blake
*/
+#include "cpu/checker/cpu.hh"
+
#include <list>
#include <string>
#include "arch/generic/tlb.hh"
#include "arch/kernel_stats.hh"
#include "arch/vtophys.hh"
-#include "cpu/checker/cpu.hh"
#include "cpu/base.hh"
#include "cpu/simple_thread.hh"
#include "cpu/static_inst.hh"
diff --git a/src/cpu/dummy_checker.cc b/src/cpu/dummy_checker.cc
index aa4d45e..f9077be 100644
--- a/src/cpu/dummy_checker.cc
+++ b/src/cpu/dummy_checker.cc
@@ -38,6 +38,7 @@
*/
#include "cpu/dummy_checker.hh"
+
#include "params/DummyChecker.hh"
////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc
index dfd39d7..bbde89c 100644
--- a/src/cpu/exetrace.cc
+++ b/src/cpu/exetrace.cc
@@ -31,6 +31,8 @@
* Steve Raasch
*/
+#include "cpu/exetrace.hh"
+
#include <iomanip>
#include "arch/isa_traits.hh"
@@ -38,7 +40,6 @@
#include "base/loader/symtab.hh"
#include "config/the_isa.hh"
#include "cpu/base.hh"
-#include "cpu/exetrace.hh"
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
#include "debug/ExecAll.hh"
diff --git a/src/cpu/func_unit.cc b/src/cpu/func_unit.cc
index 3c2f104..d5d5640 100644
--- a/src/cpu/func_unit.cc
+++ b/src/cpu/func_unit.cc
@@ -28,10 +28,11 @@
* Authors: Steve Raasch
*/
+#include "cpu/func_unit.hh"
+
#include <sstream>
#include "base/misc.hh"
-#include "cpu/func_unit.hh"
using namespace std;
diff --git a/src/cpu/inteltrace.cc b/src/cpu/inteltrace.cc
index 05bdc64..c36f639 100644
--- a/src/cpu/inteltrace.cc
+++ b/src/cpu/inteltrace.cc
@@ -31,11 +31,12 @@
* Steve Raasch
*/
+#include "cpu/inteltrace.hh"
+
#include <iomanip>
#include "config/the_isa.hh"
#include "cpu/exetrace.hh"
-#include "cpu/inteltrace.hh"
#include "cpu/static_inst.hh"
using namespace std;
diff --git a/src/cpu/intr_control.cc b/src/cpu/intr_control.cc
index ca24495..9e842d0 100644
--- a/src/cpu/intr_control.cc
+++ b/src/cpu/intr_control.cc
@@ -29,12 +29,13 @@
* Ron Dreslinski
*/
+#include "cpu/intr_control.hh"
+
#include <string>
#include <vector>
#include "base/trace.hh"
#include "cpu/base.hh"
-#include "cpu/intr_control.hh"
#include "cpu/thread_context.hh"
#include "debug/IntrControl.hh"
#include "sim/sim_object.hh"
diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc
index ddf80db..723feda 100644
--- a/src/cpu/kvm/base.cc
+++ b/src/cpu/kvm/base.cc
@@ -37,6 +37,8 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/base.hh"
+
#include <linux/kvm.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
@@ -48,7 +50,6 @@
#include "arch/mmapped_ipr.hh"
#include "arch/utility.hh"
-#include "cpu/kvm/base.hh"
#include "debug/Checkpoint.hh"
#include "debug/Drain.hh"
#include "debug/Kvm.hh"
@@ -58,8 +59,6 @@
#include "sim/process.hh"
#include "sim/system.hh"
-#include <signal.h>
-
/* Used by some KVM macros */
#define PAGE_SIZE pageSize
diff --git a/src/cpu/kvm/perfevent.cc b/src/cpu/kvm/perfevent.cc
index acc2af0..5738b8e 100644
--- a/src/cpu/kvm/perfevent.cc
+++ b/src/cpu/kvm/perfevent.cc
@@ -37,11 +37,11 @@
* Authors: Andreas Sandberg
*/
+#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/types.h>
-#include <fcntl.h>
#include <syscall.h>
#include <unistd.h>
diff --git a/src/cpu/kvm/timer.cc b/src/cpu/kvm/timer.cc
index cb48046..03b31bd 100644
--- a/src/cpu/kvm/timer.cc
+++ b/src/cpu/kvm/timer.cc
@@ -37,15 +37,17 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/timer.hh"
+
+#include <sys/syscall.h>
+#include <unistd.h>
+
#include <algorithm>
#include <csignal>
#include <ctime>
-#include <unistd.h>
-#include <sys/syscall.h>
#include "base/misc.hh"
#include "base/trace.hh"
-#include "cpu/kvm/timer.hh"
#include "debug/KvmTimer.hh"
/* According to timer_create(2), the value SIGEV_THREAD_ID can be used
diff --git a/src/cpu/kvm/vm.cc b/src/cpu/kvm/vm.cc
index 39bce32..d3ab8c4 100644
--- a/src/cpu/kvm/vm.cc
+++ b/src/cpu/kvm/vm.cc
@@ -38,17 +38,18 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/vm.hh"
+
+#include <fcntl.h>
#include <linux/kvm.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <fcntl.h>
#include <unistd.h>
#include <cerrno>
#include <memory>
-#include "cpu/kvm/vm.hh"
#include "debug/Kvm.hh"
#include "params/KvmVM.hh"
#include "sim/system.hh"
diff --git a/src/cpu/kvm/x86_cpu.cc b/src/cpu/kvm/x86_cpu.cc
index f8f66af..bdbdadf 100644
--- a/src/cpu/kvm/x86_cpu.cc
+++ b/src/cpu/kvm/x86_cpu.cc
@@ -28,18 +28,19 @@
* Authors: Andreas Sandberg
*/
+#include "cpu/kvm/x86_cpu.hh"
+
#include <linux/kvm.h>
#include <algorithm>
#include <cerrno>
#include <memory>
-#include "arch/x86/regs/msr.hh"
-#include "arch/x86/cpuid.hh"
-#include "arch/x86/utility.hh"
#include "arch/registers.hh"
+#include "arch/x86/cpuid.hh"
+#include "arch/x86/regs/msr.hh"
+#include "arch/x86/utility.hh"
#include "cpu/kvm/base.hh"
-#include "cpu/kvm/x86_cpu.hh"
#include "debug/Drain.hh"
#include "debug/Kvm.hh"
#include "debug/KvmContext.hh"
diff --git a/src/cpu/minor/activity.cc b/src/cpu/minor/activity.cc
index 8e322d3..4a4f9d7 100644
--- a/src/cpu/minor/activity.cc
+++ b/src/cpu/minor/activity.cc
@@ -37,9 +37,10 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/activity.hh"
+
#include <sstream>
-#include "cpu/minor/activity.hh"
#include "cpu/minor/trace.hh"
namespace Minor
diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc
index 016a60f..ae4fda6 100644
--- a/src/cpu/minor/cpu.cc
+++ b/src/cpu/minor/cpu.cc
@@ -37,8 +37,9 @@
* Authors: Andrew Bardsley
*/
-#include "arch/utility.hh"
#include "cpu/minor/cpu.hh"
+
+#include "arch/utility.hh"
#include "cpu/minor/dyn_inst.hh"
#include "cpu/minor/fetch1.hh"
#include "cpu/minor/pipeline.hh"
diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc
index a8a33d9..390ca5f 100644
--- a/src/cpu/minor/decode.cc
+++ b/src/cpu/minor/decode.cc
@@ -38,6 +38,7 @@
*/
#include "cpu/minor/decode.hh"
+
#include "cpu/minor/pipeline.hh"
#include "debug/Decode.hh"
diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index 5d54f69..16af15b 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -37,14 +37,15 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/dyn_inst.hh"
+
#include <iomanip>
#include <sstream>
#include "arch/isa.hh"
#include "arch/registers.hh"
-#include "cpu/minor/dyn_inst.hh"
-#include "cpu/minor/trace.hh"
#include "cpu/base.hh"
+#include "cpu/minor/trace.hh"
#include "cpu/reg_class.hh"
#include "debug/MinorExecute.hh"
#include "enums/OpClass.hh"
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index f5f0067..a38a767 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -37,12 +37,13 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/execute.hh"
+
#include "arch/locked_mem.hh"
#include "arch/registers.hh"
#include "arch/utility.hh"
#include "cpu/minor/cpu.hh"
#include "cpu/minor/exec_context.hh"
-#include "cpu/minor/execute.hh"
#include "cpu/minor/fetch1.hh"
#include "cpu/minor/lsq.hh"
#include "cpu/op_class.hh"
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index f47f549..0620fee 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -37,12 +37,13 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/fetch1.hh"
+
#include <cstring>
#include <iomanip>
#include <sstream>
#include "base/cast.hh"
-#include "cpu/minor/fetch1.hh"
#include "cpu/minor/pipeline.hh"
#include "debug/Drain.hh"
#include "debug/Fetch.hh"
diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc
index 15d362d..986f1f2 100644
--- a/src/cpu/minor/fetch2.cc
+++ b/src/cpu/minor/fetch2.cc
@@ -37,11 +37,12 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/fetch2.hh"
+
#include <string>
#include "arch/decoder.hh"
#include "arch/utility.hh"
-#include "cpu/minor/fetch2.hh"
#include "cpu/minor/pipeline.hh"
#include "cpu/pred/bpred_unit.hh"
#include "debug/Branch.hh"
diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc
index aeee5cc..a9248ba 100644
--- a/src/cpu/minor/func_unit.cc
+++ b/src/cpu/minor/func_unit.cc
@@ -37,11 +37,12 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/func_unit.hh"
+
#include <iomanip>
#include <sstream>
#include <typeinfo>
-#include "cpu/minor/func_unit.hh"
#include "debug/MinorTiming.hh"
#include "enums/OpClass.hh"
diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index 476f9d4..3b70c53 100644
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -37,6 +37,8 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/lsq.hh"
+
#include <iomanip>
#include <sstream>
@@ -45,7 +47,6 @@
#include "cpu/minor/cpu.hh"
#include "cpu/minor/exec_context.hh"
#include "cpu/minor/execute.hh"
-#include "cpu/minor/lsq.hh"
#include "cpu/minor/pipeline.hh"
#include "debug/Activity.hh"
#include "debug/MinorMem.hh"
diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc
index 8c04e39..08dc3db 100644
--- a/src/cpu/minor/pipeline.cc
+++ b/src/cpu/minor/pipeline.cc
@@ -37,13 +37,14 @@
* Authors: Andrew Bardsley
*/
+#include "cpu/minor/pipeline.hh"
+
#include <algorithm>
#include "cpu/minor/decode.hh"
#include "cpu/minor/execute.hh"
#include "cpu/minor/fetch1.hh"
#include "cpu/minor/fetch2.hh"
-#include "cpu/minor/pipeline.hh"
#include "debug/Drain.hh"
#include "debug/MinorCPU.hh"
#include "debug/MinorTrace.hh"
diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc
index f6b1f79..4de3f95 100644
--- a/src/cpu/minor/scoreboard.cc
+++ b/src/cpu/minor/scoreboard.cc
@@ -37,8 +37,9 @@
* Authors: Andrew Bardsley
*/
-#include "arch/registers.hh"
#include "cpu/minor/scoreboard.hh"
+
+#include "arch/registers.hh"
#include "cpu/reg_class.hh"
#include "debug/MinorScoreboard.hh"
#include "debug/MinorTiming.hh"
diff --git a/src/cpu/nativetrace.cc b/src/cpu/nativetrace.cc
index 6d1655b..9b5c270 100644
--- a/src/cpu/nativetrace.cc
+++ b/src/cpu/nativetrace.cc
@@ -28,8 +28,9 @@
* Authors: Gabe Black
*/
-#include "base/socket.hh"
#include "cpu/nativetrace.hh"
+
+#include "base/socket.hh"
#include "cpu/static_inst.hh"
#include "debug/GDBMisc.hh"
#include "params/NativeTrace.hh"
diff --git a/src/cpu/o3/base_dyn_inst.cc b/src/cpu/o3/base_dyn_inst.cc
index 5cf01f2..510109d 100644
--- a/src/cpu/o3/base_dyn_inst.cc
+++ b/src/cpu/o3/base_dyn_inst.cc
@@ -28,9 +28,9 @@
* Authors: Kevin Lim
*/
+#include "cpu/base_dyn_inst_impl.hh"
#include "cpu/o3/cpu.hh"
#include "cpu/o3/isa_specific.hh"
-#include "cpu/base_dyn_inst_impl.hh"
// Explicit instantiation
template class BaseDynInst<O3CPUImpl>;
diff --git a/src/cpu/o3/checker.cc b/src/cpu/o3/checker.cc
index be685d7..970af53 100644
--- a/src/cpu/o3/checker.cc
+++ b/src/cpu/o3/checker.cc
@@ -40,8 +40,9 @@
* Authors: Kevin Lim
*/
-#include "cpu/checker/cpu_impl.hh"
#include "cpu/o3/checker.hh"
+
+#include "cpu/checker/cpu_impl.hh"
#include "params/O3Checker.hh"
class MemObject;
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 9bda09b..d858950 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -44,14 +44,15 @@
* Rick Strong
*/
+#include "cpu/o3/cpu.hh"
+
#include "arch/kernel_stats.hh"
#include "config/the_isa.hh"
+#include "cpu/activity.hh"
#include "cpu/checker/cpu.hh"
#include "cpu/checker/thread_context.hh"
-#include "cpu/o3/cpu.hh"
#include "cpu/o3/isa_specific.hh"
#include "cpu/o3/thread_context.hh"
-#include "cpu/activity.hh"
#include "cpu/quiesce_event.hh"
#include "cpu/simple_thread.hh"
#include "cpu/thread_context.hh"
@@ -69,6 +70,7 @@
#if THE_ISA == ALPHA_ISA
#include "arch/alpha/osfpal.hh"
#include "debug/Activity.hh"
+
#endif
struct BaseCPUParams;
diff --git a/src/cpu/o3/deriv.cc b/src/cpu/o3/deriv.cc
index 9f41b98..6b2af76 100644
--- a/src/cpu/o3/deriv.cc
+++ b/src/cpu/o3/deriv.cc
@@ -28,9 +28,10 @@
* Authors: Kevin Lim
*/
+#include "cpu/o3/deriv.hh"
+
#include <string>
-#include "cpu/o3/deriv.hh"
#include "params/DerivO3CPU.hh"
DerivO3CPU *
diff --git a/src/cpu/o3/free_list.cc b/src/cpu/o3/free_list.cc
index a954458..d4b3a2f 100644
--- a/src/cpu/o3/free_list.cc
+++ b/src/cpu/o3/free_list.cc
@@ -29,10 +29,11 @@
* Authors: Kevin Lim
*/
+#include "cpu/o3/free_list.hh"
+
#include "arch/registers.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
-#include "cpu/o3/free_list.hh"
#include "debug/FreeList.hh"
UnifiedFreeList::UnifiedFreeList(const std::string &_my_name,
diff --git a/src/cpu/o3/fu_pool.cc b/src/cpu/o3/fu_pool.cc
index b99eeab..414066e 100644
--- a/src/cpu/o3/fu_pool.cc
+++ b/src/cpu/o3/fu_pool.cc
@@ -40,9 +40,10 @@
* Authors: Kevin Lim
*/
+#include "cpu/o3/fu_pool.hh"
+
#include <sstream>
-#include "cpu/o3/fu_pool.hh"
#include "cpu/func_unit.hh"
using namespace std;
diff --git a/src/cpu/o3/probe/simple_trace.cc b/src/cpu/o3/probe/simple_trace.cc
index 35d1365..060b4df 100644
--- a/src/cpu/o3/probe/simple_trace.cc
+++ b/src/cpu/o3/probe/simple_trace.cc
@@ -37,8 +37,9 @@
* Authors: Matt Horsnell
*/
-#include "base/trace.hh"
#include "cpu/o3/probe/simple_trace.hh"
+
+#include "base/trace.hh"
#include "debug/SimpleTrace.hh"
void SimpleTrace::traceCommit(const O3CPUImpl::DynInstPtr &dynInst)
diff --git a/src/cpu/o3/regfile.cc b/src/cpu/o3/regfile.cc
index 96ce44b..e1d84c6 100644
--- a/src/cpu/o3/regfile.cc
+++ b/src/cpu/o3/regfile.cc
@@ -31,9 +31,9 @@
* Steve Reinhardt
*/
-#include "cpu/o3/free_list.hh"
#include "cpu/o3/regfile.hh"
+#include "cpu/o3/free_list.hh"
PhysRegFile::PhysRegFile(unsigned _numPhysicalIntRegs,
unsigned _numPhysicalFloatRegs,
diff --git a/src/cpu/o3/rename_map.cc b/src/cpu/o3/rename_map.cc
index b0232df..18c20cf 100644
--- a/src/cpu/o3/rename_map.cc
+++ b/src/cpu/o3/rename_map.cc
@@ -29,9 +29,10 @@
* Authors: Kevin Lim
*/
+#include "cpu/o3/rename_map.hh"
+
#include <vector>
-#include "cpu/o3/rename_map.hh"
#include "debug/Rename.hh"
using namespace std;
diff --git a/src/cpu/o3/scoreboard.cc b/src/cpu/o3/scoreboard.cc
index 11b2858..2b2b091 100644
--- a/src/cpu/o3/scoreboard.cc
+++ b/src/cpu/o3/scoreboard.cc
@@ -30,8 +30,9 @@
* Kevin Lim
*/
-#include "config/the_isa.hh"
#include "cpu/o3/scoreboard.hh"
+
+#include "config/the_isa.hh"
#include "debug/Scoreboard.hh"
Scoreboard::Scoreboard(const std::string &_my_name,
diff --git a/src/cpu/o3/store_set.cc b/src/cpu/o3/store_set.cc
index acd4a8d..9c21fbf 100644
--- a/src/cpu/o3/store_set.cc
+++ b/src/cpu/o3/store_set.cc
@@ -28,10 +28,11 @@
* Authors: Kevin Lim
*/
+#include "cpu/o3/store_set.hh"
+
#include "base/intmath.hh"
#include "base/misc.hh"
#include "base/trace.hh"
-#include "cpu/o3/store_set.hh"
#include "debug/StoreSet.hh"
StoreSet::StoreSet(uint64_t clear_period, int _SSIT_size, int _LFST_size)
diff --git a/src/cpu/o3/thread_context.cc b/src/cpu/o3/thread_context.cc
index 7ca716d..6724911 100755
--- a/src/cpu/o3/thread_context.cc
+++ b/src/cpu/o3/thread_context.cc
@@ -28,8 +28,9 @@
* Authors: Kevin Lim
*/
-#include "cpu/o3/impl.hh"
#include "cpu/o3/thread_context.hh"
+
+#include "cpu/o3/impl.hh"
#include "cpu/o3/thread_context_impl.hh"
template class O3ThreadContext<O3CPUImpl>;
diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc
index 837b17e..4d01ca7 100644
--- a/src/cpu/pc_event.cc
+++ b/src/cpu/pc_event.cc
@@ -29,6 +29,8 @@
* Steve Reinhardt
*/
+#include "cpu/pc_event.hh"
+
#include <algorithm>
#include <string>
#include <utility>
@@ -36,7 +38,6 @@
#include "base/debug.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
-#include "cpu/pc_event.hh"
#include "cpu/thread_context.hh"
#include "debug/PCEvent.hh"
#include "sim/core.hh"
diff --git a/src/cpu/pred/2bit_local.cc b/src/cpu/pred/2bit_local.cc
index 6f821e9..adbb075 100644
--- a/src/cpu/pred/2bit_local.cc
+++ b/src/cpu/pred/2bit_local.cc
@@ -28,10 +28,11 @@
* Authors: Kevin Lim
*/
+#include "cpu/pred/2bit_local.hh"
+
#include "base/intmath.hh"
#include "base/misc.hh"
#include "base/trace.hh"
-#include "cpu/pred/2bit_local.hh"
#include "debug/Fetch.hh"
LocalBP::LocalBP(const LocalBPParams *params)
diff --git a/src/cpu/pred/bi_mode.cc b/src/cpu/pred/bi_mode.cc
index 355d0d8..69af458 100644
--- a/src/cpu/pred/bi_mode.cc
+++ b/src/cpu/pred/bi_mode.cc
@@ -32,9 +32,10 @@
* Implementation of a bi-mode branch predictor
*/
+#include "cpu/pred/bi_mode.hh"
+
#include "base/bitfield.hh"
#include "base/intmath.hh"
-#include "cpu/pred/bi_mode.hh"
BiModeBP::BiModeBP(const BiModeBPParams *params)
: BPredUnit(params),
diff --git a/src/cpu/pred/btb.cc b/src/cpu/pred/btb.cc
index c7ef195..9de3bb4 100644
--- a/src/cpu/pred/btb.cc
+++ b/src/cpu/pred/btb.cc
@@ -28,9 +28,10 @@
* Authors: Kevin Lim
*/
+#include "cpu/pred/btb.hh"
+
#include "base/intmath.hh"
#include "base/trace.hh"
-#include "cpu/pred/btb.hh"
#include "debug/Fetch.hh"
DefaultBTB::DefaultBTB(unsigned _numEntries,
diff --git a/src/cpu/pred/tournament.cc b/src/cpu/pred/tournament.cc
index c0c1c12..2763381 100644
--- a/src/cpu/pred/tournament.cc
+++ b/src/cpu/pred/tournament.cc
@@ -40,9 +40,10 @@
* Authors: Kevin Lim
*/
+#include "cpu/pred/tournament.hh"
+
#include "base/bitfield.hh"
#include "base/intmath.hh"
-#include "cpu/pred/tournament.hh"
TournamentBP::TournamentBP(const TournamentBPParams *params)
: BPredUnit(params),
diff --git a/src/cpu/profile.cc b/src/cpu/profile.cc
index 79ae22c..7558c38 100644
--- a/src/cpu/profile.cc
+++ b/src/cpu/profile.cc
@@ -28,15 +28,16 @@
* Authors: Nathan Binkert
*/
+#include "cpu/profile.hh"
+
#include <string>
-#include "base/loader/symtab.hh"
#include "base/bitfield.hh"
#include "base/callback.hh"
+#include "base/loader/symtab.hh"
#include "base/statistics.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
-#include "cpu/profile.hh"
#include "cpu/thread_context.hh"
using namespace std;
diff --git a/src/cpu/quiesce_event.cc b/src/cpu/quiesce_event.cc
index d5c3fe2..a152448 100644
--- a/src/cpu/quiesce_event.cc
+++ b/src/cpu/quiesce_event.cc
@@ -28,8 +28,9 @@
* Authors: Kevin Lim
*/
-#include "cpu/base.hh"
#include "cpu/quiesce_event.hh"
+
+#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "debug/Quiesce.hh"
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 8dd81ae..c09f0c5 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -41,13 +41,14 @@
* Authors: Steve Reinhardt
*/
+#include "cpu/simple/atomic.hh"
+
#include "arch/locked_mem.hh"
#include "arch/mmapped_ipr.hh"
#include "arch/utility.hh"
#include "base/bigint.hh"
#include "base/output.hh"
#include "config/the_isa.hh"
-#include "cpu/simple/atomic.hh"
#include "cpu/exetrace.hh"
#include "debug/Drain.hh"
#include "debug/ExecFaulting.hh"
@@ -57,8 +58,8 @@
#include "mem/physical.hh"
#include "params/AtomicSimpleCPU.hh"
#include "sim/faults.hh"
-#include "sim/system.hh"
#include "sim/full_system.hh"
+#include "sim/system.hh"
using namespace std;
using namespace TheISA;
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index bd68611..77d2fb4 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -41,21 +41,22 @@
* Authors: Steve Reinhardt
*/
+#include "cpu/simple/base.hh"
+
#include "arch/kernel_stats.hh"
#include "arch/stacktrace.hh"
#include "arch/tlb.hh"
#include "arch/utility.hh"
#include "arch/vtophys.hh"
-#include "base/loader/symtab.hh"
#include "base/cp_annotate.hh"
#include "base/cprintf.hh"
#include "base/inifile.hh"
+#include "base/loader/symtab.hh"
#include "base/misc.hh"
#include "base/pollevent.hh"
#include "base/trace.hh"
#include "base/types.hh"
#include "config/the_isa.hh"
-#include "cpu/simple/base.hh"
#include "cpu/base.hh"
#include "cpu/checker/cpu.hh"
#include "cpu/checker/thread_context.hh"
diff --git a/src/cpu/simple/probes/simpoint.cc b/src/cpu/simple/probes/simpoint.cc
index 4f4b5da..5fa4a26 100644
--- a/src/cpu/simple/probes/simpoint.cc
+++ b/src/cpu/simple/probes/simpoint.cc
@@ -38,9 +38,10 @@
* Curtis Dunham
*/
-#include "base/output.hh"
#include "cpu/simple/probes/simpoint.hh"
+#include "base/output.hh"
+
SimPoint::SimPoint(const SimPointParams *p)
: ProbeListenerObject(p),
intervalSize(p->interval),
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index 65fea15..43c50b9 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -41,16 +41,18 @@
* Authors: Steve Reinhardt
*/
+#include "cpu/simple/timing.hh"
+
#include "arch/locked_mem.hh"
#include "arch/mmapped_ipr.hh"
#include "arch/utility.hh"
#include "base/bigint.hh"
#include "config/the_isa.hh"
-#include "cpu/simple/timing.hh"
#include "cpu/exetrace.hh"
#include "debug/Config.hh"
#include "debug/Drain.hh"
#include "debug/ExecFaulting.hh"
+#include "debug/Mwait.hh"
#include "debug/SimpleCPU.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
@@ -59,8 +61,6 @@
#include "sim/full_system.hh"
#include "sim/system.hh"
-#include "debug/Mwait.hh"
-
using namespace std;
using namespace TheISA;
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 0e17c07..7c3568c 100644
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -31,6 +31,8 @@
* Kevin Lim
*/
+#include "cpu/simple_thread.hh"
+
#include <string>
#include "arch/isa_traits.hh"
@@ -45,7 +47,6 @@
#include "cpu/base.hh"
#include "cpu/profile.hh"
#include "cpu/quiesce_event.hh"
-#include "cpu/simple_thread.hh"
#include "cpu/thread_context.hh"
#include "mem/fs_translating_port_proxy.hh"
#include "mem/se_translating_port_proxy.hh"
diff --git a/src/cpu/static_inst.cc b/src/cpu/static_inst.cc
index 387cf05..d50c9f1 100644
--- a/src/cpu/static_inst.cc
+++ b/src/cpu/static_inst.cc
@@ -29,9 +29,10 @@
* Nathan Binkert
*/
+#include "cpu/static_inst.hh"
+
#include <iostream>
-#include "cpu/static_inst.hh"
#include "sim/core.hh"
StaticInstPtr StaticInst::nullStaticInstPtr;
diff --git a/src/cpu/testers/directedtest/DirectedGenerator.cc b/src/cpu/testers/directedtest/DirectedGenerator.cc
index 5aee2a9..e37868b 100644
--- a/src/cpu/testers/directedtest/DirectedGenerator.cc
+++ b/src/cpu/testers/directedtest/DirectedGenerator.cc
@@ -28,6 +28,7 @@
*/
#include "cpu/testers/directedtest/DirectedGenerator.hh"
+
#include "sim/system.hh"
DirectedGenerator::DirectedGenerator(const Params *p)
diff --git a/src/cpu/testers/directedtest/InvalidateGenerator.cc b/src/cpu/testers/directedtest/InvalidateGenerator.cc
index 6f48773..20ea4f9 100644
--- a/src/cpu/testers/directedtest/InvalidateGenerator.cc
+++ b/src/cpu/testers/directedtest/InvalidateGenerator.cc
@@ -27,8 +27,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "cpu/testers/directedtest/DirectedGenerator.hh"
#include "cpu/testers/directedtest/InvalidateGenerator.hh"
+
+#include "cpu/testers/directedtest/DirectedGenerator.hh"
#include "cpu/testers/directedtest/RubyDirectedTester.hh"
#include "debug/DirectedTest.hh"
diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.cc b/src/cpu/testers/directedtest/RubyDirectedTester.cc
index b850317..9b4e454 100644
--- a/src/cpu/testers/directedtest/RubyDirectedTester.cc
+++ b/src/cpu/testers/directedtest/RubyDirectedTester.cc
@@ -39,8 +39,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "cpu/testers/directedtest/DirectedGenerator.hh"
#include "cpu/testers/directedtest/RubyDirectedTester.hh"
+
+#include "cpu/testers/directedtest/DirectedGenerator.hh"
#include "debug/DirectedTest.hh"
#include "sim/sim_exit.hh"
diff --git a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc
index 62d03fb..966ee49 100644
--- a/src/cpu/testers/directedtest/SeriesRequestGenerator.cc
+++ b/src/cpu/testers/directedtest/SeriesRequestGenerator.cc
@@ -27,10 +27,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "cpu/testers/directedtest/SeriesRequestGenerator.hh"
+
#include "base/random.hh"
#include "cpu/testers/directedtest/DirectedGenerator.hh"
#include "cpu/testers/directedtest/RubyDirectedTester.hh"
-#include "cpu/testers/directedtest/SeriesRequestGenerator.hh"
#include "debug/DirectedTest.hh"
SeriesRequestGenerator::SeriesRequestGenerator(const Params *p)
diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc
index f5a7186..0f8c877 100644
--- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc
+++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.cc
@@ -28,6 +28,8 @@
* Authors: Tushar Krishna
*/
+#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh"
+
#include <cmath>
#include <iomanip>
#include <set>
@@ -37,7 +39,6 @@
#include "base/misc.hh"
#include "base/random.hh"
#include "base/statistics.hh"
-#include "cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh"
#include "debug/GarnetSyntheticTraffic.hh"
#include "mem/mem_object.hh"
#include "mem/packet.hh"
diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc
index c2c721b..5dc8b74 100644
--- a/src/cpu/testers/memtest/memtest.cc
+++ b/src/cpu/testers/memtest/memtest.cc
@@ -42,9 +42,10 @@
* Andreas Hansson
*/
+#include "cpu/testers/memtest/memtest.hh"
+
#include "base/random.hh"
#include "base/statistics.hh"
-#include "cpu/testers/memtest/memtest.hh"
#include "debug/MemTest.hh"
#include "mem/mem_object.hh"
#include "sim/sim_exit.hh"
diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc
index c869bd7..f685d65 100644
--- a/src/cpu/testers/rubytest/Check.cc
+++ b/src/cpu/testers/rubytest/Check.cc
@@ -27,8 +27,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "base/random.hh"
#include "cpu/testers/rubytest/Check.hh"
+
+#include "base/random.hh"
#include "debug/RubyTest.hh"
#include "mem/ruby/common/SubBlock.hh"
diff --git a/src/cpu/testers/rubytest/CheckTable.cc b/src/cpu/testers/rubytest/CheckTable.cc
index 3bdd73f..5424809 100644
--- a/src/cpu/testers/rubytest/CheckTable.cc
+++ b/src/cpu/testers/rubytest/CheckTable.cc
@@ -27,10 +27,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "cpu/testers/rubytest/CheckTable.hh"
+
#include "base/intmath.hh"
#include "base/random.hh"
#include "cpu/testers/rubytest/Check.hh"
-#include "cpu/testers/rubytest/CheckTable.hh"
#include "debug/RubyTest.hh"
CheckTable::CheckTable(int _num_writers, int _num_readers, RubyTester* _tester)
diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc
index 5ed6d7f..61de052 100644
--- a/src/cpu/testers/rubytest/RubyTester.cc
+++ b/src/cpu/testers/rubytest/RubyTester.cc
@@ -39,9 +39,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "cpu/testers/rubytest/RubyTester.hh"
+
#include "base/misc.hh"
#include "cpu/testers/rubytest/Check.hh"
-#include "cpu/testers/rubytest/RubyTester.hh"
#include "debug/RubyTest.hh"
#include "mem/ruby/common/SubBlock.hh"
#include "sim/sim_exit.hh"
diff --git a/src/cpu/thread_context.cc b/src/cpu/thread_context.cc
index 6914659..cea21e7 100644
--- a/src/cpu/thread_context.cc
+++ b/src/cpu/thread_context.cc
@@ -41,13 +41,14 @@
* Authors: Kevin Lim
*/
+#include "cpu/thread_context.hh"
+
#include "arch/kernel_stats.hh"
#include "base/misc.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "cpu/base.hh"
#include "cpu/quiesce_event.hh"
-#include "cpu/thread_context.hh"
#include "debug/Context.hh"
#include "debug/Quiesce.hh"
#include "params/BaseCPU.hh"
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index 4241876..92be179 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -28,12 +28,13 @@
* Authors: Kevin Lim
*/
+#include "cpu/thread_state.hh"
+
#include "arch/kernel_stats.hh"
#include "base/output.hh"
#include "cpu/base.hh"
#include "cpu/profile.hh"
#include "cpu/quiesce_event.hh"
-#include "cpu/thread_state.hh"
#include "mem/fs_translating_port_proxy.hh"
#include "mem/port.hh"
#include "mem/port_proxy.hh"
diff --git a/src/cpu/timing_expr.cc b/src/cpu/timing_expr.cc
index 36a643e..88bc547 100644
--- a/src/cpu/timing_expr.cc
+++ b/src/cpu/timing_expr.cc
@@ -37,9 +37,10 @@
* Authors: Andrew Bardsley
*/
-#include "base/intmath.hh"
#include "cpu/timing_expr.hh"
+#include "base/intmath.hh"
+
TimingExprEvalContext::TimingExprEvalContext(const StaticInstPtr &inst_,
ThreadContext *thread_,
TimingExprLet *let_) :
diff --git a/src/dev/alpha/backdoor.cc b/src/dev/alpha/backdoor.cc
index 93bfedf..5c627ca 100644
--- a/src/dev/alpha/backdoor.cc
+++ b/src/dev/alpha/backdoor.cc
@@ -35,6 +35,8 @@
* Alpha Console Backdoor Definition
*/
+#include "dev/alpha/backdoor.hh"
+
#include <cstddef>
#include <string>
@@ -45,7 +47,6 @@
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "debug/AlphaBackdoor.hh"
-#include "dev/alpha/backdoor.hh"
#include "dev/alpha/tsunami.hh"
#include "dev/alpha/tsunami_cchip.hh"
#include "dev/alpha/tsunami_io.hh"
diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc
index 300b481..82a3812 100644
--- a/src/dev/alpha/tsunami.cc
+++ b/src/dev/alpha/tsunami.cc
@@ -32,6 +32,8 @@
* Implementation of Tsunami platform.
*/
+#include "dev/alpha/tsunami.hh"
+
#include <deque>
#include <string>
#include <vector>
@@ -39,7 +41,6 @@
#include "arch/alpha/system.hh"
#include "config/the_isa.hh"
#include "cpu/intr_control.hh"
-#include "dev/alpha/tsunami.hh"
#include "dev/alpha/tsunami_cchip.hh"
#include "dev/alpha/tsunami_io.hh"
#include "dev/alpha/tsunami_pchip.hh"
diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc
index b9a3eb4..7429d8c 100644
--- a/src/dev/alpha/tsunami_cchip.cc
+++ b/src/dev/alpha/tsunami_cchip.cc
@@ -33,6 +33,8 @@
* Emulation of the Tsunami CChip CSRs
*/
+#include "dev/alpha/tsunami_cchip.hh"
+
#include <deque>
#include <string>
#include <vector>
@@ -45,7 +47,6 @@
#include "debug/IPI.hh"
#include "debug/Tsunami.hh"
#include "dev/alpha/tsunami.hh"
-#include "dev/alpha/tsunami_cchip.hh"
#include "dev/alpha/tsunamireg.h"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index 8015ec2..7112a02 100644
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -34,6 +34,8 @@
* Tsunami I/O including PIC, PIT, RTC, DMA
*/
+#include "dev/alpha/tsunami_io.hh"
+
#include <sys/time.h>
#include <deque>
@@ -46,7 +48,6 @@
#include "debug/Tsunami.hh"
#include "dev/alpha/tsunami.hh"
#include "dev/alpha/tsunami_cchip.hh"
-#include "dev/alpha/tsunami_io.hh"
#include "dev/alpha/tsunamireg.h"
#include "dev/rtcreg.h"
#include "mem/packet.hh"
diff --git a/src/dev/arm/a9scu.cc b/src/dev/arm/a9scu.cc
index 26b2a45..32dc3f7 100644
--- a/src/dev/arm/a9scu.cc
+++ b/src/dev/arm/a9scu.cc
@@ -37,9 +37,10 @@
* Authors: Ali Saidi
*/
+#include "dev/arm/a9scu.hh"
+
#include "base/intmath.hh"
#include "base/trace.hh"
-#include "dev/arm/a9scu.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/system.hh"
diff --git a/src/dev/arm/amba_device.cc b/src/dev/arm/amba_device.cc
index 540d096..d9acc9a 100644
--- a/src/dev/arm/amba_device.cc
+++ b/src/dev/arm/amba_device.cc
@@ -40,9 +40,10 @@
* Authors: Ali Saidi
*/
+#include "dev/arm/amba_device.hh"
+
#include "base/trace.hh"
#include "debug/AMBA.hh"
-#include "dev/arm/amba_device.hh"
#include "dev/arm/amba_fake.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/arm/amba_fake.cc b/src/dev/arm/amba_fake.cc
index d415ab2..3f8fcd6 100644
--- a/src/dev/arm/amba_fake.cc
+++ b/src/dev/arm/amba_fake.cc
@@ -40,9 +40,10 @@
* Authors: Ali Saidi
*/
+#include "dev/arm/amba_fake.hh"
+
#include "base/trace.hh"
#include "debug/AMBA.hh"
-#include "dev/arm/amba_fake.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/arm/energy_ctrl.cc b/src/dev/arm/energy_ctrl.cc
index 0e69258..9efdeb1 100644
--- a/src/dev/arm/energy_ctrl.cc
+++ b/src/dev/arm/energy_ctrl.cc
@@ -39,8 +39,9 @@
* Stephan Diestelhorst
*/
-#include "debug/EnergyCtrl.hh"
#include "dev/arm/energy_ctrl.hh"
+
+#include "debug/EnergyCtrl.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "params/EnergyCtrl.hh"
diff --git a/src/dev/arm/gic_pl390.cc b/src/dev/arm/gic_pl390.cc
index 5a73c31..3c6fed7 100644
--- a/src/dev/arm/gic_pl390.cc
+++ b/src/dev/arm/gic_pl390.cc
@@ -41,12 +41,13 @@
* Prakash Ramrakhyani
*/
+#include "dev/arm/gic_pl390.hh"
+
#include "base/trace.hh"
#include "debug/Checkpoint.hh"
#include "debug/GIC.hh"
#include "debug/IPI.hh"
#include "debug/Interrupt.hh"
-#include "dev/arm/gic_pl390.hh"
#include "dev/terminal.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/arm/hdlcd.cc b/src/dev/arm/hdlcd.cc
index 0f63f23..363aeba 100644
--- a/src/dev/arm/hdlcd.cc
+++ b/src/dev/arm/hdlcd.cc
@@ -40,9 +40,9 @@
#include "dev/arm/hdlcd.hh"
-#include "base/vnc/vncinput.hh"
#include "base/output.hh"
#include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
#include "debug/Checkpoint.hh"
#include "debug/HDLcd.hh"
#include "dev/arm/amba_device.hh"
diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index d968103..9415467 100644
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -41,11 +41,12 @@
* William Wang
*/
-#include "base/vnc/vncinput.hh"
+#include "dev/arm/kmi.hh"
+
#include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
#include "debug/Pl050.hh"
#include "dev/arm/amba_device.hh"
-#include "dev/arm/kmi.hh"
#include "dev/ps2.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/arm/pl011.cc b/src/dev/arm/pl011.cc
index 40f34e1..f7f5d2d 100644
--- a/src/dev/arm/pl011.cc
+++ b/src/dev/arm/pl011.cc
@@ -51,8 +51,8 @@
#include "dev/terminal.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
-#include "sim/sim_exit.hh"
#include "params/Pl011.hh"
+#include "sim/sim_exit.hh"
Pl011::Pl011(const Pl011Params *p)
: Uart(p, 0xfff),
diff --git a/src/dev/arm/pl111.cc b/src/dev/arm/pl111.cc
index 23ffe58..b12e7a3 100644
--- a/src/dev/arm/pl111.cc
+++ b/src/dev/arm/pl111.cc
@@ -38,14 +38,15 @@
* Ali Saidi
*/
-#include "base/vnc/vncinput.hh"
+#include "dev/arm/pl111.hh"
+
#include "base/output.hh"
#include "base/trace.hh"
+#include "base/vnc/vncinput.hh"
#include "debug/PL111.hh"
#include "debug/Uart.hh"
#include "dev/arm/amba_device.hh"
#include "dev/arm/base_gic.hh"
-#include "dev/arm/pl111.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/system.hh"
diff --git a/src/dev/arm/realview.cc b/src/dev/arm/realview.cc
index 2a6bc63..e5e7afd 100644
--- a/src/dev/arm/realview.cc
+++ b/src/dev/arm/realview.cc
@@ -44,6 +44,8 @@
* Implementation of RealView platform.
*/
+#include "dev/arm/realview.hh"
+
#include <deque>
#include <string>
#include <vector>
@@ -51,7 +53,6 @@
#include "config/the_isa.hh"
#include "cpu/intr_control.hh"
#include "dev/arm/base_gic.hh"
-#include "dev/arm/realview.hh"
#include "dev/terminal.hh"
#include "sim/system.hh"
diff --git a/src/dev/arm/rtc_pl031.cc b/src/dev/arm/rtc_pl031.cc
index d566187..46c5d28 100644
--- a/src/dev/arm/rtc_pl031.cc
+++ b/src/dev/arm/rtc_pl031.cc
@@ -37,13 +37,14 @@
* Authors: Ali Saidi
*/
+#include "dev/arm/rtc_pl031.hh"
+
#include "base/intmath.hh"
#include "base/time.hh"
#include "base/trace.hh"
#include "debug/Checkpoint.hh"
#include "debug/Timer.hh"
#include "dev/arm/amba_device.hh"
-#include "dev/arm/rtc_pl031.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/arm/timer_cpulocal.cc b/src/dev/arm/timer_cpulocal.cc
index 11ae3b3..448ac21 100644
--- a/src/dev/arm/timer_cpulocal.cc
+++ b/src/dev/arm/timer_cpulocal.cc
@@ -38,12 +38,13 @@
* Geoffrey Blake
*/
+#include "dev/arm/timer_cpulocal.hh"
+
#include "base/intmath.hh"
#include "base/trace.hh"
#include "debug/Checkpoint.hh"
#include "debug/Timer.hh"
#include "dev/arm/base_gic.hh"
-#include "dev/arm/timer_cpulocal.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/arm/timer_sp804.cc b/src/dev/arm/timer_sp804.cc
index 54a5a25..99c722d 100644
--- a/src/dev/arm/timer_sp804.cc
+++ b/src/dev/arm/timer_sp804.cc
@@ -37,12 +37,13 @@
* Authors: Ali Saidi
*/
+#include "dev/arm/timer_sp804.hh"
+
#include "base/intmath.hh"
#include "base/trace.hh"
#include "debug/Checkpoint.hh"
#include "debug/Timer.hh"
#include "dev/arm/base_gic.hh"
-#include "dev/arm/timer_sp804.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/arm/vgic.cc b/src/dev/arm/vgic.cc
index 71d1d3b..60866f1 100644
--- a/src/dev/arm/vgic.cc
+++ b/src/dev/arm/vgic.cc
@@ -37,11 +37,12 @@
* Authors: Matt Evans
*/
+#include "dev/arm/vgic.hh"
+
#include "base/trace.hh"
#include "debug/Checkpoint.hh"
#include "debug/VGIC.hh"
#include "dev/arm/base_gic.hh"
-#include "dev/arm/vgic.hh"
#include "dev/terminal.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc
index 918c754..b933853 100644
--- a/src/dev/baddev.cc
+++ b/src/dev/baddev.cc
@@ -32,10 +32,11 @@
* BadDevice implemenation
*/
+#include "dev/baddev.hh"
+
#include <string>
#include "base/trace.hh"
-#include "dev/baddev.hh"
#include "params/BadDevice.hh"
#include "sim/system.hh"
diff --git a/src/dev/intel_8254_timer.cc b/src/dev/intel_8254_timer.cc
index e832808..3831f21 100644
--- a/src/dev/intel_8254_timer.cc
+++ b/src/dev/intel_8254_timer.cc
@@ -30,9 +30,10 @@
* Miguel J. Serrano
*/
+#include "dev/intel_8254_timer.hh"
+
#include "base/misc.hh"
#include "debug/Intel8254Timer.hh"
-#include "dev/intel_8254_timer.hh"
using namespace std;
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index daa939d..28ea52a 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -41,9 +41,10 @@
* Nathan Binkert
*/
+#include "dev/io_device.hh"
+
#include "base/trace.hh"
#include "debug/AddrRanges.hh"
-#include "dev/io_device.hh"
#include "sim/system.hh"
PioPort::PioPort(PioDevice *dev)
diff --git a/src/dev/isa_fake.cc b/src/dev/isa_fake.cc
index 0871fec..92ee19a 100644
--- a/src/dev/isa_fake.cc
+++ b/src/dev/isa_fake.cc
@@ -32,9 +32,10 @@
* Isa Fake Device implementation
*/
+#include "dev/isa_fake.hh"
+
#include "base/trace.hh"
#include "debug/IsaFake.hh"
-#include "dev/isa_fake.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/system.hh"
diff --git a/src/dev/mc146818.cc b/src/dev/mc146818.cc
index 1eaaf96..4f57935 100644
--- a/src/dev/mc146818.cc
+++ b/src/dev/mc146818.cc
@@ -30,6 +30,8 @@
* Miguel Serrano
*/
+#include "dev/mc146818.hh"
+
#include <sys/time.h>
#include <ctime>
@@ -39,7 +41,6 @@
#include "base/time.hh"
#include "base/trace.hh"
#include "debug/MC146818.hh"
-#include "dev/mc146818.hh"
#include "dev/rtcreg.h"
using namespace std;
diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc
index 21dfd40..8843d4b 100755
--- a/src/dev/mips/malta.cc
+++ b/src/dev/mips/malta.cc
@@ -33,6 +33,8 @@
* Implementation of Malta platform.
*/
+#include "dev/mips/malta.hh"
+
#include <deque>
#include <string>
#include <vector>
@@ -40,7 +42,6 @@
#include "config/the_isa.hh"
#include "cpu/intr_control.hh"
#include "debug/Malta.hh"
-#include "dev/mips/malta.hh"
#include "dev/mips/malta_cchip.hh"
#include "dev/mips/malta_io.hh"
#include "dev/terminal.hh"
diff --git a/src/dev/mips/malta_cchip.cc b/src/dev/mips/malta_cchip.cc
index d607acb..929702f 100755
--- a/src/dev/mips/malta_cchip.cc
+++ b/src/dev/mips/malta_cchip.cc
@@ -33,6 +33,8 @@
* Emulation of the Malta CChip CSRs
*/
+#include "dev/mips/malta_cchip.hh"
+
#include <deque>
#include <string>
#include <vector>
@@ -43,7 +45,6 @@
#include "cpu/thread_context.hh"
#include "debug/Malta.hh"
#include "dev/mips/malta.hh"
-#include "dev/mips/malta_cchip.hh"
#include "dev/mips/maltareg.h"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc
index bd37911..96de7f9 100755
--- a/src/dev/mips/malta_io.cc
+++ b/src/dev/mips/malta_io.cc
@@ -34,6 +34,8 @@
* Malta I/O including PIC, PIT, RTC, DMA
*/
+#include "dev/mips/malta_io.hh"
+
#include <sys/time.h>
#include <deque>
@@ -46,7 +48,6 @@
#include "debug/Malta.hh"
#include "dev/mips/malta.hh"
#include "dev/mips/malta_cchip.hh"
-#include "dev/mips/malta_io.hh"
#include "dev/mips/maltareg.h"
#include "dev/rtcreg.h"
#include "mem/packet.hh"
diff --git a/src/dev/pci/device.cc b/src/dev/pci/device.cc
index 916cd84..192d824 100644
--- a/src/dev/pci/device.cc
+++ b/src/dev/pci/device.cc
@@ -63,7 +63,6 @@
#include "sim/byteswap.hh"
#include "sim/core.hh"
-
PciDevice::PciDevice(const PciDeviceParams *p)
: DmaDevice(p),
_busAddr(p->pci_bus, p->pci_dev, p->pci_func),
diff --git a/src/dev/pci/host.cc b/src/dev/pci/host.cc
index 3b572f7..dfb197b 100644
--- a/src/dev/pci/host.cc
+++ b/src/dev/pci/host.cc
@@ -47,7 +47,6 @@
#include "params/GenericPciHost.hh"
#include "params/PciHost.hh"
-
PciHost::PciHost(const PciHostParams *p)
: PioDevice(p)
{
diff --git a/src/dev/platform.cc b/src/dev/platform.cc
index 8c7706b..63df9bc 100644
--- a/src/dev/platform.cc
+++ b/src/dev/platform.cc
@@ -29,9 +29,10 @@
* Nathan Binkert
*/
+#include "dev/platform.hh"
+
#include "base/misc.hh"
#include "config/the_isa.hh"
-#include "dev/platform.hh"
#include "sim/sim_exit.hh"
using namespace std;
diff --git a/src/dev/ps2.cc b/src/dev/ps2.cc
index 0d973ad..2c13e5c 100644
--- a/src/dev/ps2.cc
+++ b/src/dev/ps2.cc
@@ -37,10 +37,11 @@
* Authors: Ali Saidi
*/
+#include "dev/ps2.hh"
+
#include <list>
#include "base/misc.hh"
-#include "dev/ps2.hh"
#include "x11keysym/keysym.h"
namespace Ps2 {
diff --git a/src/dev/ps2.hh b/src/dev/ps2.hh
index f1ddb52..9e99867 100644
--- a/src/dev/ps2.hh
+++ b/src/dev/ps2.hh
@@ -41,6 +41,7 @@
#define __DEV_PS2_HH__
#include <stdint.h>
+#include <list>
#include "base/bitunion.hh"
diff --git a/src/dev/sparc/dtod.cc b/src/dev/sparc/dtod.cc
index 5b74bbc..3d47ff6 100644
--- a/src/dev/sparc/dtod.cc
+++ b/src/dev/sparc/dtod.cc
@@ -31,6 +31,8 @@
/** @file
* Time of date device implementation
*/
+#include "dev/sparc/dtod.hh"
+
#include <sys/time.h>
#include <deque>
@@ -40,7 +42,6 @@
#include "base/time.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
-#include "dev/sparc/dtod.hh"
#include "dev/platform.hh"
#include "mem/packet_access.hh"
#include "mem/port.hh"
diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc
index 55cb93f..28d3842 100644
--- a/src/dev/sparc/iob.cc
+++ b/src/dev/sparc/iob.cc
@@ -35,6 +35,8 @@
* well as facilities to send IPIs to other cpus.
*/
+#include "dev/sparc/iob.hh"
+
#include <cstring>
#include "arch/sparc/faults.hh"
@@ -44,7 +46,6 @@
#include "cpu/intr_control.hh"
#include "cpu/thread_context.hh"
#include "debug/Iob.hh"
-#include "dev/sparc/iob.hh"
#include "dev/platform.hh"
#include "mem/packet_access.hh"
#include "mem/port.hh"
diff --git a/src/dev/sparc/mm_disk.cc b/src/dev/sparc/mm_disk.cc
index 5fe9157..a6ce1d0 100644
--- a/src/dev/sparc/mm_disk.cc
+++ b/src/dev/sparc/mm_disk.cc
@@ -33,11 +33,12 @@
* in legion. Any access is translated to an offset in the disk image.
*/
+#include "dev/sparc/mm_disk.hh"
+
#include <cstring>
#include "base/trace.hh"
#include "debug/IdeDisk.hh"
-#include "dev/sparc/mm_disk.hh"
#include "dev/platform.hh"
#include "mem/packet_access.hh"
#include "mem/port.hh"
diff --git a/src/dev/sparc/t1000.cc b/src/dev/sparc/t1000.cc
index 12f43ab..f658462 100644
--- a/src/dev/sparc/t1000.cc
+++ b/src/dev/sparc/t1000.cc
@@ -32,13 +32,14 @@
* Implementation of T1000 platform.
*/
+#include "dev/sparc/t1000.hh"
+
#include <deque>
#include <string>
#include <vector>
#include "config/the_isa.hh"
#include "cpu/intr_control.hh"
-#include "dev/sparc/t1000.hh"
#include "dev/terminal.hh"
#include "sim/system.hh"
diff --git a/src/dev/uart.cc b/src/dev/uart.cc
index f232f0f..0190044 100644
--- a/src/dev/uart.cc
+++ b/src/dev/uart.cc
@@ -32,9 +32,10 @@
* Implements a base class for UARTs
*/
+#include "dev/uart.hh"
+
#include "dev/platform.hh"
#include "dev/terminal.hh"
-#include "dev/uart.hh"
using namespace std;
diff --git a/src/dev/uart8250.cc b/src/dev/uart8250.cc
index a9446e6..3c97604 100644
--- a/src/dev/uart8250.cc
+++ b/src/dev/uart8250.cc
@@ -32,6 +32,8 @@
* Implements a 8250 UART
*/
+#include "dev/uart8250.hh"
+
#include <string>
#include <vector>
@@ -41,7 +43,6 @@
#include "debug/Uart.hh"
#include "dev/platform.hh"
#include "dev/terminal.hh"
-#include "dev/uart8250.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/virtio/base.cc b/src/dev/virtio/base.cc
index 05c1edd..f098784 100644
--- a/src/dev/virtio/base.cc
+++ b/src/dev/virtio/base.cc
@@ -37,8 +37,9 @@
* Authors: Andreas Sandberg
*/
-#include "debug/VIO.hh"
#include "dev/virtio/base.hh"
+
+#include "debug/VIO.hh"
#include "params/VirtIODeviceBase.hh"
VirtDescriptor::VirtDescriptor(PortProxy &_memProxy, VirtQueue &_queue,
diff --git a/src/dev/virtio/block.cc b/src/dev/virtio/block.cc
index 2b511e2..a602c3e 100644
--- a/src/dev/virtio/block.cc
+++ b/src/dev/virtio/block.cc
@@ -37,8 +37,9 @@
* Authors: Andreas Sandberg
*/
-#include "debug/VIOBlock.hh"
#include "dev/virtio/block.hh"
+
+#include "debug/VIOBlock.hh"
#include "params/VirtIOBlock.hh"
#include "sim/system.hh"
diff --git a/src/dev/virtio/console.cc b/src/dev/virtio/console.cc
index 70b53c1..e3428e9 100644
--- a/src/dev/virtio/console.cc
+++ b/src/dev/virtio/console.cc
@@ -37,12 +37,12 @@
* Authors: Andreas Sandberg
*/
-#include "debug/VIOConsole.hh"
#include "dev/virtio/console.hh"
+
+#include "debug/VIOConsole.hh"
#include "params/VirtIOConsole.hh"
#include "sim/system.hh"
-
VirtIOConsole::VirtIOConsole(Params *params)
: VirtIODeviceBase(params, ID_CONSOLE, sizeof(Config), F_SIZE),
qRecv(params->system->physProxy, params->qRecvSize, *this),
diff --git a/src/dev/virtio/fs9p.cc b/src/dev/virtio/fs9p.cc
index 2006006..a8d1ee7 100644
--- a/src/dev/virtio/fs9p.cc
+++ b/src/dev/virtio/fs9p.cc
@@ -37,16 +37,17 @@
* Authors: Andreas Sandberg
*/
+#include "dev/virtio/fs9p.hh"
+
+#include <fcntl.h>
+#include <netdb.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/types.h>
-#include <fcntl.h>
-#include <netdb.h>
#include <unistd.h>
#include "debug/VIO9P.hh"
#include "debug/VIO9PData.hh"
-#include "dev/virtio/fs9p.hh"
#include "params/VirtIO9PBase.hh"
#include "params/VirtIO9PDiod.hh"
#include "params/VirtIO9PProxy.hh"
diff --git a/src/dev/virtio/pci.cc b/src/dev/virtio/pci.cc
index fb0735e..29b9294 100644
--- a/src/dev/virtio/pci.cc
+++ b/src/dev/virtio/pci.cc
@@ -37,8 +37,9 @@
* Authors: Andreas Sandberg
*/
-#include "debug/VIOPci.hh"
#include "dev/virtio/pci.hh"
+
+#include "debug/VIOPci.hh"
#include "mem/packet_access.hh"
#include "params/PciVirtIO.hh"
diff --git a/src/dev/x86/cmos.cc b/src/dev/x86/cmos.cc
index 73cfe85..16286f0 100644
--- a/src/dev/x86/cmos.cc
+++ b/src/dev/x86/cmos.cc
@@ -28,8 +28,9 @@
* Authors: Gabe Black
*/
-#include "debug/CMOS.hh"
#include "dev/x86/cmos.hh"
+
+#include "debug/CMOS.hh"
#include "dev/x86/intdev.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8042.cc b/src/dev/x86/i8042.cc
index 8aef932..39b0205 100644
--- a/src/dev/x86/i8042.cc
+++ b/src/dev/x86/i8042.cc
@@ -28,9 +28,10 @@
* Authors: Gabe Black
*/
+#include "dev/x86/i8042.hh"
+
#include "base/bitunion.hh"
#include "debug/I8042.hh"
-#include "dev/x86/i8042.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc
index 7388036..a4b05b0 100644
--- a/src/dev/x86/i82094aa.cc
+++ b/src/dev/x86/i82094aa.cc
@@ -28,11 +28,12 @@
* Authors: Gabe Black
*/
+#include "dev/x86/i82094aa.hh"
+
#include "arch/x86/interrupts.hh"
#include "arch/x86/intmessage.hh"
#include "cpu/base.hh"
#include "debug/I82094AA.hh"
-#include "dev/x86/i82094aa.hh"
#include "dev/x86/i8259.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8237.cc b/src/dev/x86/i8237.cc
index b16f788..a9ef53c 100644
--- a/src/dev/x86/i8237.cc
+++ b/src/dev/x86/i8237.cc
@@ -29,6 +29,7 @@
*/
#include "dev/x86/i8237.hh"
+
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8254.cc b/src/dev/x86/i8254.cc
index f784a01..457db13 100644
--- a/src/dev/x86/i8254.cc
+++ b/src/dev/x86/i8254.cc
@@ -28,8 +28,9 @@
* Authors: Gabe Black
*/
-#include "debug/I8254.hh"
#include "dev/x86/i8254.hh"
+
+#include "debug/I8254.hh"
#include "dev/x86/intdev.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/x86/i8259.cc b/src/dev/x86/i8259.cc
index 84f2d13..03c5cb9 100644
--- a/src/dev/x86/i8259.cc
+++ b/src/dev/x86/i8259.cc
@@ -28,10 +28,11 @@
* Authors: Gabe Black
*/
+#include "dev/x86/i8259.hh"
+
#include "base/bitfield.hh"
#include "debug/I8259.hh"
#include "dev/x86/i82094aa.hh"
-#include "dev/x86/i8259.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc
index fe31198..6d182c0 100644
--- a/src/dev/x86/pc.cc
+++ b/src/dev/x86/pc.cc
@@ -32,6 +32,8 @@
* Implementation of PC platform.
*/
+#include "dev/x86/pc.hh"
+
#include <deque>
#include <string>
#include <vector>
@@ -40,12 +42,11 @@
#include "arch/x86/x86_traits.hh"
#include "config/the_isa.hh"
#include "cpu/intr_control.hh"
+#include "dev/terminal.hh"
#include "dev/x86/i82094aa.hh"
#include "dev/x86/i8254.hh"
#include "dev/x86/i8259.hh"
-#include "dev/x86/pc.hh"
#include "dev/x86/south_bridge.hh"
-#include "dev/terminal.hh"
#include "sim/system.hh"
using namespace std;
diff --git a/src/dev/x86/south_bridge.cc b/src/dev/x86/south_bridge.cc
index dbb1ef1..e426c70 100644
--- a/src/dev/x86/south_bridge.cc
+++ b/src/dev/x86/south_bridge.cc
@@ -28,10 +28,11 @@
* Authors: Gabe Black
*/
+#include "dev/x86/south_bridge.hh"
+
#include <cassert>
#include "dev/x86/pc.hh"
-#include "dev/x86/south_bridge.hh"
using namespace X86ISA;
diff --git a/src/dev/x86/speaker.cc b/src/dev/x86/speaker.cc
index 2358608..61a2967 100644
--- a/src/dev/x86/speaker.cc
+++ b/src/dev/x86/speaker.cc
@@ -28,11 +28,12 @@
* Authors: Gabe Black
*/
+#include "dev/x86/speaker.hh"
+
#include "base/bitunion.hh"
#include "base/trace.hh"
#include "debug/PcSpeaker.hh"
#include "dev/x86/i8254.hh"
-#include "dev/x86/speaker.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff --git a/src/kern/linux/linux.cc b/src/kern/linux/linux.cc
index 8214aeb..ef5b441 100644
--- a/src/kern/linux/linux.cc
+++ b/src/kern/linux/linux.cc
@@ -28,12 +28,13 @@
* Authors: Ali Saidi
*/
+#include "kern/linux/linux.hh"
+
#include <cstdio>
#include <string>
#include "cpu/thread_context.hh"
#include "debug/SyscallVerbose.hh"
-#include "kern/linux/linux.hh"
#include "sim/process.hh"
#include "sim/system.hh"
diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index c2cf609..adc2009 100644
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -29,13 +29,14 @@
* Ali Saidi
*/
+#include "kern/linux/printk.hh"
+
#include <sys/types.h>
#include <algorithm>
#include "base/trace.hh"
#include "cpu/thread_context.hh"
-#include "kern/linux/printk.hh"
#include "sim/arguments.hh"
using namespace std;
diff --git a/src/kern/operatingsystem.cc b/src/kern/operatingsystem.cc
index ce4092c..1ecc94c 100644
--- a/src/kern/operatingsystem.cc
+++ b/src/kern/operatingsystem.cc
@@ -29,9 +29,10 @@
*/
-#include "base/misc.hh"
#include "kern/operatingsystem.hh"
+#include "base/misc.hh"
+
int
OperatingSystem::openSpecialFile(std::string path, LiveProcess *process,
ThreadContext *tc)
diff --git a/src/kern/system_events.cc b/src/kern/system_events.cc
index 3ee7a09..7ac8b57 100644
--- a/src/kern/system_events.cc
+++ b/src/kern/system_events.cc
@@ -29,13 +29,14 @@
* Nathan Binkert
*/
+#include "kern/system_events.hh"
+
#include "arch/isa_traits.hh"
#include "arch/utility.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "cpu/thread_context.hh"
#include "debug/PCEvent.hh"
-#include "kern/system_events.hh"
using namespace TheISA;
diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc
index 75c5b55..e05296c 100644
--- a/src/mem/abstract_mem.cc
+++ b/src/mem/abstract_mem.cc
@@ -42,13 +42,14 @@
* Andreas Hansson
*/
+#include "mem/abstract_mem.hh"
+
#include <vector>
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "debug/LLSC.hh"
#include "debug/MemoryAccess.hh"
-#include "mem/abstract_mem.hh"
#include "mem/packet_access.hh"
#include "sim/system.hh"
diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc
index 8a209e8..a7adcba 100644
--- a/src/mem/bridge.cc
+++ b/src/mem/bridge.cc
@@ -48,9 +48,10 @@
* and a slave through a request and response queue.
*/
+#include "mem/bridge.hh"
+
#include "base/trace.hh"
#include "debug/Bridge.hh"
-#include "mem/bridge.hh"
#include "params/Bridge.hh"
Bridge::BridgeSlavePort::BridgeSlavePort(const std::string& _name,
diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc
index 3d22dcc..6b4cf05 100644
--- a/src/mem/cache/prefetch/base.cc
+++ b/src/mem/cache/prefetch/base.cc
@@ -46,10 +46,11 @@
* Hardware Prefetcher Definition.
*/
+#include "mem/cache/prefetch/base.hh"
+
#include <list>
#include "base/intmath.hh"
-#include "mem/cache/prefetch/base.hh"
#include "mem/cache/base.hh"
#include "sim/system.hh"
diff --git a/src/mem/cache/prefetch/queued.cc b/src/mem/cache/prefetch/queued.cc
index 863d369..4a685d8 100644
--- a/src/mem/cache/prefetch/queued.cc
+++ b/src/mem/cache/prefetch/queued.cc
@@ -37,8 +37,9 @@
* Authors: Mitch Hayenga
*/
-#include "debug/HWPrefetch.hh"
#include "mem/cache/prefetch/queued.hh"
+
+#include "debug/HWPrefetch.hh"
#include "mem/cache/base.hh"
QueuedPrefetcher::QueuedPrefetcher(const QueuedPrefetcherParams *p)
diff --git a/src/mem/cache/prefetch/stride.cc b/src/mem/cache/prefetch/stride.cc
index 6b8fee8..e9c83f2 100644
--- a/src/mem/cache/prefetch/stride.cc
+++ b/src/mem/cache/prefetch/stride.cc
@@ -46,9 +46,10 @@
* Stride Prefetcher template instantiations.
*/
+#include "mem/cache/prefetch/stride.hh"
+
#include "base/random.hh"
#include "debug/HWPrefetch.hh"
-#include "mem/cache/prefetch/stride.hh"
StridePrefetcher::StridePrefetcher(const StridePrefetcherParams *p)
: QueuedPrefetcher(p),
diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc
index 6cf381c..7c3a4e3 100644
--- a/src/mem/coherent_xbar.cc
+++ b/src/mem/coherent_xbar.cc
@@ -47,11 +47,12 @@
* Definition of a crossbar object.
*/
+#include "mem/coherent_xbar.hh"
+
#include "base/misc.hh"
#include "base/trace.hh"
#include "debug/AddrRanges.hh"
#include "debug/CoherentXBar.hh"
-#include "mem/coherent_xbar.hh"
#include "sim/system.hh"
CoherentXBar::CoherentXBar(const CoherentXBarParams *p)
diff --git a/src/mem/comm_monitor.cc b/src/mem/comm_monitor.cc
index 05549fd..df2f8ca 100644
--- a/src/mem/comm_monitor.cc
+++ b/src/mem/comm_monitor.cc
@@ -38,9 +38,10 @@
* Andreas Hansson
*/
+#include "mem/comm_monitor.hh"
+
#include "base/trace.hh"
#include "debug/CommMonitor.hh"
-#include "mem/comm_monitor.hh"
#include "sim/stats.hh"
CommMonitor::CommMonitor(Params* params)
diff --git a/src/mem/dram_ctrl.cc b/src/mem/dram_ctrl.cc
index 5d4852d..ada7027 100644
--- a/src/mem/dram_ctrl.cc
+++ b/src/mem/dram_ctrl.cc
@@ -44,13 +44,14 @@
* Wendy Elsasser
*/
+#include "mem/dram_ctrl.hh"
+
#include "base/bitfield.hh"
#include "base/trace.hh"
#include "debug/DRAM.hh"
#include "debug/DRAMPower.hh"
#include "debug/DRAMState.hh"
#include "debug/Drain.hh"
-#include "mem/dram_ctrl.hh"
#include "sim/system.hh"
using namespace std;
diff --git a/src/mem/drampower.cc b/src/mem/drampower.cc
index d6293b0..d491c96 100644
--- a/src/mem/drampower.cc
+++ b/src/mem/drampower.cc
@@ -37,8 +37,9 @@
* Authors: Omar Naji
*/
-#include "base/intmath.hh"
#include "mem/drampower.hh"
+
+#include "base/intmath.hh"
#include "sim/core.hh"
using namespace Data;
diff --git a/src/mem/dramsim2.cc b/src/mem/dramsim2.cc
index fb1ee94..106ea26 100644
--- a/src/mem/dramsim2.cc
+++ b/src/mem/dramsim2.cc
@@ -37,12 +37,13 @@
* Authors: Andreas Hansson
*/
+#include "mem/dramsim2.hh"
+
#include "DRAMSim2/Callback.h"
#include "base/callback.hh"
#include "base/trace.hh"
#include "debug/DRAMSim2.hh"
#include "debug/Drain.hh"
-#include "mem/dramsim2.hh"
#include "sim/system.hh"
DRAMSim2::DRAMSim2(const Params* p) :
diff --git a/src/mem/dramsim2_wrapper.cc b/src/mem/dramsim2_wrapper.cc
index 34a7ad5..841ae43 100644
--- a/src/mem/dramsim2_wrapper.cc
+++ b/src/mem/dramsim2_wrapper.cc
@@ -48,12 +48,13 @@
#undef DEBUG
#endif
+#include "mem/dramsim2_wrapper.hh"
+
#include <fstream>
#include "DRAMSim2/MultiChannelMemorySystem.h"
#include "base/compiler.hh"
#include "base/misc.hh"
-#include "mem/dramsim2_wrapper.hh"
/**
* DRAMSim2 requires SHOW_SIM_OUTPUT to be defined (declared extern in
diff --git a/src/mem/external_master.cc b/src/mem/external_master.cc
index 74c5a6f..94fdc39 100644
--- a/src/mem/external_master.cc
+++ b/src/mem/external_master.cc
@@ -38,11 +38,12 @@
* Curtis Dunham
*/
+#include "mem/external_master.hh"
+
#include <cctype>
#include <iomanip>
#include "debug/ExternalPort.hh"
-#include "mem/external_master.hh"
std::map<std::string, ExternalMaster::Handler *>
ExternalMaster::portHandlers;
diff --git a/src/mem/external_slave.cc b/src/mem/external_slave.cc
index fadeff8..2d7ba1a 100644
--- a/src/mem/external_slave.cc
+++ b/src/mem/external_slave.cc
@@ -37,11 +37,12 @@
* Authors: Andrew Bardsley
*/
+#include "mem/external_slave.hh"
+
#include <cctype>
#include <iomanip>
#include "debug/ExternalPort.hh"
-#include "mem/external_slave.hh"
/** Implement a `stub' port which just responds to requests by printing
* a message. The stub port can be used to configure and test a system
diff --git a/src/mem/fs_translating_port_proxy.cc b/src/mem/fs_translating_port_proxy.cc
index a3229d7..616c12e 100644
--- a/src/mem/fs_translating_port_proxy.cc
+++ b/src/mem/fs_translating_port_proxy.cc
@@ -46,11 +46,12 @@
* Port object definitions.
*/
+#include "mem/fs_translating_port_proxy.hh"
+
#include "arch/vtophys.hh"
#include "base/chunk_generator.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
-#include "mem/fs_translating_port_proxy.hh"
#include "sim/system.hh"
using namespace TheISA;
diff --git a/src/mem/hmc_controller.cc b/src/mem/hmc_controller.cc
index 18c1262..c8938b7 100644
--- a/src/mem/hmc_controller.cc
+++ b/src/mem/hmc_controller.cc
@@ -1,6 +1,7 @@
+#include "mem/hmc_controller.hh"
+
#include "base/random.hh"
#include "debug/HMCController.hh"
-#include "mem/hmc_controller.hh"
HMCController::HMCController(const HMCControllerParams* p) :
NoncoherentXBar(p),
diff --git a/src/mem/mem_checker.cc b/src/mem/mem_checker.cc
index dba4b50..810683c 100644
--- a/src/mem/mem_checker.cc
+++ b/src/mem/mem_checker.cc
@@ -38,10 +38,10 @@
* Marco Elver
*/
-#include <cassert>
-
#include "mem/mem_checker.hh"
+#include <cassert>
+
void
MemChecker::WriteCluster::startWrite(MemChecker::Serial serial, Tick _start,
uint8_t data)
diff --git a/src/mem/mem_checker_monitor.cc b/src/mem/mem_checker_monitor.cc
index 971dfc0..2a25d21 100644
--- a/src/mem/mem_checker_monitor.cc
+++ b/src/mem/mem_checker_monitor.cc
@@ -39,12 +39,13 @@
* Marco Elver
*/
+#include "mem/mem_checker_monitor.hh"
+
#include <memory>
#include "base/output.hh"
#include "base/trace.hh"
#include "debug/MemCheckerMonitor.hh"
-#include "mem/mem_checker_monitor.hh"
using namespace std;
diff --git a/src/mem/noncoherent_xbar.cc b/src/mem/noncoherent_xbar.cc
index bd7258f..eeaa4fb 100644
--- a/src/mem/noncoherent_xbar.cc
+++ b/src/mem/noncoherent_xbar.cc
@@ -47,11 +47,12 @@
* Definition of a non-coherent crossbar object.
*/
+#include "mem/noncoherent_xbar.hh"
+
#include "base/misc.hh"
#include "base/trace.hh"
#include "debug/NoncoherentXBar.hh"
#include "debug/XBar.hh"
-#include "mem/noncoherent_xbar.hh"
NoncoherentXBar::NoncoherentXBar(const NoncoherentXBarParams *p)
: BaseXBar(p)
diff --git a/src/mem/packet.cc b/src/mem/packet.cc
index 7efed73..371058b 100644
--- a/src/mem/packet.cc
+++ b/src/mem/packet.cc
@@ -48,13 +48,14 @@
* between a single level of the memory heirarchy (ie L1->L2).
*/
+#include "mem/packet.hh"
+
#include <cstring>
#include <iostream>
#include "base/cprintf.hh"
#include "base/misc.hh"
#include "base/trace.hh"
-#include "mem/packet.hh"
using namespace std;
diff --git a/src/mem/packet_queue.cc b/src/mem/packet_queue.cc
index ca8422f..f7df331 100644
--- a/src/mem/packet_queue.cc
+++ b/src/mem/packet_queue.cc
@@ -41,10 +41,11 @@
* Andreas Hansson
*/
+#include "mem/packet_queue.hh"
+
#include "base/trace.hh"
#include "debug/Drain.hh"
#include "debug/PacketQueue.hh"
-#include "mem/packet_queue.hh"
using namespace std;
diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index 6875d6f..f47227f 100644
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -35,6 +35,8 @@
* @file
* Definitions of functional page table.
*/
+#include "mem/page_table.hh"
+
#include <fstream>
#include <map>
#include <memory>
@@ -45,7 +47,6 @@
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "debug/MMU.hh"
-#include "mem/page_table.hh"
#include "sim/faults.hh"
#include "sim/sim_object.hh"
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 05881b2..586f1c4 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -37,10 +37,12 @@
* Authors: Andreas Hansson
*/
+#include "mem/physical.hh"
+
+#include <fcntl.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/user.h>
-#include <fcntl.h>
#include <unistd.h>
#include <zlib.h>
@@ -54,7 +56,6 @@
#include "debug/AddrRanges.hh"
#include "debug/Checkpoint.hh"
#include "mem/abstract_mem.hh"
-#include "mem/physical.hh"
/**
* On Linux, MAP_NORESERVE allow us to simulate a very large memory
diff --git a/src/mem/port.cc b/src/mem/port.cc
index 91b9408..2111fa4 100644
--- a/src/mem/port.cc
+++ b/src/mem/port.cc
@@ -46,9 +46,10 @@
* @file
* Port object definitions.
*/
+#include "mem/port.hh"
+
#include "base/trace.hh"
#include "mem/mem_object.hh"
-#include "mem/port.hh"
Port::Port(const std::string &_name, MemObject& _owner, PortID _id)
: portName(_name), id(_id), owner(_owner)
diff --git a/src/mem/port_proxy.cc b/src/mem/port_proxy.cc
index f0158ec..f40c64e 100644
--- a/src/mem/port_proxy.cc
+++ b/src/mem/port_proxy.cc
@@ -37,9 +37,10 @@
* Authors: Andreas Hansson
*/
-#include "base/chunk_generator.hh"
#include "mem/port_proxy.hh"
+#include "base/chunk_generator.hh"
+
void
PortProxy::readBlob(Addr addr, uint8_t *p, int size) const
{
diff --git a/src/mem/probes/base.cc b/src/mem/probes/base.cc
index 36c9a58..39c25fc 100644
--- a/src/mem/probes/base.cc
+++ b/src/mem/probes/base.cc
@@ -41,7 +41,6 @@
#include "params/BaseMemProbe.hh"
-
BaseMemProbe::BaseMemProbe(BaseMemProbeParams *p)
: SimObject(p)
{
diff --git a/src/mem/ruby/common/Histogram.cc b/src/mem/ruby/common/Histogram.cc
index 31de160..209802b 100644
--- a/src/mem/ruby/common/Histogram.cc
+++ b/src/mem/ruby/common/Histogram.cc
@@ -26,11 +26,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/common/Histogram.hh"
+
#include <cmath>
#include <iomanip>
#include "base/intmath.hh"
-#include "mem/ruby/common/Histogram.hh"
using namespace std;
diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc
index 0a89bda..3a28646 100644
--- a/src/mem/ruby/common/NetDest.cc
+++ b/src/mem/ruby/common/NetDest.cc
@@ -26,10 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <algorithm>
-
#include "mem/ruby/common/NetDest.hh"
+#include <algorithm>
+
NetDest::NetDest()
{
resize();
diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc
index 5175cb9..98fec99 100644
--- a/src/mem/ruby/common/SubBlock.cc
+++ b/src/mem/ruby/common/SubBlock.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "base/stl_helpers.hh"
#include "mem/ruby/common/SubBlock.hh"
+#include "base/stl_helpers.hh"
+
using m5::stl_helpers::operator<<;
SubBlock::SubBlock(Addr addr, int size)
diff --git a/src/mem/ruby/filters/BlockBloomFilter.cc b/src/mem/ruby/filters/BlockBloomFilter.cc
index a453c37..9587fa9 100644
--- a/src/mem/ruby/filters/BlockBloomFilter.cc
+++ b/src/mem/ruby/filters/BlockBloomFilter.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/filters/BlockBloomFilter.hh"
+
#include "base/intmath.hh"
#include "base/str.hh"
-#include "mem/ruby/filters/BlockBloomFilter.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc b/src/mem/ruby/filters/BulkBloomFilter.cc
index f634b13..3bd2b4d 100644
--- a/src/mem/ruby/filters/BulkBloomFilter.cc
+++ b/src/mem/ruby/filters/BulkBloomFilter.cc
@@ -26,11 +26,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/filters/BulkBloomFilter.hh"
+
#include <cassert>
#include "base/intmath.hh"
#include "base/str.hh"
-#include "mem/ruby/filters/BulkBloomFilter.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/filters/H3BloomFilter.cc b/src/mem/ruby/filters/H3BloomFilter.cc
index a9a0cdc..10dc4d2 100644
--- a/src/mem/ruby/filters/H3BloomFilter.cc
+++ b/src/mem/ruby/filters/H3BloomFilter.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "base/intmath.hh"
#include "mem/ruby/filters/H3BloomFilter.hh"
+#include "base/intmath.hh"
+
using namespace std;
static int H3[64][16] = {
diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
index eaac5c4..e8050b1 100644
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc
@@ -26,8 +26,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "base/intmath.hh"
#include "mem/ruby/filters/LSB_CountingBloomFilter.hh"
+
+#include "base/intmath.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
index 4cbf25f..5faaa10 100644
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc
@@ -26,11 +26,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/filters/MultiBitSelBloomFilter.hh"
+
#include <vector>
#include "base/intmath.hh"
#include "base/str.hh"
-#include "mem/ruby/filters/MultiBitSelBloomFilter.hh"
using namespace std;
diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
index 0226a29..c1d558c 100644
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/filters/MultiGrainBloomFilter.hh"
+
#include "base/intmath.hh"
#include "base/str.hh"
-#include "mem/ruby/filters/MultiGrainBloomFilter.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.cc b/src/mem/ruby/filters/NonCountingBloomFilter.cc
index fe76f7c..15b1697 100644
--- a/src/mem/ruby/filters/NonCountingBloomFilter.cc
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/filters/NonCountingBloomFilter.hh"
+
#include "base/intmath.hh"
#include "base/str.hh"
-#include "mem/ruby/filters/NonCountingBloomFilter.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc
index b96b005..d7e1d03 100644
--- a/src/mem/ruby/network/MessageBuffer.cc
+++ b/src/mem/ruby/network/MessageBuffer.cc
@@ -26,6 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/network/MessageBuffer.hh"
+
#include <cassert>
#include "base/cprintf.hh"
@@ -33,7 +35,6 @@
#include "base/random.hh"
#include "base/stl_helpers.hh"
#include "debug/RubyQueue.hh"
-#include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc
index 721dbba..e9b28a7 100644
--- a/src/mem/ruby/network/Network.cc
+++ b/src/mem/ruby/network/Network.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/network/Network.hh"
+
#include "base/misc.hh"
#include "mem/ruby/network/BasicLink.hh"
-#include "mem/ruby/network/Network.hh"
#include "mem/ruby/system/RubySystem.hh"
uint32_t Network::m_virtual_networks;
diff --git a/src/mem/ruby/network/Topology.cc b/src/mem/ruby/network/Topology.cc
index c18f379..f7afffd 100644
--- a/src/mem/ruby/network/Topology.cc
+++ b/src/mem/ruby/network/Topology.cc
@@ -26,13 +26,15 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/network/Topology.hh"
+
#include <cassert>
#include "base/trace.hh"
#include "debug/RubyNetwork.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/BasicLink.hh"
-#include "mem/ruby/network/Topology.hh"
+#include "mem/ruby/network/Network.hh"
#include "mem/ruby/slicc_interface/AbstractController.hh"
using namespace std;
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc
index 027c8ba..156b96d 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.cc
+++ b/src/mem/ruby/network/simple/PerfectSwitch.cc
@@ -26,13 +26,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+
#include <algorithm>
#include "base/cast.hh"
#include "base/random.hh"
#include "debug/RubyNetwork.hh"
#include "mem/ruby/network/MessageBuffer.hh"
-#include "mem/ruby/network/simple/PerfectSwitch.hh"
#include "mem/ruby/network/simple/SimpleNetwork.hh"
#include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/slicc_interface/Message.hh"
diff --git a/src/mem/ruby/network/simple/PerfectSwitch.hh b/src/mem/ruby/network/simple/PerfectSwitch.hh
index 1cc9869..12d5e46 100644
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh
@@ -41,6 +41,7 @@
#include <vector>
#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/TypeDefines.hh"
class MessageBuffer;
class NetDest;
diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc
index 1652ae7..56f948f 100644
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc
@@ -26,6 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+
#include <cassert>
#include <numeric>
@@ -34,7 +36,6 @@
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/network/simple/SimpleLink.hh"
-#include "mem/ruby/network/simple/SimpleNetwork.hh"
#include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/network/simple/Throttle.hh"
#include "mem/ruby/profiler/Profiler.hh"
diff --git a/src/mem/ruby/network/simple/Switch.cc b/src/mem/ruby/network/simple/Switch.cc
index 78f5b60..7cc635d 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -26,6 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/network/simple/Switch.hh"
+
#include <numeric>
#include "base/cast.hh"
@@ -33,7 +35,6 @@
#include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/network/simple/PerfectSwitch.hh"
#include "mem/ruby/network/simple/SimpleNetwork.hh"
-#include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/network/simple/Throttle.hh"
using namespace std;
diff --git a/src/mem/ruby/network/simple/Throttle.cc b/src/mem/ruby/network/simple/Throttle.cc
index 3863ab9..5ed918c 100644
--- a/src/mem/ruby/network/simple/Throttle.cc
+++ b/src/mem/ruby/network/simple/Throttle.cc
@@ -26,15 +26,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/network/simple/Throttle.hh"
+
#include <cassert>
#include "base/cast.hh"
#include "base/cprintf.hh"
#include "debug/RubyNetwork.hh"
-#include "mem/ruby/network/simple/Switch.hh"
-#include "mem/ruby/network/simple/Throttle.hh"
#include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/slicc_interface/Message.hh"
#include "mem/ruby/system/RubySystem.hh"
diff --git a/src/mem/ruby/profiler/AccessTraceForAddress.cc b/src/mem/ruby/profiler/AccessTraceForAddress.cc
index dc5f1ac..5822766 100644
--- a/src/mem/ruby/profiler/AccessTraceForAddress.cc
+++ b/src/mem/ruby/profiler/AccessTraceForAddress.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "mem/ruby/common/Histogram.hh"
#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/ruby/common/Histogram.hh"
+
AccessTraceForAddress::~AccessTraceForAddress()
{
if (m_histogram_ptr) {
diff --git a/src/mem/ruby/profiler/AddressProfiler.cc b/src/mem/ruby/profiler/AddressProfiler.cc
index 52c6933..087b774 100644
--- a/src/mem/ruby/profiler/AddressProfiler.cc
+++ b/src/mem/ruby/profiler/AddressProfiler.cc
@@ -26,11 +26,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/profiler/AddressProfiler.hh"
+
#include <vector>
#include "base/stl_helpers.hh"
#include "mem/protocol/RubyRequest.hh"
-#include "mem/ruby/profiler/AddressProfiler.hh"
#include "mem/ruby/profiler/Profiler.hh"
using namespace std;
diff --git a/src/mem/ruby/profiler/StoreTrace.cc b/src/mem/ruby/profiler/StoreTrace.cc
index c3c1f8a..9db1d48 100644
--- a/src/mem/ruby/profiler/StoreTrace.cc
+++ b/src/mem/ruby/profiler/StoreTrace.cc
@@ -27,6 +27,7 @@
*/
#include "mem/ruby/profiler/StoreTrace.hh"
+
#include "sim/core.hh"
using namespace std;
diff --git a/src/mem/ruby/slicc_interface/AbstractController.cc b/src/mem/ruby/slicc_interface/AbstractController.cc
index f737707..19dca90 100644
--- a/src/mem/ruby/slicc_interface/AbstractController.cc
+++ b/src/mem/ruby/slicc_interface/AbstractController.cc
@@ -30,9 +30,10 @@
#include "debug/RubyQueue.hh"
#include "mem/protocol/MemoryMsg.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/system/GPUCoalescer.hh"
#include "mem/ruby/system/RubySystem.hh"
#include "mem/ruby/system/Sequencer.hh"
-#include "mem/ruby/system/GPUCoalescer.hh"
#include "sim/system.hh"
AbstractController::AbstractController(const Params *p)
diff --git a/src/mem/ruby/slicc_interface/AbstractController.hh b/src/mem/ruby/slicc_interface/AbstractController.hh
index 6f49e5e..e456214 100644
--- a/src/mem/ruby/slicc_interface/AbstractController.hh
+++ b/src/mem/ruby/slicc_interface/AbstractController.hh
@@ -41,7 +41,6 @@
#include "mem/ruby/common/Histogram.hh"
#include "mem/ruby/common/MachineID.hh"
#include "mem/ruby/network/MessageBuffer.hh"
-#include "mem/ruby/network/Network.hh"
#include "mem/ruby/system/CacheRecorder.hh"
#include "mem/packet.hh"
#include "mem/qport.hh"
diff --git a/src/mem/ruby/slicc_interface/RubyRequest.cc b/src/mem/ruby/slicc_interface/RubyRequest.cc
index c4c5b2f..dd26ad6 100644
--- a/src/mem/ruby/slicc_interface/RubyRequest.cc
+++ b/src/mem/ruby/slicc_interface/RubyRequest.cc
@@ -26,10 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <iostream>
-
#include "mem/ruby/slicc_interface/RubyRequest.hh"
+#include <iostream>
+
using namespace std;
void
diff --git a/src/mem/ruby/structures/BankedArray.cc b/src/mem/ruby/structures/BankedArray.cc
index 5054eae..091bcbd 100644
--- a/src/mem/ruby/structures/BankedArray.cc
+++ b/src/mem/ruby/structures/BankedArray.cc
@@ -29,8 +29,9 @@
*
*/
-#include "base/intmath.hh"
#include "mem/ruby/structures/BankedArray.hh"
+
+#include "base/intmath.hh"
#include "mem/ruby/system/RubySystem.hh"
BankedArray::BankedArray(unsigned int banks, Cycles accessLatency,
diff --git a/src/mem/ruby/structures/CacheMemory.cc b/src/mem/ruby/structures/CacheMemory.cc
index 36d1097..8d99c90 100644
--- a/src/mem/ruby/structures/CacheMemory.cc
+++ b/src/mem/ruby/structures/CacheMemory.cc
@@ -27,13 +27,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/structures/CacheMemory.hh"
+
#include "base/intmath.hh"
#include "debug/RubyCache.hh"
#include "debug/RubyCacheTrace.hh"
#include "debug/RubyResourceStalls.hh"
#include "debug/RubyStats.hh"
#include "mem/protocol/AccessPermission.hh"
-#include "mem/ruby/structures/CacheMemory.hh"
#include "mem/ruby/system/RubySystem.hh"
#include "mem/ruby/system/WeightedLRUPolicy.hh"
diff --git a/src/mem/ruby/structures/DirectoryMemory.cc b/src/mem/ruby/structures/DirectoryMemory.cc
index 8aad6f4..f79382c 100644
--- a/src/mem/ruby/structures/DirectoryMemory.cc
+++ b/src/mem/ruby/structures/DirectoryMemory.cc
@@ -26,11 +26,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/structures/DirectoryMemory.hh"
+
#include "base/intmath.hh"
#include "debug/RubyCache.hh"
#include "debug/RubyStats.hh"
#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
-#include "mem/ruby/structures/DirectoryMemory.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/structures/LRUPolicy.cc b/src/mem/ruby/structures/LRUPolicy.cc
index 1c49902..3b6d917 100644
--- a/src/mem/ruby/structures/LRUPolicy.cc
+++ b/src/mem/ruby/structures/LRUPolicy.cc
@@ -30,8 +30,6 @@
#include "mem/ruby/structures/LRUPolicy.hh"
-
-
LRUPolicy::LRUPolicy(const Params * p)
: AbstractReplacementPolicy(p)
{
diff --git a/src/mem/ruby/structures/Prefetcher.cc b/src/mem/ruby/structures/Prefetcher.cc
index eef51dc..df8fdfc 100644
--- a/src/mem/ruby/structures/Prefetcher.cc
+++ b/src/mem/ruby/structures/Prefetcher.cc
@@ -26,9 +26,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/structures/Prefetcher.hh"
+
#include "debug/RubyPrefetcher.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
-#include "mem/ruby/structures/Prefetcher.hh"
#include "mem/ruby/system/RubySystem.hh"
Prefetcher*
diff --git a/src/mem/ruby/structures/PseudoLRUPolicy.cc b/src/mem/ruby/structures/PseudoLRUPolicy.cc
index 954e744..e423bb5 100644
--- a/src/mem/ruby/structures/PseudoLRUPolicy.cc
+++ b/src/mem/ruby/structures/PseudoLRUPolicy.cc
@@ -30,8 +30,6 @@
#include "mem/ruby/structures/PseudoLRUPolicy.hh"
-
-
PseudoLRUPolicy::PseudoLRUPolicy(const Params * p)
: AbstractReplacementPolicy(p)
{
diff --git a/src/mem/ruby/structures/WireBuffer.cc b/src/mem/ruby/structures/WireBuffer.cc
index c46aea0..15398d8 100644
--- a/src/mem/ruby/structures/WireBuffer.cc
+++ b/src/mem/ruby/structures/WireBuffer.cc
@@ -29,12 +29,13 @@
*
*/
+#include "mem/ruby/structures/WireBuffer.hh"
+
#include <algorithm>
#include <functional>
#include "base/cprintf.hh"
#include "base/stl_helpers.hh"
-#include "mem/ruby/structures/WireBuffer.hh"
#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff --git a/src/mem/ruby/system/CacheRecorder.cc b/src/mem/ruby/system/CacheRecorder.cc
index 78d6939..83e8a70 100644
--- a/src/mem/ruby/system/CacheRecorder.cc
+++ b/src/mem/ruby/system/CacheRecorder.cc
@@ -27,8 +27,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "debug/RubyCacheTrace.hh"
#include "mem/ruby/system/CacheRecorder.hh"
+
+#include "debug/RubyCacheTrace.hh"
#include "mem/ruby/system/RubySystem.hh"
#include "mem/ruby/system/Sequencer.hh"
diff --git a/src/mem/ruby/system/DMASequencer.cc b/src/mem/ruby/system/DMASequencer.cc
index 58714ab..0ad8a20 100644
--- a/src/mem/ruby/system/DMASequencer.cc
+++ b/src/mem/ruby/system/DMASequencer.cc
@@ -26,13 +26,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/system/DMASequencer.hh"
+
#include <memory>
#include "debug/RubyDma.hh"
#include "debug/RubyStats.hh"
#include "mem/protocol/SequencerMsg.hh"
#include "mem/protocol/SequencerRequestType.hh"
-#include "mem/ruby/system/DMASequencer.hh"
#include "mem/ruby/system/RubySystem.hh"
DMARequest::DMARequest(uint64_t start_paddr, int len, bool write,
diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc
index 7f0e6f8..5b94f80 100644
--- a/src/mem/ruby/system/RubyPort.cc
+++ b/src/mem/ruby/system/RubyPort.cc
@@ -39,13 +39,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/system/RubyPort.hh"
+
#include "cpu/testers/rubytest/RubyTester.hh"
#include "debug/Config.hh"
#include "debug/Drain.hh"
#include "debug/Ruby.hh"
#include "mem/protocol/AccessPermission.hh"
#include "mem/ruby/slicc_interface/AbstractController.hh"
-#include "mem/ruby/system/RubyPort.hh"
#include "mem/simple_mem.hh"
#include "sim/full_system.hh"
#include "sim/system.hh"
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 982c1c8..7fdd526 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -26,6 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/system/Sequencer.hh"
+
#include "arch/x86/ldstflags.hh"
#include "base/misc.hh"
#include "base/str.hh"
@@ -34,13 +36,12 @@
#include "debug/ProtocolTrace.hh"
#include "debug/RubySequencer.hh"
#include "debug/RubyStats.hh"
+#include "mem/packet.hh"
#include "mem/protocol/PrefetchBit.hh"
#include "mem/protocol/RubyAccessMode.hh"
#include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/slicc_interface/RubyRequest.hh"
#include "mem/ruby/system/RubySystem.hh"
-#include "mem/ruby/system/Sequencer.hh"
-#include "mem/packet.hh"
#include "sim/system.hh"
using namespace std;
diff --git a/src/mem/se_translating_port_proxy.cc b/src/mem/se_translating_port_proxy.cc
index 7dfeb93..6c5191c 100644
--- a/src/mem/se_translating_port_proxy.cc
+++ b/src/mem/se_translating_port_proxy.cc
@@ -42,13 +42,14 @@
* Andreas Hansson
*/
+#include "mem/se_translating_port_proxy.hh"
+
#include <string>
#include "arch/isa_traits.hh"
#include "base/chunk_generator.hh"
#include "config/the_isa.hh"
#include "mem/page_table.hh"
-#include "mem/se_translating_port_proxy.hh"
#include "sim/process.hh"
#include "sim/system.hh"
diff --git a/src/mem/serial_link.cc b/src/mem/serial_link.cc
index 25f5291..ee21163 100644
--- a/src/mem/serial_link.cc
+++ b/src/mem/serial_link.cc
@@ -56,7 +56,6 @@
#include "debug/SerialLink.hh"
#include "params/SerialLink.hh"
-
SerialLink::SerialLinkSlavePort::SerialLinkSlavePort(const std::string& _name,
SerialLink& _serial_link,
SerialLinkMasterPort& _masterPort,
diff --git a/src/mem/simple_mem.cc b/src/mem/simple_mem.cc
index bb44b8c..f3a01b5 100644
--- a/src/mem/simple_mem.cc
+++ b/src/mem/simple_mem.cc
@@ -42,8 +42,9 @@
* Andreas Hansson
*/
-#include "base/random.hh"
#include "mem/simple_mem.hh"
+
+#include "base/random.hh"
#include "debug/Drain.hh"
using namespace std;
diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py
index 3f88d83..817ddb4 100644
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -470,6 +470,7 @@
#include "mem/protocol/${ident}_Event.hh"
#include "mem/protocol/${ident}_State.hh"
#include "mem/protocol/Types.hh"
+#include "mem/ruby/network/Network.hh"
#include "mem/ruby/system/RubySystem.hh"
''')
diff --git a/src/mem/snoop_filter.cc b/src/mem/snoop_filter.cc
index eb500cf..e8f4495 100755
--- a/src/mem/snoop_filter.cc
+++ b/src/mem/snoop_filter.cc
@@ -42,10 +42,11 @@
* Implementation of a snoop filter.
*/
+#include "mem/snoop_filter.hh"
+
#include "base/misc.hh"
#include "base/trace.hh"
#include "debug/SnoopFilter.hh"
-#include "mem/snoop_filter.hh"
#include "sim/system.hh"
void
diff --git a/src/mem/tport.cc b/src/mem/tport.cc
index b80c2d9..fce4f6c 100644
--- a/src/mem/tport.cc
+++ b/src/mem/tport.cc
@@ -41,9 +41,10 @@
* Andreas Hansson
*/
-#include "mem/mem_object.hh"
#include "mem/tport.hh"
+#include "mem/mem_object.hh"
+
SimpleTimingPort::SimpleTimingPort(const std::string& _name,
MemObject* _owner) :
QueuedSlavePort(_name, _owner, queueImpl), queueImpl(*_owner, *this)
diff --git a/src/mem/xbar.cc b/src/mem/xbar.cc
index 416b029..0354619 100644
--- a/src/mem/xbar.cc
+++ b/src/mem/xbar.cc
@@ -47,12 +47,13 @@
* Definition of a crossbar object.
*/
+#include "mem/xbar.hh"
+
#include "base/misc.hh"
#include "base/trace.hh"
#include "debug/AddrRanges.hh"
#include "debug/Drain.hh"
#include "debug/XBar.hh"
-#include "mem/xbar.hh"
BaseXBar::BaseXBar(const BaseXBarParams *p)
: MemObject(p),
diff --git a/src/proto/protoio.cc b/src/proto/protoio.cc
index 70e3fcb..a666726 100644
--- a/src/proto/protoio.cc
+++ b/src/proto/protoio.cc
@@ -37,9 +37,10 @@
* Authors: Andreas Hansson
*/
-#include "base/misc.hh"
#include "proto/protoio.hh"
+#include "base/misc.hh"
+
using namespace std;
using namespace google::protobuf;
diff --git a/src/python/swig/pyevent.cc b/src/python/swig/pyevent.cc
index d83d57c..24760fc 100644
--- a/src/python/swig/pyevent.cc
+++ b/src/python/swig/pyevent.cc
@@ -28,9 +28,10 @@
* Authors: Nathan Binkert
*/
+#include "python/swig/pyevent.hh"
+
#include <Python.h>
-#include "python/swig/pyevent.hh"
#include "sim/async.hh"
#include "sim/eventq.hh"
diff --git a/src/python/swig/pyevent.hh b/src/python/swig/pyevent.hh
index f668c1d..270fc38 100644
--- a/src/python/swig/pyevent.hh
+++ b/src/python/swig/pyevent.hh
@@ -32,6 +32,7 @@
#define __PYTHON_SWIG_PYEVENT_HH__
#include "sim/eventq.hh"
+#include "sim/init.hh"
#include "sim/sim_events.hh"
class PythonEvent : public Event
diff --git a/src/python/swig/pyobject.cc b/src/python/swig/pyobject.cc
index dc3a486..07a2ef8 100644
--- a/src/python/swig/pyobject.cc
+++ b/src/python/swig/pyobject.cc
@@ -35,13 +35,16 @@
#include "base/inifile.hh"
#include "base/output.hh"
#include "config/the_isa.hh"
+
#if THE_ISA != NULL_ISA
#include "dev/net/etherdevice.hh"
#include "dev/net/etherobject.hh"
+
#endif
-#include "mem/ruby/slicc_interface/AbstractController.hh"
-#include "mem/mem_object.hh"
#include "python/swig/pyobject.hh"
+
+#include "mem/mem_object.hh"
+#include "mem/ruby/slicc_interface/AbstractController.hh"
#include "sim/full_system.hh"
#include "sim/sim_object.hh"
diff --git a/src/sim/arguments.cc b/src/sim/arguments.cc
index 6d45e3b..5d6ded9 100644
--- a/src/sim/arguments.cc
+++ b/src/sim/arguments.cc
@@ -28,10 +28,11 @@
* Authors: Nathan Binkert
*/
+#include "sim/arguments.hh"
+
#include "arch/utility.hh"
#include "config/the_isa.hh"
#include "cpu/thread_context.hh"
-#include "sim/arguments.hh"
Arguments::Data::~Data()
{
diff --git a/src/sim/backtrace_glibc.cc b/src/sim/backtrace_glibc.cc
index 584f9f3..a2958a6 100644
--- a/src/sim/backtrace_glibc.cc
+++ b/src/sim/backtrace_glibc.cc
@@ -37,12 +37,11 @@
* Authors: Andreas Sandberg
*/
-#include "sim/backtrace.hh"
-
#include <execinfo.h>
#include <unistd.h>
#include "base/atomicio.hh"
+#include "sim/backtrace.hh"
#define SAFE_MSG(m) \
do { \
diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc
index 9865c4d..5b05ced 100644
--- a/src/sim/clock_domain.cc
+++ b/src/sim/clock_domain.cc
@@ -42,6 +42,8 @@
* Stephan Diestelhorst
*/
+#include "sim/clock_domain.hh"
+
#include <algorithm>
#include <functional>
@@ -49,9 +51,8 @@
#include "params/ClockDomain.hh"
#include "params/DerivedClockDomain.hh"
#include "params/SrcClockDomain.hh"
-#include "sim/clock_domain.hh"
-#include "sim/voltage_domain.hh"
#include "sim/clocked_object.hh"
+#include "sim/voltage_domain.hh"
void
ClockDomain::regStats()
diff --git a/src/sim/core.cc b/src/sim/core.cc
index 1333c8b..279012f 100644
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -31,12 +31,13 @@
* Steve Reinhardt
*/
+#include "sim/core.hh"
+
#include <iostream>
#include <string>
#include "base/callback.hh"
#include "base/output.hh"
-#include "sim/core.hh"
#include "sim/eventq.hh"
using namespace std;
diff --git a/src/sim/cxx_manager.cc b/src/sim/cxx_manager.cc
index e0b209a..a679c61 100644
--- a/src/sim/cxx_manager.cc
+++ b/src/sim/cxx_manager.cc
@@ -37,13 +37,14 @@
* Authors: Andrew Bardsley
*/
+#include "sim/cxx_manager.hh"
+
#include <cstdlib>
#include <sstream>
#include "base/str.hh"
#include "debug/CxxConfig.hh"
#include "mem/mem_object.hh"
-#include "sim/cxx_manager.hh"
#include "sim/serialize.hh"
CxxConfigManager::CxxConfigManager(CxxConfigFileBase &configFile_) :
diff --git a/src/sim/debug.cc b/src/sim/debug.cc
index 9fab751..b8291c8 100644
--- a/src/sim/debug.cc
+++ b/src/sim/debug.cc
@@ -29,16 +29,17 @@
* Steve Reinhardt
*/
+#include "sim/debug.hh"
+
#include <string>
#include <vector>
#include "base/debug.hh"
-#include "sim/debug.hh"
+#include "cpu/pc_event.hh"
#include "sim/eventq_impl.hh"
#include "sim/global_event.hh"
#include "sim/sim_events.hh"
#include "sim/sim_exit.hh"
-#include "cpu/pc_event.hh"
#include "sim/system.hh"
using namespace std;
diff --git a/src/sim/dvfs_handler.cc b/src/sim/dvfs_handler.cc
index f11e3f1..254720c 100644
--- a/src/sim/dvfs_handler.cc
+++ b/src/sim/dvfs_handler.cc
@@ -39,6 +39,8 @@
* Stephan Diestelhorst
*/
+#include "sim/dvfs_handler.hh"
+
#include <set>
#include <utility>
@@ -46,7 +48,6 @@
#include "debug/DVFS.hh"
#include "params/DVFSHandler.hh"
#include "sim/clock_domain.hh"
-#include "sim/dvfs_handler.hh"
#include "sim/stat_control.hh"
#include "sim/voltage_domain.hh"
diff --git a/src/sim/faults.cc b/src/sim/faults.cc
index abcad6d..93e7665 100644
--- a/src/sim/faults.cc
+++ b/src/sim/faults.cc
@@ -29,13 +29,14 @@
* Gabe Black
*/
+#include "sim/faults.hh"
+
#include "arch/isa_traits.hh"
#include "base/misc.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "debug/Fault.hh"
#include "mem/page_table.hh"
-#include "sim/faults.hh"
#include "sim/full_system.hh"
#include "sim/process.hh"
diff --git a/src/sim/init.cc b/src/sim/init.cc
index 2e1dd62..d46e763 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -41,6 +41,8 @@
* Authors: Nathan Binkert
*/
+#include "sim/init.hh"
+
#include <Python.h>
#include <marshal.h>
@@ -56,10 +58,10 @@
#include "config/have_protobuf.hh"
#include "sim/async.hh"
#include "sim/core.hh"
-#include "sim/init.hh"
#if HAVE_PROTOBUF
#include <google/protobuf/stubs/common.h>
+
#endif
using namespace std;
diff --git a/src/sim/probe/probe.cc b/src/sim/probe/probe.cc
index 600d9dc..5f20f78 100644
--- a/src/sim/probe/probe.cc
+++ b/src/sim/probe/probe.cc
@@ -37,9 +37,10 @@
* Authors: Matt Horsnell
*/
-#include "debug/ProbeVerbose.hh"
#include "sim/probe/probe.hh"
+#include "debug/ProbeVerbose.hh"
+
ProbePoint::ProbePoint(ProbeManager *manager, const std::string& _name)
: name(_name)
{
diff --git a/src/sim/process.cc b/src/sim/process.cc
index ef3ab9e..1272949 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -43,6 +43,8 @@
* Ali Saidi
*/
+#include "sim/process.hh"
+
#include <fcntl.h>
#include <unistd.h>
@@ -50,19 +52,18 @@
#include <map>
#include <string>
+#include "base/intmath.hh"
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
-#include "base/intmath.hh"
#include "base/statistics.hh"
#include "config/the_isa.hh"
#include "cpu/thread_context.hh"
-#include "mem/page_table.hh"
#include "mem/multi_level_page_table.hh"
+#include "mem/page_table.hh"
#include "mem/se_translating_port_proxy.hh"
#include "params/LiveProcess.hh"
#include "params/Process.hh"
#include "sim/debug.hh"
-#include "sim/process.hh"
#include "sim/process_impl.hh"
#include "sim/stats.hh"
#include "sim/syscall_emul.hh"
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index eed3327..8c2d26b 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -41,6 +41,8 @@
* Authors: Nathan Binkert
*/
+#include "sim/pseudo_inst.hh"
+
#include <fcntl.h>
#include <unistd.h>
@@ -50,9 +52,9 @@
#include <vector>
#include "arch/kernel_stats.hh"
+#include "arch/pseudo_inst.hh"
#include "arch/utility.hh"
#include "arch/vtophys.hh"
-#include "arch/pseudo_inst.hh"
#include "base/debug.hh"
#include "base/output.hh"
#include "config/the_isa.hh"
@@ -68,7 +70,6 @@
#include "sim/full_system.hh"
#include "sim/initparam_keys.hh"
#include "sim/process.hh"
-#include "sim/pseudo_inst.hh"
#include "sim/serialize.hh"
#include "sim/sim_events.hh"
#include "sim/sim_exit.hh"
diff --git a/src/sim/py_interact.cc b/src/sim/py_interact.cc
index 7e6527e..8acff40 100644
--- a/src/sim/py_interact.cc
+++ b/src/sim/py_interact.cc
@@ -29,10 +29,10 @@
* Steve Reinhardt
*/
-#include <Python.h>
-
#include "sim/py_interact.hh"
+#include <Python.h>
+
void
py_interact()
{
diff --git a/src/sim/root.cc b/src/sim/root.cc
index 7647ca5..6787564 100644
--- a/src/sim/root.cc
+++ b/src/sim/root.cc
@@ -31,12 +31,13 @@
* Gabe Black
*/
+#include "sim/root.hh"
+
#include "base/misc.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "debug/TimeSync.hh"
#include "sim/full_system.hh"
-#include "sim/root.hh"
Root *Root::_root = NULL;
diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc
index d2e699c..f06aaf8 100644
--- a/src/sim/serialize.cc
+++ b/src/sim/serialize.cc
@@ -45,6 +45,8 @@
* Andreas Sandberg
*/
+#include "sim/serialize.hh"
+
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
@@ -63,7 +65,6 @@
#include "base/trace.hh"
#include "debug/Checkpoint.hh"
#include "sim/eventq.hh"
-#include "sim/serialize.hh"
#include "sim/sim_events.hh"
#include "sim/sim_exit.hh"
#include "sim/sim_object.hh"
diff --git a/src/sim/sim_events.cc b/src/sim/sim_events.cc
index cfd08f7..23da8fd 100644
--- a/src/sim/sim_events.cc
+++ b/src/sim/sim_events.cc
@@ -42,12 +42,13 @@
* Authors: Nathan Binkert
*/
+#include "sim/sim_events.hh"
+
#include <string>
#include "base/callback.hh"
#include "base/hostinfo.hh"
#include "sim/eventq_impl.hh"
-#include "sim/sim_events.hh"
#include "sim/sim_exit.hh"
#include "sim/stats.hh"
diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index af0ef3c..0ccc36b 100644
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -30,6 +30,8 @@
* Nathan Binkert
*/
+#include "sim/sim_object.hh"
+
#include <cassert>
#include "base/callback.hh"
@@ -40,7 +42,6 @@
#include "base/types.hh"
#include "debug/Checkpoint.hh"
#include "sim/probe/probe.hh"
-#include "sim/sim_object.hh"
#include "sim/stats.hh"
using namespace std;
diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc
index e0b80bb..c6eb2dd 100644
--- a/src/sim/simulate.cc
+++ b/src/sim/simulate.cc
@@ -31,6 +31,8 @@
* Steve Reinhardt
*/
+#include "sim/simulate.hh"
+
#include <mutex>
#include <thread>
@@ -41,7 +43,6 @@
#include "sim/eventq_impl.hh"
#include "sim/sim_events.hh"
#include "sim/sim_exit.hh"
-#include "sim/simulate.hh"
#include "sim/stat_control.hh"
//! Mutex for handling async events.
diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index 75e717b..6324b36 100644
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -46,6 +46,8 @@
// This file will contain default statistics for the simulator that
// don't really belong to a specific simulator object
+#include "sim/stat_control.hh"
+
#include <fstream>
#include <iostream>
#include <list>
@@ -56,7 +58,6 @@
#include "base/time.hh"
#include "cpu/base.hh"
#include "sim/global_event.hh"
-#include "sim/stat_control.hh"
using namespace std;
diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 889a983..73961e8 100644
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -44,6 +44,9 @@
#ifndef __SIM_STAT_CONTROL_HH__
#define __SIM_STAT_CONTROL_HH__
+#include "base/types.hh"
+#include "sim/core.hh"
+
namespace Stats {
double statElapsedTime();
diff --git a/src/sim/sub_system.cc b/src/sim/sub_system.cc
index 8fc930b..2ccdc6b 100644
--- a/src/sim/sub_system.cc
+++ b/src/sim/sub_system.cc
@@ -40,7 +40,6 @@
#include "sim/sub_system.hh"
#include "params/SubSystem.hh"
-#include "sim/sub_system.hh"
#include "sim/power/power_model.hh"
#include "sim/power/thermal_domain.hh"
diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index 9c3f50b..499cd25 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -29,6 +29,8 @@
* Ali Saidi
*/
+#include "sim/syscall_emul.hh"
+
#include <fcntl.h>
#include <unistd.h>
@@ -47,7 +49,6 @@
#include "mem/page_table.hh"
#include "sim/process.hh"
#include "sim/sim_exit.hh"
-#include "sim/syscall_emul.hh"
#include "sim/system.hh"
using namespace std;
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 9f240c9..c0fb083 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -45,6 +45,8 @@
* Rick Strong
*/
+#include "sim/system.hh"
+
#include "arch/remote_gdb.hh"
#include "arch/utility.hh"
#include "base/loader/object_file.hh"
@@ -60,7 +62,6 @@
#include "sim/byteswap.hh"
#include "sim/debug.hh"
#include "sim/full_system.hh"
-#include "sim/system.hh"
/**
* To avoid linking errors with LTO, only include the header if we
@@ -68,6 +69,7 @@
*/
#if THE_ISA != NULL_ISA
#include "kern/kernel_stats.hh"
+
#endif
using namespace std;
diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc
index 61715df..0c5b65d 100644
--- a/src/sim/voltage_domain.cc
+++ b/src/sim/voltage_domain.cc
@@ -38,13 +38,14 @@
* Akash Bagdia
*/
+#include "sim/voltage_domain.hh"
+
#include <algorithm>
#include "base/statistics.hh"
#include "debug/VoltageDomain.hh"
#include "params/VoltageDomain.hh"
#include "sim/sim_object.hh"
-#include "sim/voltage_domain.hh"
VoltageDomain::VoltageDomain(const Params *p)
: SimObject(p), voltageOpPoints(p->voltage), _perfLevel(0)
diff --git a/src/unittest/circlebuf.cc b/src/unittest/circlebuf.cc
index 887d2c0..13f8f70 100644
--- a/src/unittest/circlebuf.cc
+++ b/src/unittest/circlebuf.cc
@@ -38,7 +38,6 @@
*/
#include "base/circlebuf.hh"
-
#include "unittest/unittest.hh"
const char data[] = {
diff --git a/src/unittest/unittest.cc b/src/unittest/unittest.cc
index 36038d6..0cac20e 100644
--- a/src/unittest/unittest.cc
+++ b/src/unittest/unittest.cc
@@ -28,10 +28,11 @@
* Authors: Gabe Black
*/
+#include "unittest/unittest.hh"
+
#include <cstdlib>
#include "base/cprintf.hh"
-#include "unittest/unittest.hh"
namespace {
