Merge [2088] from trunk (Add westmere CPU).

svn path=/branches/yasm-0.7.x/; revision=2092
This commit is contained in:
Peter Johnson 2008-05-14 03:46:41 +00:00
parent 464cbc852b
commit 81f12a1830

View file

@ -47,7 +47,8 @@ RCSID("$Id$");
#define PROC_conroe 11
#define PROC_penryn 12
#define PROC_nehalem 13
#define PROC_sandybridge 14
#define PROC_westmere 14
#define PROC_sandybridge 15
static void
x86_cpu_intel(wordptr cpu, unsigned int data)
@ -59,9 +60,9 @@ x86_cpu_intel(wordptr cpu, unsigned int data)
BitVector_Bit_On(cpu, CPU_Prot);
if (data >= PROC_386)
BitVector_Bit_On(cpu, CPU_SMM);
if (data >= PROC_sandybridge) {
if (data >= PROC_sandybridge)
BitVector_Bit_On(cpu, CPU_AVX);
BitVector_Bit_On(cpu, CPU_FMA);
if (data >= PROC_westmere) {
BitVector_Bit_On(cpu, CPU_AES);
BitVector_Bit_On(cpu, CPU_CLMUL);
}
@ -273,6 +274,7 @@ conroe, x86_cpu_intel, PROC_conroe
core2, x86_cpu_intel, PROC_conroe
penryn, x86_cpu_intel, PROC_penryn
nehalem, x86_cpu_intel, PROC_nehalem
westmere, x86_cpu_intel, PROC_westmere
sandybridge, x86_cpu_intel, PROC_sandybridge
#
# Features have "no" versions to disable them, and only set/reset the