From 39a055645f77e0fa7bf49406635dba6bd65e361f Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 15 Apr 2011 10:44:06 -0700 Subject: includes: sort all includes --- src/arch/alpha/faults.cc | 6 +++--- src/arch/alpha/isa.hh | 5 ++--- src/arch/alpha/isa/main.isa | 12 ++++++------ src/arch/alpha/linux/system.cc | 8 ++++---- src/arch/alpha/mt.hh | 6 +++--- src/arch/alpha/process.cc | 2 +- src/arch/alpha/remote_gdb.cc | 4 ++-- src/arch/alpha/remote_gdb.hh | 6 +++--- src/arch/alpha/tlb.cc | 2 +- src/arch/alpha/tru64/process.cc | 2 +- src/arch/alpha/types.hh | 2 +- src/arch/alpha/utility.hh | 2 +- src/arch/arm/faults.cc | 4 ++-- src/arch/arm/faults.hh | 2 +- src/arch/arm/insts/macromem.cc | 3 ++- src/arch/arm/insts/static_inst.cc | 4 ++-- src/arch/arm/insts/vfp.hh | 6 ++++-- src/arch/arm/intregs.hh | 2 +- src/arch/arm/isa/includes.isa | 8 ++++---- src/arch/arm/linux/atag.hh | 1 + src/arch/arm/linux/linux.cc | 4 ++-- src/arch/arm/linux/process.cc | 2 -- src/arch/arm/linux/process.hh | 1 - src/arch/arm/linux/system.cc | 2 +- src/arch/arm/locked_mem.hh | 1 - src/arch/arm/pagetable.hh | 1 - src/arch/arm/predecoder.hh | 2 +- src/arch/arm/process.hh | 1 + src/arch/arm/registers.hh | 2 +- src/arch/arm/remote_gdb.cc | 10 +++++----- src/arch/arm/system.cc | 3 ++- src/arch/arm/system.hh | 2 +- src/arch/arm/table_walker.cc | 2 +- src/arch/arm/table_walker.hh | 1 - src/arch/arm/tlb.hh | 2 +- src/arch/arm/vtophys.hh | 1 - src/arch/generic/debugfaults.hh | 4 ++-- src/arch/generic/types.hh | 2 +- src/arch/mips/dsp.cc | 6 +++--- src/arch/mips/dsp.hh | 2 +- src/arch/mips/isa.cc | 2 +- src/arch/mips/isa.hh | 2 +- src/arch/mips/isa/includes.isa | 37 +++++++++++++++++-------------------- src/arch/mips/isa_traits.hh | 2 +- src/arch/mips/linux/linux.cc | 4 ++-- src/arch/mips/linux/process.cc | 4 ++-- src/arch/mips/linux/process.hh | 2 +- src/arch/mips/linux/system.cc | 8 ++++---- src/arch/mips/mt.hh | 6 +++--- src/arch/mips/process.cc | 2 +- src/arch/mips/process.hh | 1 + src/arch/mips/system.cc | 3 +-- src/arch/mips/system.hh | 4 ++-- src/arch/mips/tlb.cc | 6 +++--- src/arch/mips/tlb.hh | 4 ++-- src/arch/mips/utility.cc | 6 +++--- src/arch/mips/utility.hh | 3 +-- src/arch/mips/vtophys.hh | 1 - src/arch/power/insts/floating.hh | 2 +- src/arch/power/insts/integer.hh | 2 +- src/arch/power/isa/includes.isa | 16 ++++++++-------- src/arch/power/linux/linux.cc | 4 ++-- src/arch/power/linux/process.cc | 2 -- src/arch/power/linux/process.hh | 1 - src/arch/power/process.hh | 1 + src/arch/power/tlb.hh | 2 +- src/arch/power/vtophys.hh | 1 - src/arch/sparc/isa.hh | 6 +++--- src/arch/sparc/isa/includes.isa | 14 +++++++------- src/arch/sparc/isa_traits.hh | 2 +- src/arch/sparc/linux/linux.cc | 3 ++- src/arch/sparc/linux/process.cc | 4 +--- src/arch/sparc/locked_mem.hh | 1 - src/arch/sparc/mmapped_ipr.hh | 3 +-- src/arch/sparc/nativetrace.cc | 2 +- src/arch/sparc/process.cc | 6 +++--- src/arch/sparc/process.hh | 1 + src/arch/sparc/remote_gdb.cc | 6 +++--- src/arch/sparc/remote_gdb.hh | 2 +- src/arch/sparc/solaris/process.cc | 4 +--- src/arch/sparc/solaris/solaris.cc | 4 ++-- src/arch/sparc/system.cc | 1 - src/arch/sparc/tlb.cc | 2 +- src/arch/sparc/tlb_map.hh | 3 ++- src/arch/sparc/types.hh | 2 +- src/arch/sparc/utility.hh | 2 +- src/arch/sparc/vtophys.cc | 4 ++-- src/arch/x86/bios/acpi.cc | 8 +++----- src/arch/x86/bios/intelmp.hh | 3 +-- src/arch/x86/emulenv.hh | 2 +- src/arch/x86/faults.hh | 4 ++-- src/arch/x86/insts/badmicroop.cc | 2 +- src/arch/x86/insts/macroop.hh | 4 ++-- src/arch/x86/insts/microfpop.cc | 3 ++- src/arch/x86/insts/microldstop.cc | 3 ++- src/arch/x86/insts/micromediaop.cc | 3 ++- src/arch/x86/interrupts.cc | 2 +- src/arch/x86/interrupts.hh | 4 ++-- src/arch/x86/isa.hh | 8 ++++---- src/arch/x86/isa/includes.isa | 16 ++++++++-------- src/arch/x86/linux/linux.cc | 3 ++- src/arch/x86/linux/process.cc | 4 +--- src/arch/x86/linux/process.hh | 2 +- src/arch/x86/linux/syscalls.cc | 2 +- src/arch/x86/linux/system.cc | 3 +-- src/arch/x86/linux/system.hh | 2 +- src/arch/x86/microcode_rom.hh | 2 +- src/arch/x86/nativetrace.cc | 4 ++-- src/arch/x86/pagetable_walker.cc | 2 +- src/arch/x86/pagetable_walker.hh | 2 +- src/arch/x86/predecoder.hh | 2 +- src/arch/x86/process.cc | 6 +++--- src/arch/x86/process.hh | 1 + src/arch/x86/registers.hh | 2 +- src/arch/x86/remote_gdb.cc | 4 ++-- src/arch/x86/system.cc | 7 +++---- src/arch/x86/tlb.cc | 8 +++----- src/arch/x86/tlb.hh | 6 +++--- 118 files changed, 222 insertions(+), 240 deletions(-) (limited to 'src/arch') diff --git a/src/arch/alpha/faults.cc b/src/arch/alpha/faults.cc index 38386cce1..4f84a151a 100644 --- a/src/arch/alpha/faults.cc +++ b/src/arch/alpha/faults.cc @@ -32,13 +32,13 @@ #include "arch/alpha/ev5.hh" #include "arch/alpha/faults.hh" #include "arch/alpha/tlb.hh" -#include "cpu/thread_context.hh" -#include "cpu/base.hh" #include "base/trace.hh" +#include "cpu/base.hh" +#include "cpu/thread_context.hh" #if !FULL_SYSTEM -#include "sim/process.hh" #include "mem/page_table.hh" +#include "sim/process.hh" #endif namespace AlphaISA { diff --git a/src/arch/alpha/isa.hh b/src/arch/alpha/isa.hh index 500bd039b..f1bfcebec 100644 --- a/src/arch/alpha/isa.hh +++ b/src/arch/alpha/isa.hh @@ -31,10 +31,9 @@ #ifndef __ARCH_ALPHA_ISA_HH__ #define __ARCH_ALPHA_ISA_HH__ -#include - -#include +#include #include +#include #include "arch/alpha/registers.hh" #include "arch/alpha/types.hh" diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa index 077520139..4b5678e81 100644 --- a/src/arch/alpha/isa/main.isa +++ b/src/arch/alpha/isa/main.isa @@ -41,16 +41,16 @@ // output header {{ -#include -#include #include +#include +#include #include "arch/alpha/faults.hh" #include "arch/alpha/types.hh" #include "config/ss_compatible_fp.hh" #include "cpu/static_inst.hh" -#include "mem/request.hh" // some constructors use MemReq flags #include "mem/packet.hh" +#include "mem/request.hh" // some constructors use MemReq flags }}; output decoder {{ @@ -58,9 +58,9 @@ output decoder {{ #include "arch/alpha/registers.hh" #include "arch/alpha/regredir.hh" +#include "base/loader/symtab.hh" #include "base/cprintf.hh" #include "base/fenv.hh" -#include "base/loader/symtab.hh" #include "config/ss_compatible_fp.hh" #include "cpu/thread_context.hh" // for Jump::branchTarget() #include "mem/packet.hh" @@ -71,16 +71,16 @@ using namespace AlphaISA; output exec {{ #include +#include "arch/alpha/registers.hh" #include "arch/alpha/regredir.hh" #include "base/cp_annotate.hh" -#include "sim/pseudo_inst.hh" -#include "arch/alpha/registers.hh" #include "base/fenv.hh" #include "config/ss_compatible_fp.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" +#include "sim/pseudo_inst.hh" #include "sim/sim_exit.hh" using namespace AlphaISA; diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc index 1bb8bd2cf..e7440e003 100644 --- a/src/arch/alpha/linux/system.cc +++ b/src/arch/alpha/linux/system.cc @@ -40,17 +40,17 @@ * up boot time. */ -#include "arch/vtophys.hh" -#include "arch/alpha/idle_event.hh" #include "arch/alpha/linux/system.hh" #include "arch/alpha/linux/threadinfo.hh" +#include "arch/alpha/idle_event.hh" #include "arch/alpha/system.hh" +#include "arch/vtophys.hh" #include "base/loader/symtab.hh" -#include "cpu/thread_context.hh" #include "cpu/base.hh" +#include "cpu/thread_context.hh" #include "dev/platform.hh" -#include "kern/linux/printk.hh" #include "kern/linux/events.hh" +#include "kern/linux/printk.hh" #include "mem/physical.hh" #include "mem/port.hh" #include "sim/arguments.hh" diff --git a/src/arch/alpha/mt.hh b/src/arch/alpha/mt.hh index 57cf90f79..03ecf8486 100644 --- a/src/arch/alpha/mt.hh +++ b/src/arch/alpha/mt.hh @@ -38,12 +38,12 @@ * ISA-specific helper functions for multithreaded execution. */ +#include + #include "arch/isa_traits.hh" #include "base/bitfield.hh" -#include "base/trace.hh" #include "base/misc.hh" - -#include +#include "base/trace.hh" using namespace std; namespace AlphaISA diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc index 3c3fd9b25..269a7bd63 100644 --- a/src/arch/alpha/process.cc +++ b/src/arch/alpha/process.cc @@ -31,8 +31,8 @@ #include "arch/alpha/isa_traits.hh" #include "arch/alpha/process.hh" -#include "base/loader/object_file.hh" #include "base/loader/elf_object.hh" +#include "base/loader/object_file.hh" #include "base/misc.hh" #include "cpu/thread_context.hh" #include "mem/page_table.hh" diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc index 9a2a5f23f..f05b448fa 100644 --- a/src/arch/alpha/remote_gdb.cc +++ b/src/arch/alpha/remote_gdb.cc @@ -127,15 +127,15 @@ #endif #include "arch/alpha/kgdb.h" -#include "arch/alpha/utility.hh" #include "arch/alpha/regredir.hh" #include "arch/alpha/remote_gdb.hh" +#include "arch/alpha/utility.hh" #include "base/intmath.hh" #include "base/remote_gdb.hh" #include "base/socket.hh" #include "base/trace.hh" -#include "cpu/thread_context.hh" #include "cpu/static_inst.hh" +#include "cpu/thread_context.hh" #include "mem/physical.hh" #include "mem/port.hh" #include "sim/system.hh" diff --git a/src/arch/alpha/remote_gdb.hh b/src/arch/alpha/remote_gdb.hh index 43d0580d8..b7aef5f64 100644 --- a/src/arch/alpha/remote_gdb.hh +++ b/src/arch/alpha/remote_gdb.hh @@ -33,12 +33,12 @@ #include -#include "arch/alpha/types.hh" #include "arch/alpha/kgdb.h" -#include "base/remote_gdb.hh" -#include "cpu/pc_event.hh" +#include "arch/alpha/types.hh" #include "base/pollevent.hh" +#include "base/remote_gdb.hh" #include "base/socket.hh" +#include "cpu/pc_event.hh" class System; class ThreadContext; diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc index 58d54e790..6bcfffa3a 100644 --- a/src/arch/alpha/tlb.cc +++ b/src/arch/alpha/tlb.cc @@ -33,9 +33,9 @@ #include #include +#include "arch/alpha/faults.hh" #include "arch/alpha/pagetable.hh" #include "arch/alpha/tlb.hh" -#include "arch/alpha/faults.hh" #include "base/inifile.hh" #include "base/str.hh" #include "base/trace.hh" diff --git a/src/arch/alpha/tru64/process.cc b/src/arch/alpha/tru64/process.cc index b10fea02b..96fe2725f 100644 --- a/src/arch/alpha/tru64/process.cc +++ b/src/arch/alpha/tru64/process.cc @@ -29,9 +29,9 @@ * Ali Saidi */ +#include "arch/alpha/tru64/process.hh" #include "arch/alpha/tru64/tru64.hh" #include "arch/alpha/isa_traits.hh" -#include "arch/alpha/tru64/process.hh" #include "cpu/thread_context.hh" #include "kern/tru64/tru64.hh" #include "sim/byteswap.hh" diff --git a/src/arch/alpha/types.hh b/src/arch/alpha/types.hh index 4713f0849..645e09105 100644 --- a/src/arch/alpha/types.hh +++ b/src/arch/alpha/types.hh @@ -32,8 +32,8 @@ #ifndef __ARCH_ALPHA_TYPES_HH__ #define __ARCH_ALPHA_TYPES_HH__ -#include "base/types.hh" #include "arch/generic/types.hh" +#include "base/types.hh" namespace AlphaISA { diff --git a/src/arch/alpha/utility.hh b/src/arch/alpha/utility.hh index fdac8b8d1..8759b49ce 100644 --- a/src/arch/alpha/utility.hh +++ b/src/arch/alpha/utility.hh @@ -32,9 +32,9 @@ #ifndef __ARCH_ALPHA_UTILITY_HH__ #define __ARCH_ALPHA_UTILITY_HH__ -#include "arch/alpha/types.hh" #include "arch/alpha/isa_traits.hh" #include "arch/alpha/registers.hh" +#include "arch/alpha/types.hh" #include "base/misc.hh" #include "config/full_system.hh" #include "cpu/static_inst.hh" diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc index 01d43f338..4150adba6 100644 --- a/src/arch/arm/faults.cc +++ b/src/arch/arm/faults.cc @@ -43,9 +43,9 @@ */ #include "arch/arm/faults.hh" -#include "cpu/thread_context.hh" -#include "cpu/base.hh" #include "base/trace.hh" +#include "cpu/base.hh" +#include "cpu/thread_context.hh" namespace ArmISA { diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh index 8df8d0abf..234d8cfec 100644 --- a/src/arch/arm/faults.hh +++ b/src/arch/arm/faults.hh @@ -47,9 +47,9 @@ #include "arch/arm/miscregs.hh" #include "arch/arm/types.hh" +#include "base/misc.hh" #include "config/full_system.hh" #include "sim/faults.hh" -#include "base/misc.hh" // The design of the "name" and "vect" functions is in sim/faults.hh diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc index 28852bf89..e056856b6 100644 --- a/src/arch/arm/insts/macromem.cc +++ b/src/arch/arm/insts/macromem.cc @@ -40,9 +40,10 @@ * Authors: Stephen Hines */ +#include + #include "arch/arm/insts/macromem.hh" #include "arch/arm/decoder.hh" -#include using namespace std; using namespace ArmISAInst; diff --git a/src/arch/arm/insts/static_inst.cc b/src/arch/arm/insts/static_inst.cc index 528111759..8306c620f 100644 --- a/src/arch/arm/insts/static_inst.cc +++ b/src/arch/arm/insts/static_inst.cc @@ -40,11 +40,11 @@ * Authors: Stephen Hines */ -#include "arch/arm/faults.hh" #include "arch/arm/insts/static_inst.hh" +#include "arch/arm/faults.hh" +#include "base/loader/symtab.hh" #include "base/condcodes.hh" #include "base/cprintf.hh" -#include "base/loader/symtab.hh" namespace ArmISA { diff --git a/src/arch/arm/insts/vfp.hh b/src/arch/arm/insts/vfp.hh index e962704e0..57b74d040 100644 --- a/src/arch/arm/insts/vfp.hh +++ b/src/arch/arm/insts/vfp.hh @@ -40,11 +40,13 @@ #ifndef __ARCH_ARM_INSTS_VFP_HH__ #define __ARCH_ARM_INSTS_VFP_HH__ -#include "arch/arm/insts/misc.hh" -#include "arch/arm/miscregs.hh" #include + #include +#include "arch/arm/insts/misc.hh" +#include "arch/arm/miscregs.hh" + namespace ArmISA { diff --git a/src/arch/arm/intregs.hh b/src/arch/arm/intregs.hh index 2cbed6c59..9da910106 100644 --- a/src/arch/arm/intregs.hh +++ b/src/arch/arm/intregs.hh @@ -40,7 +40,7 @@ * Authors: Gabe Black */ -#include +#include #ifndef __ARCH_ARM_INTREGS_HH__ #define __ARCH_ARM_INTREGS_HH__ diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa index 5840cc9b2..aebce0944 100644 --- a/src/arch/arm/isa/includes.isa +++ b/src/arch/arm/isa/includes.isa @@ -46,8 +46,8 @@ // output header {{ -#include #include +#include #include "arch/arm/insts/branch.hh" #include "arch/arm/insts/macromem.hh" @@ -67,21 +67,21 @@ output decoder {{ #include "arch/arm/intregs.hh" #include "arch/arm/isa_traits.hh" #include "arch/arm/utility.hh" -#include "base/cprintf.hh" #include "base/loader/symtab.hh" +#include "base/cprintf.hh" #include "cpu/thread_context.hh" using namespace ArmISA; }}; output exec {{ +#include + #include "arch/arm/faults.hh" #include "arch/arm/isa_traits.hh" #include "arch/arm/utility.hh" #include "base/condcodes.hh" #include "sim/pseudo_inst.hh" - -#include #if defined(linux) #include #endif diff --git a/src/arch/arm/linux/atag.hh b/src/arch/arm/linux/atag.hh index d01474ac0..b7c37dffd 100644 --- a/src/arch/arm/linux/atag.hh +++ b/src/arch/arm/linux/atag.hh @@ -42,6 +42,7 @@ #include #include + #include "base/types.hh" enum { diff --git a/src/arch/arm/linux/linux.cc b/src/arch/arm/linux/linux.cc index a26567475..1e3a1e725 100644 --- a/src/arch/arm/linux/linux.cc +++ b/src/arch/arm/linux/linux.cc @@ -29,10 +29,10 @@ * Authors: Stephen Hines */ -#include "arch/arm/linux/linux.hh" - #include +#include "arch/arm/linux/linux.hh" + // open(2) flags translation table OpenFlagTransTable ArmLinux::openFlagTable[] = { #ifdef _MSC_VER diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc index 6b449c2e7..f17749252 100644 --- a/src/arch/arm/linux/process.cc +++ b/src/arch/arm/linux/process.cc @@ -46,11 +46,9 @@ #include "arch/arm/linux/linux.hh" #include "arch/arm/linux/process.hh" #include "arch/arm/isa_traits.hh" - #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" - #include "sim/process.hh" #include "sim/syscall_emul.hh" #include "sim/system.hh" diff --git a/src/arch/arm/linux/process.hh b/src/arch/arm/linux/process.hh index f0a81c5fc..854b0b176 100644 --- a/src/arch/arm/linux/process.hh +++ b/src/arch/arm/linux/process.hh @@ -33,7 +33,6 @@ #include "arch/arm/process.hh" - /// A process with emulated Arm/Linux syscalls. class ArmLinuxProcess : public ArmLiveProcess { diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc index 7aff2b6ef..0d34121b4 100644 --- a/src/arch/arm/linux/system.cc +++ b/src/arch/arm/linux/system.cc @@ -40,9 +40,9 @@ * Authors: Ali Saidi */ -#include "arch/arm/isa_traits.hh" #include "arch/arm/linux/atag.hh" #include "arch/arm/linux/system.hh" +#include "arch/arm/isa_traits.hh" #include "arch/arm/utility.hh" #include "base/loader/object_file.hh" #include "base/loader/symtab.hh" diff --git a/src/arch/arm/locked_mem.hh b/src/arch/arm/locked_mem.hh index f902bdb49..f95542bb0 100644 --- a/src/arch/arm/locked_mem.hh +++ b/src/arch/arm/locked_mem.hh @@ -43,7 +43,6 @@ #include "arch/arm/miscregs.hh" #include "mem/request.hh" - namespace ArmISA { template diff --git a/src/arch/arm/pagetable.hh b/src/arch/arm/pagetable.hh index 46322046f..6d84fbf7b 100644 --- a/src/arch/arm/pagetable.hh +++ b/src/arch/arm/pagetable.hh @@ -47,7 +47,6 @@ #include "arch/arm/utility.hh" #include "arch/arm/vtophys.hh" #include "config/full_system.hh" - #include "sim/serialize.hh" namespace ArmISA { diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh index e650d52d6..188f675bb 100644 --- a/src/arch/arm/predecoder.hh +++ b/src/arch/arm/predecoder.hh @@ -47,8 +47,8 @@ #include -#include "arch/arm/types.hh" #include "arch/arm/miscregs.hh" +#include "arch/arm/types.hh" #include "base/types.hh" class ThreadContext; diff --git a/src/arch/arm/process.hh b/src/arch/arm/process.hh index 8816b765d..26a59323f 100644 --- a/src/arch/arm/process.hh +++ b/src/arch/arm/process.hh @@ -33,6 +33,7 @@ #include #include + #include "base/loader/object_file.hh" #include "sim/process.hh" diff --git a/src/arch/arm/registers.hh b/src/arch/arm/registers.hh index 30289ff27..14ec03471 100644 --- a/src/arch/arm/registers.hh +++ b/src/arch/arm/registers.hh @@ -43,8 +43,8 @@ #ifndef __ARCH_ARM_REGISTERS_HH__ #define __ARCH_ARM_REGISTERS_HH__ -#include "arch/arm/max_inst_regs.hh" #include "arch/arm/intregs.hh" +#include "arch/arm/max_inst_regs.hh" #include "arch/arm/miscregs.hh" namespace ArmISA { diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc index bf7639575..2a4680782 100644 --- a/src/arch/arm/remote_gdb.cc +++ b/src/arch/arm/remote_gdb.cc @@ -139,22 +139,22 @@ #include "arch/arm/vtophys.hh" #endif -#include "arch/arm/utility.hh" -#include "arch/arm/remote_gdb.hh" +#include "arch/arm/pagetable.hh" #include "arch/arm/registers.hh" +#include "arch/arm/remote_gdb.hh" +#include "arch/arm/utility.hh" #include "arch/arm/vtophys.hh" #include "base/intmath.hh" #include "base/remote_gdb.hh" #include "base/socket.hh" #include "base/trace.hh" +#include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "cpu/thread_state.hh" -#include "cpu/static_inst.hh" +#include "mem/page_table.hh" #include "mem/physical.hh" #include "mem/port.hh" #include "sim/system.hh" -#include "arch/arm/pagetable.hh" -#include "mem/page_table.hh" using namespace std; using namespace ArmISA; diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc index f6e265ae4..d61db4cfe 100644 --- a/src/arch/arm/system.cc +++ b/src/arch/arm/system.cc @@ -40,9 +40,10 @@ * Authors: Ali Saidi */ -#include "arch/arm/system.hh" #include +#include "arch/arm/system.hh" + using namespace std; using namespace Linux; diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh index c64673df5..8711e7cce 100644 --- a/src/arch/arm/system.hh +++ b/src/arch/arm/system.hh @@ -46,10 +46,10 @@ #include #include +#include "kern/linux/events.hh" #include "params/ArmSystem.hh" #include "sim/sim_object.hh" #include "sim/system.hh" -#include "kern/linux/events.hh" class ArmSystem : public System { diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc index 2d0e323f6..9296b951a 100644 --- a/src/arch/arm/table_walker.cc +++ b/src/arch/arm/table_walker.cc @@ -40,9 +40,9 @@ #include "arch/arm/faults.hh" #include "arch/arm/table_walker.hh" #include "arch/arm/tlb.hh" -#include "dev/io_device.hh" #include "cpu/base.hh" #include "cpu/thread_context.hh" +#include "dev/io_device.hh" #include "sim/system.hh" using namespace ArmISA; diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh index 96a39cc61..85db1fa77 100644 --- a/src/arch/arm/table_walker.hh +++ b/src/arch/arm/table_walker.hh @@ -46,7 +46,6 @@ #include "arch/arm/tlb.hh" #include "mem/mem_object.hh" #include "mem/request.hh" -#include "mem/request.hh" #include "params/ArmTableWalker.hh" #include "sim/eventq.hh" #include "sim/fault_fwd.hh" diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh index e60de38dd..269128c2a 100644 --- a/src/arch/arm/tlb.hh +++ b/src/arch/arm/tlb.hh @@ -46,9 +46,9 @@ #include #include "arch/arm/isa_traits.hh" +#include "arch/arm/pagetable.hh" #include "arch/arm/utility.hh" #include "arch/arm/vtophys.hh" -#include "arch/arm/pagetable.hh" #include "base/statistics.hh" #include "mem/request.hh" #include "params/ArmTLB.hh" diff --git a/src/arch/arm/vtophys.hh b/src/arch/arm/vtophys.hh index 12b4846ed..a85209a4a 100644 --- a/src/arch/arm/vtophys.hh +++ b/src/arch/arm/vtophys.hh @@ -37,7 +37,6 @@ #include "arch/arm/isa_traits.hh" #include "arch/arm/utility.hh" - class ThreadContext; class FunctionalPort; diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh index acffadc34..68bc6c533 100644 --- a/src/arch/generic/debugfaults.hh +++ b/src/arch/generic/debugfaults.hh @@ -40,11 +40,11 @@ #ifndef __ARCH_GENERIC_DEBUGFAULTS_HH__ #define __ARCH_GENERIC_DEBUGFAULTS_HH__ +#include + #include "base/misc.hh" #include "sim/faults.hh" -#include - namespace GenericISA { class M5DebugFault : public FaultBase diff --git a/src/arch/generic/types.hh b/src/arch/generic/types.hh index 214b01926..931349ac4 100644 --- a/src/arch/generic/types.hh +++ b/src/arch/generic/types.hh @@ -33,8 +33,8 @@ #include -#include "base/types.hh" #include "base/trace.hh" +#include "base/types.hh" #include "sim/serialize.hh" namespace GenericISA diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc index b8b02ae9e..49698eec6 100755 --- a/src/arch/mips/dsp.cc +++ b/src/arch/mips/dsp.cc @@ -28,13 +28,13 @@ * Authors: Brett Miller */ -#include "arch/mips/isa_traits.hh" #include "arch/mips/dsp.hh" +#include "arch/mips/isa_traits.hh" +#include "base/bitfield.hh" +#include "base/misc.hh" #include "config/full_system.hh" #include "cpu/static_inst.hh" #include "sim/serialize.hh" -#include "base/bitfield.hh" -#include "base/misc.hh" using namespace MipsISA; using namespace std; diff --git a/src/arch/mips/dsp.hh b/src/arch/mips/dsp.hh index 1cca51384..f13431714 100755 --- a/src/arch/mips/dsp.hh +++ b/src/arch/mips/dsp.hh @@ -31,8 +31,8 @@ #ifndef __ARCH_MIPS_DSP_HH__ #define __ARCH_MIPS_DSP_HH__ -#include "arch/mips/types.hh" #include "arch/mips/isa_traits.hh" +#include "arch/mips/types.hh" #include "base/misc.hh" #include "base/types.hh" #include "config/full_system.hh" diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc index 66d8b0815..902574bac 100644 --- a/src/arch/mips/isa.cc +++ b/src/arch/mips/isa.cc @@ -29,8 +29,8 @@ */ #include "arch/mips/isa.hh" -#include "arch/mips/mt_constants.hh" #include "arch/mips/mt.hh" +#include "arch/mips/mt_constants.hh" #include "arch/mips/pra_constants.hh" #include "base/bitfield.hh" #include "cpu/base.hh" diff --git a/src/arch/mips/isa.hh b/src/arch/mips/isa.hh index cc075a9a6..720c7725e 100644 --- a/src/arch/mips/isa.hh +++ b/src/arch/mips/isa.hh @@ -31,8 +31,8 @@ #ifndef __ARCH_MIPS_ISA_HH__ #define __ARCH_MIPS_ISA_HH__ -#include #include +#include #include #include "arch/mips/registers.hh" diff --git a/src/arch/mips/isa/includes.isa b/src/arch/mips/isa/includes.isa index d5e1448ac..b0d1aa748 100644 --- a/src/arch/mips/isa/includes.isa +++ b/src/arch/mips/isa/includes.isa @@ -34,9 +34,9 @@ // output header {{ -#include -#include #include +#include +#include #include "arch/mips/isa_traits.hh" #include "arch/mips/types.hh" @@ -45,20 +45,19 @@ output header {{ }}; output decoder {{ -#include "arch/mips/isa_traits.hh" -#include "base/cprintf.hh" -#include "base/loader/symtab.hh" -#include "cpu/thread_context.hh" +#include + +#include "arch/mips/dsp.hh" +#include "arch/mips/dt_constants.hh" #include "arch/mips/faults.hh" #include "arch/mips/isa_traits.hh" -#include "arch/mips/pra_constants.hh" -#include "arch/mips/dt_constants.hh" #include "arch/mips/mt_constants.hh" +#include "arch/mips/pra_constants.hh" #include "arch/mips/utility.hh" -#include "arch/mips/dsp.hh" +#include "base/loader/symtab.hh" +#include "base/cprintf.hh" +#include "cpu/thread_context.hh" #include "mem/packet.hh" - -#include #if defined(linux) #include #endif @@ -67,29 +66,27 @@ using namespace MipsISA; }}; output exec {{ +#include + +#include "arch/mips/dsp.hh" +#include "arch/mips/dt_constants.hh" #include "arch/mips/faults.hh" #include "arch/mips/isa_traits.hh" -#include "arch/mips/utility.hh" -#include "arch/mips/dsp.hh" #include "arch/mips/mt.hh" -#include "arch/mips/pra_constants.hh" -#include "arch/mips/dt_constants.hh" #include "arch/mips/mt_constants.hh" - -#include +#include "arch/mips/pra_constants.hh" +#include "arch/mips/utility.hh" #if defined(linux) #include #endif #include "cpu/base.hh" #include "cpu/exetrace.hh" - #include "mem/packet.hh" #include "mem/packet_access.hh" - -#include "sim/sim_exit.hh" #include "sim/eventq.hh" #include "sim/sim_events.hh" +#include "sim/sim_exit.hh" using namespace MipsISA; }}; diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh index 648713926..4d07c5abe 100644 --- a/src/arch/mips/isa_traits.hh +++ b/src/arch/mips/isa_traits.hh @@ -34,8 +34,8 @@ #ifndef __ARCH_MIPS_ISA_TRAITS_HH__ #define __ARCH_MIPS_ISA_TRAITS_HH__ -#include "arch/mips/types.hh" #include "arch/mips/mips_core_specific.hh" +#include "arch/mips/types.hh" #include "base/types.hh" #include "config/full_system.hh" diff --git a/src/arch/mips/linux/linux.cc b/src/arch/mips/linux/linux.cc index 6cfc93585..8c4e3bf8c 100644 --- a/src/arch/mips/linux/linux.cc +++ b/src/arch/mips/linux/linux.cc @@ -28,10 +28,10 @@ * Authors: Korey Sewell */ -#include "arch/mips/linux/linux.hh" - #include +#include "arch/mips/linux/linux.hh" + // open(2) flags translation table OpenFlagTransTable MipsLinux::openFlagTable[] = { #ifdef _MSC_VER diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc index f3cac84e8..fa8e659b6 100644 --- a/src/arch/mips/linux/process.cc +++ b/src/arch/mips/linux/process.cc @@ -36,10 +36,10 @@ #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" +#include "sim/eventq.hh" #include "sim/process.hh" -#include "sim/system.hh" #include "sim/syscall_emul.hh" -#include "sim/eventq.hh" +#include "sim/system.hh" using namespace std; using namespace MipsISA; diff --git a/src/arch/mips/linux/process.hh b/src/arch/mips/linux/process.hh index 8c45014e0..fd96be4c1 100644 --- a/src/arch/mips/linux/process.hh +++ b/src/arch/mips/linux/process.hh @@ -32,8 +32,8 @@ #ifndef __MIPS_LINUX_PROCESS_HH__ #define __MIPS_LINUX_PROCESS_HH__ -#include "arch/mips/process.hh" #include "arch/mips/linux/linux.hh" +#include "arch/mips/process.hh" #include "sim/eventq.hh" /// A process with emulated Mips/Linux syscalls. diff --git a/src/arch/mips/linux/system.cc b/src/arch/mips/linux/system.cc index ff07f526a..67e21574e 100644 --- a/src/arch/mips/linux/system.cc +++ b/src/arch/mips/linux/system.cc @@ -39,17 +39,17 @@ * up boot time. */ -#include "arch/vtophys.hh" -#include "arch/mips/idle_event.hh" #include "arch/mips/linux/system.hh" #include "arch/mips/linux/threadinfo.hh" +#include "arch/mips/idle_event.hh" #include "arch/mips/system.hh" +#include "arch/vtophys.hh" #include "base/loader/symtab.hh" -#include "cpu/thread_context.hh" #include "cpu/base.hh" +#include "cpu/thread_context.hh" #include "dev/platform.hh" -#include "kern/linux/printk.hh" #include "kern/linux/events.hh" +#include "kern/linux/printk.hh" #include "mem/physical.hh" #include "mem/port.hh" #include "sim/arguments.hh" diff --git a/src/arch/mips/mt.hh b/src/arch/mips/mt.hh index c63c65a73..f163d3240 100755 --- a/src/arch/mips/mt.hh +++ b/src/arch/mips/mt.hh @@ -37,16 +37,16 @@ * ISA-specific helper functions for multithreaded execution. */ +#include + #include "arch/mips/faults.hh" #include "arch/mips/isa_traits.hh" #include "arch/mips/mt_constants.hh" #include "arch/mips/pra_constants.hh" #include "arch/mips/registers.hh" #include "base/bitfield.hh" -#include "base/trace.hh" #include "base/misc.hh" - -#include +#include "base/trace.hh" namespace MipsISA { diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc index 26a2a0ddb..b6f21c95c 100644 --- a/src/arch/mips/process.cc +++ b/src/arch/mips/process.cc @@ -32,8 +32,8 @@ #include "arch/mips/isa_traits.hh" #include "arch/mips/process.hh" -#include "base/loader/object_file.hh" #include "base/loader/elf_object.hh" +#include "base/loader/object_file.hh" #include "base/misc.hh" #include "cpu/thread_context.hh" #include "mem/page_table.hh" diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh index a065feb8f..3f9a7aff0 100644 --- a/src/arch/mips/process.hh +++ b/src/arch/mips/process.hh @@ -34,6 +34,7 @@ #include #include + #include "sim/process.hh" class LiveProcess; diff --git a/src/arch/mips/system.cc b/src/arch/mips/system.cc index 6e2ad4d5a..c1735b740 100755 --- a/src/arch/mips/system.cc +++ b/src/arch/mips/system.cc @@ -33,15 +33,14 @@ #include "arch/mips/system.hh" #include "arch/vtophys.hh" -#include "base/loader/object_file.hh" #include "base/loader/hex_file.hh" +#include "base/loader/object_file.hh" #include "base/loader/symtab.hh" #include "base/trace.hh" #include "mem/physical.hh" #include "params/MipsSystem.hh" #include "sim/byteswap.hh" - using namespace LittleEndianGuest; MipsSystem::MipsSystem(Params *p) : System(p) diff --git a/src/arch/mips/system.hh b/src/arch/mips/system.hh index cfdf316b3..128f36581 100755 --- a/src/arch/mips/system.hh +++ b/src/arch/mips/system.hh @@ -37,13 +37,13 @@ #include #include -#include "sim/system.hh" -#include "base/loader/symtab.hh" #include "base/loader/hex_file.hh" +#include "base/loader/symtab.hh" #include "cpu/pc_event.hh" #include "kern/system_events.hh" #include "params/MipsSystem.hh" #include "sim/sim_object.hh" +#include "sim/system.hh" class MipsSystem : public System { diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc index 288c8e88e..b73eae72f 100644 --- a/src/arch/mips/tlb.cc +++ b/src/arch/mips/tlb.cc @@ -34,18 +34,18 @@ #include #include -#include "arch/mips/pra_constants.hh" +#include "arch/mips/faults.hh" #include "arch/mips/pagetable.hh" +#include "arch/mips/pra_constants.hh" #include "arch/mips/tlb.hh" -#include "arch/mips/faults.hh" #include "arch/mips/utility.hh" #include "base/inifile.hh" #include "base/str.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" -#include "sim/process.hh" #include "mem/page_table.hh" #include "params/MipsTLB.hh" +#include "sim/process.hh" using namespace std; using namespace MipsISA; diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh index 5c8b10263..4b1456862 100644 --- a/src/arch/mips/tlb.hh +++ b/src/arch/mips/tlb.hh @@ -38,15 +38,15 @@ #include #include "arch/mips/isa_traits.hh" +#include "arch/mips/pagetable.hh" #include "arch/mips/utility.hh" #include "arch/mips/vtophys.hh" -#include "arch/mips/pagetable.hh" #include "base/statistics.hh" #include "mem/request.hh" #include "params/MipsTLB.hh" #include "sim/fault_fwd.hh" -#include "sim/tlb.hh" #include "sim/sim_object.hh" +#include "sim/tlb.hh" class ThreadContext; diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc index 0859eb80f..37f71416f 100644 --- a/src/arch/mips/utility.cc +++ b/src/arch/mips/utility.cc @@ -32,12 +32,12 @@ #include "arch/mips/isa_traits.hh" #include "arch/mips/utility.hh" +#include "base/bitfield.hh" +#include "base/misc.hh" #include "config/full_system.hh" -#include "cpu/thread_context.hh" #include "cpu/static_inst.hh" +#include "cpu/thread_context.hh" #include "sim/serialize.hh" -#include "base/bitfield.hh" -#include "base/misc.hh" #if FULL_SYSTEM #include "arch/mips/registers.hh" diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh index 2f6726c59..61c43a158 100644 --- a/src/arch/mips/utility.hh +++ b/src/arch/mips/utility.hh @@ -33,9 +33,8 @@ #ifndef __ARCH_MIPS_UTILITY_HH__ #define __ARCH_MIPS_UTILITY_HH__ -#include "config/full_system.hh" -#include "arch/mips/types.hh" #include "arch/mips/isa_traits.hh" +#include "arch/mips/types.hh" #include "base/misc.hh" #include "base/types.hh" #include "config/full_system.hh" diff --git a/src/arch/mips/vtophys.hh b/src/arch/mips/vtophys.hh index 6fde36aac..5ecc30b1f 100644 --- a/src/arch/mips/vtophys.hh +++ b/src/arch/mips/vtophys.hh @@ -37,7 +37,6 @@ #include "arch/mips/isa_traits.hh" #include "arch/mips/utility.hh" - class ThreadContext; class FunctionalPort; diff --git a/src/arch/power/insts/floating.hh b/src/arch/power/insts/floating.hh index deeac82cf..65906e507 100644 --- a/src/arch/power/insts/floating.hh +++ b/src/arch/power/insts/floating.hh @@ -33,8 +33,8 @@ #define __ARCH_POWER_INSTS_FLOATING_HH__ #include "arch/power/insts/static_inst.hh" -#include "base/cprintf.hh" #include "base/bitfield.hh" +#include "base/cprintf.hh" namespace PowerISA { diff --git a/src/arch/power/insts/integer.hh b/src/arch/power/insts/integer.hh index a7270cd38..f911eb08a 100644 --- a/src/arch/power/insts/integer.hh +++ b/src/arch/power/insts/integer.hh @@ -32,8 +32,8 @@ #define __ARCH_POWER_INSTS_INTEGER_HH__ #include "arch/power/insts/static_inst.hh" -#include "base/cprintf.hh" #include "base/bitfield.hh" +#include "base/cprintf.hh" namespace PowerISA { diff --git a/src/arch/power/isa/includes.isa b/src/arch/power/isa/includes.isa index 47e8c1411..a9069710b 100644 --- a/src/arch/power/isa/includes.isa +++ b/src/arch/power/isa/includes.isa @@ -34,15 +34,15 @@ // output header {{ -#include -#include #include +#include +#include #include "arch/power/insts/branch.hh" -#include "arch/power/insts/mem.hh" -#include "arch/power/insts/integer.hh" -#include "arch/power/insts/floating.hh" #include "arch/power/insts/condition.hh" +#include "arch/power/insts/floating.hh" +#include "arch/power/insts/integer.hh" +#include "arch/power/insts/mem.hh" #include "arch/power/insts/misc.hh" #include "arch/power/insts/static_inst.hh" #include "arch/power/isa_traits.hh" @@ -61,8 +61,8 @@ output decoder {{ #include "arch/power/faults.hh" #include "arch/power/isa_traits.hh" #include "arch/power/utility.hh" -#include "base/cprintf.hh" #include "base/loader/symtab.hh" +#include "base/cprintf.hh" #include "cpu/thread_context.hh" using namespace PowerISA; @@ -70,11 +70,11 @@ using std::isnan; }}; output exec {{ +#include + #include "arch/power/faults.hh" #include "arch/power/isa_traits.hh" #include "arch/power/utility.hh" - -#include #if defined(linux) #include #endif diff --git a/src/arch/power/linux/linux.cc b/src/arch/power/linux/linux.cc index 113f3e48e..b614c0dcb 100644 --- a/src/arch/power/linux/linux.cc +++ b/src/arch/power/linux/linux.cc @@ -29,10 +29,10 @@ * Authors: Timothy M. Jones */ -#include "arch/power/linux/linux.hh" - #include +#include "arch/power/linux/linux.hh" + // open(2) flags translation table OpenFlagTransTable PowerLinux::openFlagTable[] = { #ifdef _MSC_VER diff --git a/src/arch/power/linux/process.cc b/src/arch/power/linux/process.cc index c2587d5e7..1c1b2827f 100644 --- a/src/arch/power/linux/process.cc +++ b/src/arch/power/linux/process.cc @@ -35,11 +35,9 @@ #include "arch/power/linux/linux.hh" #include "arch/power/linux/process.hh" #include "arch/power/isa_traits.hh" - #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" - #include "sim/process.hh" #include "sim/syscall_emul.hh" #include "sim/system.hh" diff --git a/src/arch/power/linux/process.hh b/src/arch/power/linux/process.hh index bef7e8dae..c4600129e 100644 --- a/src/arch/power/linux/process.hh +++ b/src/arch/power/linux/process.hh @@ -35,7 +35,6 @@ #include "arch/power/process.hh" - /// A process with emulated PPC/Linux syscalls. class PowerLinuxProcess : public PowerLiveProcess { diff --git a/src/arch/power/process.hh b/src/arch/power/process.hh index 473b7e028..e02a30abd 100644 --- a/src/arch/power/process.hh +++ b/src/arch/power/process.hh @@ -35,6 +35,7 @@ #include #include + #include "sim/process.hh" class LiveProcess; diff --git a/src/arch/power/tlb.hh b/src/arch/power/tlb.hh index c4e3fadaa..590477b6a 100644 --- a/src/arch/power/tlb.hh +++ b/src/arch/power/tlb.hh @@ -40,9 +40,9 @@ #include #include "arch/power/isa_traits.hh" +#include "arch/power/pagetable.hh" #include "arch/power/utility.hh" #include "arch/power/vtophys.hh" -#include "arch/power/pagetable.hh" #include "base/statistics.hh" #include "mem/request.hh" #include "params/PowerTLB.hh" diff --git a/src/arch/power/vtophys.hh b/src/arch/power/vtophys.hh index 8b88c9215..7371f38a6 100644 --- a/src/arch/power/vtophys.hh +++ b/src/arch/power/vtophys.hh @@ -39,7 +39,6 @@ #include "arch/power/isa_traits.hh" #include "arch/power/utility.hh" - class ThreadContext; class FunctionalPort; diff --git a/src/arch/sparc/isa.hh b/src/arch/sparc/isa.hh index 660f0c49d..f00068bbc 100644 --- a/src/arch/sparc/isa.hh +++ b/src/arch/sparc/isa.hh @@ -31,14 +31,14 @@ #ifndef __ARCH_SPARC_ISA_HH__ #define __ARCH_SPARC_ISA_HH__ +#include +#include + #include "arch/sparc/registers.hh" #include "arch/sparc/types.hh" #include "config/full_system.hh" #include "cpu/cpuevent.hh" -#include -#include - class Checkpoint; class EventManager; class ThreadContext; diff --git a/src/arch/sparc/isa/includes.isa b/src/arch/sparc/isa/includes.isa index bc9273ad3..8ef753d2e 100644 --- a/src/arch/sparc/isa/includes.isa +++ b/src/arch/sparc/isa/includes.isa @@ -35,8 +35,8 @@ output header {{ #include -#include #include +#include #include "arch/sparc/faults.hh" #include "arch/sparc/isa_traits.hh" @@ -49,14 +49,14 @@ output header {{ }}; output decoder {{ -#include "base/cprintf.hh" +#include + #include "base/loader/symtab.hh" +#include "base/cprintf.hh" +#include "base/fenv.hh" #include "cpu/thread_context.hh" // for Jump::branchTarget() #include "mem/packet.hh" -#include "base/fenv.hh" -#include - using namespace SparcISA; }}; @@ -67,16 +67,16 @@ output exec {{ #include "sim/pseudo_inst.hh" #endif +#include #include -#include #include "arch/sparc/asi.hh" #include "base/bigint.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" -#include "sim/sim_exit.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" +#include "sim/sim_exit.hh" using namespace SparcISA; using namespace std; diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh index 719127641..6992cfee1 100644 --- a/src/arch/sparc/isa_traits.hh +++ b/src/arch/sparc/isa_traits.hh @@ -32,8 +32,8 @@ #ifndef __ARCH_SPARC_ISA_TRAITS_HH__ #define __ARCH_SPARC_ISA_TRAITS_HH__ -#include "arch/sparc/types.hh" #include "arch/sparc/sparc_traits.hh" +#include "arch/sparc/types.hh" #include "base/types.hh" #include "config/full_system.hh" diff --git a/src/arch/sparc/linux/linux.cc b/src/arch/sparc/linux/linux.cc index 102e5af3b..6f8a05750 100644 --- a/src/arch/sparc/linux/linux.cc +++ b/src/arch/sparc/linux/linux.cc @@ -28,9 +28,10 @@ * Authors: Gabe Black */ -#include "arch/sparc/linux/linux.hh" #include +#include "arch/sparc/linux/linux.hh" + // open(2) flags translation table OpenFlagTransTable SparcLinux::openFlagTable[] = { #ifdef _MSC_VER diff --git a/src/arch/sparc/linux/process.cc b/src/arch/sparc/linux/process.cc index 2c9fe2ac0..ce6094060 100644 --- a/src/arch/sparc/linux/process.cc +++ b/src/arch/sparc/linux/process.cc @@ -30,14 +30,12 @@ * Ali Saidi */ -#include "arch/sparc/isa_traits.hh" #include "arch/sparc/linux/process.hh" +#include "arch/sparc/isa_traits.hh" #include "arch/sparc/registers.hh" - #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" - #include "sim/process.hh" #include "sim/syscall_emul.hh" diff --git a/src/arch/sparc/locked_mem.hh b/src/arch/sparc/locked_mem.hh index 291b2f422..556fbbdd9 100644 --- a/src/arch/sparc/locked_mem.hh +++ b/src/arch/sparc/locked_mem.hh @@ -39,7 +39,6 @@ #include "mem/request.hh" - namespace SparcISA { template diff --git a/src/arch/sparc/mmapped_ipr.hh b/src/arch/sparc/mmapped_ipr.hh index 777242e7c..28e3ec259 100644 --- a/src/arch/sparc/mmapped_ipr.hh +++ b/src/arch/sparc/mmapped_ipr.hh @@ -37,11 +37,10 @@ * ISA-specific helper functions for memory mapped IPR accesses. */ +#include "arch/sparc/tlb.hh" #include "config/full_system.hh" #include "cpu/thread_context.hh" #include "mem/packet.hh" -#include "arch/sparc/tlb.hh" - namespace SparcISA { diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc index 7d8b96dc1..8987aa518 100644 --- a/src/arch/sparc/nativetrace.cc +++ b/src/arch/sparc/nativetrace.cc @@ -29,8 +29,8 @@ */ #include "arch/sparc/isa_traits.hh" -#include "arch/sparc/registers.hh" #include "arch/sparc/nativetrace.hh" +#include "arch/sparc/registers.hh" #include "cpu/thread_context.hh" #include "params/SparcNativeTrace.hh" #include "sim/byteswap.hh" diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc index ac42ccf64..bd3db92b6 100644 --- a/src/arch/sparc/process.cc +++ b/src/arch/sparc/process.cc @@ -32,16 +32,16 @@ #include "arch/sparc/asi.hh" #include "arch/sparc/handlers.hh" #include "arch/sparc/isa_traits.hh" -#include "arch/sparc/registers.hh" #include "arch/sparc/process.hh" +#include "arch/sparc/registers.hh" #include "arch/sparc/types.hh" -#include "base/loader/object_file.hh" #include "base/loader/elf_object.hh" +#include "base/loader/object_file.hh" #include "base/misc.hh" #include "cpu/thread_context.hh" #include "mem/page_table.hh" -#include "sim/process_impl.hh" #include "mem/translating_port.hh" +#include "sim/process_impl.hh" #include "sim/system.hh" using namespace std; diff --git a/src/arch/sparc/process.hh b/src/arch/sparc/process.hh index 4ad8bb804..a9a4247fc 100644 --- a/src/arch/sparc/process.hh +++ b/src/arch/sparc/process.hh @@ -34,6 +34,7 @@ #include #include + #include "sim/byteswap.hh" #include "sim/process.hh" diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc index 932123548..86c287237 100644 --- a/src/arch/sparc/remote_gdb.cc +++ b/src/arch/sparc/remote_gdb.cc @@ -117,19 +117,19 @@ */ #include +#include #include -#include -#include "arch/vtophys.hh" #include "arch/sparc/remote_gdb.hh" +#include "arch/vtophys.hh" #include "base/intmath.hh" #include "base/remote_gdb.hh" #include "base/socket.hh" #include "base/trace.hh" #include "config/full_system.hh" -#include "cpu/thread_context.hh" #include "cpu/static_inst.hh" +#include "cpu/thread_context.hh" #include "mem/page_table.hh" #include "mem/physical.hh" #include "mem/port.hh" diff --git a/src/arch/sparc/remote_gdb.hh b/src/arch/sparc/remote_gdb.hh index 06f6b3896..6ada8bdca 100644 --- a/src/arch/sparc/remote_gdb.hh +++ b/src/arch/sparc/remote_gdb.hh @@ -34,9 +34,9 @@ #include #include "arch/sparc/types.hh" +#include "base/pollevent.hh" #include "base/remote_gdb.hh" #include "cpu/pc_event.hh" -#include "base/pollevent.hh" class System; class ThreadContext; diff --git a/src/arch/sparc/solaris/process.cc b/src/arch/sparc/solaris/process.cc index 24abd8687..e47377d42 100644 --- a/src/arch/sparc/solaris/process.cc +++ b/src/arch/sparc/solaris/process.cc @@ -28,14 +28,12 @@ * Authors: Ali Saidi */ -#include "arch/sparc/isa_traits.hh" #include "arch/sparc/solaris/process.hh" +#include "arch/sparc/isa_traits.hh" #include "arch/sparc/registers.hh" - #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/solaris/solaris.hh" - #include "sim/process.hh" #include "sim/syscall_emul.hh" diff --git a/src/arch/sparc/solaris/solaris.cc b/src/arch/sparc/solaris/solaris.cc index 3cc910005..5474d8b17 100644 --- a/src/arch/sparc/solaris/solaris.cc +++ b/src/arch/sparc/solaris/solaris.cc @@ -28,10 +28,10 @@ * Authors: Ali Saidi */ -#include "arch/sparc/solaris/solaris.hh" - #include +#include "arch/sparc/solaris/solaris.hh" + // open(2) flags translation table OpenFlagTransTable SparcSolaris::openFlagTable[] = { #ifdef _MSC_VER diff --git a/src/arch/sparc/system.cc b/src/arch/sparc/system.cc index e4ee3cacb..9988702d2 100644 --- a/src/arch/sparc/system.cc +++ b/src/arch/sparc/system.cc @@ -37,7 +37,6 @@ #include "params/SparcSystem.hh" #include "sim/byteswap.hh" - using namespace BigEndianGuest; SparcSystem::SparcSystem(Params *p) diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc index 8aa007168..8742cfd32 100644 --- a/src/arch/sparc/tlb.cc +++ b/src/arch/sparc/tlb.cc @@ -36,8 +36,8 @@ #include "arch/sparc/tlb.hh" #include "base/bitfield.hh" #include "base/trace.hh" -#include "cpu/thread_context.hh" #include "cpu/base.hh" +#include "cpu/thread_context.hh" #include "mem/packet_access.hh" #include "mem/request.hh" #include "sim/system.hh" diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh index 133443d5b..5541ff7e9 100644 --- a/src/arch/sparc/tlb_map.hh +++ b/src/arch/sparc/tlb_map.hh @@ -31,9 +31,10 @@ #ifndef __ARCH_SPARC_TLB_MAP_HH__ #define __ARCH_SPARC_TLB_MAP_HH__ -#include "arch/sparc/pagetable.hh" #include +#include "arch/sparc/pagetable.hh" + namespace SparcISA { diff --git a/src/arch/sparc/types.hh b/src/arch/sparc/types.hh index acc4e4a64..7d0a7617c 100644 --- a/src/arch/sparc/types.hh +++ b/src/arch/sparc/types.hh @@ -31,9 +31,9 @@ #ifndef __ARCH_SPARC_TYPES_HH__ #define __ARCH_SPARC_TYPES_HH__ +#include "arch/generic/types.hh" #include "base/bigint.hh" #include "base/types.hh" -#include "arch/generic/types.hh" namespace SparcISA { diff --git a/src/arch/sparc/utility.hh b/src/arch/sparc/utility.hh index d69b42d01..b702e6838 100644 --- a/src/arch/sparc/utility.hh +++ b/src/arch/sparc/utility.hh @@ -34,8 +34,8 @@ #include "arch/sparc/isa_traits.hh" #include "arch/sparc/registers.hh" #include "arch/sparc/tlb.hh" -#include "base/misc.hh" #include "base/bitfield.hh" +#include "base/misc.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "sim/fault_fwd.hh" diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc index 36b2557e7..c8f35fe8b 100644 --- a/src/arch/sparc/vtophys.cc +++ b/src/arch/sparc/vtophys.cc @@ -30,10 +30,10 @@ #include -#include "arch/sparc/vtophys.hh" #include "arch/sparc/tlb.hh" -#include "base/compiler.hh" +#include "arch/sparc/vtophys.hh" #include "base/chunk_generator.hh" +#include "base/compiler.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" #include "mem/vport.hh" diff --git a/src/arch/x86/bios/acpi.cc b/src/arch/x86/bios/acpi.cc index 8d39236d4..4382a3d6b 100644 --- a/src/arch/x86/bios/acpi.cc +++ b/src/arch/x86/bios/acpi.cc @@ -39,14 +39,12 @@ #include "arch/x86/bios/acpi.hh" #include "mem/port.hh" -#include "sim/byteswap.hh" -#include "sim/sim_object.hh" - #include "params/X86ACPIRSDP.hh" - -#include "params/X86ACPISysDescTable.hh" #include "params/X86ACPIRSDT.hh" +#include "params/X86ACPISysDescTable.hh" #include "params/X86ACPIXSDT.hh" +#include "sim/byteswap.hh" +#include "sim/sim_object.hh" using namespace std; diff --git a/src/arch/x86/bios/intelmp.hh b/src/arch/x86/bios/intelmp.hh index 64c1e18c9..117466b48 100644 --- a/src/arch/x86/bios/intelmp.hh +++ b/src/arch/x86/bios/intelmp.hh @@ -44,13 +44,12 @@ #include #include "base/bitfield.hh" -#include "sim/sim_object.hh" - #include "enums/X86IntelMPAddressType.hh" #include "enums/X86IntelMPInterruptType.hh" #include "enums/X86IntelMPPolarity.hh" #include "enums/X86IntelMPRangeList.hh" #include "enums/X86IntelMPTriggerMode.hh" +#include "sim/sim_object.hh" class FunctionalPort; diff --git a/src/arch/x86/emulenv.hh b/src/arch/x86/emulenv.hh index a745fb539..ac707d808 100644 --- a/src/arch/x86/emulenv.hh +++ b/src/arch/x86/emulenv.hh @@ -40,9 +40,9 @@ #ifndef __ARCH_X86_EMULENV_HH__ #define __ARCH_X86_EMULENV_HH__ -#include "arch/x86/registers.hh" #include "arch/x86/regs/int.hh" #include "arch/x86/regs/segment.hh" +#include "arch/x86/registers.hh" #include "arch/x86/types.hh" namespace X86ISA diff --git a/src/arch/x86/faults.hh b/src/arch/x86/faults.hh index 7682953c1..2e8889404 100644 --- a/src/arch/x86/faults.hh +++ b/src/arch/x86/faults.hh @@ -40,13 +40,13 @@ #ifndef __ARCH_X86_FAULTS_HH__ #define __ARCH_X86_FAULTS_HH__ +#include + #include "base/bitunion.hh" #include "base/misc.hh" #include "sim/faults.hh" #include "sim/tlb.hh" -#include - namespace X86ISA { // Base class for all x86 "faults" where faults is in the m5 sense diff --git a/src/arch/x86/insts/badmicroop.cc b/src/arch/x86/insts/badmicroop.cc index ef493f250..d03a5eba8 100644 --- a/src/arch/x86/insts/badmicroop.cc +++ b/src/arch/x86/insts/badmicroop.cc @@ -38,8 +38,8 @@ */ #include "arch/x86/insts/badmicroop.hh" -#include "arch/x86/isa_traits.hh" #include "arch/x86/decoder.hh" +#include "arch/x86/isa_traits.hh" namespace X86ISA { diff --git a/src/arch/x86/insts/macroop.hh b/src/arch/x86/insts/macroop.hh index 4f4176b77..d12ff0d8f 100644 --- a/src/arch/x86/insts/macroop.hh +++ b/src/arch/x86/insts/macroop.hh @@ -40,10 +40,10 @@ #ifndef __ARCH_X86_INSTS_MACROOP_HH__ #define __ARCH_X86_INSTS_MACROOP_HH__ -#include "arch/x86/emulenv.hh" #include "arch/x86/insts/badmicroop.hh" -#include "arch/x86/types.hh" #include "arch/x86/insts/static_inst.hh" +#include "arch/x86/emulenv.hh" +#include "arch/x86/types.hh" namespace X86ISA { diff --git a/src/arch/x86/insts/microfpop.cc b/src/arch/x86/insts/microfpop.cc index 94194974a..000cbf635 100644 --- a/src/arch/x86/insts/microfpop.cc +++ b/src/arch/x86/insts/microfpop.cc @@ -37,9 +37,10 @@ * Authors: Gabe Black */ +#include + #include "arch/x86/insts/microfpop.hh" #include "arch/x86/regs/misc.hh" -#include namespace X86ISA { diff --git a/src/arch/x86/insts/microldstop.cc b/src/arch/x86/insts/microldstop.cc index 6d09a4baf..4fc0ec8e3 100644 --- a/src/arch/x86/insts/microldstop.cc +++ b/src/arch/x86/insts/microldstop.cc @@ -37,9 +37,10 @@ * Authors: Gabe Black */ -#include "arch/x86/insts/microldstop.hh" #include +#include "arch/x86/insts/microldstop.hh" + 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 2ed5df184..fa4d3a473 100644 --- a/src/arch/x86/insts/micromediaop.cc +++ b/src/arch/x86/insts/micromediaop.cc @@ -28,9 +28,10 @@ * Authors: Gabe Black */ +#include + #include "arch/x86/insts/micromediaop.hh" #include "arch/x86/regs/misc.hh" -#include namespace X86ISA { diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc index 837c802ec..c45b0c344 100644 --- a/src/arch/x86/interrupts.cc +++ b/src/arch/x86/interrupts.cc @@ -37,9 +37,9 @@ * Authors: Gabe Black */ +#include "arch/x86/regs/apic.hh" #include "arch/x86/interrupts.hh" #include "arch/x86/intmessage.hh" -#include "arch/x86/regs/apic.hh" #include "cpu/base.hh" #include "dev/x86/i82094aa.hh" #include "dev/x86/pc.hh" diff --git a/src/arch/x86/interrupts.hh b/src/arch/x86/interrupts.hh index e45610ec7..f5d86219b 100644 --- a/src/arch/x86/interrupts.hh +++ b/src/arch/x86/interrupts.hh @@ -40,13 +40,13 @@ #ifndef __ARCH_X86_INTERRUPTS_HH__ #define __ARCH_X86_INTERRUPTS_HH__ +#include "arch/x86/regs/apic.hh" #include "arch/x86/faults.hh" #include "arch/x86/intmessage.hh" -#include "arch/x86/regs/apic.hh" #include "base/bitfield.hh" #include "cpu/thread_context.hh" -#include "dev/io_device.hh" #include "dev/x86/intdev.hh" +#include "dev/io_device.hh" #include "params/X86LocalApic.hh" #include "sim/eventq.hh" diff --git a/src/arch/x86/isa.hh b/src/arch/x86/isa.hh index c6dea8876..463a249a4 100644 --- a/src/arch/x86/isa.hh +++ b/src/arch/x86/isa.hh @@ -31,14 +31,14 @@ #ifndef __ARCH_X86_ISA_HH__ #define __ARCH_X86_ISA_HH__ -#include "arch/x86/registers.hh" +#include +#include + #include "arch/x86/regs/float.hh" #include "arch/x86/regs/misc.hh" +#include "arch/x86/registers.hh" #include "base/types.hh" -#include -#include - class Checkpoint; class EventManager; class ThreadContext; diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa index 674e69e98..6f4c4008e 100644 --- a/src/arch/x86/isa/includes.isa +++ b/src/arch/x86/isa/includes.isa @@ -50,17 +50,17 @@ let {{ output header {{ #include -#include #include +#include #include "arch/generic/debugfaults.hh" -#include "arch/x86/emulenv.hh" #include "arch/x86/insts/macroop.hh" #include "arch/x86/insts/microfpop.hh" #include "arch/x86/insts/microldstop.hh" #include "arch/x86/insts/micromediaop.hh" #include "arch/x86/insts/microregop.hh" #include "arch/x86/insts/static_inst.hh" +#include "arch/x86/emulenv.hh" #include "arch/x86/isa_traits.hh" #include "arch/x86/registers.hh" #include "arch/x86/types.hh" @@ -73,14 +73,14 @@ using X86ISA::InstRegIndex; }}; output decoder {{ -#include "arch/x86/faults.hh" -#include "arch/x86/microcode_rom.hh" #include "arch/x86/regs/float.hh" #include "arch/x86/regs/misc.hh" #include "arch/x86/regs/segment.hh" +#include "arch/x86/faults.hh" +#include "arch/x86/microcode_rom.hh" #include "arch/x86/tlb.hh" -#include "base/cprintf.hh" #include "base/loader/symtab.hh" +#include "base/cprintf.hh" #include "base/misc.hh" #include "cpu/thread_context.hh" // for Jump::branchTarget() #include "mem/packet.hh" @@ -106,23 +106,23 @@ output exec {{ #include "sim/pseudo_inst.hh" #endif +#include #include -#include +#include "arch/x86/regs/misc.hh" #include "arch/x86/cpuid.hh" #include "arch/x86/faults.hh" -#include "arch/x86/regs/misc.hh" #include "arch/x86/tlb.hh" #include "base/bigint.hh" #include "base/compiler.hh" #include "base/condcodes.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" -#include "sim/sim_exit.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "mem/request.hh" #include "sim/pseudo_inst.hh" +#include "sim/sim_exit.hh" using namespace X86ISA; using namespace std; diff --git a/src/arch/x86/linux/linux.cc b/src/arch/x86/linux/linux.cc index 0d9d7b676..590af0e40 100644 --- a/src/arch/x86/linux/linux.cc +++ b/src/arch/x86/linux/linux.cc @@ -37,9 +37,10 @@ * Authors: Gabe Black */ -#include "arch/x86/linux/linux.hh" #include +#include "arch/x86/linux/linux.hh" + // open(2) flags translation table OpenFlagTransTable X86Linux64::openFlagTable[] = { #ifdef _MSC_VER diff --git a/src/arch/x86/linux/process.cc b/src/arch/x86/linux/process.cc index 4f7967424..2e665072b 100644 --- a/src/arch/x86/linux/process.cc +++ b/src/arch/x86/linux/process.cc @@ -37,14 +37,12 @@ * Authors: Gabe Black */ -#include "arch/x86/isa_traits.hh" #include "arch/x86/linux/process.hh" +#include "arch/x86/isa_traits.hh" #include "arch/x86/registers.hh" - #include "base/trace.hh" #include "cpu/thread_context.hh" #include "kern/linux/linux.hh" - #include "sim/process.hh" using namespace std; diff --git a/src/arch/x86/linux/process.hh b/src/arch/x86/linux/process.hh index 20012d960..789c2925a 100644 --- a/src/arch/x86/linux/process.hh +++ b/src/arch/x86/linux/process.hh @@ -40,9 +40,9 @@ #ifndef __X86_LINUX_PROCESS_HH__ #define __X86_LINUX_PROCESS_HH__ -#include "sim/process.hh" #include "arch/x86/linux/linux.hh" #include "arch/x86/process.hh" +#include "sim/process.hh" namespace X86ISA { diff --git a/src/arch/x86/linux/syscalls.cc b/src/arch/x86/linux/syscalls.cc index 87cddba4d..5ccb14394 100644 --- a/src/arch/x86/linux/syscalls.cc +++ b/src/arch/x86/linux/syscalls.cc @@ -37,8 +37,8 @@ * Authors: Gabe Black */ -#include "arch/x86/linux/process.hh" #include "arch/x86/linux/linux.hh" +#include "arch/x86/linux/process.hh" #include "arch/x86/regs/misc.hh" #include "kern/linux/linux.hh" #include "sim/syscall_emul.hh" diff --git a/src/arch/x86/linux/system.cc b/src/arch/x86/linux/system.cc index f750019a8..104f93372 100644 --- a/src/arch/x86/linux/system.cc +++ b/src/arch/x86/linux/system.cc @@ -37,9 +37,9 @@ * Authors: Gabe Black */ -#include "arch/x86/isa_traits.hh" #include "arch/x86/linux/system.hh" #include "arch/x86/regs/int.hh" +#include "arch/x86/isa_traits.hh" #include "arch/vtophys.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" @@ -47,7 +47,6 @@ #include "params/LinuxX86System.hh" #include "sim/byteswap.hh" - using namespace LittleEndianGuest; using namespace X86ISA; diff --git a/src/arch/x86/linux/system.hh b/src/arch/x86/linux/system.hh index ae7e93f3d..e8adba9f2 100644 --- a/src/arch/x86/linux/system.hh +++ b/src/arch/x86/linux/system.hh @@ -43,9 +43,9 @@ #include #include -#include "params/LinuxX86System.hh" #include "arch/x86/bios/e820.hh" #include "arch/x86/system.hh" +#include "params/LinuxX86System.hh" class LinuxX86System : public X86System { diff --git a/src/arch/x86/microcode_rom.hh b/src/arch/x86/microcode_rom.hh index 84c503bb9..4a35e06a3 100644 --- a/src/arch/x86/microcode_rom.hh +++ b/src/arch/x86/microcode_rom.hh @@ -31,8 +31,8 @@ #ifndef __ARCH_X86_MICROCODE_ROM_HH__ #define __ARCH_X86_MICROCODE_ROM_HH__ -#include "arch/x86/emulenv.hh" #include "arch/x86/insts/badmicroop.hh" +#include "arch/x86/emulenv.hh" #include "cpu/static_inst.hh" namespace X86ISAInst diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc index d1d75387d..3dd5890bc 100644 --- a/src/arch/x86/nativetrace.cc +++ b/src/arch/x86/nativetrace.cc @@ -28,10 +28,10 @@ * Authors: Gabe Black */ -#include "arch/x86/isa_traits.hh" -#include "arch/x86/nativetrace.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 "params/X86NativeTrace.hh" #include "sim/byteswap.hh" diff --git a/src/arch/x86/pagetable_walker.cc b/src/arch/x86/pagetable_walker.cc index 234ea5961..835cc69ad 100644 --- a/src/arch/x86/pagetable_walker.cc +++ b/src/arch/x86/pagetable_walker.cc @@ -42,8 +42,8 @@ #include "arch/x86/tlb.hh" #include "arch/x86/vtophys.hh" #include "base/bitfield.hh" -#include "cpu/thread_context.hh" #include "cpu/base.hh" +#include "cpu/thread_context.hh" #include "mem/packet_access.hh" #include "mem/request.hh" #include "sim/system.hh" diff --git a/src/arch/x86/pagetable_walker.hh b/src/arch/x86/pagetable_walker.hh index 007c577ae..b0edc434f 100644 --- a/src/arch/x86/pagetable_walker.hh +++ b/src/arch/x86/pagetable_walker.hh @@ -44,8 +44,8 @@ #include "arch/x86/pagetable.hh" #include "arch/x86/tlb.hh" -#include "base/types.hh" #include "base/fast_alloc.hh" +#include "base/types.hh" #include "mem/mem_object.hh" #include "mem/packet.hh" #include "params/X86PagetableWalker.hh" diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh index 5c67e28e1..f0d9cda81 100644 --- a/src/arch/x86/predecoder.hh +++ b/src/arch/x86/predecoder.hh @@ -42,8 +42,8 @@ #include -#include "arch/x86/types.hh" #include "arch/x86/regs/misc.hh" +#include "arch/x86/types.hh" #include "base/bitfield.hh" #include "base/misc.hh" #include "base/trace.hh" diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc index bb875686e..693a8fabe 100644 --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -41,13 +41,13 @@ * Ali Saidi */ -#include "arch/x86/isa_traits.hh" -#include "arch/x86/process.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/types.hh" -#include "base/loader/object_file.hh" #include "base/loader/elf_object.hh" +#include "base/loader/object_file.hh" #include "base/misc.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" diff --git a/src/arch/x86/process.hh b/src/arch/x86/process.hh index 34275b2d3..98e17715a 100644 --- a/src/arch/x86/process.hh +++ b/src/arch/x86/process.hh @@ -42,6 +42,7 @@ #include #include + #include "sim/process.hh" class SyscallDesc; diff --git a/src/arch/x86/registers.hh b/src/arch/x86/registers.hh index 5882132e5..c3bda5a19 100644 --- a/src/arch/x86/registers.hh +++ b/src/arch/x86/registers.hh @@ -40,9 +40,9 @@ #ifndef __ARCH_X86_REGISTERS_HH__ #define __ARCH_X86_REGISTERS_HH__ -#include "arch/x86/max_inst_regs.hh" #include "arch/x86/regs/int.hh" #include "arch/x86/regs/misc.hh" +#include "arch/x86/max_inst_regs.hh" #include "arch/x86/x86_traits.hh" namespace X86ISA diff --git a/src/arch/x86/remote_gdb.cc b/src/arch/x86/remote_gdb.cc index 9985374d0..8db7a6088 100644 --- a/src/arch/x86/remote_gdb.cc +++ b/src/arch/x86/remote_gdb.cc @@ -38,12 +38,12 @@ */ #include +#include #include -#include -#include "arch/vtophys.hh" #include "arch/x86/remote_gdb.hh" +#include "arch/vtophys.hh" #include "base/remote_gdb.hh" #include "base/socket.hh" #include "base/trace.hh" diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc index 20ee484fb..d287e3947 100644 --- a/src/arch/x86/system.cc +++ b/src/arch/x86/system.cc @@ -37,22 +37,21 @@ * Authors: Gabe Black */ -#include "arch/x86/bios/smbios.hh" #include "arch/x86/bios/intelmp.hh" -#include "arch/x86/isa_traits.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 "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/physical.hh" #include "params/X86System.hh" #include "sim/byteswap.hh" - using namespace LittleEndianGuest; using namespace X86ISA; diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc index ac32e86d7..f5e73dcee 100644 --- a/src/arch/x86/tlb.cc +++ b/src/arch/x86/tlb.cc @@ -39,19 +39,17 @@ #include -#include "config/full_system.hh" - -#include "arch/x86/faults.hh" #include "arch/x86/insts/microldstop.hh" -#include "arch/x86/pagetable.hh" #include "arch/x86/regs/misc.hh" +#include "arch/x86/faults.hh" +#include "arch/x86/pagetable.hh" #include "arch/x86/tlb.hh" #include "arch/x86/x86_traits.hh" #include "base/bitfield.hh" #include "base/trace.hh" #include "config/full_system.hh" -#include "cpu/thread_context.hh" #include "cpu/base.hh" +#include "cpu/thread_context.hh" #include "mem/packet_access.hh" #include "mem/request.hh" diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh index 965d331ba..e4ea0e1b7 100644 --- a/src/arch/x86/tlb.hh +++ b/src/arch/x86/tlb.hh @@ -41,18 +41,18 @@ #define __ARCH_X86_TLB_HH__ #include -#include #include +#include -#include "arch/x86/pagetable.hh" #include "arch/x86/regs/segment.hh" +#include "arch/x86/pagetable.hh" #include "config/full_system.hh" #include "mem/mem_object.hh" #include "mem/request.hh" #include "params/X86TLB.hh" #include "sim/fault_fwd.hh" -#include "sim/tlb.hh" #include "sim/sim_object.hh" +#include "sim/tlb.hh" class ThreadContext; class Packet; -- cgit v1.2.3