From owner-p4-projects@FreeBSD.ORG  Fri Jan 18 16:58:39 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B4FE416A468; Fri, 18 Jan 2008 16:58:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 622FF16A41A
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 16:58:39 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 289F613C4EF
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 16:58:39 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0IGwcAF093765
	for <perforce@freebsd.org>; Fri, 18 Jan 2008 16:58:38 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IGwc2K093762
	for perforce@freebsd.org; Fri, 18 Jan 2008 16:58:38 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 18 Jan 2008 16:58:38 GMT
Message-Id: <200801181658.m0IGwc2K093762@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133557 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 18 Jan 2008 16:58:40 -0000

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

Change 133557 by imp@imp_paco-paco on 2008/01/18 16:58:22

	Add a nop to prevent macro expanding into delay slot of blt.  The
	target of the blt also loads the per cpu stuff (into t0), so there's
	no need to put it in the delay slot.  One might be able to tweak
	the code a little to load it always and have the leaf code cope,
	but I'm not sure if the leaf that's called is called only from here
	so I'm just doing the correct thing and noting the posbilty that more
	analysis could yield more optimal results.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#6 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#6 (text+ko) ====

@@ -1466,6 +1466,7 @@
 
 	li	t0, VM_MAXUSER_ADDRESS /* verify address validity */
 	blt	a0, t0, fusufault		/* trap faults */
+	nop
 
 	GET_CPU_PCPU(t1)
 	lw	t1, PC_CURTHREAD(t1)