xnu-1456.1.26.tar.gz

[apple/xnu.git] / bsd / i386 / ucontext.h

diff --git a/bsd/i386/ucontext.h b/bsd/i386/ucontext.h
index 0ce0243b3d0dd870e67ed7890a768de988b5e4e3..acae1f055b7b5b173896cafeec4826765ffa422b 100644 (file)
--- a/bsd/i386/ucontext.h
+++ b/bsd/i386/ucontext.h
@@ -33,42 +33,31 @@
 #include <sys/appleapiopts.h>
 #include <mach/thread_status.h>
 
-#ifdef __APPLE_API_UNSTABLE
-/* WARNING: THIS WILL CHANGE;  DO NOT COUNT ON THIS */
-/* Needs to be finalized as to what it should contain */
-#ifndef _POSIX_C_SOURCE
+#if !__DARWIN_UNIX03
 struct mcontext
-#else /* _POSIX_C_SOURCE */
+#else /* __DARWIN_UNIX03 */
 struct __darwin_mcontext
-#endif /* _POSIX_C_SOURCE */
+#endif /* __DARWIN_UNIX03 */
 {
-       struct sigcontext sc;
+       i386_exception_state_t  es;
+       i386_thread_state_t     ss;     
+       i386_float_state_t      fs;
 };
 
-#ifndef _POSIX_C_SOURCE
-#define I386_MCONTEXT_SIZE     sizeof(struct mcontext) 
-#endif /* _POSIX_C_SOURCE */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define I386_MCONTEXT_SIZE     (i386_THREAD_STATE_COUNT + i386_FLOAT_STATE_COUNT + I386_EXCEPTION_STATE_COUNT) * sizeof(int)
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 
 #ifndef _MCONTEXT_T
 #define _MCONTEXT_T
-typedef __darwin_mcontext_t    mcontext_t;
+#if defined(__LP64__)
+typedef __darwin_mcontext64_t  mcontext_t;
+#else
+typedef __darwin_mcontext32_t  mcontext_t;
 #endif
-
-#ifndef _POSIX_C_SOURCE
-
-struct mcontext64
-{
-       struct sigcontext sc;
-};
-#define I386_MCONTEXT64_SIZE   sizeof(struct mcontext64)       
-
-#ifndef _MCONTEXT64_T
-#define _MCONTEXT64_T
-typedef struct mcontext64 * mcontext64_t;
 #endif
 
-#endif /* _POSIX_C_SOURCE */
+//#endif
 
-#endif /* __APPLE_API_UNSTABLE */
 
 #endif /* _I386_UCONTEXT_H_ */