X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcpuid%2Ftest%2Frun.c;h=39a7af95ed4073765e451cb87f94a35e35e6ce8c;hp=88c241a196ff33398c7424e9956463de605384c6;hb=dce6f0fa3177fbed4797e13173918309abb3cb5f;hpb=d03f0db15bde9934e801ce9e935b2cfe82301ab3

diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c
index 88c241a1..39a7af95 100644
--- a/ccan/cpuid/test/run.c
+++ b/ccan/cpuid/test/run.c
@@ -10,12 +10,21 @@ int main(void)
 		return 1;
 	}
 
-	printf ("Vendor ID: %s\n", cpuid_get_cpu_type_string (cpuid_get_cpu_type ()));
+	char cputype[12];
+	if (cpuid_sprintf_cputype(cpuid_get_cpu_type(), cputype))
+		printf ("Vendor ID: %s\n", cputype);
 
 	char buf[48];
 	cpuid(CPU_PROC_BRAND_STRING, (uint32_t *)buf);
 	printf ("Processor Brand: %s\n", buf);
 
+	uint32_t procinfo[11];
+	cpuid(CPU_PROCINFO_AND_FEATUREBITS, procinfo);
+	printf("Stepping: %d Model: 0x%X Family: %d extended model: %d extended family: %d\n",
+		procinfo[0], procinfo[1], procinfo[2], procinfo[3], procinfo[4]);
+	printf("Brand Index: %d CL Flush Line Size: %d Logical Processors: %d Initial APICID: %d\n",
+		procinfo[7], procinfo[8], procinfo[9], procinfo[10]);
+
 	printf ("Highest extended function supported: %#010x\n", cpuid_highest_ext_func_supported());
 
 	uint32_t phys_virt[2];