glibc/sysdeps/sparc/sparc32/strcat.S
Ulrich Drepper 85dd100310 Update.
* 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>
2003-04-29 22:49:58 +00:00

350 lines
6.7 KiB
ArmAsm

/* strcat (dest, src) -- Append SRC on the end of DEST.
For SPARC v7.
Copyright (C) 1996, 1999, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jj@ultra.linux.cz>.
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>
/* Normally, this uses ((xword - 0x01010101) & 0x80808080) test
to find out if any byte in xword could be zero. This is fast, but
also gives false alarm for any byte in range 0x81-0xff. It does
not matter for correctness, as if this test tells us there could
be some zero byte, we check it byte by byte, but if bytes with
high bits set are common in the strings, then this will give poor
performance. You can #define EIGHTBIT_NOT_RARE and the algorithm
will use one tick slower, but more precise test
((xword - 0x01010101) & (~xword) & 0x80808080),
which does not give any false alarms (but if some bits are set,
one cannot assume from it which bytes are zero and which are not).
It is yet to be measured, what is the correct default for glibc
in these days for an average user.
*/
.text
.align 4
10: cmp %o4, 2
be 1f
cmp %o4, 3
ldub [%o1], %o5
add %o1, 1, %o1
stb %o5, [%o0]
be 3f
cmp %o5, 0
be 0f
add %o0, 1, %o0
1: lduh [%o1], %o5
add %o1, 2, %o1
srl %o5, 8, %o4
cmp %o4, 0
stb %o4, [%o0]
bne,a 2f
stb %o5, [%o0 + 1]
retl
mov %g2, %o0
2: andcc %o5, 0xff, %o5
bne 4f
add %o0, 2, %o0
retl
mov %g2, %o0
3: bne 4f
add %o0, 1, %o0
retl
mov %g2, %o0
11: ldub [%o0], %o5
cmp %o5, 0
be 1f
add %o0, 1, %o0
andcc %o0, 3, %g0
be 7f
or %o4, %lo(0x80808080), %o3
ldub [%o0], %o5
cmp %o5, 0
be 2f
add %o0, 1, %o0
andcc %o0, 3, %g0
be 8f
sethi %hi(0x01010101), %o4
ldub [%o0], %o5
cmp %o5, 0
be 3f
add %o0, 1, %o0
b 9f
or %o4, %lo(0x01010101), %o2
1: or %o4, %lo(0x80808080), %o3
2: sethi %hi(0x01010101), %o4
3: or %o4, %lo(0x01010101), %o2
b 3f
sub %o0, 1, %o0
ENTRY(strcat)
mov %o0, %g2
andcc %o0, 3, %g0
bne 11b
sethi %hi(0x80808080), %o4
or %o4, %lo(0x80808080), %o3
7: sethi %hi(0x01010101), %o4
8: or %o4, %lo(0x01010101), %o2
9: ld [%o0], %o5
7: sub %o5, %o2, %o4
#ifdef EIGHTBIT_NOT_RARE
andn %o4, %o5, %o4
#endif
andcc %o4, %o3, %g0
be 9b
add %o0, 4, %o0
srl %o5, 24, %g5
andcc %g5, 0xff, %g0
be 3f
add %o0, -4, %o0
srl %o5, 16, %g5
andcc %g5, 0xff, %g0
be 3f
add %o0, 1, %o0
srl %o5, 8, %g5
andcc %g5, 0xff, %g0
be 3f
add %o0, 1, %o0
andcc %o5, 0xff, %g0
add %o0, 2, %o0
bne,a 7b
ld [%o0], %o5
sub %o0, 1, %o0
3: andcc %o1, 3, %o4
bne 10b
4: andcc %o0, 3, %g3
bne 12f
1: ld [%o1], %o5
add %o1, 4, %o1
sub %o5, %o2, %o4
#ifdef EIGHTBIT_NOT_RARE
andn %o4, %o5, %o4
#endif
add %o0, 4, %o0
andcc %o4, %o3, %g0
be,a 1b
st %o5, [%o0 - 4]
srl %o5, 24, %g5
andcc %g5, 0xff, %g0
be 1f
srl %o5, 16, %g5
andcc %g5, 0xff, %g0
be 2f
srl %o5, 8, %g5
andcc %g5, 0xff, %g0
be 3f
andcc %o5, 0xff, %g0
bne 1b
st %o5, [%o0 - 4]
retl
mov %g2, %o0
3: srl %o5, 16, %o5
sth %o5, [%o0 - 4]
stb %g0, [%o0 - 2]
retl
mov %g2, %o0
2: srl %o5, 16, %o5
sth %o5, [%o0 - 4]
retl
mov %g2, %o0
1: stb %g0, [%o0 - 4]
retl
mov %g2, %o0
12: add %o1, 4, %o1
sub %o5, %o2, %o4
cmp %g3, 2
be 2f
cmp %g3, 3
be 3f
andcc %o4, %o3, %g0
bne 5f
srl %o5, 24, %g5
stb %g5, [%o0]
sub %o0, 1, %o0
srl %o5, 8, %g5
sth %g5, [%o0 + 2]
1: add %o0, 4, %o0
4: sll %o5, 24, %g6
ld [%o1], %o5
add %o1, 4, %o1
srl %o5, 8, %g5
sub %o5, %o2, %o4
#ifdef EIGHTBIT_NOT_RARE
andn %o4, %o5, %o4
#endif
or %g5, %g6, %g5
andcc %o4, %o3, %g0
be,a 1b
st %g5, [%o0]
srl %o5, 24, %o4
andcc %o4, 0xff, %g0
be 6f
srl %o5, 16, %o4
andcc %o4, 0xff, %g0
be 7f
srl %o5, 8, %o4
st %g5, [%o0]
andcc %o4, 0xff, %g0
be 0f
andcc %o5, 0xff, %g0
1: bne 4b
add %o0, 4, %o0
9: stb %g0, [%o0]
0: retl
mov %g2, %o0
6: srl %g5, 16, %g5
sth %g5, [%o0]
retl
mov %g2, %o0
7: srl %g5, 16, %g5
sth %g5, [%o0]
stb %g0, [%o0 + 2]
retl
mov %g2, %o0
5: andcc %g5, 0xff, %g4
be 9b
srl %o5, 16, %g5
andcc %g5, 0xff, %g0
be 7f
srl %o5, 8, %g5
andcc %g5, 0xff, %g0
stb %g4, [%o0]
sth %g5, [%o0 + 1]
sub %o0, 1, %o0
bne 1b
andcc %o5, 0xff, %g0
retl
mov %g2, %o0
7: stb %g4, [%o0]
stb %g0, [%o0 + 1]
retl
mov %g2, %o0
2: andcc %o4, %o3, %g0
bne 5f
srl %o5, 16, %g5
sth %g5, [%o0]
sub %o0, 2, %o0
1: add %o0, 4, %o0
4: sll %o5, 16, %g6
ld [%o1], %o5
add %o1, 4, %o1
srl %o5, 16, %g5
sub %o5, %o2, %o4
#ifdef EIGHTBIT_NOT_RARE
andn %o4, %o5, %o4
#endif
or %g5, %g6, %g5
andcc %o4, %o3, %g0
be,a 1b
st %g5, [%o0]
srl %o5, 24, %o4
andcc %o4, 0xff, %g0
be 7f
srl %o5, 16, %o4
st %g5, [%o0]
andcc %o4, 0xff, %g0
be 0b
srl %o5, 8, %o4
1: andcc %o4, 0xff, %g0
be 8f
andcc %o5, 0xff, %g0
bne 4b
add %o0, 4, %o0
sth %o5, [%o0]
retl
mov %g2, %o0
7: srl %g5, 16, %g5
sth %g5, [%o0]
stb %g0, [%o0 + 2]
retl
mov %g2, %o0
8: stb %g0, [%o0 + 4]
retl
mov %g2, %o0
5: srl %o5, 24, %g5
andcc %g5, 0xff, %g0
be 9b
srl %o5, 16, %g5
andcc %g5, 0xff, %g0
sth %g5, [%o0]
sub %o0, 2, %o0
bne 1b
srl %o5, 8, %o4
retl
mov %g2, %o0
3: bne 5f
srl %o5, 24, %g5
stb %g5, [%o0]
sub %o0, 3, %o0
1: add %o0, 4, %o0
4: sll %o5, 8, %g6
ld [%o1], %o5
add %o1, 4, %o1
srl %o5, 24, %g5
sub %o5, %o2, %o4
#ifdef EIGHTBIT_NOT_RARE
andn %o4, %o5, %o4
#endif
or %g5, %g6, %g5
andcc %o4, %o3, %g0
be 1b
st %g5, [%o0]
srl %o5, 24, %o4
andcc %o4, 0xff, %g0
be 0b
srl %o5, 16, %o4
1: andcc %o4, 0xff, %g0
be 8b
srl %o5, 8, %o4
andcc %o4, 0xff, %g0
be 9f
andcc %o5, 0xff, %g0
bne 4b
add %o0, 4, %o0
srl %o5, 8, %o5
sth %o5, [%o0]
stb %g0, [%o0 + 2]
retl
mov %g2, %o0
9: srl %o5, 8, %o5
sth %o5, [%o0 + 4]
retl
mov %g2, %o0
5: andcc %g5, 0xff, %g0
stb %g5, [%o0]
sub %o0, 3, %o0
bne 1b
srl %o5, 16, %o4
retl
mov %g2, %o0
END(strcat)
libc_hidden_builtin_def (strcat)