Changes in kernel/arch/ia32/src/fpu_context.c [24c394b:9d58539] in mainline

File:

• kernel/arch/ia32/src/fpu_context.c (modified) (9 diffs)

kernel/arch/ia32/src/fpu_context.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup ia32    
  * @{
  */
@@ -38 +38 @@
 #include <cpu.h>
 
-/** x87 FPU scr values (P3+ MMX2) */
-enum {
-        X87_FLUSH_ZERO_FLAG = (1 << 15),
-        X87_ROUND_CONTROL_MASK = (0x3 << 13),
-        x87_ROUND_TO_NEAREST_EVEN = (0x0 << 13),
-        X87_ROUND_DOWN_TO_NEG_INF = (0x1 << 13),
-        X87_ROUND_UP_TO_POS_INF = (0x2 << 13),
-        X87_ROUND_TO_ZERO = (0x3 << 13),
-        X87_PRECISION_MASK = (1 << 12),
-        X87_UNDERFLOW_MASK = (1 << 11),
-        X87_OVERFLOW_MASK = (1 << 10),
-        X87_ZERO_DIV_MASK = (1 << 9),
-        X87_DENORMAL_OP_MASK = (1 << 8),
-        X87_INVALID_OP_MASK = (1 << 7),
-        X87_DENOM_ZERO_FLAG = (1 << 6),
-        X87_PRECISION_EXC_FLAG = (1 << 5),
-        X87_UNDERFLOW_EXC_FLAG = (1 << 4),
-        X87_OVERFLOW_EXC_FLAG = (1 << 3),
-        X87_ZERO_DIV_EXC_FLAG = (1 << 2),
-        X87_DENORMAL_EXC_FLAG = (1 << 1),
-        X87_INVALID_OP_EXC_FLAG = (1 << 0),
-        
-        X87_ALL_MASK = X87_PRECISION_MASK | X87_UNDERFLOW_MASK | X87_OVERFLOW_MASK | X87_ZERO_DIV_MASK | X87_DENORMAL_OP_MASK | X87_INVALID_OP_MASK,
-};
-
 typedef void (*fpu_context_function)(fpu_context_t *fctx);
 
-static fpu_context_function fpu_save;
-static fpu_context_function fpu_restore;
+static fpu_context_function fpu_save, fpu_restore;
 
 static void fpu_context_f_save(fpu_context_t *fctx)
@@ -72 +46 @@
         asm volatile (
                 "fnsave %[fctx]"
-                : [fctx] "=m" (fctx->fpu)
+                : [fctx] "=m" (*fctx)
         );
 }
@@ -80 +54 @@
         asm volatile (
                 "frstor %[fctx]"
-                : [fctx] "=m" (fctx->fpu)
+                : [fctx] "=m" (*fctx)
         );
 }
@@ -88 +62 @@
         asm volatile (
                 "fxsave %[fctx]"
-                : [fctx] "=m" (fctx->fpu)
+                : [fctx] "=m" (*fctx)
         );
 }
@@ -96 +70 @@
         asm volatile (
                 "fxrstor %[fctx]"
-                : [fctx] "=m" (fctx->fpu)
+                : [fctx] "=m" (*fctx)
         );
 }
@@ -103 +77 @@
 void fpu_fxsr(void)
 {
-        fpu_save = fpu_context_fx_save;
-        fpu_restore = fpu_context_fx_restore;
+        fpu_save=fpu_context_fx_save;
+        fpu_restore=fpu_context_fx_restore;
 }
 
@@ -124 +98 @@
 }
 
-/** Initialize x87 FPU. Mask all exceptions. */
 void fpu_init()
 {
@@ -138 +111 @@
                 "ldmxcsr %[help0]\n"
                 : [help0] "+m" (help0), [help1] "+r" (help1)
-                : [magic] "i" (X87_ALL_MASK)
+                : [magic] "i" (0x1f80)
         );
 }