Changeset 57c2a87 in mainline for kernel/arch/ia32/include

Timestamp:

2016-05-05T13:02:20Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a0d9abcd

Parents:

811770c

Message:

Avoid even more magic numbers

Location:

kernel/arch/ia32/include/arch

Files:

• cpu.h (modified) (2 diffs)
• cpuid.h (modified) (2 diffs)

kernel/arch/ia32/include/arch/cpu.h

@@ -41 +41 @@
 #define EFLAGS_NT       (1 << 14)
 #define EFLAGS_RF       (1 << 16)
+#define EFLAGS_ID       (1 << 21)
 
+#define CR0_PE          (1 << 0) 
+#define CR0_TS          (1 << 3)
 #define CR0_AM          (1 << 18)
 #define CR0_NW          (1 << 29)
@@ -47 +50 @@
 #define CR0_PG          (1 << 31)
 
-#define CR4_OSFXSR_MASK         (1 << 9)
-#define CR4_OSXMMEXCPT_MASK     (1 << 10)
+#define CR4_PSE         (1 << 4)
+#define CR4_PAE         (1 << 5)
+#define CR4_OSFXSR      (1 << 9)
+#define CR4_OSXMMEXCPT  (1 << 10)
 
 #define IA32_APIC_BASE_GE       (1 << 11)

kernel/arch/ia32/include/arch/cpuid.h

@@ -44 +44 @@
 
 #include <typedefs.h>
+#include <arch/cpu.h>
 
 typedef struct {
@@ -84 +85 @@
         
         asm volatile (
-                "pushf\n"                    /* read flags */
+                "pushf\n"                       /* read flags */
                 "popl %[ret]\n"
                 "movl %[ret], %[val]\n"
                 
-                "btcl $21, %[val]\n"         /* swap the ID bit */
+                "xorl %[eflags_id], %[val]\n"   /* swap the ID bit */
                 
-                "pushl %[val]\n"             /* propagate the change into flags */
+                "pushl %[val]\n"                /* propagate the change into flags */
                 "popf\n"
                 "pushf\n"
                 "popl %[val]\n"
                 
-                "andl $(1 << 21), %[ret]\n"  /* interrested only in ID bit */
-                "andl $(1 << 21), %[val]\n"
+                "andl %[eflags_id], %[ret]\n"   /* interrested only in ID bit */
+                "andl %[eflags_id], %[val]\n"
                 "xorl %[val], %[ret]\n"
                 : [ret] "=r" (ret), [val] "=r" (val)
+                : [eflags_id] "i" (EFLAGS_ID)
         );