Implement the _lwp* and sa_* families of syscalls, using the newly

introduced hooks in the native code.

sys/compat/netbsd32/files.netbsd32

@@ -1,4 +1,4 @@
-#	$NetBSD: files.netbsd32,v 1.21 2006/03/05 01:28:20 cube Exp $
+#	$NetBSD: files.netbsd32,v 1.22 2006/03/29 23:04:12 cube Exp $
 #
 # config file description for machine-independent netbsd32 compat code.
 # included by ports that need it.
@@ -15,6 +15,7 @@ file	compat/netbsd32/netbsd32_execve.c	compat_netbsd32
 file	compat/netbsd32/netbsd32_fs.c		compat_netbsd32
 file	compat/netbsd32/netbsd32_ioctl.c	compat_netbsd32
 file	compat/netbsd32/netbsd32_ipc.c		compat_netbsd32
+file	compat/netbsd32/netbsd32_sa.c		compat_netbsd32
 file	compat/netbsd32/netbsd32_select.c	compat_netbsd32
 file	compat/netbsd32/netbsd32_sem.c		compat_netbsd32 & p1003_1b_semaphore
 file	compat/netbsd32/netbsd32_signal.c	compat_netbsd32

sys/compat/netbsd32/netbsd32.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32.h,v 1.50 2006/03/06 14:40:55 cube Exp $	*/
+/*	$NetBSD: netbsd32.h,v 1.51 2006/03/29 23:04:12 cube Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -47,6 +47,7 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/ucontext.h>
+#include <compat/sys/ucontext.h>
 
 /*
  * first, define the basic types we need.
@@ -289,6 +290,13 @@ struct netbsd32_msqid_ds14 {
 	netbsd32_long	msg_pad4[4];
 };
 
+/* from  <sys/sa.h> */
+typedef netbsd32_pointer_t netbsd32_sa_upcall_t;
+typedef netbsd32_pointer_t netbsd32_sa_upcallp_t;
+
+void	netbsd32_cpu_upcall(struct lwp *, int, int, int, void *, void *,
+    void *, sa_upcall_t);
+
 /* from <sys/sem.h> */
 typedef netbsd32_pointer_t netbsd32_semp_t;
 
@@ -412,6 +420,9 @@ struct netbsd32_sigevent {
 	netbsd32_voidp	sigev_notify_attributes;
 };
 
+/* from <sys/sigtypes.h> */
+typedef netbsd32_pointer_t netbsd32_stackp_t;
+
 /* from <sys/socket.h> */
 typedef netbsd32_pointer_t netbsd32_sockaddrp_t;
 typedef netbsd32_pointer_t netbsd32_osockaddrp_t;

sys/compat/netbsd32/netbsd32_netbsd.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.100 2006/02/09 19:18:57 manu Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.101 2006/03/29 23:04:12 cube Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.100 2006/02/09 19:18:57 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.101 2006/03/29 23:04:12 cube Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
@@ -79,6 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.100 2006/02/09 19:18:57 manu E
 #include <uvm/uvm_extern.h>
 
 #include <sys/sa.h>
+#include <sys/savar.h>
 #include <sys/syscallargs.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
@@ -91,6 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.100 2006/02/09 19:18:57 manu E
 #include <compat/netbsd32/netbsd32_syscall.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 #include <compat/netbsd32/netbsd32_conv.h>
+#include <compat/netbsd32/netbsd32_sa.h>
 
 #include <machine/frame.h>
 
@@ -115,6 +117,17 @@ struct uvm_object *emul_netbsd32_object;
 
 extern struct sysctlnode netbsd32_sysctl_root;
 
+const struct sa_emul saemul_netbsd32 = {
+	sizeof(ucontext32_t),
+	sizeof(struct netbsd32_sa_t),
+	sizeof(netbsd32_sa_tp),
+	netbsd32_sacopyout,
+	netbsd32_upcallconv,
+	netbsd32_cpu_upcall,
+	(void (*)(struct lwp *, void *))getucontext32,
+	netbsd32_sa_ucsp
+};
+
 const struct emul emul_netbsd32 = {
 	"netbsd32",
 	"/emul/netbsd32",
@@ -157,6 +170,8 @@ const struct emul emul_netbsd32 = {
 	NULL,
 
 	netbsd32_vm_default_addr,
+	NULL,
+	&saemul_netbsd32,
 };
 
 /*

sys/compat/netbsd32/netbsd32_sa.c

@@ -0,0 +1,287 @@
+/*	$NetBSD: netbsd32_sa.c,v 1.1 2006/03/29 23:04:12 cube Exp $	*/
+
+/*
+ *  Copyright (c) 2005 The NetBSD Foundation.
+ *  All rights reserved.
+ *
+ *  This code is derived from software contributed to the NetBSD Foundation
+ *   by Quentin Garnier.
+ *
+ *  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.
+ *  3. Neither the name of The NetBSD Foundation nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ *  ``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: netbsd32_sa.c,v 1.1 2006/03/29 23:04:12 cube Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/dirent.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/sa.h>
+#include <sys/savar.h>
+#include <sys/syscallargs.h>
+
+#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscallargs.h>
+#include <compat/netbsd32/netbsd32_conv.h>
+#include <compat/netbsd32/netbsd32_sa.h>
+
+/* SA emulation helpers */
+int
+netbsd32_sacopyout(int type, const void *src, void *dst)
+{
+	switch (type) {
+	case SAOUT_UCONTEXT:
+		{
+			const ucontext_t *u = src;
+			ucontext32_t u32;
+
+			u32.uc_flags = u->uc_flags;
+			u32.uc_stack.ss_sp = (uintptr_t)u->uc_stack.ss_sp;
+			u32.uc_stack.ss_size = u->uc_stack.ss_size;
+			u32.uc_stack.ss_flags = u->uc_stack.ss_flags;
+
+			return copyout(&u32, dst, sizeof(u32));
+		} break;
+	case SAOUT_SA_T:
+		{
+			const struct sa_t *sa = src;
+			struct netbsd32_sa_t sa32;
+
+			sa32.sa_id = sa->sa_id;
+			sa32.sa_cpu = sa->sa_cpu;
+			sa32.sa_context = (uintptr_t)sa->sa_context;
+
+			return copyout(&sa32, dst, sizeof(sa32));
+		} break;
+	case SAOUT_SAP_T:
+		{
+			void * const *p = src;
+			netbsd32_pointer_t p32;
+
+			p32 = (uintptr_t)*p;
+			return copyout(&p32, dst, sizeof(p32));
+		} break;
+	}
+	return EINVAL;
+}
+
+int
+netbsd32_upcallconv(struct lwp *l, int type, size_t *pargsize, void **parg,
+    void (**pfunc)(void *))
+{
+	switch (type & SA_UPCALL_TYPE_MASK) {
+	case SA_UPCALL_SIGNAL:
+	case SA_UPCALL_SIGEV:
+		{
+			siginfo32_t si32;
+			siginfo_t *si = *parg;
+
+			netbsd32_si_to_si32(&si32, si);
+
+			/*
+			 * This is so wrong, but assuming
+			 * sizeof(siginfo32_t) < sizeof(siginfo_t) is not
+			 * very dangerous.
+			 */
+			memcpy(*parg, &si32, sizeof(si32));
+			*pargsize = sizeof(si32);
+		}
+	}
+
+	return 0;
+}
+
+void *
+netbsd32_sa_ucsp(void *arg)
+{
+	ucontext32_t *uc32 = arg;
+
+	return NETBSD32PTR64(_UC_MACHINE32_SP(uc32));
+}
+
+/* Sycalls conversion */
+
+int
+netbsd32__lwp_create(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32__lwp_create_args /* {
+		syscallarg(const netbsd32_ucontextp) ucp;
+		syscallarg(netbsd32_u_long) flags;
+		syscallarg(netbsd32_lwpidp) new_lwp;
+	} */ *uap = v;
+	struct sys__lwp_create_args ua;
+
+	NETBSD32TOP_UAP(ucp, const ucontext_t);
+	NETBSD32TO64_UAP(flags);
+	NETBSD32TOP_UAP(new_lwp, lwpid_t);
+
+	return sys__lwp_create(l, &ua, retval);
+}
+
+int
+netbsd32__lwp_wait(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32__lwp_wait_args /* {
+		syscallarg(lwpid_t) wait_for;
+		syscallarg(netbsd32_lwpidp) departed;
+	} */ *uap = v;
+	struct sys__lwp_wait_args ua;
+
+	NETBSD32TO64_UAP(wait_for);
+	NETBSD32TOP_UAP(departed, lwpid_t);
+	return sys__lwp_wait(l, &ua, retval);
+}
+
+int
+netbsd32__lwp_suspend(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32__lwp_suspend_args /* {
+		syscallarg(lwpid_t) target;
+	} */ *uap = v;
+	struct sys__lwp_suspend_args ua;
+
+	NETBSD32TO64_UAP(target);
+	return sys__lwp_suspend(l, &ua, retval);
+}
+
+int
+netbsd32__lwp_continue(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32__lwp_continue_args /* {
+		syscallarg(lwpid_t) target;
+	} */ *uap = v;
+	struct sys__lwp_continue_args ua;
+
+	NETBSD32TO64_UAP(target);
+	return sys__lwp_continue(l, &ua, retval);
+}
+
+int
+netbsd32__lwp_wakeup(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32__lwp_wakeup_args /* {
+		syscallarg(lwpid_t) target;
+	} */ *uap = v;
+	struct sys__lwp_wakeup_args ua;
+
+	NETBSD32TO64_UAP(target);
+	return sys__lwp_wakeup(l, &ua, retval);
+}
+
+int
+netbsd32__lwp_setprivate(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32__lwp_setprivate_args /* {
+		syscallarg(netbsd32_voidp) ptr;
+	} */ *uap = v;
+	struct sys__lwp_setprivate_args ua;
+
+	NETBSD32TOP_UAP(ptr, void);
+	return sys__lwp_setprivate(l, &ua, retval);
+}
+
+int
+netbsd32_sa_register(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32_sa_register_args /* {
+		syscallarg(netbsd32_sa_upcall_t) new;
+		syscallarg(netbsd32_sa_upcallp_t) old;
+		syscallarg(int) flags;
+		syscallarg(netbsd32_ssize_t) stackinfo_offset;
+	} */ *uap = v;
+	sa_upcall_t prev;
+	int error;
+
+	error = dosa_register(l, NETBSD32PTR64(SCARG(uap, new)), &prev,
+	    SCARG(uap, flags), SCARG(uap, stackinfo_offset));
+	if (error)
+		return error;
+
+	if (SCARG(uap, old)) {
+		netbsd32_sa_upcall_t old = (uintptr_t)prev;
+		return copyout(&old, NETBSD32PTR64(SCARG(uap, old)),
+		    sizeof(old));
+	}
+
+	return 0;	
+}
+
+static int
+netbsd32_sa_copyin_stack(stack_t *stacks, int index, stack_t *dest)
+{
+	stack32_t s32, *stacks32;
+	int error;
+
+	stacks32 = (stack32_t *)stacks;
+	error = copyin(stacks32 + index, &s32, sizeof(s32));
+	if (error)
+		return error;
+
+	dest->ss_sp = NETBSD32PTR64(s32.ss_sp);
+	dest->ss_size = s32.ss_size;
+	dest->ss_flags = s32.ss_flags;
+
+	return 0;
+}
+
+int
+netbsd32_sa_stacks(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32_sa_stacks_args /* {
+		syscallarg(int) num;
+		syscallarg(netbsd32_stackp_t) stacks;
+	} */ *uap = v;
+
+	return sa_stacks1(l, retval, SCARG(uap, num),
+	    NETBSD32PTR64(SCARG(uap, stacks)), netbsd32_sa_copyin_stack);
+}
+
+int
+netbsd32_sa_setconcurrency(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32_sa_setconcurrency_args /* {
+		syscallarg(int) concurrency;
+	} */ *uap = v;
+	struct sys_sa_setconcurrency_args ua;
+
+	NETBSD32TO64_UAP(concurrency);
+	return sys_sa_setconcurrency(l, &ua, retval);
+}
+
+int
+netbsd32_sa_preempt(struct lwp *l, void *v, register_t *retval)
+{
+	struct netbsd32_sa_preempt_args /* {
+		syscallarg(int) sa_id;
+	} */ *uap = v;
+	struct sys_sa_preempt_args ua;
+
+	NETBSD32TO64_UAP(sa_id);
+	return sys_sa_preempt(l, &ua, retval);
+}

sys/compat/netbsd32/netbsd32_sa.h

@@ -0,0 +1,51 @@
+/*	$NetBSD: netbsd32_sa.h,v 1.1 2006/03/29 23:04:12 cube Exp $	*/
+
+/*
+ *  Copyright (c) 2006 The NetBSD Foundation.
+ *  All rights reserved.
+ *
+ *  This code is derived from software contributed to the NetBSD Foundation
+ *   by Quentin Garnier.
+ *
+ *  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.
+ *  3. Neither the name of The NetBSD Foundation nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ *  ``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.
+ */
+
+#ifndef _COMPAT_NETBSD32_SA_H_
+#define _COMPAT_NETBSD32_SA_H_
+
+struct netbsd32_sa_t {
+	netbsd32_ucontextp sa_context;
+	int sa_id;
+	int sa_cpu;
+};
+
+typedef netbsd32_pointer_t netbsd32_sa_tp;
+
+int	netbsd32_sacopyout(int, const void *, void *);
+int	netbsd32_upcallconv(struct lwp *, int, size_t *, void **,
+    void (**)(void *));
+void	*netbsd32_sa_ucsp(void *);
+
+#endif /* !_COMPAT_NETBSD32_SA_H_ */

sys/compat/netbsd32/syscalls.master

@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.43 2006/03/06 14:40:55 cube Exp $
+	$NetBSD: syscalls.master,v 1.44 2006/03/29 23:04:12 cube Exp $
 
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -524,15 +524,17 @@
 ;
 ; Syscalls 309-339 are reserved for LWP and scheduler activation syscalls.
 ;
-309	UNIMPL
+309	STD		{ int netbsd32__lwp_create(const netbsd32_ucontextp ucp, \
-310	UNIMPL
+			    netbsd32_u_long flags, netbsd32_lwpidp new_lwp); }
-311	UNIMPL
+310	NOARGS		{ int sys__lwp_exit(void); }
-312	UNIMPL
+311	NOARGS		{ lwpid_t sys__lwp_self(void); }
-313	UNIMPL
+312	STD		{ int netbsd32__lwp_wait(lwpid_t wait_for, \
-314	UNIMPL
+			    netbsd32_lwpidp departed); }
-315	UNIMPL
+313	STD		{ int netbsd32__lwp_suspend(lwpid_t target); }
-316	UNIMPL
+314	STD		{ int netbsd32__lwp_continue(lwpid_t target); }
-317	UNIMPL
+315	STD		{ int netbsd32__lwp_wakeup(lwpid_t target); }
+316	NOARGS		{ void *sys__lwp_getprivate(void); }
+317	STD		{ void netbsd32__lwp_setprivate(netbsd32_voidp ptr); }
 318	UNIMPL
 319	UNIMPL
 320	UNIMPL
@@ -545,13 +547,15 @@
 327	UNIMPL
 328	UNIMPL
 329	UNIMPL
-330	UNIMPL
+330	STD		{ int netbsd32_sa_register(netbsd32_sa_upcall_t new, \
-331	UNIMPL
+			    netbsd32_sa_upcallp_t old, int flags, \
-332	UNIMPL
+			    netbsd32_ssize_t stackinfo_offset); }
-333	UNIMPL
+331	STD		{ int netbsd32_sa_stacks(int num, netbsd32_stackp_t stacks); }
-334	UNIMPL
+332	NOARGS		{ int sys_sa_enable(void); }
-335	UNIMPL
+333	STD		{ int netbsd32_sa_setconcurrency(int concurrency); }
-336	UNIMPL
+334	NOARGS		{ int sys_sa_yield(void); }
+335	STD		{ int netbsd32_sa_preempt(int sa_id); }
+336	OBSOL		sys_sa_unblockyield
 337	UNIMPL
 338	UNIMPL
 339	UNIMPL