mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2025-06-07 00:51:40 +00:00
Code Issues Releases Wiki Activity

Support another variant of AIDA64 dumps in cpuid_deserialize_raw_data_internal()

Browse source 
It support lines like 'CPU#000 AffMask: 0x0000000000000001'
This commit is contained in:
The Tumultuous Unicorn Of Darkness 2023-05-07 12:41:25 +02:00
parent 2317f40b36
commit 5789a6e297
No known key found for this signature in database
GPG key ID: 1E55EE2EFF18BC1A
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libcpuid/cpuid_main.c
View file

@ -637,7 +637,10 @@ static int cpuid_deserialize_raw_data_internal(struct cpu_raw_data_t* single_raw
raw_array->with_affinity = false; raw_array->with_affinity = false;
} }
} }
else if (!strcmp(line, "------[ Versions ]------") || !strcmp(line, "------[ Logical CPU #0 ]------") || !strcmp(line, "------[ CPUID Registers / Logical CPU #0 ]------")) { else if (!strcmp(line, "------[ Versions ]------") ||
!strcmp(line, "------[ Logical CPU #0 ]------") ||
!strcmp(line, "------[ CPUID Registers / Logical CPU #0 ]------") ||
strstr(line, "CPU#000 AffMask: 0x")) {
debugf(2, "Recognized AIDA64 raw dump\n"); debugf(2, "Recognized AIDA64 raw dump\n");
is_header = false; is_header = false;
is_libcpuid_dump = false; is_libcpuid_dump = false;
@ -679,8 +682,9 @@ static int cpuid_deserialize_raw_data_internal(struct cpu_raw_data_t* single_raw
} }
} }
else if (is_aida64_dump) { else if (is_aida64_dump) {
if (use_raw_array && ((sscanf(line, "------[ Logical CPU #%hi ]------", &logical_cpu) >= 1) || \ if (use_raw_array && ((sscanf(line, "------[ Logical CPU #%hi ]------", &logical_cpu) >= 1) ||
(sscanf(line, "------[ CPUID Registers / Logical CPU #%hi ]------", &logical_cpu) >= 1))) { (sscanf(line, "------[ CPUID Registers / Logical CPU #%hi ]------", &logical_cpu) >= 1) ||
(sscanf(line, "CPU#%hi AffMask: 0x%*x", &logical_cpu) >= 1))) {
debugf(2, "Parsing AIDA64 raw dump for logical CPU %i\n", logical_cpu); debugf(2, "Parsing AIDA64 raw dump for logical CPU %i\n", logical_cpu);
cpuid_grow_raw_data_array(raw_array, logical_cpu + 1); cpuid_grow_raw_data_array(raw_array, logical_cpu + 1);
raw_ptr = &raw_array->raw[logical_cpu]; raw_ptr = &raw_array->raw[logical_cpu];

2
tests/create_test.py
View file

@ -12,7 +12,7 @@ if len(args) != 3:
def readRawFile(): def readRawFile():
rawdata = [] rawdata = []
for line in open(args[1], "rt").readlines(): for line in open(args[1], "rt").readlines():
lookfor = ["basic_cpuid", "ext_cpuid", "intel_fn4", "intel_fn11", "amd_fn8000001dh", "Logical CPU", "CPUID"] lookfor = ["basic_cpuid", "ext_cpuid", "intel_fn4", "intel_fn11", "amd_fn8000001dh", "Logical CPU", "CPUID", "CPU#"]
ignore = ["MSR Register"] ignore = ["MSR Register"]
good = False good = False
for match in lookfor: for match in lookfor: