From owner-svn-src-head@FreeBSD.ORG  Wed Oct 22 17:36:52 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABE19106567C;
	Wed, 22 Oct 2008 17:36:52 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A4DB8FC20;
	Wed, 22 Oct 2008 17:36:52 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9MHaqFD034646;
	Wed, 22 Oct 2008 17:36:52 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9MHaqHX034645;
	Wed, 22 Oct 2008 17:36:52 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200810221736.m9MHaqHX034645@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 22 Oct 2008 17:36:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184170 - head/sys/amd64/include
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Oct 2008 17:36:52 -0000

Author: jkim
Date: Wed Oct 22 17:36:52 2008
New Revision: 184170
URL: http://svn.freebsd.org/changeset/base/184170

Log:
  Simplify AMD64_CPU_MODEL() and AMD64_CPU_FAMILY() macros as the base family
  should be at least 0xf00 for all supported platforms.

Modified:
  head/sys/amd64/include/specialreg.h

Modified: head/sys/amd64/include/specialreg.h
==============================================================================
--- head/sys/amd64/include/specialreg.h	Wed Oct 22 17:30:37 2008	(r184169)
+++ head/sys/amd64/include/specialreg.h	Wed Oct 22 17:36:52 2008	(r184170)
@@ -162,12 +162,10 @@
 #define	CPUID_EXT_FAMILY	0x0ff00000
 #define	AMD64_CPU_MODEL(id) \
     ((((id) & CPUID_MODEL) >> 4) | \
-    ((((id) & CPUID_FAMILY) >= 0x600) ? \
-    (((id) & CPUID_EXT_MODEL) >> 12) : 0))
+    (((id) & CPUID_EXT_MODEL) >> 12))
 #define	AMD64_CPU_FAMILY(id) \
     ((((id) & CPUID_FAMILY) >> 8) + \
-    ((((id) & CPUID_FAMILY) == 0xf00) ? \
-    (((id) & CPUID_EXT_FAMILY) >> 20) : 0))
+    (((id) & CPUID_EXT_FAMILY) >> 20))
 
 /*
  * CPUID instruction 1 ebx info