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

File:

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

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

@@ -27 +27 @@
 #
 
-#include <libarch/context_offset.h>
+#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
         
         # save registers to the context structure
-        CONTEXT_SAVE_ARCH_CORE %edx %eax
+        movl %esp, CONTEXT_OFFSET_SP(%edx)      # %esp -> ctx->sp
+        movl %eax, CONTEXT_OFFSET_PC(%edx)      # %eip -> ctx->pc
+        movl %ebx, CONTEXT_OFFSET_EBX(%edx)     # %ebx -> ctx->ebx
+        movl %esi, CONTEXT_OFFSET_ESI(%edx)     # %esi -> ctx->esi
+        movl %edi, CONTEXT_OFFSET_EDI(%edx)     # %edi -> ctx->edi
+        movl %ebp, CONTEXT_OFFSET_EBP(%edx)     # %ebp -> ctx->ebp
         
         # save TLS
         movl %gs:0, %eax
-        movl %eax, OFFSET_TLS(%edx)     # tls -> ctx->tls
+        movl %eax, CONTEXT_OFFSET_TLS(%edx)     # tls -> ctx->tls
         
-        xorl %eax, %eax     # context_save returns 1
+        xorl %eax, %eax         # context_save returns 1
         incl %eax
         ret
+FUNCTION_END(context_save)
 
 ## Restore saved CPU context
@@ -59 +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
         
         # restore registers from the context structure
-        CONTEXT_RESTORE_ARCH_CORE %eax %edx
+        movl CONTEXT_OFFSET_SP(%eax),%esp       # ctx->sp -> %esp
+        movl CONTEXT_OFFSET_PC(%eax),%edx       # ctx->pc -> \pc
+        movl CONTEXT_OFFSET_EBX(%eax),%ebx      # ctx->ebx -> %ebx
+        movl CONTEXT_OFFSET_ESI(%eax),%esi      # ctx->esi -> %esi
+        movl CONTEXT_OFFSET_EDI(%eax),%edi      # ctx->edi -> %edi
+        movl CONTEXT_OFFSET_EBP(%eax),%ebp      # ctx->ebp -> %ebp
         
         movl %edx, 0(%esp)  # ctx->pc -> saver's return %eip
         
         # set thread local storage
-        pushl %edx
-        movl OFFSET_TLS(%eax), %edx  # Set arg1 to TLS addr
-        movl $1, %eax                # Syscall SYS_TLS_SET
-        int $0x30
-        popl %edx
+        movl CONTEXT_OFFSET_TLS(%eax), %edx     # Set arg1 to TLS addr
+        movl %edx, %gs:0
         
-        xorl %eax, %eax     # context_restore returns 0
+        xorl %eax, %eax         # context_restore returns 0
         ret
+FUNCTION_END(context_restore)
+