WebSVN – HelenOS – Path Comparison – / – /SPARTAN/trunk/arch/ia32/src/ Rev 309 and /SPARTAN/trunk/arch/ia32/src Rev 305

Ignore whitespace Rev 309 → Rev 305

 /SPARTAN/trunk/arch/ia32/src/fpu_context.c
 ,6 → 33,23
 void fpu_context_save(fpu_context_t *fctx)
 {
+}
+void fpu_context_restore(fpu_context_t *fctx)
+{
+    if (THREAD==CPU->fpu_owner)
+        reset_TS_flag();
+    else {
+        set_TS_flag();
+        if (CPU->fpu_owner != NULL)
+            (CPU->fpu_owner)->fpu_context_engaged=1;
+    }
+}
+void fpu_lazy_context_save(fpu_context_t *fctx)
+{
     __asm__ volatile (
         "fnsave %0"
         : "=m"(*fctx)
 ,8 → 56,7
         );
 }
-void fpu_context_restore(fpu_context_t *fctx)
+void fpu_lazy_context_restore(fpu_context_t *fctx)
 {
     __asm__ volatile (
         "frstor %0"

 /SPARTAN/trunk/arch/ia32/src/interrupt.c
 ,11 → 109,18
 void nm_fault(__u8 n, __native stack[])
 {
-#ifdef FPU_LAZY
-    scheduler_fpu_lazy_request();
-#else
-    panic("fpu fault");
-#endif
+    reset_TS_flag();
+    if (CPU->fpu_owner != NULL) {
+        fpu_lazy_context_save(&((CPU->fpu_owner)->saved_fpu_context));
+        CPU->fpu_owner->fpu_context_engaged=0; /* don't prevent migration */
+    }
+    if (THREAD->fpu_context_exists)
+        fpu_lazy_context_restore(&(THREAD->saved_fpu_context));
+    else {
+        fpu_init();
+        THREAD->fpu_context_exists=1;
+    }
+    CPU->fpu_owner=THREAD;
 }

 /SPARTAN/trunk/arch/ia32/src/cpu/cpu.c
 ,9 → 62,10
     "GenuineIntel"
 };
-void fpu_disable(void)
+void set_TS_flag(void)
 {
-    __asm__ volatile (
+    asm
+    (
         "mov %%cr0,%%eax;"
         "or $8,%%eax;"
         "mov %%eax,%%cr0;"
 ,9 → 75,10
     );
 }
-void fpu_enable(void)
+void reset_TS_flag(void)
 {
-    __asm__ volatile (
+    asm
+    (
         "mov %%cr0,%%eax;"
         "and $0xffFFffF7,%%eax;"
         "mov %%eax,%%cr0;"