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>
261 lines
8.7 KiB
ArmAsm
261 lines
8.7 KiB
ArmAsm
/* strcat(dest, src) -- Append SRC on the end of DEST.
|
|
Optimized for x86-64.
|
|
Copyright (C) 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Andreas Jaeger <aj@suse.de>, 2002.
|
|
|
|
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"
|
|
|
|
|
|
.text
|
|
ENTRY (BP_SYM (strcat))
|
|
movq %rdi, %rcx /* Dest. register. */
|
|
andl $7, %ecx /* mask alignment bits */
|
|
movq %rdi, %rax /* Duplicate destination pointer. */
|
|
movq $0xfefefefefefefeff,%r8
|
|
|
|
/* First step: Find end of destination. */
|
|
jz 4f /* aligned => start loop */
|
|
|
|
neg %ecx /* We need to align to 8 bytes. */
|
|
addl $8,%ecx
|
|
/* Search the first bytes directly. */
|
|
0: cmpb $0x0,(%rax) /* is byte NUL? */
|
|
je 2f /* yes => start copy */
|
|
incq %rax /* increment pointer */
|
|
decl %ecx
|
|
jnz 0b
|
|
|
|
|
|
|
|
/* Now the source is aligned. Scan for NUL byte. */
|
|
.p2align 4
|
|
4:
|
|
/* First unroll. */
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
movq %r8, %rdx /* magic value */
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
/* Second unroll. */
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
movq %r8, %rdx /* magic value */
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
/* Third unroll. */
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
movq %r8, %rdx /* magic value */
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
/* Fourth unroll. */
|
|
movq (%rax), %rcx /* get double word (= 8 bytes) in question */
|
|
addq $8,%rax /* adjust pointer for next word */
|
|
movq %r8, %rdx /* magic value */
|
|
addq %rcx, %rdx /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rcx, %rdx /* (word+magic)^word */
|
|
orq %r8, %rdx /* set all non-carry bits */
|
|
incq %rdx /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
jz 4b /* no NUL found => continue loop */
|
|
|
|
.p2align 4 /* Align, it's a jump target. */
|
|
3: subq $8,%rax /* correct pointer increment. */
|
|
|
|
testb %cl, %cl /* is first byte NUL? */
|
|
jz 2f /* yes => return */
|
|
incq %rax /* increment pointer */
|
|
|
|
testb %ch, %ch /* is second byte NUL? */
|
|
jz 2f /* yes => return */
|
|
incq %rax /* increment pointer */
|
|
|
|
testl $0x00ff0000, %ecx /* is third byte NUL? */
|
|
jz 2f /* yes => return pointer */
|
|
incq %rax /* increment pointer */
|
|
|
|
testl $0xff000000, %ecx /* is fourth byte NUL? */
|
|
jz 2f /* yes => return pointer */
|
|
incq %rax /* increment pointer */
|
|
|
|
shrq $32, %rcx /* look at other half. */
|
|
|
|
testb %cl, %cl /* is first byte NUL? */
|
|
jz 2f /* yes => return */
|
|
incq %rax /* increment pointer */
|
|
|
|
testb %ch, %ch /* is second byte NUL? */
|
|
jz 2f /* yes => return */
|
|
incq %rax /* increment pointer */
|
|
|
|
testl $0xff0000, %ecx /* is third byte NUL? */
|
|
jz 2f /* yes => return pointer */
|
|
incq %rax /* increment pointer */
|
|
|
|
2:
|
|
/* Second step: Copy source to destination. */
|
|
|
|
movq %rsi, %rcx /* duplicate */
|
|
andl $7,%ecx /* mask alignment bits */
|
|
movq %rax, %rdx /* move around */
|
|
jz 22f /* aligned => start loop */
|
|
|
|
neg %ecx /* align to 8 bytes. */
|
|
addl $8, %ecx
|
|
/* Align the source pointer. */
|
|
21:
|
|
movb (%rsi), %al /* Fetch a byte */
|
|
testb %al, %al /* Is it NUL? */
|
|
movb %al, (%rdx) /* Store it */
|
|
jz 24f /* If it was NUL, done! */
|
|
incq %rsi
|
|
incq %rdx
|
|
decl %ecx
|
|
jnz 21b
|
|
|
|
/* Now the sources is aligned. Unfortunatly we cannot force
|
|
to have both source and destination aligned, so ignore the
|
|
alignment of the destination. */
|
|
.p2align 4
|
|
22:
|
|
/* 1st unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 23f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 23f /* found NUL => return pointer */
|
|
|
|
movq %rax, (%rdx) /* Write value to destination. */
|
|
addq $8, %rdx /* Adjust pointer. */
|
|
|
|
/* 2nd unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 23f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 23f /* found NUL => return pointer */
|
|
|
|
movq %rax, (%rdx) /* Write value to destination. */
|
|
addq $8, %rdx /* Adjust pointer. */
|
|
|
|
/* 3rd unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 23f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 23f /* found NUL => return pointer */
|
|
|
|
movq %rax, (%rdx) /* Write value to destination. */
|
|
addq $8, %rdx /* Adjust pointer. */
|
|
|
|
/* 4th unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 23f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 23f /* found NUL => return pointer */
|
|
|
|
movq %rax, (%rdx) /* Write value to destination. */
|
|
addq $8, %rdx /* Adjust pointer. */
|
|
jmp 22b /* Next iteration. */
|
|
|
|
/* Do the last few bytes. %rax contains the value to write.
|
|
The loop is unrolled twice. */
|
|
.p2align 4
|
|
23:
|
|
movb %al, (%rdx) /* 1st byte. */
|
|
testb %al, %al /* Is it NUL. */
|
|
jz 24f /* yes, finish. */
|
|
incq %rdx /* Increment destination. */
|
|
movb %ah, (%rdx) /* 2nd byte. */
|
|
testb %ah, %ah /* Is it NUL?. */
|
|
jz 24f /* yes, finish. */
|
|
incq %rdx /* Increment destination. */
|
|
shrq $16, %rax /* Shift... */
|
|
jmp 23b /* and look at next two bytes in %rax. */
|
|
|
|
|
|
24:
|
|
movq %rdi, %rax /* Source is return value. */
|
|
retq
|
|
END (BP_SYM (strcat))
|
|
libc_hidden_builtin_def (strcat)
|