svn commit: r256497 - in head/sys/mips: include mips

[Warner Losh]

Author: imp
Date: Tue Oct 15 04:45:09 2013
New Revision: 256497
URL: http://svnweb.freebsd.org/changeset/base/256497

Log:
  Elminate NON_LEAF and use NESTED instead to unify our assembler
  conventions.
  
  Reviewed by:	jmallet@

Modified:
  head/sys/mips/include/asm.h
  head/sys/mips/mips/exception.S
  head/sys/mips/mips/fp.S
  head/sys/mips/mips/support.S
  head/sys/mips/mips/swtch.S

Modified: head/sys/mips/include/asm.h
==============================================================================
--- head/sys/mips/include/asm.h	Tue Oct 15 04:44:21 2013	(r256496)
+++ head/sys/mips/include/asm.h	Tue Oct 15 04:45:09 2013	(r256497)
@@ -261,12 +261,6 @@ _C_LABEL(x):
 	.asciiz str;			\
 	.align	3
 
-/*
- * XXX retain dialects XXX
- */
-#define	NON_LEAF(x, fsize, retpc)	NESTED(x, fsize, retpc)
-#define	NNON_LEAF(x, fsize, retpc)	NESTED_NOPROFILE(x, fsize, retpc)
-
 #if defined(__mips_o32)
 #define	SZREG	4
 #else

Modified: head/sys/mips/mips/exception.S
==============================================================================
--- head/sys/mips/mips/exception.S	Tue Oct 15 04:44:21 2013	(r256496)
+++ head/sys/mips/mips/exception.S	Tue Oct 15 04:45:09 2013	(r256497)
@@ -377,7 +377,7 @@ SlowFault:
 #define	KERN_REG_SIZE		(NUMSAVEREGS * SZREG)
 #define	KERN_EXC_FRAME_SIZE	(CALLFRAME_SIZ + KERN_REG_SIZE + 16)
 
-NNON_LEAF(MipsKernGenException, KERN_EXC_FRAME_SIZE, ra)
+NESTED_NOPROFILE(MipsKernGenException, KERN_EXC_FRAME_SIZE, ra)
 	.set	noat
 	PTR_SUBU	sp, sp, KERN_EXC_FRAME_SIZE
 	.mask	0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE)
@@ -426,7 +426,7 @@ END(MipsKernGenException)
  *
  *----------------------------------------------------------------------------
  */
-NNON_LEAF(MipsUserGenException, CALLFRAME_SIZ, ra)
+NESTED_NOPROFILE(MipsUserGenException, CALLFRAME_SIZ, ra)
 	.set	noat
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 /*
@@ -573,7 +573,7 @@ END(MipsUserGenException)
 
 	.set	push
 	.set	noat
-NON_LEAF(mips_wait, CALLFRAME_SIZ, ra)
+NESTED(mips_wait, CALLFRAME_SIZ, ra)
 	PTR_SUBU        sp, sp, CALLFRAME_SIZ
 	.mask   0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	REG_S   ra, CALLFRAME_RA(sp)		# save RA
@@ -615,7 +615,7 @@ END(mips_wait)
  *----------------------------------------------------------------------------
  */
 
-NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_SIZE, ra)
+NESTED_NOPROFILE(MipsKernIntr, KERN_EXC_FRAME_SIZE, ra)
 	.set	noat
 	PTR_SUBU	sp, sp, KERN_EXC_FRAME_SIZE
 	.mask	0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE)
@@ -682,7 +682,7 @@ END(MipsKernIntr)
  *
  *----------------------------------------------------------------------------
  */
-NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, ra)
+NESTED_NOPROFILE(MipsUserIntr, CALLFRAME_SIZ, ra)
 	.set	noat
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 /*
@@ -1088,7 +1088,7 @@ END(MipsTLBMissException)
  *
  *----------------------------------------------------------------------------
  */
-NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra)
+NESTED(MipsFPTrap, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	mfc0	t0, MIPS_COP_0_STATUS
 	REG_S	ra, CALLFRAME_RA(sp)

Modified: head/sys/mips/mips/fp.S
==============================================================================
--- head/sys/mips/mips/fp.S	Tue Oct 15 04:44:21 2013	(r256496)
+++ head/sys/mips/mips/fp.S	Tue Oct 15 04:45:09 2013	(r256497)
@@ -94,7 +94,7 @@
  *
  *----------------------------------------------------------------------------
  */
-NON_LEAF(MipsEmulateFP, CALLFRAME_SIZ, ra)
+NESTED(MipsEmulateFP, CALLFRAME_SIZ, ra)
 	subu	sp, sp, CALLFRAME_SIZ
 	sw	ra, CALLFRAME_RA(sp)
 /*

Modified: head/sys/mips/mips/support.S
==============================================================================
--- head/sys/mips/mips/support.S	Tue Oct 15 04:44:21 2013	(r256496)
+++ head/sys/mips/mips/support.S	Tue Oct 15 04:45:09 2013	(r256497)
@@ -175,7 +175,7 @@ END(copystr)
  *		u_int maxlength;
  *		u_int *lencopied;
  */
-NON_LEAF(copyinstr, CALLFRAME_SIZ, ra)
+NESTED(copyinstr, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr
@@ -203,7 +203,7 @@ END(copyinstr)
  *		u_int maxlength;
  *		u_int *lencopied;
  */
-NON_LEAF(copyoutstr, CALLFRAME_SIZ, ra)
+NESTED(copyoutstr, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr
@@ -228,7 +228,7 @@ END(copyoutstr)
  *		caddr_t *to;	(kernel destination address)
  *		unsigned len;
  */
-NON_LEAF(copyin, CALLFRAME_SIZ, ra)
+NESTED(copyin, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr
@@ -254,7 +254,7 @@ END(copyin)
  *		caddr_t *to;	(user destination address)
  *		unsigned len;
  */
-NON_LEAF(copyout, CALLFRAME_SIZ, ra)
+NESTED(copyout, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr

Modified: head/sys/mips/mips/swtch.S
==============================================================================
--- head/sys/mips/mips/swtch.S	Tue Oct 15 04:44:21 2013	(r256496)
+++ head/sys/mips/mips/swtch.S	Tue Oct 15 04:45:09 2013	(r256497)
@@ -175,7 +175,7 @@ LEAF(savectx)
 	move	v0, zero
 END(savectx)
 
-NON_LEAF(cpu_throw, CALLFRAME_SIZ, ra)
+NESTED(cpu_throw, CALLFRAME_SIZ, ra)
 	mfc0	t0, MIPS_COP_0_STATUS		# t0 = saved status register
 	nop
 	nop
@@ -195,7 +195,7 @@ END(cpu_throw)
  *	a2 - mtx
  * Find the highest priority process and resume it.
  */
-NON_LEAF(cpu_switch, CALLFRAME_SIZ, ra)
+NESTED(cpu_switch, CALLFRAME_SIZ, ra)
 	mfc0	t0, MIPS_COP_0_STATUS		# t0 = saved status register
 	nop
 	nop