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
This commit is contained in:
parent
babb22eea4
commit
3e1537cf8b
2 changed files with 1 additions and 5 deletions
|
@ -249,7 +249,7 @@ void SparcFault::invoke(ThreadContext * tc)
|
||||||
|
|
||||||
void TrapInstruction::invoke(ThreadContext * tc)
|
void TrapInstruction::invoke(ThreadContext * tc)
|
||||||
{
|
{
|
||||||
tc->syscall(syscall_num);
|
// Should be handled in ISA.
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -245,8 +245,6 @@ class ThreadContext
|
||||||
|
|
||||||
virtual void setSyscallReturn(SyscallReturn return_value) = 0;
|
virtual void setSyscallReturn(SyscallReturn return_value) = 0;
|
||||||
|
|
||||||
virtual void syscall(int64_t callnum) = 0;
|
|
||||||
|
|
||||||
// Same with st cond failures.
|
// Same with st cond failures.
|
||||||
virtual Counter readFuncExeInst() = 0;
|
virtual Counter readFuncExeInst() = 0;
|
||||||
#endif
|
#endif
|
||||||
|
@ -432,8 +430,6 @@ class ProxyThreadContext : public ThreadContext
|
||||||
void setSyscallReturn(SyscallReturn return_value)
|
void setSyscallReturn(SyscallReturn return_value)
|
||||||
{ actualTC->setSyscallReturn(return_value); }
|
{ actualTC->setSyscallReturn(return_value); }
|
||||||
|
|
||||||
void syscall(int64_t callnum) { actualTC->syscall(callnum); }
|
|
||||||
|
|
||||||
Counter readFuncExeInst() { return actualTC->readFuncExeInst(); }
|
Counter readFuncExeInst() { return actualTC->readFuncExeInst(); }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue