Changeset 8844e70 in mainline for kernel/arch/ia32/src/asm.S

Timestamp:

2016-04-11T17:03:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3b0f1b9a

Parents:

3a34852

Message:

ia32: use asmtool.h macros for defining symbols

File:

• kernel/arch/ia32/src/asm.S (modified) (14 diffs)

kernel/arch/ia32/src/asm.S

@@ -31 +31 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/pm.h>
 #include <arch/cpu.h>
@@ -37 +38 @@
 
 .text
-.global paging_on
-.global enable_l_apic_in_msr
-.global memcpy_from_uspace
-.global memcpy_from_uspace_failover_address
-.global memcpy_to_uspace
-.global memcpy_to_uspace_failover_address
-.global early_putchar
 
 #define MEMCPY_DST   4
@@ -64 +58 @@
  *
  */
-memcpy_from_uspace:
-memcpy_to_uspace:
+FUNCTION_BEGIN(memcpy_from_uspace)
+FUNCTION_BEGIN(memcpy_to_uspace)
         movl %edi, %edx  /* save %edi */
         movl %esi, %eax  /* save %esi */
@@ -93 +87 @@
                 movl MEMCPY_DST(%esp), %eax
                 ret
+FUNCTION_END(memcpy_from_uspace)
+FUNCTION_END(memcpy_to_uspace)
 
 /*
@@ -98 +94 @@
  * above had caused a page fault.
  */
-memcpy_from_uspace_failover_address:
-memcpy_to_uspace_failover_address:
+SYMBOL(memcpy_from_uspace_failover_address)
+SYMBOL(memcpy_to_uspace_failover_address)
         movl %edx, %edi
         movl %eax, %esi
@@ -112 +108 @@
  *
  */
-paging_on:
+FUNCTION_BEGIN(paging_on)
         movl %cr0, %edx
         orl $(1 << 31), %edx  /* paging on */
@@ -123 +119 @@
         0:
                 ret
+FUNCTION_END(paging_on)
 
 /** Enable local APIC
@@ -129 +126 @@
  *
  */
-enable_l_apic_in_msr:
+FUNCTION_BEGIN(enable_l_apic_in_msr)
         movl $0x1b, %ecx
         rdmsr
@@ -136 +133 @@
         wrmsr
         ret
+FUNCTION_END(enable_l_apic_in_msr)
 
 /*
@@ -152 +150 @@
  * entirely in registers.
  */
-.global sysenter_handler
-sysenter_handler:
+SYMBOL(sysenter_handler)
 
         /*
@@ -232 +229 @@
  * This is the legacy syscall handler using the interrupt mechanism.
  */
-.global int_syscall
-int_syscall:
+SYMBOL(int_syscall)
         subl $(ISTATE_SOFT_SIZE + 4), %esp
 
@@ -319 +315 @@
 
 .macro handler i
-.global int_\i
-int_\i:
+SYMBOL(int_\i)
         /*
          * This macro distinguishes between two versions of ia32
@@ -462 +457 @@
  *
  */
-early_putchar:
+FUNCTION_BEGIN(early_putchar)
         
 #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB)))
@@ -594 +589 @@
         
         ret
-
+FUNCTION_END(early_putchar)
+