From owner-p4-projects@FreeBSD.ORG  Sat Apr  3 19:29:27 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44F1916A4D0; Sat,  3 Apr 2004 19:29:27 -0800 (PST)
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 1EF9916A4CE
	for <perforce@freebsd.org>; Sat,  3 Apr 2004 19:29:27 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1844C43D1D
	for <perforce@freebsd.org>; Sat,  3 Apr 2004 19:29:27 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i343TQGe059752
	for <perforce@freebsd.org>; Sat, 3 Apr 2004 19:29:26 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i343TQvY059749
	for perforce@freebsd.org; Sat, 3 Apr 2004 19:29:26 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Sat, 3 Apr 2004 19:29:26 -0800 (PST)
Message-Id: <200404040329.i343TQvY059749@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 50301 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: Sun, 04 Apr 2004 03:29:27 -0000

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

Change 50301 by marcel@marcel_nfs on 2004/04/03 19:28:46

	Don't set td_last_frame before we enter the debugger when
	kdb_active is set. We would be clobbering the frame that
	the debugger is actually using.

Affected files ...

.. //depot/projects/gdb/sys/i386/i386/trap.c#8 edit

Differences ...

==== //depot/projects/gdb/sys/i386/i386/trap.c#8 (text+ko) ====

@@ -185,7 +185,6 @@
 
 	atomic_add_int(&cnt.v_trap, 1);
 	type = frame.tf_trapno;
-	td->td_last_frame = &frame;
 
 #ifdef KDB
 	if (kdb_active && type == T_PAGEFLT) {
@@ -194,6 +193,8 @@
 	}
 #endif
 
+	td->td_last_frame = &frame;
+
 	if ((frame.tf_eflags & PSL_I) == 0) {
 		/*
 		 * Buggy application or kernel code has disabled