Changeset ffe276f in mainline for kernel/arch/ppc32/src/asm.S

Timestamp:

2010-05-22T22:56:00Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c555155

Parents:

86a3f89b

Message:

restructure constants
change the return type of pic_get_pending()
coding style changes

File:

• kernel/arch/ppc32/src/asm.S (modified) (9 diffs)

kernel/arch/ppc32/src/asm.S

@@ -28 +28 @@
 
 #include <arch/asm/regname.h>
+#include <arch/cpu.h>
 
 .text
@@ -43 +44 @@
 
 userspace_asm:
-
+        
         # r3 = uspace_uarg
         # r4 = stack
@@ -49 +50 @@
         
         # disable interrupts
-
+        
         mfmsr r31
         rlwinm r31, r31, 0, 17, 15
@@ -60 +61 @@
         # set problem state, enable interrupts
         
-        ori r31, r31, msr_pr
-        ori r31, r31, msr_ee
+        ori r31, r31, MSR_PR
+        ori r31, r31, MSR_EE
         mtsrr1 r31
         
@@ -67 +68 @@
         
         mr sp, r4
-
+        
         # %r6 is defined to hold pcb_ptr - set it to 0
-
+        
         xor r6, r6, r6
         
@@ -141 +142 @@
         
         # reset decrementer
-
+        
         li r31, 1000
         mtdec r31
@@ -201 +202 @@
         lwz r12, 156(sp)
         lwz sp, 160(sp)
-
+        
         rfi
 
@@ -213 +214 @@
 memcpy_from_uspace:
 memcpy_to_uspace:
-
+        
         srwi. r7, r5, 3
         addi r6, r3, -4
         addi r4, r4, -4
-        beq     2f
+        beq 2f
         
         andi. r0, r6, 3
@@ -225 +226 @@
         1:
         
-        lwz r7, 4(r4)
-        lwzu r8, 8(r4)
-        stw r7, 4(r6)
-        stwu r8, 8(r6)
-        bdnz 1b
-        
-        andi. r5, r5, 7
+                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)
+                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
+                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
+                lbzu r0, 1(r4)
+                stbu r0, 1(r6)
+                bdnz 4b
+                blr
         
         5:
         
-        subfic r0, r0, 4
-        mtctr r0
+                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
+                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
 
 memcpy_from_uspace_failover_address: