diff options
Diffstat (limited to 'src/arch/x86')
-rw-r--r-- | src/arch/x86/isa_traits.hh | 1 | ||||
-rw-r--r-- | src/arch/x86/pagetable.hh | 3 | ||||
-rw-r--r-- | src/arch/x86/process.cc | 1 | ||||
-rw-r--r-- | src/arch/x86/pseudo_inst.cc | 3 | ||||
-rw-r--r-- | src/arch/x86/system.cc | 7 | ||||
-rw-r--r-- | src/arch/x86/system.hh | 4 | ||||
-rw-r--r-- | src/arch/x86/tlb.cc | 4 | ||||
-rw-r--r-- | src/arch/x86/tlb.hh | 5 | ||||
-rw-r--r-- | src/arch/x86/utility.cc | 3 | ||||
-rw-r--r-- | src/arch/x86/utility.hh | 6 |
10 files changed, 6 insertions, 31 deletions
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh index fcdffec1c..88cd16eff 100644 --- a/src/arch/x86/isa_traits.hh +++ b/src/arch/x86/isa_traits.hh @@ -42,6 +42,7 @@ #include "arch/x86/types.hh" #include "arch/x86/x86_traits.hh" +#include "base/compiler.hh" #include "base/types.hh" namespace LittleEndianGuest {} diff --git a/src/arch/x86/pagetable.hh b/src/arch/x86/pagetable.hh index 1361109d5..354fb5a5c 100644 --- a/src/arch/x86/pagetable.hh +++ b/src/arch/x86/pagetable.hh @@ -46,14 +46,13 @@ #include <vector> #include "base/bitunion.hh" -#include "base/misc.hh" #include "base/types.hh" #include "base/trie.hh" -#include "cpu/thread_context.hh" #include "arch/x86/system.hh" #include "debug/MMU.hh" class Checkpoint; +class ThreadContext; namespace X86ISA { diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc index 116304fb4..a37468a88 100644 --- a/src/arch/x86/process.cc +++ b/src/arch/x86/process.cc @@ -59,6 +59,7 @@ #include "mem/page_table.hh" #include "sim/process_impl.hh" #include "sim/syscall_desc.hh" +#include "sim/syscall_return.hh" #include "sim/system.hh" using namespace std; diff --git a/src/arch/x86/pseudo_inst.cc b/src/arch/x86/pseudo_inst.cc index edba0474a..acf310631 100644 --- a/src/arch/x86/pseudo_inst.cc +++ b/src/arch/x86/pseudo_inst.cc @@ -31,9 +31,10 @@ #include "arch/x86/pseudo_inst.hh" #include "arch/x86/system.hh" +#include "cpu/thread_context.hh" #include "debug/PseudoInst.hh" +#include "mem/se_translating_port_proxy.hh" #include "sim/process.hh" -#include "sim/system.hh" using namespace X86ISA; diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc index 25a1bd0df..ecde8366a 100644 --- a/src/arch/x86/system.cc +++ b/src/arch/x86/system.cc @@ -39,19 +39,12 @@ #include "arch/x86/system.hh" -#include "arch/vtophys.hh" #include "arch/x86/bios/intelmp.hh" #include "arch/x86/bios/smbios.hh" #include "arch/x86/isa_traits.hh" -#include "arch/x86/regs/misc.hh" -#include "base/intmath.hh" #include "base/loader/object_file.hh" -#include "base/loader/symtab.hh" -#include "base/trace.hh" #include "cpu/thread_context.hh" -#include "mem/port_proxy.hh" #include "params/X86System.hh" -#include "sim/byteswap.hh" using namespace LittleEndianGuest; using namespace X86ISA; diff --git a/src/arch/x86/system.hh b/src/arch/x86/system.hh index 578110a7b..45bc9651c 100644 --- a/src/arch/x86/system.hh +++ b/src/arch/x86/system.hh @@ -44,11 +44,7 @@ #include <vector> #include "arch/x86/regs/misc.hh" -#include "base/loader/symtab.hh" -#include "cpu/pc_event.hh" -#include "kern/system_events.hh" #include "params/X86System.hh" -#include "sim/sim_object.hh" #include "sim/system.hh" namespace X86ISA diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc index 2e24b20e5..a5e8f5524 100644 --- a/src/arch/x86/tlb.cc +++ b/src/arch/x86/tlb.cc @@ -45,17 +45,13 @@ #include "arch/generic/mmapped_ipr.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/regs/misc.hh" #include "arch/x86/regs/msr.hh" #include "arch/x86/x86_traits.hh" -#include "base/bitfield.hh" #include "base/trace.hh" -#include "cpu/base.hh" #include "cpu/thread_context.hh" #include "debug/TLB.hh" -#include "mem/packet_access.hh" #include "mem/page_table.hh" #include "mem/request.hh" #include "sim/full_system.hh" diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh index 53f61dcbc..a134ad427 100644 --- a/src/arch/x86/tlb.hh +++ b/src/arch/x86/tlb.hh @@ -41,20 +41,15 @@ #define __ARCH_X86_TLB_HH__ #include <list> -#include <string> #include <vector> #include "arch/generic/tlb.hh" -#include "arch/x86/regs/segment.hh" #include "arch/x86/pagetable.hh" #include "base/trie.hh" -#include "mem/mem_object.hh" #include "mem/request.hh" #include "params/X86TLB.hh" -#include "sim/sim_object.hh" class ThreadContext; -class Packet; namespace X86ISA { diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc index ae0a833e6..33b53ca92 100644 --- a/src/arch/x86/utility.cc +++ b/src/arch/x86/utility.cc @@ -42,11 +42,10 @@ #include "arch/x86/interrupts.hh" #include "arch/x86/registers.hh" -#include "arch/x86/tlb.hh" #include "arch/x86/x86_traits.hh" #include "cpu/base.hh" #include "fputils/fp80.h" -#include "sim/system.hh" +#include "sim/full_system.hh" namespace X86ISA { diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh index 87bed9762..87d5cbb6c 100644 --- a/src/arch/x86/utility.hh +++ b/src/arch/x86/utility.hh @@ -40,16 +40,10 @@ #ifndef __ARCH_X86_UTILITY_HH__ #define __ARCH_X86_UTILITY_HH__ -#include "arch/x86/regs/misc.hh" -#include "arch/x86/types.hh" -#include "base/misc.hh" -#include "base/types.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "sim/full_system.hh" -class ThreadContext; - namespace X86ISA { |