Changeset 3b0f1b9a in mainline for kernel/arch/amd64/src/asm.S

Timestamp:

2016-04-12T05:57:00Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0f792c28, d84398a7

Parents:

8844e70

Message:

amd64: use asmtool.h macros for defining symbols

File:

• kernel/arch/amd64/src/asm.S (modified) (13 diffs)

kernel/arch/amd64/src/asm.S

@@ -27 +27 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/pm.h>
 #include <arch/mm/page.h>
@@ -32 +33 @@
 
 .text
-.global interrupt_handlers
-.global syscall_entry
-.global cpuid
-.global has_cpuid
-.global read_efer_flag
-.global set_efer_flag
-.global memcpy_from_uspace
-.global memcpy_to_uspace
-.global memcpy_from_uspace_failover_address
-.global memcpy_to_uspace_failover_address
-.global early_putchar
 
 #define MEMCPY_DST   %rdi
@@ -64 +54 @@
  *
  */
-memcpy_from_uspace:
-memcpy_to_uspace:
+FUNCTION_BEGIN(memcpy_from_uspace)
+FUNCTION_BEGIN(memcpy_to_uspace)
         movq MEMCPY_DST, %rax
         
@@ -81 +71 @@
         0:
                 ret                 /* return MEMCPY_SRC, success */
-
-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)
         xorl %eax, %eax         /* return 0, failure */
         ret
@@ -92 +84 @@
 *
 */
-has_cpuid:
+FUNCTION_BEGIN(has_cpuid)
         /* Load RFLAGS */
         pushfq
@@ -114 +106 @@
         xorl %edx, %eax
         ret
-
-cpuid:
+FUNCTION_END(has_cpuid)
+
+FUNCTION_BEGIN(cpuid)
         /* Preserve %rbx across function calls */
         movq %rbx, %r10
@@ -130 +123 @@
         movq %r10, %rbx
         ret
-
-set_efer_flag:
+FUNCTION_END(cpuid)
+
+FUNCTION_BEGIN(set_efer_flag)
         movl $0xc0000080, %ecx
         rdmsr
@@ -137 +131 @@
         wrmsr
         ret
-
-read_efer_flag:
+FUNCTION_END(set_efer_flag)
+
+FUNCTION_BEGIN(read_efer_flag)
         movl $0xc0000080, %ecx
         rdmsr
         ret
+FUNCTION_END(read_efer_flag)
 
 /*
@@ -157 +153 @@
 
 .macro handler i
-.global int_\i
-int_\i:
+SYMBOL(int_\i)
 
         /*
@@ -249 +244 @@
         53,54,55,56,57,58,59,60,61,62,63
 
-interrupt_handlers:
+SYMBOL(interrupt_handlers)
 .irp cnt, LIST_0_63
         handler \cnt 
@@ -273 +268 @@
  *
  */
-syscall_entry:
+SYMBOL(syscall_entry)
         /* Switch to hidden %gs */
         swapgs
@@ -396 +391 @@
  *
  */
-early_putchar:
-        
+FUNCTION_BEGIN(early_putchar)
 #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB)))
         
@@ -525 +519 @@
         
         ret
-
+FUNCTION_END(early_putchar)
+