Changes in kernel/arch/amd64/src/context.S [9d58539:4bf0926e] in mainline

File:

• kernel/arch/amd64/src/context.S (modified) (3 diffs)

kernel/arch/amd64/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
-
-#include <arch/context_offset.h>
 
 ## Save current CPU context
@@ -39 +38 @@
 # pointed by the 1st argument. Returns 1 in EAX.
 #
-context_save_arch:
-        movq (%rsp), %rdx     # the caller's return %eip
+FUNCTION_BEGIN(context_save_arch)
+        movq (%rsp), %rdx     # the caller's return %rip
         
-        # 1st argument passed in %edi
-        CONTEXT_SAVE_ARCH_CORE %rdi %rdx
+        movq %rdx, CONTEXT_OFFSET_PC(%rdi)
+        movq %rsp, CONTEXT_OFFSET_SP(%rdi)
+        
+        movq %rbx, CONTEXT_OFFSET_RBX(%rdi)
+        movq %rbp, CONTEXT_OFFSET_RBP(%rdi)
+        movq %r12, CONTEXT_OFFSET_R12(%rdi)
+        movq %r13, CONTEXT_OFFSET_R13(%rdi)
+        movq %r14, CONTEXT_OFFSET_R14(%rdi)
+        movq %r15, CONTEXT_OFFSET_R15(%rdi)
+        
+#ifdef MEMORY_MODEL_large
+        movabsq $vreg_ptr, %rsi
+        movq (%rsi), %rsi
+#else
+        movq vreg_ptr, %rsi
+#endif
+        movq %fs:VREG_TP(%rsi), %rsi
+        movq %rsi, CONTEXT_OFFSET_TP(%rdi)
         
         xorl %eax, %eax       # context_save returns 1
         incl %eax
         ret
+FUNCTION_END(context_save_arch)
 
 
@@ -55 +71 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-context_restore_arch:
-        CONTEXT_RESTORE_ARCH_CORE %rdi %rdx
+FUNCTION_BEGIN(context_restore_arch)
+        movq CONTEXT_OFFSET_R15(%rdi), %r15
+        movq CONTEXT_OFFSET_R14(%rdi), %r14
+        movq CONTEXT_OFFSET_R13(%rdi), %r13
+        movq CONTEXT_OFFSET_R12(%rdi), %r12
+        movq CONTEXT_OFFSET_RBP(%rdi), %rbp
+        movq CONTEXT_OFFSET_RBX(%rdi), %rbx
         
+        movq CONTEXT_OFFSET_SP(%rdi), %rsp
+        
+        movq CONTEXT_OFFSET_PC(%rdi), %rdx
         movq %rdx, (%rsp)
+        
+        movq CONTEXT_OFFSET_TP(%rdi), %rcx
+#ifdef MEMORY_MODEL_large
+        movabsq $vreg_ptr, %rsi
+        movq (%rsi), %rsi
+#else
+        movq vreg_ptr, %rsi
+#endif
+        movq %rcx, %fs:VREG_TP(%rsi)
         
         xorl %eax, %eax       # context_restore returns 0
         ret
+FUNCTION_END(context_restore_arch)
+