summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/alpha/interrupts.hh2
-rw-r--r--src/arch/alpha/kernel_stats.cc1
-rw-r--r--src/arch/alpha/linux/process.cc1
-rw-r--r--src/arch/alpha/linux/system.cc1
-rw-r--r--src/arch/alpha/process.cc1
-rw-r--r--src/arch/alpha/remote_gdb.cc2
-rw-r--r--src/arch/alpha/stacktrace.hh1
-rw-r--r--src/arch/alpha/system.cc1
-rw-r--r--src/arch/alpha/tlb.cc1
-rw-r--r--src/arch/alpha/vtophys.cc1
-rw-r--r--src/arch/arm/faults.cc1
-rw-r--r--src/arch/arm/isa.cc2
-rw-r--r--src/arch/arm/isa.hh1
-rw-r--r--src/arch/arm/isa/includes.isa1
-rw-r--r--src/arch/arm/nativetrace.cc1
-rw-r--r--src/arch/arm/predecoder.cc1
-rw-r--r--src/arch/arm/process.cc1
-rw-r--r--src/arch/arm/remote_gdb.cc2
-rw-r--r--src/arch/arm/stacktrace.hh1
-rw-r--r--src/arch/arm/tlb.cc3
-rw-r--r--src/arch/arm/types.hh1
-rw-r--r--src/arch/mips/faults.cc1
-rw-r--r--src/arch/mips/isa.cc1
-rw-r--r--src/arch/mips/isa/includes.isa1
-rw-r--r--src/arch/mips/linux/process.cc1
-rw-r--r--src/arch/mips/locked_mem.hh1
-rw-r--r--src/arch/mips/process.cc1
-rw-r--r--src/arch/mips/stacktrace.hh1
-rw-r--r--src/arch/mips/tlb.cc2
-rw-r--r--src/arch/power/process.cc1
-rw-r--r--src/arch/power/stacktrace.hh1
-rw-r--r--src/arch/power/tlb.cc2
-rw-r--r--src/arch/sparc/interrupts.hh1
-rw-r--r--src/arch/sparc/isa.cc2
-rw-r--r--src/arch/sparc/isa/includes.isa1
-rw-r--r--src/arch/sparc/process.cc1
-rw-r--r--src/arch/sparc/remote_gdb.cc1
-rw-r--r--src/arch/sparc/stacktrace.hh1
-rw-r--r--src/arch/sparc/tlb.cc2
-rw-r--r--src/arch/sparc/ua2005.cc2
-rw-r--r--src/arch/sparc/vtophys.cc1
-rw-r--r--src/arch/x86/faults.cc2
-rw-r--r--src/arch/x86/insts/microregop.cc1
-rw-r--r--src/arch/x86/insts/static_inst.hh1
-rw-r--r--src/arch/x86/interrupts.cc1
-rw-r--r--src/arch/x86/isa/includes.isa1
-rw-r--r--src/arch/x86/nativetrace.cc1
-rw-r--r--src/arch/x86/pagetable_walker.cc1
-rw-r--r--src/arch/x86/predecoder.cc1
-rw-r--r--src/arch/x86/predecoder.hh1
-rw-r--r--src/arch/x86/process.cc1
-rw-r--r--src/arch/x86/stacktrace.hh1
-rw-r--r--src/arch/x86/tlb.cc1
-rw-r--r--src/arch/x86/vtophys.cc1
54 files changed, 66 insertions, 0 deletions
diff --git a/src/arch/alpha/interrupts.hh b/src/arch/alpha/interrupts.hh
index cbaa8e9bf..ce3108d79 100644
--- a/src/arch/alpha/interrupts.hh
+++ b/src/arch/alpha/interrupts.hh
@@ -37,6 +37,8 @@
#include "base/compiler.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/Flow.hh"
+#include "debug/Interrupt.hh"
#include "params/AlphaInterrupts.hh"
#include "sim/sim_object.hh"
diff --git a/src/arch/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc
index 70eeadd8e..c057e7f16 100644
--- a/src/arch/alpha/kernel_stats.cc
+++ b/src/arch/alpha/kernel_stats.cc
@@ -38,6 +38,7 @@
#include "arch/alpha/osfpal.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/Context.hh"
#include "kern/tru64/tru64_syscalls.hh"
#include "sim/system.hh"
diff --git a/src/arch/alpha/linux/process.cc b/src/arch/alpha/linux/process.cc
index 0e3c4ea37..97df1feca 100644
--- a/src/arch/alpha/linux/process.cc
+++ b/src/arch/alpha/linux/process.cc
@@ -34,6 +34,7 @@
#include "arch/alpha/isa_traits.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/SyscallVerbose.hh"
#include "kern/linux/linux.hh"
#include "sim/process.hh"
#include "sim/syscall_emul.hh"
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index e7440e003..6ca603a3b 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -48,6 +48,7 @@
#include "base/loader/symtab.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/Thread.hh"
#include "dev/platform.hh"
#include "kern/linux/events.hh"
#include "kern/linux/printk.hh"
diff --git a/src/arch/alpha/process.cc b/src/arch/alpha/process.cc
index 269a7bd63..637fbe065 100644
--- a/src/arch/alpha/process.cc
+++ b/src/arch/alpha/process.cc
@@ -35,6 +35,7 @@
#include "base/loader/object_file.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
+#include "debug/Loader.hh"
#include "mem/page_table.hh"
#include "sim/byteswap.hh"
#include "sim/process_impl.hh"
diff --git a/src/arch/alpha/remote_gdb.cc b/src/arch/alpha/remote_gdb.cc
index f05b448fa..82fd9c227 100644
--- a/src/arch/alpha/remote_gdb.cc
+++ b/src/arch/alpha/remote_gdb.cc
@@ -136,6 +136,8 @@
#include "base/trace.hh"
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
+#include "debug/GDBAcc.hh"
+#include "debug/GDBMisc.hh"
#include "mem/physical.hh"
#include "mem/port.hh"
#include "sim/system.hh"
diff --git a/src/arch/alpha/stacktrace.hh b/src/arch/alpha/stacktrace.hh
index c09ab3576..669c65781 100644
--- a/src/arch/alpha/stacktrace.hh
+++ b/src/arch/alpha/stacktrace.hh
@@ -33,6 +33,7 @@
#include "base/trace.hh"
#include "cpu/static_inst.hh"
+#include "debug/Stack.hh"
class ThreadContext;
diff --git a/src/arch/alpha/system.cc b/src/arch/alpha/system.cc
index 4964347fb..6a55ef8ae 100644
--- a/src/arch/alpha/system.cc
+++ b/src/arch/alpha/system.cc
@@ -37,6 +37,7 @@
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
#include "base/trace.hh"
+#include "debug/Loader.hh"
#include "mem/physical.hh"
#include "mem/vport.hh"
#include "params/AlphaSystem.hh"
diff --git a/src/arch/alpha/tlb.cc b/src/arch/alpha/tlb.cc
index 6bcfffa3a..2c7e6732a 100644
--- a/src/arch/alpha/tlb.cc
+++ b/src/arch/alpha/tlb.cc
@@ -40,6 +40,7 @@
#include "base/str.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/TLB.hh"
using namespace std;
diff --git a/src/arch/alpha/vtophys.cc b/src/arch/alpha/vtophys.cc
index 4a043d8d1..c51cddd11 100644
--- a/src/arch/alpha/vtophys.cc
+++ b/src/arch/alpha/vtophys.cc
@@ -37,6 +37,7 @@
#include "base/chunk_generator.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/VtoPhys.hh"
#include "mem/vport.hh"
using namespace std;
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 4150adba6..03a65ea88 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -46,6 +46,7 @@
#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/Faults.hh"
namespace ArmISA
{
diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 9988d431a..f7334ca9b 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -39,6 +39,8 @@
*/
#include "arch/arm/isa.hh"
+#include "debug/Arm.hh"
+#include "debug/MiscRegs.hh"
#include "sim/faults.hh"
#include "sim/stat_control.hh"
diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh
index 88d08e971..48840bf07 100644
--- a/src/arch/arm/isa.hh
+++ b/src/arch/arm/isa.hh
@@ -46,6 +46,7 @@
#include "arch/arm/registers.hh"
#include "arch/arm/tlb.hh"
#include "arch/arm/types.hh"
+#include "debug/Checkpoint.hh"
class ThreadContext;
class Checkpoint;
diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa
index aebce0944..b54545e10 100644
--- a/src/arch/arm/isa/includes.isa
+++ b/src/arch/arm/isa/includes.isa
@@ -87,6 +87,7 @@ output exec {{
#endif
#include "base/cp_annotate.hh"
+#include "debug/Arm.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/sim_exit.hh"
diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc
index 531a6ee2e..2dd225e80 100644
--- a/src/arch/arm/nativetrace.cc
+++ b/src/arch/arm/nativetrace.cc
@@ -44,6 +44,7 @@
#include "arch/arm/miscregs.hh"
#include "arch/arm/nativetrace.hh"
#include "cpu/thread_context.hh"
+#include "debug/ExecRegDelta.hh"
#include "params/ArmNativeTrace.hh"
#include "sim/byteswap.hh"
diff --git a/src/arch/arm/predecoder.cc b/src/arch/arm/predecoder.cc
index b87ca622e..a221f4e30 100644
--- a/src/arch/arm/predecoder.cc
+++ b/src/arch/arm/predecoder.cc
@@ -46,6 +46,7 @@
#include "arch/arm/utility.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/Predecoder.hh"
namespace ArmISA
{
diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc
index 61349192f..c3b02744e 100644
--- a/src/arch/arm/process.cc
+++ b/src/arch/arm/process.cc
@@ -48,6 +48,7 @@
#include "base/loader/object_file.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
+#include "debug/Stack.hh"
#include "mem/page_table.hh"
#include "mem/translating_port.hh"
#include "sim/byteswap.hh"
diff --git a/src/arch/arm/remote_gdb.cc b/src/arch/arm/remote_gdb.cc
index 2a4680782..1303f6ffc 100644
--- a/src/arch/arm/remote_gdb.cc
+++ b/src/arch/arm/remote_gdb.cc
@@ -151,6 +151,8 @@
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
#include "cpu/thread_state.hh"
+#include "debug/GDBAcc.hh"
+#include "debug/GDBMisc.hh"
#include "mem/page_table.hh"
#include "mem/physical.hh"
#include "mem/port.hh"
diff --git a/src/arch/arm/stacktrace.hh b/src/arch/arm/stacktrace.hh
index 05fdb9e78..f88ed352b 100644
--- a/src/arch/arm/stacktrace.hh
+++ b/src/arch/arm/stacktrace.hh
@@ -33,6 +33,7 @@
#include "base/trace.hh"
#include "cpu/static_inst.hh"
+#include "debug/Stack.hh"
class ThreadContext;
namespace ArmISA
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index ccbca3d9c..ca2b68b3b 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -53,6 +53,9 @@
#include "base/str.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/TLB.hh"
+#include "debug/TLBVerbose.hh"
#include "mem/page_table.hh"
#include "params/ArmTLB.hh"
#include "sim/process.hh"
diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index 6bd449e3d..9e7c0ff7f 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -48,6 +48,7 @@
#include "base/hashmap.hh"
#include "base/misc.hh"
#include "base/types.hh"
+#include "debug/Predecoder.hh"
namespace ArmISA
{
diff --git a/src/arch/mips/faults.cc b/src/arch/mips/faults.cc
index 9bb945dba..652b5960c 100644
--- a/src/arch/mips/faults.cc
+++ b/src/arch/mips/faults.cc
@@ -36,6 +36,7 @@
#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/MipsPRA.hh"
#if !FULL_SYSTEM
#include "mem/page_table.hh"
diff --git a/src/arch/mips/isa.cc b/src/arch/mips/isa.cc
index 902574bac..6a525ed3a 100644
--- a/src/arch/mips/isa.cc
+++ b/src/arch/mips/isa.cc
@@ -35,6 +35,7 @@
#include "base/bitfield.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/MipsPRA.hh"
namespace MipsISA
{
diff --git a/src/arch/mips/isa/includes.isa b/src/arch/mips/isa/includes.isa
index b0d1aa748..73d751f6e 100644
--- a/src/arch/mips/isa/includes.isa
+++ b/src/arch/mips/isa/includes.isa
@@ -82,6 +82,7 @@ output exec {{
#include "cpu/base.hh"
#include "cpu/exetrace.hh"
+#include "debug/MipsPRA.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/eventq.hh"
diff --git a/src/arch/mips/linux/process.cc b/src/arch/mips/linux/process.cc
index fa8e659b6..156d4ea05 100644
--- a/src/arch/mips/linux/process.cc
+++ b/src/arch/mips/linux/process.cc
@@ -35,6 +35,7 @@
#include "arch/mips/isa_traits.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/SyscallVerbose.hh"
#include "kern/linux/linux.hh"
#include "sim/eventq.hh"
#include "sim/process.hh"
diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh
index 1cc08ee3d..60df8252a 100644
--- a/src/arch/mips/locked_mem.hh
+++ b/src/arch/mips/locked_mem.hh
@@ -40,6 +40,7 @@
#include "arch/registers.hh"
#include "base/misc.hh"
#include "base/trace.hh"
+#include "debug/LLSC.hh"
#include "mem/request.hh"
namespace MipsISA
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index b6f21c95c..c62b60b98 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -36,6 +36,7 @@
#include "base/loader/object_file.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
+#include "debug/Loader.hh"
#include "mem/page_table.hh"
#include "sim/process.hh"
#include "sim/process_impl.hh"
diff --git a/src/arch/mips/stacktrace.hh b/src/arch/mips/stacktrace.hh
index 4c02cc86c..8520c3d1b 100644
--- a/src/arch/mips/stacktrace.hh
+++ b/src/arch/mips/stacktrace.hh
@@ -33,6 +33,7 @@
#include "base/trace.hh"
#include "cpu/static_inst.hh"
+#include "debug/Stack.hh"
class ThreadContext;
diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc
index b73eae72f..0f76363c8 100644
--- a/src/arch/mips/tlb.cc
+++ b/src/arch/mips/tlb.cc
@@ -43,6 +43,8 @@
#include "base/str.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/MipsPRA.hh"
+#include "debug/TLB.hh"
#include "mem/page_table.hh"
#include "params/MipsTLB.hh"
#include "sim/process.hh"
diff --git a/src/arch/power/process.cc b/src/arch/power/process.cc
index a34a874bc..d12e3eab6 100644
--- a/src/arch/power/process.cc
+++ b/src/arch/power/process.cc
@@ -37,6 +37,7 @@
#include "base/loader/object_file.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
+#include "debug/Stack.hh"
#include "mem/page_table.hh"
#include "mem/translating_port.hh"
#include "sim/process_impl.hh"
diff --git a/src/arch/power/stacktrace.hh b/src/arch/power/stacktrace.hh
index e87203df6..72a66e5bd 100644
--- a/src/arch/power/stacktrace.hh
+++ b/src/arch/power/stacktrace.hh
@@ -37,6 +37,7 @@
#include "base/trace.hh"
#include "cpu/static_inst.hh"
+#include "debug/Stack.hh"
class ThreadContext;
class StackTrace;
diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc
index aa47b83c0..8a088032c 100644
--- a/src/arch/power/tlb.cc
+++ b/src/arch/power/tlb.cc
@@ -46,6 +46,8 @@
#include "base/str.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/Power.hh"
+#include "debug/TLB.hh"
#include "mem/page_table.hh"
#include "params/PowerTLB.hh"
#include "sim/process.hh"
diff --git a/src/arch/sparc/interrupts.hh b/src/arch/sparc/interrupts.hh
index 5e9ae2de0..b728e7188 100644
--- a/src/arch/sparc/interrupts.hh
+++ b/src/arch/sparc/interrupts.hh
@@ -36,6 +36,7 @@
#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
#include "cpu/thread_context.hh"
+#include "debug/Interrupt.hh"
#include "params/SparcInterrupts.hh"
#include "sim/sim_object.hh"
diff --git a/src/arch/sparc/isa.cc b/src/arch/sparc/isa.cc
index c60567598..6c9be8164 100644
--- a/src/arch/sparc/isa.cc
+++ b/src/arch/sparc/isa.cc
@@ -35,6 +35,8 @@
#include "config/full_system.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/MiscRegs.hh"
+#include "debug/Timer.hh"
namespace SparcISA
{
diff --git a/src/arch/sparc/isa/includes.isa b/src/arch/sparc/isa/includes.isa
index 8ef753d2e..885cd9cc2 100644
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@ -74,6 +74,7 @@ output exec {{
#include "base/bigint.hh"
#include "cpu/base.hh"
#include "cpu/exetrace.hh"
+#include "debug/Sparc.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "sim/sim_exit.hh"
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index bd3db92b6..3eee3d137 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -39,6 +39,7 @@
#include "base/loader/object_file.hh"
#include "base/misc.hh"
#include "cpu/thread_context.hh"
+#include "debug/Stack.hh"
#include "mem/page_table.hh"
#include "mem/translating_port.hh"
#include "sim/process_impl.hh"
diff --git a/src/arch/sparc/remote_gdb.cc b/src/arch/sparc/remote_gdb.cc
index 86c287237..48f0c3e47 100644
--- a/src/arch/sparc/remote_gdb.cc
+++ b/src/arch/sparc/remote_gdb.cc
@@ -130,6 +130,7 @@
#include "config/full_system.hh"
#include "cpu/static_inst.hh"
#include "cpu/thread_context.hh"
+#include "debug/GDBRead.hh"
#include "mem/page_table.hh"
#include "mem/physical.hh"
#include "mem/port.hh"
diff --git a/src/arch/sparc/stacktrace.hh b/src/arch/sparc/stacktrace.hh
index 0b7d0b0c1..1e7853d1c 100644
--- a/src/arch/sparc/stacktrace.hh
+++ b/src/arch/sparc/stacktrace.hh
@@ -35,6 +35,7 @@
#include "base/types.hh"
#include "cpu/static_inst.hh"
+#include "debug/Stack.hh"
class ThreadContext;
namespace SparcISA
diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 8742cfd32..00ec4e411 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -38,6 +38,8 @@
#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/IPR.hh"
+#include "debug/TLB.hh"
#include "mem/packet_access.hh"
#include "mem/request.hh"
#include "sim/system.hh"
diff --git a/src/arch/sparc/ua2005.cc b/src/arch/sparc/ua2005.cc
index efab8b832..67c17900b 100644
--- a/src/arch/sparc/ua2005.cc
+++ b/src/arch/sparc/ua2005.cc
@@ -33,6 +33,8 @@
#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/Quiesce.hh"
+#include "debug/Timer.hh"
#include "sim/system.hh"
using namespace SparcISA;
diff --git a/src/arch/sparc/vtophys.cc b/src/arch/sparc/vtophys.cc
index c8f35fe8b..edcf88828 100644
--- a/src/arch/sparc/vtophys.cc
+++ b/src/arch/sparc/vtophys.cc
@@ -36,6 +36,7 @@
#include "base/compiler.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/VtoPhys.hh"
#include "mem/vport.hh"
using namespace std;
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index 7fb677c69..feb88fd76 100644
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -45,12 +45,14 @@
#include "base/trace.hh"
#include "config/full_system.hh"
#include "cpu/thread_context.hh"
+
#if !FULL_SYSTEM
#include "arch/x86/isa_traits.hh"
#include "mem/page_table.hh"
#include "sim/process.hh"
#else
#include "arch/x86/tlb.hh"
+#include "debug/Faults.hh"
#endif
namespace X86ISA
diff --git a/src/arch/x86/insts/microregop.cc b/src/arch/x86/insts/microregop.cc
index dedea0f3d..f5f32e30f 100644
--- a/src/arch/x86/insts/microregop.cc
+++ b/src/arch/x86/insts/microregop.cc
@@ -42,6 +42,7 @@
#include "arch/x86/insts/microregop.hh"
#include "arch/x86/regs/misc.hh"
#include "base/condcodes.hh"
+#include "debug/X86.hh"
namespace X86ISA
{
diff --git a/src/arch/x86/insts/static_inst.hh b/src/arch/x86/insts/static_inst.hh
index 8813f216c..b4e348fd9 100644
--- a/src/arch/x86/insts/static_inst.hh
+++ b/src/arch/x86/insts/static_inst.hh
@@ -42,6 +42,7 @@
#include "base/trace.hh"
#include "cpu/static_inst.hh"
+#include "debug/X86.hh"
namespace X86ISA
{
diff --git a/src/arch/x86/interrupts.cc b/src/arch/x86/interrupts.cc
index c45b0c344..7d6f6e35e 100644
--- a/src/arch/x86/interrupts.cc
+++ b/src/arch/x86/interrupts.cc
@@ -41,6 +41,7 @@
#include "arch/x86/interrupts.hh"
#include "arch/x86/intmessage.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"
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 6f4c4008e..8d4af6829 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -118,6 +118,7 @@ output exec {{
#include "base/condcodes.hh"
#include "cpu/base.hh"
#include "cpu/exetrace.hh"
+#include "debug/X86.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "mem/request.hh"
diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index 3dd5890bc..557508ee7 100644
--- a/src/arch/x86/nativetrace.cc
+++ b/src/arch/x86/nativetrace.cc
@@ -33,6 +33,7 @@
#include "arch/x86/isa_traits.hh"
#include "arch/x86/nativetrace.hh"
#include "cpu/thread_context.hh"
+#include "debug/ExecRegDelta.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 835cc69ad..c80fe10fc 100644
--- a/src/arch/x86/pagetable_walker.cc
+++ b/src/arch/x86/pagetable_walker.cc
@@ -44,6 +44,7 @@
#include "base/bitfield.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/PageTableWalker.hh"
#include "mem/packet_access.hh"
#include "mem/request.hh"
#include "sim/system.hh"
diff --git a/src/arch/x86/predecoder.cc b/src/arch/x86/predecoder.cc
index 0318230e5..429b91687 100644
--- a/src/arch/x86/predecoder.cc
+++ b/src/arch/x86/predecoder.cc
@@ -43,6 +43,7 @@
#include "base/trace.hh"
#include "base/types.hh"
#include "cpu/thread_context.hh"
+#include "debug/Predecoder.hh"
namespace X86ISA
{
diff --git a/src/arch/x86/predecoder.hh b/src/arch/x86/predecoder.hh
index f0d9cda81..49938dd16 100644
--- a/src/arch/x86/predecoder.hh
+++ b/src/arch/x86/predecoder.hh
@@ -48,6 +48,7 @@
#include "base/misc.hh"
#include "base/trace.hh"
#include "base/types.hh"
+#include "debug/Predecoder.hh"
class ThreadContext;
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 693a8fabe..79a140776 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -51,6 +51,7 @@
#include "base/misc.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
+#include "debug/Stack.hh"
#include "mem/page_table.hh"
#include "mem/translating_port.hh"
#include "sim/process_impl.hh"
diff --git a/src/arch/x86/stacktrace.hh b/src/arch/x86/stacktrace.hh
index 854fb397c..e9d6900d8 100644
--- a/src/arch/x86/stacktrace.hh
+++ b/src/arch/x86/stacktrace.hh
@@ -33,6 +33,7 @@
#include "base/trace.hh"
#include "cpu/static_inst.hh"
+#include "debug/Stack.hh"
class ThreadContext;
namespace X86ISA
diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index f5e73dcee..199f070d3 100644
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -50,6 +50,7 @@
#include "config/full_system.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/TLB.hh"
#include "mem/packet_access.hh"
#include "mem/request.hh"
diff --git a/src/arch/x86/vtophys.cc b/src/arch/x86/vtophys.cc
index 0fa43fd4c..60ce37131 100644
--- a/src/arch/x86/vtophys.cc
+++ b/src/arch/x86/vtophys.cc
@@ -45,6 +45,7 @@
#include "base/trace.hh"
#include "config/full_system.hh"
#include "cpu/thread_context.hh"
+#include "debug/VtoPhys.hh"
#include "sim/fault_fwd.hh"
using namespace std;