X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..0b4c1975fb5e4eccf1012a35081f7e7799b81046:/osfmk/i386/cpuid.h
diff --git a/osfmk/i386/cpuid.h b/osfmk/i386/cpuid.h
index c8fad3ffb..ce8b2a378 100644
--- a/osfmk/i386/cpuid.h
+++ b/osfmk/i386/cpuid.h
@@ -1,16 +1,19 @@
/*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 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
- * 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
@@ -20,7 +23,7 @@
* 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@
@@ -38,130 +41,105 @@
#ifdef __APPLE_API_PRIVATE
-#define CPUID_VID_SIZE 12
#define CPUID_VID_INTEL "GenuineIntel"
-#define CPUID_VID_UMC "UMC UMC UMC "
#define CPUID_VID_AMD "AuthenticAMD"
-#define CPUID_VID_CYRIX "CyrixInstead"
-#define CPUID_VID_NEXTGEN "NexGenDriven"
-
-#define CPUID_FEATURE_FPU 0x00000001 /* Floating point unit on-chip */
-#define CPUID_FEATURE_VME 0x00000002 /* Virtual Mode Extension */
-#define CPUID_FEATURE_DE 0x00000004 /* Debugging Extension */
-#define CPUID_FEATURE_PSE 0x00000008 /* Page Size Extension */
-#define CPUID_FEATURE_TSC 0x00000010 /* Time Stamp Counter */
-#define CPUID_FEATURE_MSR 0x00000020 /* Model Specific Registers */
-#define CPUID_FEATURE_PAE 0x00000040 /* Physical Address Extension */
-#define CPUID_FEATURE_MCE 0x00000080 /* Machine Check Exception */
-#define CPUID_FEATURE_CX8 0x00000100 /* CMPXCHG8B */
-#define CPUID_FEATURE_APIC 0x00000200 /* On-chip APIC */
-#define CPUID_FEATURE_SEP 0x00000800 /* Fast System Call */
-#define CPUID_FEATURE_MTRR 0x00001000 /* Memory Type Range Register */
-#define CPUID_FEATURE_PGE 0x00002000 /* Page Global Enable */
-#define CPUID_FEATURE_MCA 0x00004000 /* Machine Check Architecture */
-#define CPUID_FEATURE_CMOV 0x00008000 /* Conditional Move Instruction */
-#define CPUID_FEATURE_PAT 0x00010000 /* Page Attribute Table */
-#define CPUID_FEATURE_PSE36 0x00020000 /* 36-bit Page Size Extension */
-#define CPUID_FEATURE_PSN 0x00040000 /* Processor Serial Number */
-#define CPUID_FEATURE_CLFSH 0x00080000 /* CLFLUSH Instruction supported */
-#define CPUID_FEATURE_DS 0x00200000 /* Debug Store */
-#define CPUID_FEATURE_ACPI 0x00400000 /* Thermal Monitor, SW-controlled clock */
-#define CPUID_FEATURE_MMX 0x00800000 /* MMX supported */
-#define CPUID_FEATURE_FXSR 0x01000000 /* Fast floating point save/restore */
-#define CPUID_FEATURE_SSE 0x02000000 /* Streaming SIMD extensions */
-#define CPUID_FEATURE_SSE2 0x04000000 /* Streaming SIMD extensions 2 */
-#define CPUID_FEATURE_SS 0x08000000 /* Self-Snoop */
-#define CPUID_FEATURE_HTT 0x10000000 /* Hyper-Threading Technology */
-#define CPUID_FEATURE_TM 0x20000000 /* Thermal Monitor */
-
-#define CPUID_TYPE_OEM 0x0 /* Original processor */
-#define CPUID_TYPE_OVERDRIVE 0x1 /* Overdrive processor */
-#define CPUID_TYPE_DUAL 0x2 /* Can be used as dual processor */
-#define CPUID_TYPE_RESERVED 0x3 /* Reserved */
-
-#define CPUID_FAMILY_386 0x3 /* Intel 386 (not part of CPUID) */
-#define CPUID_FAMILY_486 0x4 /* Intel 486 */
-#define CPUID_FAMILY_P5 0x5 /* Intel Pentium */
-#define CPUID_FAMILY_PPRO 0x6 /* Intel Pentium Pro, II, III */
-#define CPUID_FAMILY_PENTIUM4 0xF /* Intel Pentium 4 */
-
-#define CPUID_MODEL_I386_DX 0x0 /* Intel 386 (not part of CPUID) */
-
-#define CPUID_MODEL_I486_DX 0x0 /* Intel 486DX */
-#define CPUID_MODEL_I486_DX_S 0x1 /* Intel 486DX-S */
-#define CPUID_MODEL_I486_SX 0x2 /* Intel 486SX */
-#define CPUID_MODEL_I486_DX2 0x3 /* Intel 486DX2 */
-#define CPUID_MODEL_I486_SL 0x4 /* Intel 486SL */
-#define CPUID_MODEL_I486_SX2 0x5 /* Intel 486SX2 */
-#define CPUID_MODEL_I486_DX2WB 0x7 /* Intel 486DX2WB */
-#define CPUID_MODEL_I486_DX4 0x8 /* Intel 486DX4 */
-#define CPUID_MODEL_I486_DX4WB 0x9 /* Intel 486DX4WB */
-
-#define CPUID_MODEL_AM486_DX 0x1 /* AMD 486DX */
-#define CPUID_MODEL_AM486_DX2 0x3 /* AMD 486DX2 */
-#define CPUID_MODEL_AM486_DX2WB 0x7 /* AMD 486DX2WB */
-#define CPUID_MODEL_AM486_DX4 0x8 /* AMD 486DX4 */
-#define CPUID_MODEL_AM486_DX4WB 0x9 /* AMD 486DX4WB */
-#define CPUID_MODEL_AM486_5X86 0xE /* AMD 5x86 */
-#define CPUID_MODEL_AM486_5X86WB 0xF /* AMD 5x86WB */
-
-#define CPUID_MODEL_CYRIX5X86 0x9 /* CYRIX 5X86 */
-
-#define CPUID_MODEL_UMC5SD 0x1 /* UMC U5SD */
-#define CPUID_MODEL_UMC5S 0x2 /* UMC U5S */
-#define CPUID_MODEL_UMC486_DX2 0x3 /* UMC U486_DX2 */
-#define CPUID_MODEL_UMC486_SX2 0x5 /* UMC U486_SX2 */
-
-#define CPUID_MODEL_P5A 0x0 /* Intel P5 60/66 Step A */
-#define CPUID_MODEL_P5 0x1 /* Intel P5 60/66 */
-#define CPUID_MODEL_P54 0x2 /* Intel P5 75/80/100/120/133/166 */
-#define CPUID_MODEL_P24T 0x3 /* Intel P5 Overdrive 63/83 */
-
-#define CPUID_MODEL_P6 0x1 /* Intel P6 */
-#define CPUID_MODEL_PII 0x3 /* Intel PII */
-#define CPUID_MODEL_P65 0x5 /* Intel PII/Xeon/Celeron model 5 */
-#define CPUID_MODEL_P66 0x6 /* Intel Celeron model 6 */
-#define CPUID_MODEL_P67 0x7 /* Intel PIII/Xeon model 7 */
-#define CPUID_MODEL_P68 0x8 /* Intel PIII/Xeon/Celeron model 8 */
-#define CPUID_MODEL_P6A 0xA /* Intel PIII Xeon model A */
-#define CPUID_MODEL_P6B 0xB /* Intel PIII model B */
-
-#define CPUID_CACHE_SIZE 16 /* Number of descriptor vales */
-
-#define CPUID_CACHE_NULL 0x00 /* NULL */
-#define CPUID_CACHE_ITLB_4K 0x01 /* Instruction TLB, 4K pages */
-#define CPUID_CACHE_ITLB_4M 0x02 /* Instruction TLB, 4M pages */
-#define CPUID_CACHE_DTLB_4K 0x03 /* Data TLB, 4K pages */
-#define CPUID_CACHE_DTLB_4M 0x04 /* Data TLB, 4M pages */
-#define CPUID_CACHE_ICACHE_8K 0x06 /* Instruction cache, 8K */
-#define CPUID_CACHE_ICACHE_16K 0x08 /* Instruction cache, 16K */
-#define CPUID_CACHE_DCACHE_8K 0x0A /* Data cache, 8K */
-#define CPUID_CACHE_DCACHE_16K 0x0C /* Data cache, 16K */
-#define CPUID_CACHE_UCACHE_128K 0x41 /* 2nd-level cache, 128K */
-#define CPUID_CACHE_UCACHE_256K 0x42 /* 2nd-level cache, 256K */
-#define CPUID_CACHE_UCACHE_512K 0x43 /* 2nd-level cache, 512K */
-#define CPUID_CACHE_UCACHE_1M 0x44 /* 2nd-level cache, 1M */
-#define CPUID_CACHE_UCACHE_2M 0x45 /* 2nd-level cache, 2M */
-#define CPUID_CACHE_ITLB_64 0x50 /* Instruction TLB, 64 entries */
-#define CPUID_CACHE_ITLB_128 0x51 /* Instruction TLB, 128 entries */
-#define CPUID_CACHE_ITLB_256 0x52 /* Instruction TLB, 256 entries */
-#define CPUID_CACHE_DTLB_64 0x5B /* Data TLB, 64 entries */
-#define CPUID_CACHE_DTLB_128 0x5C /* Data TLB, 128 entries */
-#define CPUID_CACHE_DTLB_256 0x5D /* Data TLB, 256 entries */
-#define CPUID_CACHE_DCACHE_8K_64 0x66 /* Data cache, 8K, 64 byte line size */
-#define CPUID_CACHE_DCACHE_16K_64 0x67 /* Data cache, 16K, 64 byte line size */
-#define CPUID_CACHE_DCACHE_32K_64 0x68 /* Data cache, 32K, 64 byte line size */
-#define CPUID_CACHE_TRACE_12K 0x70 /* Trace cache 12K-uop, 8-way */
-#define CPUID_CACHE_TRACE_16K 0x71 /* Trace cache 16K-uop, 8-way */
-#define CPUID_CACHE_TRACE_32K 0x72 /* Trace cache 32K-uop, 8-way */
-#define CPUID_CACHE_UCACHE_128K_64 0x79 /* 2nd-level, 128K, 8-way, 64 bytes */
-#define CPUID_CACHE_UCACHE_256K_64 0x7A /* 2nd-level, 256K, 8-way, 64 bytes */
-#define CPUID_CACHE_UCACHE_512K_64 0x7B /* 2nd-level, 512K, 8-way, 64 bytes */
-#define CPUID_CACHE_UCACHE_1M_64 0x7C /* 2nd-level, 1M, 8-way, 64 bytes */
-#define CPUID_CACHE_UCACHE_256K_32 0x82 /* 2nd-level, 256K, 8-way, 32 bytes */
-#define CPUID_CACHE_UCACHE_512K_32 0x83 /* 2nd-level, 512K, 8-way, 32 bytes */
-#define CPUID_CACHE_UCACHE_1M_32 0x84 /* 2nd-level, 1M, 8-way, 32 bytes */
-#define CPUID_CACHE_UCACHE_2M_32 0x85 /* 2nd-level, 2M, 8-way, 32 bytes */
+
+#define CPUID_STRING_UNKNOWN "Unknown CPU Typ"
+
+#define _Bit(n) (1ULL << n)
+#define _HBit(n) (1ULL << ((n)+32))
+
+/*
+ * The CPUID_FEATURE_XXX values define 64-bit values
+ * returned in %ecx:%edx to a CPUID request with %eax of 1:
+ */
+#define CPUID_FEATURE_FPU _Bit(0) /* Floating point unit on-chip */
+#define CPUID_FEATURE_VME _Bit(1) /* Virtual Mode Extension */
+#define CPUID_FEATURE_DE _Bit(2) /* Debugging Extension */
+#define CPUID_FEATURE_PSE _Bit(3) /* Page Size Extension */
+#define CPUID_FEATURE_TSC _Bit(4) /* Time Stamp Counter */
+#define CPUID_FEATURE_MSR _Bit(5) /* Model Specific Registers */
+#define CPUID_FEATURE_PAE _Bit(6) /* Physical Address Extension */
+#define CPUID_FEATURE_MCE _Bit(7) /* Machine Check Exception */
+#define CPUID_FEATURE_CX8 _Bit(8) /* CMPXCHG8B */
+#define CPUID_FEATURE_APIC _Bit(9) /* On-chip APIC */
+#define CPUID_FEATURE_SEP _Bit(11) /* Fast System Call */
+#define CPUID_FEATURE_MTRR _Bit(12) /* Memory Type Range Register */
+#define CPUID_FEATURE_PGE _Bit(13) /* Page Global Enable */
+#define CPUID_FEATURE_MCA _Bit(14) /* Machine Check Architecture */
+#define CPUID_FEATURE_CMOV _Bit(15) /* Conditional Move Instruction */
+#define CPUID_FEATURE_PAT _Bit(16) /* Page Attribute Table */
+#define CPUID_FEATURE_PSE36 _Bit(17) /* 36-bit Page Size Extension */
+#define CPUID_FEATURE_PSN _Bit(18) /* Processor Serial Number */
+#define CPUID_FEATURE_CLFSH _Bit(19) /* CLFLUSH Instruction supported */
+#define CPUID_FEATURE_DS _Bit(21) /* Debug Store */
+#define CPUID_FEATURE_ACPI _Bit(22) /* Thermal monitor and Clock Ctrl */
+#define CPUID_FEATURE_MMX _Bit(23) /* MMX supported */
+#define CPUID_FEATURE_FXSR _Bit(24) /* Fast floating pt save/restore */
+#define CPUID_FEATURE_SSE _Bit(25) /* Streaming SIMD extensions */
+#define CPUID_FEATURE_SSE2 _Bit(26) /* Streaming SIMD extensions 2 */
+#define CPUID_FEATURE_SS _Bit(27) /* Self-Snoop */
+#define CPUID_FEATURE_HTT _Bit(28) /* Hyper-Threading Technology */
+#define CPUID_FEATURE_TM _Bit(29) /* Thermal Monitor (TM1) */
+#define CPUID_FEATURE_PBE _Bit(31) /* Pend Break Enable */
+
+#define CPUID_FEATURE_SSE3 _HBit(0) /* Streaming SIMD extensions 3 */
+#define CPUID_FEATURE_PCLMULQDQ _HBit(1) /* PCLMULQDQ Instruction */
+
+#define CPUID_FEATURE_MONITOR _HBit(3) /* Monitor/mwait */
+#define CPUID_FEATURE_DSCPL _HBit(4) /* Debug Store CPL */
+#define CPUID_FEATURE_VMX _HBit(5) /* VMX */
+#define CPUID_FEATURE_SMX _HBit(6) /* SMX */
+#define CPUID_FEATURE_EST _HBit(7) /* Enhanced SpeedsTep (GV3) */
+#define CPUID_FEATURE_TM2 _HBit(8) /* Thermal Monitor 2 */
+#define CPUID_FEATURE_SSSE3 _HBit(9) /* Supplemental SSE3 instructions */
+#define CPUID_FEATURE_CID _HBit(10) /* L1 Context ID */
+#define CPUID_FEATURE_CX16 _HBit(13) /* CmpXchg16b instruction */
+#define CPUID_FEATURE_xTPR _HBit(14) /* Send Task PRiority msgs */
+#define CPUID_FEATURE_PDCM _HBit(15) /* Perf/Debug Capability MSR */
+
+#define CPUID_FEATURE_DCA _HBit(18) /* Direct Cache Access */
+#define CPUID_FEATURE_SSE4_1 _HBit(19) /* Streaming SIMD extensions 4.1 */
+#define CPUID_FEATURE_SSE4_2 _HBit(20) /* Streaming SIMD extensions 4.2 */
+#define CPUID_FEATURE_xAPIC _HBit(21) /* Extended APIC Mode */
+#define CPUID_FEATURE_POPCNT _HBit(23) /* POPCNT instruction */
+#define CPUID_FEATURE_AES _HBit(25) /* AES instructions */
+#define CPUID_FEATURE_VMM _HBit(31) /* VMM (Hypervisor) present */
+
+/*
+ * The CPUID_EXTFEATURE_XXX values define 64-bit values
+ * returned in %ecx:%edx to a CPUID request with %eax of 0x80000001:
+ */
+#define CPUID_EXTFEATURE_SYSCALL _Bit(11) /* SYSCALL/sysret */
+#define CPUID_EXTFEATURE_XD _Bit(20) /* eXecute Disable */
+
+#define CPUID_EXTFEATURE_1GBPAGE _Bit(26) /* 1G-Byte Page support */
+#define CPUID_EXTFEATURE_RDTSCP _Bit(27) /* RDTSCP */
+#define CPUID_EXTFEATURE_EM64T _Bit(29) /* Extended Mem 64 Technology */
+
+#define CPUID_EXTFEATURE_LAHF _HBit(0) /* LAHF/SAHF instructions */
+
+/*
+ * The CPUID_EXTFEATURE_XXX values define 64-bit values
+ * returned in %ecx:%edx to a CPUID request with %eax of 0x80000007:
+ */
+#define CPUID_EXTFEATURE_TSCI _Bit(8) /* TSC Invariant */
+
+#define CPUID_CACHE_SIZE 16 /* Number of descriptor values */
+
+#define CPUID_MWAIT_EXTENSION _Bit(0) /* enumeration of WMAIT extensions */
+#define CPUID_MWAIT_BREAK _Bit(1) /* interrupts are break events */
+
+#define CPUID_MODEL_YONAH 14
+#define CPUID_MODEL_MEROM 15
+#define CPUID_MODEL_PENRYN 23
+#define CPUID_MODEL_NEHALEM 26
+#define CPUID_MODEL_FIELDS 30 /* Lynnfield, Clarksfield, Jasper */
+#define CPUID_MODEL_DALES 31 /* Havendale, Auburndale */
+#define CPUID_MODEL_NEHALEM_EX 46
+#define CPUID_MODEL_DALES_32NM 37 /* Clarkdale, Arrandale */
+#define CPUID_MODEL_WESTMERE 44 /* Gulftown, Westmere-EP, Westmere-WS */
+#define CPUID_MODEL_WESTMERE_EX 47
#ifndef ASSEMBLER
#include <stdint.h>
@@ -170,6 +148,20 @@
#include <mach/machine.h>
+typedef enum { eax, ebx, ecx, edx } cpuid_register_t;
+static inline void
+cpuid(uint32_t *data)
+{
+ asm("cpuid"
+ : "=a" (data[eax]),
+ "=b" (data[ebx]),
+ "=c" (data[ecx]),
+ "=d" (data[edx])
+ : "a" (data[eax]),
+ "b" (data[ebx]),
+ "c" (data[ecx]),
+ "d" (data[edx]));
+}
static inline void
do_cpuid(uint32_t selector, uint32_t *data)
{
@@ -182,17 +174,17 @@ do_cpuid(uint32_t selector, uint32_t *data)
}
/*
- * Cache ID descriptor structure.
- * Note: description string absent in kernel.
+ * Cache ID descriptor structure, used to parse CPUID leaf 2.
+ * Note: not used in kernel.
*/
-typedef enum { Lnone, L1I, L1D, L2U, LCACHE_MAX } cache_type_t ;
+typedef enum { Lnone, L1I, L1D, L2U, L3U, LCACHE_MAX } cache_type_t ;
typedef struct {
unsigned char value; /* Descriptor value */
cache_type_t type; /* Cache type */
unsigned int size; /* Cache size */
unsigned int linesize; /* Cache line size */
#ifdef KERNEL
- char *description; /* Cache description */
+ const char *description; /* Cache description */
#endif /* KERNEL */
} cpuid_cache_desc_t;
@@ -204,48 +196,136 @@ typedef struct {
{ value, type, size, linesize }
#endif /* KERNEL */
-/* Physical CPU info */
+/* Monitor/mwait Leaf: */
+typedef struct {
+ uint32_t linesize_min;
+ uint32_t linesize_max;
+ uint32_t extensions;
+ uint32_t sub_Cstates;
+} cpuid_mwait_leaf_t;
+
+/* Thermal and Power Management Leaf: */
+typedef struct {
+ boolean_t sensor;
+ boolean_t dynamic_acceleration;
+ boolean_t invariant_APIC_timer;
+ uint32_t thresholds;
+ boolean_t ACNT_MCNT;
+} cpuid_thermal_leaf_t;
+
+/* Architectural Performance Monitoring Leaf: */
+typedef struct {
+ uint8_t version;
+ uint8_t number;
+ uint8_t width;
+ uint8_t events_number;
+ uint32_t events;
+ uint8_t fixed_number;
+ uint8_t fixed_width;
+} cpuid_arch_perf_leaf_t;
+
+/* Physical CPU info - this is exported out of the kernel (kexts), so be wary of changes */
typedef struct {
char cpuid_vendor[16];
char cpuid_brand_string[48];
+ const char *cpuid_model_string;
- uint32_t cpuid_value;
- cpu_type_t cpuid_type;
+ cpu_type_t cpuid_type; /* this is *not* a cpu_type_t in our <mach/machine.h> */
uint8_t cpuid_family;
uint8_t cpuid_model;
uint8_t cpuid_extmodel;
uint8_t cpuid_extfamily;
uint8_t cpuid_stepping;
- uint32_t cpuid_features;
+ uint64_t cpuid_features;
+ uint64_t cpuid_extfeatures;
uint32_t cpuid_signature;
uint8_t cpuid_brand;
uint32_t cache_size[LCACHE_MAX];
uint32_t cache_linesize;
- char model_string[64]; /* sanitized model string */
uint8_t cache_info[64]; /* list of cache descriptors */
+ uint32_t cpuid_cores_per_package;
+ uint32_t cpuid_logical_per_package;
+ uint32_t cache_sharing[LCACHE_MAX];
+ uint32_t cache_partitions[LCACHE_MAX];
+
+ cpu_type_t cpuid_cpu_type; /* <mach/machine.h> */
+ cpu_subtype_t cpuid_cpu_subtype; /* <mach/machine.h> */
+
+ /* Per-vendor info */
+ cpuid_mwait_leaf_t cpuid_mwait_leaf;
+#define cpuid_mwait_linesize_max cpuid_mwait_leaf.linesize_max
+#define cpuid_mwait_linesize_min cpuid_mwait_leaf.linesize_min
+#define cpuid_mwait_extensions cpuid_mwait_leaf.extensions
+#define cpuid_mwait_sub_Cstates cpuid_mwait_leaf.sub_Cstates
+ cpuid_thermal_leaf_t cpuid_thermal_leaf;
+ cpuid_arch_perf_leaf_t cpuid_arch_perf_leaf;
+
+ /* Cache details: */
+ uint32_t cpuid_cache_linesize;
+ uint32_t cpuid_cache_L2_associativity;
+ uint32_t cpuid_cache_size;
+
+ /* Virtual and physical address aize: */
+ uint32_t cpuid_address_bits_physical;
+ uint32_t cpuid_address_bits_virtual;
+
+ uint32_t cpuid_microcode_version;
+
+ /* Numbers of tlbs per processor [i|d, small|large, level0|level1] */
+ uint32_t cpuid_tlb[2][2][2];
+ #define TLB_INST 0
+ #define TLB_DATA 1
+ #define TLB_SMALL 0
+ #define TLB_LARGE 1
+ uint32_t cpuid_stlb;
+
+ uint32_t core_count;
+ uint32_t thread_count;
+
+ /* Max leaf ids available from CPUID */
+ uint32_t cpuid_max_basic;
+ uint32_t cpuid_max_ext;
+
+ /* Family-specific info links */
+ uint32_t cpuid_cpufamily;
+ cpuid_mwait_leaf_t *cpuid_mwait_leafp;
+ cpuid_thermal_leaf_t *cpuid_thermal_leafp;
+ cpuid_arch_perf_leaf_t *cpuid_arch_perf_leafp;
+
} i386_cpu_info_t;
+#ifdef __cplusplus
+extern "C" {
+#endif
/*
* External declarations
*/
-extern cpu_type_t cpuid_cputype(int);
-extern void cpuid_cpu_display(char *, int);
-extern void cpuid_features_display(char *, int);
-extern char * cpuid_get_feature_names(uint32_t, char *, unsigned);
-
-extern uint32_t cpuid_features(void);
+extern cpu_type_t cpuid_cputype(void);
+extern cpu_subtype_t cpuid_cpusubtype(void);
+extern void cpuid_cpu_display(const char *);
+extern void cpuid_feature_display(const char *);
+extern void cpuid_extfeature_display(const char *);
+extern char * cpuid_get_feature_names(uint64_t, char *, unsigned);
+extern char * cpuid_get_extfeature_names(uint64_t, char *, unsigned);
+
+extern uint64_t cpuid_features(void);
+extern uint64_t cpuid_extfeatures(void);
extern uint32_t cpuid_family(void);
+extern uint32_t cpuid_cpufamily(void);
+
+extern void cpuid_get_info(i386_cpu_info_t *info_p);
+extern i386_cpu_info_t *cpuid_info(void);
-extern char * cpuid_intel_get_model_name(uint8_t, uint8_t,
- uint8_t, uint32_t);
+extern void cpuid_set_info(void);
-extern i386_cpu_info_t *cpuid_info(void);
+#ifdef __cplusplus
+}
+#endif
-extern uint32_t cpuid_feature; /* XXX obsolescent */
#endif /* ASSEMBLER */
#endif /* __APPLE_API_PRIVATE */