 @@ -1,80 +1,91 @@
-#	$NetBSD: Makefile.rumpkern,v 1.26 2008/12/31 13:08:57 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.27 2009/01/01 19:07:43 pooka Exp $
+#
 .include "${RUMPTOP}/Makefile.rump"
 LIB=		rump
 LDFLAGS+=	-Wl,--wrap=malloc
 .PATH:	${RUMPTOP}/librump/rumpkern				\
 	${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern		\
 	${RUMPTOP}/../conf ${RUMPTOP}/../dev			\
 	${RUMPTOP}/../../common/lib/libutil			\
-	${RUMPTOP}/../../common/lib/libc/gen
+	${RUMPTOP}/../../common/lib/libutil			\
 	${RUMPTOP}/../../common/lib/libc/gen			\
 	${RUMPTOP}/../../common/lib/libc/stdlib
+#
 # Source modules, first the ones specifically implemented for librump.
+#
 SRCS=	rump.c emul.c intr.c locks.c ltsleep.c percpu.c pool.c sleepq.c vm.c
 # stubs
+#
 SRCS+=	misc_stub.c pmap_stub.c
 # autogenerated
+#
 SRCS+=	rump_syscalls.c
+#
 # Rest are from the std kernel sources.
+#
 # sys/kern
-SRCS+=	kern_auth.c kern_descrip.c kern_malloc_stdtype.c kern_module.c	\
+SRCS+=	kern_auth.c kern_descrip.c kern_ksyms.c kern_malloc_stdtype.c	\
-	kern_rate.c kern_stub.c kern_sysctl.c kern_timeout.c		\
+	kern_module.c kern_rate.c kern_stub.c kern_sysctl.c		\
-	kern_uidinfo.c param.c sys_descrip.c sys_generic.c
+	kern_timeout.c kern_uidinfo.c param.c sys_descrip.c		\
 	sys_generic.c
 # sys/kern subr (misc)
 SRCS+=	subr_devsw.c subr_callback.c subr_hash.c subr_iostat.c		\
 	subr_kobj.c subr_once.c subr_prf2.c subr_specificdata.c		\
 	subr_time.c subr_workqueue.c
 # the funny bit.  this doesn't really belong here, but helps with the
 # needs of kern_descrip.c.  And since it's a fully dynamic interface,
 # it doesn't pull in other gunk.
 SRCS+=	vnode_if.c
 # sys/dev
 SRCS+=	clock_subr.c
 # sys/lib/libkern
 SRCS+=	__assert.c scanc.c skpc.c
 # src/common
-SRCS+=	snprintb.c rb.c
+SRCS+=	snprintb.c rb.c heapsort.c
 # uncomment these lines if you want to use the real kmem code
 #CPPFLAGS+=	-DRUMP_USE_REAL_KMEM
 #SRCS+=		subr_kmem.c subr_vmem.c
 .if ${MACHINE_ARCH} == "vax"
 .PATH:	${RUMPTOP}/../lib/libkern/arch/vax
 SRCS+=	blkset.S
 .endif
 # no shlib_version because this is automatically in sync with lib/librump
 SHLIB_MAJOR=    0
 SHLIB_MINOR=    0
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpkern/opt -DMAXUSERS=32
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpvfs
 CFLAGS+=	-Wno-pointer-sign
+#
 # If archdir exists, it is required to provide:
 # 1) kobj_reloc() and kobj_machdep()
 # 2) ...?
 # 3) PROFIT!
+#
 ARCHDIR=	${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH}
 .if exists(${ARCHDIR})
 .include "${ARCHDIR}/Makefile.inc"
 .PATH:	${ARCHDIR}
 .else
 SRCS+=	kobj_stubs.c
 .endif
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: emul.c,v 1.65 2008/12/30 00:36:38 pooka Exp $	*/
+/*	$NetBSD: emul.c,v 1.66 2009/01/01 19:07:43 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * 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
 @@ -18,75 +18,79 @@
  * 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 AUTHOR 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: emul.c,v 1.65 2008/12/30 00:36:38 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.66 2009/01/01 19:07:43 pooka Exp $");
 #define malloc(a,b,c) __wrap_malloc(a,b,c)
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/null.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/select.h>
 #include <sys/syslog.h>
 #include <sys/namei.h>
 #include <sys/kauth.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kthread.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <sys/poll.h>
 #include <sys/tprintf.h>
 #include <sys/timetc.h>
 #include <sys/tprintf.h>
 #include <sys/module.h>
 #include <machine/bswap.h>
 #include <machine/stdarg.h>
 #include <rump/rumpuser.h>
 #include <uvm/uvm_map.h>
 #include "rump_private.h"
 time_t time_second = 1;
 kmutex_t *proc_lock;
 struct lwp lwp0;
 struct vnode *rootvp;
 struct device *root_device;
 dev_t rootdev;
 int physmem = 256*256; /* 256 * 1024*1024 / 4k, PAGE_SIZE not always set */
 int doing_shutdown;
 int ncpu = 1;
 const int schedppq = 1;
 int hardclock_ticks;
 bool mp_online = false;
 struct vm_map *mb_map;
 struct timeval boottime;
 struct emul emul_netbsd;
 int cold = 1;
 int boothowto;
 char hostname[MAXHOSTNAMELEN];
 size_t hostnamelen;
 u_long	bufmem_valimit;
 u_long	bufmem_hiwater;
 u_long	bufmem_lowater;
 u_long	bufmem;
 u_int	nbuf;
 const char *panicstr;
 const char ostype[] = "NetBSD";
 const char osrelease[] = "999"; /* paradroid 4evah */
 @@ -669,13 +673,23 @@ uint16_t
 bswap16(uint16_t v)
+{
 	return __bswap16(v);
+}
 uint32_t
 bswap32(uint32_t v)
+{
 	return __bswap32(v);
+}
 #endif /* __BSWAP_RENAME */
 void
 module_init_md()
+{
 	/*
 	 * Nothing for now.  However, we should load the librump
 	 * symbol table.
 	 */
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: misc_stub.c,v 1.16 2008/12/18 00:24:12 pooka Exp $	*/
+/*	$NetBSD: misc_stub.c,v 1.17 2009/01/01 19:07:43 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * 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
 @@ -18,36 +18,37 @@
  * 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 AUTHOR 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: misc_stub.c,v 1.16 2008/12/18 00:24:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.17 2009/01/01 19:07:43 pooka Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/evcnt.h>
 #include <sys/event.h>
 #include <sys/sched.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/syscallvar.h>
-#include <sys/cpu.h>
+#include <sys/xcall.h>
 #include <sys/evcnt.h>
 #ifdef __sparc__
  /*
   * XXX Least common denominator - smallest sparc pagesize.
   * Could just be declared, pooka says rump doesn't use ioctl.
   */
 int nbpg = 4096;
 #endif
 void
 yield(void)
+{
 @@ -97,13 +98,27 @@ evcnt_detach(struct evcnt *ev)
 int
 syscall_establish(const struct emul *em, const struct syscall_package *sp)
+{
 	return 0;
+}
 int
 syscall_disestablish(const struct emul *em, const struct syscall_package *sp)
+{
 	return 0;
+}
 /* crosscalls not done, no other hardware CPUs */
 uint64_t
 xc_broadcast(u_int flags, xcfunc_t func, void *arg1, void *arg2)
+{
 	return -1;
+}
 void
 xc_wait(uint64_t where)
+{
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump.c,v 1.79 2008/12/29 17:45:55 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.80 2009/01/01 19:07:43 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * 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
 @@ -18,37 +18,38 @@
  * 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 AUTHOR 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: rump.c,v 1.79 2008/12/29 17:45:55 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.80 2009/01/01 19:07:43 pooka Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/filedesc.h>
 #include <sys/iostat.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/once.h>
 #include <sys/percpu.h>
 #include <sys/queue.h>
 #include <sys/resourcevar.h>
 #include <sys/select.h>
 #include <sys/uidinfo.h>
 #include <sys/sysctl.h>
 #include <rump/rumpuser.h>
 #include "rump_private.h"
 @@ -101,28 +102,26 @@ pvfsinit_nop(struct proc *p)
 static void
 pvfsrele_nop(struct proc *p)
+{
 	return;
+}
 rump_proc_vfs_init_fn rump_proc_vfs_init = pvfsinit_nop;
 rump_proc_vfs_release_fn rump_proc_vfs_release = pvfsrele_nop;
 int
 _rump_init(int rump_version)
+{
 	extern char hostname[];
 	extern size_t hostnamelen;
 	char buf[256];
 	struct proc *p;
 	struct lwp *l;
 	int error;
 	/* XXX */
 	if (rump_inited)
 		return 0;
 	rump_inited = 1;
 	if (rump_version != RUMP_VERSION) {
 		printf("rump version mismatch, %d vs. %d\n",
 		    rump_version, RUMP_VERSION);
 @@ -168,26 +167,27 @@ _rump_init(int rump_version)
 	rumpuser_thrinit();
 	callout_startup();
 	callout_init_cpu(&rump_cpu);
 	once_init();
 	iostat_init();
 	uid_init();
 	percpu_init();
 	fd_sys_init();
 	module_init();
 	sysctl_init();
 	softint_init(&rump_cpu);
 	cold = 0;
 	devsw_init();
 	/* these do nothing if not present */
 	rump_vfs_init();
 	rump_net_init();
 	/* aieeeedondest */
 	if (rump_threads) {
 		if (workqueue_create(&uvm.aiodone_queue, "aiodoned",
 		    rump_aiodone_worker, NULL, 0, 0, 0))
 			panic("aiodoned");
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpcpu.c,v 1.1 2009/01/01 16:50:30 pooka Exp $	*/
+/*	$NetBSD: rumpcpu.c,v 1.2 2009/01/01 19:07:43 pooka Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * 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
 @@ -19,36 +19,48 @@
  * 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 AUTHOR 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: rumpcpu.c,v 1.1 2009/01/01 16:50:30 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpcpu.c,v 1.2 2009/01/01 19:07:43 pooka Exp $");
 #include <sys/param.h>
 #include <machine/cpu.h>
 #include "rump_private.h"
 struct cpu_info *cpu_info_list = &rump_cpu;
 struct cpu_info *
 x86_curcpu()
+{
 	return &rump_cpu;
+}
 struct lwp *
 x86_curlwp()
+{
 	return rump_get_curlwp();
+}
 void
 wbinvd()
+{
 	/*
 	 * Used by kobj_machdep().
+	 *
 	 * But, we Best not execute this since we're not Ring0 *.
 	 * Honestly, I don't know why it's required even in the kernel.
 	 */
+}

 @@ -1,3 +1,14 @@
-#	$NetBSD: Makefile.inc,v 1.2 2008/10/30 01:54:24 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2009/01/01 19:07:43 pooka Exp $
+#
+#
 # Mandatory flags
+#
 CPPFLAGS+=	-DMODULAR
+#
 # Optional flags
+#
 # Comment this out if you want the build to default to allowing threads
 CPPFLAGS+=	-DRUMP_WITHOUT_THREADS

 @@ -1,4 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.2 2009/01/01 16:50:30 pooka Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2009/01/01 19:07:43 pooka Exp $
+#
 SRCS+=	rumpcpu.c rumpspl.c
 .PATH:	${RUMPTOP}/../arch/i386/i386
 SRCS+=	kobj_machdep.c

 @@ -1,5 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.2 2009/01/01 16:50:30 pooka Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2009/01/01 19:07:43 pooka Exp $
+#
 .PATH:	${ARCHDIR}/../i386
 SRCS+=	rumpcpu.c rumpspl.c
 .PATH:	${RUMPTOP}/../amd64/amd64
 SRCS+=	kobj_machdep.c