diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-06-12 16:42:56 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-06-12 16:42:56 -0400 |
| commit | 3e1537cf8b6a9fdbffa3975fde9f3d7f12c719f9 (patch) | |
| tree | cfe01f11563dbfc4c0aba213502381df41d537ba | |
| parent | babb22eea4be07cbc725eea129c6a6557fd56af2 (diff) | |
| download | gem5-3e1537cf8b6a9fdbffa3975fde9f3d7f12c719f9.tar.xz | |
Removed syscall function from thread_context.hh. ThreadContext is the interface for external, non-CPU objects to access the thread, so they probably shouldn't be able to call syscall(). The case it was being used for was already handled by the ISA code.
src/arch/sparc/faults.cc:
src/cpu/thread_context.hh:
Fix for merge problems.
--HG--
extra : convert_revision : 05a7a2d6e45099fcf36d113da2e52450d892a72c
| -rw-r--r-- | src/arch/sparc/faults.cc | 2 | ||||
| -rw-r--r-- | src/cpu/thread_context.hh | 4 |
2 files changed, 1 insertions, 5 deletions
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/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 |