X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcpuid%2Fcpuid.c;h=1a09c5e666cb9457041bb0ae524fdd579677c07d;hp=f25688e5e6c8b093c95768f6d0fd9be903378a8a;hb=7061cc6bfc5a8270061b70cc55cf010e6c8e68b1;hpb=19c5822d43acc402df753e669724e3b564473da5

diff --git a/ccan/cpuid/cpuid.c b/ccan/cpuid/cpuid.c
index f25688e5..1a09c5e6 100644
--- a/ccan/cpuid/cpuid.c
+++ b/ccan/cpuid/cpuid.c
@@ -22,10 +22,14 @@
  * This file has been written with some help from wikipedia:
  * 	http://en.wikipedia.org/wiki/CPUID
  */
-#include <stdint.h>
 
+/* Only compile this file if we're on a x86 machine.  */
+#if defined(__i386__) || defined(__i386) || defined(__x86_64) \
+	|| defined(_M_AMD64) || defined(__M_X64)
 #include "cpuid.h"
 
+#include <string.h>
+
 enum {
 	CPU_PROC_BRAND_STRING_INTERNAL0  		= 0x80000003,
 	CPU_PROC_BRAND_STRING_INTERNAL1 		= 0x80000004
@@ -57,71 +61,184 @@ static void ___cpuid(cpuid_t info, uint32_t *eax, uint32_t *ebx, uint32_t *ecx,
 }
 #endif
 
-int highest_ext_func_supported(void)
+static struct {
+	uint32_t feature;
+	uint32_t mask;
+	bool use_edx; 		/* ecx will be used if false.  */
+} features[] = {
+	{ CF_MMX, 		1 << 23, 	true },
+	{ CF_SSE, 		1 << 25, 	true },
+	{ CF_SSE2, 		1 << 26, 	true },
+	{ CF_SSE3, 		1 << 9,  	false },
+	{ CF_FPU, 		1 << 0,  	true },
+
+	{ CF_TSC, 		1 << 4,  	true },
+	{ CF_MSR, 		1 << 5,  	true },
+
+	{ CF_SSSE3,     	1 << 9,  	false },
+	{ CF_AVX, 		1 << 28, 	false },
+
+	/* Extended ones.  */
+	{ CEF_x64, 		1 << 30, 	true },
+	{ CEF_FPU, 		1 << 0,  	true },
+	{ CEF_DE, 		1 << 2,  	true },
+	{ CEF_SYSCALLRET, 	1 << 11, 	true },
+	{ CEF_CMOV, 		1 << 15, 	true },
+
+	{ CEF_SSE4a, 		1 << 6, 	false },
+	{ CEF_FMA4, 		1 << 16, 	false },
+	{ CEF_XOP, 		1 << 11, 	false }
+};
+
+bool cpuid_is_supported(void)
 {
-	static int highest;
+	/* The following assembly code uses EAX as the return value,
+	 * but we store the value of EAX into ret since GCC uses EAX
+	 * as the return register for every C function.  That's a double
+	 * operation, but there's no other way to do this unless doing this
+	 * function entirely in assembly.  */
 
-	if (!highest) {
-		asm volatile(
-			"cpuid\n\t"
-			: "=a" (highest)
-			: "a" (CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED)
-		);
-	}
+	/* This check is to make sure that the compiler is actually compiling
+	 * for 64-bit.
+	 *
+	 * The compiler can be 32-bit and the system 64-bit so the 
+	 * following would be true:
+	 * 	#if defined(__x86_64) ...
+	 */
 
-	return highest;
+#if UINTPTR_MAX == 0xffffffffffffffff
+#define ASM_PUSHF 	"pushfq\n\t"
+#define ASM_POPF	"popfq\n\t"
+#define ASM_PUSHEAX 	"pushq %%rax\n\t"
+#define ASM_POPEAX 	"popq %%rax\n\t"
+#define ASM_PUSHECX 	"popq %%rcx\n\t"
+#elif UINTPTR_MAX == 0xffffffff
+#define ASM_PUSHF 	"pushfl\n\t"
+#define ASM_POPF	"popfl\n\t"
+#define ASM_PUSHEAX 	"pushl %%eax\n\t"
+#define ASM_POPEAX 	"popl %%eax\n\t"
+#define ASM_PUSHECX 	"popl %%ecx\n\t"
+#endif
+
+	int ret = 0;
+	asm volatile(
+		ASM_PUSHF
+		ASM_POPEAX
+		"movl %%eax, %%ecx\n\t"
+		"xorl $0x200000, %%eax\n\t"
+		ASM_PUSHEAX
+		ASM_POPF
+		ASM_PUSHF
+		ASM_POPEAX
+		"xorl %%ecx, %%eax\n\t"
+		"shrl $21, %%eax\n\t"
+		"andl $1, %%eax\n\t"
+		ASM_PUSHECX
+		ASM_POPF
+		: "=a" (ret)
+	);
+
+#undef ASM_PUSHF
+#undef ASM_POPF
+#undef ASM_PUSHEAX
+#undef ASM_POPEAX
+#undef ASM_PUSHECX
+
+	return !!ret;
 }
 
-int cpuid_test_feature(cpuid_t feature)
+bool cpuid_test_feature(cpuid_t feature)
 {
 	if (feature > CPU_VIRT_PHYS_ADDR_SIZES || feature < CPU_EXTENDED_PROC_INFO_FEATURE_BITS)
-		return 0;
+		return false;
 
-	return (feature <= highest_ext_func_supported());
+	return (feature <= cpuid_highest_ext_func_supported());
 }
 
-int cpuid_has_feature(cpufeature_t feature)
+bool cpuid_has_feature(int feature, bool extended)
 {
 	uint32_t eax, ebx, ecx, edx;
 
-	___cpuid(CPU_PROCINFO_AND_FEATUREBITS, &eax, &ebx, &ecx, &edx);
-	switch (feature) {
-		case CF_MMX:
-		case CF_SSE:
-		case CF_SSE2:
-			return (edx & ((int)feature)) != 0;
-		case CF_SSE3:
-		case CF_SSSE3:
-		case CF_SSE41:
-		case CF_SSE42:
-		case CF_AVX:
-		case CF_FMA:
-			return (ecx & ((int)feature)) != 0;
+	if (!extended)
+		___cpuid(CPU_PROCINFO_AND_FEATUREBITS, &eax, &ebx, &ecx, &edx);
+	else
+		___cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, &eax, &ebx, &ecx, &edx);
+
+	for (i = 0; i < sizeof(features) / sizeof(features[0]); ++i) {
+		if (features[i].feature == feature) {
+			if (features[i].use_edx)
+				return (edx & features[i].mask);
+			else
+				return (ecx & features[i].mask);
+		}
 	}
+	return false;
+}
 
-	return 0;
+static const char *const cpuids[] = {
+	"Nooooooooone",
+	"AMDisbetter!",
+	"AuthenticAMD",
+	"CentaurHauls",
+	"CyrixInstead",
+	"GenuineIntel",
+	"TransmetaCPU",
+	"GeniuneTMx86",
+	"Geode by NSC",
+	"NexGenDriven",
+	"RiseRiseRise",
+	"SiS SiS SiS ",
+	"UMC UMC UMC ",
+	"VIA VIA VIA ",
+	"Vortex86 SoC",
+	"KVMKVMKVMKVM"
+};
+
+cputype_t cpuid_get_cpu_type(void)
+{
+	static cputype_t cputype;
+	if (cputype == CT_NONE) {
+		union {
+			char buf[12];
+			uint32_t bufu32[3];
+		} u;
+		uint32_t i;
+
+		___cpuid(CPU_VENDORID, &i, &u.bufu32[0], &u.bufu32[2], &u.bufu32[1]);
+		u.buf[12] = '\0';
+
+		for (i = 0; i < sizeof(cpuids) / sizeof(cpuids[0]); ++i) {
+			if (strncmp(cpuids[i], u.buf, 12) == 0) {
+				cputype = (cputype_t)i;
+				break;
+			}
+		}
+	}
+
+	return cputype;
 }
 
-int cpuid_has_ext_feature(cpuextfeature_t extfeature)
+const char *cpuid_get_cpu_type_string(const cputype_t cputype)
 {
-	uint32_t eax, ebx, ecx, edx;
-	if (!cpuid_test_feature(CPU_EXTENDED_PROC_INFO_FEATURE_BITS))
-		return 0;
-
-	___cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, &eax, &ebx, &ecx, &edx);
-	switch (extfeature) {
-		case CEF_x64:
-			return (edx & ((int)extfeature)) != 0;
-		case CEF_SSE4a:
-		case CEF_FMA4:
-		case CEF_XOP:
-			return (ecx & ((int)extfeature)) != 0;
+	return cpuids[(int)cputype];
+}
+
+uint32_t cpuid_highest_ext_func_supported(void)
+{
+	static uint32_t highest;
+
+	if (!highest) {
+		asm volatile(
+			"cpuid\n\t"
+			: "=a" (highest)
+			: "a" (CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED)
+		);
 	}
 
-	return 0;
+	return highest;
 }
 
-void cpuid(cpuid_t info, void *buf)
+void cpuid(cpuid_t info, uint32_t *buf)
 {
 	/* Sanity checks, make sure we're not trying to do something
 	 * invalid or we are trying to get information that isn't supported
@@ -130,14 +247,20 @@ void cpuid(cpuid_t info, void *buf)
 		&& !cpuid_test_feature(info)))
 		return;
 
-	uint32_t *ubuf = buf;
 	if (info == CPU_PROC_BRAND_STRING) {
-		___cpuid(CPU_PROC_BRAND_STRING,  	  &ubuf[0], &ubuf[1], &ubuf[2],  &ubuf[3]);
-		___cpuid(CPU_PROC_BRAND_STRING_INTERNAL0, &ubuf[4], &ubuf[5], &ubuf[6],  &ubuf[7]);
-		___cpuid(CPU_PROC_BRAND_STRING_INTERNAL1, &ubuf[8], &ubuf[9], &ubuf[10], &ubuf[11]);
+		static char cached[48] = { 0 };
+		if (cached[0] == '\0') {
+			___cpuid(CPU_PROC_BRAND_STRING,		  &buf[0], &buf[1], &buf[2],  &buf[3]);
+			___cpuid(CPU_PROC_BRAND_STRING_INTERNAL0, &buf[4], &buf[5], &buf[6],  &buf[7]);
+			___cpuid(CPU_PROC_BRAND_STRING_INTERNAL1, &buf[8], &buf[9], &buf[10], &buf[11]);
+
+			memcpy(cached, buf, sizeof cached);
+		} else
+			buf = (uint32_t *)cached;
+
 		return;
 	} else if (info == CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED) {
-		*ubuf = highest_ext_func_supported();
+		*buf = cpuid_highest_ext_func_supported();
 		return;
 	}
 
@@ -146,41 +269,46 @@ void cpuid(cpuid_t info, void *buf)
 
 	switch (info) {
 		case CPU_VENDORID:
-			ubuf[0] = ebx;
-			ubuf[1] = edx;
-			ubuf[2] = ecx;
+			buf[0] = ebx;
+			buf[1] = edx;
+			buf[2] = ecx;
 			break;
 		case CPU_PROCINFO_AND_FEATUREBITS:
-			ubuf[0] = eax; 	/* The so called "signature" of the CPU.  */
-			ubuf[1] = edx; 	/* Feature flags #1.  */
-			ubuf[2] = ecx; 	/* Feature flags #2.  */
-			ubuf[3] = ebx; 	/* Additional feature information.  */
+			buf[0] = eax; 	/* The so called "signature" of the CPU.  */
+			buf[1] = edx; 	/* Feature flags #1.  */
+			buf[2] = ecx; 	/* Feature flags #2.  */
+			buf[3] = ebx; 	/* Additional feature information.  */
 			break;
 		case CPU_CACHE_AND_TLBD_INFO:
-			ubuf[0] = eax;
-			ubuf[1] = ebx;
-			ubuf[2] = ecx;
-			ubuf[3] = edx;
+			buf[0] = eax;
+			buf[1] = ebx;
+			buf[2] = ecx;
+			buf[3] = edx;
 			break;
 		case CPU_EXTENDED_PROC_INFO_FEATURE_BITS:
-			ubuf[0] = edx;
-			ubuf[1] = ecx;
+			buf[0] = edx;
+			buf[1] = ecx;
 			break;
 		case CPU_L1_CACHE_AND_TLB_IDS:
+			buf[0] = eax;
+			buf[1] = ebx;
+			buf[2] = ecx;
+			buf[3] = edx;
 			break;
 		case CPU_EXTENDED_L2_CACHE_FEATURES:
-			ubuf[0] = (ecx & 0xFF); 		/* Cache size  */
-			ubuf[1] = (ecx >> 12) & 0xF; 		/* Line size  */
-			ubuf[2] = (ecx >> 16) & 0xFFFF; 	/* Associativity  */
+			*buf = ecx;
 			break;
 		case CPU_ADV_POWER_MGT_INFO:
+			*buf = edx;
 			break;
 		case CPU_VIRT_PHYS_ADDR_SIZES:
-			*ubuf = eax;
+			*buf = eax;
 			break;
 		default:
-			*ubuf = 0xbaadf00d;
+			*buf = 0xbaadf00d;
 			break;
 	}
 }
 
+#endif
+