mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-12 12:07:12 +08:00
Interpret numeric parameter correctly.
This commit is contained in:
parent
f77b82e81b
commit
22fea1a1b6
@ -38,57 +38,45 @@ ENTRY(strncat)
|
|||||||
#endif
|
#endif
|
||||||
.prologue 1
|
.prologue 1
|
||||||
|
|
||||||
mov $16, $0 # set up return value
|
mov a0, v0 # set up return value
|
||||||
beq $18, $zerocount # U :
|
beq a2, $zerocount # U :
|
||||||
/* Find the end of the string. */
|
/* Find the end of the string. */
|
||||||
ldq_u $1, 0($16) # L : load first quadword ($16 may be misaligned)
|
ldq_u t0, 0(a0) # L : load first quadword (a0 may be misaligned)
|
||||||
lda $2, -1($31) # E :
|
lda t1, -1 # E :
|
||||||
|
|
||||||
insqh $2, $0, $2 # U :
|
insqh t1, v0, t1 # U :
|
||||||
andnot $16, 7, $16 # E :
|
andnot a0, 7, a0 # E :
|
||||||
nop # E :
|
nop # E :
|
||||||
or $2, $1, $1 # E :
|
or t1, t0, t0 # E :
|
||||||
|
|
||||||
nop # E :
|
nop # E :
|
||||||
nop # E :
|
nop # E :
|
||||||
cmpbge $31, $1, $2 # E : bits set iff byte == 0
|
cmpbge zero, t0, t1 # E : bits set iff byte == 0
|
||||||
bne $2, $found # U :
|
bne t1, $found # U :
|
||||||
|
|
||||||
$loop: ldq $1, 8($16) # L :
|
$loop: ldq t0, 8(a0) # L :
|
||||||
addq $16, 8, $16 # E :
|
addq a0, 8, a0 # E :
|
||||||
cmpbge $31, $1, $2 # E :
|
cmpbge zero, t0, t1 # E :
|
||||||
beq $2, $loop # U :
|
beq t1, $loop # U :
|
||||||
|
|
||||||
$found: cttz $2, $3 # U0 :
|
$found: cttz t1, t2 # U0 :
|
||||||
addq $16, $3, $16 # E :
|
addq a0, t2, a0 # E :
|
||||||
jsr $23, __stxncpy # L0 :/* Now do the append. */
|
jsr t9, __stxncpy # L0 : Now do the append.
|
||||||
|
|
||||||
/* Worry about the null termination. */
|
/* Worry about the null termination. */
|
||||||
|
|
||||||
zapnot $1, $27, $2 # U : was last byte a null?
|
cttz t10, t2 # U0: byte offset of end-of-count.
|
||||||
cmplt $27, $24, $5 # E : did we fill the buffer completely?
|
nop # E :
|
||||||
bne $2, 0f # U :
|
zapnot t0, t8, t1 # U : was last byte a null?
|
||||||
|
nop # E :
|
||||||
|
|
||||||
|
bne t1, 0f # U :
|
||||||
|
nop # E :
|
||||||
|
nop # E :
|
||||||
ret # L0 :
|
ret # L0 :
|
||||||
|
|
||||||
0: or $5, $18, $2 # E :
|
0: addq t2, a0, a0 # E : address of end-of-count
|
||||||
nop
|
stb zero, 1(a0) # L :
|
||||||
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 :
|
|
||||||
nop # E :
|
nop # E :
|
||||||
ret # L0 :
|
ret # L0 :
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user