 @@ -1,14 +1,14 @@
-/*	$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
 @@ -46,27 +46,27 @@
  * 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>
 @@ -149,37 +149,75 @@ kgdb_signal(int type)
 	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;

 @@ -1,14 +1,14 @@
-/*	$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"
 @@ -110,27 +110,27 @@ bool		db_phys_eq(task_t, vaddr_t, task_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