xnu-1456.1.26.tar.gz

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

diff --git a/osfmk/i386/fpu.h b/osfmk/i386/fpu.h
index 220a3c376fb0d09eada853f6966484a3964e77b8..7b6f86a826fed74c55d39010f9671c42067a420d 100644 (file)
--- a/osfmk/i386/fpu.h
+++ b/osfmk/i386/fpu.h
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, unlawful or unlicensed copies of an Apple operating 
- * system, or to circumvent, violate, or enable the circumvention or 
- * violation of, any terms of an Apple operating system software license 
- * agreement.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -56,9 +54,6 @@
  * the rights to redistribute these changes.
  */
 
-/*
- */
-
 #ifndef        _I386_FPU_H_
 #define        _I386_FPU_H_
 
@@ -67,11 +62,11 @@
  * floating-point processor.
  */
 #include <kern/thread.h>
-#include <i386/thread.h>
 #include <kern/kern_types.h>
 #include <mach/i386/kern_return.h>
 #include <mach/i386/thread_status.h>
 #include <i386/proc_reg.h>
+#include <i386/thread.h>
 
 extern int             fp_kind;
 
@@ -94,8 +89,10 @@ extern void          fpexterrflt(void);
 extern void            fpSSEexterrflt(void);
 extern void            fpflush(thread_t);
 extern void            fp_setvalid(boolean_t);
+#ifdef __i386__
 extern void            fxsave64(struct x86_fx_save *);
 extern void            fxrstor64(struct x86_fx_save *);
+#endif
 
 /*
  * FPU instructions.
@@ -109,9 +106,8 @@ extern void         fxrstor64(struct x86_fx_save *);
 #define        fldcw(control) \
        __asm__ volatile("fldcw %0" : : "m" (*(unsigned short *) &(control)) )
 
-extern unsigned short          fnstsw(void);
-
-extern __inline__ unsigned short fnstsw(void)
+static inline unsigned short
+fnstsw(void)
 {
        unsigned short status;
        __asm__ volatile("fnstsw %0" : "=ma" (status));
@@ -141,6 +137,7 @@ static inline void clear_fpu(void)
        set_ts();
 }
 
+
 /*
  * Save thread`s FPU context.
  */
@@ -160,6 +157,8 @@ static inline void fpu_save_context(thread_t thread)
                clear_ts();
                /* registers are in FPU - save to memory */
                ifps->fp_valid = TRUE;
+
+#if defined(__i386__)
                if (!thread_is_64bit(thread) || is_saved_state32(thread->machine.pcb->iss)) {
                        /* save the compatibility/legacy mode XMM+x87 state */
                        fxsave(&ifps->fx_save_state);
@@ -172,6 +171,13 @@ static inline void fpu_save_context(thread_t thread)
                        fxsave64(&ifps->fx_save_state);
                        ifps->fp_save_layout = FXSAVE64;
                }
+#elif defined(__x86_64__)
+               /* for a 64-bit long mode kernel, we can always use plain fxsave */
+               fxsave(&ifps->fx_save_state);
+               ifps->fp_save_layout = thread_is_64bit(thread) ? FXSAVE64
+                       : FXSAVE32;
+
+#endif
        }
        set_ts();
 }