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

Timestamp:

2016-05-02T20:58:16Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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, which has dltest and fixes.

File:

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

kernel/arch/ppc32/src/asm.S

@@ -27 +27 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/asm/regname.h>
 #include <arch/msr.h>
@@ -33 +34 @@
 .text
 
-.global userspace_asm
-.global iret
-.global iret_syscall
-.global memcpy_from_uspace
-.global memcpy_to_uspace
-.global memcpy_from_uspace_failover_address
-.global memcpy_to_uspace_failover_address
-.global early_putchar
-
-userspace_asm:
-        
+FUNCTION_BEGIN(userspace_asm)
         /*
          * r3 = uspace_uarg
@@ -78 +69 @@
         
         rfi
-
-iret:
-        
+FUNCTION_END(userspace_asm)
+
+SYMBOL(iret)
         /* Disable interrupts */
         
@@ -142 +133 @@
         rfi
 
-iret_syscall:
-        
+SYMBOL(iret_syscall)
         /* Disable interrupts */
         
@@ -204 +194 @@
         rfi
 
-memcpy_from_uspace:
-memcpy_to_uspace:
-        
+FUNCTION_BEGIN(memcpy_from_uspace)
+FUNCTION_BEGIN(memcpy_to_uspace)
         srwi. r7, r5, 3
         addi r6, r3, -4
@@ -267 +256 @@
                 mtctr r7
                 b 1b
-
-memcpy_from_uspace_failover_address:
-memcpy_to_uspace_failover_address:
+FUNCTION_END(memcpy_from_uspace)
+FUNCTION_END(memcpy_to_uspace)
+
+SYMBOL(memcpy_from_uspace_failover_address)
+SYMBOL(memcpy_to_uspace_failover_address)
         /* Return zero, failure */
         xor r3, r3, r3
         blr
 
-early_putchar:
+FUNCTION_BEGIN(early_putchar)
         blr
+FUNCTION_END(early_putchar)