1997-08-27 20:26:10 +00:00
|
|
|
/* Optimized, inlined string functions. i386 version.
|
2003-09-05 10:03:19 +00:00
|
|
|
Copyright (C) 1997,1998,1999,2000,2003 Free Software Foundation, Inc.
|
1997-08-27 20:26:10 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1997-08-27 20:26:10 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
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. */
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
#ifndef _STRING_H
|
1997-09-16 00:42:43 +00:00
|
|
|
# error "Never use <bits/string.h> directly; include <string.h> instead."
|
1997-08-27 20:26:10 +00:00
|
|
|
#endif
|
|
|
|
|
1997-09-16 00:42:43 +00:00
|
|
|
/* The ix86 processors can access unaligned multi-byte variables. */
|
|
|
|
#define _STRING_ARCH_unaligned 1
|
|
|
|
|
|
|
|
|
|
|
|
/* We only provide optimizations if the user selects them and if
|
|
|
|
GNU CC is used. */
|
|
|
|
#if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \
|
update
2000-07-26 Greg McGary <greg@mcgary.org>
* Makeconfig (+link-bounded, link-libc-bounded,
link-extra-libs-bounded): New variables.
(built-program-cmd): Omit $(run-program-prefix) for static BP tests.
* Makerules (do-tests-clean, common-mostlyclean): Remove BP test files.
* Rules (tests-bp.out): New variable.
(tests): Conditionally add BP tests.
(binaries-bounded): Add variable and associated rule.
* csu/Makefile [build-bounded] (extra-objs, install-lib):
Move conditional stuff after place where condition is defined.
* malloc/malloc.c (bp-checks.h): Add #include.
(mem2chunk, chunk_at_offset, bin_at): Wrap BOUNDED_1 around expression.
(_bin_at): Add unbounded version of bin_at.
(IAV, chunk_alloc): Use unbounded _bin_at.
(mALLOc, rEALLOc, chunk_realloc, mEMALIGn, cALLOc,
chunk2mem_check, realloc_check, malloc_starter, malloc_atfork):
Wrap BOUNDED_N around return value.
(chunk_realloc): Adjust oldsize once.
* sysdeps/generic/bp-checks.h (__memchr): Remove incorrect decl.
(__ubp_memchr): Add correct decl.
(_CHECK_STRING): Use __ubp_memchr.
* sysdeps/alpha/memchr.S [!__BOUNDED_POINTERS__] (__ubp_memchr):
New alias for unbounded-pointer __memchr.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
* sysdeps/i386/strtok.S: Fix bounds checks to pass tests.
(SAVE_PTR): New macro. (save_ptr): Expand size as BP.
(strtok): Don't bother to write into SAVE_PTR when returning NULL.
* sysdeps/i386/i686/strtok.S: Likewise.
* sysdeps/i386/bp-asm.h (RETURN_BOUNDED_POINTER,
RETURN_NULL_BOUNDED_POINTER): Use %ecx as the scratch register.
* sysdeps/i386/bits/string.h [!__BOUNDED_POINTERS__]: Disable inlines.
* sysdeps/i386/i486/bits/string.h [!__BOUNDED_POINTERS__]: Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Copy
bounds of copy_result to mount_proc.
2000-07-26 18:21:25 +00:00
|
|
|
&& defined __GNUC__ && __GNUC__ >= 2 && !__BOUNDED_POINTERS__
|
1997-08-27 20:26:10 +00:00
|
|
|
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef __STRING_INLINE
|
|
|
|
# ifdef __cplusplus
|
|
|
|
# define __STRING_INLINE inline
|
|
|
|
# else
|
|
|
|
# define __STRING_INLINE extern __inline
|
|
|
|
# endif
|
1997-08-27 20:26:10 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* Copy N bytes of SRC to DEST. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_memcpy 1
|
1997-08-27 20:26:10 +00:00
|
|
|
#define memcpy(dest, src, n) \
|
|
|
|
(__extension__ (__builtin_constant_p (n) \
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
? __memcpy_c ((dest), (src), (n)) \
|
|
|
|
: memcpy ((dest), (src), (n))))
|
1997-08-27 20:26:10 +00:00
|
|
|
/* This looks horribly ugly, but the compiler can optimize it totally,
|
|
|
|
as the count is constant. */
|
1998-11-30 14:21:53 +00:00
|
|
|
__STRING_INLINE void *__memcpy_c (void *__dest, __const void *__src,
|
|
|
|
size_t __n);
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE void *
|
|
|
|
__memcpy_c (void *__dest, __const void *__src, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2;
|
1999-07-25 23:21:20 +00:00
|
|
|
union {
|
|
|
|
unsigned int __ui;
|
|
|
|
unsigned short int __usi;
|
|
|
|
unsigned char __uc;
|
|
|
|
} *__u = __dest;
|
Update.
1997-09-11 04:36 Ulrich Drepper <drepper@cygnus.com>
* db2/db_int.h: Define __set_errno if not yet available.
* db2/btree/bt_rec.c: Use __set_errno to set errno value.
* db2/clib/getlong.c: Likewise.
* db2/db185/db185.c: Likewise.
* db2/db185/db185_int.h: Likewise.
* db2/dbm/dbm.c: Likewise.
* db2/lock/lock_deadlock.c: Likewise.
* db2/log/log_archive.c: Likewise.
* elf/dl-profile.c: Implement mcount function.
* gmon/gmon.c: Use __profil not profil because of namespace pollution.
* gmon/mcount.c: Remove BSD kernel code.
Use compare&swap instruction if possible to change state variable.
Optimize frompc folding.
* gmon/sys/gmon.h (struct gmonparam): Change state field to long int.
* sysdeps/i386/i486/atomicity.h: New file.
* sysdeps/stub/atomicity.h: New file.
* sysdeps/mach/hurd/profil.c: Define function as __profil and make
profil weak alias.
* sysdeps/posix/profil.c: Likewise.
* string/bits/string2.h: New file.
* include/bits/string2.h: New file.
* string/Makefile (routines): Add mempcpy.
(tests): Add inl-tester.
Remove _D__NO_STRING_INLINES from CFLAGS-* variables.
* sysdeps/generic/mempcpy.c: New file.
* sysdeps/generic/memccpy.c: Undef function name to enable definition
as macro.
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/generic/memcmp.c: Likewise.
* sysdeps/generic/memmem.c: Likewise.
* sysdeps/generic/memmove.c: Likewise.
* sysdeps/generic/strcat.c: Likewise.
* sysdeps/generic/strchr.c: Likewise.
* sysdeps/generic/strcmp.c: Likewise.
* sysdeps/generic/strcpy.c: Likewise.
* sysdeps/generic/strcspn.c: Likewise.
* sysdeps/generic/strlen.c: Likewise.
* sysdeps/generic/strncat.c: Likewise.
* sysdeps/generic/strncmp.c: Likewise.
* sysdeps/generic/strncpy.c: Likewise.
* sysdeps/generic/strpbrk.c: Likewise.
* sysdeps/generic/strrchr.c: Likewise.
* sysdeps/generic/strsep.c: Likewise.
* sysdeps/generic/strspn.c: Likewise.
* sysdeps/generic/strstr.c: Likewise.
* sysdeps/generic/strtok.c: Likewise.
* sysdeps/generic/strtok_r.c: Likewise.
* sysdeps/i386/memset.c: Likewise.
* sysdeps/i386/bits/string.h: Correct a few types and constraints.
* sysdeps/i386/i486/bits/string.h: Heavy rewrites and optimizations.
* string/stratcliff.c: Undefine __USE_STRING_INLINES.
* string/tst-strlen.c: Likewise.
* string/string.h: Add prototype for mempcpy. Include bits/string2.h
header always if optimizing.
* intl/dcgettext.c: Don't unconditionally define stpcpy, only if not
yet defined.
* intl/l10nflist.c: Likewise.
* string/tester.c: Add copyright and make little cleanups.
* inet/test_ifindex.c: Change type of ni variable to unsigned int.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Change type
of fields map_collection_max and map_collection_act to size_t.
* nss/libnss_files.map: Group entries.
* posix/unistd.h: Add prototype for __setpgid and __profil.
* sysdeps/generic/crypt.h: Declare __crypt_r.
* sysdeps/i386/bits/select.h: Fix fatal bugs, use correct casts now.
* sysdeps/i386/fpu/bits/mathinline.h (isgreater, isgreaterequal,
isless, islessequal, islessgreater, isunordered): Optimize a bit.
* sysdeps/stub/ftruncate.c: Include missing header for prototype.
* sysdeps/stub/getdents.c: Likewise.
* sysdeps/stub/reboot.c: Likewise.
* sysdeps/stub/swapon.c: Likewise.
* sysdeps/stub/syscall.c: Likewise.
* sysdeps/stub/ualarm.c: Likewise.
* sysdeps/stub/usleep.c: Likewise.
* sysdeps/unix/sysv/linux/if_index.c: Don't compile or use opensock
if SIOGIFINDEX and SIOGIFNAME are not defined.
* sysdeps/unix/sysv/linux/net/if.h: Add IFF_PORTSEL and IFF_AUTOMEDIA
according to recent kernel changes.
1997-09-10 21:32 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de>
* Makeconfig: Use $(have-initfini) instead of $(elf) to figure out
the installed name of the startup code.
(common-generated): Add version.mk.
* Makefile (distclean-1): Add glibcbug.
* Makerules: Replace -lgcc by $(gnulib).
* catgets/Makefile (generated): Add xmalloc.o.
* csu/Makefile (generated): Replace align.h and end.h by defs.h to
match the generated file.
* manual/Makefile (mostlyclean): Add stub-manual and stamp.o.
(realclean): Changed to remove chapters-incl[12].
* po/Makefile (realclean): New rule to remove the generated .mo files.
* time/Makefile: Only include zonefile dependencies if $(no_deps) is
not true to avoid make clean failure when directory time doesn't exist
yet.
(generated): Add tzselect.
* stdio/fgets.c (fgets): Add casts to reduce gcc warning noise.
* stdio/internals.c (flushbuf): Likewise.
* stdio/linewrap.c (lwupdate): Likewise.
* stdio/memstream.c (enlarge_buffer): Likewise.
* stdio-common/vfscanf.c (_IO_vfscanf): Likewise.
* time/tzset.c (compute_change): Likewise.
* misc/init-misc.c (__init_misc): Only declare static if HAVE_GNU_LD
is defined.
* sysdeps/posix/pipestream.c (FUNC): Change to generate ANSI C style
functions.
* sysdeps/stub/init-posix.c: Likewise.
* sysdeps/stub/profil.c: Likewise.
* munch-tmpl.c (__libc_init): Convert to ANSI C style declaration to
reduce gcc warning noise.
* stdio/glue.c (_filbuf, _flsbuf): Likewise.
* stdio/obstream.c (grow, seek, input, init_obstream): Likewise.
* stdio/vasprintf.c (enlarge_buffer): Likewise.
* sysdeps/generic/sysd-stdio.c (__stdio_read, __stdio_write,
__stdio_seek, __stdio_close, __stdio_fileno, __stdio_open,
__stdio_reopen): Likewise.
* sysdeps/posix/defs.c (_cleanup): Likewise.
* time/offtime.c (__offtime): Add cast.
* posix/getopt.c: Don't use text_set_element if not defined.
* configure.in: Provide a check for underscores before user labels
that works even when the compiler used for building doesn't work
(like when there is no C library). Use the old way if the compiler
works.
1997-09-10 05:08 David S. Miller <davem@caip.rutgers.edu>
* sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: The TC* ioctls use
'T' not 't' on SparcLinux.
* sysdeps/unix/sysv/linux/sparc/bits/termios.h: tcflag_t is 32 bits.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add aliases for
_longjmp and siglongjmp.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libio/stdio.h: Add format attributes to the extra printf and
scanf like functions.
* stdio/stdio.h: Likewise.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
Print tablename_val, not tablename_len.
* nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r):
Use sprintf instead of sprintf, the string always fits.
* nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r):
Likewise.
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
Likewise.
* nis/nss_nisplus/nisplus-proto.c
(_nss_nisplus_getprotobynumber_r): Likewise.
* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbynumber_r):
Likewise.
* nis/nss_nisplus/nisplus-service.c
(_nss_nisplus_getservbynumber_r): Likewise.
* nis/nss_nisplus/nisplus-alias.c (_nss_create_tablename): Use
__stpcpy, __stpncpy and __strdup instead of public names.
* nis/nss_nisplus/nisplus-ethers.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-grp.c (_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-hosts.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_parse_netgroup):
Likewise.
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-pwd.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename):
Likewise.
* libc.map: Export __stpcpy and __strdup.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/Makefile (CFLAGS-test-float.c, CFLAGS-test-double.c,
CFLAGS-test-ldouble.c): Pass -ffloat-store to avoid excessive
precision.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* include/rpc/auth_des.h: New file.
1997-09-09 Paul Eggert <eggert@twinsun.com>
* time/mktime.c (__mktime_internal): Declare sec_requested even if
!LEAP_SECONDS_POSSIBLE, since it's needed at the end when checking
for time_t overflow.
1997-09-09 22:11 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/getcwd.c: Correct test for too small buffer.
Reported by Erik Troan <ewt@redhat.com>.
* elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>.
* elf/dl-open.c: Likewise.
1997-09-07 17:09 Richard Henderson <rth@cygnus.com>
* sysdeps/alpha/Makefile: Kill setjmp_aux.
* sysdeps/alpha/bits/setjmp.h: Rewrite in terms of an array.
* sysdeps/alpha/__longjmp.c: Remove.
* sysdeps/alpha/setjmp_aux.c: Remove.
* sysdeps/alpha/__longjmp.S: New file.
* sysdeps/alpha/bsd-_setjmp.S: Stub out.
* sysdeps/alpha/bsd-setjmp.S: Likewise.
* sysdeps/alpha/setjmp.S: Do the work; don't call __setjmp_aux.
Move _setjmp and setjmp from bsd-*.S.
1997-09-06 20:20 Ulrich Drepper <drepper@cygnus.com>
* include/rpc/auth.h: New file.
* include/rpc/auth_unix.h: New file.
1997-09-06 Paul Eggert <eggert@twinsun.com>
Fix gmtime so that it reports leap seconds when TZ
indicates that leap seconds are desired.
* time/gmtime.c (<stddef.h>): Remove unnecessary include.
(gmtime): Put after gmtime_r, to help the compiler inline.
(__tz_convert): New decl.
(gmtime_r): Use __tz_convert instead of __offtime,
so that leap seconds are handled correctly.
* time/localtime.c (<errno.h>, <libc-lock.h>): Remove includes that
are now unnecessary.
(__tzset_internal, __tz_compute, __tzfile_compute, __use_tzfile,
__tzset_lock): Remove extern decls that are now unnecessary.
(localtime_internal): Moved to __tz_convert in tzset.c.
so that localtime and gmtime can both use it easily.
(localtime): Put after localtime_r, to help the compiler inline.
(localtime_r): Use __tz_convert instead of localtime_internal.
* time/strftime.c (__tz_compute): Remove unused (and now incorrect)
decl.
* time/tzfile.c (__tzfile_compute): New arg USE_LOCALTIME.
* time/tzset.c (<errno.h>): Include.
(_tmbuf): New decl.
(__tzfile_compute): New function.
(tz_compute): Renamed from __tz_compute. No longer extern.
Remove redundant call to tzset_internal.
(tzset_internal): Renamed from __tzset_internal. No longer extern.
(tzset_lock): Renamed from __tzset_lock. No longer extern.
(__tz_convert): New function, containing functionality of old
localtime_internal function, plus locking and optional UTC.
1997-09-06 Paul Eggert <eggert@twinsun.com>
* time/tzfile.c (__tzfile_read): Don't read a file if TZ is the empty
string, just use UTC without leap seconds. This is for compatibility
with the Olson code.
1997-09-06 Paul Eggert <eggert@twinsun.com>
* time/tzset.c (__tzname_max): Lock tz data structures before
invoking tzset_internal.
* time/tzfile.c: Define compute_tzname_max statically.
1997-09-07 10:57 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nis_call.c: Remove not longer necessary HAVE_SECURE_RPC ifdefs.
* nis/nis_intern.h: Likewise.
* nis/nss_nis/nis-publickey.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/ypclnt.c: Likewise.
* sunrpc/auth_des.c: Don't dereference NULL pointer,
initialize ad->ad_timediff.
* sunrpc/auth_none.c: Don't define our own prototypes, use the one
from the header files.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/rpc_cmsg.c: Likewise.
* sunrpc/key_call.c: Fix signal handling.
* sunrpc/openchild.c: Don't use /bin/sh to start /usr/etc/keyenvoy,
or we will get a deadlock with NIS+.
* sunrpc/rpc/auth.h: Add prototype for xdr_opaque_auth, don't define
HAVE_SECURE_RPC.
1997-09-07 15:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/bits/select.h [__GNUC__] (__FD_ZERO, __FD_SET, __FD_CLR,
__FD_ISSET): Use correct casts to address array correctly.
Reported by urbanw@cs.umu.se.
1997-09-07 05:07 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>.
* elf/dl-open.c: Likewise.
* sysdeps/i386/memset.c: Undefine memset in case the header with the
optimized functions is included.
Patches by NIIBE Yutaka <gniibe@mri.co.jp>.
* sysdeps/i386/bits/string.h [__PIC__] (strcspn, strspn, strpbrk,
strsep): Use register for second parameter.
* sysdeps/i386/i486/bits/string.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-09-03 09:48 Geoff Keating <geoffk@ozemail.com.au>
* math/libm-test.c: Change various tolerances to match what the
tested routines can actually provide.
* math/Makefile: Add new tests.
* math/atest-sincos.c: New file.
* math/atest-exp.c: New file.
* csu/Makefile: Give initfini.s and initfiniS.s their own
CFLAGS-* macros so they can be overridden.
* sysdeps/powerpc/Makefile [subdir=csu]: Override flags for
initfiniS.s to use -fpic instead of -fPIC, because the sed script
breaks otherwise.
* sysdeps/powerpc/Makefile [build-shared]: Use -fpic not -fPIC for
efficiency.
* sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE):
Don't use register 0, to let _mcount be in a shared object.
* sysdeps/powerpc/dl-machine.h: Use full sentences in comments.
Generally clean up. Suppress some code we don't need when relocating
ld.so.
* sysdeps/powerpc/test-arith.c: Change loop indices to size_t when
appropriate to suppress gcc warning.
* resolv/res_send.c: Suppress warning.
* sunrpc/xdr_sizeof.c: Suppress warning.
* FAQ: Add ppc-linux.
* manual/maint.texi: Add ppc-linux. Explain that gcc can't build it
yet.
* sysdeps/unix/sysv/linux/powerpc/profil-counter.h: Correct for
current kernels.
1997-08-15 07:45 Geoff Keating <geoffk@ozemail.com.au>
* stdlib/fmtmsg.c: Use two parameters for __libc_once_define.
* sysdeps/i386/machine-gmon.h: Correct typo.
* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Change to match
kernel.
* sysdeps/generic/dl-sysdep.c: Add hook for bizzare PPC argument hack.
* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Rewrite to use
sysdeps/linux/dl-sysdep.c.
* sysdeps/powerpc/Makefile [subdir=gmon]: Compile ppc-mcount.
* sysdeps/powerpc/machine-gmon.h: Use ppc-mcount.
* sysdeps/powerpc/ppc-mcount: New file.
The following are mostly changes to allow profiling:
* sysdeps/powerpc/add_n.S: Added.
* sysdeps/powerpc/add_n.s: Removed.
* sysdeps/powerpc/addmul_1.S: Added.
* sysdeps/powerpc/addmul_1.s: Removed.
* sysdeps/powerpc/bsd-_setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/bsd-setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/lshift.S: Added.
* sysdeps/powerpc/lshift.s: Removed.
* sysdeps/powerpc/memset.S: Added.
* sysdeps/powerpc/memset.s: Removed.
* sysdeps/powerpc/mul_1.S: Added.
* sysdeps/powerpc/mul_1.s: Removed.
* sysdeps/powerpc/rshift.S: Added.
* sysdeps/powerpc/rshift.s: Removed.
* sysdeps/powerpc/s_copysign.S: Use ENTRY, END, weak_alias macros.
* sysdeps/powerpc/s_fabs.S: Use ENTRY, END, weak_alias macros.
* sysdeps/powerpc/setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/strchr.S: Added.
* sysdeps/powerpc/strchr.s: Removed.
* sysdeps/powerpc/strcmp.S: Added.
* sysdeps/powerpc/strcmp.s: Removed.
* sysdeps/powerpc/strlen.S: Added.
* sysdeps/powerpc/strlen.s: Removed.
* sysdeps/powerpc/sub_n.S: Added.
* sysdeps/powerpc/sub_n.s: Removed.
* sysdeps/powerpc/submul_1.S: Added.
* sysdeps/powerpc/submul_1.s: Removed.
* sysdeps/unix/sysv/linux/powerpc/_exit.S: Removed.
* sysdeps/unix/sysv/linux/powerpc/brk.S: Added.
* sysdeps/unix/sysv/linux/powerpc/brk.c: Removed.
* sysdeps/unix/sysv/linux/powerpc/clone.S: Use new macros. Fix
various bugs. Document that it isn't tested.
* sysdeps/unix/sysv/linux/powerpc/sigreturn.S: Make look like
sysdeps/unix/_exit.S.
* sysdeps/unix/sysv/linux/powerpc/socket.S: Use new macros.
* sysdeps/unix/sysv/linux/powerpc/syscall.S: Use new macros.
* sysdeps/unix/sysv/linux/powerpc/sysdep.h: Define some new macros
to make assembler (possibly) more portable, allow profiling, etc.
1997-09-11 12:09:10 +00:00
|
|
|
switch (__n)
|
1997-08-27 20:26:10 +00:00
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
return __dest;
|
|
|
|
case 1:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__uc = *(const unsigned char *) __src;
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
case 2:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__usi = *(const unsigned short int *) __src;
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
case 3:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__usi = *(const unsigned short int *) __src;
|
|
|
|
__u = (void *) __u + 2;
|
|
|
|
__u->__uc = *(2 + (const unsigned char *) __src);
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
case 4:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__ui = *(const unsigned int *) __src;
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
1999-07-25 23:21:20 +00:00
|
|
|
case 6:
|
|
|
|
__u->__ui = *(const unsigned int *) __src;
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__usi = *(2 + (const unsigned short int *) __src);
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
case 8:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__ui = *(const unsigned int *) __src;
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(1 + (const unsigned int *) __src);
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
case 12:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__ui = *(const unsigned int *) __src;
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(1 + (const unsigned int *) __src);
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(2 + (const unsigned int *) __src);
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
case 16:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__ui = *(const unsigned int *) __src;
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(1 + (const unsigned int *) __src);
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(2 + (const unsigned int *) __src);
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(3 + (const unsigned int *) __src);
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
case 20:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__ui = *(const unsigned int *) __src;
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(1 + (const unsigned int *) __src);
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(2 + (const unsigned int *) __src);
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(3 + (const unsigned int *) __src);
|
|
|
|
__u = (void *) __u + 4;
|
|
|
|
__u->__ui = *(4 + (const unsigned int *) __src);
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
}
|
|
|
|
#define __COMMON_CODE(x) \
|
|
|
|
__asm__ __volatile__ \
|
|
|
|
("cld\n\t" \
|
|
|
|
"rep; movsl" \
|
|
|
|
x \
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&c" (__d0), "=&D" (__d1), "=&S" (__d2) \
|
1999-07-25 23:21:20 +00:00
|
|
|
: "0" (__n / 4), "1" (&__u->__uc), "2" (__src) \
|
1998-03-25 15:21:09 +00:00
|
|
|
: "memory");
|
1997-08-27 20:26:10 +00:00
|
|
|
|
Update.
1997-09-11 04:36 Ulrich Drepper <drepper@cygnus.com>
* db2/db_int.h: Define __set_errno if not yet available.
* db2/btree/bt_rec.c: Use __set_errno to set errno value.
* db2/clib/getlong.c: Likewise.
* db2/db185/db185.c: Likewise.
* db2/db185/db185_int.h: Likewise.
* db2/dbm/dbm.c: Likewise.
* db2/lock/lock_deadlock.c: Likewise.
* db2/log/log_archive.c: Likewise.
* elf/dl-profile.c: Implement mcount function.
* gmon/gmon.c: Use __profil not profil because of namespace pollution.
* gmon/mcount.c: Remove BSD kernel code.
Use compare&swap instruction if possible to change state variable.
Optimize frompc folding.
* gmon/sys/gmon.h (struct gmonparam): Change state field to long int.
* sysdeps/i386/i486/atomicity.h: New file.
* sysdeps/stub/atomicity.h: New file.
* sysdeps/mach/hurd/profil.c: Define function as __profil and make
profil weak alias.
* sysdeps/posix/profil.c: Likewise.
* string/bits/string2.h: New file.
* include/bits/string2.h: New file.
* string/Makefile (routines): Add mempcpy.
(tests): Add inl-tester.
Remove _D__NO_STRING_INLINES from CFLAGS-* variables.
* sysdeps/generic/mempcpy.c: New file.
* sysdeps/generic/memccpy.c: Undef function name to enable definition
as macro.
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/generic/memcmp.c: Likewise.
* sysdeps/generic/memmem.c: Likewise.
* sysdeps/generic/memmove.c: Likewise.
* sysdeps/generic/strcat.c: Likewise.
* sysdeps/generic/strchr.c: Likewise.
* sysdeps/generic/strcmp.c: Likewise.
* sysdeps/generic/strcpy.c: Likewise.
* sysdeps/generic/strcspn.c: Likewise.
* sysdeps/generic/strlen.c: Likewise.
* sysdeps/generic/strncat.c: Likewise.
* sysdeps/generic/strncmp.c: Likewise.
* sysdeps/generic/strncpy.c: Likewise.
* sysdeps/generic/strpbrk.c: Likewise.
* sysdeps/generic/strrchr.c: Likewise.
* sysdeps/generic/strsep.c: Likewise.
* sysdeps/generic/strspn.c: Likewise.
* sysdeps/generic/strstr.c: Likewise.
* sysdeps/generic/strtok.c: Likewise.
* sysdeps/generic/strtok_r.c: Likewise.
* sysdeps/i386/memset.c: Likewise.
* sysdeps/i386/bits/string.h: Correct a few types and constraints.
* sysdeps/i386/i486/bits/string.h: Heavy rewrites and optimizations.
* string/stratcliff.c: Undefine __USE_STRING_INLINES.
* string/tst-strlen.c: Likewise.
* string/string.h: Add prototype for mempcpy. Include bits/string2.h
header always if optimizing.
* intl/dcgettext.c: Don't unconditionally define stpcpy, only if not
yet defined.
* intl/l10nflist.c: Likewise.
* string/tester.c: Add copyright and make little cleanups.
* inet/test_ifindex.c: Change type of ni variable to unsigned int.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Change type
of fields map_collection_max and map_collection_act to size_t.
* nss/libnss_files.map: Group entries.
* posix/unistd.h: Add prototype for __setpgid and __profil.
* sysdeps/generic/crypt.h: Declare __crypt_r.
* sysdeps/i386/bits/select.h: Fix fatal bugs, use correct casts now.
* sysdeps/i386/fpu/bits/mathinline.h (isgreater, isgreaterequal,
isless, islessequal, islessgreater, isunordered): Optimize a bit.
* sysdeps/stub/ftruncate.c: Include missing header for prototype.
* sysdeps/stub/getdents.c: Likewise.
* sysdeps/stub/reboot.c: Likewise.
* sysdeps/stub/swapon.c: Likewise.
* sysdeps/stub/syscall.c: Likewise.
* sysdeps/stub/ualarm.c: Likewise.
* sysdeps/stub/usleep.c: Likewise.
* sysdeps/unix/sysv/linux/if_index.c: Don't compile or use opensock
if SIOGIFINDEX and SIOGIFNAME are not defined.
* sysdeps/unix/sysv/linux/net/if.h: Add IFF_PORTSEL and IFF_AUTOMEDIA
according to recent kernel changes.
1997-09-10 21:32 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de>
* Makeconfig: Use $(have-initfini) instead of $(elf) to figure out
the installed name of the startup code.
(common-generated): Add version.mk.
* Makefile (distclean-1): Add glibcbug.
* Makerules: Replace -lgcc by $(gnulib).
* catgets/Makefile (generated): Add xmalloc.o.
* csu/Makefile (generated): Replace align.h and end.h by defs.h to
match the generated file.
* manual/Makefile (mostlyclean): Add stub-manual and stamp.o.
(realclean): Changed to remove chapters-incl[12].
* po/Makefile (realclean): New rule to remove the generated .mo files.
* time/Makefile: Only include zonefile dependencies if $(no_deps) is
not true to avoid make clean failure when directory time doesn't exist
yet.
(generated): Add tzselect.
* stdio/fgets.c (fgets): Add casts to reduce gcc warning noise.
* stdio/internals.c (flushbuf): Likewise.
* stdio/linewrap.c (lwupdate): Likewise.
* stdio/memstream.c (enlarge_buffer): Likewise.
* stdio-common/vfscanf.c (_IO_vfscanf): Likewise.
* time/tzset.c (compute_change): Likewise.
* misc/init-misc.c (__init_misc): Only declare static if HAVE_GNU_LD
is defined.
* sysdeps/posix/pipestream.c (FUNC): Change to generate ANSI C style
functions.
* sysdeps/stub/init-posix.c: Likewise.
* sysdeps/stub/profil.c: Likewise.
* munch-tmpl.c (__libc_init): Convert to ANSI C style declaration to
reduce gcc warning noise.
* stdio/glue.c (_filbuf, _flsbuf): Likewise.
* stdio/obstream.c (grow, seek, input, init_obstream): Likewise.
* stdio/vasprintf.c (enlarge_buffer): Likewise.
* sysdeps/generic/sysd-stdio.c (__stdio_read, __stdio_write,
__stdio_seek, __stdio_close, __stdio_fileno, __stdio_open,
__stdio_reopen): Likewise.
* sysdeps/posix/defs.c (_cleanup): Likewise.
* time/offtime.c (__offtime): Add cast.
* posix/getopt.c: Don't use text_set_element if not defined.
* configure.in: Provide a check for underscores before user labels
that works even when the compiler used for building doesn't work
(like when there is no C library). Use the old way if the compiler
works.
1997-09-10 05:08 David S. Miller <davem@caip.rutgers.edu>
* sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: The TC* ioctls use
'T' not 't' on SparcLinux.
* sysdeps/unix/sysv/linux/sparc/bits/termios.h: tcflag_t is 32 bits.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add aliases for
_longjmp and siglongjmp.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libio/stdio.h: Add format attributes to the extra printf and
scanf like functions.
* stdio/stdio.h: Likewise.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
Print tablename_val, not tablename_len.
* nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r):
Use sprintf instead of sprintf, the string always fits.
* nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r):
Likewise.
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
Likewise.
* nis/nss_nisplus/nisplus-proto.c
(_nss_nisplus_getprotobynumber_r): Likewise.
* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbynumber_r):
Likewise.
* nis/nss_nisplus/nisplus-service.c
(_nss_nisplus_getservbynumber_r): Likewise.
* nis/nss_nisplus/nisplus-alias.c (_nss_create_tablename): Use
__stpcpy, __stpncpy and __strdup instead of public names.
* nis/nss_nisplus/nisplus-ethers.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-grp.c (_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-hosts.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_parse_netgroup):
Likewise.
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-pwd.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename):
Likewise.
* libc.map: Export __stpcpy and __strdup.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/Makefile (CFLAGS-test-float.c, CFLAGS-test-double.c,
CFLAGS-test-ldouble.c): Pass -ffloat-store to avoid excessive
precision.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* include/rpc/auth_des.h: New file.
1997-09-09 Paul Eggert <eggert@twinsun.com>
* time/mktime.c (__mktime_internal): Declare sec_requested even if
!LEAP_SECONDS_POSSIBLE, since it's needed at the end when checking
for time_t overflow.
1997-09-09 22:11 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/getcwd.c: Correct test for too small buffer.
Reported by Erik Troan <ewt@redhat.com>.
* elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>.
* elf/dl-open.c: Likewise.
1997-09-07 17:09 Richard Henderson <rth@cygnus.com>
* sysdeps/alpha/Makefile: Kill setjmp_aux.
* sysdeps/alpha/bits/setjmp.h: Rewrite in terms of an array.
* sysdeps/alpha/__longjmp.c: Remove.
* sysdeps/alpha/setjmp_aux.c: Remove.
* sysdeps/alpha/__longjmp.S: New file.
* sysdeps/alpha/bsd-_setjmp.S: Stub out.
* sysdeps/alpha/bsd-setjmp.S: Likewise.
* sysdeps/alpha/setjmp.S: Do the work; don't call __setjmp_aux.
Move _setjmp and setjmp from bsd-*.S.
1997-09-06 20:20 Ulrich Drepper <drepper@cygnus.com>
* include/rpc/auth.h: New file.
* include/rpc/auth_unix.h: New file.
1997-09-06 Paul Eggert <eggert@twinsun.com>
Fix gmtime so that it reports leap seconds when TZ
indicates that leap seconds are desired.
* time/gmtime.c (<stddef.h>): Remove unnecessary include.
(gmtime): Put after gmtime_r, to help the compiler inline.
(__tz_convert): New decl.
(gmtime_r): Use __tz_convert instead of __offtime,
so that leap seconds are handled correctly.
* time/localtime.c (<errno.h>, <libc-lock.h>): Remove includes that
are now unnecessary.
(__tzset_internal, __tz_compute, __tzfile_compute, __use_tzfile,
__tzset_lock): Remove extern decls that are now unnecessary.
(localtime_internal): Moved to __tz_convert in tzset.c.
so that localtime and gmtime can both use it easily.
(localtime): Put after localtime_r, to help the compiler inline.
(localtime_r): Use __tz_convert instead of localtime_internal.
* time/strftime.c (__tz_compute): Remove unused (and now incorrect)
decl.
* time/tzfile.c (__tzfile_compute): New arg USE_LOCALTIME.
* time/tzset.c (<errno.h>): Include.
(_tmbuf): New decl.
(__tzfile_compute): New function.
(tz_compute): Renamed from __tz_compute. No longer extern.
Remove redundant call to tzset_internal.
(tzset_internal): Renamed from __tzset_internal. No longer extern.
(tzset_lock): Renamed from __tzset_lock. No longer extern.
(__tz_convert): New function, containing functionality of old
localtime_internal function, plus locking and optional UTC.
1997-09-06 Paul Eggert <eggert@twinsun.com>
* time/tzfile.c (__tzfile_read): Don't read a file if TZ is the empty
string, just use UTC without leap seconds. This is for compatibility
with the Olson code.
1997-09-06 Paul Eggert <eggert@twinsun.com>
* time/tzset.c (__tzname_max): Lock tz data structures before
invoking tzset_internal.
* time/tzfile.c: Define compute_tzname_max statically.
1997-09-07 10:57 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nis_call.c: Remove not longer necessary HAVE_SECURE_RPC ifdefs.
* nis/nis_intern.h: Likewise.
* nis/nss_nis/nis-publickey.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/ypclnt.c: Likewise.
* sunrpc/auth_des.c: Don't dereference NULL pointer,
initialize ad->ad_timediff.
* sunrpc/auth_none.c: Don't define our own prototypes, use the one
from the header files.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/rpc_cmsg.c: Likewise.
* sunrpc/key_call.c: Fix signal handling.
* sunrpc/openchild.c: Don't use /bin/sh to start /usr/etc/keyenvoy,
or we will get a deadlock with NIS+.
* sunrpc/rpc/auth.h: Add prototype for xdr_opaque_auth, don't define
HAVE_SECURE_RPC.
1997-09-07 15:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/bits/select.h [__GNUC__] (__FD_ZERO, __FD_SET, __FD_CLR,
__FD_ISSET): Use correct casts to address array correctly.
Reported by urbanw@cs.umu.se.
1997-09-07 05:07 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>.
* elf/dl-open.c: Likewise.
* sysdeps/i386/memset.c: Undefine memset in case the header with the
optimized functions is included.
Patches by NIIBE Yutaka <gniibe@mri.co.jp>.
* sysdeps/i386/bits/string.h [__PIC__] (strcspn, strspn, strpbrk,
strsep): Use register for second parameter.
* sysdeps/i386/i486/bits/string.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-09-03 09:48 Geoff Keating <geoffk@ozemail.com.au>
* math/libm-test.c: Change various tolerances to match what the
tested routines can actually provide.
* math/Makefile: Add new tests.
* math/atest-sincos.c: New file.
* math/atest-exp.c: New file.
* csu/Makefile: Give initfini.s and initfiniS.s their own
CFLAGS-* macros so they can be overridden.
* sysdeps/powerpc/Makefile [subdir=csu]: Override flags for
initfiniS.s to use -fpic instead of -fPIC, because the sed script
breaks otherwise.
* sysdeps/powerpc/Makefile [build-shared]: Use -fpic not -fPIC for
efficiency.
* sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE):
Don't use register 0, to let _mcount be in a shared object.
* sysdeps/powerpc/dl-machine.h: Use full sentences in comments.
Generally clean up. Suppress some code we don't need when relocating
ld.so.
* sysdeps/powerpc/test-arith.c: Change loop indices to size_t when
appropriate to suppress gcc warning.
* resolv/res_send.c: Suppress warning.
* sunrpc/xdr_sizeof.c: Suppress warning.
* FAQ: Add ppc-linux.
* manual/maint.texi: Add ppc-linux. Explain that gcc can't build it
yet.
* sysdeps/unix/sysv/linux/powerpc/profil-counter.h: Correct for
current kernels.
1997-08-15 07:45 Geoff Keating <geoffk@ozemail.com.au>
* stdlib/fmtmsg.c: Use two parameters for __libc_once_define.
* sysdeps/i386/machine-gmon.h: Correct typo.
* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Change to match
kernel.
* sysdeps/generic/dl-sysdep.c: Add hook for bizzare PPC argument hack.
* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Rewrite to use
sysdeps/linux/dl-sysdep.c.
* sysdeps/powerpc/Makefile [subdir=gmon]: Compile ppc-mcount.
* sysdeps/powerpc/machine-gmon.h: Use ppc-mcount.
* sysdeps/powerpc/ppc-mcount: New file.
The following are mostly changes to allow profiling:
* sysdeps/powerpc/add_n.S: Added.
* sysdeps/powerpc/add_n.s: Removed.
* sysdeps/powerpc/addmul_1.S: Added.
* sysdeps/powerpc/addmul_1.s: Removed.
* sysdeps/powerpc/bsd-_setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/bsd-setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/lshift.S: Added.
* sysdeps/powerpc/lshift.s: Removed.
* sysdeps/powerpc/memset.S: Added.
* sysdeps/powerpc/memset.s: Removed.
* sysdeps/powerpc/mul_1.S: Added.
* sysdeps/powerpc/mul_1.s: Removed.
* sysdeps/powerpc/rshift.S: Added.
* sysdeps/powerpc/rshift.s: Removed.
* sysdeps/powerpc/s_copysign.S: Use ENTRY, END, weak_alias macros.
* sysdeps/powerpc/s_fabs.S: Use ENTRY, END, weak_alias macros.
* sysdeps/powerpc/setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/strchr.S: Added.
* sysdeps/powerpc/strchr.s: Removed.
* sysdeps/powerpc/strcmp.S: Added.
* sysdeps/powerpc/strcmp.s: Removed.
* sysdeps/powerpc/strlen.S: Added.
* sysdeps/powerpc/strlen.s: Removed.
* sysdeps/powerpc/sub_n.S: Added.
* sysdeps/powerpc/sub_n.s: Removed.
* sysdeps/powerpc/submul_1.S: Added.
* sysdeps/powerpc/submul_1.s: Removed.
* sysdeps/unix/sysv/linux/powerpc/_exit.S: Removed.
* sysdeps/unix/sysv/linux/powerpc/brk.S: Added.
* sysdeps/unix/sysv/linux/powerpc/brk.c: Removed.
* sysdeps/unix/sysv/linux/powerpc/clone.S: Use new macros. Fix
various bugs. Document that it isn't tested.
* sysdeps/unix/sysv/linux/powerpc/sigreturn.S: Make look like
sysdeps/unix/_exit.S.
* sysdeps/unix/sysv/linux/powerpc/socket.S: Use new macros.
* sysdeps/unix/sysv/linux/powerpc/syscall.S: Use new macros.
* sysdeps/unix/sysv/linux/powerpc/sysdep.h: Define some new macros
to make assembler (possibly) more portable, allow profiling, etc.
1997-09-11 12:09:10 +00:00
|
|
|
switch (__n % 4)
|
1997-08-27 20:26:10 +00:00
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
__COMMON_CODE ("");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 1:
|
|
|
|
__COMMON_CODE ("\n\tmovsb");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 2:
|
|
|
|
__COMMON_CODE ("\n\tmovsw");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 3:
|
|
|
|
__COMMON_CODE ("\n\tmovsw\n\tmovsb");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return __dest;
|
1997-08-27 20:26:10 +00:00
|
|
|
#undef __COMMON_CODE
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Copy N bytes of SRC to DEST, guaranteeing
|
|
|
|
correct behavior for overlapping strings. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_memmove 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE void *
|
|
|
|
memmove (void *__dest, __const void *__src, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2;
|
1997-08-27 20:26:10 +00:00
|
|
|
if (__dest < __src)
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"rep\n\t"
|
|
|
|
"movsb"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
|
|
|
|
: "0" (__n), "1" (__src), "2" (__dest)
|
|
|
|
: "memory");
|
1997-08-27 20:26:10 +00:00
|
|
|
else
|
|
|
|
__asm__ __volatile__
|
|
|
|
("std\n\t"
|
|
|
|
"rep\n\t"
|
|
|
|
"movsb\n\t"
|
|
|
|
"cld"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
|
|
|
|
: "0" (__n), "1" (__n - 1 + (const char *) __src),
|
|
|
|
"2" (__n - 1 + (char *) __dest)
|
|
|
|
: "memory");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Set N bytes of S to C. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_memset 1
|
2000-11-08 21:20:06 +00:00
|
|
|
#define _USE_STRING_ARCH_memset 1
|
1997-08-27 20:26:10 +00:00
|
|
|
#define memset(s, c, n) \
|
|
|
|
(__extension__ (__builtin_constant_p (c) \
|
|
|
|
? (__builtin_constant_p (n) \
|
|
|
|
? __memset_cc (s, 0x01010101UL * (unsigned char) (c), n) \
|
|
|
|
: __memset_cg (s, 0x01010101UL * (unsigned char) (c), n))\
|
|
|
|
: __memset_gg (s, c, n)))
|
|
|
|
|
1998-11-30 14:21:53 +00:00
|
|
|
__STRING_INLINE void *__memset_cc (void *__s, unsigned long int __pattern,
|
|
|
|
size_t __n);
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE void *
|
|
|
|
__memset_cc (void *__s, unsigned long int __pattern, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1;
|
1999-07-25 23:21:20 +00:00
|
|
|
union {
|
|
|
|
unsigned int __ui;
|
|
|
|
unsigned short int __usi;
|
|
|
|
unsigned char __uc;
|
|
|
|
} *__u = __s;
|
1997-08-27 20:26:10 +00:00
|
|
|
switch (__n)
|
|
|
|
{
|
|
|
|
case 0:
|
1998-04-02 17:42:53 +00:00
|
|
|
return __s;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 1:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__uc = __pattern;
|
1997-08-27 20:26:10 +00:00
|
|
|
return __s;
|
|
|
|
case 2:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__usi = __pattern;
|
1998-04-02 17:42:53 +00:00
|
|
|
return __s;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 3:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__usi = __pattern;
|
1999-07-29 17:13:56 +00:00
|
|
|
__u = __extension__ ((void *) __u + 2);
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__uc = __pattern;
|
1997-08-27 20:26:10 +00:00
|
|
|
return __s;
|
|
|
|
case 4:
|
1999-07-25 23:21:20 +00:00
|
|
|
__u->__ui = __pattern;
|
1997-08-27 20:26:10 +00:00
|
|
|
return __s;
|
|
|
|
}
|
|
|
|
#define __COMMON_CODE(x) \
|
|
|
|
__asm__ __volatile__ \
|
|
|
|
("cld\n\t" \
|
|
|
|
"rep; stosl" \
|
|
|
|
x \
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&c" (__d0), "=&D" (__d1) \
|
1999-07-25 23:21:20 +00:00
|
|
|
: "a" (__pattern), "0" (__n / 4), "1" (&__u->__uc) \
|
1998-03-25 15:21:09 +00:00
|
|
|
: "memory")
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
switch (__n % 4)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
__COMMON_CODE ("");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 1:
|
|
|
|
__COMMON_CODE ("\n\tstosb");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 2:
|
1998-04-02 17:42:53 +00:00
|
|
|
__COMMON_CODE ("\n\tstosw");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
1997-08-27 20:26:10 +00:00
|
|
|
case 3:
|
|
|
|
__COMMON_CODE ("\n\tstosw\n\tstosb");
|
1999-07-09 20:58:54 +00:00
|
|
|
break;
|
1997-08-27 20:26:10 +00:00
|
|
|
}
|
1999-07-09 20:58:54 +00:00
|
|
|
return __s;
|
1997-08-27 20:26:10 +00:00
|
|
|
#undef __COMMON_CODE
|
|
|
|
}
|
|
|
|
|
1998-11-30 14:21:53 +00:00
|
|
|
__STRING_INLINE void *__memset_cg (void *__s, unsigned long __c, size_t __n);
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE void *
|
|
|
|
__memset_cg (void *__s, unsigned long __c, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1;
|
1997-08-27 20:26:10 +00:00
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"rep; stosl\n\t"
|
1998-03-25 15:21:09 +00:00
|
|
|
"testb $2,%b3\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"je 1f\n\t"
|
|
|
|
"stosw\n"
|
|
|
|
"1:\n\t"
|
1998-03-25 15:21:09 +00:00
|
|
|
"testb $1,%b3\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"je 2f\n\t"
|
|
|
|
"stosb\n"
|
|
|
|
"2:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&c" (__d0), "=&D" (__d1)
|
|
|
|
: "a" (__c), "q" (__n), "0" (__n / 4), "1" (__s)
|
|
|
|
: "memory");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __s;
|
|
|
|
}
|
|
|
|
|
1998-11-30 14:21:53 +00:00
|
|
|
__STRING_INLINE void *__memset_gg (void *__s, char __c, size_t __n);
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE void *
|
|
|
|
__memset_gg (void *__s, char __c, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1;
|
1997-08-27 20:26:10 +00:00
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
Update.
1997-09-11 04:36 Ulrich Drepper <drepper@cygnus.com>
* db2/db_int.h: Define __set_errno if not yet available.
* db2/btree/bt_rec.c: Use __set_errno to set errno value.
* db2/clib/getlong.c: Likewise.
* db2/db185/db185.c: Likewise.
* db2/db185/db185_int.h: Likewise.
* db2/dbm/dbm.c: Likewise.
* db2/lock/lock_deadlock.c: Likewise.
* db2/log/log_archive.c: Likewise.
* elf/dl-profile.c: Implement mcount function.
* gmon/gmon.c: Use __profil not profil because of namespace pollution.
* gmon/mcount.c: Remove BSD kernel code.
Use compare&swap instruction if possible to change state variable.
Optimize frompc folding.
* gmon/sys/gmon.h (struct gmonparam): Change state field to long int.
* sysdeps/i386/i486/atomicity.h: New file.
* sysdeps/stub/atomicity.h: New file.
* sysdeps/mach/hurd/profil.c: Define function as __profil and make
profil weak alias.
* sysdeps/posix/profil.c: Likewise.
* string/bits/string2.h: New file.
* include/bits/string2.h: New file.
* string/Makefile (routines): Add mempcpy.
(tests): Add inl-tester.
Remove _D__NO_STRING_INLINES from CFLAGS-* variables.
* sysdeps/generic/mempcpy.c: New file.
* sysdeps/generic/memccpy.c: Undef function name to enable definition
as macro.
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/generic/memcmp.c: Likewise.
* sysdeps/generic/memmem.c: Likewise.
* sysdeps/generic/memmove.c: Likewise.
* sysdeps/generic/strcat.c: Likewise.
* sysdeps/generic/strchr.c: Likewise.
* sysdeps/generic/strcmp.c: Likewise.
* sysdeps/generic/strcpy.c: Likewise.
* sysdeps/generic/strcspn.c: Likewise.
* sysdeps/generic/strlen.c: Likewise.
* sysdeps/generic/strncat.c: Likewise.
* sysdeps/generic/strncmp.c: Likewise.
* sysdeps/generic/strncpy.c: Likewise.
* sysdeps/generic/strpbrk.c: Likewise.
* sysdeps/generic/strrchr.c: Likewise.
* sysdeps/generic/strsep.c: Likewise.
* sysdeps/generic/strspn.c: Likewise.
* sysdeps/generic/strstr.c: Likewise.
* sysdeps/generic/strtok.c: Likewise.
* sysdeps/generic/strtok_r.c: Likewise.
* sysdeps/i386/memset.c: Likewise.
* sysdeps/i386/bits/string.h: Correct a few types and constraints.
* sysdeps/i386/i486/bits/string.h: Heavy rewrites and optimizations.
* string/stratcliff.c: Undefine __USE_STRING_INLINES.
* string/tst-strlen.c: Likewise.
* string/string.h: Add prototype for mempcpy. Include bits/string2.h
header always if optimizing.
* intl/dcgettext.c: Don't unconditionally define stpcpy, only if not
yet defined.
* intl/l10nflist.c: Likewise.
* string/tester.c: Add copyright and make little cleanups.
* inet/test_ifindex.c: Change type of ni variable to unsigned int.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Change type
of fields map_collection_max and map_collection_act to size_t.
* nss/libnss_files.map: Group entries.
* posix/unistd.h: Add prototype for __setpgid and __profil.
* sysdeps/generic/crypt.h: Declare __crypt_r.
* sysdeps/i386/bits/select.h: Fix fatal bugs, use correct casts now.
* sysdeps/i386/fpu/bits/mathinline.h (isgreater, isgreaterequal,
isless, islessequal, islessgreater, isunordered): Optimize a bit.
* sysdeps/stub/ftruncate.c: Include missing header for prototype.
* sysdeps/stub/getdents.c: Likewise.
* sysdeps/stub/reboot.c: Likewise.
* sysdeps/stub/swapon.c: Likewise.
* sysdeps/stub/syscall.c: Likewise.
* sysdeps/stub/ualarm.c: Likewise.
* sysdeps/stub/usleep.c: Likewise.
* sysdeps/unix/sysv/linux/if_index.c: Don't compile or use opensock
if SIOGIFINDEX and SIOGIFNAME are not defined.
* sysdeps/unix/sysv/linux/net/if.h: Add IFF_PORTSEL and IFF_AUTOMEDIA
according to recent kernel changes.
1997-09-10 21:32 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de>
* Makeconfig: Use $(have-initfini) instead of $(elf) to figure out
the installed name of the startup code.
(common-generated): Add version.mk.
* Makefile (distclean-1): Add glibcbug.
* Makerules: Replace -lgcc by $(gnulib).
* catgets/Makefile (generated): Add xmalloc.o.
* csu/Makefile (generated): Replace align.h and end.h by defs.h to
match the generated file.
* manual/Makefile (mostlyclean): Add stub-manual and stamp.o.
(realclean): Changed to remove chapters-incl[12].
* po/Makefile (realclean): New rule to remove the generated .mo files.
* time/Makefile: Only include zonefile dependencies if $(no_deps) is
not true to avoid make clean failure when directory time doesn't exist
yet.
(generated): Add tzselect.
* stdio/fgets.c (fgets): Add casts to reduce gcc warning noise.
* stdio/internals.c (flushbuf): Likewise.
* stdio/linewrap.c (lwupdate): Likewise.
* stdio/memstream.c (enlarge_buffer): Likewise.
* stdio-common/vfscanf.c (_IO_vfscanf): Likewise.
* time/tzset.c (compute_change): Likewise.
* misc/init-misc.c (__init_misc): Only declare static if HAVE_GNU_LD
is defined.
* sysdeps/posix/pipestream.c (FUNC): Change to generate ANSI C style
functions.
* sysdeps/stub/init-posix.c: Likewise.
* sysdeps/stub/profil.c: Likewise.
* munch-tmpl.c (__libc_init): Convert to ANSI C style declaration to
reduce gcc warning noise.
* stdio/glue.c (_filbuf, _flsbuf): Likewise.
* stdio/obstream.c (grow, seek, input, init_obstream): Likewise.
* stdio/vasprintf.c (enlarge_buffer): Likewise.
* sysdeps/generic/sysd-stdio.c (__stdio_read, __stdio_write,
__stdio_seek, __stdio_close, __stdio_fileno, __stdio_open,
__stdio_reopen): Likewise.
* sysdeps/posix/defs.c (_cleanup): Likewise.
* time/offtime.c (__offtime): Add cast.
* posix/getopt.c: Don't use text_set_element if not defined.
* configure.in: Provide a check for underscores before user labels
that works even when the compiler used for building doesn't work
(like when there is no C library). Use the old way if the compiler
works.
1997-09-10 05:08 David S. Miller <davem@caip.rutgers.edu>
* sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: The TC* ioctls use
'T' not 't' on SparcLinux.
* sysdeps/unix/sysv/linux/sparc/bits/termios.h: tcflag_t is 32 bits.
* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add aliases for
_longjmp and siglongjmp.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libio/stdio.h: Add format attributes to the extra printf and
scanf like functions.
* stdio/stdio.h: Likewise.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
Print tablename_val, not tablename_len.
* nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r):
Use sprintf instead of sprintf, the string always fits.
* nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r):
Likewise.
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
Likewise.
* nis/nss_nisplus/nisplus-proto.c
(_nss_nisplus_getprotobynumber_r): Likewise.
* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbynumber_r):
Likewise.
* nis/nss_nisplus/nisplus-service.c
(_nss_nisplus_getservbynumber_r): Likewise.
* nis/nss_nisplus/nisplus-alias.c (_nss_create_tablename): Use
__stpcpy, __stpncpy and __strdup instead of public names.
* nis/nss_nisplus/nisplus-ethers.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-grp.c (_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-hosts.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_parse_netgroup):
Likewise.
* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-pwd.c (_nss_create_tablename):
Likewise.
* nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent):
Likewise.
(_nss_create_tablename): Likewise.
* nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename):
Likewise.
* libc.map: Export __stpcpy and __strdup.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* math/Makefile (CFLAGS-test-float.c, CFLAGS-test-double.c,
CFLAGS-test-ldouble.c): Pass -ffloat-store to avoid excessive
precision.
1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* include/rpc/auth_des.h: New file.
1997-09-09 Paul Eggert <eggert@twinsun.com>
* time/mktime.c (__mktime_internal): Declare sec_requested even if
!LEAP_SECONDS_POSSIBLE, since it's needed at the end when checking
for time_t overflow.
1997-09-09 22:11 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/getcwd.c: Correct test for too small buffer.
Reported by Erik Troan <ewt@redhat.com>.
* elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>.
* elf/dl-open.c: Likewise.
1997-09-07 17:09 Richard Henderson <rth@cygnus.com>
* sysdeps/alpha/Makefile: Kill setjmp_aux.
* sysdeps/alpha/bits/setjmp.h: Rewrite in terms of an array.
* sysdeps/alpha/__longjmp.c: Remove.
* sysdeps/alpha/setjmp_aux.c: Remove.
* sysdeps/alpha/__longjmp.S: New file.
* sysdeps/alpha/bsd-_setjmp.S: Stub out.
* sysdeps/alpha/bsd-setjmp.S: Likewise.
* sysdeps/alpha/setjmp.S: Do the work; don't call __setjmp_aux.
Move _setjmp and setjmp from bsd-*.S.
1997-09-06 20:20 Ulrich Drepper <drepper@cygnus.com>
* include/rpc/auth.h: New file.
* include/rpc/auth_unix.h: New file.
1997-09-06 Paul Eggert <eggert@twinsun.com>
Fix gmtime so that it reports leap seconds when TZ
indicates that leap seconds are desired.
* time/gmtime.c (<stddef.h>): Remove unnecessary include.
(gmtime): Put after gmtime_r, to help the compiler inline.
(__tz_convert): New decl.
(gmtime_r): Use __tz_convert instead of __offtime,
so that leap seconds are handled correctly.
* time/localtime.c (<errno.h>, <libc-lock.h>): Remove includes that
are now unnecessary.
(__tzset_internal, __tz_compute, __tzfile_compute, __use_tzfile,
__tzset_lock): Remove extern decls that are now unnecessary.
(localtime_internal): Moved to __tz_convert in tzset.c.
so that localtime and gmtime can both use it easily.
(localtime): Put after localtime_r, to help the compiler inline.
(localtime_r): Use __tz_convert instead of localtime_internal.
* time/strftime.c (__tz_compute): Remove unused (and now incorrect)
decl.
* time/tzfile.c (__tzfile_compute): New arg USE_LOCALTIME.
* time/tzset.c (<errno.h>): Include.
(_tmbuf): New decl.
(__tzfile_compute): New function.
(tz_compute): Renamed from __tz_compute. No longer extern.
Remove redundant call to tzset_internal.
(tzset_internal): Renamed from __tzset_internal. No longer extern.
(tzset_lock): Renamed from __tzset_lock. No longer extern.
(__tz_convert): New function, containing functionality of old
localtime_internal function, plus locking and optional UTC.
1997-09-06 Paul Eggert <eggert@twinsun.com>
* time/tzfile.c (__tzfile_read): Don't read a file if TZ is the empty
string, just use UTC without leap seconds. This is for compatibility
with the Olson code.
1997-09-06 Paul Eggert <eggert@twinsun.com>
* time/tzset.c (__tzname_max): Lock tz data structures before
invoking tzset_internal.
* time/tzfile.c: Define compute_tzname_max statically.
1997-09-07 10:57 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/nis_call.c: Remove not longer necessary HAVE_SECURE_RPC ifdefs.
* nis/nis_intern.h: Likewise.
* nis/nss_nis/nis-publickey.c: Likewise.
* nis/nss_nisplus/nisplus-publickey.c: Likewise.
* nis/ypclnt.c: Likewise.
* sunrpc/auth_des.c: Don't dereference NULL pointer,
initialize ad->ad_timediff.
* sunrpc/auth_none.c: Don't define our own prototypes, use the one
from the header files.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/rpc_cmsg.c: Likewise.
* sunrpc/key_call.c: Fix signal handling.
* sunrpc/openchild.c: Don't use /bin/sh to start /usr/etc/keyenvoy,
or we will get a deadlock with NIS+.
* sunrpc/rpc/auth.h: Add prototype for xdr_opaque_auth, don't define
HAVE_SECURE_RPC.
1997-09-07 15:51 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/bits/select.h [__GNUC__] (__FD_ZERO, __FD_SET, __FD_CLR,
__FD_ISSET): Use correct casts to address array correctly.
Reported by urbanw@cs.umu.se.
1997-09-07 05:07 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>.
* elf/dl-open.c: Likewise.
* sysdeps/i386/memset.c: Undefine memset in case the header with the
optimized functions is included.
Patches by NIIBE Yutaka <gniibe@mri.co.jp>.
* sysdeps/i386/bits/string.h [__PIC__] (strcspn, strspn, strpbrk,
strsep): Use register for second parameter.
* sysdeps/i386/i486/bits/string.h: Likewise.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
1997-09-03 09:48 Geoff Keating <geoffk@ozemail.com.au>
* math/libm-test.c: Change various tolerances to match what the
tested routines can actually provide.
* math/Makefile: Add new tests.
* math/atest-sincos.c: New file.
* math/atest-exp.c: New file.
* csu/Makefile: Give initfini.s and initfiniS.s their own
CFLAGS-* macros so they can be overridden.
* sysdeps/powerpc/Makefile [subdir=csu]: Override flags for
initfiniS.s to use -fpic instead of -fPIC, because the sed script
breaks otherwise.
* sysdeps/powerpc/Makefile [build-shared]: Use -fpic not -fPIC for
efficiency.
* sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE):
Don't use register 0, to let _mcount be in a shared object.
* sysdeps/powerpc/dl-machine.h: Use full sentences in comments.
Generally clean up. Suppress some code we don't need when relocating
ld.so.
* sysdeps/powerpc/test-arith.c: Change loop indices to size_t when
appropriate to suppress gcc warning.
* resolv/res_send.c: Suppress warning.
* sunrpc/xdr_sizeof.c: Suppress warning.
* FAQ: Add ppc-linux.
* manual/maint.texi: Add ppc-linux. Explain that gcc can't build it
yet.
* sysdeps/unix/sysv/linux/powerpc/profil-counter.h: Correct for
current kernels.
1997-08-15 07:45 Geoff Keating <geoffk@ozemail.com.au>
* stdlib/fmtmsg.c: Use two parameters for __libc_once_define.
* sysdeps/i386/machine-gmon.h: Correct typo.
* sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Change to match
kernel.
* sysdeps/generic/dl-sysdep.c: Add hook for bizzare PPC argument hack.
* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Rewrite to use
sysdeps/linux/dl-sysdep.c.
* sysdeps/powerpc/Makefile [subdir=gmon]: Compile ppc-mcount.
* sysdeps/powerpc/machine-gmon.h: Use ppc-mcount.
* sysdeps/powerpc/ppc-mcount: New file.
The following are mostly changes to allow profiling:
* sysdeps/powerpc/add_n.S: Added.
* sysdeps/powerpc/add_n.s: Removed.
* sysdeps/powerpc/addmul_1.S: Added.
* sysdeps/powerpc/addmul_1.s: Removed.
* sysdeps/powerpc/bsd-_setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/bsd-setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/lshift.S: Added.
* sysdeps/powerpc/lshift.s: Removed.
* sysdeps/powerpc/memset.S: Added.
* sysdeps/powerpc/memset.s: Removed.
* sysdeps/powerpc/mul_1.S: Added.
* sysdeps/powerpc/mul_1.s: Removed.
* sysdeps/powerpc/rshift.S: Added.
* sysdeps/powerpc/rshift.s: Removed.
* sysdeps/powerpc/s_copysign.S: Use ENTRY, END, weak_alias macros.
* sysdeps/powerpc/s_fabs.S: Use ENTRY, END, weak_alias macros.
* sysdeps/powerpc/setjmp.S: Use JUMPTARGET macro.
* sysdeps/powerpc/strchr.S: Added.
* sysdeps/powerpc/strchr.s: Removed.
* sysdeps/powerpc/strcmp.S: Added.
* sysdeps/powerpc/strcmp.s: Removed.
* sysdeps/powerpc/strlen.S: Added.
* sysdeps/powerpc/strlen.s: Removed.
* sysdeps/powerpc/sub_n.S: Added.
* sysdeps/powerpc/sub_n.s: Removed.
* sysdeps/powerpc/submul_1.S: Added.
* sysdeps/powerpc/submul_1.s: Removed.
* sysdeps/unix/sysv/linux/powerpc/_exit.S: Removed.
* sysdeps/unix/sysv/linux/powerpc/brk.S: Added.
* sysdeps/unix/sysv/linux/powerpc/brk.c: Removed.
* sysdeps/unix/sysv/linux/powerpc/clone.S: Use new macros. Fix
various bugs. Document that it isn't tested.
* sysdeps/unix/sysv/linux/powerpc/sigreturn.S: Make look like
sysdeps/unix/_exit.S.
* sysdeps/unix/sysv/linux/powerpc/socket.S: Use new macros.
* sysdeps/unix/sysv/linux/powerpc/syscall.S: Use new macros.
* sysdeps/unix/sysv/linux/powerpc/sysdep.h: Define some new macros
to make assembler (possibly) more portable, allow profiling, etc.
1997-09-11 12:09:10 +00:00
|
|
|
"rep; stosb"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&D" (__d0), "=&c" (__d1)
|
|
|
|
: "a" (__c), "0" (__s), "1" (__n)
|
|
|
|
: "memory");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __s;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Search N bytes of S for C. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_memchr 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE void *
|
|
|
|
memchr (__const void *__s, int __c, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0;
|
1997-08-27 20:26:10 +00:00
|
|
|
register void *__res;
|
1998-03-27 22:57:26 +00:00
|
|
|
if (__n == 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return NULL;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
1998-03-27 22:57:26 +00:00
|
|
|
"repne; scasb\n\t"
|
|
|
|
"je 1f\n\t"
|
|
|
|
"movl $1,%0\n"
|
1997-08-27 20:26:10 +00:00
|
|
|
"1:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=D" (__res), "=&c" (__d0)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "a" (__c), "0" (__s), "1" (__n),
|
|
|
|
"m" ( *(struct { __extension__ char __x[__n]; } *)__s)
|
1999-10-04 06:16:19 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res - 1;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
1999-10-04 05:13:05 +00:00
|
|
|
#define _HAVE_STRING_ARCH_memrchr 1
|
|
|
|
#ifndef _FORCE_INLINES
|
|
|
|
__STRING_INLINE void *
|
|
|
|
__memrchr (__const void *__s, int __c, size_t __n)
|
|
|
|
{
|
|
|
|
register unsigned long int __d0;
|
|
|
|
register void *__res;
|
|
|
|
if (__n == 0)
|
|
|
|
return NULL;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("std\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"je 1f\n\t"
|
1999-10-04 07:30:05 +00:00
|
|
|
"orl $-1,%0\n"
|
2003-09-05 10:03:19 +00:00
|
|
|
"1:\tcld\n\t"
|
|
|
|
"incl %0"
|
1999-10-04 05:13:05 +00:00
|
|
|
: "=D" (__res), "=&c" (__d0)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "a" (__c), "0" (__s + __n - 1), "1" (__n),
|
|
|
|
"m" ( *(struct { __extension__ char __x[__n]; } *)__s)
|
1999-10-04 06:16:19 +00:00
|
|
|
: "cc");
|
2003-09-05 10:03:19 +00:00
|
|
|
return __res;
|
1999-10-04 05:13:05 +00:00
|
|
|
}
|
1999-10-04 07:30:05 +00:00
|
|
|
# ifdef __USE_GNU
|
|
|
|
# define memrchr(s, c, n) __memrchr (s, c, n)
|
|
|
|
# endif
|
1999-10-04 05:13:05 +00:00
|
|
|
#endif
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
/* Return the length of S. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strlen 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE size_t
|
|
|
|
strlen (__const char *__str)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0;
|
1997-08-27 20:26:10 +00:00
|
|
|
register size_t __res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %0"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=c" (__res), "=&D" (__d0)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "1" (__str), "a" (0), "0" (0xffffffff),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__str)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res - 1;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Copy SRC to DEST. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strcpy 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strcpy (char *__dest, __const char *__src)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1;
|
1997-08-27 20:26:10 +00:00
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"stosb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__d0), "=&D" (__d1)
|
|
|
|
: "0" (__src), "1" (__dest)
|
|
|
|
: "ax", "memory", "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Copy no more than N characters of SRC to DEST. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strncpy 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strncpy (char *__dest, __const char *__src, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2;
|
1997-08-27 20:26:10 +00:00
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"decl %2\n\t"
|
|
|
|
"js 2f\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"stosb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"rep; stosb\n"
|
|
|
|
"2:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
|
|
|
|
: "0" (__src), "1" (__dest), "2" (__n)
|
|
|
|
: "ax", "memory", "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Append SRC onto DEST. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strcat 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strcat (char *__dest, __const char *__src)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2, __d3;
|
1997-08-27 20:26:10 +00:00
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"decl %1\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"stosb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__d0), "=&D" (__d1), "=&c" (__d2), "=&a" (__d3)
|
|
|
|
: "0" (__src), "1" (__dest), "2" (0xffffffff), "3" (0)
|
|
|
|
: "memory", "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Append no more than N characters from SRC onto DEST. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strncat 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strncat (char *__dest, __const char *__src, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2, __d3;
|
1997-08-27 20:26:10 +00:00
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"decl %1\n\t"
|
1999-01-13 00:14:51 +00:00
|
|
|
"movl %4,%2\n"
|
1997-08-27 20:26:10 +00:00
|
|
|
"1:\n\t"
|
1999-01-13 00:14:51 +00:00
|
|
|
"decl %2\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"js 2f\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"stosb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
1999-01-13 00:14:51 +00:00
|
|
|
"jne 1b\n\t"
|
|
|
|
"jmp 3f\n"
|
1997-08-27 20:26:10 +00:00
|
|
|
"2:\n\t"
|
1999-01-13 00:14:51 +00:00
|
|
|
"xorl %3,%3\n\t"
|
|
|
|
"stosb\n"
|
|
|
|
"3:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__d0), "=&D" (__d1), "=&c" (__d2), "=&a" (__d3)
|
|
|
|
: "g" (__n), "0" (__src), "1" (__dest), "2" (0xffffffff), "3" (0)
|
|
|
|
: "memory", "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __dest;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Compare S1 and S2. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strcmp 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE int
|
|
|
|
strcmp (__const char *__s1, __const char *__s2)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1;
|
1997-08-27 20:26:10 +00:00
|
|
|
register int __res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"scasb\n\t"
|
|
|
|
"jne 2f\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"xorl %%eax,%%eax\n\t"
|
|
|
|
"jmp 3f\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"sbbl %%eax,%%eax\n\t"
|
2000-06-30 08:51:50 +00:00
|
|
|
"orb $1,%%al\n"
|
1997-08-27 20:26:10 +00:00
|
|
|
"3:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=a" (__res), "=&S" (__d0), "=&D" (__d1)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "1" (__s1), "2" (__s2),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s1),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s2)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Compare N characters of S1 and S2. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strncmp 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE int
|
|
|
|
strncmp (__const char *__s1, __const char *__s2, size_t __n)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2;
|
1997-08-27 20:26:10 +00:00
|
|
|
register int __res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"decl %3\n\t"
|
|
|
|
"js 2f\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"scasb\n\t"
|
|
|
|
"jne 3f\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"xorl %%eax,%%eax\n\t"
|
|
|
|
"jmp 4f\n"
|
|
|
|
"3:\n\t"
|
|
|
|
"sbbl %%eax,%%eax\n\t"
|
|
|
|
"orb $1,%%al\n"
|
|
|
|
"4:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=a" (__res), "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "1" (__s1), "2" (__s2), "3" (__n),
|
|
|
|
"m" ( *(struct { __extension__ char __x[__n]; } *)__s1),
|
|
|
|
"m" ( *(struct { __extension__ char __x[__n]; } *)__s2)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
|
|
|
/* Find the first occurrence of C in S. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strchr 1
|
2000-11-08 21:20:06 +00:00
|
|
|
#define _USE_STRING_ARCH_strchr 1
|
1997-08-27 20:26:10 +00:00
|
|
|
#define strchr(s, c) \
|
|
|
|
(__extension__ (__builtin_constant_p (c) \
|
|
|
|
? __strchr_c (s, ((c) & 0xff) << 8) \
|
|
|
|
: __strchr_g (s, c)))
|
|
|
|
|
1998-11-30 14:21:53 +00:00
|
|
|
__STRING_INLINE char *__strchr_g (__const char *__s, int __c);
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
__strchr_g (__const char *__s, int __c)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"movb %%al,%%ah\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"cmpb %%ah,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"movl $1,%1\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"movl %1,%0"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=a" (__res), "=&S" (__d0)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "0" (__c), "1" (__s),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res - 1;
|
|
|
|
}
|
|
|
|
|
1998-11-30 14:21:53 +00:00
|
|
|
__STRING_INLINE char *__strchr_c (__const char *__s, int __c);
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
__strchr_c (__const char *__s, int __c)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"cmpb %%ah,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"movl $1,%1\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"movl %1,%0"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=a" (__res), "=&S" (__d0)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "0" (__c), "1" (__s),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Update.
1999-04-28 Ulrich Drepper <drepper@cygnus.com>
* argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0.
* argp/argp-parse.c (_argp_hang): Likewise.
* argp/argp-pv.c (argp_program_version): Likewise.
* argp/argp-pvh.c (argp_program_version_hook): Likewise.
* inet/ether_hton.c (ether_hton, startp): Likewise.
* inet/ether_ntoh.c (ether_ntoh, startp): Likewise.
* inet/getnetgrent_r.c (setup, startp): Likewise.
* intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise.
* intl/localealias.c (string_space, string_space_act, string_space_max,
nmap, maxmap): Likewise.
* libio/iopopen.c (proc_file_chain): Likewise.
* libio/oldiopopen.c (old_proc_file_chain): Likewise.
* locale/lc-collate.c (__collate_table, __collate_extra,
__collate_element_hash, __collate_element_strings,
__collate_element_values): Likewise.
* malloc/mcheck.c (mcheck_used): Likewise.
* malloc/mtrace.c (added_atexit_handler): Likewise.
* malloc/set-freeres.c (already_called): Likewise.
* misc/getpass.c (getpass) [buf, bufsize]: Likewise.
* misc/syslog.c (LogStat, LogTag): Likewise.
* nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise.
* nss/getXXbyYY_r.c (startp): Likewise.
* posix/getopt.c (optarg, __getopt_initialized): Likewise.
* posix/regex.c (init_syntax_once) [done]: Likewise.
(debug): Likewise.
* string/strfry.c (init): Likewise.
* sunrpc/svc_run.c (svc_top): Likewise.
* posix/euidaccess.c (have_ids): Likewise.
* sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise.
* sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise.
* time/getdate.c (getdate_err): Likewise.
* time/tzfile.c (transitions, type_idxs, types, zone_names, leaps):
Likewise.
* time/tzset.c (old_tz, is_initialized): Likewise.
* inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization
of static data with zero.
* signal/allocrtsig.c (init): Likewise.
* string/Makefile (routines): Add strchrnul.
* string/Versions [GLIBC_2.1.1]: Add strchrnul.
* string/string.c: Add strchrnul prototype.
* include/string.h: Add __strchrnul prototype.
* sysdeps/generic/strchrnul.c: New file.
* sysdeps/i386/strchrnul.S: New file.
* sysdeps/i386/bits/string.c: Add strchrnul optimization.
* sysdeps/i386/i486/bits/string.c: Likewise.
* argp/argp-help.c (argp_args_usage): Use __strchrnul.
* inet/ether_line.c (ether_line): Likewise.
* nscd/nscd_conf.c (nscd_parse_file): Likewise.
* nss/nsswitch.c (nss_parse_file): Likewise.
* posix/execvp.c (execvp): Likewise.
* posix/fnmatch.c (internal_fnmatch): Likewise.
* resolv/res_hconf.c (_res_hconv_init): Likewise.
* resolv/res_init.c (res_init): Likewise.
* stdlib/fmtmsg.c (init): Likewise.
* stdlib/getsubopt.c (getsubopt): Likewise.
* catgets/catgets.c (catopen): Only allocate one memory block.
(catclose): Only one free call necessary.
* catgets/open_catalog.c (__open_catalog): Simplify handling of
file descriptor.
* ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead
of real functions. Simplify _tolower and _toupper.
* grp/initgroups.c (compat_call): Remove unnecessary use of pointer
variable.
* iconv/gconv.h (struct gconv_info): Change data element from pointer
to array of size 0.
* iconv/gconv_open.c (__gconv_open): Allocate structures accordingly.
* iconv/gconv_close.c (__gconv_close): Don't free data.
* iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to
insert new alias.
* iconv/gconv_db.c (add_derivation): More efficient copying. Check
for error while inserting in tree.
* include/time.h: Pretty print.
* inet/ruserpass.c: Rewrite use of toktab to avoid string pointers
in table and lots of relocations.
* posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid
string pointers in table and lots of relocations.
* intl/finddomain.c: Remove definition of strchr macro.
* io/ftw.c (nftw_arr, ftw_arr): Make const.
* locale/loadlocale.c (_nl_load_locale): Optimize string copying.
* locale/localeinfo.h (_nl_category_names): Change into an array with
fixed width char string elements.
* locale/setlocale.c (_nl_category_names): Likewise.
(_nl_current): Make global.
* locale/nl_langinfo.c (nldata): Removed. Use _nl_current now.
* malloc/Makefile (distribute): Add stackinfo.h.
* sysdeps/generic/stackinfo.h: New file.
* sysdeps/i386/stackinfo.h: New file.
* posix/execl.c: Use stackinfo.h in optimizing alloca use.
* posix/execle.c: Likewise.
* posix/execlp.c: Likewise.
* nis/nis_table.c (__create_ib_request): Always use realloc.
* posix/execvp.c (execute): Rename to script_execute and keep only
code to execute using shell.
(execvp): Call execv directly and only fall back on script_execute.
* resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define
and always use xdigits instead.
* resolv/res_init.c (res_init): Use rawmemchr instead of strchr
where appropriate.
* stdlib/fpioconst.h (__tens): New declaration.
(struct mp_power): Remove array, add arrayoff element.
* stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one
__tens array and add in _fpioconst_pow10 offsets into __tens.
* stdio-common/printf_fp.c: Rewrite to use new __tens array.
* stdlib/strtod.c: Likewise.
* stdlib/a64l.c (a64l_table): Avoid unnecessary elements.
* stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end
of the list.
* stdlib/atexit.c (__exit_funcs): Don't initialize.
* stdlib/fmtmsg.c (keywords): Make name element fixed width array.
* sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use
a single and an array with offsets.
* sunrpc/des_soft.c (partab): Make it const.
* sunrpc/key_call.c (trytimeout, tottimeout): Make const.
(__key_encryptsession_pk_LOCAL): Don't initialize with 0.
(__key_decryptsession_pk_LOCAL): Likewise.
(__key_gendes_LOCAL): Likewise.
(MESSENGER): Mark const.
(key_call_private_main): Don't initialize with 0.
(use_keyenvoy): Don't initialize with 0.
(key_call): Rewrite to reverse logic of use_doors variable.
* sunrpc/netname.c (OPSYS): Define as array, not pointer.
(startp): Don't initialize with zero.
* sunrpc/openchild.c (_openchild): Make first argument const.
* sunrpc/pmap_rmt.c (timeout): Mark const.
* sunrpc/xcrypt.c (hex): Likewise.
* sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting
initialization of global variables.
* sysdeps/unix/sysv/linux/getpt.c: Likewise.
* sysdeps/unix/sysv/linux/if_index.c: Likewise.
* termios/tcgetsid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change
fxsr to osfxsr.
* time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory
block. Add function to free memory if wanted.
* time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read.
* wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers.
* wcsmbs/wmemset.c: Little code optimization.
1999-04-28 23:13:52 +00:00
|
|
|
/* Find the first occurrence of C in S or the final NUL byte. */
|
|
|
|
#define _HAVE_STRING_ARCH_strchrnul 1
|
|
|
|
#define __strchrnul(s, c) \
|
|
|
|
(__extension__ (__builtin_constant_p (c) \
|
|
|
|
? ((c) == '\0' \
|
|
|
|
? (char *) __rawmemchr (s, c) \
|
|
|
|
: __strchrnul_c (s, ((c) & 0xff) << 8)) \
|
|
|
|
: __strchrnul_g (s, c)))
|
|
|
|
|
|
|
|
__STRING_INLINE char *__strchrnul_g (__const char *__s, int __c);
|
|
|
|
|
|
|
|
__STRING_INLINE char *
|
|
|
|
__strchrnul_g (__const char *__s, int __c)
|
|
|
|
{
|
|
|
|
register unsigned long int __d0;
|
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"movb %%al,%%ah\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"cmpb %%ah,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"2:\n\t"
|
|
|
|
"movl %1,%0"
|
|
|
|
: "=a" (__res), "=&S" (__d0)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "0" (__c), "1" (__s),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
Update.
1999-04-28 Ulrich Drepper <drepper@cygnus.com>
* argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0.
* argp/argp-parse.c (_argp_hang): Likewise.
* argp/argp-pv.c (argp_program_version): Likewise.
* argp/argp-pvh.c (argp_program_version_hook): Likewise.
* inet/ether_hton.c (ether_hton, startp): Likewise.
* inet/ether_ntoh.c (ether_ntoh, startp): Likewise.
* inet/getnetgrent_r.c (setup, startp): Likewise.
* intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise.
* intl/localealias.c (string_space, string_space_act, string_space_max,
nmap, maxmap): Likewise.
* libio/iopopen.c (proc_file_chain): Likewise.
* libio/oldiopopen.c (old_proc_file_chain): Likewise.
* locale/lc-collate.c (__collate_table, __collate_extra,
__collate_element_hash, __collate_element_strings,
__collate_element_values): Likewise.
* malloc/mcheck.c (mcheck_used): Likewise.
* malloc/mtrace.c (added_atexit_handler): Likewise.
* malloc/set-freeres.c (already_called): Likewise.
* misc/getpass.c (getpass) [buf, bufsize]: Likewise.
* misc/syslog.c (LogStat, LogTag): Likewise.
* nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise.
* nss/getXXbyYY_r.c (startp): Likewise.
* posix/getopt.c (optarg, __getopt_initialized): Likewise.
* posix/regex.c (init_syntax_once) [done]: Likewise.
(debug): Likewise.
* string/strfry.c (init): Likewise.
* sunrpc/svc_run.c (svc_top): Likewise.
* posix/euidaccess.c (have_ids): Likewise.
* sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise.
* sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise.
* time/getdate.c (getdate_err): Likewise.
* time/tzfile.c (transitions, type_idxs, types, zone_names, leaps):
Likewise.
* time/tzset.c (old_tz, is_initialized): Likewise.
* inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization
of static data with zero.
* signal/allocrtsig.c (init): Likewise.
* string/Makefile (routines): Add strchrnul.
* string/Versions [GLIBC_2.1.1]: Add strchrnul.
* string/string.c: Add strchrnul prototype.
* include/string.h: Add __strchrnul prototype.
* sysdeps/generic/strchrnul.c: New file.
* sysdeps/i386/strchrnul.S: New file.
* sysdeps/i386/bits/string.c: Add strchrnul optimization.
* sysdeps/i386/i486/bits/string.c: Likewise.
* argp/argp-help.c (argp_args_usage): Use __strchrnul.
* inet/ether_line.c (ether_line): Likewise.
* nscd/nscd_conf.c (nscd_parse_file): Likewise.
* nss/nsswitch.c (nss_parse_file): Likewise.
* posix/execvp.c (execvp): Likewise.
* posix/fnmatch.c (internal_fnmatch): Likewise.
* resolv/res_hconf.c (_res_hconv_init): Likewise.
* resolv/res_init.c (res_init): Likewise.
* stdlib/fmtmsg.c (init): Likewise.
* stdlib/getsubopt.c (getsubopt): Likewise.
* catgets/catgets.c (catopen): Only allocate one memory block.
(catclose): Only one free call necessary.
* catgets/open_catalog.c (__open_catalog): Simplify handling of
file descriptor.
* ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead
of real functions. Simplify _tolower and _toupper.
* grp/initgroups.c (compat_call): Remove unnecessary use of pointer
variable.
* iconv/gconv.h (struct gconv_info): Change data element from pointer
to array of size 0.
* iconv/gconv_open.c (__gconv_open): Allocate structures accordingly.
* iconv/gconv_close.c (__gconv_close): Don't free data.
* iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to
insert new alias.
* iconv/gconv_db.c (add_derivation): More efficient copying. Check
for error while inserting in tree.
* include/time.h: Pretty print.
* inet/ruserpass.c: Rewrite use of toktab to avoid string pointers
in table and lots of relocations.
* posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid
string pointers in table and lots of relocations.
* intl/finddomain.c: Remove definition of strchr macro.
* io/ftw.c (nftw_arr, ftw_arr): Make const.
* locale/loadlocale.c (_nl_load_locale): Optimize string copying.
* locale/localeinfo.h (_nl_category_names): Change into an array with
fixed width char string elements.
* locale/setlocale.c (_nl_category_names): Likewise.
(_nl_current): Make global.
* locale/nl_langinfo.c (nldata): Removed. Use _nl_current now.
* malloc/Makefile (distribute): Add stackinfo.h.
* sysdeps/generic/stackinfo.h: New file.
* sysdeps/i386/stackinfo.h: New file.
* posix/execl.c: Use stackinfo.h in optimizing alloca use.
* posix/execle.c: Likewise.
* posix/execlp.c: Likewise.
* nis/nis_table.c (__create_ib_request): Always use realloc.
* posix/execvp.c (execute): Rename to script_execute and keep only
code to execute using shell.
(execvp): Call execv directly and only fall back on script_execute.
* resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define
and always use xdigits instead.
* resolv/res_init.c (res_init): Use rawmemchr instead of strchr
where appropriate.
* stdlib/fpioconst.h (__tens): New declaration.
(struct mp_power): Remove array, add arrayoff element.
* stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one
__tens array and add in _fpioconst_pow10 offsets into __tens.
* stdio-common/printf_fp.c: Rewrite to use new __tens array.
* stdlib/strtod.c: Likewise.
* stdlib/a64l.c (a64l_table): Avoid unnecessary elements.
* stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end
of the list.
* stdlib/atexit.c (__exit_funcs): Don't initialize.
* stdlib/fmtmsg.c (keywords): Make name element fixed width array.
* sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use
a single and an array with offsets.
* sunrpc/des_soft.c (partab): Make it const.
* sunrpc/key_call.c (trytimeout, tottimeout): Make const.
(__key_encryptsession_pk_LOCAL): Don't initialize with 0.
(__key_decryptsession_pk_LOCAL): Likewise.
(__key_gendes_LOCAL): Likewise.
(MESSENGER): Mark const.
(key_call_private_main): Don't initialize with 0.
(use_keyenvoy): Don't initialize with 0.
(key_call): Rewrite to reverse logic of use_doors variable.
* sunrpc/netname.c (OPSYS): Define as array, not pointer.
(startp): Don't initialize with zero.
* sunrpc/openchild.c (_openchild): Make first argument const.
* sunrpc/pmap_rmt.c (timeout): Mark const.
* sunrpc/xcrypt.c (hex): Likewise.
* sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting
initialization of global variables.
* sysdeps/unix/sysv/linux/getpt.c: Likewise.
* sysdeps/unix/sysv/linux/if_index.c: Likewise.
* termios/tcgetsid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change
fxsr to osfxsr.
* time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory
block. Add function to free memory if wanted.
* time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read.
* wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers.
* wcsmbs/wmemset.c: Little code optimization.
1999-04-28 23:13:52 +00:00
|
|
|
: "cc");
|
|
|
|
return __res - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
__STRING_INLINE char *__strchrnul_c (__const char *__s, int __c);
|
|
|
|
|
|
|
|
__STRING_INLINE char *
|
|
|
|
__strchrnul_c (__const char *__s, int __c)
|
|
|
|
{
|
|
|
|
register unsigned long int __d0;
|
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"cmpb %%ah,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"2:\n\t"
|
|
|
|
"movl %1,%0"
|
|
|
|
: "=a" (__res), "=&S" (__d0)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "0" (__c), "1" (__s),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
Update.
1999-04-28 Ulrich Drepper <drepper@cygnus.com>
* argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0.
* argp/argp-parse.c (_argp_hang): Likewise.
* argp/argp-pv.c (argp_program_version): Likewise.
* argp/argp-pvh.c (argp_program_version_hook): Likewise.
* inet/ether_hton.c (ether_hton, startp): Likewise.
* inet/ether_ntoh.c (ether_ntoh, startp): Likewise.
* inet/getnetgrent_r.c (setup, startp): Likewise.
* intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise.
* intl/localealias.c (string_space, string_space_act, string_space_max,
nmap, maxmap): Likewise.
* libio/iopopen.c (proc_file_chain): Likewise.
* libio/oldiopopen.c (old_proc_file_chain): Likewise.
* locale/lc-collate.c (__collate_table, __collate_extra,
__collate_element_hash, __collate_element_strings,
__collate_element_values): Likewise.
* malloc/mcheck.c (mcheck_used): Likewise.
* malloc/mtrace.c (added_atexit_handler): Likewise.
* malloc/set-freeres.c (already_called): Likewise.
* misc/getpass.c (getpass) [buf, bufsize]: Likewise.
* misc/syslog.c (LogStat, LogTag): Likewise.
* nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise.
* nss/getXXbyYY_r.c (startp): Likewise.
* posix/getopt.c (optarg, __getopt_initialized): Likewise.
* posix/regex.c (init_syntax_once) [done]: Likewise.
(debug): Likewise.
* string/strfry.c (init): Likewise.
* sunrpc/svc_run.c (svc_top): Likewise.
* posix/euidaccess.c (have_ids): Likewise.
* sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise.
* sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise.
* time/getdate.c (getdate_err): Likewise.
* time/tzfile.c (transitions, type_idxs, types, zone_names, leaps):
Likewise.
* time/tzset.c (old_tz, is_initialized): Likewise.
* inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization
of static data with zero.
* signal/allocrtsig.c (init): Likewise.
* string/Makefile (routines): Add strchrnul.
* string/Versions [GLIBC_2.1.1]: Add strchrnul.
* string/string.c: Add strchrnul prototype.
* include/string.h: Add __strchrnul prototype.
* sysdeps/generic/strchrnul.c: New file.
* sysdeps/i386/strchrnul.S: New file.
* sysdeps/i386/bits/string.c: Add strchrnul optimization.
* sysdeps/i386/i486/bits/string.c: Likewise.
* argp/argp-help.c (argp_args_usage): Use __strchrnul.
* inet/ether_line.c (ether_line): Likewise.
* nscd/nscd_conf.c (nscd_parse_file): Likewise.
* nss/nsswitch.c (nss_parse_file): Likewise.
* posix/execvp.c (execvp): Likewise.
* posix/fnmatch.c (internal_fnmatch): Likewise.
* resolv/res_hconf.c (_res_hconv_init): Likewise.
* resolv/res_init.c (res_init): Likewise.
* stdlib/fmtmsg.c (init): Likewise.
* stdlib/getsubopt.c (getsubopt): Likewise.
* catgets/catgets.c (catopen): Only allocate one memory block.
(catclose): Only one free call necessary.
* catgets/open_catalog.c (__open_catalog): Simplify handling of
file descriptor.
* ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead
of real functions. Simplify _tolower and _toupper.
* grp/initgroups.c (compat_call): Remove unnecessary use of pointer
variable.
* iconv/gconv.h (struct gconv_info): Change data element from pointer
to array of size 0.
* iconv/gconv_open.c (__gconv_open): Allocate structures accordingly.
* iconv/gconv_close.c (__gconv_close): Don't free data.
* iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to
insert new alias.
* iconv/gconv_db.c (add_derivation): More efficient copying. Check
for error while inserting in tree.
* include/time.h: Pretty print.
* inet/ruserpass.c: Rewrite use of toktab to avoid string pointers
in table and lots of relocations.
* posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid
string pointers in table and lots of relocations.
* intl/finddomain.c: Remove definition of strchr macro.
* io/ftw.c (nftw_arr, ftw_arr): Make const.
* locale/loadlocale.c (_nl_load_locale): Optimize string copying.
* locale/localeinfo.h (_nl_category_names): Change into an array with
fixed width char string elements.
* locale/setlocale.c (_nl_category_names): Likewise.
(_nl_current): Make global.
* locale/nl_langinfo.c (nldata): Removed. Use _nl_current now.
* malloc/Makefile (distribute): Add stackinfo.h.
* sysdeps/generic/stackinfo.h: New file.
* sysdeps/i386/stackinfo.h: New file.
* posix/execl.c: Use stackinfo.h in optimizing alloca use.
* posix/execle.c: Likewise.
* posix/execlp.c: Likewise.
* nis/nis_table.c (__create_ib_request): Always use realloc.
* posix/execvp.c (execute): Rename to script_execute and keep only
code to execute using shell.
(execvp): Call execv directly and only fall back on script_execute.
* resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define
and always use xdigits instead.
* resolv/res_init.c (res_init): Use rawmemchr instead of strchr
where appropriate.
* stdlib/fpioconst.h (__tens): New declaration.
(struct mp_power): Remove array, add arrayoff element.
* stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one
__tens array and add in _fpioconst_pow10 offsets into __tens.
* stdio-common/printf_fp.c: Rewrite to use new __tens array.
* stdlib/strtod.c: Likewise.
* stdlib/a64l.c (a64l_table): Avoid unnecessary elements.
* stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end
of the list.
* stdlib/atexit.c (__exit_funcs): Don't initialize.
* stdlib/fmtmsg.c (keywords): Make name element fixed width array.
* sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use
a single and an array with offsets.
* sunrpc/des_soft.c (partab): Make it const.
* sunrpc/key_call.c (trytimeout, tottimeout): Make const.
(__key_encryptsession_pk_LOCAL): Don't initialize with 0.
(__key_decryptsession_pk_LOCAL): Likewise.
(__key_gendes_LOCAL): Likewise.
(MESSENGER): Mark const.
(key_call_private_main): Don't initialize with 0.
(use_keyenvoy): Don't initialize with 0.
(key_call): Rewrite to reverse logic of use_doors variable.
* sunrpc/netname.c (OPSYS): Define as array, not pointer.
(startp): Don't initialize with zero.
* sunrpc/openchild.c (_openchild): Make first argument const.
* sunrpc/pmap_rmt.c (timeout): Mark const.
* sunrpc/xcrypt.c (hex): Likewise.
* sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting
initialization of global variables.
* sysdeps/unix/sysv/linux/getpt.c: Likewise.
* sysdeps/unix/sysv/linux/if_index.c: Likewise.
* termios/tcgetsid.c: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change
fxsr to osfxsr.
* time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory
block. Add function to free memory if wanted.
* time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read.
* wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers.
* wcsmbs/wmemset.c: Little code optimization.
1999-04-28 23:13:52 +00:00
|
|
|
: "cc");
|
|
|
|
return __res - 1;
|
|
|
|
}
|
|
|
|
#ifdef __USE_GNU
|
|
|
|
# define strchrnul(s, c) __strchrnul (s, c)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
1997-08-27 20:26:10 +00:00
|
|
|
/* Return the length of the initial segment of S which
|
|
|
|
consists entirely of characters not in REJECT. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strcspn 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
|
|
|
# ifdef __PIC__
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE size_t
|
|
|
|
strcspn (__const char *__s, __const char *__reject)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("pushl %%ebx\n\t"
|
|
|
|
"cld\n\t"
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t"
|
|
|
|
"movl %%ecx,%%ebx\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"movl %%ebx,%%ecx\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"jne 1b\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"popl %%ebx"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&D" (__d2)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "d" (__reject), "0" (__s), "1" (0), "2" (0xffffffff),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return (__res - 1) - __s;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# else
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE size_t
|
|
|
|
strcspn (__const char *__s, __const char *__reject)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2, __d3;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
1998-03-25 15:21:09 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t"
|
|
|
|
"movl %%ecx,%%edx\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
1998-03-25 15:21:09 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"movl %%edx,%%ecx\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"jne 1b\n"
|
|
|
|
"2:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&d" (__d2), "=&D" (__d3)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "g" (__reject), "0" (__s), "1" (0), "2" (0xffffffff),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return (__res - 1) - __s;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# endif
|
1997-08-27 20:26:10 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the length of the initial segment of S which
|
|
|
|
consists entirely of characters in ACCEPT. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strspn 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
|
|
|
# ifdef __PIC__
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE size_t
|
|
|
|
strspn (__const char *__s, __const char *__accept)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("pushl %%ebx\n\t"
|
|
|
|
"cld\n\t"
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t"
|
|
|
|
"movl %%ecx,%%ebx\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"movl %%ebx,%%ecx\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"je 1b\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"popl %%ebx"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&D" (__d2)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "r" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return (__res - 1) - __s;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# else
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE size_t
|
|
|
|
strspn (__const char *__s, __const char *__accept)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2, __d3;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
1998-03-25 15:21:09 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t"
|
|
|
|
"movl %%ecx,%%edx\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
1998-03-25 15:21:09 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"movl %%edx,%%ecx\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"je 1b\n"
|
|
|
|
"2:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&d" (__d2), "=&D" (__d3)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "g" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return (__res - 1) - __s;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# endif
|
1997-08-27 20:26:10 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* Find the first occurrence in S of any character in ACCEPT. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strpbrk 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
|
|
|
# ifdef __PIC__
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strpbrk (__const char *__s, __const char *__accept)
|
|
|
|
{
|
1998-03-25 15:21:09 +00:00
|
|
|
unsigned long int __d0, __d1, __d2;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("pushl %%ebx\n\t"
|
|
|
|
"cld\n\t"
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t"
|
|
|
|
"movl %%ecx,%%ebx\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"movl %%ebx,%%ecx\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"decl %0\n\t"
|
|
|
|
"jmp 3f\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"xorl %0,%0\n"
|
|
|
|
"3:\n\t"
|
|
|
|
"popl %%ebx"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&D" (__d2)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "r" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# else
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strpbrk (__const char *__s, __const char *__accept)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2, __d3;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t"
|
1999-01-13 00:14:51 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t"
|
|
|
|
"movl %%ecx,%%edx\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"lodsb\n\t"
|
|
|
|
"testb %%al,%%al\n\t"
|
|
|
|
"je 2f\n\t"
|
1999-01-13 00:14:51 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"movl %%edx,%%ecx\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"decl %0\n\t"
|
|
|
|
"jmp 3f\n"
|
|
|
|
"2:\n\t"
|
|
|
|
"xorl %0,%0\n"
|
|
|
|
"3:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&d" (__d2), "=&D" (__d3)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "g" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
|
|
|
|
"m" ( *(struct { char __x[0xfffffff]; } *)__s)
|
1998-03-25 15:21:09 +00:00
|
|
|
: "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# endif
|
1997-08-27 20:26:10 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* Find the first occurrence of NEEDLE in HAYSTACK. */
|
1998-01-21 17:04:36 +00:00
|
|
|
#define _HAVE_STRING_ARCH_strstr 1
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
|
|
|
# ifdef __PIC__
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strstr (__const char *__haystack, __const char *__needle)
|
|
|
|
{
|
1999-01-13 00:14:51 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("pushl %%ebx\n\t"
|
|
|
|
"cld\n\t" \
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t" /* NOTE! This also sets Z if searchstring='' */
|
|
|
|
"movl %%ecx,%%ebx\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"movl %4,%%edi\n\t"
|
|
|
|
"movl %%esi,%%eax\n\t"
|
|
|
|
"movl %%ebx,%%ecx\n\t"
|
|
|
|
"repe; cmpsb\n\t"
|
|
|
|
"je 2f\n\t" /* also works for empty string, see above */
|
|
|
|
"xchgl %%eax,%%esi\n\t"
|
|
|
|
"incl %%esi\n\t"
|
|
|
|
"cmpb $0,-1(%%eax)\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"xorl %%eax,%%eax\n\t"
|
|
|
|
"2:\n\t"
|
|
|
|
"popl %%ebx"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&a" (__res), "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
|
|
|
|
: "r" (__needle), "0" (0), "1" (0xffffffff), "2" (__haystack)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "memory", "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# else
|
1997-08-27 20:26:10 +00:00
|
|
|
__STRING_INLINE char *
|
|
|
|
strstr (__const char *__haystack, __const char *__needle)
|
|
|
|
{
|
1998-03-27 22:57:26 +00:00
|
|
|
register unsigned long int __d0, __d1, __d2, __d3;
|
1997-08-27 20:26:10 +00:00
|
|
|
register char *__res;
|
|
|
|
__asm__ __volatile__
|
|
|
|
("cld\n\t" \
|
1998-03-25 15:21:09 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"repne; scasb\n\t"
|
|
|
|
"notl %%ecx\n\t"
|
|
|
|
"decl %%ecx\n\t" /* NOTE! This also sets Z if searchstring='' */
|
|
|
|
"movl %%ecx,%%edx\n"
|
|
|
|
"1:\n\t"
|
1998-03-25 15:21:09 +00:00
|
|
|
"movl %5,%%edi\n\t"
|
1997-08-27 20:26:10 +00:00
|
|
|
"movl %%esi,%%eax\n\t"
|
|
|
|
"movl %%edx,%%ecx\n\t"
|
|
|
|
"repe; cmpsb\n\t"
|
|
|
|
"je 2f\n\t" /* also works for empty string, see above */
|
|
|
|
"xchgl %%eax,%%esi\n\t"
|
|
|
|
"incl %%esi\n\t"
|
|
|
|
"cmpb $0,-1(%%eax)\n\t"
|
|
|
|
"jne 1b\n\t"
|
|
|
|
"xorl %%eax,%%eax\n\t"
|
|
|
|
"2:"
|
1998-03-25 15:21:09 +00:00
|
|
|
: "=&a" (__res), "=&c" (__d0), "=&S" (__d1), "=&d" (__d2), "=&D" (__d3)
|
|
|
|
: "g" (__needle), "0" (0), "1" (0xffffffff), "2" (__haystack)
|
* sysdeps/i386/bits/string.h (memcpy): Add () around arguments.
(memchr, __memrchr, strlen, strcmp, strncmp, __strchr_g, __strchr_c,
__strchrnul_g, __strchrnul_c, strspn, strcspn, strpbrk): Add memory
the asm uses as its input, either of size __n where __n is known or
0xfffffff.
(strstr): Add "memory" clobber.
2004-06-15 20:12:01 +00:00
|
|
|
: "memory", "cc");
|
1997-08-27 20:26:10 +00:00
|
|
|
return __res;
|
|
|
|
}
|
1999-05-17 17:25:32 +00:00
|
|
|
# endif
|
1997-08-27 20:26:10 +00:00
|
|
|
#endif
|
|
|
|
|
1999-05-17 17:25:32 +00:00
|
|
|
#ifndef _FORCE_INLINES
|
|
|
|
# undef __STRING_INLINE
|
|
|
|
#endif
|
1997-08-27 20:26:10 +00:00
|
|
|
|
1997-09-16 00:42:43 +00:00
|
|
|
#endif /* use string inlines && GNU CC */
|