aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-21 14:34:13 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-21 14:34:13 +0000
commite7c5513dcd240d468812b11fda8eaba404ea082c (patch)
tree9177a17422e50471d537a22bdefee6d4cf48f57e /string
parentb0fd6165c72f56f0ff6383a5cc89d74ff24820fa (diff)
downloadglibc-e7c5513dcd240d468812b11fda8eaba404ea082c.tar
glibc-e7c5513dcd240d468812b11fda8eaba404ea082c.tar.gz
glibc-e7c5513dcd240d468812b11fda8eaba404ea082c.tar.bz2
glibc-e7c5513dcd240d468812b11fda8eaba404ea082c.zip
Update.
1998-09-21 10:00 Ulrich Drepper <drepper@cygnus.com> * string/bits/string2.h: Add mempcpy optimization. * sysdeps/generic/mempcpy.c: Undefined __mempcpy. * intl/localealias.c: Define mempcpy only if not already defined. * sysdeps/i386/i486/bits/string.h: Define ffsl only if not already defined. 1998-09-20 10:48 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * csu/abi-note.S: Emit the note directly instead of defining a preprocessor macro that's only used once. Don't include sysdep.h. * abi-tags: Generalize Solaris entry. 1998-09-18 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/bsd/getpt.c (__libc_ptyname1, __libc_ptyname2): Change to array to avoid runtime relocation. * sysdeps/unix/sysv/linux/ptsname.c: Update declarations. 1998-09-21 12:22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/Makefile ($(objpfx)libmcheck.a): Fix use of $(LN_S). * math/Makefile ($(objpfx)libieee.a): Likewise. 1998-09-21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/getpt.c: Fix order of argument to weak_alias. Patch by John Tobey <jtobey@banta-im.com>.
Diffstat (limited to 'string')
-rw-r--r--string/bits/string2.h147
1 files changed, 146 insertions, 1 deletions
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 8051c48162..172c21734a 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -101,6 +101,151 @@ __STRING2_COPY_TYPE (8);
#endif
+/* Copy N bytes from SRC to DEST, returning pointer to byte following the
+ last copied. */
+#ifdef __USE_GNU
+# ifndef _HAVE_STRING_ARCH_mempcpy
+# define __mempcpy(dest, src, n) \
+ (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n) \
+ && __string2_1bptr_p (src) && n <= 8 \
+ ? __mempcpy_small (dest, src, n) \
+ : __mempcpy (dest, src, n)))
+/* In glibc we use this function frequently but for namespace reasons
+ we have to use the name `__mempcpy'. */
+# define mempcpy(dest, src, n) __mempcpy (dest, src, n)
+
+# if _STRING_ARCH_unaligned
+# define __mempcpy_small(dest, src, srclen) \
+ (__extension__ ({ char *__dest = (char *) (dest); \
+ switch (srclen) \
+ { \
+ case 1: \
+ *__dest++ = *(char *) src; \
+ break; \
+ case 2: \
+ *((__uint16_t *) __dest) = \
+ __STRING2_SMALL_GET16 (src, 0); \
+ __dest += 2; \
+ break; \
+ case 3: \
+ *((__uint16_t *) __dest) = \
+ __STRING2_SMALL_GET16 (src, 0); \
+ __dest += sizeof (__uint16_t); \
+ *__dest++ = ((char *) src)[2]; \
+ break; \
+ case 4: \
+ *((__uint32_t *) __dest) = \
+ __STRING2_SMALL_GET32 (src, 0); \
+ __dest += 4; \
+ break; \
+ case 5: \
+ *((__uint32_t *) __dest) = \
+ __STRING2_SMALL_GET32 (src, 0); \
+ __dest += 4; \
+ *__dest++ = ((char *) src)[4]; \
+ break; \
+ case 6: \
+ *((__uint32_t *) __dest) = \
+ __STRING2_SMALL_GET32 (src, 0); \
+ *((__uint16_t *) (__dest + 4)) = \
+ __STRING2_SMALL_GET16 (src, 4); \
+ __dest += 6; \
+ break; \
+ case 7: \
+ *((__uint32_t *) __dest) = \
+ __STRING2_SMALL_GET32 (src, 0); \
+ *((__uint16_t *) (__dest + 4)) = \
+ __STRING2_SMALL_GET16 (src, 4); \
+ __dest += 6; \
+ *__dest++ = ((char *) src)[6]; \
+ break; \
+ case 8: \
+ *((__uint32_t *) __dest) = \
+ __STRING2_SMALL_GET32 (src, 0); \
+ *((__uint32_t *) (__dest + 4)) = \
+ __STRING2_SMALL_GET32 (src, 4); \
+ __dest += 8; \
+ break; \
+ } \
+ __dest; }))
+# else
+# define __mempcpy_small(dest, src, srclen) \
+ (__extension__ ({ char *__dest = (char *) (dest); \
+ switch (srclen) \
+ { \
+ case 1: \
+ *__dest = '\0'; \
+ break; \
+ case 2: \
+ *((__STRING2_COPY_ARR2 *) __dest) = \
+ ((__STRING2_COPY_ARR2) \
+ { { ((__const char *) (src))[0], \
+ ((__const char *) (src))[1] } }); \
+ break; \
+ case 3: \
+ *((__STRING2_COPY_ARR3 *) __dest) = \
+ ((__STRING2_COPY_ARR3) \
+ { { ((__const char *) (src))[0], \
+ ((__const char *) (src))[1], \
+ ((__const char *) (src))[2] } }); \
+ break; \
+ case 4: \
+ *((__STRING2_COPY_ARR4 *) __dest) = \
+ ((__STRING2_COPY_ARR4) \
+ { { ((__const char *) (src))[0], \
+ ((__const char *) (src))[1], \
+ ((__const char *) (src))[2], \
+ ((__const char *) (src))[3] } }); \
+ break; \
+ case 5: \
+ *((__STRING2_COPY_ARR5 *) __dest) = \
+ ((__STRING2_COPY_ARR5) \
+ { { ((__const char *) (src))[0], \
+ ((__const char *) (src))[1], \
+ ((__const char *) (src))[2], \
+ ((__const char *) (src))[3], \
+ ((__const char *) (src))[4] } }); \
+ break; \
+ case 6: \
+ *((__STRING2_COPY_ARR6 *) __dest) = \
+ ((__STRING2_COPY_ARR6) \
+ { { ((__const char *) (src))[0], \
+ ((__const char *) (src))[1], \
+ ((__const char *) (src))[2], \
+ ((__const char *) (src))[3], \
+ ((__const char *) (src))[4], \
+ ((__const char *) (src))[5] } }); \
+ break; \
+ case 7: \
+ *((__STRING2_COPY_ARR7 *) __dest) = \
+ ((__STRING2_COPY_ARR7) \
+ { { ((__const char *) (src))[0], \
+ ((__const char *) (src))[1], \
+ ((__const char *) (src))[2], \
+ ((__const char *) (src))[3], \
+ ((__const char *) (src))[4], \
+ ((__const char *) (src))[5], \
+ ((__const char *) (src))[6] } }); \
+ break; \
+ case 8: \
+ *((__STRING2_COPY_ARR8 *) __dest) = \
+ ((__STRING2_COPY_ARR8) \
+ { { ((__const char *) (src))[0], \
+ ((__const char *) (src))[1], \
+ ((__const char *) (src))[2], \
+ ((__const char *) (src))[3], \
+ ((__const char *) (src))[4], \
+ ((__const char *) (src))[5], \
+ ((__const char *) (src))[6], \
+ ((__const char *) (src))[7] } }); \
+ break; \
+ } \
+ __dest + (srclen); }))
+# endif
+# endif
+#endif
+
+
/* Copy SRC to DEST. */
#ifndef _HAVE_STRING_ARCH_strcpy
# define strcpy(dest, src) \
@@ -274,7 +419,7 @@ __STRING2_COPY_TYPE (8);
case 5: \
*((__uint32_t *) __dest) = \
__STRING2_SMALL_GET32 (src, 0); \
- __dest += sizeof (__uint32_t); \
+ __dest += 4; \
*__dest = '\0'; \
break; \
case 6: \