summaryrefslogtreecommitdiff
path: root/src/kern
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-10-31 02:58:22 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-10-31 02:58:22 -0700
commit8ad2b8c5596b817267fbf7a39e6ce28ffb49789c (patch)
treee20e9aa7253fb12e2e6b8abf8932e726728004c1 /src/kern
parentef097eb69cec0753074d5190e5ff91aabfaef5e5 (diff)
downloadgem5-8ad2b8c5596b817267fbf7a39e6ce28ffb49789c.tar.xz
SE/FS: Make the functions available from the TC consistent between SE and FS.
Diffstat (limited to 'src/kern')
-rw-r--r--src/kern/SConscript2
-rw-r--r--src/kern/kernel_stats.cc7
-rw-r--r--src/kern/kernel_stats.hh2
3 files changed, 8 insertions, 3 deletions
diff --git a/src/kern/SConscript b/src/kern/SConscript
index b730e4b49..1726bb3b1 100644
--- a/src/kern/SConscript
+++ b/src/kern/SConscript
@@ -33,6 +33,7 @@ Import('*')
if env['TARGET_ISA'] == 'no':
Return()
+Source('kernel_stats.cc')
Source('linux/events.cc')
Source('linux/linux.cc')
Source('linux/printk.cc')
@@ -50,7 +51,6 @@ DebugFlag('DebugPrintf')
DebugFlag('Printf')
if env['FULL_SYSTEM']:
- Source('kernel_stats.cc')
Source('linux/linux_syscalls.cc')
if env['TARGET_ISA'] == 'alpha':
diff --git a/src/kern/kernel_stats.cc b/src/kern/kernel_stats.cc
index 09c1a6760..96e219bd4 100644
--- a/src/kern/kernel_stats.cc
+++ b/src/kern/kernel_stats.cc
@@ -33,8 +33,10 @@
#include "base/trace.hh"
#include "cpu/thread_context.hh"
-#include "kern/tru64/tru64_syscalls.hh"
#include "kern/kernel_stats.hh"
+#if THE_ISA == ALPHA_ISA
+#include "kern/tru64/tru64_syscalls.hh"
+#endif
#include "sim/system.hh"
using namespace std;
@@ -90,13 +92,14 @@ Statistics::regStats(const string &_name)
;
_iplUsed = _iplGood / _iplCount;
-
+#if THE_ISA == ALPHA_ISA
_syscall
.init(SystemCalls<Tru64>::Number)
.name(name() + ".syscall")
.desc("number of syscalls executed")
.flags(total | pdf | nozero | nonan)
;
+#endif
//@todo This needs to get the names of syscalls from an appropriate place.
#if 0
diff --git a/src/kern/kernel_stats.hh b/src/kern/kernel_stats.hh
index e4ca67fcb..d5abde83f 100644
--- a/src/kern/kernel_stats.hh
+++ b/src/kern/kernel_stats.hh
@@ -61,7 +61,9 @@ class Statistics : public Serializable
Stats::Vector _iplTicks;
Stats::Formula _iplUsed;
+#if THE_ISA == ALPHA_ISA
Stats::Vector _syscall;
+#endif
// Stats::Vector _faults;
private: