d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Elminate NON_LEAF and use NESTED instead to unify our assembler

Browse Source 
conventions.

Reviewed by:	jmallet@
This commit is contained in:
Warner Losh 2013-10-15 04:45:09 +00:00
parent 10eb94556e
commit 0013199a74
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/mips/include/asm.h
View File

@ -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

12
sys/mips/mips/exception.S
View File

@ -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)

2
sys/mips/mips/fp.S
View File

@ -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)
/*

8
sys/mips/mips/support.S
View File

@ -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

4
sys/mips/mips/swtch.S
View File

@ -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