diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-03-31 22:56:24 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-31 22:56:24 +0000 |
commit | 5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5 (patch) | |
tree | 15b1ff0a40462018402078788148c0c99d188429 /sysdeps/i386/stpncpy.S | |
parent | 3075e0e37c0e7cc2e6eb518c409e0769d058ed4b (diff) | |
download | glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.tar.gz glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.tar.xz glibc-5929563ff20245bbaa1b3ca2f4bfcee623ac6fb5.zip |
Update. cvs/libc-ud-970331
1997-04-01 00:37 Ulrich Drepper <drepper@cygnus.com> * math/Makefile: Prevent inlining for test-{float,double,longdouble}. * math/libm-test.c (initialize): Make strings unique and force values to memory. * posix/regex.c: Debug debugging code. * sysdeps/i386/asm-syntax.h: Define `L' macro to emit correct syntax for local label. * sysdeps/i386/add_n.S: Use correct local label syntax for the binary format. * sysdeps/i386/addmul_1.S: Likewise. * sysdeps/i386/lshift.S: Likewise. * sysdeps/i386/memchr.S: Likewise. * sysdeps/i386/memset.S: Likewise. * sysdeps/i386/mul_1.S: Likewise. * sysdeps/i386/rshift.S: Likewise. * sysdeps/i386/stpcpy.S: Likewise. * sysdeps/i386/stpncpy.S: Likewise. * sysdeps/i386/strchr.S: Likewise. * sysdeps/i386/strcspn.S: Likewise. * sysdeps/i386/strlen.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/i486/strcat.S: Likewise. * sysdeps/i386/i486/strlen.S: Likewise. * sysdeps/i386/i586/add_n.S: Likewise. * sysdeps/i386/i586/addmul_1.S: Likewise. * sysdeps/i386/i586/lshift.S: Likewise. * sysdeps/i386/i586/memset.S: Likewise. * sysdeps/i386/i586/mul_1.S: Likewise. * sysdeps/i386/i586/rshift.S: Likewise. * sysdeps/i386/i586/strchr.S: Likewise. * sysdeps/i386/i586/strlen.S: Likewise. * sysdeps/i386/i586/sub_n.S: Likewise. * sysdeps/i386/i586/submul_1.S: Likewise. * sysdeps/stub/s_log2l.c: Correct function name. * time/africa: Updated from ADO tzdata1997e. * time/aantarctica: Likewise. * time/asia: Likewise. * time/australia: Likewise. * time/europe: Likewise. * time/northamerica: Likewise. * time/southamerica: Likewise. * time/private.h: Updated from ADO tzcode1997d. * time/scheck.c: Likewise. 1997-03-31 12:42 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/powerpc/Dist: Add kernel_*.h files. 1997-03-23 01:41 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/powerpc/strlen.s: Rewrote for more speed. * string/tst-strlen.c: Also test various string alignments. 1997-03-19 06:11 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/powerpc/statbuf.h: Removed. * sysdeps/unix/sysv/linux/powerpc/kernel_stat.h: Added. * sysdeps/powerpc/dl-machine.h (ELF_PREFERRED_ADDRESS): Assume program base address is 0x01800000 if we can't otherwise tell what it is. (elf_machine_rela): Replace `assertion failed' with real error messages. * sysdeps/powerpc/dl-machine.h: More comments, more GNU indenting. Put in extra parentheses to make explicit the relative precedence of + and >>. * sysdeps/powerpc/bsd-setjmp.S: Add `__setjmp' symbol so the tests pass. * sysdeps/powerpc/clone.S: Rewrite. Probably still doesn't work. * sysdeps/unix/sysv/linux/powerpc/sys/sysdep.h: Use .section "text" instead of .text. 1997-03-31 02:28 Ulrich Drepper <drepper@cygnus.com> * misc/tst-tsearch.c: Don't write to stderr, write to stdout instead. * inet/inet_ntoa.c (inet_ntoa): Complete rewrite. Now uses thread-specific memory in multi-threaded programs. * sysdeps/stub/s_exp2.c: New file. Stub version for exp2 function. * sysdeps/stub/s_exp2f.c: New file. * sysdeps/stub/s_exp2l.c: New file. Reported by a sun <asun@zoology.washington.edu>. * sysdeps/unix/sysv/linux/netatalk/atalk.h: Rename to... * sysdeps/unix/sysv/linux/netatalk/at.h: ...this. Suggested by a sun <asun@zoology.washington.edu>. 1997-03-30 14:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip_icmp.h: Add former contents of <netinet/icmp.h>. Patch by a sun <asun@zoology.washington.edu>. * sysdeps/powerpc/strlen.S: Added.
Diffstat (limited to 'sysdeps/i386/stpncpy.S')
-rw-r--r-- | sysdeps/i386/stpncpy.S | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/sysdeps/i386/stpncpy.S b/sysdeps/i386/stpncpy.S index 96878fb79a..e0213082f8 100644 --- a/sysdeps/i386/stpncpy.S +++ b/sysdeps/i386/stpncpy.S @@ -1,7 +1,7 @@ -/* stpncpy -- copy no more then N bytes from SRC to DEST, returning the - address of the terminating '\0' in DEST. +/* copy no more then N bytes from SRC to DEST, returning the address of + the terminating '\0' in DEST. For Intel 80x86, x>=3. - Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu> Some bug fixes by Alan Modra <Alan@SPRI.Levels.UniSA.Edu.Au> @@ -45,98 +45,98 @@ ENTRY (__stpncpy) subl %eax, %esi /* magic: reduce number of loop variants to one using addressing mode */ - jmp L1 /* jump to loop "head" */ + jmp L(1) /* jump to loop "head" */ ALIGN(4) /* Four times unfolded loop with two loop counters. We get the the third value (the source address) by using the index+base addressing mode. */ -L2: movb (%eax,%esi), %dl /* load current char */ +L(2): movb (%eax,%esi), %dl /* load current char */ movb %dl, (%eax) /* and store it */ testb %dl, %dl /* was it NUL? */ - jz L7 /* yes, then exit */ + jz L(7) /* yes, then exit */ movb 1(%eax,%esi), %dl /* load current char */ movb %dl, 1(%eax) /* and store it */ testb %dl, %dl /* was it NUL? */ - jz L6 /* yes, then exit */ + jz L(6) /* yes, then exit */ movb 2(%eax,%esi), %dl /* load current char */ movb %dl, 2(%eax) /* and store it */ testb %dl, %dl /* was it NUL? */ - jz L5 /* yes, then exit */ + jz L(5) /* yes, then exit */ movb 3(%eax,%esi), %dl /* load current char */ movb %dl, 3(%eax) /* and store it */ testb %dl, %dl /* was it NUL? */ - jz L4 /* yes, then exit */ + jz L(4) /* yes, then exit */ addl $4, %eax /* increment loop counter for full round */ -L1: subl $4, %ecx /* still more than 4 bytes allowed? */ - jae L2 /* yes, then go to start of loop */ +L(1): subl $4, %ecx /* still more than 4 bytes allowed? */ + jae L(2) /* yes, then go to start of loop */ /* The maximal remaining 15 bytes are not processed in a loop. */ addl $4, %ecx /* correct above subtraction */ - jz L9 /* maximal allowed char reached => go to end */ + jz L(9) /* maximal allowed char reached => go to end */ movb (%eax,%esi), %dl /* load current char */ movb %dl, (%eax) /* and store it */ testb %dl, %dl /* was it NUL? */ - jz L3 /* yes, then exit */ + jz L(3) /* yes, then exit */ incl %eax /* increment pointer */ decl %ecx /* decrement length counter */ - jz L9 /* no more allowed => exit */ + jz L(9) /* no more allowed => exit */ movb (%eax,%esi), %dl /* load current char */ movb %dl, (%eax) /* and store it */ testb %dl, %dl /* was it NUL? */ - jz L3 /* yes, then exit */ + jz L(3) /* yes, then exit */ incl %eax /* increment pointer */ decl %ecx /* decrement length counter */ - jz L9 /* no more allowed => exit */ + jz L(9) /* no more allowed => exit */ movb (%eax,%esi), %dl /* load current char */ movb %dl, (%eax) /* and store it */ testb %dl, %dl /* was it NUL? */ - jz L3 /* yes, then exit */ + jz L(3) /* yes, then exit */ incl %eax /* increment pointer */ - jmp L9 /* we don't have to test for counter underflow + jmp L(9) /* we don't have to test for counter underflow because we know we had a most 3 bytes remaining => exit */ /* When coming from the main loop we have to adjust the pointer. */ -L4: decl %ecx /* decrement counter */ +L(4): decl %ecx /* decrement counter */ incl %eax /* increment pointer */ -L5: decl %ecx /* increment pointer */ +L(5): decl %ecx /* increment pointer */ incl %eax /* increment pointer */ -L6: decl %ecx /* increment pointer */ +L(6): decl %ecx /* increment pointer */ incl %eax /* increment pointer */ -L7: +L(7): addl $3, %ecx /* correct pre-decrementation of counter at the beginning of the loop; but why 3 and not 4? Very simple, we have to count the NUL char we already wrote. */ - jz L9 /* counter is also 0 => exit */ + jz L(9) /* counter is also 0 => exit */ /* We now have to fill the rest of the buffer with NUL. This is done in a tricky way. Please note that the addressing mode used below is not the same we used above. Here we use the %ecx register. */ -L8: +L(8): movb $0, (%ecx,%eax) /* store NUL char */ -L3: decl %ecx /* all bytes written? */ - jnz L8 /* no, then again */ +L(3): decl %ecx /* all bytes written? */ + jnz L(8) /* no, then again */ -L9: popl %esi /* restore saved register content */ +L(9): popl %esi /* restore saved register content */ ret END (__stpncpy) |