 @@ -1,14 +1,14 @@
-/* $NetBSD: clock.c,v 1.22 2011/12/13 22:22:08 jmcneill Exp $ */
+/* $NetBSD: clock.c,v 1.23 2011/12/15 03:42:32 jmcneill 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.
 @@ -16,128 +16,132 @@
  * 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 "opt_hz.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.22 2011/12/13 22:22:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.23 2011/12/15 03:42:32 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/cpu.h>
 #include <sys/malloc.h>
 #include <sys/timetc.h>
 #include <sys/time.h>
 #include <machine/pcb.h>
 #include <machine/mainbus.h>
 #include <machine/thunk.h>
 #include <dev/clock_subr.h>
 static int	clock_match(device_t, cfdata_t, void *);
 static void	clock_attach(device_t, device_t, void *);
 static void	clock(void);
 static void	clock_signal(int sig, siginfo_t *info, void *ctx);
 static unsigned int clock_getcounter(struct timecounter *);
 static int	clock_todr_gettime(struct todr_chip_handle *, struct timeval *);
-typedef struct clock_softc {
+struct clock_softc {
 	device_t		sc_dev;
 	struct todr_chip_handle	sc_todr;
-} clock_softc_t;
+};
 static struct timecounter clock_timecounter = {
 	clock_getcounter,	/* get_timecount */
 ,			/* no poll_pps */
 	~0u,			/* counter_mask */
 	1000000000ULL,		/* frequency */
 	"CLOCK_MONOTONIC",	/* name */
 	-100,			/* quality */
 	NULL,			/* prev */
 	NULL,			/* next */
 };
-static struct clock_softc *clock_sc;
+timer_t clock_timerid;
 CFATTACH_DECL_NEW(clock, sizeof(struct clock_softc),
 CFATTACH_DECL_NEW(clock, sizeof(clock_softc_t),
     clock_match, clock_attach, NULL, NULL);
 static int
 clock_match(device_t parent, cfdata_t match, void *opaque)
+{
 	struct thunkbus_attach_args *taa = opaque;
 	if (taa->taa_type != THUNKBUS_TYPE_CLOCK)
 		return 0;
 	return 1;
+}
 static void
 clock_attach(device_t parent, device_t self, void *opaque)
+{
 	static struct sigaction sa;
-	clock_softc_t *sc = device_private(self);
+	struct clock_softc *sc = device_private(self);
 	long tcres;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	KASSERT(clock_sc == NULL);
 	clock_sc = sc;
 	sc->sc_dev = self;
 	sc->sc_todr.todr_gettime = clock_todr_gettime;
 	todr_attach(&sc->sc_todr);
 	memset(&sa, 0, sizeof(sa));
 	thunk_sigemptyset(&sa.sa_mask);
 	sa.sa_sigaction = clock_signal;
-	sa.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK;
+	sa.sa_flags = SA_RESTART | SA_ONSTACK;
 	if (thunk_sigaction(SIGALRM, &sa, NULL) == -1)
 		panic("couldn't register SIGALRM handler : %d",
 		    thunk_geterrno());
-	tcres = thunk_clock_getres_monotonic();
+	clock_timerid = thunk_timer_attach();
 	if (tcres > 0) {
-		clock_timecounter.tc_quality = 1000;
+	clock_timecounter.tc_quality = 1000;
 	tc_init(&clock_timecounter);
+}
 static void
-clock(void)
+clock_intr(void *priv)
+{
 	struct clockframe cf;
 	int nticks = thunk_timer_getoverrun(clock_timerid) + 1;
 	while (nticks-- > 0) {
 		hardclock(&cf);
 	};
+}
 static void
 clock(void)
+{
 	curcpu()->ci_idepth++;
-	spl_intr(IPL_SOFTCLOCK, (void (*)(void *)) hardclock, &cf);
+	spl_intr(IPL_SOFTCLOCK, clock_intr, NULL);
 	curcpu()->ci_idepth--;
+}
 static void
 clock_signal(int sig, siginfo_t *info, void *ctx)
+{
 #if 0
 	ucontext_t *uct = ctx;
 	struct lwp *l;
 	struct pcb *pcb;
 	l = curlwp;
 	pcb = lwp_getpcb(l);

 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.c,v 1.54 2011/12/15 02:09:15 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.55 2011/12/15 03:42:32 jmcneill 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.54 2011/12/15 02:09:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.55 2011/12/15 03:42:32 jmcneill 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>
 @@ -354,32 +354,29 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	/* set up the ucontext for the pagefault */
 	pcb2->pcb_pagefault_ucp.uc_stack.ss_sp = stack_pagefault_ucp;
 	pcb2->pcb_pagefault_ucp.uc_stack.ss_size = stacksize;
 	pcb2->pcb_pagefault_ucp.uc_flags = _UC_STACK | _UC_CPU;
 	pcb2->pcb_pagefault_ucp.uc_link = &pcb2->pcb_trapret_ucp;
 	thunk_makecontext(&pcb2->pcb_pagefault_ucp, (void (*)(void)) pagefault,
 , NULL, NULL, NULL);
+}
 void
 cpu_initclocks(void)
+{
-	struct thunk_itimerval itimer;
+	extern timer_t clock_timerid;
-	itimer.it_interval.tv_sec = 0;
+	thunk_timer_start(clock_timerid, HZ);
 	itimer.it_interval.tv_usec = 1000000 / HZ;
 	itimer.it_value = itimer.it_interval;
 	thunk_setitimer(ITIMER_REAL, &itimer, NULL);
+}
 void
 cpu_startup(void)
+{
 	size_t stacksize, msgbufsize = 32 * 1024;
 	void *stack_pagefault_ucp;
 	um_msgbuf = kmem_zalloc(msgbufsize, KM_SLEEP);
 	if (um_msgbuf == NULL)
 		panic("couldn't allocate msgbuf");
 	initmsgbuf(um_msgbuf, msgbufsize);

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.h,v 1.40 2011/12/15 01:30:04 jmcneill Exp $ */
+/* $NetBSD: thunk.h,v 1.41 2011/12/15 03:42:32 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 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.
 @@ -67,26 +67,30 @@ struct thunk_termios {
 #define THUNK_PROT_WRITE	0x02
 #define THUNK_PROT_EXEC		0x04
 struct aiocb;
 void	dprintf_debug(const char *fmt, ...) __attribute__((__format__(__printf__, 1, 2)));
 int	thunk_setitimer(int, const struct thunk_itimerval *, struct thunk_itimerval *);
 int	thunk_gettimeofday(struct thunk_timeval *, void *);
 unsigned int thunk_getcounter(void);
 long	thunk_clock_getres_monotonic(void);
 int	thunk_usleep(useconds_t);
 timer_t	thunk_timer_attach(void);
 int	thunk_timer_start(timer_t, int);
 int	thunk_timer_getoverrun(timer_t);
 void	thunk_exit(int);
 void	thunk_abort(void);
 int	thunk_geterrno(void);
 void	thunk_seterrno(int err);
 int	thunk_getcontext(ucontext_t *);
 int	thunk_setcontext(const ucontext_t *);
 void	thunk_makecontext(ucontext_t *ucp, void (*func)(void),
 		int nargs, void *arg1, void *arg2, void *arg3);
 int	thunk_swapcontext(ucontext_t *, ucontext_t *);
 int	thunk_tcgetattr(int, struct thunk_termios *);

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.46 2011/12/15 01:30:04 jmcneill Exp $ */
+/* $NetBSD: thunk.c,v 1.47 2011/12/15 03:42:33 jmcneill Exp $ */
 /*-
  * Copyright (c) 2011 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.
 @@ -18,27 +18,27 @@
  * 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>
 #ifdef __NetBSD__
-__RCSID("$NetBSD: thunk.c,v 1.46 2011/12/15 01:30:04 jmcneill Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.47 2011/12/15 03:42:33 jmcneill Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/reboot.h>
 #include <sys/poll.h>
 #include <machine/vmparam.h>
 #include <aio.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
 @@ -219,26 +219,59 @@ thunk_getcounter(void)
 long
 thunk_clock_getres_monotonic(void)
+{
 	struct timespec res;
 	int error;
 	error = clock_getres(CLOCK_MONOTONIC, &res);
 	if (error)
 		return -1;
 	return (long)(res.tv_sec * 1000000000ULL + res.tv_nsec);
+}
 timer_t
 thunk_timer_attach(void)
+{
 	timer_t timerid;
 	int error;
 	error = timer_create(CLOCK_MONOTONIC, NULL, &timerid);
 	if (error) {
 		perror("timer_create CLOCK_MONOTONIC");
 		abort();
+	}
 	return timerid;
+}
 int
 thunk_timer_start(timer_t timerid, int freq)
+{
 	struct itimerspec tim;
 	tim.it_interval.tv_sec = 0;
 	tim.it_interval.tv_nsec = 1000000000 / freq;
 	tim.it_value = tim.it_interval;
 	return timer_settime(timerid, TIMER_RELTIME, &tim, NULL);
+}
 int
 thunk_timer_getoverrun(timer_t timerid)
+{
 	return timer_getoverrun(timerid);
+}
 int
 thunk_usleep(useconds_t microseconds)
+{
 	return usleep(microseconds);
+}
 void
 thunk_exit(int status)
+{
 	return exit(status);
+}
 void