Changes in kernel/arch/ia32/src/cpu/cpu.c [57c2a87:45b4300] in mainline

File:

• kernel/arch/ia32/src/cpu/cpu.c (modified) (3 diffs)

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

@@ -72 +72 @@
 void fpu_disable(void)
 {
-        write_cr0(read_cr0() & ~CR0_TS); 
+        asm volatile (
+                "mov %%cr0, %%eax\n"
+                "or $8, %%eax\n"
+                "mov %%eax, %%cr0\n"
+                ::: "%eax"
+        );
 }
 
 void fpu_enable(void)
 {
-        write_cr0(read_cr0() | CR0_TS); 
+        asm volatile (
+                "mov %%cr0, %%eax\n"
+                "and $0xffFFffF7, %%eax\n"
+                "mov %%eax,%%cr0\n"
+                ::: "%eax"
+        );
 }
 
@@ -105 +115 @@
                         "mov %[help], %%cr4\n"
                         : [help] "+r" (help)
-                        : [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT)
+                        : [mask] "i" (CR4_OSFXSR_MASK | CR4_OSXMMEXCPT_MASK)
                 );
         }
@@ -150 +160 @@
 void cpu_print_report(cpu_t* cpu)
 {
-        printf("cpu%u: (%s family=%u model=%u stepping=%u apicid=%u) %" PRIu16 
-                " MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
-                cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz);
+        printf("cpu%u: (%s family=%u model=%u stepping=%u) %" PRIu16 " MHz\n",
+                cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family,
+                cpu->arch.model, cpu->arch.stepping, cpu->frequency_mhz);
 }