diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-12-13 11:43:39 -0200 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-12-20 16:55:26 -0200 |
commit | 24d1d8ec9e529ed66c49e17366fe5a889d483670 (patch) | |
tree | a80a960c7f0b071cff127c37d76814413e3a956d /sysdeps/tile/tilegx/strnlen.c | |
parent | ed95f6114928f00f5f8fe76ccf2ec9e77872cbad (diff) | |
download | glibc-24d1d8ec9e529ed66c49e17366fe5a889d483670.tar glibc-24d1d8ec9e529ed66c49e17366fe5a889d483670.tar.gz glibc-24d1d8ec9e529ed66c49e17366fe5a889d483670.tar.bz2 glibc-24d1d8ec9e529ed66c49e17366fe5a889d483670.zip |
Simplify tilegx sysdeps folder
With tilepro support removal we can now simplify internal tile support by
moving the directory structure to avoid the unnecessary directory levels
in tile/tilegx both on generic and linux folders.
Checked with a build for tilegx-linux-gnu and tilegx-linux-gnu-32 with
and without the patch, there is no difference in generated binary with
a dissassemble.
* stdlib/bug-getcontext.c (do_test): Remove tilepro mention in
comment.
* sysdeps/tile/preconfigure: Remove tilegx folder.
* sysdeps/tile/tilegx/Implies: Move definitions to ...
* sysdeps/tile/Implies: ... here.
* sysdeps/tile/tilegx/Makefile: Move rules to ...
* sysdeps/tile/Makefile: ... here.
* sysdeps/tile/tilegx/atomic-machine.h: Move definitions to ...
* sysdeps/tile/atomic-machine.h: ... here. Add include guards.
* sysdeps/tile/tilegx/bits/wordsize.h: Move to ...
* sysdeps/tile/bits/wordsize.h: ... here.
* sysdeps/tile/tilegx/*: Move to ...
* sysdeps/tile/*: ... here.
* sysdeps/tile/tilegx/tilegx32/Implies: Move to ...
* sysdeps/tile/tilegx32/Implies: ... here.
* sysdeps/tile/tilegx/tilegx64/Implies: Move to ...
* sysdeps/tile/tilegx64/Implies: ... here.
* sysdeps/unix/sysv/linux/tile/tilegx/Makefile: Move definitions
to ...
* sysdeps/unix/sysv/linux/tile/Makefile: ... here.
* sysdeps/unix/sysv/linux/tile/tilegx/*: Move to ...
* sysdeps/unix/sysv/linux/tile/*: ... here.
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/*: Move to ...
* sysdeps/unix/sysv/linux/tile/tilegx32/*: ... here.
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/*: Move to ...
* sysdeps/unix/sysv/linux/tile/tilegx64/*: ... here.
Diffstat (limited to 'sysdeps/tile/tilegx/strnlen.c')
-rw-r--r-- | sysdeps/tile/tilegx/strnlen.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/sysdeps/tile/tilegx/strnlen.c b/sysdeps/tile/tilegx/strnlen.c deleted file mode 100644 index c3560d208d..0000000000 --- a/sysdeps/tile/tilegx/strnlen.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (C) 2013-2017 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <string.h> -#include <stdint.h> -#include "string-endian.h" - -/* Find the length of S, but scan at most MAXLEN characters. If no - '\0' terminator is found in that many characters, return MAXLEN. */ -size_t -__strnlen (const char *s, size_t maxlen) -{ - /* When maxlen is 0, can't read any bytes or it might cause a page fault. */ - if (maxlen == 0) - return 0; - - /* Get an aligned pointer. */ - const uintptr_t s_int = (uintptr_t) s; - const uint64_t *p = (const uint64_t *) (s_int & -8); - size_t bytes_read = sizeof (*p) - (s_int & (sizeof (*p) - 1)); - - /* Read and MASK the first word. */ - uint64_t v = *p | MASK (s_int); - - uint64_t bits; - while ((bits = v1cmpeqi (v, 0)) == 0) - { - if (bytes_read >= maxlen) - { - /* Read maxlen bytes and didn't find the terminator. */ - return maxlen; - } - v = *++p; - bytes_read += sizeof (v); - } - - /* Found '\0', check it is not larger than maxlen */ - size_t len = ((const char *) p) + (CFZ (bits) >> 3) - s; - return (len < maxlen ? len : maxlen); -} -libc_hidden_def (__strnlen) -weak_alias (__strnlen, strnlen) -libc_hidden_def (strnlen) |