mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 17:50:20 +00:00
2cfbdb9a27
Use of strftime, a C90 function, ends up bringing in wcschr, which is not a C90 function. Although not a conformance bug (C90 reserves wcs*), this is still contrary to glibc practice of avoiding relying on those reservations; this patch arranges for the internal uses to use __wcschr instead, with wcschr being a weak alias. This is more complicated than some such patches because of the various IFUNC definitions of wcschr (which include code redefining libc_hidden_def in a way that involves creating __GI_wcschr manually and so also needs to create __GI___wcschr after the change of internal uses to use __wcschr). Tested for x86_64 and 32-bit x86 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). 2014-12-10 Joseph Myers <joseph@codesourcery.com> Adhemerval Zanella <azanella@linux.vnet.ibm.com> [BZ #17634] * wcsmbs/wcschr.c [!WCSCHR] (wcschr): Define as __wcschr. Undefine after defining function. Define as weak alias of __wcschr. Use libc_hidden_weak. * include/wchar.h (__wcschr): Declare. Use libc_hidden_proto. * sysdeps/i386/i686/multiarch/wcschr-c.c [IS_IN (libc) && SHARED] (libc_hidden_def): Also define __GI___wcschr alias. * sysdeps/i386/i686/multiarch/wcschr.S (wcschr): Rename to __wcschr and define as weak alias of __wcschr. * sysdeps/powerpc/power6/wcschr.c [!WCSCHR] (WCSCHR): Define as __wcschr. [!WCSCHR] (DEFAULT_WCSCHR): Define. [DEFAULT_WCSCHR] (__wcschr): Use libc_hidden_def. [DEFAULT_WCSCHR] (wcschr): Define as weak alias of __wcschr. Use libc_hidden_weak. Do not use libc_hidden_def. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c [IS_IN (libc) && SHARED] (libc_hidden_def): Also define __GI___wcschr alias. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c [IS_IN (libc)] (wcschr): Define as macro expanding to __redirect_wcschr. [IS_IN (libc)] (__wcschr_ppc): Use __redirect_wcschr in typeof. [IS_IN (libc)] (__wcschr_power6): Likewise. [IS_IN (libc)] (__wcschr_power7): Likewise. [IS_IN (libc)] (__libc_wcschr): New. Define with libc_ifunc instead of wcschr. [IS_IN (libc)] (wcschr): Undefine and define as weak alias of __libc_wcschr. [!IS_IN (libc)] (libc_hidden_def): Do not undefine and redefine. * sysdeps/powerpc/powerpc64/multiarch/wcschr.c (wcschr): Rename to __wcschr and define as weak alias of __wcschr. Use libc_hidden_builtin_def. * sysdeps/x86_64/wcschr.S (wcschr): Rename to __wcschr and define as weak alias of __wcschr. Use libc_hidden_weak. * time/alt_digit.c (_nl_get_walt_digit): Use __wcschr instead of wcschr. * time/era.c (_nl_init_era_entries): Likewise. * conform/Makefile (test-xfail-ISO/time.h/linknamespace): Remove variable. (test-xfail-XPG3/time.h/linknamespace): Likewise. (test-xfail-XPG4/time.h/linknamespace): Likewise.
157 lines
2.9 KiB
ArmAsm
157 lines
2.9 KiB
ArmAsm
/* wcschr with SSSE3
|
|
Copyright (C) 2011-2014 Free Software Foundation, Inc.
|
|
Contributed by Intel Corporation.
|
|
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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <sysdep.h>
|
|
|
|
.text
|
|
ENTRY (__wcschr)
|
|
|
|
movd %rsi, %xmm1
|
|
pxor %xmm2, %xmm2
|
|
mov %rdi, %rcx
|
|
punpckldq %xmm1, %xmm1
|
|
punpckldq %xmm1, %xmm1
|
|
|
|
and $63, %rcx
|
|
cmp $48, %rcx
|
|
ja L(cross_cache)
|
|
|
|
movdqu (%rdi), %xmm0
|
|
pcmpeqd %xmm0, %xmm2
|
|
add $16, %rdi
|
|
pcmpeqd %xmm1, %xmm0
|
|
pmovmskb %xmm2, %rdx
|
|
pmovmskb %xmm0, %rax
|
|
or %rax, %rdx
|
|
jnz L(matches)
|
|
|
|
and $-16, %rdi
|
|
|
|
movdqa (%rdi), %xmm0
|
|
pcmpeqd %xmm0, %xmm2
|
|
add $16, %rdi
|
|
pcmpeqd %xmm1, %xmm0
|
|
pmovmskb %xmm2, %rdx
|
|
pmovmskb %xmm0, %rax
|
|
or %rax, %rdx
|
|
jnz L(matches)
|
|
|
|
jmp L(loop)
|
|
|
|
L(cross_cache):
|
|
and $15, %rcx
|
|
and $-16, %rdi
|
|
movdqa (%rdi), %xmm0
|
|
pcmpeqd %xmm0, %xmm2
|
|
pcmpeqd %xmm1, %xmm0
|
|
pmovmskb %xmm2, %rdx
|
|
pmovmskb %xmm0, %rax
|
|
|
|
sar %cl, %rdx
|
|
sar %cl, %rax
|
|
test %rax, %rax
|
|
je L(unaligned_no_match)
|
|
|
|
bsf %rax, %rax
|
|
test %rdx, %rdx
|
|
je L(unaligned_match)
|
|
bsf %rdx, %rdx
|
|
cmp %rdx, %rax
|
|
ja L(return_null)
|
|
|
|
L(unaligned_match):
|
|
add %rdi, %rax
|
|
add %rcx, %rax
|
|
ret
|
|
|
|
.p2align 4
|
|
L(unaligned_no_match):
|
|
test %rdx, %rdx
|
|
jne L(return_null)
|
|
pxor %xmm2, %xmm2
|
|
|
|
add $16, %rdi
|
|
|
|
.p2align 4
|
|
/* Loop start on aligned string. */
|
|
L(loop):
|
|
movdqa (%rdi), %xmm0
|
|
pcmpeqd %xmm0, %xmm2
|
|
add $16, %rdi
|
|
pcmpeqd %xmm1, %xmm0
|
|
pmovmskb %xmm2, %rdx
|
|
pmovmskb %xmm0, %rax
|
|
or %rax, %rdx
|
|
jnz L(matches)
|
|
|
|
movdqa (%rdi), %xmm0
|
|
pcmpeqd %xmm0, %xmm2
|
|
add $16, %rdi
|
|
pcmpeqd %xmm1, %xmm0
|
|
pmovmskb %xmm2, %rdx
|
|
pmovmskb %xmm0, %rax
|
|
or %rax, %rdx
|
|
jnz L(matches)
|
|
|
|
movdqa (%rdi), %xmm0
|
|
pcmpeqd %xmm0, %xmm2
|
|
add $16, %rdi
|
|
pcmpeqd %xmm1, %xmm0
|
|
pmovmskb %xmm2, %rdx
|
|
pmovmskb %xmm0, %rax
|
|
or %rax, %rdx
|
|
jnz L(matches)
|
|
|
|
movdqa (%rdi), %xmm0
|
|
pcmpeqd %xmm0, %xmm2
|
|
add $16, %rdi
|
|
pcmpeqd %xmm1, %xmm0
|
|
pmovmskb %xmm2, %rdx
|
|
pmovmskb %xmm0, %rax
|
|
or %rax, %rdx
|
|
jnz L(matches)
|
|
jmp L(loop)
|
|
|
|
.p2align 4
|
|
L(matches):
|
|
pmovmskb %xmm2, %rdx
|
|
test %rax, %rax
|
|
jz L(return_null)
|
|
bsf %rax, %rax
|
|
test %rdx, %rdx
|
|
je L(match)
|
|
bsf %rdx, %rcx
|
|
cmp %rcx, %rax
|
|
ja L(return_null)
|
|
L(match):
|
|
sub $16, %rdi
|
|
add %rdi, %rax
|
|
ret
|
|
|
|
.p2align 4
|
|
L(return_null):
|
|
xor %rax, %rax
|
|
ret
|
|
|
|
END (__wcschr)
|
|
|
|
libc_hidden_def(__wcschr)
|
|
weak_alias (__wcschr, wcschr)
|
|
libc_hidden_weak (wcschr)
|