mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-07 05:40:05 +00:00
2ed5fd9a2a
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.
270 lines
7.4 KiB
ArmAsm
270 lines
7.4 KiB
ArmAsm
/* strtok (str, delim) -- Return next DELIM separated token from STR.
|
|
For Intel 80686.
|
|
Copyright (C) 1998, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
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. */
|
|
|
|
#include <sysdep.h>
|
|
#include "asm-syntax.h"
|
|
#include "bp-sym.h"
|
|
#include "bp-asm.h"
|
|
|
|
/* This file can be used for three variants of the strtok function:
|
|
|
|
strtok:
|
|
INPUT PARAMETER:
|
|
str (sp + 4)
|
|
delim (sp + 8)
|
|
|
|
strtok_r:
|
|
INPUT PARAMETER:
|
|
str (sp + 4)
|
|
delim (sp + 8)
|
|
save_ptr (sp + 12)
|
|
|
|
We do a common implementation here. */
|
|
|
|
#ifdef USE_AS_STRTOK_R
|
|
# define SAVE_PTR 0(%ecx)
|
|
#else
|
|
.bss
|
|
.local save_ptr
|
|
ASM_TYPE_DIRECTIVE (save_ptr, @object)
|
|
.size save_ptr, 4
|
|
save_ptr:
|
|
# if __BOUNDED_POINTERS__
|
|
.space 12
|
|
# else
|
|
.space 4
|
|
# endif
|
|
|
|
# ifdef PIC
|
|
# define SAVE_PTR save_ptr@GOTOFF(%ebx)
|
|
# else
|
|
# define SAVE_PTR save_ptr
|
|
# endif
|
|
|
|
# define FUNCTION strtok
|
|
#endif
|
|
|
|
#if !defined USE_AS_STRTOK_R && defined PIC
|
|
# define PARMS LINKAGE+256+4 /* space for table and saved PIC register */
|
|
#else
|
|
# define PARMS LINKAGE+256 /* space for table */
|
|
#endif
|
|
#define RTN PARMS
|
|
#define STR RTN+RTN_SIZE
|
|
#define DELIM STR+PTR_SIZE
|
|
#ifdef USE_AS_STRTOK_R
|
|
# define SAVE DELIM+PTR_SIZE
|
|
#endif
|
|
|
|
.text
|
|
|
|
#if !defined USE_AS_STRTOK_R && defined PIC
|
|
0: movl (%esp), %ebx
|
|
ret
|
|
#endif
|
|
|
|
ENTRY (BP_SYM (FUNCTION))
|
|
ENTER
|
|
|
|
#if !defined USE_AS_STRTOK_R && defined PIC
|
|
pushl %ebx /* Save PIC register. */
|
|
call 0b
|
|
addl $_GLOBAL_OFFSET_TABLE_, %ebx
|
|
#endif
|
|
|
|
/* First we create a table with flags for all possible characters.
|
|
For the ASCII (7bit/8bit) or ISO-8859-X character sets which are
|
|
supported by the C string functions we have 256 characters.
|
|
Before inserting marks for the stop characters we clear the whole
|
|
table. */
|
|
movl %edi, %edx
|
|
subl $256, %esp
|
|
movl $64, %ecx
|
|
movl %esp, %edi
|
|
xorl %eax, %eax
|
|
cld
|
|
rep
|
|
stosl
|
|
|
|
/* Note: %ecx = 0 !!! */
|
|
movl %edx, %edi
|
|
|
|
movl STR(%esp), %edx /* Get start of string. */
|
|
|
|
#ifdef USE_AS_STRTOK_R
|
|
/* The value is stored in the third argument. */
|
|
movl SAVE(%esp), %eax
|
|
movl (%eax), %eax
|
|
#else
|
|
/* The value is in the local variable defined above. But
|
|
we have to take care for PIC code. */
|
|
movl SAVE_PTR, %eax
|
|
#endif
|
|
|
|
/* If the pointer is NULL we have to use the stored value of
|
|
the last run. */
|
|
cmpl $0, %edx
|
|
cmove %eax, %edx
|
|
#if __BOUNDED_POINTERS__
|
|
# ifdef USE_AS_STRTOK_R
|
|
movl SAVE(%esp), %ecx /* borrow %ecx for a moment */
|
|
# endif
|
|
je L(0)
|
|
/* Save bounds of incoming non-NULL STR into save area. */
|
|
movl 4+STR(%esp), %eax
|
|
movl %eax, 4+SAVE_PTR
|
|
movl 8+STR(%esp), %eax
|
|
movl %eax, 8+SAVE_PTR
|
|
L(0): CHECK_BOUNDS_LOW (%edx, SAVE_PTR)
|
|
# ifdef USE_AS_STRTOK_R
|
|
xorl %ecx, %ecx /* restore %ecx to zero */
|
|
# endif
|
|
#endif
|
|
movl DELIM(%esp), %eax /* Get start of delimiter set. */
|
|
CHECK_BOUNDS_LOW (%eax, DELIM(%esp))
|
|
|
|
/* For understanding the following code remember that %ecx == 0 now.
|
|
Although all the following instruction only modify %cl we always
|
|
have a correct zero-extended 32-bit value in %ecx. */
|
|
|
|
L(2): movb (%eax), %cl /* get byte from stopset */
|
|
testb %cl, %cl /* is NUL char? */
|
|
jz L(1_1) /* yes => start compare loop */
|
|
movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */
|
|
|
|
movb 1(%eax), %cl /* get byte from stopset */
|
|
testb $0xff, %cl /* is NUL char? */
|
|
jz L(1_2) /* yes => start compare loop */
|
|
movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */
|
|
|
|
movb 2(%eax), %cl /* get byte from stopset */
|
|
testb $0xff, %cl /* is NUL char? */
|
|
jz L(1_3) /* yes => start compare loop */
|
|
movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */
|
|
|
|
movb 3(%eax), %cl /* get byte from stopset */
|
|
addl $4, %eax /* increment stopset pointer */
|
|
movb %cl, (%esp,%ecx) /* set corresponding byte in stopset table */
|
|
testb $0xff, %cl /* is NUL char? */
|
|
jnz L(2) /* no => process next dword from stopset */
|
|
|
|
#if __BOUNDED_POINTERS__
|
|
jmp L(1_0) /* pointer is correct for bounds check */
|
|
L(1_3): incl %eax /* adjust pointer for bounds check */
|
|
L(1_2): incl %eax /* ditto */
|
|
L(1_1): incl %eax /* ditto */
|
|
L(1_0): CHECK_BOUNDS_HIGH (%eax, DELIM(%esp), jbe)
|
|
#else
|
|
L(1_3):; L(1_2):; L(1_1): /* fall through */
|
|
#endif
|
|
leal -4(%edx), %eax /* prepare loop */
|
|
|
|
/* We use a neat trick for the following loop. Normally we would
|
|
have to test for two termination conditions
|
|
1. a character in the stopset was found
|
|
and
|
|
2. the end of the string was found
|
|
As a sign that the character is in the stopset we store its
|
|
value in the table. The value of NUL is NUL so the loop
|
|
terminates for NUL in every case. */
|
|
|
|
L(3): addl $4, %eax /* adjust pointer for full loop round */
|
|
|
|
movb (%eax), %cl /* get byte from string */
|
|
testb %cl, (%esp,%ecx) /* is it contained in stopset? */
|
|
jz L(4) /* no => start of token */
|
|
|
|
movb 1(%eax), %cl /* get byte from string */
|
|
testb %cl, (%esp,%ecx) /* is it contained in stopset? */
|
|
jz L(5) /* no => start of token */
|
|
|
|
movb 2(%eax), %cl /* get byte from string */
|
|
testb %cl, (%esp,%ecx) /* is it contained in stopset? */
|
|
jz L(6) /* no => start of token */
|
|
|
|
movb 3(%eax), %cl /* get byte from string */
|
|
testb %cl, (%esp,%ecx) /* is it contained in stopset? */
|
|
jnz L(3) /* yes => start of loop */
|
|
|
|
incl %eax /* adjust pointer */
|
|
L(6): incl %eax
|
|
L(5): incl %eax
|
|
|
|
/* Now we have to terminate the string. */
|
|
|
|
L(4): leal -4(%eax), %edx /* We use %EDX for the next run. */
|
|
|
|
L(7): addl $4, %edx /* adjust pointer for full loop round */
|
|
|
|
movb (%edx), %cl /* get byte from string */
|
|
cmpb %cl, (%esp,%ecx) /* is it contained in skipset? */
|
|
je L(8) /* yes => return */
|
|
|
|
movb 1(%edx), %cl /* get byte from string */
|
|
cmpb %cl, (%esp,%ecx) /* is it contained in skipset? */
|
|
je L(9) /* yes => return */
|
|
|
|
movb 2(%edx), %cl /* get byte from string */
|
|
cmpb %cl, (%esp,%ecx) /* is it contained in skipset? */
|
|
je L(10) /* yes => return */
|
|
|
|
movb 3(%edx), %cl /* get byte from string */
|
|
cmpb %cl, (%esp,%ecx) /* is it contained in skipset? */
|
|
jne L(7) /* no => start loop again */
|
|
|
|
incl %edx /* adjust pointer */
|
|
L(10): incl %edx
|
|
L(9): incl %edx
|
|
|
|
L(8): cmpl %eax, %edx
|
|
je L(returnNULL) /* There was no token anymore. */
|
|
|
|
movb $0, (%edx) /* Terminate string. */
|
|
|
|
/* Are we at end of string? */
|
|
cmpb $0, %cl
|
|
leal 1(%edx), %ecx
|
|
cmovne %ecx, %edx
|
|
|
|
/* Store the pointer to the next character. */
|
|
# ifdef USE_AS_STRTOK_R
|
|
movl SAVE(%esp), %ecx
|
|
# endif
|
|
movl %edx, SAVE_PTR
|
|
CHECK_BOUNDS_HIGH (%edx, SAVE_PTR, jb)
|
|
RETURN_BOUNDED_POINTER (SAVE_PTR)
|
|
|
|
L(epilogue):
|
|
/* Remove the stopset table. */
|
|
addl $256, %esp
|
|
#if !defined USE_AS_STRTOK_R && defined PIC
|
|
popl %ebx
|
|
#endif
|
|
LEAVE
|
|
RET_PTR
|
|
|
|
L(returnNULL):
|
|
xorl %eax, %eax
|
|
RETURN_NULL_BOUNDED_POINTER
|
|
jmp L(epilogue)
|
|
|
|
END (BP_SYM (FUNCTION))
|