diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/alpha/dl-machine.h | 3 | ||||
| -rw-r--r-- | sysdeps/generic/memcpy.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/memset.c | 2 | ||||
| -rw-r--r-- | sysdeps/i386/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/i386/bits/select.h | 36 | ||||
| -rw-r--r-- | sysdeps/i386/bits/string.h | 745 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 8 | ||||
| -rw-r--r-- | sysdeps/i386/i486/bits/string.h | 853 | ||||
| -rw-r--r-- | sysdeps/m68k/dl-machine.h | 26 | ||||
| -rw-r--r-- | sysdeps/m68k/m68020/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/abi-tag.h | 12 | ||||
| -rw-r--r-- | sysdeps/mips/dl-machine.h | 2 | ||||
| -rw-r--r-- | sysdeps/mips/mips64/dl-machine.h | 2 | ||||
| -rw-r--r-- | sysdeps/sparc/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 3 | ||||
| -rw-r--r-- | sysdeps/stub/abi-tag.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/make-syscalls.sh | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/abi-tag.h | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/if_index.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netinet/tcp.h | 99 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysmacros.h | 17 |
22 files changed, 1725 insertions, 123 deletions
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 746cdd236b..e0ba67b48b 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -243,7 +243,8 @@ _dl_start_user: /* Jump to the user's entry point. */ mov $9, $27 jmp ($9) - .end _dl_start_user"); + .end _dl_start_user +.previous"); /* Nonzero iff TYPE describes relocation of a PLT entry, so PLT entries should not be allowed to define the value. */ diff --git a/sysdeps/generic/memcpy.c b/sysdeps/generic/memcpy.c index 05fa043fa5..7e6c72c7ae 100644 --- a/sysdeps/generic/memcpy.c +++ b/sysdeps/generic/memcpy.c @@ -23,6 +23,8 @@ #include <memcopy.h> #include <pagecopy.h> +#undef memcpy + void * memcpy (dstpp, srcpp, len) void *dstpp; diff --git a/sysdeps/generic/memset.c b/sysdeps/generic/memset.c index 7aeac0abec..1369698652 100644 --- a/sysdeps/generic/memset.c +++ b/sysdeps/generic/memset.c @@ -19,6 +19,8 @@ #include <string.h> #include <memcopy.h> +#undef memset + void * memset (dstpp, c, len) void *dstpp; diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile index 35e0422bdb..bb2d8f7b41 100644 --- a/sysdeps/i386/Makefile +++ b/sysdeps/i386/Makefile @@ -5,6 +5,10 @@ asm-CPPFLAGS := $(asm-CPPFLAGS) -DGAS_SYNTAX # The i386 `long double' is a distinct type we support. long-double-fcts = yes +ifeq ($(subdir),db2) +CPPFLAGS += -DHAVE_SPINLOCKS=1 -DHAVE_ASSEM_X86_GCC=1 +endif + ifeq ($(subdir),gmon) sysdep_routines += i386-mcount endif diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h index e72b6f0a84..8c9a5434b9 100644 --- a/sysdeps/i386/bits/select.h +++ b/sysdeps/i386/bits/select.h @@ -23,41 +23,45 @@ #if defined __GNUC__ && __GNUC__ >= 2 -#define __FD_ZERO(fdsetp) \ +# define __FD_ZERO(fdsetp) \ __asm__ __volatile__ ("cld ; rep ; stosl" \ : "=m" (*(__fd_set *) (fdsetp)) \ : "a" (0), "c" (sizeof (__fd_set) \ / sizeof (__fd_mask)), \ "D" ((__fd_set *) (fdsetp)) \ :"cx","di") -#define __FD_SET(fd, fdsetp) \ +# define __FD_SET(fd, fdsetp) \ __asm__ __volatile__ ("btsl %1,%0" \ - : "=m" (*(__fd_set *) (fdsetp)) \ - : "r" ((int) (fd))) -#define __FD_CLR(fd, fdsetp) \ + : "=m" (((__fd_set *) (fdsetp))[__FDELT (fd)]) \ + : "r" (((int) (fd)) % __NFDBITS) \ + : "cc") +# define __FD_CLR(fd, fdsetp) \ __asm__ __volatile__ ("btrl %1,%0" \ - : "=m" (*(__fd_set *) (fdsetp)) \ - : "r" ((int) (fd))) -#define __FD_ISSET(fd, fdsetp) \ + : "=m" (((__fd_set *) (fdsetp))[__FDELT (fd)]) \ + : "r" (((int) (fd)) % __NFDBITS) \ + : "cc") +# define __FD_ISSET(fd, fdsetp) \ (__extension__ \ - ({unsigned char __result; \ - __asm__ __volatile__ ("btl %1,%2 ; setb %0" \ + ({unsigned int __result; \ + __asm__ __volatile__ ("btl %1,%2 ; setcb %b0; andl $1,%0" \ : "=q" (__result) \ - : "r" ((int) (fd)), "m" (*(__fd_set *) (fdsetp))); \ + : "r" (((int) (fd)) % __NFDBITS), \ + "m" (((__fd_set *) (fdsetp))[__FDELT (fd)]) \ + : "cc"); \ __result; })) #else /* ! GNU CC */ /* We don't use `memset' because this would require a prototype and the array isn't too big. */ -#define __FD_ZERO(set) \ +# define __FD_ZERO(set) \ do { \ unsigned int __i; \ for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ - ((__fd_mask *) set)[__i] = '\0'; \ + ((__fd_mask *) set)[__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)) -#define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) +# define __FD_SET(d, set) ((set)->fds_bits[__FDELT (d)] |= __FDMASK (d)) +# define __FD_CLR(d, set) ((set)->fds_bits[__FDELT (d)] &= ~__FDMASK (d)) +# define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT (d)] & __FDMASK (d)) #endif /* GNU CC */ diff --git a/sysdeps/i386/bits/string.h b/sysdeps/i386/bits/string.h new file mode 100644 index 0000000000..254db3e7f3 --- /dev/null +++ b/sysdeps/i386/bits/string.h @@ -0,0 +1,745 @@ +/* Optimized, inlined string functions. i386 version. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _STRING_H +#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 + +#ifdef __cplusplus +# define __STRING_INLINE inline +#else +# define __STRING_INLINE extern __inline +#endif + + +/* Copy N bytes of SRC to DEST. */ +#define memcpy(dest, src, n) \ + (__extension__ (__builtin_constant_p (n) \ + ? __memcpy_c (dest, src, n) \ + : memcpy (dest, src, n))) +/* This looks horribly ugly, but the compiler can optimize it totally, + as the count is constant. */ +__STRING_INLINE void * +__memcpy_c (void *__dest, __const void *__src, size_t __n) +{ + switch (n) + { + case 0: + return __dest; + case 1: + *(unsigned char *) __dest = *(const unsigned char *) __src; + return __dest; + case 2: + *(unsigned short int *) __dest = *(const unsigned short int *) __src; + return __dest; + case 3: + *(unsigned short int *) __dest = *(const unsigned short int *) __src; + *(2 + (unsigned char *) __dest) = *(2 + (const unsigned char *) __src); + return __dest; + case 4: + *(unsigned long int *) __dest = *(const unsigned long int *) __src; + return __dest; + case 6: /* for ethernet addresses */ + *(unsigned long int *) __dest = *(const unsigned long int *) __src; + *(2 + (unsigned short int *) __dest) = + *(2 + (const unsigned short int *) __src); + return __dest; + case 8: + *(unsigned long int *) __dest = *(const unsigned long int *) __to; + *(1 + (unsigned long int *) __dest) = + *(1 + (const unsigned long int *) __src); + return __dest; + case 12: + *(unsigned long int *) __dest = *(const unsigned long int *) __src; + *(1 + (unsigned long int *) __dest) = + *(1 + (const unsigned long int *) __src); + *(2 + (unsigned long int *) __dest) = + *(2 + (const unsigned long int *) __src); + return __dest; + case 16: + *(unsigned long int *) __dest = *(const unsigned long int *) __src; + *(1 + (unsigned long int *) __dest) = + *(1 + (const unsigned long int *) __src); + *(2 + (unsigned long int *) __dest) = + *(2 + (const unsigned long int *) __src); + *(3 + (unsigned long int *) __dest) = + *(3 + (const unsigned long int *) __src); + return __dest; + case 20: + *(unsigned long int *) __dest = *(const unsigned long int *) __src; + *(1 + (unsigned long int *) __dest) = + *(1 + (const unsigned long int *) __src); + *(2 + (unsigned long int *) __dest) = + *(2 + (const unsigned long int *) __src); + *(3 + (unsigned long int *) __dest) = + *(3 + (const unsigned long int *) __src); + *(4 + (unsigned long int *) __dest) = + *(4 + (const unsigned long int *) __src); + return __dest; + } +#define __COMMON_CODE(x) \ + __asm__ __volatile__ \ + ("cld\n\t" \ + "rep; movsl" \ + x \ + : /* no outputs */ \ + : "c" (n / 4), "D" (__dest), "S" (__src) \ + : "cx", "di", "si", "memory"); + + switch (n % 4) + { + case 0: + __COMMON_CODE (""); + return __dest; + case 1: + __COMMON_CODE ("\n\tmovsb"); + return __dest; + case 2: + __COMMON_CODE ("\n\tmovsw"); + return __dest; + case 3: + __COMMON_CODE ("\n\tmovsw\n\tmovsb"); + return __dest; + } +#undef __COMMON_CODE +} + + +/* Copy N bytes of SRC to DEST, guaranteeing + correct behavior for overlapping strings. */ +__STRING_INLINE void * +memmove (void *__dest, __const void *__src, size_t __n) +{ + if (__dest < __src) + __asm__ __volatile__ + ("cld\n\t" + "rep\n\t" + "movsb" + : /* no output */ + : "c" (__n), "S" (__src),"D" (__dest) + : "cx", "si", "di"); + else + __asm__ __volatile__ + ("std\n\t" + "rep\n\t" + "movsb\n\t" + "cld" + : /* no output */ + : "c" (__n), "S" (__n - 1 + (const char *) __src), + "D" (__n - 1 + (char *) __dest) + : "cx", "si", "di", "memory"); + return __dest; +} + + +/* Set N bytes of S to C. */ +#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))) + +__STRING_INLINE void * +__memset_cc (void *__s, unsigned long int __pattern, size_t __n) +{ + switch (__n) + { + case 0: + return s; + case 1: + *(unsigned char *) __s = __pattern; + return __s; + case 2: + *(unsigned short int *) __s = __pattern; + return s; + case 3: + *(unsigned short int *) __s = __pattern; + *(2 + (unsigned char *) __s) = __pattern; + return __s; + case 4: + *(unsigned long *) __s = __pattern; + return __s; + } +#define __COMMON_CODE(x) \ + __asm__ __volatile__ \ + ("cld\n\t" \ + "rep; stosl" \ + x \ + : /* no outputs */ \ + : "a" (__pattern),"c" (__n / 4), "D" (__s) \ + : "cx", "di", "memory") + + switch (__n % 4) + { + case 0: + __COMMON_CODE (""); + return __s; + case 1: + __COMMON_CODE ("\n\tstosb"); + return __s; + case 2: + __COMMON__CODE ("\n\tstosw"); + return s; + case 3: + __COMMON_CODE ("\n\tstosw\n\tstosb"); + return __s; + } +#undef __COMMON_CODE +} + +__STRING_INLINE void * +__memset_cg (void *__s, unsigned long __c, size_t __n) +{ + __asm__ __volatile__ + ("cld\n\t" + "rep; stosl\n\t" + "testb $2,%b1\n\t" + "je 1f\n\t" + "stosw\n" + "1:\n\t" + "testb $1,%b1\n\t" + "je 2f\n\t" + "stosb\n" + "2:" + : /* no output */ + : "a" (__c), "q" (__n), "c" (__n / 4), "D" (__s) + : "cx", "di", "memory"); + return __s; +} + +__STRING_INLINE void * +__memset_gg (void *__s, char __c, size_t __n) +{ + __asm__ __volatile__ + ("cld\n\t" + "rep\n\t" + "stosb" + : /* no output */ + : "a" (__c),"D" (__s), "c" (__n) + : "cx", "di", "memory"); + return __s; +} + + + + +/* Search N bytes of S for C. */ +__STRING_INLINE void * +memchr (__const void *__s, int __c, size_t __n) +{ + register void *__res; + if (count == 0) + return NULL; + __asm__ __volatile__ + ("cld\n\t" + "repne; scasb\n\t" + "je 1f\n\t" + "movl $1,%0\n" + "1:\n\t" + "decl %0" + : "=D" (__res) + : "a" (__c), "D" (__s), "c" (__n) + : "cx", "cc"); + return __res; +} + + +/* Search N bytes of S for C. */ +__STRING_INLINE void * +memchr (__const void *__s, int __c, size_t __n) +{ + register void *__res; + if (count == 0) + return NULL; + __asm__ __volatile__ + ("cld\n\t" + "repne\n\t" + "scasb\n\t" + "je 1f\n\t" + "movl $1,%0\n" + "1:" + : "=D" (__res) + : "a" (__c), "0" (__s), "c" (__n) + : "cx"); + return __res - 1; +} + + +/* Return the length of S. */ +__STRING_INLINE size_t +strlen (__const char *__str) +{ + register size_t __res; + __asm__ __volatile__ + ("cld\n\t" + "repne; scasb\n\t" + "notl %0" + : "=c" (__res) + : "D" (__str), "a" (0), "0" (0xffffffff) + : "di", "cc"); + return __res - 1; +} + + +/* Copy SRC to DEST. */ +__STRING_INLINE char * +strcpy (char *__dest, __const char *__src) +{ + __asm__ __volatile__ + ("cld\n" + "1:\n\t" + "lodsb\n\t" + "stosb\n\t" + "testb %%al,%%al\n\t" + "jne 1b" + : /* no output */ + : "S" (__src), "D" (__dest) + : "si", "di", "ax", "memory", "cc"); + return __dest; +} + + +/* Copy no more than N characters of SRC to DEST. */ +__STRING_INLINE char * +strncpy (char *__dest, __const char *__src, size_t __n) +{ + __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:" + : /* no output */ + : "S" (__src), "D" (__dest), "c" (__n) + : "si", "di", "ax", "cx", "memory", "cc"); + return __dest; +} + + +/* Append SRC onto DEST. */ +__STRING_INLINE char * +strcat (char *__dest, __const char *__src) +{ + __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" + : /* no output */ + : "S" (__src), "D" (__dest), "a" (0), "c" (0xffffffff) + : "si", "di", "ax", "cx", "memory", "cc"); + return __dest; +} + + +/* Append no more than N characters from SRC onto DEST. */ +__STRING_INLINE char * +strncat (char *__dest, __const char *__src, size_t __n) +{ + __asm__ __volatile__ + ("cld\n\t" + "repne; scasb\n\t" + "decl %1\n\t" + "movl %4,%3\n" + "1:\n\t" + "decl %3\n\t" + "js 2f\n\t" + "lodsb\n\t" + "stosb\n\t" + "testb %%al,%%al\n\t" + "jne 1b\n" + "2:\n\t" + "xorl %2,%2\n\t" + "stosb" + : /* no output */ + : "S" (__src), "D" (__dest), "a" (0), "c" (0xffffffff), "g" (__n) + : "si", "di", "ax", "cx", "memory", "cc"); + return __dest; +} + + +/* Compare S1 and S2. */ +__STRING_INLINE int +strcmp (__const char *__s1, __const char *__s2) +{ + 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" + "orb $1,%%eax\n" + "3:" + : "=a" (__res) + : "S" (__s1), "D" (__s2) + : "si", "di", "cc"); + return __res; +} + + +/* Compare N characters of S1 and S2. */ +__STRING_INLINE int +strncmp (__const char *__s1, __const char *__s2, size_t __n) +{ + 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:" + : "=a" (__res) + : "S" (__s1), "D" (__s2), "c" (__n) + : "si", "di", "cx", "cc"); + return __res; +} + + +/* Find the first occurrence of C in S. */ +#define strchr(s, c) \ + (__extension__ (__builtin_constant_p (c) \ + ? __strchr_c (s, ((c) & 0xff) << 8) \ + : __strchr_g (s, c))) + +__STRING_INLINE char * +__strchr_g (__const char *__s, int __c) +{ + 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" + : "=a" (__res) + : "S" (__s), "0" (__c) + : "si", "cc"); + return __res - 1; +} + +__STRING_INLINE char * +__strchr_c (__const char *__s, int __c) +{ + 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" + : "=a" (__res) + : "S" (__s), "0" (__c) + : "si", "cc"); + return __res - 1; +} + + +/* Return the length of the initial segment of S which + consists entirely of characters not in REJECT. */ +#ifdef __PIC__ +__STRING_INLINE size_t +strcspn (__const char *__s, __const char *__reject) +{ + 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" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__reject) + : "ax", "cx", "di", "cc"); + return (__res - 1) - __s; +} +#else +__STRING_INLINE size_t +strcspn (__const char *__s, __const char *__reject) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "movl %4,%%edi\n\t" + "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" + "movl %4,%%edi\n\t" + "movl %%edx,%%ecx\n\t" + "repne; scasb\n\t" + "jne 1b\n" + "2:" + : "=S" (__res) + : "a" (0), "c" (0xffffffff),"0" (__s), "g" (__reject) + : "ax", "cx", "dx", "di", "cc"); + return (__res - 1) - __s; +} +#endif + + +/* Return the length of the initial segment of S which + consists entirely of characters in ACCEPT. */ +#ifdef __PIC__ +__STRING_INLINE size_t +strspn (__const char *__s, __const char *__accept) +{ + 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" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "di", "cc"); + return (__res - 1) - __s; +} +#else +__STRING_INLINE size_t +strspn (__const char *__s, __const char *__accept) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "movl %4,%%edi\n\t" + "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" + "movl %4,%%edi\n\t" + "movl %%edx,%%ecx\n\t" + "repne; scasb\n\t" + "je 1b\n" + "2:" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "dx", "di", "cc"); + return (__res - 1) - __s; +} +#endif + + +/* Find the first occurrence in S of any character in ACCEPT. */ +#ifdef __PIC__ +__STRING_INLINE char * +strpbrk (__const char *__s, __const char *__accept) +{ + 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" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "di", "cc"); + return __res; +} +#else +__STRING_INLINE char * +strpbrk (__const char *__s, __const char *__accept) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "movl %4,%%edi\n\t" + "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" + "movl %4,%%edi\n\t" + "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:" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "dx", "di", "cc"); + return __res; +} +#endif + + +/* Find the first occurrence of NEEDLE in HAYSTACK. */ +#ifdef __PIC__ +__STRING_INLINE char * +strstr (__const char *__haystack, __const char *__needle) +{ + 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" + : "=a" (__res) + : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle) + : "cx", "di", "si", "cc"); + return __res; +} +#else +__STRING_INLINE char * +strstr (__const char *__haystack, __const char *__needle) +{ + register char *__res; + __asm__ __volatile__ + ("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,%%edx\n" + "1:\n\t" + "movl %4,%%edi\n\t" + "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:" + : "=a" (__res) + : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle) + : "cx", "dx", "di", "si", "cc"); + return __res; +} +#endif + + +#undef __STRING_INLINE + +#endif /* GNU CC */ diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 213060ba84..f9913cf00c 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -57,10 +57,9 @@ static inline Elf32_Addr __attribute__ ((unused)) elf_machine_load_address (void) { Elf32_Addr addr; - asm (" call 1f\n" - "1: popl %0\n" - " subl 1b@GOT(%%ebx), %0" - : "=r" (addr)); + asm ("leal _dl_start@GOTOFF(%%ebx), %0\n" + "subl _dl_start@GOT(%%ebx), %0" + : "=r" (addr) : : "cc"); return addr; } @@ -250,6 +249,7 @@ _dl_start_user:\n\ movl _dl_fini@GOT(%ebx), %edx\n\ # Jump to the user's entry point.\n\ jmp *%edi\n\ +.previous\n\ "); /* Nonzero iff TYPE should not be allowed to resolve to one of diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h new file mode 100644 index 0000000000..f141bd50e1 --- /dev/null +++ b/sysdeps/i386/i486/bits/string.h @@ -0,0 +1,853 @@ +/* Optimized, inlined string functions. i486 version. + Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _STRING_H +#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 + +#ifdef __cplusplus +# define __STRING_INLINE inline +#else +# define __STRING_INLINE extern __inline +#endif + + +/* Copy N bytes of SRC to DEST. */ +#define memcpy(dest, src, n) \ + (__extension__ (__builtin_constant_p (n) \ + ? __memcpy_c (dest, src, n) \ + : __memcpy_g (dest, src, n))) +#define __memcpy_c(dest, src, n) \ + (((n) % 4 == 0) \ + ? __memcpy_by4 (dest, src, n) \ + : (((n) % 2 == 0) \ + ? __memcpy_by2 (dest, src, n) \ + : __memcpy_g (dest, src, n))) + +__STRING_INLINE void * +__memcpy_by4 (void *__dest, __const void *__src, size_t __n) +{ + register void *__tmp = __dest; + register int __dummy1, __dummy2; + __asm__ __volatile__ + ("1:\n\t" + "movl (%2),%0\n\t" + "leal 4(%2),%2\n\t" + "movl %0,(%1)\n\t" + "leal 4(%1),%1\n\t" + "decl %3\n\t" + "jnz 1b" + : "=r" (__dummy1), "=r" (__tmp), "=r" (__src), "=r" (__dummy2) + : "1" (__tmp), "2" (__src), "3" (__n / 4) + : "memory", "cc"); + return __dest; +} + +__STRING_INLINE void * +__memcpy_by2 (void *__dest, __const void *__src, size_t __n) +{ + register void *__tmp = __dest; + register int __dummy1, __dummy2; + __asm__ __volatile__ + ("shrl $1,%3\n\t" + "jz 2f\n" /* only a word */ + "1:\n\t" + "movl (%2),%0\n\t" + "leal 4(%2),%2\n\t" + "movl %0,(%1)\n\t" + "leal 4(%1),%1\n\t" + "decl %3\n\t" + "jnz 1b\n" + "2:\n\t" + "movw (%2),%w0\n\t" + "movw %w0,(%1)" + : "=q" (__dummy1), "=r" (__tmp), "=r" (__src), "=r" (__dummy2) + : "1" (__tmp), "2" (__src), "3" (__n / 2) + : "memory", "cc"); + return __dest; +} + +__STRING_INLINE void * +__memcpy_g (void *__dest, __const void *__src, size_t __n) +{ + register void *__tmp = __dest; + __asm__ __volatile__ + ("cld\n\t" + "shrl $1,%%ecx\n\t" + "jnc 1f\n\t" + "movsb\n" + "1:\n\t" + "shrl $1,%%ecx\n\t" + "jnc 2f\n\t" + "movsw\n" + "2:\n\t" + "rep; movsl" + : /* no output */ + : "c" (__n), "D" (__tmp),"S" (__src) + : "cx", "di", "si", "memory", "cc"); + return __dest; +} + + +/* Copy N bytes of SRC to DEST, guaranteeing + correct behavior for overlapping strings. */ +__STRING_INLINE void * +memmove (void *__dest, __const void *__src, size_t __n) +{ + register void *__tmp = __dest; + if (__dest < __src) + __asm__ __volatile__ + ("cld\n\t" + "rep; movsb" + : /* no output */ + : "c" (__n), "S" (__src), "D" (__tmp) + : "cx", "si", "di"); + else + __asm__ __volatile__ + ("std\n\t" + "rep; movsb\n\t" + "cld" + : /* no output */ + : "c" (__n), "S" (__n - 1 + (__const char *) __src), + "D" (__n - 1 + (char *) __tmp) + : "cx", "si", "di", "memory"); + return __dest; +} + + +/* Compare N bytes of S1 and S2. */ +#ifndef __PIC__ +/* gcc has problems to spill registers when using PIC. */ +__STRING_INLINE int +memcmp (__const void *__s1, __const void *__s2, size_t __n) +{ + register int __res; + __asm__ __volatile__ + ("cld\n\t" + "repe; cmpsb\n\t" + "je 1f\n\t" + "sbbl %0,%0\n\t" + "orb $1,%b0\n" + "1:" + : "=a" (__res) + : "0" (0), "S" (__s1), "D" (__s2), "c" (__n) + : "si", "di", "cx", "cc"); + return __res; +} +#endif + + +/* Set N bytes of S to C. */ +#define memset(s, c, n) \ + (__extension__ (__builtin_constant_p (c) \ + ? (__builtin_constant_p (n) \ + ? __memset_cc (s, c, n) \ + : __memset_cg (s, c, n)) \ + : (__builtin_constant_p (n) \ + ? __memset_gc (s, c, n) \ + : __memset_gg (s, c, n)))) +#define __memset_cc(s, c, n) \ + (((n) % 4 == 0) \ + ? __memset_cc_by4 (s, c, n) \ + : (((n) % 2== 0) \ + ? __memset_cc_by2 (s, c, n) \ + : __memset_cg (s, c, n))) +#define __memset_gc(s, c, n) \ + (((n) % 4== 0) \ + ? __memset_gc_by4 (s, c, n) \ + : (((n) % 2 == 0) \ + ? __memset_gc_by2 (s, c, n) \ + : __memset_gg (s, c, n))) + +__STRING_INLINE void * +__memset_cc_by4 (void *__s, int __c, size_t __n) +{ + register char *__tmp = __s; + register int __dummy; + __asm__ __volatile__ + ("1:\n\t" + "movl %2,(%0)\n\t" + "leal 4(%0),%0\n\t" + "decl %1\n\t" + "jnz 1b" + : "=r" (__tmp), "=r" (__dummy) + : "q" (0x01010101UL * (unsigned char) __c), "0" (__tmp), "1" (__n / 4) + : "memory", "cc"); + return __s; +} + +__STRING_INLINE void * +__memset_cc_by2 (void *__s, char __c, size_t __n) +{ + register void *__tmp = __s; + register int __dummy; + __asm__ __volatile__ + ("shrl $1,%1\n\t" /* may be divisible also by 4 */ + "jz 2f\n" + "1:\n\t" + "movl %2,(%0)\n\t" + "leal 4(%0),%0\n\t" + "decl %1\n\t" + "jnz 1b\n" + "2:\n\t" + "movw %w2,(%0)" + : "=r" (__tmp), "=r" (__dummy) + : "q" (0x01010101UL * (unsigned char) __c), "0" (__tmp), "1" (__n / 2) + : "memory", "cc"); + return __s; +} + +__STRING_INLINE void * +__memset_gc_by4 (void *__s, char __c, size_t __n) +{ + register void *__tmp = __s; + register int __dummy; + __asm__ __volatile__ + ("movb %b0,%h0\n" + "pushw %w0\n\t" + "shll $16,%0\n\t" + "popw %w0\n" + "1:\n\t" + "movl %0,(%1)\n\t" + "addl $4,%1\n\t" + "decl %2\n\t" + "jnz 1b\n" + : "=q" (__c), "=r" (__tmp), "=r" (__dummy) + : "0" ((unsigned int) __c), "1" (__tmp), "2" (__n / 4) + : "memory", "cc"); + return __s; +} + +__STRING_INLINE void * +__memset_gc_by2 (void *__s, char __c, size_t __n) +{ + register void *__tmp = __s; + register int __dummy1, __dummy2; + __asm__ __volatile__ + ("movb %b0,%h0\n\t" + "shrl $1,%2\n\t" /* may be divisible also by 4 */ + "jz 2f\n\t" + "pushw %w0\n\t" + "shll $16,%0\n\t" + "popw %w0\n" + "1:\n\t" + "movl %0,(%1)\n\t" + "leal 4(%1),%1\n\t" + "decl %2\n\t" + "jnz 1b\n" + "2:\n\t" + "movw %w0,(%1)" + : "=q" (__dummy1), "=r" (__tmp), "=r" (__dummy2) + : "0" ((unsigned int) __c), "1" (__tmp), "2" (__n / 2) + : "memory", "cc"); + return __s; +} + +__STRING_INLINE void * +__memset_cg (void *__s, char __c, size_t __n) +{ + register void *__tmp = __s; + __asm__ __volatile__ + ("shrl $1,%%ecx\n\t" + "rep; stosw\n\t" + "jnc 1f\n\t" + "movb %%al,(%%edi)\n" + "1:" + : /* no output */ + : "c" (__n),"D" (__tmp), "a" (0x0101U * (unsigned char) __c) + : "cx", "di", "memory", "cc"); + return __s; +} + +__STRING_INLINE void * +__memset_gg (void *__s, char __c, size_t __n) +{ + register void *__tmp = __s; + __asm__ __volatile__ + ("movb %%al,%%ah\n\t" + "shrl $1,%%ecx\n\t" + "rep; stosw\n\t" + "jnc 1f\n\t" + "movb %%al,(%%edi)\n" + "1:" + : /* no output */ + : "c" (__n), "D" (__tmp), "a" (__c) + : "cx", "di", "memory", "cc"); + return __s; +} + + +/* Search N bytes of S for C. */ +__STRING_INLINE void * +memchr (__const void *__s, int __c, size_t __n) +{ + register void *__res; + if (__n == 0) + return NULL; + __asm__ __volatile__ + ("cld\n\t" + "repne; scasb\n\t" + "je 1f\n\t" + "movl $1,%0\n" + "1:\n\t" + "decl %0" + : "=D" (__res) + : "a" (__c), "D" (__s), "c" (__n) + : "cx", "cc"); + return __res; +} + + +/* Return the length of S. */ +__STRING_INLINE size_t +strlen (__const char *__str) +{ + register char __dummy; + register __const char *__tmp = __str; + __asm__ __volatile__ + ("1:\n\t" + "movb (%0),%1\n\t" + "leal 1(%0),%0\n\t" + "testb %1,%1\n\t" + "jne 1b" + : "=r" (__tmp), "=q" (__dummy) + : "0" (__str) + : "memory", "cc" ); + return __tmp - __str - 1; +} + + +/* Copy SRC to DEST. */ +__STRING_INLINE char * +strcpy (char *__dest, __const char *__src) +{ + register char *__tmp = __dest; + register char __dummy; + __asm__ __volatile__ + ( + "1:\n\t" + "movb (%0),%2\n\t" + "incl %0\n\t" + "movb %2,(%1)\n\t" + "incl %1\n\t" + "testb %2,%2\n\t" + "jne 1b" + : "=r" (__src), "=r" (__tmp), "=q" (__dummy) + : "0" (__src), "1" (__tmp) + : "memory", "cc"); + return __dest; +} + + +/* Copy no more than N characters of SRC to DEST. */ +__STRING_INLINE char * +strncpy (char *__dest, __const char *__src, size_t __n) +{ + register char *__tmp = __dest; + register char __dummy; + if (__n > 0) + __asm__ __volatile__ + ("1:\n\t" + "movb (%0),%2\n\t" + "incl %0\n\t" + "movb %2,(%1)\n\t" + "incl %1\n\t" + "decl %3\n\t" + "je 3f\n\t" + "testb %2,%2\n\t" + "jne 1b\n\t" + "2:\n\t" + "movb %2,(%1)\n\t" + "incl %1\n\t" + "decl %3\n\t" + "jne 2b\n\t" + "3:" + : "=r" (__src), "=r" (__tmp), "=q" (__dummy), "=r" (__n) + : "0" (__src), "1" (__tmp), "3" (__n) + : "memory", "cc"); + + return __dest; +} + + +/* Append SRC onto DEST. */ +__STRING_INLINE char * +strcat (char *__dest, __const char *__src) +{ + register char *__tmp = __dest - 1; + register char __dummy; + __asm__ __volatile__ + ( + "1:\n\t" + "incl %1\n\t" + "cmpb $0,(%1)\n\t" + "jne 1b\n" + "2:\n\t" + "movb (%2),%b0\n\t" + "incl %2\n\t" + "movb %b0,(%1)\n\t" + "incl %1\n\t" + "testb %b0,%b0\n\t" + "jne 2b\n" + : "=q" (__dummy), "=r" (__tmp), "=r" (__src) + : "1" (__tmp), "2" (__src) + : "memory", "cc"); + return __dest; +} + + +/* Append no more than N characters from SRC onto DEST. */ +__STRING_INLINE char * +strncat (char *__dest, __const char *__src, size_t __n) +{ + register char *__tmp = __dest - 1; + register char __dummy; + __asm__ __volatile__ + ( + "1:\n\t" + "incl %1\n\t" + "cmpb $0,(%1)\n\t" + "jne 1b\n" + "2:\n\t" + "decl %3\n\t" + "js 3f\n\t" + "movb (%2),%b0\n\t" + "leal 1(%2),%2\n\t" + "movb %b0,(%1)\n\t" + "leal 1(%1),%1\n\t" + "testb %b0,%b0\n\t" + "jne 2b\n" + "3:\n\t" + "movb $0,(%1)\n\t" + : "=q" (__dummy), "=r" (__tmp), "=r" (__src), "=r" (__n) + : "1" (__tmp), "2" (__src), "3" (__n) + : "memory", "cc"); + return __dest; +} + + +/* Compare S1 and S2. */ +__STRING_INLINE int +strcmp (__const char *__s1, __const char *__s2) +{ + register int __res; + __asm__ __volatile__ + ("1:\n\t" + "movb (%1),%b0\n\t" + "leal 1(%1),%1\n\t" + "cmpb %b0,(%2)\n\t" + "jne 2f\n\t" + "leal 1(%2),%2\n\t" + "testb %b0,%b0\n\t" + "jne 1b\n\t" + "xorl %0,%0\n\t" + "jmp 3f\n" + "2:\n\t" + "movl $1,%0\n\t" + "jb 3f\n\t" + "negl %0\n" + "3:" + : "=q" (__res), "=r" (__s1), "=r" (__s2) + : "1" (__s1), "2" (__s2) + : "cc"); + return __res; +} + + +/* Compare N characters of S1 and S2. */ +__STRING_INLINE int +strncmp (__const char *__s1, __const char *__s2, size_t __n) +{ + register int __res; + __asm__ __volatile__ + ("1:\n\t" + "decl %3\n\t" + "js 2f\n\t" + "movb (%1),%b0\n\t" + "incl %1\n\t" + "cmpb %b0,(%2)\n\t" + "jne 3f\n\t" + "incl %2\n\t" + "testb %b0,%b0\n\t" + "jne 1b\n" + "2:\n\t" + "xorl %0,%0\n\t" + "jmp 4f\n" + "3:\n\t" + "movl $1,%0\n\t" + "jb 4f\n\t" + "negl %0\n" + "4:" + : "=q" (__res), "=r" (__s1), "=r" (__s2), "=r" (__n) + : "1" (__s1), "2" (__s2), "3" (__n) + : "cc"); + return __res; +} + + +/* Find the first occurrence of C in S. */ +#define strchr(s, c) \ + (__extension__ (__builtin_constant_p (c) \ + ? __strchr_c (s, ((c) & 0xff) << 8) \ + : __strchr_g (s, c))) + +__STRING_INLINE char * +__strchr_g (__const char *__s, int __c) +{ + register char *__res; + __asm__ __volatile__ + ("movb %%al,%%ah\n" + "1:\n\t" + "movb (%0),%%al\n\t" + "cmpb %%ah,%%al\n\t" + "je 2f\n\t" + "leal 1(%0),%0\n\t" + "testb %%al,%%al\n\t" + "jne 1b\n\t" + "xorl %0,%0\n" + "2:" + : "=r" (__res) + : "a" (__c), "0" (__s) + : "ax", "cc"); + return __res; +} + +__STRING_INLINE char * +__strchr_c (__const char *__s, int __c) +{ + register char *__res; + __asm__ __volatile__ + ("1:\n\t" + "movb (%0),%%al\n\t" + "cmpb %%ah,%%al\n\t" + "je 2f\n\t" + "leal 1(%0),%0\n\t" + "testb %%al,%%al\n\t" + "jne 1b\n\t" + "xorl %0,%0\n" + "2:" + : "=r" (__res) + : "a" (__c), "0" (__s) + : "ax", "cc"); + return __res; +} + + +/* Find the last occurrence of C in S. */ +#define strrchr(s, c) \ + (__extension__ (__builtin_constant_p (c) \ + ? __strrchr_c (s, ((c) & 0xff) << 8) \ + : __strrchr_g (s, c))) + +__STRING_INLINE char * +__strrchr_g (__const char *__s, int __c) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "movb %%al,%%ah\n" + "1:\n\t" + "lodsb\n\t" + "cmpb %%ah,%%al\n\t" + "jne 2f\n\t" + "leal -1(%%esi),%0\n" + "2:\n\t" + "testb %%al,%%al\n\t" + "jne 1b" + : "=d" (__res) + : "0" (0), "S" (__s),"a" (__c) + : "ax", "si", "cc"); + return __res; +} + +__STRING_INLINE char * +__strrchr_c (__const char *__s, int __c) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "1:\n\t" + "lodsb\n\t" + "cmpb %%ah,%%al\n\t" + "jne 2f\n\t" + "leal -1(%%esi),%0\n" + "2:\n\t" + "testb %%al,%%al\n\t" + "jne 1b" + : "=d" (__res) + : "0" (0), "S" (__s),"a" (__c) + : "ax", "si", "cc"); + return __res; +} + + +/* Return the length of the initial segment of S which + consists entirely of characters not in REJECT. */ +#ifdef __PIC__ +__STRING_INLINE size_t +strcspn (__const char *__s, __const char *__reject) +{ + register char *__res; + __asm__ __volatile__ + ("push %%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" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__reject) + : "ax", "cx", "di", "cc"); + return (__res - 1) - __s; +} +#else +__STRING_INLINE size_t +strcspn (__const char *__s, __const char *__reject) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "movl %4,%%edi\n\t" + "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" + "movl %4,%%edi\n\t" + "movl %%edx,%%ecx\n\t" + "repne; scasb\n\t" + "jne 1b\n" + "2:" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__reject) + : "ax", "cx", "dx", "di", "cc"); + return (__res - 1) - __s; +} +#endif + + +/* Return the length of the initial segment of S which + consists entirely of characters in ACCEPT. */ +#ifdef __PIC__ +__STRING_INLINE size_t +strspn (__const char *__s, __const char *__accept) +{ + 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" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "di", "cc"); + return (__res - 1) - __s; +} +#else +__STRING_INLINE size_t +strspn (__const char *__s, __const char *__accept) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "movl %4,%%edi\n\t" + "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" + "movl %4,%%edi\n\t" + "movl %%edx,%%ecx\n\t" + "repne; scasb\n\t" + "je 1b\n" + "2:" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "dx", "di", "cc"); + return (__res - 1) - __s; +} +#endif + + +/* Find the first occurrence in S of any character in ACCEPT. */ +#ifdef __PIC__ +__STRING_INLINE char * +strpbrk (__const char *__s, __const char *__accept) +{ + 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" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "di", "cc"); + return __res; +} +#else +__STRING_INLINE char * +strpbrk (__const char *__s, __const char *__accept) +{ + register char *__res; + __asm__ __volatile__ + ("cld\n\t" + "movl %4,%%edi\n\t" + "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" + "movl %4,%%edi\n\t" + "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:" + : "=S" (__res) + : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept) + : "ax", "cx", "dx", "di", "cc"); + return __res; +} +#endif + + +/* Find the first occurrence of NEEDLE in HAYSTACK. */ +#ifdef __PIC__ +__STRING_INLINE char * +strstr (__const char *__haystack, __const char *__needle) +{ + 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" + : "=a" (__res) + : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle) + : "cx", "di", "si", "cc"); + return __res; +} +#else +__STRING_INLINE char * +strstr (__const char *__haystack, __const char *__needle) +{ + register char *__res; + __asm__ __volatile__ + ("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,%%edx\n" + "1:\n\t" + "movl %4,%%edi\n\t" + "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:" + : "=a" (__res) + : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle) + : "cx", "dx", "di", "si", "cc"); + return __res; +} +#endif + + +#undef __STRING_INLINE + +#endif /* GNU CC */ diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 01fc339928..75434cd750 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -56,21 +56,12 @@ static inline Elf32_Addr elf_machine_load_address (void) { Elf32_Addr addr; - asm (".Lhere: lea .Lhere(%%pc), %0\n" - " sub.l %#.Lhere, %0" + asm ("1: lea 1b(%%pc), %0\n" + " sub.l 1b@GOTPC(%%pc), %0" : "=a" (addr)); return addr; } -/* The `subl' insn above will contain an R_68K_RELATIVE relocation - entry intended to insert the run-time address of the label `.Lhere'. - This will be the first relocation in the text of the dynamic - linker; we skip it to avoid trying to modify read-only text in this - early stage. */ -#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \ - ((dynamic_info)[DT_RELA]->d_un.d_ptr += sizeof (Elf32_Rela), \ - (dynamic_info)[DT_RELASZ]->d_un.d_val -= sizeof (Elf32_Rela)) - /* Set up the loaded object described by L so its unrelocated PLT entries will jump to the on-demand fixup code in dl-runtime.c. */ @@ -157,13 +148,16 @@ asm (TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup) \ its return value is the user program's entry point. */ #define RTLD_START asm ("\ -.text -.globl _start -.globl _dl_start_user + .text + .globl _start + .type _start,@function _start: move.l %sp, -(%sp) jbsr _dl_start addq.l #4, %sp + + .globl _dl_start_user + .type _dl_start_user,@function _dl_start_user: | Save the user entry point address in %a4. move.l %d0, %a4 @@ -209,7 +203,9 @@ _dl_start_user: | Initialize %fp with the stack pointer. move.l %sp, %fp | Jump to the user's entry point. - jmp (%a4)"); + jmp (%a4) + .size _dl_start_user, . - _dl_start_user + .previous"); /* Nonzero iff TYPE describes a relocation that should skip the executable when looking up the symbol value. */ diff --git a/sysdeps/m68k/m68020/Makefile b/sysdeps/m68k/m68020/Makefile new file mode 100644 index 0000000000..b17635467d --- /dev/null +++ b/sysdeps/m68k/m68020/Makefile @@ -0,0 +1,3 @@ +ifeq ($(subdir),db2) +CPPFLAGS += -DHAVE_SPINLOCKS=1 -DHAVE_ASSEM_MC68020_GCC=1 +endif diff --git a/sysdeps/mach/hurd/abi-tag.h b/sysdeps/mach/hurd/abi-tag.h deleted file mode 100644 index 0498d6ebf5..0000000000 --- a/sysdeps/mach/hurd/abi-tag.h +++ /dev/null @@ -1,12 +0,0 @@ -#define ABI_HURD_TAG 1 - -#define ABI_HURD_MAJOR 0 -#define ABI_HURD_MINOR 0 -#define ABI_HURD_PATCH 0 - -/* Don't use `|' in this expression, it is a comment character in the - assembler. */ -#define ABI_TAG ((ABI_HURD_TAG << 24) + \ - (ABI_HURD_MAJOR << 16) + \ - (ABI_HURD_MINOR << 8) + \ - (ABI_HURD_PATCH << 0)) diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 6973f7612a..7ee2e20343 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -423,6 +423,7 @@ _dl_runtime_resolve:\n \ move $25, $2\n \ jr $25\n \ .end _dl_runtime_resolve\n \ + .previous\n \ "); /* Mask identifying addresses reserved for the user program, @@ -519,6 +520,7 @@ _dl_start_user:\n\ lw $7, 12($29)\n\ jr $25\n"\ _RTLD_EPILOGUE(ENTRY_POINT)\ + "\n.previous"\ ); /* The MIPS never uses Elfxx_Rela relocations. */ diff --git a/sysdeps/mips/mips64/dl-machine.h b/sysdeps/mips/mips64/dl-machine.h index e501a2520e..76981a6a9b 100644 --- a/sysdeps/mips/mips64/dl-machine.h +++ b/sysdeps/mips/mips64/dl-machine.h @@ -423,6 +423,7 @@ _dl_runtime_resolve:\n \ move $25, $2\n \ jr $25\n \ .end _dl_runtime_resolve\n \ + .previous\n \ "); /* Mask identifying addresses reserved for the user program, @@ -514,6 +515,7 @@ _dl_start_user:\n\ ld $7, 3*8($29)\n\ jr $25\n"\ _RTLD_EPILOGUE(ENTRY_POINT) \ + "\n.previous"\ ); diff --git a/sysdeps/sparc/Makefile b/sysdeps/sparc/Makefile new file mode 100644 index 0000000000..e55e461423 --- /dev/null +++ b/sysdeps/sparc/Makefile @@ -0,0 +1,3 @@ +ifeq ($(subdir),db2) +CPPFLAGS += -DHAVE_SPINLOCKS=1 -DHAVE_ASSEM_SPARC_GCC=1 +endif diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 7c547f24ba..39bcab7df5 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -243,7 +243,8 @@ _dl_start_user: /* Jump to the user's entry point and deallocate the extra stack we got. */ jmp %l0 add %sp, 6*4, %sp - .size _dl_start_user,.-_dl_start_user"); + .size _dl_start_user,.-_dl_start_user +.previous"); #ifdef RESOLVE /* Perform the relocation specified by RELOC and SYM (which is fully resolved). diff --git a/sysdeps/stub/abi-tag.h b/sysdeps/stub/abi-tag.h deleted file mode 100644 index 2810552694..0000000000 --- a/sysdeps/stub/abi-tag.h +++ /dev/null @@ -1,3 +0,0 @@ -#error must define an ABI tag for this port - -#define ABI_TAG 0xff123abc diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index 93a73802f7..f00ce5bf37 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -57,7 +57,7 @@ EOF # Emit a compilation rule for this syscall. echo "\ -\$(foreach o,\$(all-object-suffixes),\$(objpfx)$file\$o): \\ +\$(foreach o,\$(object-suffixes),\$(objpfx)$file\$o): \\ \$(common-objpfx)s-proto.d (echo '#include <sysdep.h>'; \\ echo 'PSEUDO ($strong, $syscall, $nargs)'; \\ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index ea1ab49fd4..0545f4426a 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -4,6 +4,10 @@ CFLAGS-init-first.c = -fkeep-inline-functions sysdep_routines += errno-loc endif +ifeq ($(subdir),db2) +CPPFLAGS += -DHAVE_LLSEEK=1 +endif + ifeq ($(subdir),misc) sysdep_routines += sysctl clone llseek diff --git a/sysdeps/unix/sysv/linux/abi-tag.h b/sysdeps/unix/sysv/linux/abi-tag.h deleted file mode 100644 index 6c71eece85..0000000000 --- a/sysdeps/unix/sysv/linux/abi-tag.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Define the GNU ABI tag for the Linux kernel we need. - The is a 4-byte quantity in native byte order: - the high byte is 0 to indicate Linux; - the low three bytes are the LINUX_VERSION_CODE for the earliest - compatible Linux kernel. */ - -#define ABI_LINUX_TAG 0 - -#define ABI_LINUX_MAJOR 2 -#define ABI_LINUX_MINOR 0 -#define ABI_LINUX_PATCH 0 - -/* Don't use `|' in this expression, it is a comment character in the - assembler. */ -#define ABI_TAG ((ABI_LINUX_TAG << 24) + \ - (ABI_LINUX_MAJOR << 16) + \ - (ABI_LINUX_MINOR << 8) + \ - (ABI_LINUX_PATCH << 0)) diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c index 7d7fc02717..c0ffbcedf6 100644 --- a/sysdeps/unix/sysv/linux/if_index.c +++ b/sysdeps/unix/sysv/linux/if_index.c @@ -16,6 +16,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/sysdeps/unix/sysv/linux/netinet/tcp.h b/sysdeps/unix/sysv/linux/netinet/tcp.h index 60e67c5149..49fa180a00 100644 --- a/sysdeps/unix/sysv/linux/netinet/tcp.h +++ b/sysdeps/unix/sysv/linux/netinet/tcp.h @@ -36,78 +36,81 @@ #ifndef _NETINET_TCP_H #define _NETINET_TCP_H 1 -#include <sys/cdefs.h> +#include <features.h> #include <sys/types.h> __BEGIN_DECLS #ifdef __FAVOR_BSD -typedef u_int32_t tcp_seq; +typedef u_int32_t tcp_seq; /* * TCP header. * Per RFC 793, September, 1981. */ -struct tcphdr { - u_int16_t th_sport; /* source port */ - u_int16_t th_dport; /* destination port */ - tcp_seq th_seq; /* sequence number */ - tcp_seq th_ack; /* acknowledgement number */ +struct tcphdr + { + u_int16_t th_sport; /* source port */ + u_int16_t th_dport; /* destination port */ + tcp_seq th_seq; /* sequence number */ + tcp_seq th_ack; /* acknowledgement number */ #if __BYTE_ORDER == __LITTLE_ENDIAN - u_int8_t th_x2:4, /* (unused) */ - th_off:4; /* data offset */ + u_int8_t th_x2:4; /* (unused) */ + u_int8_t th_off:4; /* data offset */ #endif #if __BYTE_ORDER == __BIG_ENDIAN - u_int8_t th_off:4, /* data offset */ - th_x2:4; /* (unused) */ + u_int8_t th_off:4; /* data offset */ + u_int8_t th_x2:4; /* (unused) */ #endif - u_int8_t th_flags; + u_int8_t th_flags; #define TH_FIN 0x01 #define TH_SYN 0x02 #define TH_RST 0x04 #define TH_PUSH 0x08 #define TH_ACK 0x10 #define TH_URG 0x20 - u_int16_t th_win; /* window */ - u_int16_t th_sum; /* checksum */ - u_int16_t th_urp; /* urgent pointer */ + u_int16_t th_win; /* window */ + u_int16_t th_sum; /* checksum */ + u_int16_t th_urp; /* urgent pointer */ }; #else /* !__FAVOR_BSD */ -struct tcphdr { - u_int16_t source; - u_int16_t dest; - u_int32_t seq; - u_int32_t ack_seq; +struct tcphdr + { + u_int16_t source; + u_int16_t dest; + u_int32_t seq; + u_int32_t ack_seq; #if __BYTE_ORDER == __LITTLE_ENDIAN - u_int16_t res1:4, - doff:4, - fin:1, - syn:1, - rst:1, - psh:1, - ack:1, - urg:1, - res2:2; + u_int16_t res1:4; + u_int16_t doff:4; + u_int16_t fin:1; + u_int16_t syn:1; + u_int16_t rst:1; + u_int16_t psh:1; + u_int16_t ack:1; + u_int16_t urg:1; + u_int16_t res2:2; #elif __BYTE_ORDER == __BIG_ENDIAN - u_int16_t doff:4, - res1:4, - res2:2, - urg:1, - ack:1, - psh:1, - rst:1, - syn:1, - fin:1; + u_int16_t doff:4; + u_int16_t res1:4; + u_int16_t res2:2; + u_int16_t urg:1; + u_int16_t ack:1; + u_int16_t psh:1; + u_int16_t rst:1; + u_int16_t syn:1; + u_int16_t fin:1; #else #error "Adjust your <bits/endian.h> defines" -#endif - u_int16_t window; - u_int16_t check; - u_int16_t urg_ptr; +#endif + u_int16_t window; + u_int16_t check; + u_int16_t urg_ptr; }; #endif /* __FAVOR_BSD */ -enum { +enum +{ TCP_ESTABLISHED = 1, TCP_SYN_SENT, TCP_SYN_RECV, @@ -124,15 +127,15 @@ enum { #define TCPOPT_EOL 0 #define TCPOPT_NOP 1 #define TCPOPT_MAXSEG 2 -#define TCPOLEN_MAXSEG 4 +#define TCPOLEN_MAXSEG 4 #define TCPOPT_WINDOW 3 -#define TCPOLEN_WINDOW 3 +#define TCPOLEN_WINDOW 3 #define TCPOPT_SACK_PERMITTED 4 /* Experimental */ -#define TCPOLEN_SACK_PERMITTED 2 +#define TCPOLEN_SACK_PERMITTED 2 #define TCPOPT_SACK 5 /* Experimental */ #define TCPOPT_TIMESTAMP 8 -#define TCPOLEN_TIMESTAMP 10 -#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ +#define TCPOLEN_TIMESTAMP 10 +#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ #define TCPOPT_TSTAMP_HDR \ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h index 5c1e1f7441..55486feb3e 100644 --- a/sysdeps/unix/sysv/linux/sys/sysmacros.h +++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h @@ -21,9 +21,18 @@ #define _SYS_SYSMACROS_H 1 -/* For compatibility we provide alternative names. */ -#define major(dev) ((int)(((dev) >> 8) & 0xff)) -#define minor(dev) ((int)((dev) & 0xff)) -#define makedev(major, minor) (((major) << 8) | (minor)) +/* For compatibility we provide alternative names. + + The problem here is that compilers other than GCC probably don't + have the `long long' type and so `dev_t' is actually an array. */ +#if defined __GNUC__ && __GNUC__ >= 2 +# define major(dev) ((int)(((dev) >> 8) & 0xff)) +# define minor(dev) ((int)((dev) & 0xff)) +# define makedev(major, minor) (((major) << 8) | (minor)) +#else +# define major(dev) (((dev).__val[0] >> 8) & 0xff) +# define minor(dev) ((dev).__val[0] & 0xff) +# define makedev(major, minor) { (((major) << 8) | (minor)), 0 } +#endif #endif /* _SYS_SYSMACROS_H */ |