From owner-p4-projects@FreeBSD.ORG  Fri Mar 12 16:28:11 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6356116A4D0; Fri, 12 Mar 2004 16:28:11 -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 3950F16A4CE
	for <perforce@freebsd.org>; Fri, 12 Mar 2004 16:28:11 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 30D1043D3F
	for <perforce@freebsd.org>; Fri, 12 Mar 2004 16:28:11 -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 i2D0SAGe034493
	for <perforce@freebsd.org>; Fri, 12 Mar 2004 16:28:10 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2D0SA2Q034490
	for perforce@freebsd.org; Fri, 12 Mar 2004 16:28:10 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Fri, 12 Mar 2004 16:28:10 -0800 (PST)
Message-Id: <200403130028.i2D0SA2Q034490@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 48838 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 00:28:12 -0000

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

Change 48838 by jmallett@jmallett_oingo on 2004/03/12 16:27:10

	Go back to panicky Cache Vector now that I'm not switching
	between cached and uncached accesses like an idiot.

Affected files ...

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

Differences ...

==== //depot/projects/mips/sys/mips/mips/exception.S#20 (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#19 $
+ * $P4: //depot/projects/mips/sys/mips/mips/exception.S#20 $
  */
 
 #include "opt_ddb.h"
@@ -142,14 +142,17 @@
 
 LEAF(CacheVector)
 	.set noat
-	mfc0	k0, MIPS_COP_0_CONFIG
-	li	k1, MIPS_SR_DIAG_PE
-	and	k0, k1
-	mtc0	k0, MIPS_COP_0_CONFIG
-	nop
+	dla	k0, __panic
+	li	a0, 0
+	li	a1, 0
+	dmtc0	k0, MIPS_COP_0_EXC_PC
+	dla	a2, 1f
 	eret
 	.set at
 VEND(CacheVector)
+	.data
+1:	.asciiz "Cache Vector"
+	.text
 
 LEAF(TLBMissVector)
 	.set noat