 @@ -1,208 +1,246 @@
-/*	$NetBSD: kgdb_machdep.c,v 1.8 2011/04/03 22:29:25 dyoung Exp $	*/
+/*	$NetBSD: kgdb_machdep.c,v 1.9 2015/07/26 10:49:05 mrg Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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.
  */
 /*
  * Copyright (c) 1996 Matthias Pfaller.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: kgdb_machdep.c,v 1.8 2011/04/03 22:29:25 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.9 2015/07/26 10:49:05 mrg Exp $");
 #include "opt_ddb.h"
 /*
  * Machine-dependent functions for remote KGDB.  Originally written
  * for NetBSD/pc532 by Matthias Pfaller.  Modified for NetBSD/i386
  * by Jason R. Thorpe. Modified for NetBSD/amd64 by Frank van der Linden.
  */
 #include <sys/param.h>
 #include <sys/kgdb.h>
 #include <sys/systm.h>
 #include <machine/pte.h>
 #include <machine/trap.h>
 /*
  * Determine if the memory at va..(va+len) is valid.
  */
 int
 kgdb_acc(vaddr_t va, size_t len)
+{
 	vaddr_t last_va;
 	pt_entry_t *pte;
 	last_va = va + len;
 	va  &= ~PGOFSET;
 	last_va &= ~PGOFSET;
 	do {
 		if (va < VM_MIN_KERNEL_ADDRESS)
 			pte = vtopte(va);
 		else
 			pte = kvtopte(va);
 		if ((*pte & PG_V) == 0)
 			return (0);
 		va += PAGE_SIZE;
 	} while (va < last_va);
 	return (1);
+}
 void
 kgdb_entry_notice(int type, db_regs_t *regs)
+{
 	if (type == T_NMI)
 		printf("NMI ... going to debugger\n");
+}
 /*
  * Translate a trap number into a unix compatible signal value.
  * (gdb only understands unix signal numbers).
  */
 int
 kgdb_signal(int type)
+{
 	switch (type) {
 	case T_NMI:
 		return (SIGINT);
 	case T_ALIGNFLT:
 		return (SIGILL);
 	case T_BPTFLT:
 	case T_TRCTRAP:
 		return (SIGTRAP);
 	case T_ASTFLT:
 	case T_DOUBLEFLT:
 		return (SIGEMT);
 	case T_ARITHTRAP:
 	case T_DIVIDE:
 	case T_OFLOW:
 	case T_DNA:
 	case T_FPOPFLT:
 		return (SIGFPE);
 	case T_PRIVINFLT:
 	case T_PROTFLT:
 	case T_PAGEFLT:
 	case T_TSSFLT:
 	case T_SEGNPFLT:
 	case T_STKFLT:
 		return (SIGSEGV);
 	case T_BOUND:
 		return (SIGURG);
 	default:
 		return (SIGEMT);
+	}
+}
 /*
  * Translate the values stored in the kernel regs struct to the format
  * understood by gdb.
  */
 void
 kgdb_getregs(db_regs_t *regs, kgdb_reg_t *gdb_regs)
+{
-	memcpy(gdb_regs, regs, sizeof *regs);
+	gdb_regs[ 0] = regs->tf_rax;
 	gdb_regs[ 1] = regs->tf_rbx;
 	gdb_regs[ 2] = regs->tf_rcx;
 	gdb_regs[ 3] = regs->tf_rdx;
 	gdb_regs[ 4] = regs->tf_rsi;
 	gdb_regs[ 5] = regs->tf_rdi;
 	gdb_regs[ 6] = regs->tf_rbp;
 	gdb_regs[ 7] = regs->tf_rsp;
 	gdb_regs[ 8] = regs->tf_r8;
 	gdb_regs[ 9] = regs->tf_r9;
 	gdb_regs[10] = regs->tf_r10;
 	gdb_regs[11] = regs->tf_r11;
 	gdb_regs[12] = regs->tf_r12;
 	gdb_regs[13] = regs->tf_r13;
 	gdb_regs[14] = regs->tf_r14;
 	gdb_regs[15] = regs->tf_r15;
 	gdb_regs[16] = regs->tf_rip;
 	gdb_regs[17] = regs->tf_rflags;
 	gdb_regs[18] = regs->tf_cs;
 	gdb_regs[19] = regs->tf_ss;
+}
 /*
  * Reverse the above.
  */
 void
 kgdb_setregs(db_regs_t *regs, kgdb_reg_t *gdb_regs)
+{
-	memcpy(regs, gdb_regs, sizeof *regs);
+	regs->tf_rax = gdb_regs[ 0];
 	regs->tf_rbx = gdb_regs[ 1];
 	regs->tf_rcx = gdb_regs[ 2];
 	regs->tf_rdx = gdb_regs[ 3];
 	regs->tf_rsi = gdb_regs[ 4];
 	regs->tf_rdi = gdb_regs[ 5];
 	regs->tf_rbp = gdb_regs[ 6];
 	regs->tf_rsp = gdb_regs[ 7];
 	regs->tf_r8  = gdb_regs[ 8];
 	regs->tf_r9  = gdb_regs[ 9];
 	regs->tf_r10 = gdb_regs[10];
 	regs->tf_r11 = gdb_regs[11];
 	regs->tf_r12 = gdb_regs[12];
 	regs->tf_r13 = gdb_regs[13];
 	regs->tf_r14 = gdb_regs[14];
 	regs->tf_r15 = gdb_regs[15];
 	regs->tf_rip = gdb_regs[16];
 	regs->tf_rflags = gdb_regs[17];
 	regs->tf_cs  = gdb_regs[18];
 	regs->tf_ss  = gdb_regs[19];
+}
 /*
  * Trap into kgdb to wait for debugger to connect,
  * noting on the console why nothing else is going on.
  */
 void
 kgdb_connect(int verbose)
+{
 	if (kgdb_dev == NODEV)
 		return;
 	if (verbose)
 		printf("kgdb waiting...");
 	breakpoint();
 	if (verbose)
 		printf("connected.\n");
 	kgdb_debug_panic = 1;
+}
 /*
  * Decide what to do on panic.
  * (This is called by panic, like Debugger())
  */
 void
 kgdb_panic(void)
+{
 	if (kgdb_dev != NODEV && kgdb_debug_panic) {
 		printf("entering kgdb\n");
 		kgdb_connect(kgdb_active == 0);
+	}
+}

 @@ -1,150 +1,150 @@
-/*	$NetBSD: db_machdep.h,v 1.14 2013/10/17 23:05:08 christos Exp $	*/
+/*	$NetBSD: db_machdep.h,v 1.15 2015/07/26 10:49:05 mrg Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 #ifndef	_X86_64_DB_MACHDEP_H_
 #define	_X86_64_DB_MACHDEP_H_
 /*
  * Machine-dependent defines for new kernel debugger.
  */
 #if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #endif /* defined(_KERNEL_OPT) */
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
 #include <machine/trap.h>
 typedef	vaddr_t		db_addr_t;	/* address - unsigned */
 #define	DDB_EXPR_FMT	"l"		/* expression is long */
 typedef	long		db_expr_t;	/* expression - signed */
 typedef struct trapframe db_regs_t;
 struct x86_64_frame {
 	struct x86_64_frame	*f_frame;
 	long			f_retaddr;
 	long			f_arg0;
 };
 #ifndef MULTIPROCESSOR
 extern db_regs_t ddb_regs;	/* register state */
 #define	DDB_REGS	(&ddb_regs)
 #else
 extern db_regs_t *ddb_regp;
 #define DDB_REGS	(ddb_regp)
 #define ddb_regs	(*ddb_regp)
 #endif
 #define	PC_REGS(regs)	((regs)->tf_rip)
 #define PC_ADVANCE(r)  ((r)->tf_rip += BKPT_SIZE)
 #define	BKPT_ADDR(addr)	(addr)		/* breakpoint address */
 #define	BKPT_INST	0xcc		/* breakpoint instruction */
 #define	BKPT_SIZE	(1)		/* size of breakpoint inst */
 #define	BKPT_SET(inst, addr)	(BKPT_INST)
 #define	FIXUP_PC_AFTER_BREAK(regs)	((regs)->tf_rip -= BKPT_SIZE)
 #define	db_clear_single_step(regs)	((regs)->tf_rflags &= ~PSL_T)
 #define	db_set_single_step(regs)	((regs)->tf_rflags |=  PSL_T)
 #define	IS_BREAKPOINT_TRAP(type, code)	((type) == T_BPTFLT)
 #define IS_WATCHPOINT_TRAP(type, code)	((type) == T_TRCTRAP && (code) & 15)
 #define	I_CALL		0xe8
 #define	I_CALLI		0xff
 #define	I_RET		0xc3
 #define	I_IRET		0xcf
 #define	inst_trap_return(ins)	(((ins)&0xff) == I_IRET)
 #define	inst_return(ins)	(((ins)&0xff) == I_RET)
 #define	inst_call(ins)		(((ins)&0xff) == I_CALL || \
 				 (((ins)&0xff) == I_CALLI && \
 				  ((ins)&0x3800) == 0x1000))
 #define inst_load(ins)		(__USE(ins), 0)
 #define inst_store(ins)		(__USE(ins), 0)
 /* access capability and access macros */
 #define DB_ACCESS_LEVEL		2	/* access any space */
 #define DB_CHECK_ACCESS(addr,size,task)				\
 	db_check_access(addr,size,task)
 #define DB_PHYS_EQ(task1,addr1,task2,addr2)			\
 	db_phys_eq(task1,addr1,task2,addr2)
 #define DB_VALID_KERN_ADDR(addr)				\
 	((addr) >= VM_MIN_KERNEL_ADDRESS && 			\
 	 (addr) < VM_MAX_KERNEL_ADDRESS)
 #define DB_VALID_ADDRESS(addr,user)				\
 	((!(user) && DB_VALID_KERN_ADDR(addr)) ||		\
 	 ((user) && (addr) < VM_MAX_ADDRESS))
 #if 0
 bool	 	db_check_access(vaddr_t, int, task_t);
 bool		db_phys_eq(task_t, vaddr_t, task_t, vaddr_t);
 #endif
 /* macros for printing OS server dependent task name */
 #define DB_TASK_NAME(task)	db_task_name(task)
 #define DB_TASK_NAME_TITLE	"COMMAND                "
 #define DB_TASK_NAME_LEN	23
 #define DB_NULL_TASK_NAME	"?                      "
 /*
  * Constants for KGDB.
  */
 typedef	long		kgdb_reg_t;
-#define	KGDB_NUMREGS	16
+#define	KGDB_NUMREGS	20
 #define	KGDB_BUFLEN	512
 #if 0
 void		db_task_name(/* task_t */);
 #endif
 /* macro for checking if a thread has used floating-point */
 #define db_thread_fp_used(thread)	((thread)->pcb->ims.ifps != 0)
 int kdb_trap(int, int, db_regs_t *);
 #ifdef _KERNEL
 /*
  * We define some of our own commands
  */
 #define DB_MACHINE_COMMANDS
 #endif
 #define	DB_ELF_SYMBOLS
 #define	DB_ELFSIZE	64
 extern void db_machine_init(void);
 extern void cpu_debug_dump(void);
 #endif	/* _X86_64_DB_MACHDEP_H_ */