[POWERPC] Move bootwrapper's strchr() and strncmp() from .h to string.S

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / string.S

diff --git a/arch/powerpc/boot/string.S b/arch/powerpc/boot/string.S
index b1eeaed7db177e273c6e014c4d0c882e82cee739..2627558bcb7132cc30a7944752068264beeb0cbb 100644 (file)
--- a/arch/powerpc/boot/string.S
+++ b/arch/powerpc/boot/string.S
@@ -49,6 +49,17 @@ strcat:
        bne     1b
        blr
 
+       .globl  strchr
+strchr:
+       addi    r3,r3,-1
+1:     lbzu    r0,1(r3)
+       cmpw    0,r0,r4
+       beqlr
+       cmpwi   0,r0,0
+       bne     1b
+       li      r3,0
+       blr
+
        .globl  strcmp
 strcmp:
        addi    r5,r3,-1
@@ -61,6 +72,19 @@ strcmp:
        beq     1b
        blr
 
+       .globl  strncmp
+strncmp:
+       mtctr   r5
+       addi    r5,r3,-1
+       addi    r4,r4,-1
+1:     lbzu    r3,1(r5)
+       cmpwi   1,r3,0
+       lbzu    r0,1(r4)
+       subf.   r3,r0,r3
+       beqlr   1
+       bdnzt   eq,1b
+       blr
+
        .globl  strlen
 strlen:
        addi    r4,r3,-1
@@ -107,10 +131,12 @@ memcpy:
        rlwinm. r7,r5,32-3,3,31         /* r7 = r5 >> 3 */
        addi    r6,r3,-4
        addi    r4,r4,-4
-       beq     2f                      /* if less than 8 bytes to do */
+       beq     3f                      /* if less than 8 bytes to do */
        andi.   r0,r6,3                 /* get dest word aligned */
        mtctr   r7
        bne     5f
+       andi.   r0,r4,3                 /* check src word aligned too */
+       bne     3f
 1:     lwz     r7,4(r4)
        lwzu    r8,8(r4)
        stw     r7,4(r6)
@@ -132,6 +158,11 @@ memcpy:
        bdnz    4b
        blr
 5:     subfic  r0,r0,4
+       cmpw    cr1,r0,r5
+       add     r7,r0,r4
+       andi.   r7,r7,3                 /* will source be word-aligned too? */
+       ble     cr1,3b
+       bne     3b                      /* do byte-by-byte if not */
        mtctr   r0
 6:     lbz     r7,4(r4)
        addi    r4,r4,1
@@ -149,10 +180,12 @@ backwards_memcpy:
        rlwinm. r7,r5,32-3,3,31         /* r7 = r5 >> 3 */
        add     r6,r3,r5
        add     r4,r4,r5
-       beq     2f
+       beq     3f
        andi.   r0,r6,3
        mtctr   r7
        bne     5f
+       andi.   r0,r4,3
+       bne     3f
 1:     lwz     r7,-4(r4)
        lwzu    r8,-8(r4)
        stw     r7,-4(r6)
@@ -171,7 +204,12 @@ backwards_memcpy:
        stbu    r0,-1(r6)
        bdnz    4b
        blr
-5:     mtctr   r0
+5:     cmpw    cr1,r0,r5
+       subf    r7,r0,r4
+       andi.   r7,r7,3
+       ble     cr1,3b
+       bne     3b
+       mtctr   r0
 6:     lbzu    r7,-1(r4)
        stbu    r7,-1(r6)
        bdnz    6b