diff options
Diffstat (limited to 'src/arch/x86')
31 files changed, 60 insertions, 64 deletions
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 <vector> #include "base/bitfield.hh" -#include "sim/sim_object.hh" - #include "enums/X86IntelMPAddressType.hh" #include "enums/X86IntelMPInterruptType.hh" #include "enums/X86IntelMPPolarity.hh" #include "enums/X86IntelMPRangeList.hh" #include "enums/X86IntelMPTriggerMode.hh" +#include "sim/sim_object.hh" class FunctionalPort; 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 <string> + #include "base/bitunion.hh" #include "base/misc.hh" #include "sim/faults.hh" #include "sim/tlb.hh" -#include <string> - namespace X86ISA { // Base class for all x86 "faults" where faults is in the m5 sense 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 <string> + #include "arch/x86/insts/microfpop.hh" #include "arch/x86/regs/misc.hh" -#include <string> 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 <string> +#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 <string> + #include "arch/x86/insts/micromediaop.hh" #include "arch/x86/regs/misc.hh" -#include <string> 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 <iostream> +#include <string> + #include "arch/x86/regs/float.hh" #include "arch/x86/regs/misc.hh" +#include "arch/x86/registers.hh" #include "base/types.hh" -#include <string> -#include <iostream> - class Checkpoint; class EventManager; class ThreadContext; 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 <cstring> -#include <sstream> #include <iostream> +#include <sstream> #include "arch/generic/debugfaults.hh" -#include "arch/x86/emulenv.hh" #include "arch/x86/insts/macroop.hh" #include "arch/x86/insts/microfpop.hh" #include "arch/x86/insts/microldstop.hh" #include "arch/x86/insts/micromediaop.hh" #include "arch/x86/insts/microregop.hh" #include "arch/x86/insts/static_inst.hh" +#include "arch/x86/emulenv.hh" #include "arch/x86/isa_traits.hh" #include "arch/x86/registers.hh" #include "arch/x86/types.hh" @@ -73,14 +73,14 @@ using X86ISA::InstRegIndex; }}; output decoder {{ -#include "arch/x86/faults.hh" -#include "arch/x86/microcode_rom.hh" #include "arch/x86/regs/float.hh" #include "arch/x86/regs/misc.hh" #include "arch/x86/regs/segment.hh" +#include "arch/x86/faults.hh" +#include "arch/x86/microcode_rom.hh" #include "arch/x86/tlb.hh" -#include "base/cprintf.hh" #include "base/loader/symtab.hh" +#include "base/cprintf.hh" #include "base/misc.hh" #include "cpu/thread_context.hh" // for Jump::branchTarget() #include "mem/packet.hh" @@ -106,23 +106,23 @@ output exec {{ #include "sim/pseudo_inst.hh" #endif +#include <cmath> #include <limits> -#include <cmath> +#include "arch/x86/regs/misc.hh" #include "arch/x86/cpuid.hh" #include "arch/x86/faults.hh" -#include "arch/x86/regs/misc.hh" #include "arch/x86/tlb.hh" #include "base/bigint.hh" #include "base/compiler.hh" #include "base/condcodes.hh" #include "cpu/base.hh" #include "cpu/exetrace.hh" -#include "sim/sim_exit.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" #include "mem/request.hh" #include "sim/pseudo_inst.hh" +#include "sim/sim_exit.hh" using namespace X86ISA; using namespace std; 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 <fcntl.h> +#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 <string> #include <vector> -#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 <cassert> -#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 <string> #include <vector> + #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 <sys/signal.h> +#include <unistd.h> #include <string> -#include <unistd.h> -#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 <cstring> -#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 <list> -#include <vector> #include <string> +#include <vector> -#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; |