Changeset 0f17bff in mainline for kernel/arch/ia32/src/pm.c

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/src/pm.c (modified) (3 diffs)

kernel/arch/ia32/src/pm.c

@@ -47 +47 @@
 #include <arch/boot/boot.h>
 #include <interrupt.h>
+#include <arch/cpu.h>
 
 /*
@@ -256 +257 @@
 }
 
-/* Clean IOPL(12,13) and NT(14) flags in EFLAGS register */
-static void clean_IOPL_NT_flags(void)
-{
-        asm volatile (
-                "pushfl\n"
-                "pop %%eax\n"
-                "and $0xffff8fff, %%eax\n"
-                "push %%eax\n"
-                "popfl\n"
-                ::: "eax"
-        );
-}
-
-/* Clean AM(18) flag in CR0 register */
-static void clean_AM_flag(void)
-{
-        asm volatile (
-                "mov %%cr0, %%eax\n"
-                "and $0xfffbffff, %%eax\n"
-                "mov %%eax, %%cr0\n"
-                ::: "eax"
-        );
-}
-
 void pm_init(void)
 {
@@ -326 +303 @@
         tr_load(GDT_SELECTOR(TSS_DES));
         
-        clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels and clear NT flag. */
-        clean_AM_flag();          /* Disable alignment check */
+        /* Disable I/O on nonprivileged levels and clear NT flag. */
+        write_eflags(read_eflags() & ~(EFLAGS_IOPL | EFLAGS_NT));
+
+        /* Disable alignment check */
+        write_cr0(read_cr0() & ~CR0_AM);
 }