 @@ -1,14 +1,14 @@
-/* $NetBSD: trap.c,v 1.27 2011/09/05 18:50:34 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.28 2011/09/05 21:38:05 jmcneill 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,47 +17,48 @@
  * ``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.27 2011/09/05 18:50:34 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.28 2011/09/05 21:38:05 jmcneill 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>
 #include <machine/thunk.h>
 //#include <machine/ctlreg.h>
 //#include <machine/trap.h>
 //#include <machine/instr.h>
 //#include <machine/userret.h>
 extern int cpu_lwp_inkernel;
 /* forwards and externals */
 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)
 @@ -107,26 +108,28 @@ mem_access_handler(int sig, siginfo_t *i
 	static vaddr_t old_va, old_old_va = 0;
 	struct proc *p;
 	struct lwp *l;
 	struct pcb *pcb;
 	struct vmspace *vm;
 	struct vm_map *vm_map;
 	struct trapframe *tf;
 	vm_prot_t atype;
 	vaddr_t va;
 	void *onfault;
 	int kmem, lwp_errno, rv;
 	cpu_lwp_inkernel++;
 	recurse++;
 	if (recurse > 1)
 		printf("enter trap recursion level %d\n", recurse);
 	if ((info->si_signo == SIGSEGV) || (info->si_signo == SIGBUS)) {
 		l = curlwp;
 		p = l->l_proc;
 		pcb = lwp_getpcb(l);
 		onfault = pcb->pcb_onfault;
 		vm = p->p_vmspace;
 		lwp_errno = pcb->pcb_errno = thunk_geterrno();
 #if 0
 		va = (vaddr_t) info->si_addr;
 @@ -219,37 +222,39 @@ mem_access_handler(int sig, siginfo_t *i
 				recurse--;
 				return;
+			}
 			panic("should deliver a trap to the process");
 			/* XXX HOWTO see arm/arm/syscall.c illegal instruction signal */
+		}
 		thunk_seterrno(lwp_errno);
 		pcb->pcb_errno = lwp_errno;
+	}
 	if (recurse > 1)
 		printf("leaving trap recursion level %d\n", recurse);
 	recurse--;
 	cpu_lwp_inkernel--;
+}
 static void
 illegal_instruction_handler(int sig, siginfo_t *info, void *ctx)
+{
 	static volatile int recurse = 0;
 	struct proc *p;
 	struct lwp *l;
 	struct pcb *pcb;
 	vaddr_t va;
 	cpu_lwp_inkernel++;
 	recurse++;
 	if (recurse > 1)
 		printf("enter trap recursion level %d\n", recurse);
 	if (info->si_signo == SIGILL) {
 		l = curlwp;
 		p = l->l_proc;
 		pcb = lwp_getpcb(l);
 #if 1
 		va = (vaddr_t) info->si_addr;
 		printf("illegal instruction trap lwp = %p pid = %d lid = %d, va = %p\n",
 		    curlwp,
 		    curlwp->l_proc->p_pid,
 @@ -277,14 +282,15 @@ illegal_instruction_handler(int sig, sig
 			printf("\t\tCoprocessor error");
 		if (info->si_code == ILL_BADSTK)
 			printf("\t\tInternal stack error");
 		printf("\tsi_addr = %p\n", info->si_addr);
 		printf("\tsi_trap = %d\n", info->si_trap);
 #endif
 		if (recurse > 1)
 			printf("leaving trap recursion level %d\n", recurse);
 		recurse--;
 		panic("illegal instruction encountered\n");
+	}
 	cpu_lwp_inkernel--;
+}