mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-16 18:10:11 +00:00
85dd100310
* sysdeps/i386/fpu/ftestexcept.c: Also check SSE status word. * include/signal.h: Use libc_hidden_proto for sigaddset and sigdelset. * signal/sigaddset.c: Add libc_hidden_def. * signal/sigdelset.c: Likewise. 2003-04-29 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/i486/string-inlines.c (__memcpy_g, __strchr_g): Move to the end of the file. * configure.in: Change __oline__ to $LINENO. (HAVE_BUILTIN_REDIRECTION): New check. * config.h.in (HAVE_BUILTIN_REDIRECTION): Add. * include/libc-symbols.h (libc_hidden_builtin_proto, libc_hidden_builtin_def, libc_hidden_builtin_weak, libc_hidden_builtin_ver): Define. * include/string.h (memchr, memcpy, memmove, memset, strcat, strchr, strcmp, strcpy, strcspn, strlen, strncmp, strncpy, strpbrk, strrchr, strspn, strstr): Add libc_hidden_builtin_proto. * intl/plural.y: Include string.h. * sysdeps/alpha/alphaev6/memchr.S (memchr): Add libc_hidden_builtin_def. * sysdeps/alpha/alphaev6/memcpy.S (memcpy): Likewise. * sysdeps/alpha/alphaev6/memset.S (memset): Likewise. * sysdeps/alpha/alphaev67/strcat.S (strcat): Likewise. * sysdeps/alpha/alphaev67/strchr.S (strchr): Likewise. * sysdeps/alpha/alphaev67/strlen.S (strlen): Likewise. * sysdeps/alpha/alphaev67/strrchr.S (strrchr): Likewise. * sysdeps/alpha/memchr.S (memchr): Likewise. * sysdeps/alpha/memset.S (memset): Likewise. * sysdeps/alpha/strcat.S (strcat): Likewise. * sysdeps/alpha/strchr.S (strchr): Likewise. * sysdeps/alpha/strcmp.S (strcmp): Likewise. * sysdeps/alpha/strcpy.S (strcpy): Likewise. * sysdeps/alpha/strlen.S (strlen): Likewise. * sysdeps/alpha/strncmp.S (strncmp): Likewise. * sysdeps/alpha/strncpy.S (strncpy): Likewise. * sysdeps/alpha/strrchr.S (strrchr): Likewise. * sysdeps/arm/memset.S (memset): Likewise. * sysdeps/arm/strlen.S (strlen): Likewise. * sysdeps/generic/memchr.c (memchr): Likewise. * sysdeps/generic/memcpy.c (memcpy): Likewise. * sysdeps/generic/memmove.c (memmove): Likewise. * sysdeps/generic/memset.c (memset): Likewise. * sysdeps/generic/strcat.c (strcat): Likewise. * sysdeps/generic/strchr.c (strchr): Likewise. * sysdeps/generic/strcmp.c (strcmp): Likewise. * sysdeps/generic/strcpy.c (strcpy): Likewise. * sysdeps/generic/strcspn.c (strcspn): Likewise. * sysdeps/generic/strlen.c (strlen): Likewise. * sysdeps/generic/strncmp.c (strncmp): Likewise. * sysdeps/generic/strncpy.c (strncpy): Likewise. * sysdeps/generic/strpbrk.c (strpbrk): Likewise. * sysdeps/generic/strrchr.c (strrchr): Likewise. * sysdeps/generic/strspn.c (strspn): Likewise. * sysdeps/generic/strstr.c (strstr): Likewise. * sysdeps/i386/i486/strcat.S (strcat): Likewise. * sysdeps/i386/i486/strlen.S (strlen): Likewise. * sysdeps/i386/i586/memcpy.S (memcpy): Likewise. * sysdeps/i386/i586/memset.S (memset): Likewise. * sysdeps/i386/i586/strchr.S (strchr): Likewise. * sysdeps/i386/i586/strcpy.S (strcpy): Likewise. * sysdeps/i386/i586/strlen.S (strlen): Likewise. * sysdeps/i386/i686/memcpy.S (memcpy): Likewise. * sysdeps/i386/i686/memmove.S (memmove): Likewise. * sysdeps/i386/i686/memset.S (memset): Likewise. * sysdeps/i386/i686/strcmp.S (strcmp): Likewise. * sysdeps/i386/memchr.S (memchr): Likewise. * sysdeps/i386/memset.c (memset): Likewise. * sysdeps/i386/strchr.S (strchr): Likewise. * sysdeps/i386/strcspn.S (strcspn): Likewise. * sysdeps/i386/strlen.c (strlen): Likewise. * sysdeps/i386/strpbrk.S (strpbrk): Likewise. * sysdeps/i386/strrchr.S (strrchr): Likewise. * sysdeps/i386/strspn.S (strspn): Likewise. * sysdeps/ia64/memchr.S (memchr): Likewise. * sysdeps/ia64/memcpy.S (memcpy): Likewise. * sysdeps/ia64/memmove.S (memmove): Likewise. * sysdeps/ia64/memset.S (memset): Likewise. * sysdeps/ia64/strcat.S (strcat): Likewise. * sysdeps/ia64/strchr.S (strchr): Likewise. * sysdeps/ia64/strcmp.S (strcmp): Likewise. * sysdeps/ia64/strcpy.S (strcpy): Likewise. * sysdeps/ia64/strlen.S (strlen): Likewise. * sysdeps/ia64/strncmp.S (strncmp): Likewise. * sysdeps/ia64/strncpy.S (strncpy): Likewise. * sysdeps/m68k/memchr.S (memchr): Likewise. * sysdeps/m68k/strchr.S (strchr): Likewise. * sysdeps/mips/mips64/memcpy.S (memcpy): Likewise. * sysdeps/mips/mips64/memset.S (memset): Likewise. * sysdeps/mips/memcpy.S (memcpy): Likewise. * sysdeps/mips/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc32/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc32/strchr.S (strchr): Likewise. * sysdeps/powerpc/powerpc32/strcmp.S (strcmp): Likewise. * sysdeps/powerpc/powerpc32/strcpy.S (strcpy): Likewise. * sysdeps/powerpc/powerpc32/strlen.S (strlen): Likewise. * sysdeps/powerpc/powerpc64/memcpy.S (memcpy): Likewise. * sysdeps/powerpc/powerpc64/memset.S (memset): Likewise. * sysdeps/powerpc/powerpc64/strchr.S (strchr): Likewise. * sysdeps/powerpc/powerpc64/strcmp.S (strcmp): Likewise. * sysdeps/powerpc/powerpc64/strcpy.S (strcpy): Likewise. * sysdeps/powerpc/powerpc64/strlen.S (strlen): Likewise. * sysdeps/powerpc/strcat.c (strcat): Likewise. * sysdeps/sparc/sparc32/memchr.S (memchr): Likewise. * sysdeps/sparc/sparc32/memcpy.S (memcpy): Likewise. * sysdeps/sparc/sparc32/memset.S (memset): Likewise. * sysdeps/sparc/sparc32/strcat.S (strcat): Likewise. * sysdeps/sparc/sparc32/strchr.S (strchr, strrchr): Likewise. * sysdeps/sparc/sparc32/strcmp.S (strcmp): Likewise. * sysdeps/sparc/sparc32/strcpy.S (strcpy): Likewise. * sysdeps/sparc/sparc32/strlen.S (strlen): Likewise. * sysdeps/sparc/sparc64/sparcv9b/memcpy.S (memcpy, memmove): Likewise. * sysdeps/sparc/sparc64/memchr.S (memchr): Likewise. * sysdeps/sparc/sparc64/memcpy.S (memcpy, memmove): Likewise. * sysdeps/sparc/sparc64/memset.S (memset): Likewise. * sysdeps/sparc/sparc64/strcat.S (strcat): Likewise. * sysdeps/sparc/sparc64/strchr.S (strchr, strrchr): Likewise. * sysdeps/sparc/sparc64/strcmp.S (strcmp): Likewise. * sysdeps/sparc/sparc64/strcpy.S (strcpy): Likewise. * sysdeps/sparc/sparc64/strcspn.S (strcspn): Likewise. * sysdeps/sparc/sparc64/strlen.S (strlen): Likewise. * sysdeps/sparc/sparc64/strncmp.S (strncmp): Likewise. * sysdeps/sparc/sparc64/strncpy.S (strncpy): Likewise. * sysdeps/sparc/sparc64/strpbrk.S (strpbrk): Likewise. * sysdeps/sparc/sparc64/strspn.S (strspn): Likewise. * sysdeps/sh/memcpy.S (memcpy): Likewise. * sysdeps/sh/memset.S (memset): Likewise. * sysdeps/sh/strlen.S (strlen): Likewise. * sysdeps/s390/s390-32/memchr.S (memchr): Likewise. * sysdeps/s390/s390-32/memcpy.S (memcpy): Likewise. * sysdeps/s390/s390-32/memset.S (memset): Likewise. * sysdeps/s390/s390-32/strcmp.S (strcmp): Likewise. * sysdeps/s390/s390-32/strcpy.S (strcpy): Likewise. * sysdeps/s390/s390-32/strncpy.S (strncpy): Likewise. * sysdeps/s390/s390-64/memchr.S (memchr): Likewise. * sysdeps/s390/s390-64/memcpy.S (memcpy): Likewise. * sysdeps/s390/s390-64/memset.S (memset): Likewise. * sysdeps/s390/s390-64/strcmp.S (strcmp): Likewise. * sysdeps/s390/s390-64/strcpy.S (strcpy): Likewise. * sysdeps/s390/s390-64/strncpy.S (strncpy): Likewise. * sysdeps/x86_64/memcpy.S (memcpy): Likewise. * sysdeps/x86_64/memset.S (memset): Likewise. * sysdeps/x86_64/strcat.S (strcat): Likewise. * sysdeps/x86_64/strchr.S (strchr): Likewise. * sysdeps/x86_64/strcmp.S (strcmp): Likewise. * sysdeps/x86_64/strcpy.S (strcpy): Likewise. * sysdeps/x86_64/strcspn.S (strcspn): Likewise. * sysdeps/x86_64/strlen.S (strlen): Likewise. * sysdeps/x86_64/strspn.S (strspn): Likewise. * string/string-inlines.c: Move... * sysdeps/generic/string-inlines.c: ...here. (__memcpy_g, __strchr_g): Remove. (__NO_INLINE__): Define before including <string.h>, undefine after. Include bits/string.h and bits/string2.h. * sysdeps/i386/i486/string-inlines.c: New file. * sysdeps/i386/string-inlines.c: New file. * sysdeps/i386/i486/Versions: Remove. All GLIBC_2.1.1 symbols moved... * sysdeps/i386/Versions (libc): ...here. 2003-04-29 Ulrich Drepper <drepper@redhat.com>
271 lines
9.9 KiB
ArmAsm
271 lines
9.9 KiB
ArmAsm
/* strcat(dest, src) -- Append SRC on the end of DEST.
|
|
For Intel 80x86, x>=4.
|
|
Copyright (C) 1994,1995,1996,1997,2000,2003 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de>.
|
|
Optimised a little by Alan Modra <Alan@SPRI.Levels.UniSA.Edu.Au>
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <sysdep.h>
|
|
#include "asm-syntax.h"
|
|
#include "bp-sym.h"
|
|
#include "bp-asm.h"
|
|
|
|
#define PARMS LINKAGE+4 /* space for 1 saved reg */
|
|
#define RTN PARMS
|
|
#define DEST RTN+RTN_SIZE
|
|
#define SRC DEST+PTR_SIZE
|
|
|
|
.text
|
|
ENTRY (BP_SYM (strcat))
|
|
ENTER
|
|
|
|
pushl %edi /* Save callee-safe register. */
|
|
|
|
movl DEST(%esp), %edx
|
|
movl SRC(%esp), %ecx
|
|
CHECK_BOUNDS_LOW (%edx, DEST(%esp))
|
|
CHECK_BOUNDS_LOW (%ecx, SRC(%esp))
|
|
|
|
testb $0xff, (%ecx) /* Is source string empty? */
|
|
jz L(8) /* yes => return */
|
|
|
|
/* Test the first bytes separately until destination is aligned. */
|
|
testl $3, %edx /* destination pointer aligned? */
|
|
jz L(1) /* yes => begin scan loop */
|
|
testb $0xff, (%edx) /* is end of string? */
|
|
jz L(2) /* yes => start appending */
|
|
incl %edx /* increment source pointer */
|
|
|
|
testl $3, %edx /* destination pointer aligned? */
|
|
jz L(1) /* yes => begin scan loop */
|
|
testb $0xff, (%edx) /* is end of string? */
|
|
jz L(2) /* yes => start appending */
|
|
incl %edx /* increment source pointer */
|
|
|
|
testl $3, %edx /* destination pointer aligned? */
|
|
jz L(1) /* yes => begin scan loop */
|
|
testb $0xff, (%edx) /* is end of string? */
|
|
jz L(2) /* yes => start appending */
|
|
incl %edx /* increment source pointer */
|
|
|
|
/* Now we are aligned. Begin scan loop. */
|
|
jmp L(1)
|
|
|
|
ALIGN(4)
|
|
|
|
L(4): addl $16,%edx /* increment destination pointer for round */
|
|
|
|
L(1): movl (%edx), %eax /* get word (= 4 bytes) in question */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
|
|
/* If you compare this with the algorithm in memchr.S you will
|
|
notice that here is an `xorl' statement missing. But you must
|
|
not forget that we are looking for C == 0 and `xorl $0, %eax'
|
|
is a no-op. */
|
|
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
|
|
/* According to the algorithm we had to reverse the effect of the
|
|
XOR first and then test the overflow bits. But because the
|
|
following XOR would destroy the carry flag and it would (in a
|
|
representation with more than 32 bits) not alter then last
|
|
overflow, we can now test this condition. If no carry is signaled
|
|
no overflow must have occurred in the last byte => it was 0. */
|
|
jnc L(3)
|
|
|
|
/* We are only interested in carry bits that change due to the
|
|
previous add, so remove original bits */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
|
|
/* Now test for the other three overflow bits. */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
/* If at least one byte of the word is C we don't get 0 in %ecx. */
|
|
jnz L(3)
|
|
|
|
movl 4(%edx), %eax /* get word from source */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc L(5) /* highest byte is C => stop copying */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz L(5) /* one byte is NUL => stop copying */
|
|
|
|
movl 8(%edx), %eax /* get word from source */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc L(6) /* highest byte is C => stop copying */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz L(6) /* one byte is NUL => stop copying */
|
|
|
|
movl 12(%edx), %eax /* get word from source */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc L(7) /* highest byte is C => stop copying */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jz L(4) /* no byte is NUL => carry on copying */
|
|
|
|
L(7): addl $4, %edx /* adjust source pointer */
|
|
L(6): addl $4, %edx
|
|
L(5): addl $4, %edx
|
|
|
|
L(3): testb %al, %al /* is first byte NUL? */
|
|
jz L(2) /* yes => start copying */
|
|
incl %edx /* increment source pointer */
|
|
|
|
testb %ah, %ah /* is second byte NUL? */
|
|
jz L(2) /* yes => start copying */
|
|
incl %edx /* increment source pointer */
|
|
|
|
testl $0xff0000, %eax /* is third byte NUL? */
|
|
jz L(2) /* yes => start copying */
|
|
incl %edx /* increment source pointer */
|
|
|
|
L(2): subl %ecx, %edx /* reduce number of loop variants */
|
|
|
|
/* Now we have to align the source pointer. */
|
|
testl $3, %ecx /* pointer correctly aligned? */
|
|
jz L(29) /* yes => start copy loop */
|
|
movb (%ecx), %al /* get first byte */
|
|
movb %al, (%ecx,%edx) /* and store it */
|
|
andb %al, %al /* is byte NUL? */
|
|
jz L(8) /* yes => return */
|
|
incl %ecx /* increment pointer */
|
|
|
|
testl $3, %ecx /* pointer correctly aligned? */
|
|
jz L(29) /* yes => start copy loop */
|
|
movb (%ecx), %al /* get first byte */
|
|
movb %al, (%ecx,%edx) /* and store it */
|
|
andb %al, %al /* is byte NUL? */
|
|
jz L(8) /* yes => return */
|
|
incl %ecx /* increment pointer */
|
|
|
|
testl $3, %ecx /* pointer correctly aligned? */
|
|
jz L(29) /* yes => start copy loop */
|
|
movb (%ecx), %al /* get first byte */
|
|
movb %al, (%ecx,%edx) /* and store it */
|
|
andb %al, %al /* is byte NUL? */
|
|
jz L(8) /* yes => return */
|
|
incl %ecx /* increment pointer */
|
|
|
|
/* Now we are aligned. */
|
|
jmp L(29) /* start copy loop */
|
|
|
|
ALIGN(4)
|
|
|
|
L(28): movl %eax, 12(%ecx,%edx)/* store word at destination */
|
|
addl $16, %ecx /* adjust pointer for full round */
|
|
|
|
L(29): movl (%ecx), %eax /* get word from source */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc L(9) /* highest byte is C => stop copying */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz L(9) /* one byte is NUL => stop copying */
|
|
movl %eax, (%ecx,%edx) /* store word to destination */
|
|
|
|
movl 4(%ecx), %eax /* get word from source */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc L(91) /* highest byte is C => stop copying */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz L(91) /* one byte is NUL => stop copying */
|
|
movl %eax, 4(%ecx,%edx) /* store word to destination */
|
|
|
|
movl 8(%ecx), %eax /* get word from source */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc L(92) /* highest byte is C => stop copying */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz L(92) /* one byte is NUL => stop copying */
|
|
movl %eax, 8(%ecx,%edx) /* store word to destination */
|
|
|
|
movl 12(%ecx), %eax /* get word from source */
|
|
movl $0xfefefeff, %edi /* magic value */
|
|
addl %eax, %edi /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc L(93) /* highest byte is C => stop copying */
|
|
xorl %eax, %edi /* ((word^charmask)+magic)^(word^charmask) */
|
|
orl $0xfefefeff, %edi /* set all non-carry bits */
|
|
incl %edi /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jz L(28) /* no is NUL => carry on copying */
|
|
|
|
L(93): addl $4, %ecx /* adjust pointer */
|
|
L(92): addl $4, %ecx
|
|
L(91): addl $4, %ecx
|
|
|
|
L(9): movb %al, (%ecx,%edx) /* store first byte of last word */
|
|
orb %al, %al /* is it NUL? */
|
|
jz L(8) /* yes => return */
|
|
|
|
movb %ah, 1(%ecx,%edx) /* store second byte of last word */
|
|
orb %ah, %ah /* is it NUL? */
|
|
jz L(8) /* yes => return */
|
|
|
|
shrl $16, %eax /* make upper bytes accessible */
|
|
movb %al, 2(%ecx,%edx) /* store third byte of last word */
|
|
orb %al, %al /* is it NUL? */
|
|
jz L(8) /* yes => return */
|
|
|
|
movb %ah, 3(%ecx,%edx) /* store fourth byte of last word */
|
|
|
|
L(8): /* GKM FIXME: check high bounds */
|
|
movl DEST(%esp), %eax /* start address of destination is result */
|
|
RETURN_BOUNDED_POINTER (DEST(%esp))
|
|
popl %edi /* restore saved register */
|
|
|
|
LEAVE
|
|
RET_PTR
|
|
END (BP_SYM (strcat))
|
|
libc_hidden_builtin_def (strcat)
|