X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcpuid%2Ftest%2Frun.c;h=c77fd25f87face6a4dc74a501b140132764413fc;hb=174fe59fdce127808420986f56987205ecab2858;hp=65741f144920f6487e27de8de04803fd7c9f3ce0;hpb=19c5822d43acc402df753e669724e3b564473da5;p=ccan

diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c
index 65741f14..c77fd25f 100644
--- a/ccan/cpuid/test/run.c
+++ b/ccan/cpuid/test/run.c
@@ -1,45 +1,54 @@
-#include "cpuid.h"
+#include "../cpuid.c"
 
 #include <stdio.h>
+#include <stdint.h>
 
-int main()
+int main(void)
 {
 	if (!cpuid_is_supported()) {
 		printf ("CPUID instruction is not supported by this CPU\n");
 		return 1;
 	}
 
-	printf ("MMX:  %s\n", cpuid_has_mmx()  ? "Yes" : "No");
-	printf ("SSE:  %s\n", cpuid_has_sse()  ? "Yes" : "No");
-	printf ("SSE2: %s\n", cpuid_has_sse2() ? "Yes" : "No");
-	printf ("SSE3: %s\n", cpuid_has_sse3() ? "Yes" : "No");
-	printf ("x64:  %s\n", cpuid_has_x64()  ? "Yes" : "No");
+	printf ("Vendor ID: %s\n", cpuid_get_cpu_type_string (cpuid_get_cpu_type ()));
 
-	char buf[128];
-	cpuid(CPU_VENDORID, buf);
-	printf ("Vendor ID: %s\n", buf);
-
-	cpuid(CPU_PROC_BRAND_STRING, buf);
+	char buf[48];
+	cpuid(CPU_PROC_BRAND_STRING, (uint32_t *)buf);
 	printf ("Processor Brand: %s\n", buf);
 
-	int addr;
-	cpuid(CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED, &addr);
-	printf ("Highest extended function supported: %#010x\n", addr);
+	printf ("Highest extended function supported: %#010x\n", cpuid_highest_ext_func_supported());
 
-	int virtphys_size;
-	cpuid(CPU_VIRT_PHYS_ADDR_SIZES, &virtphys_size);
-	printf ("Virtual and physical address sizes: %d\n", virtphys_size);
+	union {
+		struct {
+			uint32_t phys_bits : 8;
+			uint32_t virt_bits : 8;
+			uint32_t reserved  : 16;
+		};
+		uint32_t w;
+	} s;
+	cpuid(CPU_VIRT_PHYS_ADDR_SIZES, &s.w);
+	printf ("Physical address size: %d\nVirtual: %d\n", s.phys_bits, s.virt_bits);
 
-	int extfeatures[2];
+	uint32_t extfeatures[2];
 	cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, extfeatures);
 	printf ("Extended processor info and feature bits: %d %d\n", extfeatures[0], extfeatures[1]);
 
-	int l2features[3];
-	cpuid(CPU_EXTENDED_L2_CACHE_FEATURES, l2features);
+	union {
+		struct {
+			uint32_t line_size : 8;
+			uint32_t reserved : 4;
+			uint32_t assoc : 4;
+			uint32_t cache_size : 16;
+		};
+
+		uint32_t w;
+	} l2c;
+
+	cpuid(CPU_EXTENDED_L2_CACHE_FEATURES, &l2c.w);
 	printf ("L2 Cache Size: %u KB\tLine Size: %u bytes\tAssociativity: %02xh\n",
-			l2features[0], l2features[1], l2features[2]);
+			l2c.cache_size, l2c.line_size, l2c.assoc);
 
-	int invalid;
+	uint32_t invalid;
 	cpuid(0x0ffffffUL, &invalid);
 	printf ("Testing invalid: %#010x\n", invalid);
 	return 0;