mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 16:21:07 +00:00
4f41c682f3
Replace with !IS_IN (libc). This completes the transition from the IS_IN/NOT_IN macros to the IN_MODULE macro set. The generated code is unchanged on x86_64. * stdlib/isomac.c (fmt): Replace NOT_IN_libc with IN_MODULE. (get_null_defines): Adjust. * sunrpc/Makefile: Adjust comment. * Makerules (CPPFLAGS-nonlib): Remove NOT_IN_libc. * elf/Makefile (CPPFLAGS-sotruss-lib): Likewise. (CFLAGS-interp.c): Likewise. (CFLAGS-ldconfig.c): Likewise. (CPPFLAGS-.os): Likewise. * elf/rtld-Rules (rtld-CPPFLAGS): Likewise. * extra-lib.mk (CPPFLAGS-$(lib)): Likewise. * extra-modules.mk (extra-modules.mk): Likewise. * iconv/Makefile (CPPFLAGS-iconvprogs): Likewise. * locale/Makefile (CPPFLAGS-locale_programs): Likewise. * malloc/Makefile (CPPFLAGS-memusagestat): Likewise. * nscd/Makefile (CPPFLAGS-nscd): Likewise. * nss/Makefile (CPPFLAGS-nss_test1): Likewise. * stdlib/Makefile (CFLAGS-tst-putenvmod.c): Likewise. * sysdeps/gnu/Makefile ($(objpfx)errlist-compat.c): Likewise. * sysdeps/unix/sysv/linux/Makefile (CPPFLAGS-lddlibc4): Likewise. * iconvdata/Makefile (CPPFLAGS): Likewise. (cpp-srcs-left): Add libof for all iconvdata routines. * bits/stdio-lock.h: Replace NOT_IN_libc with IS_IN. * include/assert.h: Likewise. * include/ctype.h: Likewise. * include/errno.h: Likewise. * include/libc-symbols.h: Likewise. * include/math.h: Likewise. * include/netdb.h: Likewise. * include/resolv.h: Likewise. * include/stdio.h: Likewise. * include/stdlib.h: Likewise. * include/string.h: Likewise. * include/sys/stat.h: Likewise. * include/wctype.h: Likewise. * intl/l10nflist.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * nptl/libc_multiple_threads.c: Likewise. * nptl/pthreadP.h: Likewise. * posix/regex_internal.h: Likewise. * resolv/res_hconf.c: Likewise. * sysdeps/arm/armv7/multiarch/memcpy.S: Likewise. * sysdeps/arm/memmove.S: Likewise. * sysdeps/arm/sysdep.h: Likewise. * sysdeps/generic/_itoa.h: Likewise. * sysdeps/generic/symbol-hacks.h: Likewise. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Likewise. * sysdeps/i386/i586/memcpy.S: Likewise. * sysdeps/i386/i586/memset.S: Likewise. * sysdeps/i386/i686/memcpy.S: Likewise. * sysdeps/i386/i686/memmove.S: Likewise. * sysdeps/i386/i686/mempcpy.S: Likewise. * sysdeps/i386/i686/memset.S: Likewise. * sysdeps/i386/i686/multiarch/bcopy.S: Likewise. * sysdeps/i386/i686/multiarch/bzero.S: Likewise. * sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S: Likewise. * sysdeps/i386/i686/multiarch/memchr-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/memchr.S: Likewise. * sysdeps/i386/i686/multiarch/memcmp-sse4.S: Likewise. * sysdeps/i386/i686/multiarch/memcmp-ssse3.S: Likewise. * sysdeps/i386/i686/multiarch/memcmp.S: Likewise. * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Likewise. * sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise. * sysdeps/i386/i686/multiarch/memcpy.S: Likewise. * sysdeps/i386/i686/multiarch/memcpy_chk.S: Likewise. * sysdeps/i386/i686/multiarch/memmove.S: Likewise. * sysdeps/i386/i686/multiarch/memmove_chk.S: Likewise. * sysdeps/i386/i686/multiarch/mempcpy.S: Likewise. * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Likewise. * sysdeps/i386/i686/multiarch/memrchr-c.c: Likewise. * sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S: Likewise. * sysdeps/i386/i686/multiarch/memrchr-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/memrchr.S: Likewise. * sysdeps/i386/i686/multiarch/memset-sse2-rep.S: Likewise. * sysdeps/i386/i686/multiarch/memset-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/memset.S: Likewise. * sysdeps/i386/i686/multiarch/memset_chk.S: Likewise. * sysdeps/i386/i686/multiarch/rawmemchr.S: Likewise. * sysdeps/i386/i686/multiarch/strcat-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/strcat-ssse3.S: Likewise. * sysdeps/i386/i686/multiarch/strcat.S: Likewise. * sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S: Likewise. * sysdeps/i386/i686/multiarch/strchr-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/strchr.S: Likewise. * sysdeps/i386/i686/multiarch/strcmp-sse4.S: Likewise. * sysdeps/i386/i686/multiarch/strcmp-ssse3.S: Likewise. * sysdeps/i386/i686/multiarch/strcmp.S: Likewise. * sysdeps/i386/i686/multiarch/strcpy-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/strcpy-ssse3.S: Likewise. * sysdeps/i386/i686/multiarch/strcpy.S: Likewise. * sysdeps/i386/i686/multiarch/strcspn.S: Likewise. * sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S: Likewise. * sysdeps/i386/i686/multiarch/strlen-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/strlen.S: Likewise. * sysdeps/i386/i686/multiarch/strnlen.S: Likewise. * sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S: Likewise. * sysdeps/i386/i686/multiarch/strrchr-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/strrchr.S: Likewise. * sysdeps/i386/i686/multiarch/strspn.S: Likewise. * sysdeps/i386/i686/multiarch/wcschr-c.c: Likewise. * sysdeps/i386/i686/multiarch/wcschr-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/wcschr.S: Likewise. * sysdeps/i386/i686/multiarch/wcscmp-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/wcscmp.S: Likewise. * sysdeps/i386/i686/multiarch/wcscpy-c.c: Likewise. * sysdeps/i386/i686/multiarch/wcscpy-ssse3.S: Likewise. * sysdeps/i386/i686/multiarch/wcscpy.S: Likewise. * sysdeps/i386/i686/multiarch/wcslen-c.c: Likewise. * sysdeps/i386/i686/multiarch/wcslen-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/wcslen.S: Likewise. * sysdeps/i386/i686/multiarch/wcsrchr-c.c: Likewise. * sysdeps/i386/i686/multiarch/wcsrchr-sse2.S: Likewise. * sysdeps/i386/i686/multiarch/wcsrchr.S: Likewise. * sysdeps/i386/i686/multiarch/wmemcmp-c.c: Likewise. * sysdeps/i386/i686/multiarch/wmemcmp.S: Likewise. * sysdeps/ia64/fpu/libm-symbols.h: Likewise. * sysdeps/nptl/bits/libc-lock.h: Likewise. * sysdeps/nptl/bits/libc-lockP.h: Likewise. * sysdeps/nptl/bits/stdio-lock.h: Likewise. * sysdeps/posix/closedir.c: Likewise. * sysdeps/posix/opendir.c: Likewise. * sysdeps/posix/readdir.c: Likewise. * sysdeps/posix/rewinddir.c: Likewise. * sysdeps/powerpc/novmx-sigjmp.c: Likewise. * sysdeps/powerpc/powerpc32/__longjmp.S: Likewise. * sysdeps/powerpc/powerpc32/bsd-_setjmp.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/__longjmp.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/setjmp.S: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/memset.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c: Likewise. * sysdeps/powerpc/powerpc32/power6/memset.S: Likewise. * sysdeps/powerpc/powerpc32/setjmp.S: Likewise. * sysdeps/powerpc/powerpc64/__longjmp.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/bzero.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memchr.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memcmp.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memcpy.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memmove.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/mempcpy.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memrchr.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/memset.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/stpncpy.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcat.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strchr.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strchrnul.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcmp.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcpy.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strcspn.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strlen.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strncase.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strncase_l.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strncat.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strncmp.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strncpy.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strnlen.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strpbrk.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strrchr.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/strspn.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/wcschr.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/wcscpy.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c: Likewise. * sysdeps/powerpc/powerpc64/multiarch/wordcopy.c: Likewise. * sysdeps/powerpc/powerpc64/setjmp.S: Likewise. * sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: Likewise. * sysdeps/s390/s390-32/multiarch/memcmp.S: Likewise. * sysdeps/s390/s390-32/multiarch/memcpy.S: Likewise. * sysdeps/s390/s390-32/multiarch/memset.S: Likewise. * sysdeps/s390/s390-64/multiarch/ifunc-resolve.c: Likewise. * sysdeps/s390/s390-64/multiarch/memcmp.S: Likewise. * sysdeps/s390/s390-64/multiarch/memcpy.S: Likewise. * sysdeps/s390/s390-64/multiarch/memset.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memcpy.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memset-niagara1.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memset-niagara4.S: Likewise. * sysdeps/sparc/sparc64/multiarch/memset.S: Likewise. * sysdeps/unix/alpha/sysdep.S: Likewise. * sysdeps/unix/alpha/sysdep.h: Likewise. * sysdeps/unix/make-syscalls.sh: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/alpha/vfork.S: Likewise. * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/arm/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/getpid.c: Likewise. * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/lowlevellock-futex.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/microblaze/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/not-cancel.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/s390/longjmp_chk.c: Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Likewise. * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/sh/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sh/vfork.S: Likewise. * sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/tile/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/tile/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise. * sysdeps/wordsize-32/symbol-hacks.h: Likewise. * sysdeps/x86_64/memcpy.S: Likewise. * sysdeps/x86_64/memmove.c: Likewise. * sysdeps/x86_64/memset.S: Likewise. * sysdeps/x86_64/multiarch/init-arch.h: Likewise. * sysdeps/x86_64/multiarch/memcmp-sse4.S: Likewise. * sysdeps/x86_64/multiarch/memcmp-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/memcmp.S: Likewise. * sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S: Likewise. * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: Likewise. * sysdeps/x86_64/multiarch/memcpy-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/memcpy.S: Likewise. * sysdeps/x86_64/multiarch/memcpy_chk.S: Likewise. * sysdeps/x86_64/multiarch/memmove.c: Likewise. * sysdeps/x86_64/multiarch/mempcpy.S: Likewise. * sysdeps/x86_64/multiarch/mempcpy_chk.S: Likewise. * sysdeps/x86_64/multiarch/memset-avx2.S: Likewise. * sysdeps/x86_64/multiarch/memset.S: Likewise. * sysdeps/x86_64/multiarch/memset_chk.S: Likewise. * sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S: Likewise. * sysdeps/x86_64/multiarch/strcat-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/strcat.S: Likewise. * sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S: Likewise. * sysdeps/x86_64/multiarch/strchr.S: Likewise. * sysdeps/x86_64/multiarch/strcmp-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/strcmp.S: Likewise. * sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S: Likewise. * sysdeps/x86_64/multiarch/strcpy-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/strcpy.S: Likewise. * sysdeps/x86_64/multiarch/strcspn.S: Likewise. * sysdeps/x86_64/multiarch/strspn.S: Likewise. * sysdeps/x86_64/multiarch/wcscpy-c.c: Likewise. * sysdeps/x86_64/multiarch/wcscpy-ssse3.S: Likewise. * sysdeps/x86_64/multiarch/wcscpy.S: Likewise. * sysdeps/x86_64/multiarch/wmemcmp-c.c: Likewise. * sysdeps/x86_64/multiarch/wmemcmp.S: Likewise. * sysdeps/x86_64/strcmp.S: Likewise.
709 lines
11 KiB
ArmAsm
709 lines
11 KiB
ArmAsm
/* strrchr SSE2 without bsf and bsr
|
|
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/>. */
|
|
|
|
#if IS_IN (libc)
|
|
|
|
# include <sysdep.h>
|
|
|
|
# define CFI_PUSH(REG) \
|
|
cfi_adjust_cfa_offset (4); \
|
|
cfi_rel_offset (REG, 0)
|
|
|
|
# define CFI_POP(REG) \
|
|
cfi_adjust_cfa_offset (-4); \
|
|
cfi_restore (REG)
|
|
|
|
# define PUSH(REG) pushl REG; CFI_PUSH (REG)
|
|
# define POP(REG) popl REG; CFI_POP (REG)
|
|
|
|
# define PARMS 8
|
|
# define ENTRANCE PUSH(%edi);
|
|
# define RETURN POP(%edi); ret; CFI_PUSH(%edi);
|
|
|
|
# define STR1 PARMS
|
|
# define STR2 STR1+4
|
|
|
|
atom_text_section
|
|
ENTRY (__strrchr_sse2)
|
|
|
|
ENTRANCE
|
|
mov STR1(%esp), %ecx
|
|
movd STR2(%esp), %xmm1
|
|
|
|
pxor %xmm2, %xmm2
|
|
mov %ecx, %edi
|
|
punpcklbw %xmm1, %xmm1
|
|
punpcklbw %xmm1, %xmm1
|
|
/* ECX has OFFSET. */
|
|
and $63, %ecx
|
|
cmp $48, %ecx
|
|
pshufd $0, %xmm1, %xmm1
|
|
ja L(crosscache)
|
|
|
|
/* unaligned string. */
|
|
movdqu (%edi), %xmm0
|
|
pcmpeqb %xmm0, %xmm2
|
|
pcmpeqb %xmm1, %xmm0
|
|
/* Find where NULL is. */
|
|
pmovmskb %xmm2, %ecx
|
|
/* Check if there is a match. */
|
|
pmovmskb %xmm0, %eax
|
|
add $16, %edi
|
|
|
|
test %eax, %eax
|
|
jnz L(unaligned_match1)
|
|
|
|
test %ecx, %ecx
|
|
jnz L(return_null)
|
|
|
|
and $-16, %edi
|
|
|
|
PUSH (%esi)
|
|
PUSH (%ebx)
|
|
|
|
xor %ebx, %ebx
|
|
jmp L(loop)
|
|
|
|
CFI_POP (%esi)
|
|
CFI_POP (%ebx)
|
|
|
|
.p2align 4
|
|
L(unaligned_match1):
|
|
test %ecx, %ecx
|
|
jnz L(prolog_find_zero_1)
|
|
|
|
PUSH (%esi)
|
|
PUSH (%ebx)
|
|
|
|
mov %eax, %ebx
|
|
mov %edi, %esi
|
|
and $-16, %edi
|
|
jmp L(loop)
|
|
|
|
CFI_POP (%esi)
|
|
CFI_POP (%ebx)
|
|
|
|
.p2align 4
|
|
L(crosscache):
|
|
/* Hancle unaligned string. */
|
|
and $15, %ecx
|
|
and $-16, %edi
|
|
pxor %xmm3, %xmm3
|
|
movdqa (%edi), %xmm0
|
|
pcmpeqb %xmm0, %xmm3
|
|
pcmpeqb %xmm1, %xmm0
|
|
/* Find where NULL is. */
|
|
pmovmskb %xmm3, %edx
|
|
/* Check if there is a match. */
|
|
pmovmskb %xmm0, %eax
|
|
/* Remove the leading bytes. */
|
|
shr %cl, %edx
|
|
shr %cl, %eax
|
|
add $16, %edi
|
|
|
|
test %eax, %eax
|
|
jnz L(unaligned_match)
|
|
|
|
test %edx, %edx
|
|
jnz L(return_null)
|
|
|
|
PUSH (%esi)
|
|
PUSH (%ebx)
|
|
|
|
xor %ebx, %ebx
|
|
jmp L(loop)
|
|
|
|
CFI_POP (%esi)
|
|
CFI_POP (%ebx)
|
|
|
|
.p2align 4
|
|
L(unaligned_match):
|
|
test %edx, %edx
|
|
jnz L(prolog_find_zero)
|
|
|
|
PUSH (%esi)
|
|
PUSH (%ebx)
|
|
|
|
mov %eax, %ebx
|
|
lea (%edi, %ecx), %esi
|
|
|
|
/* Loop start on aligned string. */
|
|
.p2align 4
|
|
L(loop):
|
|
movdqa (%edi), %xmm0
|
|
pcmpeqb %xmm0, %xmm2
|
|
add $16, %edi
|
|
pcmpeqb %xmm1, %xmm0
|
|
pmovmskb %xmm2, %ecx
|
|
pmovmskb %xmm0, %eax
|
|
or %eax, %ecx
|
|
jnz L(matches)
|
|
|
|
movdqa (%edi), %xmm0
|
|
pcmpeqb %xmm0, %xmm2
|
|
add $16, %edi
|
|
pcmpeqb %xmm1, %xmm0
|
|
pmovmskb %xmm2, %ecx
|
|
pmovmskb %xmm0, %eax
|
|
or %eax, %ecx
|
|
jnz L(matches)
|
|
|
|
movdqa (%edi), %xmm0
|
|
pcmpeqb %xmm0, %xmm2
|
|
add $16, %edi
|
|
pcmpeqb %xmm1, %xmm0
|
|
pmovmskb %xmm2, %ecx
|
|
pmovmskb %xmm0, %eax
|
|
or %eax, %ecx
|
|
jnz L(matches)
|
|
|
|
movdqa (%edi), %xmm0
|
|
pcmpeqb %xmm0, %xmm2
|
|
add $16, %edi
|
|
pcmpeqb %xmm1, %xmm0
|
|
pmovmskb %xmm2, %ecx
|
|
pmovmskb %xmm0, %eax
|
|
or %eax, %ecx
|
|
jz L(loop)
|
|
|
|
L(matches):
|
|
test %eax, %eax
|
|
jnz L(match)
|
|
L(return_value):
|
|
test %ebx, %ebx
|
|
jz L(return_null_1)
|
|
mov %ebx, %eax
|
|
mov %esi, %edi
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(return_null_1):
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(match):
|
|
pmovmskb %xmm2, %ecx
|
|
test %ecx, %ecx
|
|
jnz L(find_zero)
|
|
mov %eax, %ebx
|
|
mov %edi, %esi
|
|
jmp L(loop)
|
|
|
|
.p2align 4
|
|
L(find_zero):
|
|
test %cl, %cl
|
|
jz L(find_zero_high)
|
|
mov %cl, %dl
|
|
and $15, %dl
|
|
jz L(find_zero_8)
|
|
test $0x01, %cl
|
|
jnz L(FindZeroExit1)
|
|
test $0x02, %cl
|
|
jnz L(FindZeroExit2)
|
|
test $0x04, %cl
|
|
jnz L(FindZeroExit3)
|
|
and $1 << 4 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(find_zero_8):
|
|
test $0x10, %cl
|
|
jnz L(FindZeroExit5)
|
|
test $0x20, %cl
|
|
jnz L(FindZeroExit6)
|
|
test $0x40, %cl
|
|
jnz L(FindZeroExit7)
|
|
and $1 << 8 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(find_zero_high):
|
|
mov %ch, %dh
|
|
and $15, %dh
|
|
jz L(find_zero_high_8)
|
|
test $0x01, %ch
|
|
jnz L(FindZeroExit9)
|
|
test $0x02, %ch
|
|
jnz L(FindZeroExit10)
|
|
test $0x04, %ch
|
|
jnz L(FindZeroExit11)
|
|
and $1 << 12 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(find_zero_high_8):
|
|
test $0x10, %ch
|
|
jnz L(FindZeroExit13)
|
|
test $0x20, %ch
|
|
jnz L(FindZeroExit14)
|
|
test $0x40, %ch
|
|
jnz L(FindZeroExit15)
|
|
and $1 << 16 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit1):
|
|
and $1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit2):
|
|
and $1 << 2 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit3):
|
|
and $1 << 3 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit5):
|
|
and $1 << 5 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit6):
|
|
and $1 << 6 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit7):
|
|
and $1 << 7 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit9):
|
|
and $1 << 9 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit10):
|
|
and $1 << 10 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit11):
|
|
and $1 << 11 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit13):
|
|
and $1 << 13 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit14):
|
|
and $1 << 14 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
jmp L(match_exit)
|
|
|
|
CFI_PUSH (%ebx)
|
|
CFI_PUSH (%esi)
|
|
|
|
.p2align 4
|
|
L(FindZeroExit15):
|
|
and $1 << 15 - 1, %eax
|
|
jz L(return_value)
|
|
|
|
POP (%ebx)
|
|
POP (%esi)
|
|
|
|
.p2align 4
|
|
L(match_exit):
|
|
test %ah, %ah
|
|
jnz L(match_exit_high)
|
|
mov %al, %dl
|
|
and $15 << 4, %dl
|
|
jnz L(match_exit_8)
|
|
test $0x08, %al
|
|
jnz L(Exit4)
|
|
test $0x04, %al
|
|
jnz L(Exit3)
|
|
test $0x02, %al
|
|
jnz L(Exit2)
|
|
lea -16(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(match_exit_8):
|
|
test $0x80, %al
|
|
jnz L(Exit8)
|
|
test $0x40, %al
|
|
jnz L(Exit7)
|
|
test $0x20, %al
|
|
jnz L(Exit6)
|
|
lea -12(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(match_exit_high):
|
|
mov %ah, %dh
|
|
and $15 << 4, %dh
|
|
jnz L(match_exit_high_8)
|
|
test $0x08, %ah
|
|
jnz L(Exit12)
|
|
test $0x04, %ah
|
|
jnz L(Exit11)
|
|
test $0x02, %ah
|
|
jnz L(Exit10)
|
|
lea -8(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(match_exit_high_8):
|
|
test $0x80, %ah
|
|
jnz L(Exit16)
|
|
test $0x40, %ah
|
|
jnz L(Exit15)
|
|
test $0x20, %ah
|
|
jnz L(Exit14)
|
|
lea -4(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit2):
|
|
lea -15(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit3):
|
|
lea -14(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit4):
|
|
lea -13(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit6):
|
|
lea -11(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit7):
|
|
lea -10(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit8):
|
|
lea -9(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit10):
|
|
lea -7(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit11):
|
|
lea -6(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit12):
|
|
lea -5(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit14):
|
|
lea -3(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit15):
|
|
lea -2(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(Exit16):
|
|
lea -1(%edi), %eax
|
|
RETURN
|
|
|
|
/* Return NULL. */
|
|
.p2align 4
|
|
L(return_null):
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(prolog_find_zero):
|
|
add %ecx, %edi
|
|
mov %edx, %ecx
|
|
L(prolog_find_zero_1):
|
|
test %cl, %cl
|
|
jz L(prolog_find_zero_high)
|
|
mov %cl, %dl
|
|
and $15, %dl
|
|
jz L(prolog_find_zero_8)
|
|
test $0x01, %cl
|
|
jnz L(PrologFindZeroExit1)
|
|
test $0x02, %cl
|
|
jnz L(PrologFindZeroExit2)
|
|
test $0x04, %cl
|
|
jnz L(PrologFindZeroExit3)
|
|
and $1 << 4 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(prolog_find_zero_8):
|
|
test $0x10, %cl
|
|
jnz L(PrologFindZeroExit5)
|
|
test $0x20, %cl
|
|
jnz L(PrologFindZeroExit6)
|
|
test $0x40, %cl
|
|
jnz L(PrologFindZeroExit7)
|
|
and $1 << 8 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(prolog_find_zero_high):
|
|
mov %ch, %dh
|
|
and $15, %dh
|
|
jz L(prolog_find_zero_high_8)
|
|
test $0x01, %ch
|
|
jnz L(PrologFindZeroExit9)
|
|
test $0x02, %ch
|
|
jnz L(PrologFindZeroExit10)
|
|
test $0x04, %ch
|
|
jnz L(PrologFindZeroExit11)
|
|
and $1 << 12 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(prolog_find_zero_high_8):
|
|
test $0x10, %ch
|
|
jnz L(PrologFindZeroExit13)
|
|
test $0x20, %ch
|
|
jnz L(PrologFindZeroExit14)
|
|
test $0x40, %ch
|
|
jnz L(PrologFindZeroExit15)
|
|
and $1 << 16 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit1):
|
|
and $1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit2):
|
|
and $1 << 2 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit3):
|
|
and $1 << 3 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit5):
|
|
and $1 << 5 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit6):
|
|
and $1 << 6 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit7):
|
|
and $1 << 7 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit9):
|
|
and $1 << 9 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit10):
|
|
and $1 << 10 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit11):
|
|
and $1 << 11 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit13):
|
|
and $1 << 13 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit14):
|
|
and $1 << 14 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(PrologFindZeroExit15):
|
|
and $1 << 15 - 1, %eax
|
|
jnz L(match_exit)
|
|
xor %eax, %eax
|
|
RETURN
|
|
|
|
END (__strrchr_sse2)
|
|
#endif
|