Changeset 0f17bff in mainline for kernel/arch/ia32/include/arch/cpu.h

Timestamp:

2016-05-05T08:34:45Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

811770c

Parents:

4b0206c

Message:

Replace magic numbers with macros

File:

• kernel/arch/ia32/include/arch/cpu.h (modified) (1 diff)

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

@@ -36 +36 @@
 #define KERN_ia32_CPU_H_
 
-#define EFLAGS_IF       (1 << 9)
-#define EFLAGS_DF       (1 << 10)
-#define EFLAGS_NT       (1 << 14)
-#define EFLAGS_RF       (1 << 16)
+#define EFLAGS_IF       (1 << 9)
+#define EFLAGS_DF       (1 << 10)
+#define EFLAGS_IOPL     (3 << 12)
+#define EFLAGS_NT       (1 << 14)
+#define EFLAGS_RF       (1 << 16)
 
-#define CR4_OSFXSR_MASK      (1 << 9)
-#define CR4_OSXMMEXCPT_MASK  (1 << 10)
+#define CR0_AM          (1 << 18)
+#define CR0_NW          (1 << 29)
+#define CR0_CD          (1 << 30)
+#define CR0_PG          (1 << 31)
+
+#define CR4_OSFXSR_MASK         (1 << 9)
+#define CR4_OSXMMEXCPT_MASK     (1 << 10)
+
+#define IA32_APIC_BASE_GE       (1 << 11)
+
+#define IA32_MSR_APIC_BASE      0x01b
 
 /* Support for SYSENTER and SYSEXIT */
-#define IA32_MSR_SYSENTER_CS   0x174U
-#define IA32_MSR_SYSENTER_ESP  0x175U
-#define IA32_MSR_SYSENTER_EIP  0x176U
+#define IA32_MSR_SYSENTER_CS    0x174
+#define IA32_MSR_SYSENTER_ESP   0x175
+#define IA32_MSR_SYSENTER_EIP   0x176
 
 #ifndef __ASM__