summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authorchs <chs@NetBSD.org>2003-09-11 05:04:33 +0000
committerchs <chs@NetBSD.org>2003-09-11 05:04:33 +0000
commit0454ead77f85d239cdd8f2b62e2ba2cd48c10156 (patch)
treedaf2b09b14f5bb6137375ec5a04fe5a8a8aed5db /sys/lib
parent19f997418fa147c47d59bfc2a906202ac5ac5276 (diff)
the asm version of strlcpy() was buggy, just use the C version.
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/libkern/arch/hppa/Makefile.inc6
-rw-r--r--sys/lib/libkern/arch/hppa/strlcpy.S70
2 files changed, 3 insertions, 73 deletions
diff --git a/sys/lib/libkern/arch/hppa/Makefile.inc b/sys/lib/libkern/arch/hppa/Makefile.inc
index a9d4e5a67a7..c9edfc6a147 100644
--- a/sys/lib/libkern/arch/hppa/Makefile.inc
+++ b/sys/lib/libkern/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2002/09/21 17:45:16 chs Exp $
+# $NetBSD: Makefile.inc,v 1.3 2003/09/11 05:04:33 chs Exp $
# $OpenBSD: Makefile.inc,v 1.14 2000/12/29 19:04:41 mickey Exp $
@@ -6,10 +6,10 @@ SRCS+= __main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
random.c ashrdi3.c divdi3.c strncpy.c strncmp.c strcmp.c memchr.c \
memcmp.c memset.c strlen.c strcpy.c \
strcat.c skpc.c strncasecmp.c strtoul.c \
- bcmp.c scanc.c ffs.c
+ bcmp.c scanc.c ffs.c strlcpy.c
SRCS+= __assert.c
-SRCS+= milli.S strlcpy.S
+SRCS+= milli.S
OBJS+= bzero.o
SRCS+= bcopy.S spcopy.S memcpy.S memmove.S
diff --git a/sys/lib/libkern/arch/hppa/strlcpy.S b/sys/lib/libkern/arch/hppa/strlcpy.S
deleted file mode 100644
index e46e660b053..00000000000
--- a/sys/lib/libkern/arch/hppa/strlcpy.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $NetBSD: strlcpy.S,v 1.1 2002/06/06 20:03:39 fredette Exp $ */
-
-/* $OpenBSD: strlcpy.S,v 1.4 2001/06/04 23:20:44 mickey Exp $ */
-
-/*
- * Copyright (c) 1999-2001 Michael Shalayeff
- * All rights reserved.
- *
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Michael Shalayeff.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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>
-
-#if defined(LIBC_SCCS)
- .text
- .asciz "$OpenBSD: strlcpy.S,v 1.4 2001/06/04 23:20:44 mickey Exp $"
- .align 4
-#endif
-
-/* size_t strlcpy(char *dst, const char *src, size_t siz)
- *
- * it will never be a string of 2^32, so we assume 2^31 as a max size
- */
-LEAF_ENTRY(strlcpy)
-
- addi 1, arg1, ret0
- subi 1, arg2, t2
-
-$strlcpy_loop
- ldbs,ma 1(arg1), t1
- comb,= r0, t1, $strlcpy_exit
-
- addib,>,n -1, t2, $strlcpy_loop
- stbs,ma t1, 1(arg0)
-
-$strlcpy_exit
-
- comb,=,n r0, arg2, $strlcpy_nzero
- stbs r0, -1(arg0)
-$strlcpy_nzero
-
- bv 0(rp)
- sub arg1, ret0, ret0
-
-EXIT(strlcpy)
-
- .end