From owner-svn-src-user@FreeBSD.ORG  Sun Mar 28 02:44:34 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4F3D11065670;
	Sun, 28 Mar 2010 02:44:34 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4049F8FC1A;
	Sun, 28 Mar 2010 02:44:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2S2iXwi075611;
	Sun, 28 Mar 2010 02:44:33 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2S2iXd9075609;
	Sun, 28 Mar 2010 02:44:33 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201003280244.o2S2iXd9075609@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sun, 28 Mar 2010 02:44:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205786 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Mar 2010 02:44:34 -0000

Author: jmallett
Date: Sun Mar 28 02:44:33 2010
New Revision: 205786
URL: http://svn.freebsd.org/changeset/base/205786

Log:
  Move a big instruction out of a branch delay slot.

Modified:
  user/jmallett/octeon/sys/mips/mips/swtch.S

Modified: user/jmallett/octeon/sys/mips/mips/swtch.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/swtch.S	Sun Mar 28 02:21:58 2010	(r205785)
+++ user/jmallett/octeon/sys/mips/mips/swtch.S	Sun Mar 28 02:44:33 2010	(r205786)
@@ -319,8 +319,9 @@ entry0:
 	mfc0	s0, COP_0_TLB_INDEX
 	nop
 pgm:
-	bltz	s0, entry0set
 	REG_LI	t1, MIPS_KSEG0_START		# invalidate tlb entry
+	bltz	s0, entry0set
+	nop
 	sll	s0, PAGE_SHIFT + 1
 	addu	t1, s0
 	mtc0	t1, COP_0_TLB_HI