[src/trunk]: src/sys/arch Use sy_invoke

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5a304c73a51
branches:  trunk
changeset: 787609:b5a304c73a51
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jun 26 15:09:59 2013 +0000

description:
Use sy_invoke

diffstat:

 sys/arch/alpha/alpha/syscall.c       |  18 +++---------------
 sys/arch/usermode/usermode/syscall.c |  15 +++------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diffs (75 lines):

diff -r 98e84416f7a8 -r b5a304c73a51 sys/arch/alpha/alpha/syscall.c
--- a/sys/arch/alpha/alpha/syscall.c    Wed Jun 26 12:07:21 2013 +0000
+++ b/sys/arch/alpha/alpha/syscall.c    Wed Jun 26 15:09:59 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.41 2012/07/22 14:02:11 matt Exp $ */
+/* $NetBSD: syscall.c,v 1.42 2013/06/26 15:09:59 matt Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.41 2012/07/22 14:02:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.42 2013/06/26 15:09:59 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -190,19 +190,7 @@
        }
        args += hidden;
 
-       if (!__predict_false(p->p_trace_enabled)
-           || __predict_false(callp->sy_flags & SYCALL_INDIRECT)
-           || (error = trace_enter(code, args, callp->sy_narg)) == 0) {
-               rval[0] = 0;
-               rval[1] = 0;
-               error = sy_call(callp, l, args, rval);
-       }
-
-       if (__predict_false(p->p_trace_enabled)
-           && !__predict_false(callp->sy_flags & SYCALL_INDIRECT)) {
-               trace_exit(code, rval, error);
-       }
-
+       error = sy_invoke(callp, l, args, rval, code);
 
        if (__predict_true(error == 0)) {
                tf->tf_regs[FRAME_V0] = rval[0];
diff -r 98e84416f7a8 -r b5a304c73a51 sys/arch/usermode/usermode/syscall.c
--- a/sys/arch/usermode/usermode/syscall.c      Wed Jun 26 12:07:21 2013 +0000
+++ b/sys/arch/usermode/usermode/syscall.c      Wed Jun 26 15:09:59 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.23 2012/02/13 19:15:59 reinoud Exp $ */
+/* $NetBSD: syscall.c,v 1.24 2013/06/26 15:11:30 matt Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.23 2012/02/13 19:15:59 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.24 2013/06/26 15:11:30 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -131,16 +131,7 @@
        md_syscall_inc_pc(ucp, opcode);
 
        if (!error) {
-               if (!__predict_false(p->p_trace_enabled)
-                   || __predict_false(callp->sy_flags & SYCALL_INDIRECT)
-                   || (error = trace_enter(code, args, callp->sy_narg)) == 0) {
-                       error = (*callp->sy_call)(l, args, rval);
-               }
-
-               if (__predict_false(p->p_trace_enabled)
-                   && !__predict_false(callp->sy_flags & SYCALL_INDIRECT)) {
-                       trace_exit(code, rval, error);
-               }
+               error = sy_invoke(callp, l, args, rval, code);
        }
 
        syscall_retvals_print(l, curlwp, code, nargs, args, error, rval);