From owner-p4-projects@FreeBSD.ORG  Tue Mar 23 20:58:58 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6AFC216A4D0; Tue, 23 Mar 2004 20:58:58 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 39FCB16A4CE
	for <perforce@freebsd.org>; Tue, 23 Mar 2004 20:58:58 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3090F43D45
	for <perforce@freebsd.org>; Tue, 23 Mar 2004 20:58:58 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2O4wvGe040751
	for <perforce@freebsd.org>; Tue, 23 Mar 2004 20:58:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2O4wvjA040748
	for perforce@freebsd.org; Tue, 23 Mar 2004 20:58:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 23 Mar 2004 20:58:57 -0800 (PST)
Message-Id: <200403240458.i2O4wvjA040748@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 49607 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Mar 2004 04:58:58 -0000

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

Change 49607 by peter@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 */