Changes in kernel/arch/mips32/src/asm.S [45f7449:0407636] in mainline

File:

• kernel/arch/mips32/src/asm.S (modified) (7 diffs)

kernel/arch/mips32/src/asm.S

@@ -27 +27 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/asm/regname.h>
+#include <arch/fpu_context_struct.h>
 
 .text
@@ -47 +49 @@
 .set nomacro
 
-.global asm_delay_loop
-asm_delay_loop:
+FUNCTION_BEGIN(asm_delay_loop)
         j $31
         nop
-
-.global cpu_halt
-cpu_halt:
+FUNCTION_END(asm_delay_loop)
+
+FUNCTION_BEGIN(cpu_halt)
         j cpu_halt
         nop
-
-.global memcpy_from_uspace
-.global memcpy_to_uspace
-.global memcpy_from_uspace_failover_address
-.global memcpy_to_uspace_failover_address
-memcpy_from_uspace:
-memcpy_to_uspace:
+FUNCTION_END(cpu_halt)
+
+FUNCTION_BEGIN(memcpy_from_uspace)
+FUNCTION_BEGIN(memcpy_to_uspace)
         move $t2, $a0  /* save dst */
         
@@ -128 +126 @@
                 jr $ra
                 move $v0, $t2
-
-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)
         jr $ra
         move $v0, $zero
@@ -136 +136 @@
 .macro fpu_gp_save reg ctx
         mfc1 $t0, $\reg
-        sw $t0, \reg * 4(\ctx)
+        sw $t0, FPU_CONTEXT_OFFSET_DREGS + \reg * FPU_CONTEXT_DREGS_ITEM_SIZE(\ctx)
 .endm
 
 .macro fpu_gp_restore reg ctx
-        lw $t0, \reg * 4(\ctx)
+        lw $t0, FPU_CONTEXT_OFFSET_DREGS + \reg * FPU_CONTEXT_DREGS_ITEM_SIZE(\ctx)
         mtc1 $t0, $\reg
 .endm
@@ -146 +146 @@
 .macro fpu_ct_save reg ctx
         cfc1 $t0, $1
-        sw $t0, (\reg + 32) * 4(\ctx)
+        sw $t0, FPU_CONTEXT_OFFSET_CREGS + \reg * FPU_CONTEXT_CREGS_ITEM_SIZE(\ctx)
 .endm
 
 .macro fpu_ct_restore reg ctx
-        lw $t0, (\reg + 32) * 4(\ctx)
+        lw $t0, FPU_CONTEXT_OFFSET_CREGS + \reg * FPU_CONTEZT_CREGS_ITEM_SIZE(\ctx)
         ctc1 $t0, $\reg
 .endm
 
-.global fpu_context_save
-fpu_context_save:
+FUNCTION_BEGIN(fpu_context_save)
 #ifdef CONFIG_FPU
         fpu_gp_save 0, $a0
@@ -224 +223 @@
         j $ra
         nop
-
-.global fpu_context_restore
-fpu_context_restore:
+FUNCTION_END(fpu_context_save)
+
+FUNCTION_BEGIN(fpu_context_restore)
 #ifdef CONFIG_FPU
         fpu_gp_restore 0, $a0
@@ -295 +294 @@
         j $ra
         nop
-
-.global early_putchar
-early_putchar:
+FUNCTION_END(fpu_context_restore)
+
+FUNCTION_BEGIN(early_putchar)
         j $ra
         nop
+FUNCTION_END(early_putchar)