Changeset 20235a3 in mainline for boot/arch/ppc32/src/asm.S

Timestamp:

2010-09-02T20:55:28Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0c39b96

Parents:

0c61955 (diff), 3249673 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/ppc32/src/asm.S (modified) (2 diffs)

boot/arch/ppc32/src/asm.S

@@ -60 +60 @@
 .global start
 .global halt
-.global memcpy
 .global jump_to_kernel
 .global real_mode
@@ -78 +77 @@
 halt:
         b halt
-
-memcpy:
-        srwi. r7, r5, 3
-        addi r6, r3, -4
-        addi r4, r4, -4
-        beq 2f
-        
-        andi. r0, r6, 3
-        mtctr r7
-        bne 5f
-        
-        1:
-                lwz r7, 4(r4)
-                lwzu r8, 8(r4)
-                stw r7, 4(r6)
-                stwu r8, 8(r6)
-                bdnz 1b
-                
-                andi. r5, r5, 7
-        
-        2:
-                cmplwi 0, r5, 4
-                blt 3f
-                
-                lwzu r0, 4(r4)
-                addi r5, r5, -4
-                stwu r0, 4(r6)
-        
-        3:
-                cmpwi 0, r5, 0
-                beqlr
-                mtctr r5
-                addi r4, r4, 3
-                addi r6, r6, 3
-        
-        4:
-                lbzu r0, 1(r4)
-                stbu r0, 1(r6)
-                bdnz 4b
-                blr
-        
-        5:
-                subfic r0, r0, 4
-                mtctr r0
-        
-        6:
-                lbz r7, 4(r4)
-                addi r4, r4, 1
-                stb r7, 4(r6)
-                addi r6, r6, 1
-                bdnz 6b
-                subf r5, r0, r5
-                rlwinm. r7, r5, 32-3, 3, 31
-                beq 2b
-                mtctr r7
-                b 1b
 
 jump_to_kernel: