diff options
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/ffs.c | 5 | ||||
| -rw-r--r-- | sysdeps/i386/i486/bits/string.h | 19 | ||||
| -rw-r--r-- | sysdeps/i386/i686/ffs.c | 3 |
3 files changed, 26 insertions, 1 deletions
diff --git a/sysdeps/i386/ffs.c b/sysdeps/i386/ffs.c index 4f46dc7256..97e9c4040b 100644 --- a/sysdeps/i386/ffs.c +++ b/sysdeps/i386/ffs.c @@ -1,7 +1,7 @@ /* ffs -- find first set bit in a word, counted from least significant end. For Intel 80x86, x>=3. This file is part of the GNU C Library. - Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1991, 92, 93, 94, 97, 98 Free Software Foundation, Inc. Contributed by Torbjorn Granlund (tege@sics.se). The GNU C Library is free software; you can redistribute it and/or @@ -19,6 +19,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define ffsl __something_else #include <string.h> #undef ffs @@ -41,6 +42,8 @@ __ffs (x) return cnt; } weak_alias (__ffs, ffs) +#undef ffsl +weak_alias (__ffs, ffsl) #else #include <sysdeps/generic/ffs.c> diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h index d4c2eaf715..921c66498e 100644 --- a/sysdeps/i386/i486/bits/string.h +++ b/sysdeps/i386/i486/bits/string.h @@ -1567,6 +1567,25 @@ __strstr_g (__const char *__haystack, __const char *__needle) #endif +/* Bit find functions. We define only the i686 version since for the other + processors gcc generates good code. */ +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +# ifdef __i686__ +# define _HAVE_STRING_ARCH_ffs 1 +# define ffs(word) (__builtin_constant_p (word) \ + ? __builtin_ffs (word) \ + : ({ int __cnt, __tmp; \ + __asm__ __volatile__ \ + ("bsfl %2,%0\n\t" \ + "cmovel %1,%0" \ + : "=&r" (__cnt), "=r" (__tmp) \ + : "rm" (word), "1" (-1)); \ + __cnt + 1; })) + +# define ffsl(word) ffs(word) +# endif /* i686 */ +#endif /* BSD || X/Open */ + #undef __STRING_INLINE #endif /* use string inlines && GNU CC */ diff --git a/sysdeps/i386/i686/ffs.c b/sysdeps/i386/i686/ffs.c index c858b31a78..799128b2ed 100644 --- a/sysdeps/i386/i686/ffs.c +++ b/sysdeps/i386/i686/ffs.c @@ -19,6 +19,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define ffsl __something_else #include <string.h> #undef ffs @@ -39,6 +40,8 @@ __ffs (x) return cnt + 1; } weak_alias (__ffs, ffs) +#undef ffsl +weak_alias (__ffs, ffsl) #else #include <sysdeps/generic/ffs.c> |