mirror of
https://github.com/anrieff/libcpuid
synced 2024-12-16 16:35:45 +00:00
Fixed detection of Merom and other mobile Core2 arch
git-svn-id: https://svn.code.sf.net/p/libcpuid/code/HEAD/libcpuid@34 3b4be424-7ac5-41d7-8526-f4ddcb85d872
This commit is contained in:
Veselin Georgiev
parent
f46fd2635e
commit
da2eb29639
2 changed files with 100 additions and 3 deletions
|
|
@ -157,7 +157,7 @@ const struct match_entry_t cpudb_intel[] = {
|
|||
{ 6, 15, -1, -1, -1, XEON , "Xeon (Clovertown) Quad" },
|
||||
{ 6, 15, -1, -1, -1, MOBILE_CORE , "Merom (Core 2 Duo)" },
|
||||
{ 6, 15, -1, -1, -1, MEROM_2M , "Merom (Core 2 Duo) 2048K" },
|
||||
{ 6, 15, -1, -1, -1, MEROM_4M , "Merom (Core 2 Duo) 4192K" },
|
||||
{ 6, 15, -1, -1, -1, MEROM_4M , "Merom (Core 2 Duo) 4096K" },
|
||||
|
||||
|
||||
{ 6, 6, -1, -1, 22, CELERON , "Conroe-L (Celeron)" },
|
||||
|
|
@ -461,6 +461,7 @@ static void decode_intel_codename(struct cpu_raw_data_t* raw, struct cpu_id_t* d
|
|||
int i;
|
||||
int L2 = data->l2_cache;
|
||||
const char* bs = data->brand_str;
|
||||
const char* s;
|
||||
const struct { int cache_size; intel_code_t code; } match_cache[] = {
|
||||
{ 512, CORE_DUO_512K },
|
||||
{ 1024, CORE_DUO_1024K },
|
||||
|
|
@ -474,8 +475,6 @@ static void decode_intel_codename(struct cpu_raw_data_t* raw, struct cpu_id_t* d
|
|||
{ MOBILE_PENTIUM_M, "Pentium(R) M" },
|
||||
{ PENTIUM_D, "Pentium(R) D" },
|
||||
{ PENTIUM, "Pentium" },
|
||||
{ MOBILE_CORE, "Intel(R) Core(TM)2 CPU T" },
|
||||
{ MOBILE_CORE, "Genuine Intel(R) CPU T" },
|
||||
{ CORE_SOLO, "Genuine Intel(R) CPU" },
|
||||
{ CORE_SOLO, "Intel(R) Core(TM)2" },
|
||||
{ ATOM_DIAMONDVILLE, "Atom(TM) CPU 2" },
|
||||
|
|
@ -501,6 +500,15 @@ static void decode_intel_codename(struct cpu_raw_data_t* raw, struct cpu_id_t* d
|
|||
code = XEON_IRWIN;
|
||||
if (code == XEONMP && data->l3_cache > 0)
|
||||
code = XEON_POTOMAC;
|
||||
if (code == CORE_SOLO) {
|
||||
s = strstr(bs, "CPU");
|
||||
if (s) {
|
||||
s += 3;
|
||||
while (*s == ' ') s++;
|
||||
if (*s == 'T')
|
||||
code = MOBILE_CORE;
|
||||
}
|
||||
}
|
||||
if (code == CORE_SOLO) {
|
||||
switch (data->num_cores) {
|
||||
case 1: break;
|
||||
|
|
|
|||
|
|
@ -799,3 +799,92 @@ intel_fn4[3]=00000000 00000000 00000000 00000000
|
|||
Atom (Diamondville)
|
||||
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 dts64 monitor ds_cpl est tm2 ssse3 xtpr pdcm xd movbe lahf_lm
|
||||
--------------------------------------------------------------------------------
|
||||
basic_cpuid[0]=0000000a 756e6547 6c65746e 49656e69
|
||||
basic_cpuid[1]=000006fa 00020800 0000e3bd bfebfbff
|
||||
basic_cpuid[2]=05b0b101 005657f0 00000000 2cb43049
|
||||
basic_cpuid[3]=00000000 00000000 00000000 00000000
|
||||
basic_cpuid[4]=04000121 01c0003f 0000003f 00000001
|
||||
basic_cpuid[5]=00000040 00000040 00000003 00022220
|
||||
basic_cpuid[6]=00000003 00000002 00000001 00000000
|
||||
basic_cpuid[7]=00000000 00000000 00000000 00000000
|
||||
basic_cpuid[8]=00000400 00000000 00000000 00000000
|
||||
basic_cpuid[9]=00000000 00000000 00000000 00000000
|
||||
basic_cpuid[10]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[11]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[12]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[13]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[14]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[15]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[16]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[17]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[18]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[19]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[20]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[21]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[22]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[23]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[24]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[25]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[26]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[27]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[28]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[29]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[30]=07280202 00000000 00000000 00000503
|
||||
basic_cpuid[31]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[0]=80000008 00000000 00000000 00000000
|
||||
ext_cpuid[1]=00000000 00000000 00000001 20100000
|
||||
ext_cpuid[2]=65746e49 2952286c 726f4320 4d542865
|
||||
ext_cpuid[3]=44203229 43206f75 20205550 54202020
|
||||
ext_cpuid[4]=30303537 20402020 30322e32 007a4847
|
||||
ext_cpuid[5]=00000000 00000000 00000000 00000000
|
||||
ext_cpuid[6]=00000000 00000000 10008040 00000000
|
||||
ext_cpuid[7]=00000000 00000000 00000000 00000000
|
||||
ext_cpuid[8]=00003024 00000000 00000000 00000000
|
||||
ext_cpuid[9]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[10]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[11]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[12]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[13]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[14]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[15]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[16]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[17]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[18]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[19]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[20]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[21]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[22]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[23]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[24]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[25]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[26]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[27]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[28]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[29]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[30]=07280202 00000000 00000000 00000503
|
||||
ext_cpuid[31]=07280202 00000000 00000000 00000503
|
||||
intel_fn4[0]=04000121 01c0003f 0000003f 00000001
|
||||
intel_fn4[1]=04000122 01c0003f 0000003f 00000001
|
||||
intel_fn4[2]=04004143 03c0003f 00000fff 00000001
|
||||
intel_fn4[3]=00000000 00000000 00000000 00000000
|
||||
--------------------------------------------------------------------------------
|
||||
6
|
||||
15
|
||||
10
|
||||
6
|
||||
15
|
||||
2
|
||||
2
|
||||
32
|
||||
32
|
||||
4096
|
||||
-1
|
||||
8
|
||||
16
|
||||
-1
|
||||
64
|
||||
64
|
||||
-1
|
||||
Merom (Core 2 Duo) 4096K
|
||||
fpu vme de pse tsc msr pae mce cx8 apic mtrr sep pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe pni dts64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm xd lm lahf_lm
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue