Changeset d5f8f19 in mainline for kernel/arch

Timestamp:

2009-08-08T13:17:08Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

42cfd91, 54d0ddc

Parents:

a7de7907 (diff), 8688a6e (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.

Location:

kernel/arch

Files:

• amd64/include/cpu.h (modified) (1 diff)
• amd64/src/userspace.c (modified) (2 diffs)
• sparc64/src/sparc64.c (modified) (1 diff)

kernel/arch/amd64/include/cpu.h

@@ -36 +36 @@
 #define KERN_amd64_CPU_H_
 
-#define RFLAGS_IF  (1 << 9)
-#define RFLAGS_DF  (1 << 10)
-#define RFLAGS_RF  (1 << 16)
+#define RFLAGS_CF       (1 << 0)
+#define RFLAGS_PF       (1 << 2)
+#define RFLAGS_AF       (1 << 4)
+#define RFLAGS_ZF       (1 << 6)
+#define RFLAGS_SF       (1 << 7)
+#define RFLAGS_TF       (1 << 8)
+#define RFLAGS_IF       (1 << 9)
+#define RFLAGS_DF       (1 << 10)
+#define RFLAGS_OF       (1 << 11)
+#define RFLAGS_RF       (1 << 16)
 
 #define EFER_MSR_NUM    0xc0000080

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)
+                ;
 }
 

kernel/arch/sparc64/src/sparc64.c

@@ -135 +135 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
+        (void) interrupts_disable();
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
             ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE