From owner-p4-projects@FreeBSD.ORG  Tue May 11 21:20:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F24A416A4D1; Tue, 11 May 2004 21:20:17 -0700 (PDT)
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 CD8C116A4CF
	for <perforce@freebsd.org>; Tue, 11 May 2004 21:20:17 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9085C43D5D
	for <perforce@freebsd.org>; Tue, 11 May 2004 21:20:17 -0700 (PDT)
	(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 i4C4KHGe064902
	for <perforce@freebsd.org>; Tue, 11 May 2004 21:20:17 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i4C4KH6o064899
	for perforce@freebsd.org; Tue, 11 May 2004 21:20:17 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Date: Tue, 11 May 2004 21:20:17 -0700 (PDT)
Message-Id: <200405120420.i4C4KH6o064899@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 52703 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: Wed, 12 May 2004 04:20:18 -0000

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

Change 52703 by marcel@marcel_nfs on 2004/05/11 21:19:21

	Add kdb_reenter(). This function is called by the trap
	handler when a trap happens while in the debugger (i.e.
	kdb_active is non-zero). The advantage of a seperate
	function for this is that it can also be called from
	other places than trap handlers.

Affected files ...

.. //depot/projects/gdb/sys/kern/subr_kdb.c#13 edit
.. //depot/projects/gdb/sys/sys/kdb.h#10 edit

Differences ...

==== //depot/projects/gdb/sys/kern/subr_kdb.c#13 (text+ko) ====

@@ -259,6 +259,17 @@
 	return (old);
 }
 
+void
+kdb_reenter(void)
+{
+
+	if (!kdb_active || kdb_jmpbufp == NULL)
+		return;
+
+	longjmp(kdb_jmpbufp, 1);
+	/* NOTREACHED */
+}
+
 /*
  * Thread related support functions.
  */
@@ -333,14 +344,12 @@
 	if (kdb_dbbe == NULL || kdb_dbbe->dbbe_trap == NULL)
 		return (0);
 
+	/* We reenter the debugger through kdb_reenter(). */
+	if (kdb_active)
+		return (0);
+
 	critical_enter();
 
-	/* Check for recursion. */
-	if (kdb_active && kdb_jmpbufp != NULL) {
-		critical_exit();
-		longjmp(kdb_jmpbufp, 1);
-	}
-
 	kdb_active++;
 	kdb_thread = curthread;
 	kdb_frame = tf;

==== //depot/projects/gdb/sys/sys/kdb.h#10 (text+ko) ====

@@ -65,6 +65,7 @@
 void	kdb_enter(const char *);
 void	kdb_init(void);
 void *	kdb_jmpbuf(jmp_buf);
+void	kdb_reenter(void);
 struct thread *kdb_thr_first(void);
 struct thread *kdb_thr_lookup(pid_t);
 struct thread *kdb_thr_next(struct thread *);