 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.92 2017/02/23 03:34:22 kamil Exp $	*/
+/*	$NetBSD: trap.c,v 1.93 2017/03/09 00:16:07 chs Exp $	*/
 /*-
  * Copyright (c) 1998, 2000 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.
 @@ -58,27 +58,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.92 2017/02/23 03:34:22 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.93 2017/03/09 00:16:07 chs Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.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>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 @@ -144,27 +144,27 @@ const char * const trap_type[] = {
 	"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 *);
+static void frame_dump(struct trapframe *, struct pcb *);
 #endif
 static void *
 onfault_handler(const struct pcb *pcb, const struct trapframe *tf)
+{
 	struct onfault_table {
 		uintptr_t start;
 		uintptr_t end;
 		void *handler;
 	};
 	extern const struct onfault_table onfault_table[];
 	const struct onfault_table *p;
 	uintptr_t pc;
 @@ -184,28 +184,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 %lx rip %lx cs %lx rflags %lx cr2 %lx "
+	printf("trap type %d code %#lx rip %#lx cs %#lx rflags %#lx cr2 %#lx "
-	    "ilevel %x rsp %lx\n",
+	    "ilevel %#x rsp %#lx\n",
 	    type, frame->tf_err, (u_long)frame->tf_rip, frame->tf_cs,
 	    frame->tf_rflags, rcr2(), curcpu()->ci_ilevel, frame->tf_rsp);
 	printf("curlwp %p pid %d.%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
 @@ -398,29 +398,29 @@ kernelfault:
 		l->l_md.md_regs = vframe;
 		(*p->p_emul->e_trapsignal)(l, &ksi);
 		/* Return to user by reloading the user frame */
 		trap_return_fault_return(vframe);
 		/* NOTREACHED */
 #endif
 	case T_PROTFLT|T_USER:		/* protection fault */
 	case T_TSSFLT|T_USER:
 	case T_SEGNPFLT|T_USER:
 	case T_STKFLT|T_USER:
 	case T_ALIGNFLT|T_USER:
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d.%d (%s): BUS/SEGV (%x) at rip %lx addr %lx\n",
+		printf("pid %d.%d (%s): BUS/SEGV (%#x) at rip %#lx addr %#lx\n",
 		    p->p_pid, l->l_lid, p->p_comm, type, frame->tf_rip, rcr2());
-		frame_dump(frame);
+		frame_dump(frame, pcb);
 #endif
 		KSI_INIT_TRAP(&ksi);
 		ksi.ksi_trap = type & ~T_USER;
 		ksi.ksi_addr = (void *)rcr2();
 		switch (type) {
 		case T_SEGNPFLT|T_USER:
 		case T_STKFLT|T_USER:
 			ksi.ksi_signo = SIGBUS;
 			ksi.ksi_code = BUS_ADRERR;
 			break;
 		case T_TSSFLT|T_USER:
 			ksi.ksi_signo = SIGBUS;
 			ksi.ksi_code = BUS_OBJERR;
 @@ -432,29 +432,29 @@ kernelfault:
 		case T_PROTFLT|T_USER:
 			ksi.ksi_signo = SIGSEGV;
 			ksi.ksi_code = SEGV_ACCERR;
 			break;
 		default:
 			KASSERT(0);
 			break;
+		}
 		goto trapsignal;
 	case T_PRIVINFLT|T_USER:	/* privileged instruction fault */
 	case T_FPOPFLT|T_USER:		/* coprocessor operand fault */
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d.%d (%s): ILL at rip %lx addr %lx\n",
+		printf("pid %d.%d (%s): ILL at rip %#lx addr %#lx\n",
 		    p->p_pid, l->l_lid, p->p_comm, frame->tf_rip, rcr2());
-		frame_dump(frame);
+		frame_dump(frame, pcb);
 #endif
 		KSI_INIT_TRAP(&ksi);
 		ksi.ksi_signo = SIGILL;
 		ksi.ksi_trap = type & ~T_USER;
 		ksi.ksi_addr = (void *) frame->tf_rip;
 		switch (type) {
 		case T_PRIVINFLT|T_USER:
 			ksi.ksi_code = ILL_PRVOPC;
 			break;
 		case T_FPOPFLT|T_USER:
 			ksi.ksi_code = ILL_COPROC;
 			break;
 		default:
 @@ -660,27 +660,27 @@ faultcommon:
 			    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 rip %#lx addr %#lx "
 		    "error %d trap %d cr2 %p\n", p->p_pid, l->l_lid, p->p_comm,
 		    ksi.ksi_signo, frame->tf_rip, va, error, ksi.ksi_trap,
 		    ksi.ksi_addr);
-		frame_dump(frame);
+		frame_dump(frame, pcb);
 #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
 		 * then passes that buffer to a system call.
 		 * We still want to get TRCTRAPS for addresses
 @@ -753,42 +753,46 @@ 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
-static void
+void
-frame_dump(struct trapframe *tf)
+frame_dump(struct trapframe *tf, struct pcb *pcb)
+{
 	int i;
 	unsigned long *p;
-	printf("rip %p  rsp %p  rfl %p\n",
+	printf("trapframe %p\n", tf);
-	    (void *)tf->tf_rip, (void *)tf->tf_rsp, (void *)tf->tf_rflags);
+	printf("rip 0x%016lx  rsp 0x%016lx  rfl 0x%016lx\n",
-	printf("rdi %p  rsi %p  rdx %p\n",
+	    tf->tf_rip, tf->tf_rsp, tf->tf_rflags);
-	    (void *)tf->tf_rdi, (void *)tf->tf_rsi, (void *)tf->tf_rdx);
+	printf("rdi 0x%016lx  rsi 0x%016lx  rdx 0x%016lx\n",
-	printf("rcx %p  r8  %p  r9  %p\n",
+	    tf->tf_rdi, tf->tf_rsi, tf->tf_rdx);
-	    (void *)tf->tf_rcx, (void *)tf->tf_r8, (void *)tf->tf_r9);
+	printf("rcx 0x%016lx  r8  0x%016lx  r9  0x%016lx\n",
-	printf("r10 %p  r11 %p  r12 %p\n",
+	    tf->tf_rcx, tf->tf_r8, tf->tf_r9);
-	    (void *)tf->tf_r10, (void *)tf->tf_r11, (void *)tf->tf_r12);
+	printf("r10 0x%016lx  r11 0x%016lx  r12 0x%016lx\n",
-	printf("r13 %p  r14 %p  r15 %p\n",
+	    tf->tf_r10, tf->tf_r11, tf->tf_r12);
-	    (void *)tf->tf_r13, (void *)tf->tf_r14, (void *)tf->tf_r15);
+	printf("r13 0x%016lx  r14 0x%016lx  r15 0x%016lx\n",
-	printf("rbp %p  rbx %p  rax %p\n",
+	    tf->tf_r13, tf->tf_r14, tf->tf_r15);
-	    (void *)tf->tf_rbp, (void *)tf->tf_rbx, (void *)tf->tf_rax);
+	printf("rbp 0x%016lx  rbx 0x%016lx  rax 0x%016lx\n",
-	printf("cs %lx  ds %lx  es %lx  fs %lx  gs %lx  ss %lx\n",
+	    tf->tf_rbp, tf->tf_rbx, tf->tf_rax);
 	printf("cs 0x%04lx  ds 0x%04lx  es 0x%04lx  "
 	       "fs 0x%04lx  gs 0x%04lx  ss 0x%04lx\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);
 	printf("fsbase 0x%016lx gsbase 0x%016lx\n",
 	       pcb->pcb_fs, pcb->pcb_gs);
 	printf("\n");
 	printf("Stack dump:\n");
 	for (i = 0, p = (unsigned long *) tf; i < 20; i ++, p += 4)
-		printf("   0x%.16lx  0x%.16lx  0x%.16lx 0x%.16lx\n", *p, p[1], p[2], p[3]);
+		printf(" 0x%.16lx  0x%.16lx  0x%.16lx  0x%.16lx\n",
 		       p[0], p[1], p[2], p[3]);
 	printf("\n");
+}
 #endif