 @@ -1,15 +1,15 @@
-/*	$NetBSD: trap.c,v 1.284 2017/02/23 03:34:22 kamil Exp $	*/
+/*	$NetBSD: trap.c,v 1.285 2017/03/09 00:16:51 chs Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -59,27 +59,27 @@
  * 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.
+ *
  *	@(#)trap.c	7.4 (Berkeley) 5/13/91
  */
 /*
  * 386 Trap and System call handling
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.284 2017/02/23 03:34:22 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.285 2017/03/09 00:16:51 chs Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_vm86.h"
 #include "opt_xen.h"
 #include "opt_dtrace.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 @@ -115,27 +115,26 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.2
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>
 /*
  * This is a hook which is initialized by the dtrace module
  * to handle traps which might occur during DTrace probe
  * execution.
  */
 dtrace_trap_func_t	dtrace_trap_func = NULL;
 dtrace_doubletrap_func_t	dtrace_doubletrap_func = NULL;
 #endif
 void trap(struct trapframe *);
 void trap_tss(struct i386tss *, int, int);
 void trap_return_fault_return(struct trapframe *) __dead;
 const char * const trap_type[] = {
 	"privileged instruction fault",		/*  0 T_PRIVINFLT */
 	"breakpoint trap",			/*  1 T_BPTFLT */
 	"arithmetic trap",			/*  2 T_ARITHTRAP */
 	"asynchronous system trap",		/*  3 T_ASTFLT */
 	"protection fault",			/*  4 T_PROTFLT */
 	"trace trap",				/*  5 T_TRCTRAP */
 	"page fault",				/*  6 T_PAGEFLT */
 	"alignment fault",			/*  7 T_ALIGNFLT */
 @@ -151,26 +150,30 @@ const char * const trap_type[] = {
 	"stack fault",				/* 17 T_STKFLT */
 	"machine check fault",			/* 18 T_MCA */
 	"SSE FP exception",			/* 19 T_XMM */
 	"reserved trap",			/* 20 T_RESERVED */
 };
 int	trap_types = __arraycount(trap_type);
 #ifdef DEBUG
 int	trapdebug = 0;
 #endif
 #define	IDTVEC(name)	__CONCAT(X, name)
 #ifdef TRAP_SIGDEBUG
 static void frame_dump(struct trapframe *, struct pcb *);
 #endif
 void
 trap_tss(struct i386tss *tss, int trapno, int code)
+{
 	struct trapframe tf;
 	tf.tf_gs = tss->tss_gs;
 	tf.tf_fs = tss->tss_fs;
 	tf.tf_es = tss->__tss_es;
 	tf.tf_ds = tss->__tss_ds;
 	tf.tf_edi = tss->__tss_edi;
 	tf.tf_esi = tss->__tss_esi;
 	tf.tf_ebp = tss->tss_ebp;
 	tf.tf_ebx = tss->__tss_ebx;
 @@ -214,28 +217,28 @@ onfault_handler(const struct pcb *pcb, c
 static void
 trap_print(const struct trapframe *frame, const lwp_t *l)
+{
 	const int type = frame->tf_trapno;
 	if (frame->tf_trapno < trap_types) {
 		printf("fatal %s", trap_type[type]);
 	} else {
 		printf("unknown trap %d", type);
+	}
 	printf(" in %s mode\n", (type & T_USER) ? "user" : "supervisor");
-	printf("trap type %d code %x eip %x cs %x eflags %x cr2 %lx "
+	printf("trap type %d code %#x eip %#x cs %#x eflags %#x cr2 %#lx "
-	    "ilevel %x esp %x\n",
+	    "ilevel %#x esp %#x\n",
 	    type, frame->tf_err, frame->tf_eip, frame->tf_cs, frame->tf_eflags,
 	    (long)rcr2(), curcpu()->ci_ilevel, frame->tf_esp);
 	printf("curlwp %p pid %d lid %d lowest kstack %p\n",
 	    l, l->l_proc->p_pid, l->l_lid, KSTACK_LOWEST_ADDR(l));
+}
 /*
  * trap(frame): exception, fault, and trap interface to BSD kernel.
+ *
  * This common code is called from assembly language IDT gate entry routines
  * that prepare a suitable stack frame, and restore this frame after the
  * exception has been processed. Note that the effect is as if the arguments
 @@ -663,27 +666,27 @@ faultcommon:
 		case ENOMEM:
 			ksi.ksi_signo = SIGKILL;
 			printf("UVM: pid %d.%d (%s), uid %d killed: "
 			    "out of swap\n", p->p_pid, l->l_lid, p->p_comm,
 			    l->l_cred ?  kauth_cred_geteuid(l->l_cred) : -1);
 			break;
 		default:
 			ksi.ksi_signo = SIGSEGV;
 			ksi.ksi_code = SEGV_MAPERR;
 			break;
+		}
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d.%d (%s): signal %d at eip %x addr %lx "
+		printf("pid %d.%d (%s): signal %d at eip %#x addr %#lx "
 		    "error %d\n", p->p_pid, l->l_lid, p->p_comm, ksi.ksi_signo,
 		    frame->tf_eip, va, error);
 #endif
 		(*p->p_emul->e_trapsignal)(l, &ksi);
 		break;
+	}
 	case T_TRCTRAP:
 		/*
 		 * Ignore debug register trace traps due to
 		 * accesses in the user's address space, which
 		 * can happen under several conditions such as
 		 * if a user sets a watchpoint on a buffer and
 @@ -758,13 +761,47 @@ trapsignal:
 void
 startlwp(void *arg)
+{
 	ucontext_t *uc = arg;
 	lwp_t *l = curlwp;
 	int error __diagused;
 	error = cpu_setmcontext(l, &uc->uc_mcontext, uc->uc_flags);
 	KASSERT(error == 0);
 	kmem_free(uc, sizeof(ucontext_t));
 	userret(l);
+}
 #ifdef TRAP_SIGDEBUG
 void
 frame_dump(struct trapframe *tf, struct pcb *pcb)
+{
 	int i;
 	unsigned long *p;
 	uint64_t fsd, gsd;
 	printf("trapframe %p\n", tf);
 	printf("eip 0x%08x  esp 0x%08x  efl 0x%08x\n",
 	    tf->tf_eip, tf->tf_esp, tf->tf_eflags);
 	printf("edi 0x%08x  esi 0x%08x  edx 0x%08x\n",
 	    tf->tf_edi, tf->tf_esi, tf->tf_edx);
 	printf("ecx 0x%08x\n",
 	    tf->tf_ecx);
 	printf("ebp 0x%08x  ebx 0x%08x  eax 0x%08x\n",
 	    tf->tf_ebp, tf->tf_ebx, tf->tf_eax);
 	printf("cs 0x%04x  ds 0x%04x  es 0x%04x  "
 	       "fs 0x%04x  gs 0x%04x  ss 0x%04x\n",
 		tf->tf_cs & 0xffff, tf->tf_ds & 0xffff, tf->tf_es & 0xffff,
 		tf->tf_fs & 0xffff, tf->tf_gs & 0xffff, tf->tf_ss & 0xffff);
 	memcpy(&fsd, &pcb->pcb_fsd, sizeof(fsd));
 	memcpy(&gsd, &pcb->pcb_gsd, sizeof(gsd));
 	printf("fsbase 0x%016llx gsbase 0x%016llx\n", fsd, gsd);
 	printf("\n");
 	printf("Stack dump:\n");
 	for (i = 0, p = (unsigned long *) tf; i < 20; i ++, p += 8)
 		printf(" 0x%.8lx 0x%.8lx 0x%.8lx 0x%.8lx"
 		       " 0x%.8lx 0x%.8lx 0x%.8lx 0x%.8lx\n",
 		       p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
 	printf("\n");
+}
 #endif