From e39dddd4134cba441e36dfed0f3d96a71f0c13aa Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Wed, 22 Oct 2008 17:36:52 +0000 Subject: [PATCH] Simplify AMD64_CPU_MODEL() and AMD64_CPU_FAMILY() macros as the base family should be at least 0xf00 for all supported platforms. --- sys/amd64/include/specialreg.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h index 46058d8a470..c2c9c553e4a 100644 --- a/sys/amd64/include/specialreg.h +++ b/sys/amd64/include/specialreg.h @@ -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