2002-09-18 01:50:03 +02:00
|
|
|
/* Optimized strchr implementation for PowerPC64.
|
2003-04-05 00:03:25 +02:00
|
|
|
Copyright (C) 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
|
2002-09-18 01:50:03 +02:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
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 <bp-sym.h>
|
|
|
|
#include <bp-asm.h>
|
|
|
|
|
|
|
|
/* See strlen.s for comments on how this works. */
|
|
|
|
|
|
|
|
/* char * [r3] strchr (const char *s [r3] , int c [r4] ) */
|
|
|
|
|
|
|
|
ENTRY (BP_SYM (strchr))
|
|
|
|
|
|
|
|
#define rTMP1 r0
|
|
|
|
#define rRTN r3 /* outgoing result */
|
2003-04-05 00:03:25 +02:00
|
|
|
/* Note: The Bounded pointer support in this code is broken. This code
|
|
|
|
was inherited from PPC32 and and that support was never completed.
|
|
|
|
Currently PPC gcc does not support -fbounds-check or -fbounded-pointers.
|
|
|
|
These artifacts are left in the code as a reminder in case we need
|
|
|
|
bounded pointer support in the future. */
|
2002-09-18 01:50:03 +02:00
|
|
|
#if __BOUNDED_POINTERS__
|
|
|
|
# define rSTR r4
|
|
|
|
# define rCHR r5 /* byte we're looking for, spread over the whole word */
|
|
|
|
# define rWORD r8 /* the current word */
|
|
|
|
#else
|
|
|
|
# define rSTR r8 /* current word pointer */
|
|
|
|
# define rCHR r4 /* byte we're looking for, spread over the whole word */
|
|
|
|
# define rWORD r5 /* the current word */
|
|
|
|
#endif
|
|
|
|
#define rCLZB rCHR /* leading zero byte count */
|
2003-04-05 00:03:25 +02:00
|
|
|
#define rFEFE r6 /* constant 0xfefefefefefefeff (-0x0101010101010101) */
|
|
|
|
#define r7F7F r7 /* constant 0x7f7f7f7f7f7f7f7f */
|
2002-09-18 01:50:03 +02:00
|
|
|
#define rTMP2 r9
|
|
|
|
#define rIGN r10 /* number of bits we should ignore in the first word */
|
|
|
|
#define rMASK r11 /* mask with the bits to ignore set to 0 */
|
|
|
|
#define rTMP3 r12
|
|
|
|
|
|
|
|
CHECK_BOUNDS_LOW (rSTR, rTMP1, rTMP2)
|
|
|
|
STORE_RETURN_BOUNDS (rTMP1, rTMP2)
|
|
|
|
|
2003-04-05 00:03:25 +02:00
|
|
|
dcbt 0,rRTN
|
2002-09-18 01:50:03 +02:00
|
|
|
rlwimi rCHR, rCHR, 8, 16, 23
|
|
|
|
li rMASK, -1
|
|
|
|
rlwimi rCHR, rCHR, 16, 0, 15
|
2003-04-05 00:03:25 +02:00
|
|
|
rlwinm rIGN, rRTN, 3, 26, 28
|
|
|
|
insrdi rCHR, rCHR, 32, 0
|
2002-09-18 01:50:03 +02:00
|
|
|
lis rFEFE, -0x101
|
|
|
|
lis r7F7F, 0x7f7f
|
2003-04-05 00:03:25 +02:00
|
|
|
clrrdi rSTR, rRTN, 3
|
2002-09-18 01:50:03 +02:00
|
|
|
addi rFEFE, rFEFE, -0x101
|
|
|
|
addi r7F7F, r7F7F, 0x7f7f
|
2003-04-05 00:03:25 +02:00
|
|
|
sldi rTMP1, rFEFE, 32
|
|
|
|
insrdi r7F7F, r7F7F, 32, 0
|
|
|
|
add rFEFE, rFEFE, rTMP1
|
2002-09-18 01:50:03 +02:00
|
|
|
/* Test the first (partial?) word. */
|
2003-04-05 00:03:25 +02:00
|
|
|
ld rWORD, 0(rSTR)
|
|
|
|
srd rMASK, rMASK, rIGN
|
2002-09-18 01:50:03 +02:00
|
|
|
orc rWORD, rWORD, rMASK
|
|
|
|
add rTMP1, rFEFE, rWORD
|
|
|
|
nor rTMP2, r7F7F, rWORD
|
|
|
|
and. rTMP1, rTMP1, rTMP2
|
|
|
|
xor rTMP3, rCHR, rWORD
|
|
|
|
orc rTMP3, rTMP3, rMASK
|
|
|
|
b L(loopentry)
|
|
|
|
|
|
|
|
/* The loop. */
|
|
|
|
|
2003-04-05 00:03:25 +02:00
|
|
|
L(loop):ldu rWORD, 8(rSTR)
|
2002-09-18 01:50:03 +02:00
|
|
|
and. rTMP1, rTMP1, rTMP2
|
|
|
|
/* Test for 0. */
|
|
|
|
add rTMP1, rFEFE, rWORD
|
|
|
|
nor rTMP2, r7F7F, rWORD
|
|
|
|
bne L(foundit)
|
|
|
|
and. rTMP1, rTMP1, rTMP2
|
|
|
|
/* Start test for the bytes we're looking for. */
|
|
|
|
xor rTMP3, rCHR, rWORD
|
|
|
|
L(loopentry):
|
|
|
|
add rTMP1, rFEFE, rTMP3
|
|
|
|
nor rTMP2, r7F7F, rTMP3
|
|
|
|
beq L(loop)
|
|
|
|
/* There is a zero byte in the word, but may also be a matching byte (either
|
|
|
|
before or after the zero byte). In fact, we may be looking for a
|
|
|
|
zero byte, in which case we return a match. We guess that this hasn't
|
|
|
|
happened, though. */
|
|
|
|
L(missed):
|
|
|
|
and. rTMP1, rTMP1, rTMP2
|
|
|
|
li rRTN, 0
|
|
|
|
STORE_RETURN_VALUE (rSTR)
|
|
|
|
beqlr
|
|
|
|
/* It did happen. Decide which one was first...
|
|
|
|
I'm not sure if this is actually faster than a sequence of
|
|
|
|
rotates, compares, and branches (we use it anyway because it's shorter). */
|
|
|
|
and rFEFE, r7F7F, rWORD
|
|
|
|
or rMASK, r7F7F, rWORD
|
|
|
|
and rTMP1, r7F7F, rTMP3
|
|
|
|
or rIGN, r7F7F, rTMP3
|
|
|
|
add rFEFE, rFEFE, r7F7F
|
|
|
|
add rTMP1, rTMP1, r7F7F
|
|
|
|
nor rWORD, rMASK, rFEFE
|
|
|
|
nor rTMP2, rIGN, rTMP1
|
2003-04-05 00:03:25 +02:00
|
|
|
cmpld rWORD, rTMP2
|
2002-09-18 01:50:03 +02:00
|
|
|
bgtlr
|
2003-04-05 00:03:25 +02:00
|
|
|
cntlzd rCLZB, rTMP2
|
|
|
|
srdi rCLZB, rCLZB, 3
|
2002-09-18 01:50:03 +02:00
|
|
|
add rRTN, rSTR, rCLZB
|
2003-04-05 00:03:25 +02:00
|
|
|
CHECK_BOUNDS_HIGH_RTN (rSTR, rTMP2, tdlge)
|
2002-09-18 01:50:03 +02:00
|
|
|
STORE_RETURN_VALUE (rSTR)
|
|
|
|
blr
|
|
|
|
|
|
|
|
L(foundit):
|
|
|
|
and rTMP1, r7F7F, rTMP3
|
|
|
|
or rIGN, r7F7F, rTMP3
|
|
|
|
add rTMP1, rTMP1, r7F7F
|
|
|
|
nor rTMP2, rIGN, rTMP1
|
2003-04-05 00:03:25 +02:00
|
|
|
cntlzd rCLZB, rTMP2
|
|
|
|
subi rSTR, rSTR, 8
|
|
|
|
srdi rCLZB, rCLZB, 3
|
2002-09-18 01:50:03 +02:00
|
|
|
add rRTN, rSTR, rCLZB
|
2003-04-05 00:03:25 +02:00
|
|
|
CHECK_BOUNDS_HIGH_RTN (rSTR, rTMP2, tdlge)
|
2002-09-18 01:50:03 +02:00
|
|
|
STORE_RETURN_VALUE (rSTR)
|
|
|
|
blr
|
|
|
|
END (BP_SYM (strchr))
|
|
|
|
|
|
|
|
weak_alias (BP_SYM (strchr), BP_SYM (index))
|
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-30 00:49:58 +02:00
|
|
|
libc_hidden_builtin_def (strchr)
|