Changeset 811770c in mainline for kernel/arch/amd64/src/cpu/cpu.c

Timestamp:

2016-05-05T12:06:04Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

57c2a87

Parents:

0f17bff

Message:

Avoid magic numbers and specialized functions to set/get register bits

File:

• kernel/arch/amd64/src/cpu/cpu.c (modified) (2 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);
 }