Changeset b50b5af2 in mainline for kernel/arch/amd64/src/userspace.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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/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>
@@ -50 +51 @@
         ipl_t ipl = interrupts_disable();
         
-        /* Clear CF, PF, AF, ZF, SF, DF, OF */
-        ipl &= ~(0xcd4);
+        ipl &= ~(RFLAGS_CF | RFLAGS_PF | RFLAGS_AF | RFLAGS_ZF | RFLAGS_SF |
+            RFLAGS_DF | RFLAGS_OF);
         
         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)
+                ;
 }