xnu-4903.221.2.tar.gz

[apple/xnu.git] / osfmk / mach / machine.h

diff --git a/osfmk/mach/machine.h b/osfmk/mach/machine.h
index 9c459178a7fa390d244a68cb15a0b7eecf5f35e2..b7a5d36b6c24bd4ecea7686f414518fcd9489eec 100644 (file)
--- a/osfmk/mach/machine.h
+++ b/osfmk/mach/machine.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2007-2016 Apple, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -126,8 +127,8 @@ __END_DECLS
 /*
  * Capability bits used in the definition of cpu_type.
  */
-#define        CPU_ARCH_MASK   0xff000000              /* mask for architecture bits */
-#define CPU_ARCH_ABI64 0x01000000              /* 64 bit ABI */
+#define        CPU_ARCH_MASK           0xff000000      /* mask for architecture bits */
+#define CPU_ARCH_ABI64         0x01000000      /* 64 bit ABI */
 
 /*
  *     Machine types known by all.
@@ -150,7 +151,7 @@ __END_DECLS
 #define CPU_TYPE_MC98000       ((cpu_type_t) 10)
 #define CPU_TYPE_HPPA           ((cpu_type_t) 11)
 #define CPU_TYPE_ARM           ((cpu_type_t) 12)
-#define CPU_TYPE_ARM64          (CPU_TYPE_ARM | CPU_ARCH_ABI64)
+#define CPU_TYPE_ARM64         (CPU_TYPE_ARM | CPU_ARCH_ABI64)
 #define CPU_TYPE_MC88000       ((cpu_type_t) 13)
 #define CPU_TYPE_SPARC         ((cpu_type_t) 14)
 #define CPU_TYPE_I860          ((cpu_type_t) 15)
@@ -367,6 +368,7 @@ __END_DECLS
 #define CPU_SUBTYPE_ARM64_ALL           ((cpu_subtype_t) 0)
 #define CPU_SUBTYPE_ARM64_V8            ((cpu_subtype_t) 1)
 
+
 #endif /* !__ASSEMBLER__ */
 
 /*
@@ -385,8 +387,6 @@ __END_DECLS
 #define CPUFAMILY_POWERPC_G4           0x77c184ae
 #define CPUFAMILY_POWERPC_G5           0xed76d8aa
 #define CPUFAMILY_INTEL_6_13           0xaa33392b
-#define CPUFAMILY_INTEL_YONAH          0x73d67300
-#define CPUFAMILY_INTEL_MEROM          0x426f69ef
 #define CPUFAMILY_INTEL_PENRYN         0x78ea4fbc
 #define CPUFAMILY_INTEL_NEHALEM                0x6b5a4cd2
 #define CPUFAMILY_INTEL_WESTMERE       0x573b5eec
@@ -395,25 +395,24 @@ __END_DECLS
 #define CPUFAMILY_INTEL_HASWELL                0x10b282dc
 #define CPUFAMILY_INTEL_BROADWELL      0x582ed09c
 #define CPUFAMILY_INTEL_SKYLAKE                0x37fc219f
+#define CPUFAMILY_INTEL_KABYLAKE       0x0f817246
 #define CPUFAMILY_ARM_9                        0xe73283ae
 #define CPUFAMILY_ARM_11               0x8ff620d8
 #define CPUFAMILY_ARM_XSCALE           0x53b005f5
-#define CPUFAMILY_ARM_12               0xbd1b0ae9
+#define CPUFAMILY_ARM_12                0xbd1b0ae9
 #define CPUFAMILY_ARM_13               0x0cc90e64
 #define CPUFAMILY_ARM_14               0x96077ef1
 #define CPUFAMILY_ARM_15               0xa8511bca
 #define CPUFAMILY_ARM_SWIFT            0x1e2d6381
 #define CPUFAMILY_ARM_CYCLONE          0x37a09642
 #define CPUFAMILY_ARM_TYPHOON          0x2c91a47e
+#define CPUFAMILY_ARM_TWISTER          0x92fb37c8
+#define CPUFAMILY_ARM_HURRICANE                0x67ceee93
+#define CPUFAMILY_ARM_MONSOON_MISTRAL  0xe81e7ef6
 
 /* The following synonyms are deprecated: */
-#define CPUFAMILY_INTEL_6_14   CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_6_15   CPUFAMILY_INTEL_MEROM
 #define CPUFAMILY_INTEL_6_23   CPUFAMILY_INTEL_PENRYN
 #define CPUFAMILY_INTEL_6_26   CPUFAMILY_INTEL_NEHALEM
 
-#define CPUFAMILY_INTEL_CORE   CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_CORE2  CPUFAMILY_INTEL_MEROM
-
 
 #endif /* _MACH_MACHINE_H_ */