vserver 1.9.5.x5

[linux-2.6.git] / arch / i386 / kernel / i387.c

diff --git a/arch/i386/kernel/i387.c b/arch/i386/kernel/i387.c
index 3da92c2..5af8b68 100644 (file)
--- a/arch/i386/kernel/i387.c
+++ b/arch/i386/kernel/i387.c
@@ -60,7 +60,8 @@ void init_fpu(struct task_struct *tsk)
                tsk->thread.i387.fsave.twd = 0xffffffffu;
                tsk->thread.i387.fsave.fos = 0xffff0000u;
        }
-       tsk->used_math = 1;
+       /* only the device not available exception or ptrace can call init_fpu */
+       set_stopped_child_used_math(tsk);
 }
 
 /*
@@ -111,16 +112,17 @@ static inline unsigned short twd_i387_to_fxsr( unsigned short twd )
 static inline unsigned long twd_fxsr_to_i387( struct i387_fxsave_struct *fxsave )
 {
        struct _fpxreg *st = NULL;
+       unsigned long tos = (fxsave->swd >> 11) & 7;
        unsigned long twd = (unsigned long) fxsave->twd;
        unsigned long tag;
        unsigned long ret = 0xffff0000u;
        int i;
 
-#define FPREG_ADDR(f, n)       ((char *)&(f)->st_space + (n) * 16);
+#define FPREG_ADDR(f, n)       ((void *)&(f)->st_space + (n) * 16);
 
        for ( i = 0 ; i < 8 ; i++ ) {
                if ( twd & 0x1 ) {
-                       st = (struct _fpxreg *) FPREG_ADDR( fxsave, i );
+                       st = FPREG_ADDR( fxsave, (i - tos) & 7 );
 
                        switch ( st->exponent & 0x7fff ) {
                        case 0x7fff:
@@ -330,13 +332,13 @@ static int save_i387_fxsave( struct _fpstate __user *buf )
 
 int save_i387( struct _fpstate __user *buf )
 {
-       if ( !current->used_math )
+       if ( !used_math() )
                return 0;
 
        /* This will cause a "finit" to be triggered by the next
         * attempted FPU operation by the 'current' process.
         */
-       current->used_math = 0;
+       clear_used_math();
 
        if ( HAVE_HWFP ) {
                if ( cpu_has_fxsr ) {
@@ -382,7 +384,7 @@ int restore_i387( struct _fpstate __user *buf )
        } else {
                err = restore_i387_soft( &current->thread.i387.soft, buf );
        }
-       current->used_math = 1;
+       set_used_math();
        return err;
 }
 
@@ -506,7 +508,7 @@ int dump_fpu( struct pt_regs *regs, struct user_i387_struct *fpu )
        int fpvalid;
        struct task_struct *tsk = current;
 
-       fpvalid = tsk->used_math;
+       fpvalid = !!used_math();
        if ( fpvalid ) {
                unlazy_fpu( tsk );
                if ( cpu_has_fxsr ) {
@@ -519,24 +521,9 @@ int dump_fpu( struct pt_regs *regs, struct user_i387_struct *fpu )
        return fpvalid;
 }
 
-int dump_extended_fpu( struct pt_regs *regs, struct user_fxsr_struct *fpu )
-{
-       int fpvalid;
-       struct task_struct *tsk = current;
-
-       fpvalid = tsk->used_math && cpu_has_fxsr;
-       if ( fpvalid ) {
-               unlazy_fpu( tsk );
-               memcpy( fpu, &tsk->thread.i387.fxsave,
-                       sizeof(struct user_fxsr_struct) );
-       }
-
-       return fpvalid;
-}
-
 int dump_task_fpu(struct task_struct *tsk, struct user_i387_struct *fpu)
 {
-       int fpvalid = tsk->used_math;
+       int fpvalid = !!tsk_used_math(tsk);
 
        if (fpvalid) {
                if (tsk == current)
@@ -551,7 +538,7 @@ int dump_task_fpu(struct task_struct *tsk, struct user_i387_struct *fpu)
 
 int dump_task_extended_fpu(struct task_struct *tsk, struct user_fxsr_struct *fpu)
 {
-       int fpvalid = tsk->used_math && cpu_has_fxsr;
+       int fpvalid = tsk_used_math(tsk) && cpu_has_fxsr;
 
        if (fpvalid) {
                if (tsk == current)