Date: Tue, 15 Oct 2013 04:43:31 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256495 - in head/sys/mips: include mips Message-ID: <201310150443.r9F4hVQP096135@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Oct 15 04:43:31 2013 New Revision: 256495 URL: http://svnweb.freebsd.org/changeset/base/256495 Log: Replace uses of the ALEAF macro with XLEAF and remove ALEAF macro to try to unify the conventions used in our assembler. Reviewed by: jmallet@ Modified: head/sys/mips/include/asm.h head/sys/mips/mips/bcopy.S head/sys/mips/mips/fp.S head/sys/mips/mips/support.S Modified: head/sys/mips/include/asm.h ============================================================================== --- head/sys/mips/include/asm.h Tue Oct 15 04:36:34 2013 (r256494) +++ head/sys/mips/include/asm.h Tue Oct 15 04:43:31 2013 (r256495) @@ -264,7 +264,6 @@ _C_LABEL(x): /* * XXX retain dialects XXX */ -#define ALEAF(x) XLEAF(x) #define NLEAF(x) LEAF_NOPROFILE(x) #define NON_LEAF(x, fsize, retpc) NESTED(x, fsize, retpc) #define NNON_LEAF(x, fsize, retpc) NESTED_NOPROFILE(x, fsize, retpc) Modified: head/sys/mips/mips/bcopy.S ============================================================================== --- head/sys/mips/mips/bcopy.S Tue Oct 15 04:36:34 2013 (r256494) +++ head/sys/mips/mips/bcopy.S Tue Oct 15 04:43:31 2013 (r256495) @@ -72,8 +72,8 @@ LEAF(memcpy) move a0, a1 move a1, v0 -ALEAF(bcopy) -ALEAF(ovbcopy) +XLEAF(bcopy) +XLEAF(ovbcopy) /* * Make sure we can copy forwards. */ Modified: head/sys/mips/mips/fp.S ============================================================================== --- head/sys/mips/mips/fp.S Tue Oct 15 04:36:34 2013 (r256494) +++ head/sys/mips/mips/fp.S Tue Oct 15 04:43:31 2013 (r256495) @@ -2460,7 +2460,7 @@ get_ft_s_done: * *---------------------------------------------------------------------------- */ -ALEAF(get_fs_s) +XLEAF(get_fs_s) srl a3, a0, 12 - 2 # get FS field (even regs only) and a3, a3, 0xF << 2 # mask FS field lw a3, get_fs_s_tbl(a3) # switch on register number @@ -2679,7 +2679,7 @@ get_ft_d_done: * *---------------------------------------------------------------------------- */ -ALEAF(get_fs_d) +XLEAF(get_fs_d) srl a3, a0, 12 - 2 # get FS field (even regs only) and a3, a3, 0xF << 2 # mask FS field lw a3, get_fs_d_tbl(a3) # switch on register number @@ -3194,7 +3194,7 @@ LEAF(set_fd_s) sll t1, t1, 23 # position exponent or t2, t2, t0 or t2, t2, t1 -ALEAF(set_fd_word) +XLEAF(set_fd_word) srl a3, a0, 7 - 2 # get FD field (even regs only) and a3, a3, 0xF << 2 # mask FT field lw a3, set_fd_s_tbl(a3) # switch on register number Modified: head/sys/mips/mips/support.S ============================================================================== --- head/sys/mips/mips/support.S Tue Oct 15 04:36:34 2013 (r256494) +++ head/sys/mips/mips/support.S Tue Oct 15 04:43:31 2013 (r256495) @@ -288,7 +288,7 @@ END(copyerr) */ #ifdef __mips_n64 LEAF(fuword64) -ALEAF(fuword) +XLEAF(fuword) PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space nop @@ -303,7 +303,7 @@ END(fuword64) LEAF(fuword32) #ifndef __mips_n64 -ALEAF(fuword) +XLEAF(fuword) #endif PTR_LA v0, fswberr blt a0, zero, fswberr # make sure address is in user space @@ -553,7 +553,7 @@ END(memset) * bzero(s1, n) */ LEAF(bzero) -ALEAF(blkclr) +XLEAF(blkclr) .set noreorder blt a1, 12, smallclr # small amount to clear? PTR_SUBU a3, zero, a0 # compute # bytes to word align address
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310150443.r9F4hVQP096135>