From owner-p4-projects@FreeBSD.ORG  Sat Mar 20 20:51:29 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF19716A4D0; Sat, 20 Mar 2004 20:51:28 -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 B9D5516A4CE
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:51:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B227343D2D
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:51:28 -0800 (PST)
	(envelope-from jmallett@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 i2L4pSGe063441
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:51:28 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L4pSlu063435
	for perforce@freebsd.org; Sat, 20 Mar 2004 20:51:28 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 20 Mar 2004 20:51:28 -0800 (PST)
Message-Id: <200403210451.i2L4pSlu063435@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 49432 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, 21 Mar 2004 04:51:29 -0000

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

Change 49432 by jmallett@jmallett_oingo on 2004/03/20 20:50:51

	Stay kernel mode without exceptions through exception processing.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/exception.S#24 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#24 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips/sys/mips/mips/exception.S#23 $
+ * $P4: //depot/projects/mips/sys/mips/mips/exception.S#24 $
  */
 
 #include "opt_ddb.h"
@@ -121,19 +121,31 @@
 	jal	save_kdbaux
 	nop
 #endif /* DDB */
+	li	t0, MIPS_SR_KX
+	mtc0	t0, MIPS_COP_0_STATUS
 
 	/*
 	 * Call trap() with arguments:
 	 * trapframe, cause, badvaddr.
 	 *
 	 * The trapframe is copied from k1 to a0 in the BDslot.
+	 *
+	 * trap returns the frame.
 	 */
 	mfc0	a1, MIPS_COP_0_CAUSE
 	dmfc0	a2, MIPS_COP_0_BAD_VADDR
 	jal	trap
 	move	a0, k1
 
-	move	k1, sp
+	/*
+	 * Make sure interrupts are disabled for the purposes of
+	 * having a clean go at restoring.
+	 */
+	mtc0	zero, MIPS_COP_0_CAUSE
+	li	t0, MIPS_SR_KX
+	mtc0	t0, MIPS_COP_0_STATUS
+
+	move	k1, v0
 	jal	exception_restore_registers
 	nop
 	daddu	sp, sp, TF_SIZE