diff options
| author | jkim <jkim@FreeBSD.org> | 2008-10-22 17:36:52 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2008-10-22 17:36:52 +0000 |
| commit | 4a27fbf6eee3550b38f9ed9fd3c00ebd1eca9c3d (patch) | |
| tree | 38a0f4d18651d19e1485867e74c5d7c70ce20ea4 /sys/amd64/include/specialreg.h | |
| parent | a62bf181b53f6d819c63b2d584ae3c1acedf2b6e (diff) | |
| download | FreeBSD-src-4a27fbf6eee3550b38f9ed9fd3c00ebd1eca9c3d.zip FreeBSD-src-4a27fbf6eee3550b38f9ed9fd3c00ebd1eca9c3d.tar.gz | |
Simplify AMD64_CPU_MODEL() and AMD64_CPU_FAMILY() macros as the base family
should be at least 0xf00 for all supported platforms.
Diffstat (limited to 'sys/amd64/include/specialreg.h')
| -rw-r--r-- | sys/amd64/include/specialreg.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h index 46058d8..c2c9c55 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 |
