Changes in kernel/arch/amd64/src/cpu/cpu.c [9d58539:811770c] in mainline

File:

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

kernel/arch/amd64/src/cpu/cpu.c

@@ -76 +76 @@
 void cpu_setup_fpu(void)
 {
-        asm volatile (
-                "movq %%cr0, %%rax\n"
-                "btsq $1, %%rax\n"  /* cr0.mp */
-                "btrq $2, %%rax\n"  /* cr0.em */
-                "movq %%rax, %%cr0\n"
-                
-                "movq %%cr4, %%rax\n"
-                "bts $9, %%rax\n"   /* cr4.osfxsr */
-                "movq %%rax, %%cr4\n"
-                ::: "%rax"
-        );
+        write_cr0((read_cr0() & ~CR0_EM) | CR0_MP);
+        write_cr4(read_cr4() | CR4_OSFXSR);
 }
 
@@ -97 +88 @@
 void fpu_disable(void)
 {
-        asm volatile (
-                "mov %%cr0, %%rax\n"
-                "bts $3, %%rax\n"
-                "mov %%rax, %%cr0\n"
-                ::: "%rax"
-        );
+        write_cr0(read_cr0() | CR0_TS);
 }
 
 void fpu_enable(void)
 {
-        asm volatile (
-                "mov %%cr0, %%rax\n"
-                "btr $3, %%rax\n"
-                "mov %%rax, %%cr0\n"
-                ::: "%rax"
-        );
+        write_cr0(read_cr0() & ~CR0_TS);
 }
 
@@ -158 +139 @@
 void cpu_print_report(cpu_t* m)
 {
-        printf("cpu%d: (%s family=%d model=%d stepping=%d) %dMHz\n",
+        printf("cpu%d: (%s family=%d model=%d stepping=%d apicid=%u) %dMHz\n",
             m->id, vendor_str[m->arch.vendor], m->arch.family, m->arch.model,
-            m->arch.stepping, m->frequency_mhz);
+            m->arch.stepping, m->arch.id, m->frequency_mhz);
 }