 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.c,v 1.67 2012/01/15 10:45:03 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.68 2012/01/18 19:17:02 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.
 @@ -20,27 +20,27 @@
  * 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 "opt_cpu.h"
 #include "opt_hz.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.67 2012/01/15 10:45:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.68 2012/01/18 19:17:02 reinoud Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/lwp.h>
 #include <sys/cpu.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 @@ -68,26 +68,29 @@ static void	cpu_attach(device_t, device_
 struct cpu_info cpu_info_primary = {
 	.ci_dev = 0,
 	.ci_self = &cpu_info_primary,
 	.ci_idepth = -1,
 	.ci_curlwp = &lwp0,
 };
 char cpu_model[48] = "virtual processor";
 typedef struct cpu_softc {
 	device_t	sc_dev;
 	struct cpu_info	*sc_ci;
 	ucontext_t	sc_ucp;
 	uint8_t		sc_ucp_stack[PAGE_SIZE];
 } cpu_softc_t;
 /* statics */
 static struct pcb lwp0pcb;
 static void *um_msgbuf;
 /* attachment */
 CFATTACH_DECL_NEW(cpu, sizeof(cpu_softc_t), cpu_match, cpu_attach, NULL, NULL);
 static int
 cpu_match(device_t parent, cfdata_t match, void *opaque)
 @@ -98,28 +101,36 @@ cpu_match(device_t parent, cfdata_t matc
 		return 0;
 	return 1;
+}
 static void
 cpu_attach(device_t parent, device_t self, void *opaque)
+{
 	cpu_softc_t *sc = device_private(self);
 	aprint_naive("\n");
 	aprint_normal("\n");
 	cpu_info_primary.ci_dev = self;
 	sc->sc_dev = self;
 	sc->sc_ci = &cpu_info_primary;
 	thunk_getcontext(&sc->sc_ucp);
 	sc->sc_ucp.uc_stack.ss_sp = sc->sc_ucp_stack;
 	sc->sc_ucp.uc_stack.ss_size = PAGE_SIZE - sizeof(register_t);
 	sc->sc_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK;
 	thunk_sigaddset(&sc->sc_ucp.uc_sigmask, SIGALRM);
 	thunk_sigaddset(&sc->sc_ucp.uc_sigmask, SIGIO);
+}
 void
 cpu_configure(void)
+{
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("configure: mainbus not configured");
 	spl0();
+}
 /* main guts */
 @@ -166,70 +177,89 @@ cpu_reboot(int howto, char *bootstr)
 void
 cpu_need_resched(struct cpu_info *ci, int flags)
+{
 	ci->ci_want_resched |= flags;
 	aston(ci);
+}
 void
 cpu_need_proftick(struct lwp *l)
+{
+}
 static
 void
 cpu_switchto_atomic(lwp_t *oldlwp, lwp_t *newlwp)
+{
 	struct pcb *oldpcb = oldlwp ? lwp_getpcb(oldlwp) : NULL;
 	struct pcb *newpcb = lwp_getpcb(newlwp);
 	struct cpu_info *ci = curcpu();
 	ci->ci_stash = oldlwp;
 	if (oldpcb)
 		oldpcb->pcb_errno = thunk_geterrno();
 	thunk_seterrno(newpcb->pcb_errno);
 	curlwp = newlwp;
 	if (thunk_setcontext(&newpcb->pcb_ucp))
 		panic("setcontext failed");
 	/* not reached */
+}
 lwp_t *
 cpu_switchto(lwp_t *oldlwp, lwp_t *newlwp, bool returning)
+{
 	struct pcb *oldpcb = oldlwp ? lwp_getpcb(oldlwp) : NULL;
 	struct pcb *newpcb = lwp_getpcb(newlwp);
 	struct cpu_info *ci = curcpu();
 	cpu_softc_t *sc = device_private(ci->ci_dev);
 #ifdef CPU_DEBUG
 	thunk_printf_debug("cpu_switchto [%s,pid=%d,lid=%d] -> [%s,pid=%d,lid=%d]\n",
 	    oldlwp ? oldlwp->l_name : "none",
 	    oldlwp ? oldlwp->l_proc->p_pid : -1,
 	    oldlwp ? oldlwp->l_lid : -1,
 	    newlwp ? newlwp->l_name : "none",
 	    newlwp ? newlwp->l_proc->p_pid : -1,
 	    newlwp ? newlwp->l_lid : -1);
 	if (oldpcb) {
 		thunk_printf_debug("    oldpcb uc_link=%p, uc_stack.ss_sp=%p, "
 		    "uc_stack.ss_size=%d\n",
 		    oldpcb->pcb_ucp.uc_link,
 		    oldpcb->pcb_ucp.uc_stack.ss_sp,
 		    (int)oldpcb->pcb_ucp.uc_stack.ss_size);
+	}
 	if (newpcb) {
 		thunk_printf_debug("    newpcb uc_link=%p, uc_stack.ss_sp=%p, "
 		    "uc_stack.ss_size=%d\n",
 		    newpcb->pcb_ucp.uc_link,
 		    newpcb->pcb_ucp.uc_stack.ss_sp,
 		    (int)newpcb->pcb_ucp.uc_stack.ss_size);
+	}
 #endif /* !CPU_DEBUG */
-	ci->ci_stash = oldlwp;
+	/* create atomic switcher */
 	thunk_makecontext(&sc->sc_ucp, (void (*)(void)) cpu_switchto_atomic,
-	if (oldpcb) {
+, oldlwp, newlwp, NULL);
 		oldpcb->pcb_errno = thunk_geterrno();
-		thunk_seterrno(newpcb->pcb_errno);
+	if (!oldpcb) {
-		curlwp = newlwp;
+		thunk_setcontext(&sc->sc_ucp);
-		if (thunk_swapcontext(&oldpcb->pcb_ucp, &newpcb->pcb_ucp))
+		/* never returns */
 			panic("swapcontext failed");
 	} else {
-		thunk_seterrno(newpcb->pcb_errno);
+		thunk_swapcontext(&oldpcb->pcb_ucp, &sc->sc_ucp);
-		curlwp = newlwp;
+		/* returns here */
 		if (thunk_setcontext(&newpcb->pcb_ucp))
 			panic("setcontext failed");
+	}
 #ifdef CPU_DEBUG
 	thunk_printf_debug("cpu_switchto: returning %p (was %p)\n", ci->ci_stash, oldlwp);
 #endif
 	return ci->ci_stash;
+}
 void
 cpu_dumpconf(void)
+{
 #ifdef CPU_DEBUG
 	thunk_printf_debug("cpu_dumpconf\n");
 @@ -334,27 +364,27 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	/* copy the PCB and its switchframes from parent */
 	memcpy(pcb2, pcb1, sizeof(struct pcb));
 	/* refresh context */
 	if (thunk_getcontext(&pcb2->pcb_ucp))
 		panic("getcontext failed");
 	/* recalculate the system stack top */
 	pcb2->sys_stack_top = pcb2->sys_stack + TRAPSTACKSIZE;
 	/* get l2 its own stack */
 	pcb2->pcb_ucp.uc_stack.ss_sp = pcb2->sys_stack;
 	pcb2->pcb_ucp.uc_stack.ss_size = pcb2->sys_stack_top - pcb2->sys_stack;
-	pcb2->pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
+	pcb2->pcb_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK;
 	pcb2->pcb_ucp.uc_link = &pcb2->pcb_userret_ucp;
 	thunk_makecontext(&pcb2->pcb_ucp,
 	    (void (*)(void)) cpu_lwp_trampoline,
 , &pcb2->pcb_ucp, func, arg);
+}
 void
 cpu_initclocks(void)
+{
 	extern timer_t clock_timerid;
 	thunk_timer_start(clock_timerid, HZ);
+}
 @@ -372,26 +402,27 @@ cpu_startup(void)
 	initmsgbuf(um_msgbuf, msgbufsize);
 	/* allocate a submap for physio, 1Mb enough? */
 	minaddr = 0;
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 * 1024, 0, false, NULL);
 	/* say hi! */
 	banner();
 	/* init lwp0 */
 	memset(&lwp0pcb, 0, sizeof(lwp0pcb));
 	thunk_getcontext(&lwp0pcb.pcb_ucp);
 	lwp0pcb.pcb_ucp.uc_flags = _UC_STACK | _UC_CPU | _UC_SIGMASK;
 	uvm_lwp_setuarea(&lwp0, (vaddr_t) &lwp0pcb);
 	memcpy(&lwp0pcb.pcb_userret_ucp, &lwp0pcb.pcb_ucp, sizeof(ucontext_t));
 	/* set stack top */
 	lwp0pcb.sys_stack_top = lwp0pcb.sys_stack + TRAPSTACKSIZE;
+}
 void
 cpu_rootconf(void)
+{
 	extern char *usermode_root_device;
 	device_t rdev;