Changes in uspace/lib/c/arch/ia32/src/fibril.S [e74b24f:d6f9fff] in mainline

File:

• uspace/lib/c/arch/ia32/src/fibril.S (modified) (5 diffs)

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

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <libarch/fibril_context.h>
 
 .text
-
-.global context_save
-.global context_restore
 
 ## Save current CPU context
@@ -39 +37 @@
 # pointed by the 1st argument. Returns 1 in EAX.
 #
-context_save:
+FUNCTION_BEGIN(context_save)
         movl 0(%esp), %eax  # the caller's return %eip
         movl 4(%esp), %edx  # address of the context variable to save context to
@@ -58 +56 @@
         incl %eax
         ret
+FUNCTION_END(context_save)
 
 ## Restore saved CPU context
@@ -64 +63 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-context_restore:
+FUNCTION_BEGIN(context_restore)
         movl 4(%esp), %eax  # address of the context variable to restore context from
         
@@ -78 +77 @@
         
         # set thread local storage
-        pushl %edx
         movl CONTEXT_OFFSET_TLS(%eax), %edx     # Set arg1 to TLS addr
-        movl $1, %eax                           # Syscall SYS_TLS_SET
-        int $0x30
-        popl %edx
+        movl %edx, %gs:0
         
         xorl %eax, %eax         # context_restore returns 0
         ret
+FUNCTION_END(context_restore)