xnu-517.tar.gz

[apple/xnu.git] / osfmk / i386 / fpu.h

diff --git a/osfmk/i386/fpu.h b/osfmk/i386/fpu.h
index 2b1f9acd755667ae8dfe9ed5211c6fd39595a8ee..ba87629029e797aa975b0736d9c4e1d17bfc0924 100644 (file)
--- a/osfmk/i386/fpu.h
+++ b/osfmk/i386/fpu.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -90,7 +93,7 @@ extern __inline__ unsigned short fnstsw(void)
 #define        fnclex() \
        __asm__ volatile("fnclex")
 
-#define        fnsave(state) \
+#define        fnsave(state)  \
        __asm__ volatile("fnsave %0" : "=m" (*state))
 
 #define        frstor(state) \
@@ -99,6 +102,10 @@ extern __inline__ unsigned short fnstsw(void)
 #define fwait() \
        __asm__("fwait");
 
+#define fxrstor(addr)           __asm("fxrstor %0" : : "m" (*(addr)))     
+#define fxsave(addr)            __asm __volatile("fxsave %0" : "=m" (*(addr)))
+
+#define FXSAFE() (fp_kind == FP_FXSR)
 
 #define        fpu_load_context(pcb)
 
@@ -107,6 +114,8 @@ extern __inline__ unsigned short fnstsw(void)
  * If only one CPU, we just set the task-switched bit,
  * to keep the new thread from using the coprocessor.
  * If multiple CPUs, we save the entire state.
+ * NOTE: in order to provide backwards compatible support in the kernel. When saving SSE2 state, we also save the
+ * FP state in it's old location. Otherwise fpu_get_state() and fpu_set_state() will stop working
  */
 #if    NCPUS > 1
 #define        fpu_save_context(thread) \
@@ -116,7 +125,12 @@ extern __inline__ unsigned short fnstsw(void)
        if (ifps != 0 && !ifps->fp_valid) { \
            /* registers are in FPU - save to memory */ \
            ifps->fp_valid = TRUE; \
-           fnsave(&ifps->fp_save_state); \
+            ifps->fp_save_flavor = FP_387; \
+            if (FXSAFE()) { \
+               fxsave(&ifps->fx_save_state); \
+                ifps->fp_save_flavor = FP_FXSR; \
+           } \
+            fnsave(&ifps->fp_save_state); \
        } \
        set_ts(); \
     }
@@ -142,6 +156,12 @@ extern kern_return_t       fpu_set_state(
 extern kern_return_t   fpu_get_state(
                                thread_act_t                    thr_act,
                                struct i386_float_state         * st);
+/* extern kern_return_t        fpu_set_fxstate(
+                               thread_act_t                    thr_act,
+                               struct i386_float_state         * st);
+extern kern_return_t   fpu_get_fxstate(
+                               thread_act_t                    thr_act,
+                               struct i386_float_state         * st); */
 extern void            fpnoextflt(void);
 extern void            fpextovrflt(void);
 extern void            fpexterrflt(void);