From owner-p4-projects@FreeBSD.ORG  Thu Sep 16 01:19:42 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E3EA16A4D0; Thu, 16 Sep 2004 01:19:42 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 58FEE16A4CE
	for <perforce@freebsd.org>; Thu, 16 Sep 2004 01:19:42 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 508CA43D2D
	for <perforce@freebsd.org>; Thu, 16 Sep 2004 01:19:42 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i8G1JgvH012315
	for <perforce@freebsd.org>; Thu, 16 Sep 2004 01:19:42 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i8G1Jgsd012312
	for perforce@freebsd.org; Thu, 16 Sep 2004 01:19:42 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 16 Sep 2004 01:19:42 GMT
Message-Id: <200409160119.i8G1Jgsd012312@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 61581 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Sep 2004 01:19:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=61581

Change 61581 by peter@peter_daintree on 2004/09/16 01:18:53

	integ -I -b i386_hammer (pick up db_machdep trace fixes)

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/db_machdep.h#10 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#10 (text+ko) ====

@@ -41,9 +41,17 @@
 #define	BKPT_SIZE	(1)		/* size of breakpoint inst */
 #define	BKPT_SET(inst)	(BKPT_INST)
 
-#define BKPT_SKIP		kdb_frame->tf_rip += 1
+#define BKPT_SKIP				\
+do {						\
+	kdb_frame->tf_rip += 1;			\
+	kdb_thrctx->pcb_rip += 1;		\
+} while(0)
 
-#define	FIXUP_PC_AFTER_BREAK	kdb_frame->tf_rip -= 1;
+#define	FIXUP_PC_AFTER_BREAK			\
+do {						\
+	kdb_frame->tf_rip -= 1;			\
+	kdb_thrctx->pcb_rip -= 1;		\
+} while(0);
 
 #define	db_clear_single_step	kdb_cpu_clear_singlestep
 #define	db_set_single_step	kdb_cpu_set_singlestep