Changeset 32573ff in mainline for kernel/arch/amd64/src/context.S

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline, which has dltest and fixes.

File:

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

kernel/arch/amd64/src/context.S

@@ -29 +29 @@
 #include <abi/asmtool.h>
 #include <arch/context_struct.h>
+#include <arch/vreg.h>
 
 .text
@@ -50 +51 @@
         movq %r14, CONTEXT_OFFSET_R14(%rdi)
         movq %r15, CONTEXT_OFFSET_R15(%rdi)
+
+        movq vreg_ptr, %rsi
+        movq %fs:VREG_TP(%rsi), %rsi
+        movq %rsi, CONTEXT_OFFSET_TP(%rdi)
         
         xorl %eax, %eax       # context_save returns 1
@@ -72 +77 @@
         movq CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
         
-        movq CONTEXT_OFFSET_PC(%rdi), %rdx 
-        
+        movq CONTEXT_OFFSET_PC(%rdi), %rdx
         movq %rdx, (%rsp)
+
+        movq CONTEXT_OFFSET_TP(%rdi), %rcx 
+        movq vreg_ptr, %rsi
+        movq %rcx, %fs:VREG_TP(%rsi)
         
         xorl %eax, %eax       # context_restore returns 0