Changeset 0dc2fec in mainline for kernel/arch/ia32/src/cpu/cpu.c

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

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