Changeset ea3fb2e in mainline

Timestamp:

2005-05-12T18:02: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:

f2ffad4

Parents:

c884ef1

Message:

Move fpu_owner pointer from cpu_arch_t to cpu_t.

Files:

• arch/ia32/include/cpu.h (modified) (1 diff)
• arch/ia32/src/cpu/cpu.c (modified) (1 diff)
• arch/ia32/src/fpu_context.c (modified) (1 diff)
• arch/ia32/src/interrupt.c (modified) (2 diffs)
• include/cpu.h (modified) (1 diff)
• src/Makefile.config (modified) (1 diff)
• src/proc/scheduler.c (modified) (1 diff)

arch/ia32/include/cpu.h

@@ -48 +48 @@
         int stepping;
         struct tss *tss;
-        thread_t *fpu_owner;
 };
 

arch/ia32/src/cpu/cpu.c

@@ -93 +93 @@
 {
         CPU->arch.tss = tss_p;
-        CPU->arch.fpu_owner=NULL;
+        CPU->fpu_owner=NULL;
 }
 

arch/ia32/src/fpu_context.c

@@ -41 +41 @@
 void fpu_context_restore(fpu_context_t *fctx)
 {
-        if(THREAD==CPU->arch.fpu_owner) {reset_TS_flag(); }
-        else {set_TS_flag(); ((CPU->arch).fpu_owner)->fpu_context_engaged=1;}
+        if(THREAD==CPU->fpu_owner) {reset_TS_flag(); }
+        else {set_TS_flag(); (CPU->fpu_owner)->fpu_context_engaged=1;}
 }
 

arch/ia32/src/interrupt.c

@@ -89 +89 @@
 {
 
-        if (((CPU->arch).fpu_owner)!=NULL) 
+        if ((CPU->fpu_owner)!=NULL) 
         {  
-                fpu_lazy_context_save(&(((CPU->arch).fpu_owner)->saved_fpu_context));
-                ((CPU->arch).fpu_owner)->fpu_context_engaged=0; /* Enables migration */
+                fpu_lazy_context_save(&((CPU->fpu_owner)->saved_fpu_context));
+                (CPU->fpu_owner)->fpu_context_engaged=0; /* Enables migration */
         }
         
@@ -98 +98 @@
         else {fpu_init();THREAD->fpu_context_exists=1;}
 
-        (CPU->arch).fpu_owner=THREAD;
+        CPU->fpu_owner=THREAD;
 
         reset_TS_flag();

include/cpu.h

@@ -67 +67 @@
 
         cpu_arch_t arch;
+
+        thread_t *fpu_owner;
         
         __u8 *stack;

src/Makefile.config

@@ -1 @@
-ARCH=ia32
+#ARCH=ia32
 #ARCH=mips
-#ARCH=ia64
+ARCH=ia64
 #ARCH=powerpc
 #ARCH=amd64

src/proc/scheduler.c

@@ -270 +270 @@
 
                             spinlock_lock(&THREAD->cpu->lock);
-                            if(THREAD->cpu->arch.fpu_owner==THREAD) THREAD->cpu->arch.fpu_owner=NULL;
+                            if(THREAD->cpu->fpu_owner==THREAD) THREAD->cpu->fpu_owner=NULL;
                             spinlock_unlock(&THREAD->cpu->lock);