From owner-p4-projects@FreeBSD.ORG  Sat Mar 13 00:46:25 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D40A016A4D0; Sat, 13 Mar 2004 00:46:24 -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 AFE7416A4CE
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 00:46:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AA59D43D3F
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 00:46:24 -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 i2D8kOGe056678
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 00:46:24 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D8kONr056674
	for perforce@freebsd.org; Sat, 13 Mar 2004 00:46:24 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 13 Mar 2004 00:46:24 -0800 (PST)
Message-Id: <200403130846.i2D8kONr056674@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 48882 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: Sat, 13 Mar 2004 08:46:25 -0000

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

Change 48882 by jmallett@jmallett_oingo on 2004/03/13 00:46:05

	Try two ways of dealing with an interrupty world, neither
	perfect.  One is to not rely on k0 (err, k1?) staying the
	same across the long call to trap().  One is to twiddle IE.

Affected files ...

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

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#21 (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#20 $
+ * $P4: //depot/projects/mips/sys/mips/mips/exception.S#21 $
  */
 
 #include "opt_ddb.h"
@@ -112,6 +112,11 @@
 	move	k1, sp
 1:
 
+	mfc0	t0, MIPS_COP_0_STATUS
+	li	t1, ~MIPS_SR_IE
+	and	t0, t1
+	mtc0	t0, MIPS_COP_0_STATUS
+
 	/*
 	 * A generic exception may result in DDB being invoked.  If we
 	 * are using the kernel debugger, then set up is auxillary
@@ -133,6 +138,7 @@
 	jal	trap
 	move	a0, k1
 
+	move	k1, sp
 	jal	exception_restore_registers
 	nop
 	daddu	sp, sp, TF_SIZE