From owner-p4-projects@FreeBSD.ORG  Sat Mar 20 20:47:22 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F05216A4D0; Sat, 20 Mar 2004 20:47:22 -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 7315916A4CE
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:47:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6B71A43D2D
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:47:22 -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 i2L4lMGe062450
	for <perforce@freebsd.org>; Sat, 20 Mar 2004 20:47:22 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2L4lMVd062447
	for perforce@freebsd.org; Sat, 20 Mar 2004 20:47:22 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 20 Mar 2004 20:47:22 -0800 (PST)
Message-Id: <200403210447.i2L4lMVd062447@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 49430 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 04:47:23 -0000

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

Change 49430 by jmallett@jmallett_oingo on 2004/03/20 20:47:05

	Don't use background-clobberable registers, use temporaries.
	Don't futz with BDslots right now, just be obvious.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/swtch.S#7 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/swtch.S#7 (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/swtch.S#6 $
+ * $P4: //depot/projects/mips/sys/mips/mips/swtch.S#7 $
  */
 
 #include <machine/asm.h>
@@ -56,8 +56,9 @@
 	sd	sp, SF_REG_SP(a0)
 	sd	t0, SF_REG_SR(a0)
 	sd	ra, SF_REG_RA(a0)
+	li	v0, 0
 	jr	ra
-	li	v0, 0
+	nop
 END(savectx)
 
 /*
@@ -70,11 +71,12 @@
 	move	a0, a1
 	jal	pmap_activate
 	nop
-	ld	k1, 0(sp)
-	ld	k0, pcpup
-	sd	k1, PC_CURTHREAD(k0)
-	ld	t0, TD_PCB(k1)
-	sd	t0, PC_CURPCB(k0)
+	ld	t3, 0(sp)
+	daddu	sp, 8
+	ld	t2, pcpup
+	sd	t3, PC_CURTHREAD(t2)
+	ld	t0, TD_PCB(t3)
+	sd	t0, PC_CURPCB(t2)
 	ld	s0, SF_REG_S0(t0)
 	ld	s1, SF_REG_S1(t0)
 	ld	s2, SF_REG_S2(t0)
@@ -93,8 +95,9 @@
 	move	a2, s2
 	move	a3, s3
 	mtc0	t0, MIPS_COP_0_STATUS
+	li	v0, 1
 	jr	ra
-	li	v0, 1
+	nop
 END(cpu_throw)
 
 /*