summaryrefslogtreecommitdiff
path: root/src/arch
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/arch
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/arch')
-rw-r--r--src/arch/alpha/linux/system.cc3
-rw-r--r--src/arch/sparc/faults.cc2
2 files changed, 1 insertions, 4 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