xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / proc_reg.h

diff --git a/osfmk/ppc/proc_reg.h b/osfmk/ppc/proc_reg.h
index 5327ebe8d8ba7fd487a4061888e44569899434f4..6fb49c6133f2ba23f5b5944e99e99dd2a7177e91 100644 (file)
--- a/osfmk/ppc/proc_reg.h
+++ b/osfmk/ppc/proc_reg.h
@@ -1,16 +1,19 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -34,13 +37,13 @@
 /* Define some useful masks that convert from bit numbers */
 
 #if __PPC__
 /* Define some useful masks that convert from bit numbers */
 
 #if __PPC__

-#if _BIG_ENDIAN
+#ifdef __BIG_ENDIAN__

 #ifndef ENDIAN_MASK
 #define ENDIAN_MASK(val,size) (1 << ((size-1) - val))
 #endif
 #else
 #error code not ported to little endian targets yet
 #ifndef ENDIAN_MASK
 #define ENDIAN_MASK(val,size) (1 << ((size-1) - val))
 #endif
 #else
 #error code not ported to little endian targets yet

-#endif /* _BIG_ENDIAN */
+#endif /* __BIG_ENDIAN__ */

 #endif /* __PPC__ */
 
 #define MASK32(PART)   ENDIAN_MASK(PART ## _BIT, 32)
 #endif /* __PPC__ */
 
 #define MASK32(PART)   ENDIAN_MASK(PART ## _BIT, 32)


@@ -166,8 +169,8 @@
 #define dsiAC                          0x00400000
 #define dsiSeg                         0x00200000
 #define dsiValid                       0x5E600000
 #define dsiAC                          0x00400000
 #define dsiSeg                         0x00200000
 #define dsiValid                       0x5E600000

-#define dsiSpcNest                     0x00010000      /* Special nest - software flag */
-#define dsiSpcNestb                    15                      /* Special nest - software flag */
+#define dsiLinkage                     0x00010000      /* Linkage mapping type - software flag */
+#define dsiLinkageb                    15                      /* Linkage mapping type - software flag */

 #define dsiSoftware                    0x0000FFFF
 
 /* SRR1 bits on data/instruction translation exceptions */
 #define dsiSoftware                    0x0000FFFF
 
 /* SRR1 bits on data/instruction translation exceptions */