Changes in uspace/lib/c/arch/amd64/src/fibril.S [1a5eca4:4dc7a84] in mainline

File:

• uspace/lib/c/arch/amd64/src/fibril.S (modified) (6 diffs)

uspace/lib/c/arch/amd64/src/fibril.S

@@ -27 +27 @@
 #
 
-#include <abi/asmtool.h>
+.text
+
+.global context_save
+.global context_restore
+
 #include <libarch/fibril_context.h>
-
-.text
 
 ## Save current CPU context
@@ -37 +39 @@
 # pointed by the 1st argument. Returns 1 in EAX.
 #
-FUNCTION_BEGIN(context_save)
+context_save:
         movq (%rsp), %rdx     # the caller's return %eip
         
@@ -51 +53 @@
         movq %r15, CONTEXT_OFFSET_R15(%rdi)
         
+        # save TLS
         movq %fs:0, %rax
         movq %rax, CONTEXT_OFFSET_TLS(%rdi)
@@ -57 +60 @@
         incl %eax
         ret
-FUNCTION_END(context_save)
 
 ## Restore current CPU context
@@ -64 +66 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-FUNCTION_BEGIN(context_restore)
+context_restore:
+        
         movq CONTEXT_OFFSET_R15(%rdi), %r15
         movq CONTEXT_OFFSET_R14(%rdi), %r14
@@ -78 +81 @@
         movq %rdx,(%rsp)
         
-        movq CONTEXT_OFFSET_TLS(%rdi), %rdi
-        movq %rdi, %fs:0
+        # Set thread local storage
+        movq CONTEXT_OFFSET_TLS(%rdi), %rdi  # Set arg1 to TLS addr
+        movl $1, %eax                        # SYS_TLS_SET
+        syscall
         
         xorl %eax, %eax                      # context_restore returns 0
         ret
-FUNCTION_END(context_restore)