diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-21 22:50:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-18 10:00:57 -0700 |
| commit | 5542236837c5c41435f8282ec92799f480c36f18 (patch) | |
| tree | 9379c73ad00dc1ffea986464bbf96634f3a7fd5f | |
| parent | 1814df5b02b9c359052c2048a1d2d617b406a17a (diff) | |
| download | glibc-5542236837c5c41435f8282ec92799f480c36f18.tar.gz glibc-5542236837c5c41435f8282ec92799f480c36f18.tar.xz glibc-5542236837c5c41435f8282ec92799f480c36f18.zip | |
Port the 0x7efe...feff pattern to GCC 6.
See Steve Ellcey's bug report in: https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html * string/memrchr.c (MEMRCHR): * string/rawmemchr.c (RAWMEMCHR): * string/strchr.c (strchr): * string/strchrnul.c (STRCHRNUL): Rewrite code to avoid issues with signed shift overflow.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | string/memrchr.c | 11 | ||||
| -rw-r--r-- | string/rawmemchr.c | 11 | ||||
| -rw-r--r-- | string/strchr.c | 9 | ||||
| -rw-r--r-- | string/strchrnul.c | 9 |
5 files changed, 19 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index db5d483180..bfc31fc8f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-08-18 Paul Eggert <eggert@cs.ucla.edu> + + Port the 0x7efe...feff pattern to GCC 6. + See Steve Ellcey's bug report in: + https://sourceware.org/ml/libc-alpha/2015-07/msg00673.html + * string/memrchr.c (MEMRCHR): + * string/rawmemchr.c (RAWMEMCHR): + * string/strchr.c (strchr): + * string/strchrnul.c (STRCHRNUL): + Rewrite code to avoid issues with signed shift overflow. + 2015-08-18 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/x86/cpu-features.c (init_cpu_features): Check diff --git a/string/memrchr.c b/string/memrchr.c index 0c8fd84901..86cd5b970c 100644 --- a/string/memrchr.c +++ b/string/memrchr.c @@ -96,15 +96,8 @@ MEMRCHR The 1-bits make sure that carries propagate to the next 0-bit. The 0-bits provide holes for carries to fall into. */ - - if (sizeof (longword) != 4 && sizeof (longword) != 8) - abort (); - -#if LONG_MAX <= LONG_MAX_32_BITS - magic_bits = 0x7efefeff; -#else - magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; -#endif + magic_bits = -1; + magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; /* Set up a longword, each of whose bytes is C. */ charmask = c | (c << 8); diff --git a/string/rawmemchr.c b/string/rawmemchr.c index 05b22be24e..228ca9d216 100644 --- a/string/rawmemchr.c +++ b/string/rawmemchr.c @@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in) The 1-bits make sure that carries propagate to the next 0-bit. The 0-bits provide holes for carries to fall into. */ - - if (sizeof (longword) != 4 && sizeof (longword) != 8) - abort (); - -#if LONG_MAX <= LONG_MAX_32_BITS - magic_bits = 0x7efefeff; -#else - magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; -#endif + magic_bits = -1; + magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; /* Set up a longword, each of whose bytes is C. */ charmask = c | (c << 8); diff --git a/string/strchr.c b/string/strchr.c index 5f900750a3..f13b2b3d94 100644 --- a/string/strchr.c +++ b/string/strchr.c @@ -60,13 +60,8 @@ strchr (const char *s, int c_in) The 1-bits make sure that carries propagate to the next 0-bit. The 0-bits provide holes for carries to fall into. */ - switch (sizeof (longword)) - { - case 4: magic_bits = 0x7efefeffL; break; - case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break; - default: - abort (); - } + magic_bits = -1; + magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; /* Set up a longword, each of whose bytes is C. */ charmask = c | (c << 8); diff --git a/string/strchrnul.c b/string/strchrnul.c index 2678f1de0a..daf0b3f659 100644 --- a/string/strchrnul.c +++ b/string/strchrnul.c @@ -66,13 +66,8 @@ STRCHRNUL (s, c_in) The 1-bits make sure that carries propagate to the next 0-bit. The 0-bits provide holes for carries to fall into. */ - switch (sizeof (longword)) - { - case 4: magic_bits = 0x7efefeffL; break; - case 8: magic_bits = ((0x7efefefeL << 16) << 16) | 0xfefefeffL; break; - default: - abort (); - } + magic_bits = -1; + magic_bits = magic_bits / 0xff * 0xfe << 1 >> 1 | 1; /* Set up a longword, each of whose bytes is C. */ charmask = c | (c << 8); |