1999-03-29 13:25:15 +00:00
|
|
|
/* memchr (str, ch, n) -- Return pointer to first occurrence of CH in STR less
|
|
|
|
than N.
|
|
|
|
For SPARC v7.
|
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
2000-07-17 22:36:16 +00:00
|
|
|
Copyright (C) 1996,1999, 2000 Free Software Foundation, Inc.
|
1999-03-29 13:25:15 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Jakub Jelinek <jj@ultra.linux.cz> and
|
|
|
|
David S. Miller <davem@caip.rutgers.edu>.
|
|
|
|
This version is developed using the same algorithm as the fast C
|
|
|
|
version which carries the following introduction:
|
|
|
|
Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
|
|
|
|
with help from Dan Sahlin (dan@sics.se) and
|
|
|
|
commentary by Jim Blandy (jimb@ai.mit.edu);
|
|
|
|
adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu),
|
|
|
|
and implemented by Roland McGrath (roland@ai.mit.edu).
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
1999-03-29 13:25:15 +00:00
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1999-03-29 13:25:15 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA. */
|
1999-03-29 13:25:15 +00:00
|
|
|
|
|
|
|
#include <sysdep.h>
|
|
|
|
|
|
|
|
.text
|
|
|
|
.align 4
|
|
|
|
0: cmp %o2, 0
|
|
|
|
be 9f
|
|
|
|
sethi %hi(0x80808080), %o4
|
|
|
|
ldub [%o0], %g4
|
|
|
|
cmp %g4, %o1
|
|
|
|
be 1f
|
|
|
|
add %o0, 1, %o0
|
|
|
|
subcc %o2, 1, %o2
|
|
|
|
be 9f
|
|
|
|
andcc %o0, 3, %g0
|
|
|
|
be 4f
|
|
|
|
or %o4, %lo(0x80808080), %o3
|
|
|
|
ldub [%o0], %g4
|
|
|
|
cmp %g4, %o1
|
|
|
|
be 1f
|
|
|
|
add %o0, 1, %o0
|
|
|
|
subcc %o2, 1, %o2
|
|
|
|
be 9f
|
|
|
|
andcc %o0, 3, %g0
|
|
|
|
be 5f
|
|
|
|
sethi %hi(0x01010101), %o5
|
|
|
|
ldub [%o0], %g4
|
|
|
|
cmp %g4, %o1
|
|
|
|
be 1f
|
|
|
|
add %o0, 1, %o0
|
|
|
|
subcc %o2, 1, %o2
|
|
|
|
bne,a 7f
|
|
|
|
and %o2, 3, %g1
|
|
|
|
retl
|
|
|
|
clr %o0
|
|
|
|
1: retl
|
|
|
|
sub %o0, 1, %o0
|
|
|
|
|
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
2000-07-17 22:36:16 +00:00
|
|
|
ENTRY(__memchr)
|
1999-03-29 13:25:15 +00:00
|
|
|
andcc %o1, 0xff, %o1
|
|
|
|
sll %o1, 8, %g7
|
|
|
|
andcc %o0, 3, %g0
|
|
|
|
or %o1, %g7, %g7
|
|
|
|
sll %g7, 16, %o3
|
|
|
|
bne 0b
|
|
|
|
or %o3, %g7, %g2
|
|
|
|
sethi %hi(0x80808080), %o4
|
|
|
|
or %o4, %lo(0x80808080), %o3
|
|
|
|
4: sethi %hi(0x01010101), %o5
|
|
|
|
5: and %o2, 3, %g1
|
|
|
|
7: andcc %o2, 0xfffffffc, %o2
|
|
|
|
be 0f
|
|
|
|
or %o5, %lo(0x01010101), %g7
|
|
|
|
ld [%o0], %g4
|
|
|
|
6: xor %g4, %g2, %g5
|
|
|
|
add %o0, 4, %o0
|
|
|
|
sub %g5, %g7, %g5
|
|
|
|
andcc %g5, %o3, %g0
|
|
|
|
bne 8f
|
|
|
|
subcc %o2, 4, %o2
|
|
|
|
bne,a 6b
|
|
|
|
ld [%o0], %g4
|
|
|
|
0: cmp %g1, 0
|
|
|
|
1: be 9f
|
|
|
|
add %o0, 4, %o0
|
|
|
|
ldub [%o0 - 4], %g4
|
|
|
|
cmp %g4, %o1
|
|
|
|
be 4f
|
|
|
|
cmp %g1, 1
|
|
|
|
be 9f
|
|
|
|
ldub [%o0 - 3], %g4
|
|
|
|
cmp %g4, %o1
|
|
|
|
be 3f
|
|
|
|
cmp %g1, 2
|
|
|
|
be 9f
|
|
|
|
ldub [%o0 - 2], %g4
|
|
|
|
cmp %g4, %o1
|
|
|
|
be 2f
|
|
|
|
nop
|
|
|
|
9: retl
|
|
|
|
clr %o0
|
|
|
|
|
|
|
|
/* Check every byte. */
|
update
2000-07-26 Greg McGary <greg@mcgary.org>
* Makeconfig (+link-bounded, link-libc-bounded,
link-extra-libs-bounded): New variables.
(built-program-cmd): Omit $(run-program-prefix) for static BP tests.
* Makerules (do-tests-clean, common-mostlyclean): Remove BP test files.
* Rules (tests-bp.out): New variable.
(tests): Conditionally add BP tests.
(binaries-bounded): Add variable and associated rule.
* csu/Makefile [build-bounded] (extra-objs, install-lib):
Move conditional stuff after place where condition is defined.
* malloc/malloc.c (bp-checks.h): Add #include.
(mem2chunk, chunk_at_offset, bin_at): Wrap BOUNDED_1 around expression.
(_bin_at): Add unbounded version of bin_at.
(IAV, chunk_alloc): Use unbounded _bin_at.
(mALLOc, rEALLOc, chunk_realloc, mEMALIGn, cALLOc,
chunk2mem_check, realloc_check, malloc_starter, malloc_atfork):
Wrap BOUNDED_N around return value.
(chunk_realloc): Adjust oldsize once.
* sysdeps/generic/bp-checks.h (__memchr): Remove incorrect decl.
(__ubp_memchr): Add correct decl.
(_CHECK_STRING): Use __ubp_memchr.
* sysdeps/alpha/memchr.S [!__BOUNDED_POINTERS__] (__ubp_memchr):
New alias for unbounded-pointer __memchr.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
* sysdeps/i386/strtok.S: Fix bounds checks to pass tests.
(SAVE_PTR): New macro. (save_ptr): Expand size as BP.
(strtok): Don't bother to write into SAVE_PTR when returning NULL.
* sysdeps/i386/i686/strtok.S: Likewise.
* sysdeps/i386/bp-asm.h (RETURN_BOUNDED_POINTER,
RETURN_NULL_BOUNDED_POINTER): Use %ecx as the scratch register.
* sysdeps/i386/bits/string.h [!__BOUNDED_POINTERS__]: Disable inlines.
* sysdeps/i386/i486/bits/string.h [!__BOUNDED_POINTERS__]: Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Copy
bounds of copy_result to mount_proc.
2000-07-26 18:21:25 +00:00
|
|
|
8: srl %g4, 24, %g5
|
1999-03-29 13:25:15 +00:00
|
|
|
and %g5, 0xff, %g5
|
|
|
|
cmp %g5, %o1
|
|
|
|
be 4f
|
|
|
|
srl %g4, 16, %g5
|
|
|
|
and %g5, 0xff, %g5
|
|
|
|
cmp %g5, %o1
|
|
|
|
be 3f
|
|
|
|
srl %g4, 8, %g5
|
|
|
|
and %g5, 0xff, %g5
|
|
|
|
cmp %g5, %o1
|
|
|
|
be 2f
|
|
|
|
and %g4, 0xff, %g5
|
|
|
|
cmp %g5, %o1
|
|
|
|
be 1f
|
|
|
|
cmp %o2, 0
|
|
|
|
bne,a 6b
|
|
|
|
ld [%o0], %g4
|
|
|
|
b 1b
|
|
|
|
cmp %g1, 0
|
|
|
|
1: retl
|
|
|
|
sub %o0, 1, %o0
|
|
|
|
2: retl
|
|
|
|
sub %o0, 2, %o0
|
|
|
|
3: retl
|
|
|
|
sub %o0, 3, %o0
|
|
|
|
4: retl
|
|
|
|
sub %o0, 4, %o0
|
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
* sysdeps/generic/bp-checks.h: Use unbounded __memchr
rather than non-existent __ubp_memchr.
(CHECK_STRINGopt, CHECK_FCNTL, BOUNDED_N, BOUNDED_1): New macros.
(_CHECK_STRING, _CHECK_N): New macros.
(CHECK_STRING, CHECK_N, CHECK_Nopt): Rewrite in terms of _CHECK_*.
(CHECK_IOCTL): Move inside `#if !__ASSEMBLER__'.
* sysdeps/alpha/memchr.S: Change strong name to "__memchr".
Add weak alias "memchr".
* sysdeps/generic/memchr.c: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
2000-07-17 22:36:16 +00:00
|
|
|
END(__memchr)
|
|
|
|
|
|
|
|
weak_alias (__memchr, memchr)
|
update
2000-07-26 Greg McGary <greg@mcgary.org>
* Makeconfig (+link-bounded, link-libc-bounded,
link-extra-libs-bounded): New variables.
(built-program-cmd): Omit $(run-program-prefix) for static BP tests.
* Makerules (do-tests-clean, common-mostlyclean): Remove BP test files.
* Rules (tests-bp.out): New variable.
(tests): Conditionally add BP tests.
(binaries-bounded): Add variable and associated rule.
* csu/Makefile [build-bounded] (extra-objs, install-lib):
Move conditional stuff after place where condition is defined.
* malloc/malloc.c (bp-checks.h): Add #include.
(mem2chunk, chunk_at_offset, bin_at): Wrap BOUNDED_1 around expression.
(_bin_at): Add unbounded version of bin_at.
(IAV, chunk_alloc): Use unbounded _bin_at.
(mALLOc, rEALLOc, chunk_realloc, mEMALIGn, cALLOc,
chunk2mem_check, realloc_check, malloc_starter, malloc_atfork):
Wrap BOUNDED_N around return value.
(chunk_realloc): Adjust oldsize once.
* sysdeps/generic/bp-checks.h (__memchr): Remove incorrect decl.
(__ubp_memchr): Add correct decl.
(_CHECK_STRING): Use __ubp_memchr.
* sysdeps/alpha/memchr.S [!__BOUNDED_POINTERS__] (__ubp_memchr):
New alias for unbounded-pointer __memchr.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/ia64/memchr.S: Likewise.
* sysdeps/m68k/memchr.S: Likewise.
* sysdeps/sparc/sparc32/memchr.S: Likewise.
* sysdeps/sparc/sparc64/memchr.S: Likewise.
* sysdeps/vax/memchr.s: Likewise.
* sysdeps/i386/strtok.S: Fix bounds checks to pass tests.
(SAVE_PTR): New macro. (save_ptr): Expand size as BP.
(strtok): Don't bother to write into SAVE_PTR when returning NULL.
* sysdeps/i386/i686/strtok.S: Likewise.
* sysdeps/i386/bp-asm.h (RETURN_BOUNDED_POINTER,
RETURN_NULL_BOUNDED_POINTER): Use %ecx as the scratch register.
* sysdeps/i386/bits/string.h [!__BOUNDED_POINTERS__]: Disable inlines.
* sysdeps/i386/i486/bits/string.h [!__BOUNDED_POINTERS__]: Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Copy
bounds of copy_result to mount_proc.
2000-07-26 18:21:25 +00:00
|
|
|
#if !__BOUNDED_POINTERS__
|
|
|
|
weak_alias (__memchr, __ubp_memchr)
|
|
|
|
#endif
|