 @@ -1,14 +1,14 @@
-/*	$NetBSD: bzero.S,v 1.10 2011/01/19 02:47:01 matt Exp $ */
+/*	$NetBSD: bzero.S,v 1.11 2011/01/29 02:21:20 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.10 2011/01/19 02:47:01 matt Exp $")
+__RCSID("$NetBSD: bzero.S,v 1.11 2011/01/29 02:21:20 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);
 */
 @@ -50,30 +50,30 @@ __RCSID("$NetBSD: bzero.S,v 1.10 2011/01
 #define r_dst	%r3
 #define r_len	%r4
 #define r_val	%r0
 		.text
 		.align 4
 ENTRY(bzero)
 		li	r_val, 0		/* Value to stuff in */
 		b	cb_memset
 END(bzero)
 ENTRY(memset)
-		cmplwi	cr1, %r5, 0
+		cmplwi	%cr1, %r5, 0
 		mr.	%r0, %r4
 		mr	%r8, %r3
-		beqlr-	cr1			/* Nothing to do */
+		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 */
 		mflr	%r9
 #ifdef PIC
 		PIC_GOTSETUP(%r10)
 @@ -157,28 +157,28 @@ cb_memset:
 		li	%r8, 0
 		bl	PIC_PLT(_C_LABEL(sysctl))
 :
 		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
 		addi	%r1, %r1, STKFRAME_SZ
-		lwz	%r0, 4(%r1)
+		lwz	%r7, 4(%r1)
-		mtlr	%r0
+		mtlr	%r7
 		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
 @@ -203,30 +203,30 @@ cb_cacheline_known:
 #ifdef	MULTIPROCESSOR
 		mfsprg	%r10, 0			/* Get cpu_info pointer */
 #else
 		lis	%r10, cpu_info_store@ha
 		addi	%r10, %r10, cpu_info_store@l
 #endif
 		lwz	%r9, CPU_CI+4(%r10)	/* Load D$ line size */
 		cntlzw	%r10, %r9			/* Calculate shift.. */
 		li	%r6, 31
 		subf	%r10, %r10, %r6
 #endif /* _KERNEL */
 		/* Back in memory filling business */
-		cmplwi	cr1, r_len, 0		/* Nothing to do? */
+		cmplwi	%cr1, r_len, 0		/* Nothing to do? */
 		add	%r5, %r9, %r9
 		cmplw	r_len, %r5		/* <= 2*CL bytes to move? */
-		beqlr-	cr1			/* then do nothing */
+		beqlr-	%cr1			/* then do nothing */
 		blt+	simple_fill		/* a trivial fill routine */
 		/* Word align the block, fill bytewise until dst even*/
 		andi.	%r5, r_dst, 0x03
 		li	%r6, 4
 		beq+	cb_aligned_w		/* already aligned to word? */
 		subf	%r5, %r5, %r6		/* bytes to fill to align4 */
 #if USE_STSWX
 		mtxer	%r5
 		stswx	%r0, 0, r_dst
 @@ -267,47 +267,47 @@ cb_aligned_cb:	/* no need to check r_len
 		srw.	%r5, r_len, %r10		/* Number of cache blocks */
 		mtctr	%r5
 		beq	cblocks_done
 		slw	%r5, %r5, %r10
 		subf	r_len, %r5, r_len
 :		dcbz	0, r_dst		/* Clear blockwise */
 		add	r_dst, r_dst, %r9
 		bdnz	1b
 cblocks_done:	/* still CL aligned, but less than CL bytes left */
-		cmplwi	cr1, r_len, 0
+		cmplwi	%cr1, r_len, 0
 		cmplwi	r_len, 8
-		beq-	cr1, sf_return
+		beq-	%cr1, sf_return
 		blt-	sf_bytewise		/* <8 remaining? */
 		b	sf_aligned_w
 /*----------------------------------------------------------------------*/
 wbzero:		li	r_val, 0
 		cmplwi	r_len, 0
 		beqlr-				/* Nothing to do */
 simple_fill:
 #if USE_STSWX
-		cmplwi	cr1, r_len, 12		/* < 12 bytes to move? */
+		cmplwi	%cr1, r_len, 12		/* < 12 bytes to move? */
 #else
-		cmplwi	cr1, r_len, 8		/* < 8 bytes to move? */
+		cmplwi	%cr1, r_len, 8		/* < 8 bytes to move? */
 #endif
 		andi.	%r5, r_dst, 0x03		/* bytes to fill to align4 */
-		blt	cr1, sf_bytewise	/* trivial byte mover */
+		blt	%cr1, sf_bytewise	/* trivial byte mover */
 		li	%r6, 4
 		subf	%r5, %r5, %r6
 		beq+	sf_aligned_w		/* dest is word aligned */
 #if USE_STSWX
 		mtxer	%r5
 		stswx	%r0, 0, r_dst
 		add	r_dst, %r5, r_dst
 #else
 		mtctr	%r5			/* nope, then fill bytewise */
 		subi	r_dst, r_dst, 1		/* until it is */
 :		stbu	r_val, 1(r_dst)