diff options
author | Greg McGary <greg@mcgary.org> | 2000-06-09 06:14:39 +0000 |
---|---|---|
committer | Greg McGary <greg@mcgary.org> | 2000-06-09 06:14:39 +0000 |
commit | 3f02f778cdbec7d95e0a9d6f9368ce9cda0a6d03 (patch) | |
tree | a193d5f40640e64b7b6555e831772c1934e2a8d0 /sysdeps/i386/strtok.S | |
parent | a40fb915f89d0e225058c0865de4504f83f90173 (diff) | |
download | glibc-3f02f778cdbec7d95e0a9d6f9368ce9cda0a6d03.zip glibc-3f02f778cdbec7d95e0a9d6f9368ce9cda0a6d03.tar.gz glibc-3f02f778cdbec7d95e0a9d6f9368ce9cda0a6d03.tar.bz2 |
* sysdeps/i386/bp-asm.h: New file.
* sysdeps/i386/__longjmp.S: Define & use symbolic argument stack
offsets. Add ENTER/LEAVE macros for optionally maintaining
frame-pointer chain when debugging.
* sysdeps/i386/add_n.S: Likewise.
* sysdeps/i386/addmul_1.S: Likewise.
* sysdeps/i386/lshift.S: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/i386/memcmp.S: Likewise.
* sysdeps/i386/mul_1.S: Likewise.
* sysdeps/i386/rawmemchr.S: Likewise.
* sysdeps/i386/rshift.S: Likewise.
* sysdeps/i386/stpcpy.S: Likewise.
* sysdeps/i386/stpncpy.S: Likewise.
* sysdeps/i386/strchr.S: Likewise.
* sysdeps/i386/strchrnul.S: Likewise.
* sysdeps/i386/strcspn.S: Likewise.
* sysdeps/i386/strpbrk.S: Likewise.
* sysdeps/i386/strrchr.S: Likewise.
* sysdeps/i386/strspn.S: Likewise.
* sysdeps/i386/strtok.S: Likewise.
* sysdeps/i386/sub_n.S: Likewise.
* sysdeps/i386/submul_1.S: Likewise.
* sysdeps/i386/elf/setjmp.S: Likewise.
* sysdeps/i386/i486/strcat.S: Likewise.
* sysdeps/i386/i486/strlen.S: Likewise.
* sysdeps/i386/i586/add_n.S: Likewise.
* sysdeps/i386/i586/lshift.S: Likewise.
* sysdeps/i386/i586/memcpy.S: Likewise.
* sysdeps/i386/i586/memset.S: Likewise.
* sysdeps/i386/i586/rshift.S: Likewise.
* sysdeps/i386/i586/strchr.S: Likewise.
* sysdeps/i386/i586/strcpy.S: Likewise.
* sysdeps/i386/i586/strlen.S: Likewise.
* sysdeps/i386/i586/sub_n.S: Likewise.
* sysdeps/i386/i686/add_n.S: Likewise.
* sysdeps/i386/i686/memcpy.S: Likewise.
* sysdeps/i386/i686/mempcpy.S: Likewise.
* sysdeps/i386/i686/memset.S: Likewise.
* sysdeps/i386/i686/strcmp.S: Likewise.
2000-06-08 Greg McGary <greg@mcgary.org>
* sysdeps/i386/bp-asm.h: New file.
* sysdeps/i386/__longjmp.S: Define & use symbolic argument stack
offsets. Add ENTER/LEAVE macros for optionally maintaining
frame-pointer chain when debugging.
* sysdeps/i386/add_n.S: Likewise.
* sysdeps/i386/addmul_1.S: Likewise.
* sysdeps/i386/lshift.S: Likewise.
* sysdeps/i386/memchr.S: Likewise.
* sysdeps/i386/memcmp.S: Likewise.
* sysdeps/i386/mul_1.S: Likewise.
* sysdeps/i386/rawmemchr.S: Likewise.
* sysdeps/i386/rshift.S: Likewise.
* sysdeps/i386/stpcpy.S: Likewise.
* sysdeps/i386/stpncpy.S: Likewise.
* sysdeps/i386/strchr.S: Likewise.
* sysdeps/i386/strchrnul.S: Likewise.
* sysdeps/i386/strcspn.S: Likewise.
* sysdeps/i386/strpbrk.S: Likewise.
* sysdeps/i386/strrchr.S: Likewise.
* sysdeps/i386/strspn.S: Likewise.
* sysdeps/i386/strtok.S: Likewise.
* sysdeps/i386/sub_n.S: Likewise.
* sysdeps/i386/submul_1.S: Likewise.
* sysdeps/i386/elf/setjmp.S: Likewise.
* sysdeps/i386/i486/strcat.S: Likewise.
* sysdeps/i386/i486/strlen.S: Likewise.
* sysdeps/i386/i586/add_n.S: Likewise.
* sysdeps/i386/i586/lshift.S: Likewise.
* sysdeps/i386/i586/memcpy.S: Likewise.
* sysdeps/i386/i586/memset.S: Likewise.
* sysdeps/i386/i586/rshift.S: Likewise.
* sysdeps/i386/i586/strchr.S: Likewise.
* sysdeps/i386/i586/strcpy.S: Likewise.
* sysdeps/i386/i586/strlen.S: Likewise.
* sysdeps/i386/i586/sub_n.S: Likewise.
* sysdeps/i386/i686/add_n.S: Likewise.
* sysdeps/i386/i686/memcpy.S: Likewise.
* sysdeps/i386/i686/mempcpy.S: Likewise.
* sysdeps/i386/i686/memset.S: Likewise.
* sysdeps/i386/i686/strcmp.S: Likewise.
Diffstat (limited to 'sysdeps/i386/strtok.S')
-rw-r--r-- | sysdeps/i386/strtok.S | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/sysdeps/i386/strtok.S b/sysdeps/i386/strtok.S index c6469e8..6fa6cc2 100644 --- a/sysdeps/i386/strtok.S +++ b/sysdeps/i386/strtok.S @@ -1,6 +1,6 @@ /* strtok (str, delim) -- Return next DELIM separated token from STR. For Intel 80x86, x>=3. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -21,6 +21,7 @@ #include <sysdep.h> #include "asm-syntax.h" +#include "bp-asm.h" /* This file can be used for three variants of the strtok function: @@ -48,12 +49,19 @@ save_ptr: #define FUNCTION strtok #endif +#define PARMS LINKAGE /* no space for saved regs */ +#define RTN PARMS +#define STR RTN+RTN_SIZE +#define DELIM STR+PTR_SIZE +#define SAVE DELIM+PTR_SIZE + .text ENTRY (FUNCTION) + ENTER - movl 4(%esp), %edx /* Get start of string. */ - movl 8(%esp), %eax /* Get start of delimiter set. */ + movl STR(%esp), %edx + movl DELIM(%esp), %eax #if !defined (USE_AS_STRTOK_R) && defined (PIC) pushl %ebx /* Save PIC register. */ @@ -70,7 +78,7 @@ L(here): #ifdef USE_AS_STRTOK_R /* The value is stored in the third argument. */ - movl 12(%esp), %edx + movl SAVE(%esp), %edx movl (%edx), %edx #else /* The value is in the local variable defined above. But @@ -257,7 +265,7 @@ L(11): L(return): /* Store the pointer to the next character. */ #ifdef USE_AS_STRTOK_R - movl 12(%esp), %ecx + movl SAVE(%esp), %ecx movl %edx, (%ecx) #else # ifndef PIC @@ -267,7 +275,8 @@ L(return): popl %ebx # endif #endif - ret + LEAVE + RET_PTR L(returnNULL): xorl %eax, %eax |