Changeset 6de2480e in mainline

Timestamp:

2005-05-19T11:55:15Z (20 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

f3ebb64

Parents:

1eee8383

Message:

IA-32 FPU lazy context switching.
Doesn't work on Bochs and sometimes produces wrong results on P4.
Seems to work on VMware and PII.

Build script for IA-32 changed to build floppy images (image.bin) 1440K long.

Files:

• arch/ia32/boot/Makefile (modified) (1 diff)
• arch/ia32/include/interrupt.h (modified) (1 diff)
• arch/ia32/src/fpu_context.c (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (1 diff)
• arch/ia32/src/pm.c (modified) (1 diff)
• src/Makefile.config (modified) (2 diffs)
• test/fp/fp0/test.c (added)

arch/ia32/boot/Makefile

@@ -6 +6 @@
         dd if=boot.bin of=../../../src/image.bin bs=512 conv=sync
         -cat ../../../src/kernel.bin >>../../../src/image.bin
+        dd if=/dev/zero of=../../../src/image.bin bs=1 seek=$(KERNEL_SIZE) count=`expr 1474560 - $(KERNEL_SIZE)`
 
 boot.bin: boot.o

arch/ia32/include/interrupt.h

@@ -78 +78 @@
 extern void gp_fault(__u8 n, __u32 stack[]);
 extern void nm_fault(__u8 n, __u32 stack[]);
+extern void ss_fault(__u8 n, __u32 stack[]);
 extern void page_fault(__u8 n, __u32 stack[]);
 extern void syscall(__u8 n, __u32 stack[]);

arch/ia32/src/fpu_context.c

@@ -52 +52 @@
 void fpu_lazy_context_save(fpu_context_t *fctx)
 {
+    printf("");
     asm(
         "mov %0,%%eax;"
         "fxsave (%%eax);"
-        "ret;"
         :"=m"(fctx)
         :
-        :"%eax"
+        :"eax"
     );  
+    printf("");
 }
 
 void fpu_lazy_context_restore(fpu_context_t *fctx)
 {
+    printf("");
     asm(
         "mov %0,%%eax;"
         "fxrstor (%%eax);"
-        "ret;"
         :"=m"(fctx)
         :
-        :"%eax"
+        :"eax"
     );
+    printf("");    
 }
 

arch/ia32/src/interrupt.c

@@ -86 +86 @@
 }
 
+void ss_fault(__u8 n, __u32 stack[])
+{
+        printf("stack[0]=%X, %%eip=%X, %%cs=%X, flags=%X\n", stack[0], stack[1], stack[2], stack[3]);
+        printf("%%eax=%L, %%ebx=%L, %%ecx=%L, %%edx=%L,\n%%edi=%L, %%esi=%L, %%ebp=%L, %%esp=%L\n", stack[-2], stack[-5], stack[-3], stack[-4], stack[-9], stack[-8], stack[-1], stack);
+        printf("stack: %X, %X, %X, %X\n", stack[4], stack[5], stack[6], stack[7]);
+        panic("Stack fault\n");
+}
+
+
 void nm_fault(__u8 n, __u32 stack[])
 {
 
+//      printf("-1\n");        
+        reset_TS_flag();
         if ((CPU->fpu_owner)!=NULL) 
         {  
-                fpu_lazy_context_save(&((CPU->fpu_owner)->saved_fpu_context));
+//              printf("owner %X\n",(int)(&((CPU->fpu_owner)->saved_fpu_context)));        
+                fpu_lazy_context_save(&((CPU->fpu_owner)->saved_fpu_context));
+
+//              printf("owner 2\n");
                 (CPU->fpu_owner)->fpu_context_engaged=0; /* Enables migration */
+//              printf("owner 3\n");        
+
         }
-        
+//      printf("0\n");
         if(THREAD->fpu_context_exists) fpu_lazy_context_restore(&(THREAD->saved_fpu_context));
         else {fpu_init();THREAD->fpu_context_exists=1;}
-
+//      printf("1\n");
         CPU->fpu_owner=THREAD;
-
-        reset_TS_flag();
+//      printf("2\n");
         
+//      printf("3\n");  
 //      panic("#NM fault\n");
 }

arch/ia32/src/pm.c

@@ -122 +122 @@
         trap_register(13, gp_fault);
         trap_register( 7, nm_fault);
+        trap_register(12, ss_fault);
 }
 

src/Makefile.config

@@ -18 +18 @@
 
 # Uncomment if you want to run in the test mode
-#TEST=__TEST__
+TEST=__TEST__
 
 TEST_FILE=test.c
@@ -26 +26 @@
 #TEST_DIR=synch/rwlock2/
 #TEST_DIR=synch/rwlock3/
-TEST_DIR=synch/rwlock4/
+#TEST_DIR=synch/rwlock4/
 #TEST_DIR=synch/rwlock5/
 #TEST_DIR=synch/semaphore1/
 #TEST_DIR=synch/semaphore2/
+TEST_DIR=fp/fp0