Module Name: src
Committed By: joerg
Date: Thu Jun 16 16:39:14 UTC 2011
Modified Files:
src/common/lib/libc: Makefile.inc
Added Files:
src/common/lib/libc/arch/i386/string/small: memcmp.S memcpy.S memmove.S
memset.S strchr.S strcmp.S strcpy.S strlen.S
Log Message:
Add support for size optimised versions of the assembler functions in
the small subdirectory. Provide more compact versions of the functions
used by bootxx in x86.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/arch/i386/string/small/memcmp.S \
src/common/lib/libc/arch/i386/string/small/memcpy.S \
src/common/lib/libc/arch/i386/string/small/memmove.S \
src/common/lib/libc/arch/i386/string/small/memset.S \
src/common/lib/libc/arch/i386/string/small/strchr.S \
src/common/lib/libc/arch/i386/string/small/strcmp.S \
src/common/lib/libc/arch/i386/string/small/strcpy.S \
src/common/lib/libc/arch/i386/string/small/strlen.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/Makefile.inc
diff -u src/common/lib/libc/Makefile.inc:1.10 src/common/lib/libc/Makefile.inc:1.11
--- src/common/lib/libc/Makefile.inc:1.10 Sun Oct 26 07:22:50 2008
+++ src/common/lib/libc/Makefile.inc Thu Jun 16 16:39:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2008/10/26 07:22:50 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.11 2011/06/16 16:39:14 joerg Exp $
COMMON_DIR:=${.PARSEDIR}
COMMON_CODEDIRS=atomic gen gmon inet md net quad stdlib string sys
@@ -25,6 +25,11 @@
.if exists(${COMMON_ARCHDIR}/${i}/Makefile.inc)
.include "${COMMON_ARCHDIR}/${i}/Makefile.inc"
.endif
+.if !empty(CPPFLAGS:M-DLIBKERN_OPTIMISE_SPACE) && \
+ exists(${COMMON_ARCHDIR}/$i/small)
+.PATH.S: ${COMMON_ARCHDIR}/$i/small
+.endif
+
.if exists(${COMMON_ARCHDIR}/$i)
.PATH.c: ${COMMON_ARCHDIR}/$i
.PATH.S: ${COMMON_ARCHDIR}/$i
Added files:
Index: src/common/lib/libc/arch/i386/string/small/memcmp.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/memcmp.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/memcmp.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,50 @@
+/* $NetBSD: memcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+ RCSID("$NetBSD: memcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+
+ENTRY(memcmp)
+ pushl %esi
+ pushl %edi
+ movl 12(%esp), %edi
+ movl 16(%esp), %esi
+ movl 20(%esp), %ecx
+ xorl %eax, %eax
+ rep
+ cmpsb
+ popl %edi
+ popl %esi
+ ja 1f
+ setnz %al
+ ret
+1:
+ decl %eax
+ ret
Index: src/common/lib/libc/arch/i386/string/small/memcpy.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/memcpy.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/memcpy.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,71 @@
+/* $NetBSD: memcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+ RCSID("$NetBSD: memcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+
+# ifdef BCOPY
+ENTRY(bcopy)
+ pushl %esi
+ pushl %edi
+ movl 12(%esp), %esi
+ movl 16(%esp), %edi
+ jmp __memmove_start
+# endif
+# if defined(MEMMOVE)
+ENTRY(memcpy)
+ENTRY(memmove)
+ pushl %esi
+ pushl %edi
+ movl 12(%esp), %edi
+ movl 16(%esp), %esi
+ .globl __memmove_start
+__memmove_start:
+ movl 20(%esp), %ecx
+ pushl %edi
+ testl %ecx, %ecx
+ jz 2f
+ cmpl %esi, %edi
+ jb 1f
+ addl %ecx, %esi
+ decl %esi
+ addl %ecx, %edi
+ decl %edi
+ std
+1:
+ rep
+ movsb
+2:
+ cld
+ popl %eax
+ popl %edi
+ popl %esi
+ ret
+# endif /* MEMMOVE */
Index: src/common/lib/libc/arch/i386/string/small/memmove.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/memmove.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/memmove.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,4 @@
+/* $NetBSD: memmove.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+
+#define MEMMOVE
+#include "memcpy.S"
Index: src/common/lib/libc/arch/i386/string/small/memset.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/memset.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/memset.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,45 @@
+/* $NetBSD: memset.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+ RCSID("$NetBSD: memset.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+
+ENTRY(memset)
+ pushl %edi
+ movl 8(%esp), %edi
+ movl 12(%esp), %eax
+ movl 16(%esp), %ecx
+ pushl %edi
+ rep
+ stosb
+ popl %eax
+ popl %edi
+ ret
Index: src/common/lib/libc/arch/i386/string/small/strchr.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/strchr.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/strchr.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,51 @@
+/* $NetBSD: strchr.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+ RCSID("$NetBSD: strchr.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+
+ENTRY(strchr)
+ popl %edx /* Return address */
+ popl %eax /* String pointer */
+ popl %ecx /* Character to find */
+ pushl %ecx
+ pushl %eax
+ pushl %edx
+1:
+ cmpb $0, 0(%eax)
+ je 2f
+ cmpb %cl, 0(%eax)
+ je 3f
+ incl %eax
+ jmp 1b
+2:
+ xorl %eax, %eax
+3:
+ ret
Index: src/common/lib/libc/arch/i386/string/small/strcmp.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/strcmp.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/strcmp.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,50 @@
+/* $NetBSD: strcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+ RCSID("$NetBSD: strcmp.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+
+ENTRY(strcmp)
+ pushl %esi
+ movl 12(%esp), %ecx
+ movl 8(%esp), %esi
+ decl %ecx
+1:
+ incl %ecx
+ lodsb
+ cmpb 0(%ecx), %al
+ jne 2f
+ testb %al, %al
+ jne 1b
+2:
+ subb 0(%ecx), %al
+ movsbl %al, %eax
+ popl %esi
+ ret
Index: src/common/lib/libc/arch/i386/string/small/strcpy.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/strcpy.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/strcpy.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,48 @@
+/* $NetBSD: strcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Joerg Sonnenberger.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+ RCSID("$NetBSD: strcpy.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+
+ENTRY(strcpy)
+ pushl %esi
+ pushl %edi
+ movl 12(%esp), %edi
+ movl 16(%esp), %esi
+ pushl %edi
+1:
+ lodsb
+ stosb
+ testb %al, %al
+ jne 1b
+ popl %eax
+ popl %edi
+ popl %esi
+ ret
Index: src/common/lib/libc/arch/i386/string/small/strlen.S
diff -u /dev/null src/common/lib/libc/arch/i386/string/small/strlen.S:1.1
--- /dev/null Thu Jun 16 16:39:14 2011
+++ src/common/lib/libc/arch/i386/string/small/strlen.S Thu Jun 16 16:39:14 2011
@@ -0,0 +1,41 @@
+/* $NetBSD: strlen.S,v 1.1 2011/06/16 16:39:14 joerg Exp $ */
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by David Laight.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+ RCSID("$NetBSD: strlen.S,v 1.1 2011/06/16 16:39:14 joerg Exp $")
+ENTRY(strlen)
+ movl 8(%esp), %ecx
+ xorl %eax, %eax
+ dec %eax
+1:
+ incl %eax
+ cmpb $0, 0(%ecx,%eax,1)
+ jnz 1b
+ ret
