Module Name: src
Committed By: njoly
Date: Fri May 16 12:55:43 UTC 2014
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_syscall.c
Log Message:
Do not compute code value more than once. Remove unneeded before
trace_enter()/trace_exit() calls.
This fix some cases where tracing show unexpected SYSRET number value
because some syscalls, such as setcontext(2), modified the trapframe
register values.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/amd64/netbsd32_syscall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_syscall.c
diff -u src/sys/arch/amd64/amd64/netbsd32_syscall.c:1.31 src/sys/arch/amd64/amd64/netbsd32_syscall.c:1.32
--- src/sys/arch/amd64/amd64/netbsd32_syscall.c:1.31 Mon Dec 20 00:25:24 2010
+++ src/sys/arch/amd64/amd64/netbsd32_syscall.c Fri May 16 12:55:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_syscall.c,v 1.31 2010/12/20 00:25:24 matt Exp $ */
+/* $NetBSD: netbsd32_syscall.c,v 1.32 2014/05/16 12:55:43 njoly Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscall.c,v 1.31 2010/12/20 00:25:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscall.c,v 1.32 2014/05/16 12:55:43 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,8 +86,6 @@ netbsd32_syscall(struct trapframe *frame
error = copyin(params, args, callp->sy_argsize);
if (__predict_false(error != 0))
goto bad;
- /* Recover 'code' - not in a register */
- code = frame->tf_rax & (SYS_NSYSENT - 1);
}
if (__predict_false(p->p_trace_enabled)
@@ -107,8 +105,6 @@ netbsd32_syscall(struct trapframe *frame
out:
if (__predict_false(p->p_trace_enabled)
&& !__predict_false(callp->sy_flags & SYCALL_INDIRECT)) {
- /* Recover 'code' - the compiler doesn't assign it a register */
- code = frame->tf_rax & (SYS_NSYSENT - 1);
trace_exit(code, rval, error);
}
