From owner-p4-projects@FreeBSD.ORG  Sat Nov  8 17:58:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 390B616A4D0; Sat,  8 Nov 2003 17:58:48 -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 1477916A4CE
	for <perforce@freebsd.org>; Sat,  8 Nov 2003 17:58:48 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8D66743FBD
	for <perforce@freebsd.org>; Sat,  8 Nov 2003 17:58:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA91wlXJ034368
	for <perforce@freebsd.org>; Sat, 8 Nov 2003 17:58:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA91wlQH034365
	for perforce@freebsd.org; Sat, 8 Nov 2003 17:58:47 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 8 Nov 2003 17:58:47 -0800 (PST)
Message-Id: <200311090158.hA91wlQH034365@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 41781 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, 09 Nov 2003 01:58:48 -0000

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

Change 41781 by jmallett@jmallett_dalek on 2003/11/08 17:58:25

	Add nops, use dmtc0.  Also, in the R4600 case, jump from TLBMiss
	to XTLBMiss.  There's other brokenness there, but I just want
	to document this, in terms of some behaviour, since I've no idea
	what's going on.  The CPU seems really, really funky.

Affected files ...

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

Differences ...

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

@@ -141,6 +141,10 @@
 
 LEAF(TLBMissVector)
 	.set noat
+#if	R4600
+	j	XTLBMissVector
+	nop
+#else
 	dsubu	sp, sp, TF_SIZE
 	dla	k0, 1f
 	j	exception_save_registers
@@ -160,6 +164,7 @@
 	move	a0, sp
 	daddu	sp, sp, TF_SIZE
 	eret
+#endif
 	.set at
 VEND(TLBMissVector)
 
@@ -194,13 +199,17 @@
 	/*
 	 * Write TLB entry.
 	 */
-	mtc0	k0, MIPS_COP_0_TLB_LO0
+	dmtc0	k0, MIPS_COP_0_TLB_LO0
+	nop
+	nop
+	dmtc0	k1, MIPS_COP_0_TLB_LO1
 	nop
-	mtc0	k1, MIPS_COP_0_TLB_LO1
 	nop
 	tlbwr
 	nop
 	nop
+	nop
+	nop
 	eret
 1:	j	BadPTE
 	nop