From owner-p4-projects@FreeBSD.ORG  Wed Mar 24 17:53:20 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EB2116A4D0; Wed, 24 Mar 2004 17:53:20 -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 E43DD16A4CE
	for <perforce@freebsd.org>; Wed, 24 Mar 2004 17:53:19 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DAA7943D3F
	for <perforce@freebsd.org>; Wed, 24 Mar 2004 17:53:19 -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 i2P1rJGe051091
	for <perforce@freebsd.org>; Wed, 24 Mar 2004 17:53:19 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2P1rJSb051088
	for perforce@freebsd.org; Wed, 24 Mar 2004 17:53:19 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Wed, 24 Mar 2004 17:53:19 -0800 (PST)
Message-Id: <200403250153.i2P1rJSb051088@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 49649 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: Thu, 25 Mar 2004 01:53:20 -0000

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

Change 49649 by peter@peter_wannabe on 2004/03/24 17:52:21

	correct the CMOV bit.  Correctly mask out the common bits that are
	the same in both amd and intel features.  This part needs to go to i386
	because the i386 baseline is broken.  For example, it doesn't report the
	fast syscall bit.

Affected files ...

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

Differences ...

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

@@ -337,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],
+	printf("\n  AMD Features=0x%b", regs[3] & ~(cpu_feature & 0x0183f3ff),
 		"\020"		/* in hex */
 		"\001FPU"	/* Integral FPU */
 		"\002VME"	/* Extended VM86 mode support */
@@ -354,7 +354,7 @@
 		"\015MTRR"	/* Memory Type Range Registers */
 		"\016PGE"	/* PG_G (global bit) support */
 		"\017MCA"	/* Machine Check Architecture */
-		"\020ICMOV"	/* CMOV instruction */
+		"\020CMOV"	/* CMOV instruction */
 		"\021PAT"	/* Page attributes table */
 		"\022PGE36"	/* 36 bit address space support */
 		"\023RSVD"	/* Reserved, unknown */