diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-09-16 00:42:43 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-09-16 00:42:43 +0000 |
commit | 61eb22d3a8e9bb9c339bdbe907a85656823f4c7e (patch) | |
tree | f0cc84f2036c52f081839b17a4608fb2277b2178 /sysdeps/i386 | |
parent | 4a9332b3765e77fecb06d7135e2fefa3d7d28806 (diff) | |
download | glibc-61eb22d3a8e9bb9c339bdbe907a85656823f4c7e.zip glibc-61eb22d3a8e9bb9c339bdbe907a85656823f4c7e.tar.gz glibc-61eb22d3a8e9bb9c339bdbe907a85656823f4c7e.tar.bz2 |
Update.cvs/libc-ud-970915
1997-09-16 02:14 Ulrich Drepper <drepper@cygnus.com>
Implementation of Hesiod NSS module by Mark Kettenis.
* hesiod/Makefile: New file.
* hesiod/hesiod.c: New file.
* hesiod/hesiod.h: New file.
* hesiod/hesiod_p.h: New file.
* hesiod/libnss_hesiod.map: New file.
* hesiod/nss_hesiod/hesiod-grp.c: New file.
* hesiod/nss_hesiod/hesiod-pwd.c: New file.
* hesiod/nss_hesiod/hesiod-service.c: New file.
* sysdeps/unix/inet/Subdirs: Add hesiod.
* shlib-versions: Add version number for libnss_hesiod.
* libio/iolibio.h: Remove definition of _IO_* macros.
* libio/fileops.c: Define close, fstat, lseek, read, and write as
macros to use __ protected versions. Use those functions instead
of _IO_* functions.
* libio/iopopen.c: Define _IO_close to close.
* manual/math.texi: Explain the use of the optimizing inline
functions.
Describe rand_r function and tell about SysV RNGs in introduction.
* resolv/res_send.c (res_send): Use socklen_t type for `fromlen'
variable.
* string/Makefile (tests): Add noinl-tester.
* string/noinl-tester.c: New file.
* string/tester.c: Add more stpcpy tests for constant arguments for
all short lengths.
* string/string.h: Always declare __bzero.
Describe __NO_STRING_INLINES.
Always include <bits/string.h>.
* string/bits/string2.h: Add warning about direct use.
Change __strcpy_small and __stpcpy_small implementation to use
macros and provide alternative for platforms which cannot do
unaligned stores.
* sysdeps/i386/bits/string.h: Don't define anything is
__NO_STRING_INLINES is defined.
* sysdeps/i386/i486/bits/string.h: Change __strcpy_small and
__stpcpy_small implementation to use macros and provide
alternative for platforms which cannot do unaligned stores.
* sysdeps/alpha/bzero.S: Define bzero as weak alias of __bzero.
* sysdeps/generic/bzero.c: Likewise.
* sysdeps/i386/bzero.c: Likewise.
* sysdeps/i386/i586/bzero.S: Likewise.
* sysdeps/vax/bzero.s: Likewise.
* sysdeps/generic/bits/select.h: Don't use ugly casts to access array.
* sysdeps/i386/bits/select.h: Likewise.
* sysdeps/i386/fpu/bits/mathinline.c (__finite): Relax register
constraints a bit.
Don't define and test for _BITS_MATHINLINE_H. Emit warning if used
directly and not through math.h.
* sysdeps/i386/i486/atomicity.h: Change return type of compare_and_swap
to char to get better code. Fix typo.
* sysdeps/stub/atomicity.h: Fix typo.
1997-09-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/stpcpy.c: #undef stpcpy and __stpcpy.
1997-09-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h: Add prototypes to avoid warning.
1997-09-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (strsep): Fix handling of empty REJECT.
(__strsep_1c): Handle NULL and empty string.
(__strsep_g): Likewise.
1997-09-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* catgets/Makefile (extra-objs): Set this instead of generated.
* md5-crypt/Makefile (extra-objs): Add all object file variants of
onlymd5-entry.
1997-09-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/sysd-stdio.c (__stdio_read): Fix typo in last
change.
1997-09-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/m68020/atomicity.h: New file.
1997-09-15 05:11 Ulrich Drepper <drepper@cygnus.com>
* posix/Makefile (distribute): Add globtest.c and globtest.sh.
Compile and run globtest if not cross-compiling.
* posix/globtest.c: New file.
* posix/globtest.sh: New file.
* posix/glob.c: Pretty print preprocessor stuff.
(glob_in_dir): If PATTERN is not really a pattern still check
whether it is a real file in the current directory and return
error if not.
Reported by Eugene Mamchits <eugin@ips.ras.ru>.
* libio/fileops.c (_IO_file_sync): Acquire lock before doing the work.
* libio/ioseekoff.c (_IO_seekoff): Likewise.
* libio/ioseekpos.c (_IO_seekpos): Likewise.
1997-09-13 18:06 Ulrich Drepper <drepper@cygnus.com>
* configure.in: Prevent configuration for unsupported platforms.
1997-09-13 04:07 Ulrich Drepper <drepper@cygnus.com>
* elf/rtld.c (dl_main): Make sure we always have a file argument by
testing for < 2 arguments after recognizing the options.
1997-09-12 11:47 Fila Kolodny <fila@ibi.com>
* string/bits/string2.h (__strsep_1c): Cast out const from __retval.
(__strsep_g): Likewise.
Diffstat (limited to 'sysdeps/i386')
-rw-r--r-- | sysdeps/i386/bits/select.h | 3 | ||||
-rw-r--r-- | sysdeps/i386/bits/string.h | 14 | ||||
-rw-r--r-- | sysdeps/i386/bzero.c | 3 | ||||
-rw-r--r-- | sysdeps/i386/fpu/bits/mathinline.h | 9 | ||||
-rw-r--r-- | sysdeps/i386/i486/atomicity.h | 4 | ||||
-rw-r--r-- | sysdeps/i386/i486/bits/string.h | 160 | ||||
-rw-r--r-- | sysdeps/i386/i586/bzero.S | 3 |
7 files changed, 140 insertions, 56 deletions
diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h index edcb562..34d2b0b 100644 --- a/sysdeps/i386/bits/select.h +++ b/sysdeps/i386/bits/select.h @@ -58,8 +58,9 @@ # define __FD_ZERO(set) \ do { \ unsigned int __i; \ + __fd_mask *__arr = (set); \ for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ - ((__fd_mask *) set)[__i] = 0; \ + __arr->fds_bits[__i] = 0; \ } while (0) # define __FD_SET(d, set) ((set)->fds_bits[__FDELT (d)] |= __FDMASK (d)) # define __FD_CLR(d, set) ((set)->fds_bits[__FDELT (d)] &= ~__FDMASK (d)) diff --git a/sysdeps/i386/bits/string.h b/sysdeps/i386/bits/string.h index 2931684..c6deb2b 100644 --- a/sysdeps/i386/bits/string.h +++ b/sysdeps/i386/bits/string.h @@ -18,11 +18,17 @@ Boston, MA 02111-1307, USA. */ #ifndef _STRING_H -#error "Never use <bits/string.h> directly; include <string.h> instead." +# error "Never use <bits/string.h> directly; include <string.h> instead." #endif -/* We only provide optimizations for the GNU CC. */ -#if defined __GNUC__ && __GNUC__ >= 2 +/* 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 \ + && defined __GNUC__ && __GNUC__ >= 2 #ifdef __cplusplus # define __STRING_INLINE inline @@ -741,4 +747,4 @@ strstr (__const char *__haystack, __const char *__needle) #undef __STRING_INLINE -#endif /* GNU CC */ +#endif /* use string inlines && GNU CC */ diff --git a/sysdeps/i386/bzero.c b/sysdeps/i386/bzero.c index 5cc5989..99f2352 100644 --- a/sysdeps/i386/bzero.c +++ b/sysdeps/i386/bzero.c @@ -26,7 +26,7 @@ #ifdef __GNUC__ void -bzero (dstpp, len) +__bzero (dstpp, len) void *dstpp; size_t len; { @@ -75,6 +75,7 @@ bzero (dstpp, len) "0" (dstp), "c" (len), "a" (x) : "cx"); } +weak_alias (__bzero, bzero) #else #include <sysdeps/generic/bzero.c> diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h index 55e9171..edb6ee0 100644 --- a/sysdeps/i386/fpu/bits/mathinline.h +++ b/sysdeps/i386/fpu/bits/mathinline.h @@ -18,8 +18,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _BITS_MATHINLINE_H -#define _BITS_MATHINLINE_H 1 +#ifndef _MATH_H +# error "Never use <bits/mathinline.h> directly; include <math.h> instead." +#endif #if defined __USE_ISOC9X && defined __GNUC__ && __GNUC__ >= 2 @@ -518,7 +519,7 @@ __finite (double __x) ("orl $0x800fffff, %0\n\t" "incl %0\n\t" "shrl $31, %0" - : "=q" (__result) : "0" (((int *) &__x)[1]) : "cc"); + : "=r" (__result) : "0" (((int *) &__x)[1]) : "cc"); return __result; } @@ -542,5 +543,3 @@ __inline_mathcode (__acosh1p, __x, \ #endif /* Not gcc <= 2.7. */ #endif /* __NO_MATH_INLINES */ #endif /* __GNUC__ */ - -#endif /* _BITS_MATHINLINE_H */ diff --git a/sysdeps/i386/i486/atomicity.h b/sysdeps/i386/i486/atomicity.h index 98a2531..7157bc3 100644 --- a/sysdeps/i386/i486/atomicity.h +++ b/sysdeps/i386/i486/atomicity.h @@ -1,4 +1,4 @@ -/* Low-level functions for atomitc operations. ix86 version, x >= 4. +/* Low-level functions for atomic operations. ix86 version, x >= 4. Copyright (C) 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -41,7 +41,7 @@ atomic_add (volatile uint32_t *mem, int val) : : "ir" (val), "m" (*mem) : "memory"); } -static inline int +static inline char __attribute__ ((unused)) compare_and_swap (volatile long int *p, long int oldval, long int newval) { diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h index 770f5c1..5e4abbc 100644 --- a/sysdeps/i386/i486/bits/string.h +++ b/sysdeps/i386/i486/bits/string.h @@ -18,11 +18,17 @@ Boston, MA 02111-1307, USA. */ #ifndef _STRING_H -#error "Never use <bits/string.h> directly; include <string.h> instead." +# error "Never use <bits/string.h> directly; include <string.h> instead." #endif -/* We only provide optimizations for the GNU CC. */ -#if defined __GNUC__ && __GNUC__ >= 2 +/* 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 \ + && defined __GNUC__ && __GNUC__ >= 2 #ifdef __cplusplus # define __STRING_INLINE inline @@ -30,6 +36,13 @@ # define __STRING_INLINE extern __inline #endif +/* The macros are used in some of the optimized implementations below. */ +#define __STRING_SMALL_GET16(src, idx) \ + (((src)[idx + 1] << 8) | (src)[idx]) +#define __STRING_SMALL_GET32(src, idx) \ + ((((src)[idx + 3] << 8 | (src)[idx + 2]) << 8 \ + | (src)[idx + 1]) << 8 | (src)[idx]) + /* Copy N bytes of SRC to DEST. */ #define _HAVE_STRING_ARCH_memcpy 1 @@ -355,9 +368,59 @@ __strlen_g (__const char *__str) #define _HAVE_STRING_ARCH_strcpy 1 #define strcpy(dest, src) \ (__extension__ (__builtin_constant_p (src) \ - ? (char *) memcpy (dest, src, strlen (src) + 1) \ + ? (sizeof (src[0]) == 1 && strlen (src) + 1 <= 8 \ + ? __strcpy_small (dest, src, strlen (src) + 1) \ + : (char *) memcpy (dest, src, strlen (src) + 1)) \ : __strcpy_g (dest, src))) +# define __strcpy_small(dest, src, srclen) \ + (__extension__ ({ char *__retval = (dest); \ + char *__cp = __retval; \ + switch (srclen) \ + { \ + case 1: \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 2: \ + *((__uint16_t *) __cp) = \ + __STRING_SMALL_GET16 (src, 0); \ + break; \ + case 3: \ + *((__uint16_t *) __cp)++ = \ + __STRING_SMALL_GET16 (src, 0); \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 4: \ + *((__uint32_t *) __cp) = \ + __STRING_SMALL_GET32 (src, 0); \ + break; \ + case 5: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 6: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((__uint16_t *) __cp) = \ + __STRING_SMALL_GET16 (src, 4); \ + break; \ + case 7: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((__uint16_t *) __cp)++ = \ + __STRING_SMALL_GET16 (src, 4); \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 8: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((__uint32_t *) __cp) = \ + __STRING_SMALL_GET32 (src, 4); \ + break; \ + } \ + __retval; })) + __STRING_INLINE char * __strcpy_g (char *__dest, __const char *__src) { @@ -398,43 +461,56 @@ __strcpy_g (char *__dest, __const char *__src) /* In glibc itself we use this symbol for namespace reasons. */ # define stpcpy(dest, src) __stpcpy (dest, src) -__STRING_INLINE char * -__stpcpy_small (char *__dest, __const char __src[], size_t __srclen) -{ - register char *__tmp = __dest; - switch (__srclen) - { - case 7: - *((unsigned short int *) __tmp)++ = *((unsigned short int *) __src)++; - case 5: - *((unsigned int *) __tmp)++ = *((unsigned int *) __src)++; - *((unsigned char *) __tmp) = '\0'; - return __tmp; - - case 8: - *((unsigned int *) __tmp)++ = *((unsigned int *) __src)++; - case 4: - *((unsigned int *) __tmp) = *((unsigned int *) __src); - return __tmp + 3; - - case 6: - *((unsigned int *) __tmp)++ = *((unsigned int *) __src)++; - case 2: - *((unsigned short int *) __tmp) = *((unsigned short int *) __src); - return __tmp + 1; - - case 3: - *((unsigned short int *) __tmp)++ = *((unsigned short int *) __src)++; - case 1: - *((unsigned char *) __tmp) = '\0'; - return __tmp; - - default: - break; - } - /* This should never happen. */ - return NULL; -} +# define __stpcpy_small(dest, src, srclen) \ + (__extension__ ({ char *__cp = (dest); \ + switch (srclen) \ + { \ + case 1: \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 2: \ + *((__uint16_t *) __cp) = \ + __STRING_SMALL_GET16 (src, 0); \ + ++cp; \ + break; \ + case 3: \ + *((__uint16_t *) __cp)++ = \ + __STRING_SMALL_GET16 (src, 0); \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 4: \ + *((__uint32_t *) __cp) = \ + __STRING_SMALL_GET32 (src, 0); \ + cp += 3; \ + break; \ + case 5: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 6: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((__uint16_t *) __cp) = \ + __STRING_SMALL_GET16 (src, 4); \ + ++cp; \ + break; \ + case 7: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((__uint16_t *) __cp)++ = \ + __STRING_SMALL_GET16 (src, 4); \ + *((unsigned char *) __cp) = '\0'; \ + break; \ + case 8: \ + *((__uint32_t *) __cp)++ = \ + __STRING_SMALL_GET32 (src, 0); \ + *((__uint32_t *) __cp) = \ + __STRING_SMALL_GET32 (src, 4); \ + cp += 3; \ + break; \ + } \ + __cp; })) __STRING_INLINE char * __mempcpy_by4 (char *__dest, __const char *__src, size_t __srclen) @@ -1458,4 +1534,4 @@ __strstr_g (__const char *__haystack, __const char *__needle) #undef __STRING_INLINE -#endif /* GNU CC */ +#endif /* use string inlines && GNU CC */ diff --git a/sysdeps/i386/i586/bzero.S b/sysdeps/i386/i586/bzero.S index 2c75103..84d2f70 100644 --- a/sysdeps/i386/i586/bzero.S +++ b/sysdeps/i386/i586/bzero.S @@ -1,2 +1,3 @@ -#define memset bzero +#define memset __bzero #include <sysdeps/i386/i586/memset.S> +weak_alias (__bzero, bzero) |