From 22fea1a1b600c68a96aa5f0edc4329b239900a65 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 27 Dec 2000 23:29:08 +0000
Subject: [PATCH] Interpret numeric parameter correctly.

---
 sysdeps/alpha/alphaev67/strncat.S | 64 +++++++++++++------------------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/sysdeps/alpha/alphaev67/strncat.S b/sysdeps/alpha/alphaev67/strncat.S
index 4d199d95fe..31ca19d299 100644
--- a/sysdeps/alpha/alphaev67/strncat.S
+++ b/sysdeps/alpha/alphaev67/strncat.S
@@ -38,57 +38,45 @@ ENTRY(strncat)
 #endif
 	.prologue 1
 
-	mov	$16, $0		# set up return value
-	beq	$18, $zerocount	# U :
+	mov	a0, v0		# set up return value
+	beq	a2, $zerocount	# U :
 	/* Find the end of the string.  */
-	ldq_u   $1, 0($16)	# L : load first quadword ($16 may be misaligned)
-	lda     $2, -1($31)	# E :
+	ldq_u   t0, 0(a0)	# L : load first quadword (a0 may be misaligned)
+	lda     t1, -1		# E :
 
-	insqh   $2, $0, $2	# U :
-	andnot  $16, 7, $16	# E :
+	insqh   t1, v0, t1	# U :
+	andnot  a0, 7, a0	# E :
 	nop			# E :
-	or      $2, $1, $1	# E :
+	or      t1, t0, t0	# E :
 
 	nop			# E :
 	nop			# E :
-	cmpbge  $31, $1, $2	# E : bits set iff byte == 0
-	bne     $2, $found	# U :
+	cmpbge  zero, t0, t1	# E : bits set iff byte == 0
+	bne     t1, $found	# U :
 
-$loop:	ldq     $1, 8($16)	# L :
-	addq    $16, 8, $16	# E :
-	cmpbge  $31, $1, $2	# E :
-	beq     $2, $loop	# U :
+$loop:	ldq     t0, 8(a0)	# L :
+	addq    a0, 8, a0	# E :
+	cmpbge  zero, t0, t1	# E :
+	beq     t1, $loop	# U :
 
-$found:	cttz	$2, $3		# U0 :
-	addq	$16, $3, $16	# E :
-	jsr	$23, __stxncpy	# L0 :/* Now do the append.  */
+$found:	cttz	t1, t2		# U0 :
+	addq	a0, t2, a0	# E :
+	jsr	t9, __stxncpy	# L0 : Now do the append.
 
 	/* Worry about the null termination.  */
 
-	zapnot	$1, $27, $2	# U : was last byte a null?
-	cmplt	$27, $24, $5	# E : did we fill the buffer completely?
-	bne	$2, 0f		# U :
+	cttz	t10, t2		# U0: byte offset of end-of-count.
+	nop			# E :
+	zapnot	t0, t8, t1	# U : was last byte a null?
+	nop			# E :
+
+	bne	t1, 0f		# U :
+	nop			# E :
+	nop			# E :
 	ret			# L0 :
 
-0:	or	$5, $18, $2	# E :
-	nop
-	bne	$2, 2f		# U :
-	and	$24, 0x80, $3	# E : no zero next byte
-
-	nop			# E :
-	bne	$3, 1f		# U :
-	/* Here there are bytes left in the current word.  Clear one.  */
-	addq	$24, $24, $24	# E : end-of-count bit <<= 1
-	nop			# E :
-
-2:	zap	$1, $24, $1	# U :
-	nop			# E :
-	stq_u	$1, 0($16)	# L :
-	ret			# L0 :
-
-1:	/* Here we must clear the first byte of the next DST word */
-	stb	$31, 8($16)	# L :
-	nop			# E :
+0:	addq	t2, a0, a0	# E : address of end-of-count
+	stb	zero, 1(a0)	# L :
 	nop			# E :
 	ret			# L0 :