xnu-2050.18.24.tar.gz

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

diff --git a/osfmk/i386/fpu.h b/osfmk/i386/fpu.h
index 7979b66fa89c619a41f5d20b46b62477f447bb61..5b0658f60ab99c10f61224a6b4db219f0d72ea29 100644 (file)
--- a/osfmk/i386/fpu.h
+++ b/osfmk/i386/fpu.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -54,9 +54,6 @@
  * the rights to redistribute these changes.
  */
 
  * the rights to redistribute these changes.
  */
 

-/*
- */
-

 #ifndef        _I386_FPU_H_
 #define        _I386_FPU_H_
 
 #ifndef        _I386_FPU_H_
 #define        _I386_FPU_H_
 


@@ -65,24 +62,34 @@
  * floating-point processor.
  */
 #include <kern/thread.h>
  * 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 <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>
+
+typedef        enum {
+               FXSAVE32 = 1,
+               FXSAVE64 = 2,
+               XSAVE32  = 3,
+               XSAVE64  = 4,
+               FP_UNUSED = 5
+       } fp_save_layout_t;

 
 extern int             fp_kind;
 
 extern void            init_fpu(void);
 extern void            fpu_module_init(void);
 extern void            fpu_free(
 
 extern int             fp_kind;
 
 extern void            init_fpu(void);
 extern void            fpu_module_init(void);
 extern void            fpu_free(

-                               struct x86_fpsave_state * fps);
+                               void    * fps);

 extern kern_return_t   fpu_set_fxstate(
                                thread_t        thr_act,
 extern kern_return_t   fpu_set_fxstate(
                                thread_t        thr_act,

-                               thread_state_t  state);
+                               thread_state_t  state,
+                               thread_flavor_t f);

 extern kern_return_t   fpu_get_fxstate(
                                thread_t        thr_act,
 extern kern_return_t   fpu_get_fxstate(
                                thread_t        thr_act,

-                               thread_state_t  state);
+                               thread_state_t  state,
+                               thread_flavor_t f);

 extern void            fpu_dup_fxstate(
                                thread_t        parent,
                                thread_t        child);
 extern void            fpu_dup_fxstate(
                                thread_t        parent,
                                thread_t        child);


@@ -92,86 +99,12 @@ extern void         fpexterrflt(void);
 extern void            fpSSEexterrflt(void);
 extern void            fpflush(thread_t);
 extern void            fp_setvalid(boolean_t);
 extern void            fpSSEexterrflt(void);
 extern void            fpflush(thread_t);
 extern void            fp_setvalid(boolean_t);

-extern void            fxsave64(struct x86_fx_save *);
-extern void            fxrstor64(struct x86_fx_save *);
-
-/*
- * FPU instructions.
- */
-#define        fninit() \
-       __asm__ volatile("fninit")
-
-#define        fnstcw(control) \
-       __asm__("fnstcw %0" : "=m" (*(unsigned short *)(control)))
-
-#define        fldcw(control) \
-       __asm__ volatile("fldcw %0" : : "m" (*(unsigned short *) &(control)) )
-
-extern unsigned short          fnstsw(void);
-
-extern __inline__ unsigned short fnstsw(void)
-{
-       unsigned short status;
-       __asm__ volatile("fnstsw %0" : "=ma" (status));
-       return(status);
-}
-
-#define        fnclex() \
-       __asm__ volatile("fnclex")
-
-#define        fnsave(state)  \
-       __asm__ volatile("fnsave %0" : "=m" (*state))
-
-#define        frstor(state) \
-       __asm__ volatile("frstor %0" : : "m" (state))
-
-#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)
-
-
-static inline void clear_fpu(void)
-{
-       set_ts();
-}
-
-/*
- * Save thread`s FPU context.
- */
-
-static inline void fpu_save_context(thread_t thread)
-{
-       struct x86_fpsave_state *ifps;
+#ifdef __i386__
+extern void            fxsave64(struct x86_fx_thread_state *);
+extern void            fxrstor64(struct x86_fx_thread_state *);
+#endif

 
 

-       assert(ml_get_interrupts_enabled() == FALSE);
-       ifps = (thread)->machine.pcb->ifps;
-       if (ifps != 0 && !ifps->fp_valid) {
-               /* Clear CR0.TS in preparation for the FP context save. In
-                * theory, this shouldn't be necessary since a live FPU should
-                * indicate that TS is clear. However, various routines
-                * (such as sendsig & sigreturn) manipulate TS directly.
-                */
-               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);
-                       ifps->fp_save_layout = FXSAVE32;
-               }
-               else {
-                       /* Execute a brief jump to 64-bit mode to save the 64
-                        * bit state
-                        */
-                       fxsave64(&ifps->fx_save_state);
-                       ifps->fp_save_layout = FXSAVE64;
-               }
-       }
-       set_ts();
-}
+extern void clear_fpu(void);
+extern void fpu_save_context(thread_t thread);

 
 #endif /* _I386_FPU_H_ */
 
 #endif /* _I386_FPU_H_ */