xnu-1228.0.2.tar.gz

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

diff --git a/osfmk/i386/fpu.h b/osfmk/i386/fpu.h
index 9effc417facf342c5ff1b01bf5f66b8360ece48e..cd0b7890635ed9a364480035e3c65ec1e4d7877d 100644 (file)
--- a/osfmk/i386/fpu.h
+++ b/osfmk/i386/fpu.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -48,9 +54,6 @@
  * the rights to redistribute these changes.
  */
 
-/*
- */
-
 #ifndef        _I386_FPU_H_
 #define        _I386_FPU_H_
 
@@ -101,9 +104,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));
@@ -152,6 +154,7 @@ static inline void fpu_save_context(thread_t thread)
                clear_ts();
                /* registers are in FPU - save to memory */
                ifps->fp_valid = TRUE;
+
                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);