i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer prints out the extended processor signature on Intel CPUs as

Browse Source 
it's only reserved but not defined or used for those.
If you have a stupid BIOS, the name string might not have been set; this
is now supported, and the standard vendor string is used in that case.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10332 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-12-01 07:00:50 +00:00
parent 2e507eba4a
commit 1ec6a65f39
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/bin/sysinfo.c
+16 -7
View File
@@ -321,12 +321,13 @@ dump_cpu(system_info *info, int32 cpu)
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
get_cpuid(&cpuInfo, 0x80000002 + i, cpu); cpuid_info nameInfo;
get_cpuid(&nameInfo, 0x80000002 + i, cpu);
memcpy(name, &cpuInfo.regs.eax, 4); memcpy(name, &nameInfo.regs.eax, 4);
memcpy(name + 4, &cpuInfo.regs.ebx, 4); memcpy(name + 4, &nameInfo.regs.ebx, 4);
memcpy(name + 8, &cpuInfo.regs.ecx, 4); memcpy(name + 8, &nameInfo.regs.ecx, 4);
memcpy(name + 12, &cpuInfo.regs.edx, 4); memcpy(name + 12, &nameInfo.regs.edx, 4);
name += 16; name += 16;
} }
@@ -335,7 +336,15 @@ dump_cpu(system_info *info, int32 cpu)
while (name[0] == ' ') while (name[0] == ' ')
name++; name++;
printf("CPU #%ld: \"%s\"\n", cpu, name); // the BIOS may not have set the processor name
if (name[0])
printf("CPU #%ld: \"%s\"\n", cpu, name);
else {
// Intel CPUs don't seem to have the genuine vendor field
printf("CPU #%ld: %.12s\n", cpu,
(info->cpu_type & B_CPU_x86_VENDOR_MASK) == B_CPU_INTEL_x86 ?
baseInfo.eax_0.vendor_id : cpuInfo.eax_0.vendor_id);
}
} else { } else {
printf("CPU #%ld: %.12s\n", cpu, baseInfo.eax_0.vendor_id); printf("CPU #%ld: %.12s\n", cpu, baseInfo.eax_0.vendor_id);
if (max_eax == 0) if (max_eax == 0)
@@ -347,7 +356,7 @@ dump_cpu(system_info *info, int32 cpu)
print_features(cpuInfo.eax_1.features); print_features(cpuInfo.eax_1.features);
/* Extended CPUID */ /* Extended CPUID */
if (max_extended_eax >= 1) { if (max_extended_eax >= 1 && (info->cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86) {
get_cpuid(&cpuInfo, 0x80000001, cpu); get_cpuid(&cpuInfo, 0x80000001, cpu);
print_processor_signature(&cpuInfo, "extended: "); print_processor_signature(&cpuInfo, "extended: ");