Put kernel_stats back into arch.
--HG-- rename : src/kern/alpha/idle_event.cc => src/arch/alpha/idle_event.cc rename : src/kern/alpha/idle_event.hh => src/arch/alpha/idle_event.hh rename : src/kern/alpha/kernel_stats.cc => src/arch/alpha/kernel_stats.cc rename : src/kern/alpha/kernel_stats.hh => src/arch/alpha/kernel_stats.hh rename : src/kern/sparc/kernel_stats.hh => src/arch/sparc/kernel_stats.hh rename : src/kern/base_kernel_stats.cc => src/kern/kernel_stats.cc rename : src/kern/base_kernel_stats.hh => src/kern/kernel_stats.hh extra : convert_revision : 42bd3e36b407edbd19b912c9218f4e5923a15966
This commit is contained in:
parent
65bf3c521f
commit
c693c6ba9f
22 changed files with 28 additions and 43 deletions
|
@ -51,6 +51,7 @@ isa_switch_hdrs = Split('''
|
||||||
faults.hh
|
faults.hh
|
||||||
interrupts.hh
|
interrupts.hh
|
||||||
isa_traits.hh
|
isa_traits.hh
|
||||||
|
kernel_stats.hh
|
||||||
locked_mem.hh
|
locked_mem.hh
|
||||||
process.hh
|
process.hh
|
||||||
regfile.hh
|
regfile.hh
|
||||||
|
|
|
@ -56,7 +56,9 @@ full_system_sources = Split('''
|
||||||
tlb.cc
|
tlb.cc
|
||||||
arguments.cc
|
arguments.cc
|
||||||
ev5.cc
|
ev5.cc
|
||||||
|
idle_event.cc
|
||||||
ipr.cc
|
ipr.cc
|
||||||
|
kernel_stats.cc
|
||||||
osfpal.cc
|
osfpal.cc
|
||||||
stacktrace.cc
|
stacktrace.cc
|
||||||
vtophys.cc
|
vtophys.cc
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
|
|
||||||
#include "arch/alpha/faults.hh"
|
#include "arch/alpha/faults.hh"
|
||||||
#include "arch/alpha/isa_traits.hh"
|
#include "arch/alpha/isa_traits.hh"
|
||||||
|
#include "arch/alpha/kernel_stats.hh"
|
||||||
#include "arch/alpha/osfpal.hh"
|
#include "arch/alpha/osfpal.hh"
|
||||||
#include "arch/alpha/tlb.hh"
|
#include "arch/alpha/tlb.hh"
|
||||||
#include "arch/alpha/kgdb.h"
|
#include "arch/alpha/kgdb.h"
|
||||||
|
@ -40,7 +41,6 @@
|
||||||
#include "cpu/base.hh"
|
#include "cpu/base.hh"
|
||||||
#include "cpu/simple_thread.hh"
|
#include "cpu/simple_thread.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
#include "kern/alpha/kernel_stats.hh"
|
|
||||||
#include "sim/debug.hh"
|
#include "sim/debug.hh"
|
||||||
#include "sim/sim_exit.hh"
|
#include "sim/sim_exit.hh"
|
||||||
|
|
||||||
|
|
|
@ -29,9 +29,9 @@
|
||||||
* Nathan Binkert
|
* Nathan Binkert
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "arch/alpha/idle_event.hh"
|
||||||
|
#include "arch/alpha/kernel_stats.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
#include "kern/alpha/idle_event.hh"
|
|
||||||
#include "kern/kernel_stats.hh"
|
|
||||||
|
|
||||||
using namespace TheISA;
|
using namespace TheISA;
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <stack>
|
#include <stack>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "kern/alpha/kernel_stats.hh"
|
#include "arch/alpha/kernel_stats.hh"
|
||||||
#include "arch/alpha/osfpal.hh"
|
#include "arch/alpha/osfpal.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
|
@ -38,7 +38,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "cpu/static_inst.hh"
|
#include "cpu/static_inst.hh"
|
||||||
#include "kern/base_kernel_stats.hh"
|
#include "kern/kernel_stats.hh"
|
||||||
|
|
||||||
class BaseCPU;
|
class BaseCPU;
|
||||||
class ThreadContext;
|
class ThreadContext;
|
|
@ -42,6 +42,7 @@
|
||||||
|
|
||||||
#include "arch/arguments.hh"
|
#include "arch/arguments.hh"
|
||||||
#include "arch/vtophys.hh"
|
#include "arch/vtophys.hh"
|
||||||
|
#include "arch/alpha/idle_event.hh"
|
||||||
#include "arch/alpha/linux/system.hh"
|
#include "arch/alpha/linux/system.hh"
|
||||||
#include "arch/alpha/linux/threadinfo.hh"
|
#include "arch/alpha/linux/threadinfo.hh"
|
||||||
#include "arch/alpha/system.hh"
|
#include "arch/alpha/system.hh"
|
||||||
|
@ -49,7 +50,6 @@
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
#include "cpu/base.hh"
|
#include "cpu/base.hh"
|
||||||
#include "dev/platform.hh"
|
#include "dev/platform.hh"
|
||||||
#include "kern/alpha/idle_event.hh"
|
|
||||||
#include "kern/linux/printk.hh"
|
#include "kern/linux/printk.hh"
|
||||||
#include "kern/linux/events.hh"
|
#include "kern/linux/events.hh"
|
||||||
#include "mem/physical.hh"
|
#include "mem/physical.hh"
|
||||||
|
|
|
@ -38,8 +38,8 @@ class ThreadContext;
|
||||||
class BreakPCEvent;
|
class BreakPCEvent;
|
||||||
class IdleStartEvent;
|
class IdleStartEvent;
|
||||||
|
|
||||||
|
#include "arch/alpha/idle_event.hh"
|
||||||
#include "arch/alpha/system.hh"
|
#include "arch/alpha/system.hh"
|
||||||
#include "kern/alpha/idle_event.hh"
|
|
||||||
#include "kern/linux/events.hh"
|
#include "kern/linux/events.hh"
|
||||||
|
|
||||||
using namespace AlphaISA;
|
using namespace AlphaISA;
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "kern/base_kernel_stats.hh"
|
#include "kern/kernel_stats.hh"
|
||||||
|
|
||||||
namespace SparcISA {
|
namespace SparcISA {
|
||||||
namespace Kernel {
|
namespace Kernel {
|
|
@ -38,8 +38,8 @@
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
|
#include "arch/kernel_stats.hh"
|
||||||
#include "arch/vtophys.hh"
|
#include "arch/vtophys.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
|
||||||
#endif // FULL_SYSTEM
|
#endif // FULL_SYSTEM
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -48,8 +48,8 @@
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
#include "arch/alpha/osfpal.hh"
|
#include "arch/alpha/osfpal.hh"
|
||||||
#include "arch/isa_traits.hh"
|
#include "arch/isa_traits.hh"
|
||||||
|
#include "arch/kernel_stats.hh"
|
||||||
#include "cpu/quiesce_event.hh"
|
#include "cpu/quiesce_event.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
|
||||||
#include "sim/sim_exit.hh"
|
#include "sim/sim_exit.hh"
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include "cpu/o3/comm.hh"
|
#include "cpu/o3/comm.hh"
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
#include "kern/kernel_stats.hh"
|
#include "arch/kernel_stats.hh"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
@ -47,12 +47,12 @@
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
#include "arch/faults.hh"
|
#include "arch/faults.hh"
|
||||||
#include "arch/alpha/osfpal.hh"
|
#include "arch/alpha/osfpal.hh"
|
||||||
#include "arch/alpha/tlb.hh"
|
#include "arch/tlb.hh"
|
||||||
#include "arch/alpha/types.hh"
|
#include "arch/types.hh"
|
||||||
|
#include "arch/kernel_stats.hh"
|
||||||
#include "arch/vtophys.hh"
|
#include "arch/vtophys.hh"
|
||||||
#include "base/callback.hh"
|
#include "base/callback.hh"
|
||||||
#include "cpu/profile.hh"
|
#include "cpu/profile.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
|
||||||
#include "mem/physical.hh"
|
#include "mem/physical.hh"
|
||||||
#include "sim/faults.hh"
|
#include "sim/faults.hh"
|
||||||
#include "sim/sim_events.hh"
|
#include "sim/sim_events.hh"
|
||||||
|
|
|
@ -31,7 +31,10 @@
|
||||||
#include "sim/faults.hh"
|
#include "sim/faults.hh"
|
||||||
#include "config/full_system.hh"
|
#include "config/full_system.hh"
|
||||||
#include "cpu/ozone/dyn_inst.hh"
|
#include "cpu/ozone/dyn_inst.hh"
|
||||||
|
|
||||||
|
#if FULL_SYSTEM
|
||||||
#include "kern/kernel_stats.hh"
|
#include "kern/kernel_stats.hh"
|
||||||
|
#endif
|
||||||
|
|
||||||
template <class Impl>
|
template <class Impl>
|
||||||
OzoneDynInst<Impl>::OzoneDynInst(OzoneCPU *cpu)
|
OzoneDynInst<Impl>::OzoneDynInst(OzoneCPU *cpu)
|
||||||
|
|
|
@ -57,11 +57,11 @@
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
#include "arch/tlb.hh"
|
#include "arch/kernel_stats.hh"
|
||||||
#include "arch/stacktrace.hh"
|
#include "arch/stacktrace.hh"
|
||||||
|
#include "arch/tlb.hh"
|
||||||
#include "arch/vtophys.hh"
|
#include "arch/vtophys.hh"
|
||||||
#include "base/remote_gdb.hh"
|
#include "base/remote_gdb.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
|
||||||
#else // !FULL_SYSTEM
|
#else // !FULL_SYSTEM
|
||||||
#include "mem/mem_object.hh"
|
#include "mem/mem_object.hh"
|
||||||
#endif // FULL_SYSTEM
|
#endif // FULL_SYSTEM
|
||||||
|
|
|
@ -39,13 +39,13 @@
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
|
#include "arch/kernel_stats.hh"
|
||||||
#include "base/callback.hh"
|
#include "base/callback.hh"
|
||||||
#include "base/cprintf.hh"
|
#include "base/cprintf.hh"
|
||||||
#include "base/output.hh"
|
#include "base/output.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#include "cpu/profile.hh"
|
#include "cpu/profile.hh"
|
||||||
#include "cpu/quiesce_event.hh"
|
#include "cpu/quiesce_event.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
|
||||||
#include "sim/serialize.hh"
|
#include "sim/serialize.hh"
|
||||||
#include "sim/sim_exit.hh"
|
#include "sim/sim_exit.hh"
|
||||||
#include "arch/stacktrace.hh"
|
#include "arch/stacktrace.hh"
|
||||||
|
|
|
@ -37,8 +37,8 @@
|
||||||
#include "sim/serialize.hh"
|
#include "sim/serialize.hh"
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
|
#include "arch/kernel_stats.hh"
|
||||||
#include "cpu/quiesce_event.hh"
|
#include "cpu/quiesce_event.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
|
|
|
@ -34,7 +34,7 @@ import os.path, sys
|
||||||
Import('env')
|
Import('env')
|
||||||
|
|
||||||
sources = Split('''
|
sources = Split('''
|
||||||
base_kernel_stats.cc
|
kernel_stats.cc
|
||||||
system_events.cc
|
system_events.cc
|
||||||
linux/events.cc
|
linux/events.cc
|
||||||
linux/linux_syscalls.cc
|
linux/linux_syscalls.cc
|
||||||
|
@ -45,25 +45,4 @@ sources = Split('''
|
||||||
# path relative to the top of the directory tree.
|
# path relative to the top of the directory tree.
|
||||||
sources = [File(s) for s in sources]
|
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')
|
Return('sources')
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
#include "kern/base_kernel_stats.hh"
|
#include "kern/kernel_stats.hh"
|
||||||
#include "kern/tru64/tru64_syscalls.hh"
|
#include "kern/tru64/tru64_syscalls.hh"
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
|
|
|
@ -34,14 +34,14 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "sim/pseudo_inst.hh"
|
|
||||||
#include "arch/vtophys.hh"
|
#include "arch/vtophys.hh"
|
||||||
#include "base/annotate.hh"
|
#include "base/annotate.hh"
|
||||||
#include "cpu/base.hh"
|
#include "cpu/base.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
#include "cpu/quiesce_event.hh"
|
#include "cpu/quiesce_event.hh"
|
||||||
#include "kern/kernel_stats.hh"
|
#include "arch/kernel_stats.hh"
|
||||||
#include "sim/param.hh"
|
#include "sim/param.hh"
|
||||||
|
#include "sim/pseudo_inst.hh"
|
||||||
#include "sim/serialize.hh"
|
#include "sim/serialize.hh"
|
||||||
#include "sim/sim_exit.hh"
|
#include "sim/sim_exit.hh"
|
||||||
#include "sim/stat_control.hh"
|
#include "sim/stat_control.hh"
|
||||||
|
|
Loading…
Reference in a new issue