summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-06-12 18:16:05 -0400
committerKorey Sewell <ksewell@umich.edu>2006-06-12 18:16:05 -0400
commit07f21ce9134cd0f8a1330f70d6068a028a5ced41 (patch)
tree39895a59020f625c6ba1b3d57cee758c8594a94a /src
parentb0fc2c02af47c04650b981a28e2551bb7d07b426 (diff)
parent841d0b9d40446160fdc1e073e16f9bd7b6501911 (diff)
downloadgem5-07f21ce9134cd0f8a1330f70d6068a028a5ced41.tar.xz
Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release --HG-- extra : convert_revision : 7ac7b9c9288e4940899766cd2dd55ef793d48d4d
Diffstat (limited to 'src')
-rw-r--r--src/arch/alpha/linux/system.cc3
-rw-r--r--src/arch/sparc/faults.cc2
-rw-r--r--src/cpu/o3/alpha_cpu_impl.hh1
-rw-r--r--src/cpu/thread_context.hh4
-rw-r--r--src/sim/system.cc2
5 files changed, 2 insertions, 10 deletions
diff --git a/src/arch/alpha/linux/system.cc b/src/arch/alpha/linux/system.cc
index bb35f046d..9fe63c390 100644
--- a/src/arch/alpha/linux/system.cc
+++ b/src/arch/alpha/linux/system.cc
@@ -150,9 +150,6 @@ LinuxAlphaSystem::~LinuxAlphaSystem()
delete debugPrintkEvent;
delete idleStartEvent;
delete printThreadEvent;
- delete intStartEvent;
- delete intEndEvent;
- delete intEndEvent2;
}
diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc
index 57b4d4d86..2af242bd8 100644
--- a/src/arch/sparc/faults.cc
+++ b/src/arch/sparc/faults.cc
@@ -249,7 +249,7 @@ void SparcFault::invoke(ThreadContext * tc)
void TrapInstruction::invoke(ThreadContext * tc)
{
- tc->syscall(syscall_num);
+ // Should be handled in ISA.
}
#endif
diff --git a/src/cpu/o3/alpha_cpu_impl.hh b/src/cpu/o3/alpha_cpu_impl.hh
index 98290e57f..bfd05d260 100644
--- a/src/cpu/o3/alpha_cpu_impl.hh
+++ b/src/cpu/o3/alpha_cpu_impl.hh
@@ -46,6 +46,7 @@
#include "arch/isa_traits.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/thread_context.hh b/src/cpu/thread_context.hh
index 48c8fa28d..3c79e1116 100644
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -245,8 +245,6 @@ class ThreadContext
virtual void setSyscallReturn(SyscallReturn return_value) = 0;
- virtual void syscall(int64_t callnum) = 0;
-
// Same with st cond failures.
virtual Counter readFuncExeInst() = 0;
#endif
@@ -432,8 +430,6 @@ class ProxyThreadContext : public ThreadContext
void setSyscallReturn(SyscallReturn return_value)
{ actualTC->setSyscallReturn(return_value); }
- void syscall(int64_t callnum) { actualTC->syscall(callnum); }
-
Counter readFuncExeInst() { return actualTC->readFuncExeInst(); }
#endif
diff --git a/src/sim/system.cc b/src/sim/system.cc
index b3c7870fd..91bba85fe 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -119,8 +119,6 @@ System::System(Params *p)
DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd);
DPRINTF(Loader, "Kernel entry = %#x\n", kernelEntry);
DPRINTF(Loader, "Kernel loaded...\n");
-
- kernelBinning = new Kernel::Binning(this);
#endif // FULL_SYSTEM
// increment the number of running systms