Libraries updates and cleanup

* Updating common/lib * Updating lib/csu * Updating lib/libc * Updating libexec/ld.elf_so * Corrected test on __minix in featuretest to actually follow the meaning of the comment. * Cleaned up _REENTRANT-related defintions. * Disabled -D_REENTRANT for libfetch * Removing some unneeded __NBSD_LIBC defines and tests Change-Id: Ic1394baef74d11b9f86b312f5ff4bbc3cbf72ce2
2012-11-15 12:06:41 +01:00
parent f6aac1c3b5
commit f14fb60209
1285 changed files with 44244 additions and 14308 deletions
--- a/common/lib/libc/arch/mips/string/bcopy.S
+++ b/common/lib/libc/arch/mips/string/bcopy.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcopy.S,v 1.3 2009/12/14 00:39:00 matt Exp $	*/
+/*	$NetBSD: bcopy.S,v 1.4 2011/08/27 13:23:52 bouyer Exp $	*/

 /*
 * Mach Operating System
@@ -46,7 +46,7 @@
 #if 0
 	RCSID("from: @(#)mips_bcopy.s	2.2 CMU 18/06/93")
 #else
-	RCSID("$NetBSD: bcopy.S,v 1.3 2009/12/14 00:39:00 matt Exp $")
+	RCSID("$NetBSD: bcopy.S,v 1.4 2011/08/27 13:23:52 bouyer Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */

@@ -170,8 +170,10 @@ LEAF(FUNCTION)
 	PTR_ADDU	DSTREG,1

 4:	# copydone
+	.set at		#-mfix-loongson2f-btb
 	j	ra
 	nop
+	.set noat

 	/*
 	 *	Copy from unaligned source to aligned dest.
@@ -264,8 +266,10 @@ LEAF(FUNCTION)
 	PTR_SUBU	DSTREG,1

 4:	# copydone
+	.set at		#-mfix-loongson2f-btb
 	j	ra
 	nop
+	.set noat

 	/*
 	 *	Copy from unaligned source to aligned dest.
--- a/common/lib/libc/arch/mips/string/ffs.S
+++ b/common/lib/libc/arch/mips/string/ffs.S
@@ -1,11 +1,11 @@
-/*	$NetBSD: ffs.S,v 1.2 2009/12/14 00:39:00 matt Exp $	*/
+/*	$NetBSD: ffs.S,v 1.4 2011/07/04 11:35:26 mrg Exp $	*/

 /*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
 *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -15,40 +15,96 @@
 * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
 *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ * 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 <mips/asm.h>

-#if defined(LIBC_SCCS) && !defined(lint)
-	/* RCSID("from: @(#)ffs.s	8.1 (Berkeley) 6/4/93") */
-	RCSID("$NetBSD: ffs.S,v 1.2 2009/12/14 00:39:00 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
+RCSID("$NetBSD: ffs.S,v 1.4 2011/07/04 11:35:26 mrg Exp $")

 /* bit = ffs(value) */

+	.text
+	.set	noreorder
+
+WEAK_ALIAS(__ffssi2,ffs)
+#if __mips == 64 || __mips == 32
 LEAF(ffs)
-	move	v0, zero
-	beq	a0, zero, done
-1:
-	and	v1, a0, 1		# bit set?
-	addu	v0, v0, 1
-	srl	a0, a0, 1
-	beq	v1, zero, 1b		# no, continue
-done:
+#ifndef _LP64
+XLEAF(ffsl)
+#endif
+	.set	push
+	.set	mips32
+	li	v1, 32
+#if __mips == 64
+	sll	a0, a0, 0
+#endif
+	negu	a1, a0
+	and	a0, a1
+	clz	v0, a0
 	j	ra
+	 subu	v0, v1, v0
+	.set	pop
 END(ffs)
+#if defined(_LP64) && __mips == 64
+LEAF(ffsl)
+	li	v1, 64
+	negu	a1, a0
+	and	a0, a1
+	dclz	v0, a0
+	j	ra
+	 subu	v0, v1, v0
+END(ffsl)
+#endif
+#else /* __mips != 64 && __mips != 32 */
+
+#ifdef _LP64
+XLEAF(ffsl)
+	beqz	a0, 6f			# fast escape if 0
+	 li	v0, 0
+
+	li	v0, 1
+	li	a3, 0xffffffff		# initial mask
+	b	1f
+	 li	a2, 32			# bit count of mask
+#endif /* _LP64 */
+LEAF(ffs)
+#ifndef _LP64
+XLEAF(ffsl)
+#endif /* !_LP64 */
+	beqz	a0, 6f
+	 li	v0, 0
+
+	li	v0, 1
+	li	a3, 0xffff		# initial mask
+	li	a2, 16			# bit count of mask
+1:
+	and	v1, a0, a3		# focus no lower half of bits left
+	bnez	v1, 2f			# any of the lower half set?
+	 nop
+	addu	v0, a2			# nope, then bit is in the upper half
+#ifdef _LP64
+	dsrlv	a0, a0, a2		# discard low bits
+#else
+	srlv	a0, a0, a2		# discard low bits
+#endif
+2:
+	srl	a2, 1			# divide bit count by 2
+	bnez	a2, 1b			# still bits left to text?
+	 srlv	a3, a3, a2		# shrink mask in half
+6:
+	j	ra
+	 nop
+END(ffs)
+#endif /* __mips == 64 || __mips == 32 */