Introduce cpu_vendor_id and replace a lot of strcmp(cpu_vendor, "...").

Reviewed by:	jhb, peter (early amd64 version)

1 files changed, 39 insertions, 23 deletions

diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index 58d460d..718741a 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -33,33 +33,49 @@
 /*
  * Classes of processor.
  */
-#define	CPUCLASS_286	0
-#define	CPUCLASS_386	1
-#define	CPUCLASS_486	2
-#define	CPUCLASS_586	3
-#define	CPUCLASS_686	4
+#define	CPUCLASS_286		0
+#define	CPUCLASS_386		1
+#define	CPUCLASS_486		2
+#define	CPUCLASS_586		3
+#define	CPUCLASS_686		4
 
 /*
  * Kinds of processor.
  */
-#define	CPU_286		0	/* Intel 80286 */
-#define	CPU_386SX	1	/* Intel 80386SX */
-#define	CPU_386		2	/* Intel 80386DX */
-#define	CPU_486SX	3	/* Intel 80486SX */
-#define	CPU_486		4	/* Intel 80486DX */
-#define	CPU_586		5	/* Intel P.....m (I hate lawyers; it's TM) */
-#define	CPU_486DLC	6	/* Cyrix 486DLC */
-#define	CPU_686		7	/* Pentium Pro */
-#define	CPU_M1SC	8	/* Cyrix M1sc (aka 5x86) */
-#define	CPU_M1		9	/* Cyrix M1 (aka 6x86) */
-#define	CPU_BLUE	10	/* IBM BlueLighting CPU */
-#define	CPU_M2		11	/* Cyrix M2 (aka enhanced 6x86 with MMX */
-#define	CPU_NX586	12	/* NexGen (now AMD) 586 */
-#define	CPU_CY486DX	13	/* Cyrix 486S/DX/DX2/DX4 */
-#define	CPU_PII		14	/* Intel Pentium II */
-#define	CPU_PIII	15	/* Intel Pentium III */
-#define	CPU_P4		16	/* Intel Pentium 4 */
-#define	CPU_GEODE1100	17	/* NS Geode SC1100 */
+#define	CPU_286			0	/* Intel 80286 */
+#define	CPU_386SX		1	/* Intel 80386SX */
+#define	CPU_386			2	/* Intel 80386DX */
+#define	CPU_486SX		3	/* Intel 80486SX */
+#define	CPU_486			4	/* Intel 80486DX */
+#define	CPU_586			5	/* Intel Pentium */
+#define	CPU_486DLC		6	/* Cyrix 486DLC */
+#define	CPU_686			7	/* Pentium Pro */
+#define	CPU_M1SC		8	/* Cyrix M1sc (aka 5x86) */
+#define	CPU_M1			9	/* Cyrix M1 (aka 6x86) */
+#define	CPU_BLUE		10	/* IBM BlueLighting CPU */
+#define	CPU_M2			11	/* Cyrix M2 (enhanced 6x86 with MMX) */
+#define	CPU_NX586		12	/* NexGen (now AMD) 586 */
+#define	CPU_CY486DX		13	/* Cyrix 486S/DX/DX2/DX4 */
+#define	CPU_PII			14	/* Intel Pentium II */
+#define	CPU_PIII		15	/* Intel Pentium III */
+#define	CPU_P4			16	/* Intel Pentium 4 */
+#define	CPU_GEODE1100		17	/* NS Geode SC1100 */
+
+/*
+ * Vendors of processor.
+ */
+#define	CPU_VENDOR_NSC		0x100b		/* NSC */
+#define	CPU_VENDOR_IBM		0x1014		/* IBM */
+#define	CPU_VENDOR_AMD		0x1022		/* AMD */
+#define	CPU_VENDOR_SIS		0x1039		/* SiS */
+#define	CPU_VENDOR_UMC		0x1060		/* UMC */
+#define	CPU_VENDOR_NEXGEN	0x1074		/* Nexgen */
+#define	CPU_VENDOR_CYRIX	0x1078		/* Cyrix */
+#define	CPU_VENDOR_IDT		0x111d		/* Centaur/IDT/VIA */
+#define	CPU_VENDOR_TRANSMETA	0x1279		/* Transmeta */
+#define	CPU_VENDOR_INTEL	0x8086		/* Intel */
+#define	CPU_VENDOR_RISE		0xdead2bad	/* Rise */
+#define	CPU_VENDOR_CENTAUR	CPU_VENDOR_IDT
 
 #ifndef LOCORE
 extern int	cpu;