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

Timestamp:

2016-04-12T05:57:00Z (9 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/context.S (modified) (5 diffs)

kernel/arch/amd64/src/context.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+#include <arch/context_struct.h>
+
 .text
-
-.global context_save_arch
-.global context_restore_arch
-
-#include <arch/context_struct.h>
 
 ## Save current CPU context
@@ -39 +37 @@
 # pointed by the 1st argument. Returns 1 in EAX.
 #
-context_save_arch:
+FUNCTION_BEGIN(context_save_arch)
         movq (%rsp), %rdx     # the caller's return %eip
         
@@ -56 +54 @@
         incl %eax
         ret
+FUNCTION_END(context_save_arch)
 
 
@@ -63 +62 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-context_restore_arch:
+FUNCTION_BEGIN(context_restore_arch)
         movq CONTEXT_OFFSET_R15(%rdi), %r15
         movq CONTEXT_OFFSET_R14(%rdi), %r14
@@ -79 +78 @@
         xorl %eax, %eax       # context_restore returns 0
         ret
+FUNCTION_END(context_restore_arch)