 @@ -1,14 +1,14 @@
-/* $NetBSD: trap.c,v 1.42 2011/11/27 21:38:17 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.43 2011/12/13 17:54:01 reinoud Exp $ */
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud@netbsd.org>
  * 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,27 +17,27 @@
  * ``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: trap.c,v 1.42 2011/11/27 21:38:17 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.43 2011/12/13 17:54:01 reinoud Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/userret.h>
 #include <sys/errno.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 #include <machine/pmap.h>
 @@ -55,27 +55,26 @@ void setup_signal_handlers(void);
 static void mem_access_handler(int sig, siginfo_t *info, void *ctx);
 static void illegal_instruction_handler(int sig, siginfo_t *info, void *ctx);
 extern int errno;
 bool pmap_fault(pmap_t pmap, vaddr_t va, vm_prot_t *atype);
 static stack_t sigstk;
 void
 startlwp(void *arg)
+{
+}
 //static int debug_fh;
 void
 setup_signal_handlers(void)
+{
 	static struct sigaction sa;
 	if ((sigstk.ss_sp = thunk_malloc(SIGSTKSZ)) == NULL)
 		panic("can't allocate signal stack space\n");
 	sigstk.ss_size  = SIGSTKSZ;
 	sigstk.ss_flags = 0;
 	if (thunk_sigaltstack(&sigstk, 0) < 0)
 		panic("can't set alternate stacksize : %d",
 		    thunk_geterrno());
 @@ -85,28 +84,26 @@ setup_signal_handlers(void)
 //	thunk_sigaddset(&sa.sa_mask, SIGALRM);
 	if (thunk_sigaction(SIGSEGV, &sa, NULL) == -1)
 		panic("couldn't register SIGSEGV handler : %d",
 		    thunk_geterrno());
 	if (thunk_sigaction(SIGBUS, &sa, NULL) == -1)
 		panic("couldn't register SIGBUS handler : %d", thunk_geterrno());
 	sa.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK;
 	sa.sa_sigaction = illegal_instruction_handler;
 	thunk_sigemptyset(&sa.sa_mask);
 //	thunk_sigaddset(&sa.sa_mask, SIGALRM);
 	if (thunk_sigaction(SIGILL, &sa, NULL) == -1)
 		panic("couldn't register SIGILL handler : %d", thunk_geterrno());
 //	debug_fh = thunk_open("/usr/sources/debug", O_RDWR | O_TRUNC | O_CREAT, 0666);
+}
 static void
 mem_access_handler(int sig, siginfo_t *info, void *ctx)
+{
 	ucontext_t *uct = ctx;
 	struct lwp *l;
 	struct pcb *pcb;
 	vaddr_t va;
 	assert((info->si_signo == SIGSEGV) || (info->si_signo == SIGBUS));
 @@ -248,70 +245,60 @@ illegal_instruction_handler(int sig, sig
  */
 void
 pagefault(void)
+{
 	struct proc *p;
 	struct lwp *l;
 	struct pcb *pcb;
 	struct vmspace *vm;
 	struct vm_map *vm_map;
 	vm_prot_t atype;
 	vaddr_t va;
 	void *onfault;
 	int kmem, lwp_errno, rv;
 static vaddr_t old_va, old_old_va = 0;
 	l = curlwp;
 	pcb = lwp_getpcb(l);
 	p = l->l_proc;
 	vm = p->p_vmspace;
 	va = pcb->pcb_fault_addr;
 	lwp_errno = thunk_geterrno();
 	kmem = 1;
 	vm_map = kernel_map;
 	if ((va >= VM_MIN_ADDRESS) && (va < VM_MAXUSER_ADDRESS)) {
 		kmem = 0;
 		vm_map = &vm->vm_map;
+	}
-dprintf_debug("pagefault : va = %p\n", (void *) va);
+	dprintf_debug("pagefault : va = %p\n", (void *) va);
 	/* can pmap handle it? on its own? (r/m) */
 	onfault = pcb->pcb_onfault;
 	rv = 0;
 	if (!pmap_fault(vm_map->pmap, va, &atype)) {
 		dprintf_debug("pmap fault couldn't handle it! : "
 			"derived atype %d\n", atype);
 		/* extra debug for now */
 		if (pcb == 0)
 			panic("NULL pcb!\n");
 		pcb->pcb_onfault = NULL;
 		rv = uvm_fault(vm_map, va, atype);
 		pcb->pcb_onfault = onfault;
+	}
 #if 0
 if (old_old_va)
 	thunk_pwrite(debug_fh, (void *) old_old_va, PAGE_SIZE, old_old_va);
 if (old_va)
 	thunk_pwrite(debug_fh, (void *) old_va, PAGE_SIZE, old_va);
 thunk_pwrite(debug_fh, (void *) va, PAGE_SIZE, va);
 #endif
 old_old_va = old_va;
 old_va = va;
 	if (rv) {
 		dprintf_debug("uvm_fault returned error %d\n", rv);
 		/* something got wrong */
 		if (kmem) {
 			/* copyin / copyout */
 			if (!onfault)
 				panic("kernel fault");
 			panic("%s: can't call onfault yet\n", __func__);
 			/* jump to given onfault */
 			// tf = &kernel_tf;
 			// memset(tf, 0, sizeof(struct trapframe));
 			// tf->tf_pc = onfault;