Changeset 0dc2fec in mainline for kernel/arch/ia32/src/userspace.c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (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 changes

File:

• kernel/arch/ia32/src/userspace.c (modified) (4 diffs)

kernel/arch/ia32/src/userspace.c

@@ -39 +39 @@
 #include <abi/proc/uarg.h>
 #include <mm/as.h>
+#include <arch/cpu.h>
+#include <arch/asm.h>
 
 /** Enter userspace
@@ -47 +49 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        ipl_t ipl = interrupts_disable();
+        uint32_t eflags = read_eflags();
         
         asm volatile (
-                /*
-                 * Clear nested task flag.
-                 */
-                "pushfl\n"
-                "pop %%eax\n"
-                "and $0xffffbfff, %%eax\n"
-                "push %%eax\n"
-                "popfl\n"
-                
                 /* Set up GS register (virtual register segment) */
                 "movl %[vreg_des], %%gs\n"
@@ -64 +57 @@
                 "pushl %[udata_des]\n"
                 "pushl %[stack_top]\n"
-                "pushl %[ipl]\n"
+                "pushl %[eflags]\n"
                 "pushl %[utext_des]\n"
                 "pushl %[entry]\n"
@@ -74 +67 @@
                 "iret\n"
                 :
-                : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
+                : [eflags_mask] "i" (~EFLAGS_NT),
+                  [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
                   [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
                       kernel_uarg->uspace_stack_size),
-                  [ipl] "r" (ipl),
+                  [eflags] "r" ((eflags & ~(EFLAGS_NT)) | EFLAGS_IF),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
                   [entry] "r" (kernel_uarg->uspace_entry),