 @@ -1,14 +1,14 @@
-/* $NetBSD: syscall.c,v 1.13 2011/12/11 20:33:52 reinoud Exp $ */
+/* $NetBSD: syscall.c,v 1.14 2011/12/12 12:36:48 reinoud Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.13 2011/12/11 20:33:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.14 2011/12/12 12:36:48 reinoud Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/lwp.h>
 #include <sys/sched.h>
 #include <sys/ktrace.h>
 #include <sys/syscall.h>
 #include <sys/syscallvar.h>
 #include <sys/syscallargs.h>
 #include <sys/userret.h>
 @@ -61,27 +61,27 @@ child_return(void *arg)
 	lwp_t *l = arg;
 //	struct pcb *pcb = lwp_getpcb(l);
 	/* XXX? */
 //	frame->registers[0] = 0;
 	aprint_debug("child return! lwp %p\n", l);
 	userret(l);
 	ktrsysret(SYS_fork, 0, 0);
+}
 extern const char *const syscallnames[];
-static void syscall_args_print(int code, int nargs, int argsize,
+static void syscall_args_print(lwp_t *l, int code, int nargs, int argsize,
 	register_t *args);
 static void syscall_retvals_print(int code, int nargs, register_t *args,
 	int error, register_t *rval);
 void
 syscall(void)
+{
 	lwp_t *l = curlwp;
 	const struct proc * const p = l->l_proc;
 	const struct sysent *callp;
 	struct pcb *pcb = lwp_getpcb(l);
 	ucontext_t *ucp = &pcb->pcb_userret_ucp;
 @@ -112,27 +112,27 @@ syscall(void)
 #if 0
 	aprint_debug("syscall no. %d, ", code);
 	aprint_debug("nargs %d, argsize %d =>  ", nargs, argsize);
 	dprintf_debug("syscall no. %d, ", code);
 	dprintf_debug("nargs %d, argsize %d =>  ", nargs, argsize);
 #endif
 	/*
 	 * TODO change the pre and post printing into functions so they can be
 	 * easily adjusted and dont clobber up this space
 	 */
 	if (!error)
-		syscall_args_print(code, nargs, argsize, args);
+		syscall_args_print(l, code, nargs, argsize, args);
 	md_syscall_inc_pc(ucp, opcode);
 	if (!error)
 		error = (*callp->sy_call)(l, args, rval);
 	syscall_retvals_print(code, nargs, args, error, rval);
 //out:
 	switch (error) {
 	default:
 		/* fall trough */
 	case 0:
 @@ -142,55 +142,57 @@ syscall(void)
 		break;
 	case ERESTART:
 		md_syscall_dec_pc(ucp, opcode);
 		/* nothing to do */
 		break;
+	}
 	//dprintf_debug("end of syscall : return to userland\n");
 //if (code != 4) printf("userret() code %d\n", code);
 	userret(l);
+}
 static void
-syscall_args_print(int code, int nargs, int argsize, register_t *args)
+syscall_args_print(lwp_t *l, int code, int nargs, int argsize, register_t *args)
+{
 //return;
 	if (code != 4) {
-		printf("code %3d, nargs %d, argsize %3d\t%s(",
+		printf("lwp %p, code %3d, nargs %d, argsize %3d\t%s(",
-			code, nargs, argsize, syscallnames[code]);
+			l, code, nargs, argsize, syscallnames[code]);
 		switch (code) {
 		case 5:
 			printf("\"%s\", %"PRIx32", %"PRIx32"", (char *) (args[0]), (uint) args[1], (uint) args[2]);
 			break;
 		case 33:
 			printf("\"%s\", %"PRIx32"", (char *) (args[0]), (uint) args[1]);
 			break;
 		case 50:
 			printf("\"%s\"", (char *) (args[0]));
 			break;
 		case 58:
 			printf("\"%s\", %"PRIx32", %"PRIx32"", (char *) (args[0]), (uint) (args[1]), (uint) args[2]);
 		default:
 			for (int i = 0; i < nargs; i++)
 				printf("%"PRIx32", ", (uint) args[i]);
 			if (nargs)
 				printf("\b\b");
+		}
 		printf(") ");
+	}
-#if 1
+#if 0
 	if ((code == 4)) {
-		dprintf_debug("[us] %s", (char *) args[1]);
+//		dprintf_debug("[us] %s", (char *) args[1]);
-//		printf("[us] %s", (char *) args[1]);
+		printf("[us] %s", (char *) args[1]);
+	}
 #endif
+}
 static void
 syscall_retvals_print(int code, int nargs, register_t *args, int error, register_t *rval)
+{
 //return;
 	if (code != 4)
 		printf("=> %s: %d, (%"PRIx32", %"PRIx32")\n",
 			error?"ERROR":"OK", error, (uint) (rval[0]), (uint) (rval[1]));
+}