[src/trunk]: src/common/lib/libc/arch/i386/string For all i386 string assembl...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0881544d5863
branches:  trunk
changeset: 327970:0881544d5863
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Mar 22 19:38:46 2014 +0000

description:
For all i386 string assembly functions that don't overlap use END() so
that symbol size information is available.

diffstat:

 common/lib/libc/arch/i386/string/ffs.S          |   3 ++-
 common/lib/libc/arch/i386/string/memchr.S       |   5 +++--
 common/lib/libc/arch/i386/string/memcmp.S       |   3 ++-
 common/lib/libc/arch/i386/string/memcpy.S       |  14 ++++++++++++--
 common/lib/libc/arch/i386/string/small/memcmp.S |   5 +++--
 common/lib/libc/arch/i386/string/small/memset.S |   5 +++--
 common/lib/libc/arch/i386/string/small/strchr.S |   5 +++--
 common/lib/libc/arch/i386/string/small/strcmp.S |   5 +++--
 common/lib/libc/arch/i386/string/small/strcpy.S |   5 +++--
 common/lib/libc/arch/i386/string/small/strlen.S |   5 +++--
 common/lib/libc/arch/i386/string/strcat.S       |   3 ++-
 common/lib/libc/arch/i386/string/strchr.S       |   3 ++-
 common/lib/libc/arch/i386/string/strcmp.S       |   3 ++-
 common/lib/libc/arch/i386/string/strcpy.S       |   7 ++++---
 common/lib/libc/arch/i386/string/strlen.S       |   3 ++-
 common/lib/libc/arch/i386/string/strrchr.S      |   3 ++-
 16 files changed, 51 insertions(+), 26 deletions(-)

diffs (truncated from 354 to 300 lines):

diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/ffs.S
--- a/common/lib/libc/arch/i386/string/ffs.S    Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/ffs.S    Sat Mar 22 19:38:46 2014 +0000
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: ffs.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+       RCSID("$NetBSD: ffs.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
 ENTRY(ffs)
@@ -18,3 +18,4 @@
        _ALIGN_TEXT
 L1:    xorl    %eax,%eax               /* clear result */
        ret
+END(ffs)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/memchr.S
--- a/common/lib/libc/arch/i386/string/memchr.S Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/memchr.S Sat Mar 22 19:38:46 2014 +0000
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: memchr.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+       RCSID("$NetBSD: memchr.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
 ENTRY(memchr)
@@ -16,7 +16,7 @@
        movl    16(%esp),%esi
 
        /*
-        * Align to word boundary. 
+        * Align to word boundary.
         * Consider unrolling loop?
         */
        testl   %esi,%esi       /* nbytes == 0? */
@@ -107,3 +107,4 @@
 .Ldone:
        popl    %esi
        ret
+END(memchr)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/memcmp.S
--- a/common/lib/libc/arch/i386/string/memcmp.S Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/memcmp.S Sat Mar 22 19:38:46 2014 +0000
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: memcmp.S,v 1.2 2007/11/12 18:41:59 ad Exp $")
+       RCSID("$NetBSD: memcmp.S,v 1.3 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
 ENTRY(memcmp)
@@ -45,3 +45,4 @@
        popl    %esi
        popl    %edi
        ret
+END(memcmp)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/memcpy.S
--- a/common/lib/libc/arch/i386/string/memcpy.S Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/memcpy.S Sat Mar 22 19:38:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memcpy.S,v 1.3 2007/11/12 18:41:59 ad Exp $    */
+/*     $NetBSD: memcpy.S,v 1.4 2014/03/22 19:38:46 jakllsch Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: memcpy.S,v 1.3 2007/11/12 18:41:59 ad Exp $")
+       RCSID("$NetBSD: memcpy.S,v 1.4 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
        /*
@@ -131,3 +131,13 @@
        movb    %al,(%edi)
        jmp     .Lback_aligned
 #endif
+
+#ifdef BCOPY
+END(bcopy)
+#else
+#ifdef MEMMOVE
+END(memmove)
+#else
+END(memcpy)
+#endif
+#endif
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/small/memcmp.S
--- a/common/lib/libc/arch/i386/string/small/memcmp.S   Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/small/memcmp.S   Sat Mar 22 19:38:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*     $NetBSD: memcmp.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $      */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-       RCSID("$NetBSD: memcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+       RCSID("$NetBSD: memcmp.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 
 ENTRY(memcmp)
        pushl   %esi
@@ -48,3 +48,4 @@
 1:
        decl %eax
        ret
+END(memcmp)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/small/memset.S
--- a/common/lib/libc/arch/i386/string/small/memset.S   Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/small/memset.S   Sat Mar 22 19:38:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memset.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*     $NetBSD: memset.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $      */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <machine/asm.h>
-       RCSID("$NetBSD: memset.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+       RCSID("$NetBSD: memset.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 
 ENTRY(memset)
        pushl   %edi
@@ -43,3 +43,4 @@
        popl    %eax
        popl    %edi
        ret
+END(memset)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/small/strchr.S
--- a/common/lib/libc/arch/i386/string/small/strchr.S   Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/small/strchr.S   Sat Mar 22 19:38:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strchr.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*     $NetBSD: strchr.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $      */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-       RCSID("$NetBSD: strchr.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+       RCSID("$NetBSD: strchr.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 
 ENTRY(strchr)
        popl    %edx            /* Return address */
@@ -49,3 +49,4 @@
        xorl    %eax, %eax
 3:
        ret
+END(strchr)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/small/strcmp.S
--- a/common/lib/libc/arch/i386/string/small/strcmp.S   Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/small/strcmp.S   Sat Mar 22 19:38:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*     $NetBSD: strcmp.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $      */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-       RCSID("$NetBSD: strcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+       RCSID("$NetBSD: strcmp.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 
 ENTRY(strcmp)
        pushl   %esi
@@ -48,3 +48,4 @@
        movsbl  %al, %eax
        popl    %esi
        ret
+END(strcmp)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/small/strcpy.S
--- a/common/lib/libc/arch/i386/string/small/strcpy.S   Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/small/strcpy.S   Sat Mar 22 19:38:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*     $NetBSD: strcpy.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $      */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-       RCSID("$NetBSD: strcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+       RCSID("$NetBSD: strcpy.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 
 ENTRY(strcpy)
        pushl   %esi
@@ -46,3 +46,4 @@
        popl    %edi
        popl    %esi
        ret
+END(strcpy)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/small/strlen.S
--- a/common/lib/libc/arch/i386/string/small/strlen.S   Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/small/strlen.S   Sat Mar 22 19:38:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strlen.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*     $NetBSD: strlen.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $      */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <machine/asm.h>
-       RCSID("$NetBSD: strlen.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+       RCSID("$NetBSD: strlen.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 ENTRY(strlen)
         movl    8(%esp), %ecx
         xorl    %eax, %eax
@@ -39,3 +39,4 @@
         cmpb    $0, 0(%ecx,%eax,1)
         jnz 1b
         ret
+END(strlen)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/strcat.S
--- a/common/lib/libc/arch/i386/string/strcat.S Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/strcat.S Sat Mar 22 19:38:46 2014 +0000
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: strcat.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+       RCSID("$NetBSD: strcat.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
 ENTRY(strcat)
@@ -125,3 +125,4 @@
        movl    8(%esp),%eax
        popl    %ebx
        ret
+END(strcat)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/strchr.S
--- a/common/lib/libc/arch/i386/string/strchr.S Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/strchr.S Sat Mar 22 19:38:46 2014 +0000
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: strchr.S,v 1.2 2009/07/17 19:37:57 dsl Exp $")
+       RCSID("$NetBSD: strchr.S,v 1.3 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
 ENTRY(strchr)
@@ -99,5 +99,6 @@
        popl    %ebx
        popl    %esi
        ret
+END(strchr)
 
 STRONG_ALIAS(index,strchr)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/strcmp.S
--- a/common/lib/libc/arch/i386/string/strcmp.S Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/strcmp.S Sat Mar 22 19:38:46 2014 +0000
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: strcmp.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+       RCSID("$NetBSD: strcmp.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
 ENTRY(strcmp)
@@ -75,3 +75,4 @@
        popl    %ebx
        popl    %esi
        ret
+END(strcmp)
diff -r 29f7cbd0c069 -r 0881544d5863 common/lib/libc/arch/i386/string/strcpy.S
--- a/common/lib/libc/arch/i386/string/strcpy.S Sat Mar 22 19:16:34 2014 +0000
+++ b/common/lib/libc/arch/i386/string/strcpy.S Sat Mar 22 19:38:46 2014 +0000
@@ -6,7 +6,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: strcpy.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+       RCSID("$NetBSD: strcpy.S,v 1.2 2014/03/22 19:38:46 jakllsch Exp $")
 #endif
 
 /*
@@ -14,7 +14,7 @@
  * source pointer is aligned to a word boundary, it then copies by
  * words until it finds a word containing a zero byte, and finally
  * copies by bytes until the end of the string is reached.
- *