 @@ -1,14 +1,14 @@
-/* $NetBSD: clock.c,v 1.9 2011/08/23 14:37:50 jmcneill Exp $ */
+/* $NetBSD: clock.c,v 1.10 2011/08/23 16:09:27 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.
 @@ -17,45 +17,45 @@
  * ``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: clock.c,v 1.9 2011/08/23 14:37:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.10 2011/08/23 16:09:27 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <sys/time.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_intr(int);
-static u_int	clock_getcounter(struct timecounter *);
+static unsigned int clock_getcounter(struct timecounter *);
 static int	clock_todr_gettime(struct todr_chip_handle *, struct timeval *);
 typedef 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 */
 ,			/* frequency */
 @@ -112,27 +112,34 @@ clock_attach(device_t parent, device_t s
 static void
 clock_intr(int notused)
+{
 	extern int usermode_x;
 	struct clockframe cf;
 	curcpu()->ci_idepth++;
 	hardclock(&cf);
 	curcpu()->ci_idepth--;
+}
-static u_int
+static unsigned int
 clock_getcounter(struct timecounter *tc)
+{
-	struct timespec ts;
+	return thunk_getcounter();
 	thunk_clock_gettime(CLOCK_MONOTONIC, &ts);
 	return ts.tv_nsec;
+}
 static int
 clock_todr_gettime(struct todr_chip_handle *tch, struct timeval *tv)
+{
-	return thunk_gettimeofday(tv,  NULL);
+	struct thunk_timeval ttv;
 	int error;
 	error = thunk_gettimeofday(&ttv, NULL);
 	if (error)
 		return error;
 	tv->tv_sec = ttv.tv_sec;
 	tv->tv_usec = ttv.tv_usec;
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.h,v 1.10 2011/08/23 14:37:50 jmcneill Exp $ */
+/* $NetBSD: thunk.h,v 1.11 2011/08/23 16:09:27 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.
 @@ -28,29 +28,34 @@
 #ifndef _ARCH_USERMODE_INCLUDE_THUNK_H
 #define _ARCH_USERMODE_INCLUDE_THUNK_H
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 #include <sys/ucontext.h>
 #include <sys/signal.h>
 #include <sys/aio.h>
 #include <sys/mman.h>
 struct thunk_timeval {
 	int64_t tv_sec;
 	int32_t tv_usec;
 };
 int	thunk_setitimer(int, const struct itimerval *, struct itimerval *);
-int	thunk_gettimeofday(struct timeval *, void *);
+int	thunk_gettimeofday(struct thunk_timeval *, void *);
-int	thunk_clock_gettime(clockid_t, struct timespec *);
+unsigned int thunk_getcounter(void);
 long	thunk_clock_getres_monotonic(void);
 int	thunk_usleep(useconds_t);
 void	thunk_exit(int);
 void	thunk_abort(void);
 int	thunk_getcontext(ucontext_t *);
 int	thunk_setcontext(const ucontext_t *);
 void	thunk_makecontext(ucontext_t *, void (*)(void), int, void (*)(void *), void *);
 int	thunk_swapcontext(ucontext_t *, ucontext_t *);
 int	thunk_getchar(void);
 void	thunk_putchar(int);

 @@ -1,14 +1,14 @@
-/* $NetBSD: thunk.c,v 1.11 2011/08/23 14:37:50 jmcneill Exp $ */
+/* $NetBSD: thunk.c,v 1.12 2011/08/23 16:09:27 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.
 @@ -17,62 +17,81 @@
  * ``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>
-__RCSID("$NetBSD: thunk.c,v 1.11 2011/08/23 14:37:50 jmcneill Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.12 2011/08/23 16:09:27 jmcneill Exp $");
 #include <sys/types.h>
 #include <sys/ansi.h>
 #include <aio.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <time.h>
 #include <ucontext.h>
 #include <unistd.h>
 #include "../include/thunk.h"
 int
 thunk_setitimer(int which, const struct itimerval *value,
     struct itimerval *ovalue)
+{
 	return setitimer(which, value, ovalue);
+}
 int
-thunk_gettimeofday(struct timeval *tp, void *tzp)
+thunk_gettimeofday(struct thunk_timeval *tp, void *tzp)
+{
-	return gettimeofday(tp, tzp);
+	struct timeval tv;
 	int error;
 	error = gettimeofday(&tv, tzp);
 	if (error)
 		return error;
 	tp->tv_sec = tv.tv_sec;
 	tp->tv_usec = tv.tv_usec;
 	return 0;
+}
-int
+unsigned int
-thunk_clock_gettime(clockid_t clock_id, struct timespec *tp)
+thunk_getcounter(void)
+{
-	return clock_gettime(clock_id, tp);
+	struct timespec ts;
 	int error;
 	error = clock_gettime(CLOCK_MONOTONIC, &ts);
 	if (error) {
 		perror("clock_gettime CLOCK_MONOTONIC");
 		abort();
+	}
 	return (unsigned int)(ts.tv_sec * 1000000000ULL + ts.tv_nsec);
+}
 long
 thunk_clock_getres_monotonic(void)
+{
 	struct timespec res;
 	int error;
 	error = clock_getres(CLOCK_MONOTONIC, &res);
 	if (error)
 		return -1;
 	return res.tv_nsec;