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

Timestamp:

2016-05-02T20:58:16Z (9 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/ia32/src/context.S (modified) (3 diffs)

kernel/arch/ia32/src/context.S

@@ -29 +29 @@
 #include <abi/asmtool.h>
 #include <arch/context_struct.h>
+#include <arch/vreg.h>
 
 .text
@@ -48 +49 @@
         movl %edi, CONTEXT_OFFSET_EDI(%edx)     # %edi -> ctx->edi
         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
@@ -72 +77 @@
 
         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
-FUNCTION_END(context_restore_arch)