 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.h,v 1.9 2012/01/19 12:14:49 reinoud Exp $ */
+/* $NetBSD: cpu.h,v 1.10 2012/02/08 17:55:21 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.
 @@ -40,30 +40,30 @@ extern void	userret(struct lwp *);
 #define	curcpu()	usermode_curcpu()
 #define cpu_number()	0
 #define cpu_proc_fork(p1, p2)
 struct cpu_info;
 extern int	astpending;
 #define aston(ci) (astpending++)
 extern void cpu_need_resched(struct cpu_info *ci, int flags);
 struct cpu_info {
-	device_t	ci_dev;
+	struct cpu_data	ci_data;		/* MI per-cpu data */
 	device_t	ci_dev;			/* pointer to our device */
 	struct cpu_info	*ci_self;
 	struct cpu_info	*ci_next;
 	struct cpu_data	ci_data;
 	u_int		ci_cpuid;
 	int		ci_want_resched;
 	int		ci_idepth;
 	volatile int	ci_mtx_count;
 	volatile int	ci_mtx_oldspl;
 	lwp_t		*ci_curlwp;
 	lwp_t		*ci_stash;
 };
 __inline static struct cpu_info * __attribute__((__unused__))
 usermode_curcpu(void)
+{
 	extern struct cpu_info cpu_info_primary;

 @@ -1,14 +1,14 @@
-/* $NetBSD: types.h,v 1.7 2012/01/08 18:06:00 jmcneill Exp $ */
+/* $NetBSD: types.h,v 1.8 2012/02/08 17:55:21 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.
 @@ -52,14 +52,17 @@ typedef long int	register_t;
 #define	PRIuVSIZE	"lu"
 #define	PRIxREGISTER	"lx"
 typedef volatile unsigned char	__cpu_simple_lock_t;
 #define __CPU_SIMPLE_LOCK_PAD
 #define __SIMPLELOCK_LOCKED	1
 #define __SIMPLELOCK_UNLOCKED	0
 #if defined(__i386__)
 #define __HAVE_OLD_DISKLABEL
 #endif
 #define __HAVE_CPU_DATA_FIRST
 #define __HAVE_MM_MD_KERNACC
 #endif /* !_ARCH_USERMODE_INCLUDE_TYPES_H */

 @@ -1,14 +1,14 @@
-/* $NetBSD: vmparam.h,v 1.15 2012/01/10 10:19:38 reinoud Exp $ */
+/* $NetBSD: vmparam.h,v 1.16 2012/02/08 17:55:21 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.
 @@ -26,26 +26,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _ARCH_USERMODE_INCLUDE_VMPARAM_H
 #define _ARCH_USERMODE_INCLUDE_VMPARAM_H
 #include <machine/pmap.h>
 #include "opt_memsize.h"
 #define __USE_TOPDOWN_VM
 extern paddr_t kmem_k_start, kmem_k_end;
 extern paddr_t kmem_kvm_start, kmem_kvm_end;
 extern paddr_t kmem_kvm_cur_end;
 extern paddr_t kmem_user_start, kmem_user_end;
 #define VM_MIN_ADDRESS		kmem_user_start
 #define VM_MAX_ADDRESS		kmem_user_end
 #define VM_MAXUSER_ADDRESS	kmem_user_end
 #define VM_MIN_KERNEL_ADDRESS	kmem_kvm_start
 #define VM_MAX_KERNEL_ADDRESS 	kmem_kvm_end
 #define VM_PHYSSEG_STRAT	VM_PSTRAT_BIGFIRST
 #define VM_PHYSSEG_MAX		1
 #define	VM_NFREELIST		1
 #define	VM_FREELIST_DEFAULT	0

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.52 2012/01/15 10:30:21 jmcneill Exp $ */
+/* $NetBSD: machdep.c,v 1.53 2012/02/08 17:55:21 reinoud Exp $ */
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud@netbsd.org>
  * 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
 @@ -27,44 +27,45 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Note that this machdep.c uses the `dummy' mcontext_t defined for usermode.
  * This is basicly a blob of PAGE_SIZE big. We might want to switch over to
  * non-generic mcontext_t's one day, but will this break non-NetBSD hosts?
  */
 #include "opt_memsize.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2012/01/15 10:30:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2012/02/08 17:55:21 reinoud Exp $");
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/exec.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/ucontext.h>
 #include <sys/utsname.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_page.h>
 #include <dev/mm.h>
 #include <machine/vmparam.h>
 #include <machine/machdep.h>
 #include <machine/thunk.h>
 #ifndef MAX_DISK_IMAGES
 #define MAX_DISK_IMAGES	4
 #endif
 char machine[_SYS_NMLN] = "";
 char machine_arch[_SYS_NMLN] = "";
 char module_machine_usermode[_SYS_NMLN] = "";
 struct vm_map *phys_map = NULL;
 @@ -239,18 +240,40 @@ usermode_reboot(void)
 void
 setstatclockrate(int arg)
+{
+}
 void
 consinit(void)
+{
 	printf("NetBSD/usermode startup\n");
+}
 int
-mm_md_physacc(paddr_t pa, vm_prot_t prog)
+mm_md_physacc(paddr_t pa, vm_prot_t prot)
+{
 	// printf("%s: pa = %p, acc %d\n", __func__, (void *) pa, prot);
 	if (pa >= physmem * PAGE_SIZE)
 		return EFAULT;
 	return 0;
+}
 int
 mm_md_kernacc(void *ptr, vm_prot_t prot, bool *handled)
+{
 	const vaddr_t va = (vaddr_t)ptr;
 	extern void *end;
 	// printf("%s: ptr %p, acc %d\n", __func__, ptr, prot);
 	if (va < kmem_kvm_start)
 		return EFAULT;
 	if ((va >= kmem_kvm_cur_end) && (va < kmem_k_start))
 		return EFAULT;
 	if (va > (vaddr_t) end)
 		return EFAULT;
 	*handled = true;
 	return 0;
+}