PERFORCE change 49430 for review

[Juli Mallett]

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

Change 49430 by jmallett at 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)
 
 /*