Changeset 586cd56 in mainline

Timestamp:

2009-08-08T10:29:36Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8688a6e

Parents:

9732e98

Message:

Use the RFLAGS defines instead of magic numbers.

Location:

kernel/arch/amd64

Files:

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

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 (