mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2024-11-10 22:59:13 +00:00
Code Issues Releases Wiki Activity

Added support for Athlon II Propus

Browse source 
git-svn-id: https://svn.code.sf.net/p/libcpuid/code/HEAD/libcpuid@67 3b4be424-7ac5-41d7-8526-f4ddcb85d872
This commit is contained in:
Veselin Georgiev 2009-09-24 20:39:04 +00:00
parent b089617cca
commit 3578314b9b
2 changed files with 101 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libcpuid/recog_amd.c
View file

@ -61,6 +61,7 @@ enum _amd_code_t {
SEMPRON_DUALCORE, SEMPRON_DUALCORE,
PHENOM, PHENOM,
PHENOM2, PHENOM2,
ATHLON_64_X4,
}; };
typedef enum _amd_code_t amd_code_t; typedef enum _amd_code_t amd_code_t;
@ -227,6 +228,8 @@ const struct match_entry_t cpudb_amd[] = {
{ 15, 4, -1, 16, -1, 2, 512, PHENOM2 , 0, "Phenom II X2 (Callisto)" }, { 15, 4, -1, 16, -1, 2, 512, PHENOM2 , 0, "Phenom II X2 (Callisto)" },
{ 15, 4, -1, 16, -1, 3, 512, PHENOM2 , 0, "Phenom II X3 (Heka)" }, { 15, 4, -1, 16, -1, 3, 512, PHENOM2 , 0, "Phenom II X3 (Heka)" },
{ 15, 4, -1, 16, -1, 4, 512, PHENOM2 , 0, "Phenom II X4 (Deneb)" }, { 15, 4, -1, 16, -1, 4, 512, PHENOM2 , 0, "Phenom II X4 (Deneb)" },
{ 15, 5, -1, 16, -1, 4, 512, ATHLON_64_X4 , 0, "Athlon II X4 (Propus)" },
}; };
@ -350,11 +353,12 @@ static int amd_has_turion_modelname(const char *bs)
static amd_code_t decode_amd_codename_part1(const char *bs) static amd_code_t decode_amd_codename_part1(const char *bs)
{ {
int is_dual = 0; int is_dual = 0, is_quad = 0;
if (strstr(bs, "Dual Core") || if (strstr(bs, "Dual Core") ||
strstr(bs, "Dual-Core") || strstr(bs, "Dual-Core") ||
strstr(bs, " X2 ")) strstr(bs, " X2 "))
is_dual = 1; is_dual = 1;
if (strstr(bs, " X4 ")) is_quad = 1;
if (strstr(bs, "Opteron")) { if (strstr(bs, "Opteron")) {
return is_dual ? OPTERON_DUALCORE : OPTERON_SINGLE; return is_dual ? OPTERON_DUALCORE : OPTERON_SINGLE;
} }
@ -368,7 +372,9 @@ static amd_code_t decode_amd_codename_part1(const char *bs)
if (strstr(bs, "Athlon(tm) 64 FX")) return ATHLON_64_FX; if (strstr(bs, "Athlon(tm) 64 FX")) return ATHLON_64_FX;
if (strstr(bs, "Athlon(tm) FX")) return ATHLON_FX; if (strstr(bs, "Athlon(tm) FX")) return ATHLON_FX;
if (strstr(bs, "Athlon(tm) 64")) { if (strstr(bs, "Athlon(tm) 64")) {
return is_dual ? ATHLON_64_X2 : ATHLON_64; if (is_quad) return ATHLON_64_X4;
if (is_dual) return ATHLON_64_X2;
return ATHLON_64;
} }
if (strstr(bs, "Athlon(tm) X2")) { if (strstr(bs, "Athlon(tm) X2")) {
return ATHLON_64_X2; return ATHLON_64_X2;

93
tests/tests_stash.txt
View file

@ -3958,3 +3958,96 @@ intel_fn11[3]=07280201 00000000 00000000 00000000
Yonah (Core Duo) Yonah (Core Duo)
fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni monitor vmx est tm2 xtpr pdcm xd
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
basic_cpuid[0]=00000005 68747541 444d4163 69746e65
basic_cpuid[1]=00100f52 00040800 00802009 178bfbff
basic_cpuid[2]=00000000 00000000 00000000 00000000
basic_cpuid[3]=00000000 00000000 00000000 00000000
basic_cpuid[4]=00000000 00000000 00000000 00000000
basic_cpuid[5]=00000040 00000040 00000003 00000000
basic_cpuid[6]=00000000 00000000 00000000 00000000
basic_cpuid[7]=00000000 00000000 00000000 00000000
basic_cpuid[8]=00000000 00000000 00000000 00000000
basic_cpuid[9]=00000000 00000000 00000000 00000000
basic_cpuid[10]=00000000 00000000 00000000 00000000
basic_cpuid[11]=00000000 00000000 00000000 00000000
basic_cpuid[12]=00000000 00000000 00000000 00000000
basic_cpuid[13]=00000000 00000000 00000000 00000000
basic_cpuid[14]=00000000 00000000 00000000 00000000
basic_cpuid[15]=00000000 00000000 00000000 00000000
basic_cpuid[16]=00000000 00000000 00000000 00000000
basic_cpuid[17]=00000000 00000000 00000000 00000000
basic_cpuid[18]=00000000 00000000 00000000 00000000
basic_cpuid[19]=00000000 00000000 00000000 00000000
basic_cpuid[20]=00000000 00000000 00000000 00000000
basic_cpuid[21]=00000000 00000000 00000000 00000000
basic_cpuid[22]=00000000 00000000 00000000 00000000
basic_cpuid[23]=00000000 00000000 00000000 00000000
basic_cpuid[24]=00000000 00000000 00000000 00000000
basic_cpuid[25]=00000000 00000000 00000000 00000000
basic_cpuid[26]=00000000 00000000 00000000 00000000
basic_cpuid[27]=00000000 00000000 00000000 00000000
basic_cpuid[28]=00000000 00000000 00000000 00000000
basic_cpuid[29]=00000000 00000000 00000000 00000000
basic_cpuid[30]=00000000 00000000 00000000 00000000
basic_cpuid[31]=00000000 00000000 00000000 00000000
ext_cpuid[0]=8000001b 68747541 444d4163 69746e65
ext_cpuid[1]=00100f52 10005146 000037ff efd3fbff
ext_cpuid[2]=20444d41 6c687441 74286e6f 5820296d
ext_cpuid[3]=32362034 72502030 7365636f 00726f73
ext_cpuid[4]=00000000 00000000 00000000 00000000
ext_cpuid[5]=ff30ff10 ff30ff20 40020140 40020140
ext_cpuid[6]=20800000 42004200 02008140 00000000
ext_cpuid[7]=00000000 00000000 00000000 000001f9
ext_cpuid[8]=00003030 00000000 00002003 00000000
ext_cpuid[9]=00000000 00000000 00000000 00000000
ext_cpuid[10]=00000001 00000040 00000000 0000000f
ext_cpuid[11]=00000000 00000000 00000000 00000000
ext_cpuid[12]=00000000 00000000 00000000 00000000
ext_cpuid[13]=00000000 00000000 00000000 00000000
ext_cpuid[14]=00000000 00000000 00000000 00000000
ext_cpuid[15]=00000000 00000000 00000000 00000000
ext_cpuid[16]=00000000 00000000 00000000 00000000
ext_cpuid[17]=00000000 00000000 00000000 00000000
ext_cpuid[18]=00000000 00000000 00000000 00000000
ext_cpuid[19]=00000000 00000000 00000000 00000000
ext_cpuid[20]=00000000 00000000 00000000 00000000
ext_cpuid[21]=00000000 00000000 00000000 00000000
ext_cpuid[22]=00000000 00000000 00000000 00000000
ext_cpuid[23]=00000000 00000000 00000000 00000000
ext_cpuid[24]=00000000 00000000 00000000 00000000
ext_cpuid[25]=f0300000 60100000 00000000 00000000
ext_cpuid[26]=00000003 00000000 00000000 00000000
ext_cpuid[27]=0000001f 00000000 00000000 00000000
ext_cpuid[28]=00000000 00000000 00000000 00000000
ext_cpuid[29]=00000000 00000000 00000000 00000000
ext_cpuid[30]=00000000 00000000 00000000 00000000
ext_cpuid[31]=00000000 00000000 00000000 00000000
intel_fn4[0]=00000000 00000000 00000000 00000000
intel_fn4[1]=00000000 00000000 00000000 00000000
intel_fn4[2]=00000000 00000000 00000000 00000000
intel_fn4[3]=00000000 00000000 00000000 00000000
intel_fn11[0]=00000000 00000000 00000000 00000000
intel_fn11[1]=00000000 00000000 00000000 00000000
intel_fn11[2]=00000000 00000000 00000000 00000000
intel_fn11[3]=00000000 00000000 00000000 00000000
--------------------------------------------------------------------------------
15
5
2
16
5
4
4
64
64
512
0
2
16
-1
64
64
-1
Athlon II X4 (Propus)
fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht pni monitor cx16 syscall popcnt mmxext 3dnow 3dnowext nx fxsr_opt rdtscp lm lahf_lm cmp_legacy svm abm misalignsse sse4a 3dnowprefetch osvw ibs skinit wdt ts ttp tm_amd stc 100mhzsteps hwpstate constant_tsc
--------------------------------------------------------------------------------