Changes in kernel/arch/amd64/src/userspace.c [586cd56:f24d300] in mainline

File:

• kernel/arch/amd64/src/userspace.c (modified) (2 diffs)

kernel/arch/amd64/src/userspace.c

@@ -34 +34 @@
 
 #include <userspace.h>
-#include <arch/cpu.h>
 #include <arch/pm.h>
 #include <arch/types.h>
@@ -51 +50 @@
         ipl_t ipl = interrupts_disable();
         
-        ipl &= ~(RFLAGS_CF | RFLAGS_PF | RFLAGS_AF | RFLAGS_ZF | RFLAGS_SF |
-            RFLAGS_DF | RFLAGS_OF);
+        /* Clear CF, PF, AF, ZF, SF, DF, OF */
+        ipl &= ~(0xcd4);
         
         asm volatile (
-                "pushq %[udata_des]\n"
-                "pushq %[stack_size]\n"
-                "pushq %[ipl]\n"
-                "pushq %[utext_des]\n"
-                "pushq %[entry]\n"
-                "movq %[uarg], %%rax\n"
+                        "pushq %[udata_des]\n"
+                        "pushq %[stack_size]\n"
+                        "pushq %[ipl]\n"
+                        "pushq %[utext_des]\n"
+                        "pushq %[entry]\n"
+                        "movq %[uarg], %%rax\n"
                         
-                /* %rdi is defined to hold pcb_ptr - set it to 0 */
-                "xorq %%rdi, %%rdi\n"
-                "iretq\n"
-                :: [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
-                   [stack_size] "r" (kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
-                   [ipl] "r" (ipl),
-                   [utext_des] "i" (gdtselector(UTEXT_DES) | PL_USER),
-                   [entry] "r" (kernel_uarg->uspace_entry),
-                   [uarg] "r" (kernel_uarg->uspace_uarg)
-                : "rax"
-        );
+                        /* %rdi is defined to hold pcb_ptr - set it to 0 */
+                        "xorq %%rdi, %%rdi\n"
+                        "iretq\n"
+                        :: [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
+                           [stack_size] "r" (kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+                           [ipl] "r" (ipl),
+                           [utext_des] "i" (gdtselector(UTEXT_DES) | PL_USER),
+                           [entry] "r" (kernel_uarg->uspace_entry),
+                           [uarg] "r" (kernel_uarg->uspace_uarg)
+                        : "rax"
+                );
         
         /* Unreachable */
-        while (1)
-                ;
+        while (1);
 }