PERFORCE change 136411 for review

[Randall R. Stewart]

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

Change 136411 by rrs at rrs-mips2-jnpr on 2008/02/28 09:29:45

	Have assembly use pneumonics now please.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#14 edit

Differences ...

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

@@ -237,20 +237,20 @@
  *	savectx(struct pcb *pcbp);
  */
 LEAF(savectx)
-	SAVE_U_PCB_CONTEXT(s0, 0, a0)
-	SAVE_U_PCB_CONTEXT(s1, 1, a0)
-	SAVE_U_PCB_CONTEXT(s2, 2, a0)
-	SAVE_U_PCB_CONTEXT(s3, 3, a0)
+	SAVE_U_PCB_CONTEXT(s0, PREG_S0, a0)
+	SAVE_U_PCB_CONTEXT(s1, PREG_S1, a0)
+	SAVE_U_PCB_CONTEXT(s2, PREG_S2, a0)
+	SAVE_U_PCB_CONTEXT(s3, PREG_S3, a0)
 	mfc0	v0, COP_0_STATUS_REG
-	SAVE_U_PCB_CONTEXT(s4, 4, a0)
-	SAVE_U_PCB_CONTEXT(s5, 5, a0)
-	SAVE_U_PCB_CONTEXT(s6, 6, a0)
-	SAVE_U_PCB_CONTEXT(s7, 7, a0)
-	SAVE_U_PCB_CONTEXT(sp, 8, a0)
-	SAVE_U_PCB_CONTEXT(s8, 9, a0)
-	SAVE_U_PCB_CONTEXT(ra, 10, a0)
-	SAVE_U_PCB_CONTEXT(v0, 11, a0)
-	SAVE_U_PCB_CONTEXT(gp, 12, a0)
+	SAVE_U_PCB_CONTEXT(s4, PREG_S4, a0)
+	SAVE_U_PCB_CONTEXT(s5, PREG_S5, a0)
+	SAVE_U_PCB_CONTEXT(s6, PREG_S6, a0)
+	SAVE_U_PCB_CONTEXT(s7, PREG_S7, a0)
+	SAVE_U_PCB_CONTEXT(sp, PREG_SP, a0)
+	SAVE_U_PCB_CONTEXT(s8, PREG_S8, a0)
+	SAVE_U_PCB_CONTEXT(ra, PREG_RA, a0)
+	SAVE_U_PCB_CONTEXT(v0, PREG_SR, a0)
+	SAVE_U_PCB_CONTEXT(gp, PREG_GP, a0)
 	/*
 	 * FREEBSD_DEVELOPERS_FIXME:
 	 * In case there are CPU-specific registers that need
@@ -293,22 +293,22 @@
 	beqz	a0, mips_sw1
 	move	a3, a0
 	lw	a0, TD_PCB(a0)		# load PCB addr of curproc
-	SAVE_U_PCB_CONTEXT(sp, 8, a0)		# save old sp
+	SAVE_U_PCB_CONTEXT(sp, PREG_SP, a0)		# save old sp
 	subu	sp, sp, STAND_FRAME_SIZE
 	sw	ra, STAND_RA_OFFSET(sp)
 	.mask	0x80000000, (STAND_RA_OFFSET - STAND_FRAME_SIZE)
-	SAVE_U_PCB_CONTEXT(s0, 0, a0)		# do a 'savectx()'
-	SAVE_U_PCB_CONTEXT(s1, 1, a0)
-	SAVE_U_PCB_CONTEXT(s2, 2, a0)
-	SAVE_U_PCB_CONTEXT(s3, 3, a0)
-	SAVE_U_PCB_CONTEXT(s4, 4, a0)
-	SAVE_U_PCB_CONTEXT(s5, 5, a0)
-	SAVE_U_PCB_CONTEXT(s6, 6, a0)
-	SAVE_U_PCB_CONTEXT(s7, 7, a0)
-	SAVE_U_PCB_CONTEXT(s8, 9, a0)
-	SAVE_U_PCB_CONTEXT(ra, 10, a0)		# save return address
-	SAVE_U_PCB_CONTEXT(t0, 11, a0)		# save status register
-	SAVE_U_PCB_CONTEXT(gp, 12, a0)
+	SAVE_U_PCB_CONTEXT(s0, PREG_S0, a0)		# do a 'savectx()'
+	SAVE_U_PCB_CONTEXT(s1, PREG_S1, a0)
+	SAVE_U_PCB_CONTEXT(s2, PREG_S2, a0)
+	SAVE_U_PCB_CONTEXT(s3, PREG_S3, a0)
+	SAVE_U_PCB_CONTEXT(s4, PREG_S4, a0)
+	SAVE_U_PCB_CONTEXT(s5, PREG_S5, a0)
+	SAVE_U_PCB_CONTEXT(s6, PREG_S6, a0)
+	SAVE_U_PCB_CONTEXT(s7, PREG_S7, a0)
+	SAVE_U_PCB_CONTEXT(s8, PREG_S8, a0)
+	SAVE_U_PCB_CONTEXT(ra, PREG_RA, a0)		# save return address
+	SAVE_U_PCB_CONTEXT(t0, PREG_SR, a0)		# save status register
+	SAVE_U_PCB_CONTEXT(gp, PREG_GP, a0)
 	/*
 	 * FREEBSD_DEVELOPERS_FIXME:
 	 * In case there are CPU-specific registers that need
@@ -391,19 +391,19 @@
  * Restore registers and return.
  */
 	lw	a0, TD_PCB(s7)
-	RESTORE_U_PCB_CONTEXT(gp, 12, a0)
-	RESTORE_U_PCB_CONTEXT(v0, 11, a0)	# restore kernel context
-	RESTORE_U_PCB_CONTEXT(ra, 10, a0)
-	RESTORE_U_PCB_CONTEXT(s0, 0, a0)
-	RESTORE_U_PCB_CONTEXT(s1, 1, a0)
-	RESTORE_U_PCB_CONTEXT(s2, 2, a0)
-	RESTORE_U_PCB_CONTEXT(s3, 3, a0)
-	RESTORE_U_PCB_CONTEXT(s4, 4, a0)
-	RESTORE_U_PCB_CONTEXT(s5, 5, a0)
-	RESTORE_U_PCB_CONTEXT(s6, 6, a0)
-	RESTORE_U_PCB_CONTEXT(s7, 7, a0)
-	RESTORE_U_PCB_CONTEXT(sp, 8, a0)
-	RESTORE_U_PCB_CONTEXT(s8, 9, a0)
+	RESTORE_U_PCB_CONTEXT(gp, PREG_GP, a0)
+	RESTORE_U_PCB_CONTEXT(v0, PREG_SR, a0)	# restore kernel context
+	RESTORE_U_PCB_CONTEXT(ra, PREG_RA, a0)
+	RESTORE_U_PCB_CONTEXT(s0, PREG_S0, a0)
+	RESTORE_U_PCB_CONTEXT(s1, PREG_S1, a0)
+	RESTORE_U_PCB_CONTEXT(s2, PREG_S2, a0)
+	RESTORE_U_PCB_CONTEXT(s3, PREG_S3, a0)
+	RESTORE_U_PCB_CONTEXT(s4, PREG_S4, a0)
+	RESTORE_U_PCB_CONTEXT(s5, PREG_S5, a0)
+	RESTORE_U_PCB_CONTEXT(s6, PREG_S6, a0)
+	RESTORE_U_PCB_CONTEXT(s7, PREG_S7, a0)
+	RESTORE_U_PCB_CONTEXT(sp, PREG_SP, a0)
+	RESTORE_U_PCB_CONTEXT(s8, PREG_S8, a0)
 	/*
 	 * FREEBSD_DEVELOPERS_FIXME:
 	 * In case there are CPU-specific registers that need