Changes in kernel/arch/ia32/src/context.S [5eae56a:e98f1c3e] in mainline

File:

• kernel/arch/ia32/src/context.S (modified) (5 diffs)

kernel/arch/ia32/src/context.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/context_struct.h>
+#include <arch/vreg.h>
 
 .text
-
-.global context_save_arch
-.global context_restore_arch
-
 
 ## Save current CPU context
@@ -40 +38 @@
 # pointed by the 1st argument. Returns 1 in EAX.
 #
-context_save_arch:
+FUNCTION_BEGIN(context_save_arch)
         movl 0(%esp), %eax      # save pc value into eax        
         movl 4(%esp), %edx      # address of the context variable to save context to 
@@ -52 +50 @@
         movl %ebp, CONTEXT_OFFSET_EBP(%edx)     # %ebp -> ctx->ebp
 
+        mov vreg_ptr, %ecx
+        movl %gs:VREG_TP(%ecx), %ecx
+        movl %ecx, CONTEXT_OFFSET_TP(%edx)
+
         xorl %eax, %eax         # context_save returns 1
         incl %eax
         ret
-
+FUNCTION_END(context_save_arch)
 
 ## Restore saved CPU context
@@ -62 +64 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-context_restore_arch:
+FUNCTION_BEGIN(context_restore_arch)
         movl 4(%esp), %eax      # address of the context variable to restore context from
 
@@ -74 +76 @@
 
         movl %edx, 0(%esp)      # put saved pc on stack
+
+        mov vreg_ptr, %ecx
+        movl CONTEXT_OFFSET_TP(%eax), %edx
+        movl %edx, %gs:VREG_TP(%ecx)
+
         xorl %eax, %eax         # context_restore returns 0
         ret
-