xnu-792.17.14.tar.gz

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

diff --git a/osfmk/i386/eflags.h b/osfmk/i386/eflags.h
index 2d0894b4ed30a89f141febfab44ac175bc13df5c..d2aaefbbf928d7528937b4402ebaac6272ad5cee 100644 (file)
--- a/osfmk/i386/eflags.h
+++ b/osfmk/i386/eflags.h
@@ -1,31 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000 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.
  * limitations under the License.

- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -65,7 +63,7 @@
  *     i386 flags register
  */
 
  *     i386 flags register
  */
 

-#ifndef EFL_CF
+#ifndef EFL_CF         /* FIXME - this is pulled from mach/i386/eflags.h */

 #define        EFL_CF          0x00000001              /* carry */
 #define        EFL_PF          0x00000004              /* parity of low 8 bits */
 #define        EFL_AF          0x00000010              /* carry out of bit 3 */
 #define        EFL_CF          0x00000001              /* carry */
 #define        EFL_PF          0x00000004              /* parity of low 8 bits */
 #define        EFL_AF          0x00000010              /* carry out of bit 3 */


@@ -87,9 +85,6 @@
 #define EFL_ID         0x00200000              /* cpuID instruction */
 #endif
 
 #define EFL_ID         0x00200000              /* cpuID instruction */
 #endif
 

-#define EFL_CLR                0xfff88028
-#define EFL_SET                0x00000002
-

 #define        EFL_USER_SET    (EFL_IF)
 #define        EFL_USER_CLEAR  (EFL_IOPL|EFL_NT|EFL_RF)
 
 #define        EFL_USER_SET    (EFL_IF)
 #define        EFL_USER_CLEAR  (EFL_IOPL|EFL_NT|EFL_RF)