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

Timestamp:

2016-05-05T13:02:20Z (9 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/src

Files:

• boot/multiboot.S (modified) (5 diffs)
• boot/vesa_real.inc (modified) (2 diffs)
• cpu/cpu.c (modified) (2 diffs)
• smp/ap.S (modified) (2 diffs)

kernel/arch/ia32/src/boot/multiboot.S

@@ -35 +35 @@
 #include <genarch/multiboot/multiboot.h>
 #include <arch/cpuid.h>
+#include <arch/cpu.h>
 
 #define START_STACK  (BOOT_OFFSET - BOOT_STACK_SIZE)
@@ -166 +167 @@
         /* Paging features */
         movl %cr4, %ecx
-        orl $(1 << 4), %ecx      /* PSE on */
-        andl $(~(1 << 5)), %ecx  /* PAE off */
+        orl $CR4_PSE, %ecx      /* PSE on */
+        andl $~CR4_PAE, %ecx    /* PAE off */
         movl %ecx, %cr4
         
@@ -191 +192 @@
         
         movl %cr0, %ebx
-        orl $(1 << 31), %ebx  /* paging on */
+        orl $CR0_PG, %ebx       /* paging on */
         movl %ebx, %cr0
         ret
@@ -205 +206 @@
         /* Paging features */
         movl %cr4, %ecx
-        andl $(~(1 << 5)), %ecx  /* PAE off */
+        andl $~CR4_PAE, %ecx  /* PAE off */
         movl %ecx, %cr4
         
@@ -277 +278 @@
                 
                 movl %cr0, %ebx
-                orl $(1 << 31), %ebx  /* paging on */
+                orl $CR0_PG, %ebx  /* paging on */
                 movl %ebx, %cr0
                 

kernel/arch/ia32/src/boot/vesa_real.inc

@@ -49 +49 @@
 vesa_init_real:
         mov %cr0, %eax
-        and $~1, %eax
+        and $~CR0_PE, %eax
         mov %eax, %cr0
         
@@ -352 +352 @@
                 
                         mov %cr0, %ecx
-                        or $1, %ecx
+                        or $CR0_PE, %ecx
                         mov %ecx, %cr0
                         

kernel/arch/ia32/src/cpu/cpu.c

@@ -72 +72 @@
 void fpu_disable(void)
 {
-        asm volatile (
-                "mov %%cr0, %%eax\n"
-                "or $8, %%eax\n"
-                "mov %%eax, %%cr0\n"
-                ::: "%eax"
-        );
+        write_cr0(read_cr0() & ~CR0_TS); 
 }
 
 void fpu_enable(void)
 {
-        asm volatile (
-                "mov %%cr0, %%eax\n"
-                "and $0xffFFffF7, %%eax\n"
-                "mov %%eax,%%cr0\n"
-                ::: "%eax"
-        );
+        write_cr0(read_cr0() | CR0_TS); 
 }
 
@@ -115 +105 @@
                         "mov %[help], %%cr4\n"
                         : [help] "+r" (help)
-                        : [mask] "i" (CR4_OSFXSR_MASK | CR4_OSXMMEXCPT_MASK)
+                        : [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT)
                 );
         }

kernel/arch/ia32/src/smp/ap.S

@@ -37 +37 @@
 #include <arch/mm/page.h>
 #include <arch/pm.h>
+#include <arch/cpu.h>
 
 .section K_TEXT_START, "ax"
@@ -63 +64 @@
         /* switch to protected mode */
         movl %cr0, %eax
-        orl $1, %eax
+        orl $CR0_PE, %eax
         movl %eax, %cr0
         jmpl $KTEXT, $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET