 @@ -1,14 +1,14 @@
-/*	$NetBSD: bzero.S,v 1.9 2011/01/16 02:43:10 matt Exp $ */
+/*	$NetBSD: bzero.S,v 1.10 2011/01/19 02:47:01 matt Exp $ */
 /*-
  * Copyright (C) 2001	Martin J. Laubach <mjl@NetBSD.org>
  * 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.
 @@ -22,27 +22,27 @@
  * 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) && !defined(lint)
-__RCSID("$NetBSD: bzero.S,v 1.9 2011/01/16 02:43:10 matt Exp $")
+__RCSID("$NetBSD: bzero.S,v 1.10 2011/01/19 02:47:01 matt Exp $")
 #endif /* LIBC_SCCS && !lint */
 #ifdef _KERNEL
 #include <assym.h>
 #endif
 #define USE_STSWX 0	/* don't. slower than trivial copy loop */
 /*----------------------------------------------------------------------*/
 /*
      void bzero(void *b %r3, size_t len %r4);
      void * memset(void *b %r3, int c %r4, size_t len %r5);
 */
 @@ -64,28 +64,28 @@ ENTRY(memset)
 		mr.	%r0, %r4
 		mr	%r8, %r3
 		beqlr-	cr1			/* Nothing to do */
 		rlwimi	%r0, %r4, 8, 16, 23	/* word extend fill value */
 		rlwimi	%r0, %r0, 16, 0, 15
 		mr	%r4, %r5
 		bne-	simple_fill		/* =! 0, use trivial fill */
 cb_memset:
 /*----------------------------------------------------------------------*/
 #ifndef _KERNEL
 		/* First find out cache line size */
 #ifdef PIC
 		mflr	%r9
 #ifdef PIC
 		PIC_GOTSETUP(%r10)
 		mtlr	%r9
 		lwz	%r5,cache_info@got(%r10)
 #else
 		lis	%r5,cache_info@h
 		ori	%r5,%r5,cache_info@l
 #endif
 		lwz	%r6, 4(%r5)
 		cmpwi	%r6, -1
 		bne+	cb_cacheline_known
 /*----------------------------------------------------------------------*/
 #define CTL_MACHDEP	7
 @@ -147,44 +147,47 @@ cb_memset:
 		stw	%r0, MIB+4(%r1)
 		li	%r0, 4			/* Oldlenp := 4 */
 		stw	%r0, OLDPLEN(%r1)
 		addi	%r3, %r1, MIB
 		li	%r4, 2			/* namelen */
 		addi	%r5, %r31, 4
 		addi	%r6, %r1, OLDPLEN
 		li	%r7, 0
 		li	%r8, 0
 		bl	PIC_PLT(_C_LABEL(sysctl))
 :
 		lwz	%r8, R8_SAVE(%r1)
 		lwz	%r3, R3_SAVE(%r1)
 		lwz	%r4, R4_SAVE(%r1)
 		lwz	%r8, R8_SAVE(%r1)
 		lwz	%r0, R0_SAVE(%r1)
 		lwz	%r9, 4(%r31)
 		lwz	%r31, R31_SAVE(%r1)
 #ifdef PIC
 		lwz	%r30, R30_SAVE(%r1)
 #endif
-		la	%r1, STKFRAME_SZ(%r1)
+		addi	%r1, %r1, STKFRAME_SZ
-		lwz	%r5, 4(%r1)
+		lwz	%r0, 4(%r1)
-		mtlr	%r5
+		mtlr	%r0
 		cntlzw	%r6, %r9			/* compute shift value */
 		li	%r5, 31
 		subf	%r5, %r6, %r5
 #ifdef PIC
 		mflr	%r9
 		PIC_GOTSETUP(%r10)
 		mtlr	%r9
 		lwz	%r6, cache_sh@got(%r10)
 		stw	%r5, 0(%r6)
 #else
 		lis	%r6, cache_sh@ha
 		stw	%r5, cache_sh@l(%r6)
 #endif
 /*----------------------------------------------------------------------*/
 /* Okay, we know the cache line size (%r9) and shift value (%r10) */
 cb_cacheline_known:
 #ifdef PIC
 		lwz	%r5, cache_info@got(%r10)
 		lwz	%r9, 4(%r5)
 		lwz	%r5, cache_sh@got(%r10)