From owner-p4-projects@FreeBSD.ORG  Sat Mar 20 21:07:50 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BE57916A4D0; Sat, 20 Mar 2004 21:07:49 -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 990E416A4CE
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 21:07:49 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9136E43D1D
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 21:07:49 -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 i2L57nGe067573
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 21:07:49 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L57nNL067570
	for perforce@freebsd.org; Sat, 20 Mar 2004 21:07:49 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 20 Mar 2004 21:07:49 -0800 (PST)
Message-Id: <200403210507.i2L57nNL067570@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 49434 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 05:07:50 -0000

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

Change 49434 by jmallett@jmallett_oingo on 2004/03/20 21:07:07

	Delay restoring SR.

Affected files ...

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

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#25 (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#24 $
+ * $P4: //depot/projects/mips/sys/mips/mips/exception.S#25 $
  */
 
 #include "opt_ddb.h"
@@ -294,7 +294,9 @@
 	ld	a1, TF_REG_EPC(k1)
 	ld	a0, TF_REG_MULHI(k1)
 	ld	v1, TF_REG_MULLO(k1)
+#if 0
 	ld	v0, TF_REG_SR(k1)
+#endif
 
 	ld	ra, TF_REG_RA(k1)
 	ld	t9, TF_REG_T9(k1)
@@ -314,7 +316,9 @@
 	dmtc0	a1, MIPS_COP_0_EXC_PC
 	mthi	a0
 	mtlo	v1
+#if 0
 	mtc0	v0, MIPS_COP_0_STATUS
+#endif
 
 	/*
 	 * Now restore the registers we used for scratch, and nearby
@@ -339,9 +343,18 @@
 	 */
 	.set noat
 	ld	AT, TF_REG_AST(k1)
-
+#if 1
+	/* XXX
+	 * We wait until now so we don't interrupt ourselves.
+	 */
+	ld	k1, TF_REG_SR(k1)
+	jr	k0
+	mtc0	k1, MIPS_COP_0_STATUS
+#else
 	jr	k0
 	nop
+#endif
+
 	.set at
 END(exception_restore_registers)