PERFORCE change 49607 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=49607

Change 49607 by peter at peter_wannabe on 2004/03/23 20:58:47

	AMD_Features doesn't depend on the id string anymore.  Its now common
	on both main platforms, which are already covered in the outer brand
	string strcmp.
	I doubt there will be a CyrixInstead booting this kernel.
	Fix a bug in the AMD_Features reporting.  Not all of cpu_features
	overlap. (This is part 1, there needs to be a common bits mask instead).

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#22 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#22 (text+ko) ====

@@ -227,10 +227,8 @@
 				printf("\n  Hyperthreading: %d logical CPUs",
 				    (cpu_procinfo & CPUID_HTT_CORES) >> 16);
 		}
-		if (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
-		    cpu_exthigh >= 0x80000001)
+		if (cpu_exthigh >= 0x80000001)
 			print_AMD_features();
-	} else if (strcmp(cpu_vendor, "CyrixInstead") == 0) {
 	}
 	/* Avoid ugly blank lines: only print newline when we have to. */
 	if (*cpu_vendor || cpu_id)
@@ -339,7 +337,7 @@
 	 * http://www.amd.com/products/cpg/athlon/techdocs/pdf/20734.pdf
 	 */
 	do_cpuid(0x80000001, regs);
-	printf("\n  AMD Features=0x%b", regs[3] &~ cpu_feature,
+	printf("\n  AMD Features=0x%b", regs[3],
 		"\020"		/* in hex */
 		"\001FPU"	/* Integral FPU */
 		"\002VME"	/* Extended VM86 mode support */