summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/arch/SConscript1
-rw-r--r--src/arch/alpha/SConscript2
-rw-r--r--src/arch/alpha/ev5.cc2
-rw-r--r--src/arch/alpha/idle_event.cc (renamed from src/kern/alpha/idle_event.cc)4
-rw-r--r--src/arch/alpha/idle_event.hh (renamed from src/kern/alpha/idle_event.hh)0
-rw-r--r--src/arch/alpha/kernel_stats.cc (renamed from src/kern/alpha/kernel_stats.cc)2
-rw-r--r--src/arch/alpha/kernel_stats.hh (renamed from src/kern/alpha/kernel_stats.hh)2
-rw-r--r--src/arch/alpha/linux/system.cc2
-rw-r--r--src/arch/alpha/linux/system.hh2
-rw-r--r--src/arch/sparc/kernel_stats.hh (renamed from src/kern/sparc/kernel_stats.hh)2
-rw-r--r--src/cpu/checker/cpu.cc2
-rw-r--r--src/cpu/o3/alpha/cpu_impl.hh2
-rw-r--r--src/cpu/o3/regfile.hh2
-rw-r--r--src/cpu/ozone/cpu_impl.hh6
-rw-r--r--src/cpu/ozone/dyn_inst_impl.hh3
-rw-r--r--src/cpu/simple/base.cc4
-rw-r--r--src/cpu/simple_thread.cc2
-rw-r--r--src/cpu/thread_state.cc2
-rw-r--r--src/kern/SConscript23
-rw-r--r--src/kern/kernel_stats.cc (renamed from src/kern/base_kernel_stats.cc)2
-rw-r--r--src/kern/kernel_stats.hh (renamed from src/kern/base_kernel_stats.hh)0
-rw-r--r--src/sim/pseudo_inst.cc4
22 files changed, 28 insertions, 43 deletions
diff --git a/src/arch/SConscript b/src/arch/SConscript
index 82a56d4eb..bbe3c4e3a 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -51,6 +51,7 @@ isa_switch_hdrs = Split('''
faults.hh
interrupts.hh
isa_traits.hh
+ kernel_stats.hh
locked_mem.hh
process.hh
regfile.hh
diff --git a/src/arch/alpha/SConscript b/src/arch/alpha/SConscript
index 2d733d73b..3947ec23a 100644
--- a/src/arch/alpha/SConscript
+++ b/src/arch/alpha/SConscript
@@ -56,7 +56,9 @@ full_system_sources = Split('''
tlb.cc
arguments.cc
ev5.cc
+ idle_event.cc
ipr.cc
+ kernel_stats.cc
osfpal.cc
stacktrace.cc
vtophys.cc
diff --git a/src/arch/alpha/ev5.cc b/src/arch/alpha/ev5.cc
index 76574e2df..59f9d2fb5 100644
--- a/src/arch/alpha/ev5.cc
+++ b/src/arch/alpha/ev5.cc
@@ -31,6 +31,7 @@
#include "arch/alpha/faults.hh"
#include "arch/alpha/isa_traits.hh"
+#include "arch/alpha/kernel_stats.hh"
#include "arch/alpha/osfpal.hh"
#include "arch/alpha/tlb.hh"
#include "arch/alpha/kgdb.h"
@@ -40,7 +41,6 @@
#include "cpu/base.hh"
#include "cpu/simple_thread.hh"
#include "cpu/thread_context.hh"
-#include "kern/alpha/kernel_stats.hh"
#include "sim/debug.hh"
#include "sim/sim_exit.hh"
diff --git a/src/kern/alpha/idle_event.cc b/src/arch/alpha/idle_event.cc
index 3f07b6c16..0f6806319 100644
--- a/src/kern/alpha/idle_event.cc
+++ b/src/arch/alpha/idle_event.cc
@@ -29,9 +29,9 @@
* Nathan Binkert
*/
+#include "arch/alpha/idle_event.hh"
+#include "arch/alpha/kernel_stats.hh"
#include "cpu/thread_context.hh"
-#include "kern/alpha/idle_event.hh"
-#include "kern/kernel_stats.hh"
using namespace TheISA;
diff --git a/src/kern/alpha/idle_event.hh b/src/arch/alpha/idle_event.hh
index 97d5bdd6e..97d5bdd6e 100644
--- a/src/kern/alpha/idle_event.hh
+++ b/src/arch/alpha/idle_event.hh
diff --git a/src/kern/alpha/kernel_stats.cc b/src/arch/alpha/kernel_stats.cc
index 7b74295e4..6fc3cb72f 100644
--- a/src/kern/alpha/kernel_stats.cc
+++ b/src/arch/alpha/kernel_stats.cc
@@ -33,7 +33,7 @@
#include <stack>
#include <string>
-#include "kern/alpha/kernel_stats.hh"
+#include "arch/alpha/kernel_stats.hh"
#include "arch/alpha/osfpal.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
diff --git a/src/kern/alpha/kernel_stats.hh b/src/arch/alpha/kernel_stats.hh
index 90058e507..7b8640ad7 100644
--- a/src/kern/alpha/kernel_stats.hh
+++ b/src/arch/alpha/kernel_stats.hh
@@ -38,7 +38,7 @@
#include <vector>
#include "cpu/static_inst.hh"
-#include "kern/base_kernel_stats.hh"
+#include "kern/kernel_stats.hh"
class BaseCPU;
class ThreadContext;
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index 00684edbb..9a452e10f 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -42,6 +42,7 @@
#include "arch/arguments.hh"
#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/system.hh"
@@ -49,7 +50,6 @@
#include "cpu/thread_context.hh"
#include "cpu/base.hh"
#include "dev/platform.hh"
-#include "kern/alpha/idle_event.hh"
#include "kern/linux/printk.hh"
#include "kern/linux/events.hh"
#include "mem/physical.hh"
diff --git a/src/arch/alpha/linux/system.hh b/src/arch/alpha/linux/system.hh
index d4c92ac01..14396f8ab 100644
--- a/src/arch/alpha/linux/system.hh
+++ b/src/arch/alpha/linux/system.hh
@@ -38,8 +38,8 @@ class ThreadContext;
class BreakPCEvent;
class IdleStartEvent;
+#include "arch/alpha/idle_event.hh"
#include "arch/alpha/system.hh"
-#include "kern/alpha/idle_event.hh"
#include "kern/linux/events.hh"
using namespace AlphaISA;
diff --git a/src/kern/sparc/kernel_stats.hh b/src/arch/sparc/kernel_stats.hh
index 72bffd2b2..c007c54c2 100644
--- a/src/kern/sparc/kernel_stats.hh
+++ b/src/arch/sparc/kernel_stats.hh
@@ -36,7 +36,7 @@
#include <string>
#include <vector>
-#include "kern/base_kernel_stats.hh"
+#include "kern/kernel_stats.hh"
namespace SparcISA {
namespace Kernel {
diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index 2e81b7b31..d6cd9409b 100644
--- a/src/cpu/checker/cpu.cc
+++ b/src/cpu/checker/cpu.cc
@@ -38,8 +38,8 @@
#include "cpu/thread_context.hh"
#if FULL_SYSTEM
+#include "arch/kernel_stats.hh"
#include "arch/vtophys.hh"
-#include "kern/kernel_stats.hh"
#endif // FULL_SYSTEM
using namespace std;
diff --git a/src/cpu/o3/alpha/cpu_impl.hh b/src/cpu/o3/alpha/cpu_impl.hh
index 750ccc912..04eadfa5a 100644
--- a/src/cpu/o3/alpha/cpu_impl.hh
+++ b/src/cpu/o3/alpha/cpu_impl.hh
@@ -48,8 +48,8 @@
#if FULL_SYSTEM
#include "arch/alpha/osfpal.hh"
#include "arch/isa_traits.hh"
+#include "arch/kernel_stats.hh"
#include "cpu/quiesce_event.hh"
-#include "kern/kernel_stats.hh"
#include "sim/sim_exit.hh"
#include "sim/system.hh"
#endif
diff --git a/src/cpu/o3/regfile.hh b/src/cpu/o3/regfile.hh
index 772cd76f0..598af123e 100644
--- a/src/cpu/o3/regfile.hh
+++ b/src/cpu/o3/regfile.hh
@@ -39,7 +39,7 @@
#include "cpu/o3/comm.hh"
#if FULL_SYSTEM
-#include "kern/kernel_stats.hh"
+#include "arch/kernel_stats.hh"
#endif
#include <vector>
diff --git a/src/cpu/ozone/cpu_impl.hh b/src/cpu/ozone/cpu_impl.hh
index b83cf4e9e..86c973a0f 100644
--- a/src/cpu/ozone/cpu_impl.hh
+++ b/src/cpu/ozone/cpu_impl.hh
@@ -47,12 +47,12 @@
#if FULL_SYSTEM
#include "arch/faults.hh"
#include "arch/alpha/osfpal.hh"
-#include "arch/alpha/tlb.hh"
-#include "arch/alpha/types.hh"
+#include "arch/tlb.hh"
+#include "arch/types.hh"
+#include "arch/kernel_stats.hh"
#include "arch/vtophys.hh"
#include "base/callback.hh"
#include "cpu/profile.hh"
-#include "kern/kernel_stats.hh"
#include "mem/physical.hh"
#include "sim/faults.hh"
#include "sim/sim_events.hh"
diff --git a/src/cpu/ozone/dyn_inst_impl.hh b/src/cpu/ozone/dyn_inst_impl.hh
index 426841536..05a66d77a 100644
--- a/src/cpu/ozone/dyn_inst_impl.hh
+++ b/src/cpu/ozone/dyn_inst_impl.hh
@@ -31,7 +31,10 @@
#include "sim/faults.hh"
#include "config/full_system.hh"
#include "cpu/ozone/dyn_inst.hh"
+
+#if FULL_SYSTEM
#include "kern/kernel_stats.hh"
+#endif
template <class Impl>
OzoneDynInst<Impl>::OzoneDynInst(OzoneCPU *cpu)
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index b7df39218..00fa4d247 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -57,11 +57,11 @@
#include "sim/system.hh"
#if FULL_SYSTEM
-#include "arch/tlb.hh"
+#include "arch/kernel_stats.hh"
#include "arch/stacktrace.hh"
+#include "arch/tlb.hh"
#include "arch/vtophys.hh"
#include "base/remote_gdb.hh"
-#include "kern/kernel_stats.hh"
#else // !FULL_SYSTEM
#include "mem/mem_object.hh"
#endif // FULL_SYSTEM
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 5ae1e1d3c..1edcbf352 100644
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -39,13 +39,13 @@
#include "cpu/thread_context.hh"
#if FULL_SYSTEM
+#include "arch/kernel_stats.hh"
#include "base/callback.hh"
#include "base/cprintf.hh"
#include "base/output.hh"
#include "base/trace.hh"
#include "cpu/profile.hh"
#include "cpu/quiesce_event.hh"
-#include "kern/kernel_stats.hh"
#include "sim/serialize.hh"
#include "sim/sim_exit.hh"
#include "arch/stacktrace.hh"
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index a6fff5fc3..8602f8a50 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -37,8 +37,8 @@
#include "sim/serialize.hh"
#if FULL_SYSTEM
+#include "arch/kernel_stats.hh"
#include "cpu/quiesce_event.hh"
-#include "kern/kernel_stats.hh"
#endif
#if FULL_SYSTEM
diff --git a/src/kern/SConscript b/src/kern/SConscript
index 7245e2889..12df28836 100644
--- a/src/kern/SConscript
+++ b/src/kern/SConscript
@@ -34,7 +34,7 @@ import os.path, sys
Import('env')
sources = Split('''
- base_kernel_stats.cc
+ kernel_stats.cc
system_events.cc
linux/events.cc
linux/linux_syscalls.cc
@@ -45,25 +45,4 @@ sources = Split('''
# path relative to the top of the directory tree.
sources = [File(s) for s in sources]
-#################################################################
-#
-# ISA "switch header" generation.
-#
-# Auto-generate arch headers that include the right ISA-specific
-# header based on the setting of THE_ISA preprocessor variable.
-#
-#################################################################
-
-# List of headers to generate
-kern_switch_hdrs = Split('''
- kernel_stats.hh
- ''')
-
-env.make_switching_dir('kern', kern_switch_hdrs, env)
-
-isa = env['TARGET_ISA'] # someday this may be a list of ISAs
-
-# Let the target architecture define what additional sources it needs
-sources += SConscript(os.path.join(isa, 'SConscript'), exports = 'env')
-
Return('sources')
diff --git a/src/kern/base_kernel_stats.cc b/src/kern/kernel_stats.cc
index d29672753..29c77b3d9 100644
--- a/src/kern/base_kernel_stats.cc
+++ b/src/kern/kernel_stats.cc
@@ -33,7 +33,7 @@
#include "base/trace.hh"
#include "cpu/thread_context.hh"
-#include "kern/base_kernel_stats.hh"
+#include "kern/kernel_stats.hh"
#include "kern/tru64/tru64_syscalls.hh"
#include "sim/system.hh"
diff --git a/src/kern/base_kernel_stats.hh b/src/kern/kernel_stats.hh
index 66248c9c8..66248c9c8 100644
--- a/src/kern/base_kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 548d0c167..66036def1 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -34,14 +34,14 @@
#include <string>
-#include "sim/pseudo_inst.hh"
#include "arch/vtophys.hh"
#include "base/annotate.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "cpu/quiesce_event.hh"
-#include "kern/kernel_stats.hh"
+#include "arch/kernel_stats.hh"
#include "sim/param.hh"
+#include "sim/pseudo_inst.hh"
#include "sim/serialize.hh"
#include "sim/sim_exit.hh"
#include "sim/stat_control.hh"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 21:35:22 +0000