mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +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.
706 lines
11 KiB
ArmAsm
706 lines
11 KiB
ArmAsm
/* Optimized memchr with sse2 without bsf
|
|
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)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
# define ENTRANCE PUSH(%edi);
|
|
# define PARMS 8
|
|
# define RETURN POP(%edi); ret; CFI_PUSH(%edi);
|
|
# else
|
|
# define ENTRANCE
|
|
# define PARMS 4
|
|
# endif
|
|
|
|
# define STR1 PARMS
|
|
# define STR2 STR1+4
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
# define LEN STR2+4
|
|
# endif
|
|
|
|
# ifndef MEMCHR
|
|
# define MEMCHR __memchr_sse2
|
|
# endif
|
|
|
|
atom_text_section
|
|
ENTRY (MEMCHR)
|
|
ENTRANCE
|
|
mov STR1(%esp), %ecx
|
|
movd STR2(%esp), %xmm1
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
mov LEN(%esp), %edx
|
|
test %edx, %edx
|
|
jz L(return_null)
|
|
# endif
|
|
|
|
punpcklbw %xmm1, %xmm1
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
mov %ecx, %edi
|
|
# else
|
|
mov %ecx, %edx
|
|
# endif
|
|
punpcklbw %xmm1, %xmm1
|
|
|
|
and $63, %ecx
|
|
pshufd $0, %xmm1, %xmm1
|
|
cmp $48, %ecx
|
|
ja L(crosscache)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqu (%edi), %xmm0
|
|
# else
|
|
movdqu (%edx), %xmm0
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm0
|
|
pmovmskb %xmm0, %eax
|
|
test %eax, %eax
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
jnz L(match_case2_prolog)
|
|
|
|
sub $16, %edx
|
|
jbe L(return_null)
|
|
lea 16(%edi), %edi
|
|
and $15, %ecx
|
|
and $-16, %edi
|
|
add %ecx, %edx
|
|
# else
|
|
jnz L(match_case1_prolog)
|
|
lea 16(%edx), %edx
|
|
and $-16, %edx
|
|
# endif
|
|
jmp L(loop_prolog)
|
|
|
|
.p2align 4
|
|
L(crosscache):
|
|
and $15, %ecx
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
and $-16, %edi
|
|
movdqa (%edi), %xmm0
|
|
# else
|
|
and $-16, %edx
|
|
movdqa (%edx), %xmm0
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm0
|
|
pmovmskb %xmm0, %eax
|
|
sar %cl, %eax
|
|
test %eax, %eax
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
jnz L(match_case2_prolog1)
|
|
lea -16(%edx), %edx
|
|
add %ecx, %edx
|
|
jle L(return_null)
|
|
lea 16(%edi), %edi
|
|
# else
|
|
jnz L(match_case1_prolog1)
|
|
lea 16(%edx), %edx
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(loop_prolog):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
sub $64, %edx
|
|
jbe L(exit_loop)
|
|
movdqa (%edi), %xmm0
|
|
# else
|
|
movdqa (%edx), %xmm0
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm0
|
|
xor %ecx, %ecx
|
|
pmovmskb %xmm0, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqa 16(%edi), %xmm2
|
|
# else
|
|
movdqa 16(%edx), %xmm2
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm2
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm2, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqa 32(%edi), %xmm3
|
|
# else
|
|
movdqa 32(%edx), %xmm3
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm3
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm3, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqa 48(%edi), %xmm4
|
|
# else
|
|
movdqa 48(%edx), %xmm4
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm4
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm4, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 64(%edi), %edi
|
|
sub $64, %edx
|
|
jbe L(exit_loop)
|
|
|
|
movdqa (%edi), %xmm0
|
|
# else
|
|
lea 64(%edx), %edx
|
|
movdqa (%edx), %xmm0
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm0
|
|
xor %ecx, %ecx
|
|
pmovmskb %xmm0, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqa 16(%edi), %xmm2
|
|
# else
|
|
movdqa 16(%edx), %xmm2
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm2
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm2, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqa 32(%edi), %xmm3
|
|
# else
|
|
movdqa 32(%edx), %xmm3
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm3
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm3, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqa 48(%edi), %xmm4
|
|
# else
|
|
movdqa 48(%edx), %xmm4
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm4
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm4, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 64(%edi), %edi
|
|
mov %edi, %ecx
|
|
and $-64, %edi
|
|
and $63, %ecx
|
|
add %ecx, %edx
|
|
# else
|
|
lea 64(%edx), %edx
|
|
and $-64, %edx
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(align64_loop):
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
sub $64, %edx
|
|
jbe L(exit_loop)
|
|
movdqa (%edi), %xmm0
|
|
movdqa 16(%edi), %xmm2
|
|
movdqa 32(%edi), %xmm3
|
|
movdqa 48(%edi), %xmm4
|
|
# else
|
|
movdqa (%edx), %xmm0
|
|
movdqa 16(%edx), %xmm2
|
|
movdqa 32(%edx), %xmm3
|
|
movdqa 48(%edx), %xmm4
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm0
|
|
pcmpeqb %xmm1, %xmm2
|
|
pcmpeqb %xmm1, %xmm3
|
|
pcmpeqb %xmm1, %xmm4
|
|
|
|
pmaxub %xmm0, %xmm3
|
|
pmaxub %xmm2, %xmm4
|
|
pmaxub %xmm3, %xmm4
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
add $64, %edi
|
|
# else
|
|
add $64, %edx
|
|
# endif
|
|
pmovmskb %xmm4, %eax
|
|
|
|
test %eax, %eax
|
|
jz L(align64_loop)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
sub $64, %edi
|
|
# else
|
|
sub $64, %edx
|
|
# endif
|
|
|
|
pmovmskb %xmm0, %eax
|
|
xor %ecx, %ecx
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
pmovmskb %xmm2, %eax
|
|
lea 16(%ecx), %ecx
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
movdqa 32(%edi), %xmm3
|
|
# else
|
|
movdqa 32(%edx), %xmm3
|
|
# endif
|
|
pcmpeqb %xmm1, %xmm3
|
|
pmovmskb %xmm3, %eax
|
|
lea 16(%ecx), %ecx
|
|
test %eax, %eax
|
|
jnz L(match_case1)
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
pcmpeqb 48(%edi), %xmm1
|
|
# else
|
|
pcmpeqb 48(%edx), %xmm1
|
|
# endif
|
|
pmovmskb %xmm1, %eax
|
|
lea 16(%ecx), %ecx
|
|
|
|
.p2align 4
|
|
L(match_case1):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
add %ecx, %edi
|
|
# else
|
|
L(match_case1_prolog1):
|
|
add %ecx, %edx
|
|
L(match_case1_prolog):
|
|
# endif
|
|
test %al, %al
|
|
jz L(match_case1_high)
|
|
mov %al, %cl
|
|
and $15, %cl
|
|
jz L(match_case1_8)
|
|
test $0x01, %al
|
|
jnz L(ExitCase1_1)
|
|
test $0x02, %al
|
|
jnz L(ExitCase1_2)
|
|
test $0x04, %al
|
|
jnz L(ExitCase1_3)
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 3(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 3(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(match_case1_8):
|
|
test $0x10, %al
|
|
jnz L(ExitCase1_5)
|
|
test $0x20, %al
|
|
jnz L(ExitCase1_6)
|
|
test $0x40, %al
|
|
jnz L(ExitCase1_7)
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 7(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 7(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(match_case1_high):
|
|
mov %ah, %ch
|
|
and $15, %ch
|
|
jz L(match_case1_high_8)
|
|
test $0x01, %ah
|
|
jnz L(ExitCase1_9)
|
|
test $0x02, %ah
|
|
jnz L(ExitCase1_10)
|
|
test $0x04, %ah
|
|
jnz L(ExitCase1_11)
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 11(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 11(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(match_case1_high_8):
|
|
test $0x10, %ah
|
|
jnz L(ExitCase1_13)
|
|
test $0x20, %ah
|
|
jnz L(ExitCase1_14)
|
|
test $0x40, %ah
|
|
jnz L(ExitCase1_15)
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 15(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 15(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
.p2align 4
|
|
L(exit_loop):
|
|
add $64, %edx
|
|
|
|
movdqa (%edi), %xmm0
|
|
pcmpeqb %xmm1, %xmm0
|
|
xor %ecx, %ecx
|
|
pmovmskb %xmm0, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case2)
|
|
cmp $16, %edx
|
|
jbe L(return_null)
|
|
|
|
movdqa 16(%edi), %xmm2
|
|
pcmpeqb %xmm1, %xmm2
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm2, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case2)
|
|
cmp $32, %edx
|
|
jbe L(return_null)
|
|
|
|
movdqa 32(%edi), %xmm3
|
|
pcmpeqb %xmm1, %xmm3
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm3, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case2)
|
|
cmp $48, %edx
|
|
jbe L(return_null)
|
|
|
|
pcmpeqb 48(%edi), %xmm1
|
|
lea 16(%ecx), %ecx
|
|
pmovmskb %xmm1, %eax
|
|
test %eax, %eax
|
|
jnz L(match_case2)
|
|
|
|
xor %eax, %eax
|
|
RETURN
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_1):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
mov %edi, %eax
|
|
RETURN
|
|
# else
|
|
mov %edx, %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_2):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 1(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 1(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_3):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 2(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 2(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_5):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 4(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 4(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_6):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 5(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 5(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_7):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 6(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 6(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_9):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 8(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 8(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_10):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 9(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 9(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_11):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 10(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 10(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_13):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 12(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 12(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_14):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 13(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 13(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(ExitCase1_15):
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
lea 14(%edi), %eax
|
|
RETURN
|
|
# else
|
|
lea 14(%edx), %eax
|
|
ret
|
|
# endif
|
|
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
.p2align 4
|
|
L(match_case2):
|
|
sub %ecx, %edx
|
|
L(match_case2_prolog1):
|
|
add %ecx, %edi
|
|
L(match_case2_prolog):
|
|
test %al, %al
|
|
jz L(match_case2_high)
|
|
mov %al, %cl
|
|
and $15, %cl
|
|
jz L(match_case2_8)
|
|
test $0x01, %al
|
|
jnz L(ExitCase2_1)
|
|
test $0x02, %al
|
|
jnz L(ExitCase2_2)
|
|
test $0x04, %al
|
|
jnz L(ExitCase2_3)
|
|
sub $4, %edx
|
|
jb L(return_null)
|
|
lea 3(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(match_case2_8):
|
|
test $0x10, %al
|
|
jnz L(ExitCase2_5)
|
|
test $0x20, %al
|
|
jnz L(ExitCase2_6)
|
|
test $0x40, %al
|
|
jnz L(ExitCase2_7)
|
|
sub $8, %edx
|
|
jb L(return_null)
|
|
lea 7(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(match_case2_high):
|
|
mov %ah, %ch
|
|
and $15, %ch
|
|
jz L(match_case2_high_8)
|
|
test $0x01, %ah
|
|
jnz L(ExitCase2_9)
|
|
test $0x02, %ah
|
|
jnz L(ExitCase2_10)
|
|
test $0x04, %ah
|
|
jnz L(ExitCase2_11)
|
|
sub $12, %edx
|
|
jb L(return_null)
|
|
lea 11(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(match_case2_high_8):
|
|
test $0x10, %ah
|
|
jnz L(ExitCase2_13)
|
|
test $0x20, %ah
|
|
jnz L(ExitCase2_14)
|
|
test $0x40, %ah
|
|
jnz L(ExitCase2_15)
|
|
sub $16, %edx
|
|
jb L(return_null)
|
|
lea 15(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_1):
|
|
mov %edi, %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_2):
|
|
sub $2, %edx
|
|
jb L(return_null)
|
|
lea 1(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_3):
|
|
sub $3, %edx
|
|
jb L(return_null)
|
|
lea 2(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_5):
|
|
sub $5, %edx
|
|
jb L(return_null)
|
|
lea 4(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_6):
|
|
sub $6, %edx
|
|
jb L(return_null)
|
|
lea 5(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_7):
|
|
sub $7, %edx
|
|
jb L(return_null)
|
|
lea 6(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_9):
|
|
sub $9, %edx
|
|
jb L(return_null)
|
|
lea 8(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_10):
|
|
sub $10, %edx
|
|
jb L(return_null)
|
|
lea 9(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_11):
|
|
sub $11, %edx
|
|
jb L(return_null)
|
|
lea 10(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_13):
|
|
sub $13, %edx
|
|
jb L(return_null)
|
|
lea 12(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_14):
|
|
sub $14, %edx
|
|
jb L(return_null)
|
|
lea 13(%edi), %eax
|
|
RETURN
|
|
|
|
.p2align 4
|
|
L(ExitCase2_15):
|
|
sub $15, %edx
|
|
jb L(return_null)
|
|
lea 14(%edi), %eax
|
|
RETURN
|
|
# endif
|
|
|
|
.p2align 4
|
|
L(return_null):
|
|
xor %eax, %eax
|
|
# ifndef USE_AS_RAWMEMCHR
|
|
RETURN
|
|
# else
|
|
ret
|
|
# endif
|
|
|
|
END (MEMCHR)
|
|
#endif
|