Changeset 0f17bff in mainline for kernel/arch/ia32/src

Timestamp:

2016-05-05T08:34:45Z (9 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

Location:

kernel/arch/ia32/src

Files:

• asm.S (modified) (3 diffs)
• pm.c (modified) (3 diffs)
• smp/apic.c (modified) (1 diff)
• userspace.c (modified) (4 diffs)

kernel/arch/ia32/src/asm.S

@@ -36 +36 @@
 #include <arch/mm/page.h>
 #include <arch/istate_struct.h>
+#include <arch/smp/apic.h>
 
 .text
@@ -110 +111 @@
 FUNCTION_BEGIN(paging_on)
         movl %cr0, %edx
-        orl $(1 << 31), %edx  /* paging on */
+        orl $CR0_PG, %edx  /* paging on */
         
         /* Clear Cache Disable and not Write Though */
-        andl $~((1 << 30) | (1 << 29)), %edx
+        andl $~(CR0_CD | CR0_NW), %edx
         movl %edx, %cr0
         jmp 0f
@@ -127 +128 @@
  */
 FUNCTION_BEGIN(enable_l_apic_in_msr)
-        movl $0x1b, %ecx
+        movl $IA32_MSR_APIC_BASE, %ecx
         rdmsr
-        orl $(1 << 11), %eax
-        orl $(0xfee00000), %eax
+        orl $(L_APIC_BASE | IA32_APIC_BASE_GE), %eax
         wrmsr
         ret

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);
 }
 

kernel/arch/ia32/src/smp/apic.c

@@ -72 +72 @@
  *
  */
-volatile uint32_t *l_apic = (uint32_t *) UINT32_C(0xfee00000);
-volatile uint32_t *io_apic = (uint32_t *) UINT32_C(0xfec00000);
+volatile uint32_t *l_apic = (uint32_t *) L_APIC_BASE;
+volatile uint32_t *io_apic = (uint32_t *) IO_APIC_BASE;
 
 uint32_t apic_id_mask = 0;

kernel/arch/ia32/src/userspace.c

@@ -39 +39 @@
 #include <abi/proc/uarg.h>
 #include <mm/as.h>
+#include <arch/cpu.h>
+#include <arch/asm.h>
 
 /** Enter userspace
@@ -47 +49 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        ipl_t ipl = interrupts_disable();
+        uint32_t eflags = read_eflags();
         
         asm volatile (
-                /*
-                 * Clear nested task flag.
-                 */
-                "pushfl\n"
-                "pop %%eax\n"
-                "and $0xffffbfff, %%eax\n"
-                "push %%eax\n"
-                "popfl\n"
-                
                 /* Set up GS register (virtual register segment) */
                 "movl %[vreg_des], %%gs\n"
@@ -64 +57 @@
                 "pushl %[udata_des]\n"
                 "pushl %[stack_top]\n"
-                "pushl %[ipl]\n"
+                "pushl %[eflags]\n"
                 "pushl %[utext_des]\n"
                 "pushl %[entry]\n"
@@ -74 +67 @@
                 "iret\n"
                 :
-                : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
+                : [eflags_mask] "i" (~EFLAGS_NT),
+                  [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
                   [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
                       kernel_uarg->uspace_stack_size),
-                  [ipl] "r" (ipl),
+                  [eflags] "r" ((eflags & ~(EFLAGS_NT)) | EFLAGS_IF),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
                   [entry] "r" (kernel_uarg->uspace_entry),