mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-09-02 15:25:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Issue 59.

Browse Source
This commit is contained in:
Michael Möller
2010-05-15 10:38:47 +00:00
parent 61c007f0f6
commit 984029f77e
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Hardware/CPU/CPUID.cs
View File

@@ -104,11 +104,17 @@ namespace OpenHardwareMonitor.Hardware.CPU {
uint eax, ebx, ecx, edx; uint eax, ebx, ecx, edx;
if (thread >= 32)
throw new ArgumentException();
UIntPtr mask = (UIntPtr)(1L << thread); UIntPtr mask = (UIntPtr)(1L << thread);
if (WinRing0.CpuidTx(CPUID_0, 0, if (WinRing0.CpuidTx(CPUID_0, 0,
out eax, out ebx, out ecx, out edx, mask)) { out eax, out ebx, out ecx, out edx, mask)) {
if (eax > 0)
maxCpuid = eax; maxCpuid = eax;
else
return;
StringBuilder vendorBuilder = new StringBuilder(); StringBuilder vendorBuilder = new StringBuilder();
AppendRegister(vendorBuilder, ebx); AppendRegister(vendorBuilder, ebx);
AppendRegister(vendorBuilder, edx); AppendRegister(vendorBuilder, edx);
@@ -127,14 +133,18 @@ namespace OpenHardwareMonitor.Hardware.CPU {
} }
eax = ebx = ecx = edx = 0; eax = ebx = ecx = edx = 0;
if (WinRing0.CpuidTx(CPUID_EXT, 0, if (WinRing0.CpuidTx(CPUID_EXT, 0,
out eax, out ebx, out ecx, out edx, mask)) out eax, out ebx, out ecx, out edx, mask)) {
if (eax > CPUID_EXT)
maxCpuidExt = eax - CPUID_EXT; maxCpuidExt = eax - CPUID_EXT;
else
return;
}
} else { } else {
throw new ArgumentException(); throw new ArgumentException();
} }
if (maxCpuid == 0 || maxCpuidExt == 0) maxCpuid = Math.Min(maxCpuid, 1024);
return; maxCpuidExt = Math.Min(maxCpuidExt, 1024);
cpuidData = new uint[maxCpuid + 1, 4]; cpuidData = new uint[maxCpuid + 1, 4];
for (uint i = 0; i < (maxCpuid + 1); i++) for (uint i = 0; i < (maxCpuid + 1); i++)