diff -r 99b6bab765f8 -r 763675f19ff4 Hardware/CPU/CPUID.cs --- a/Hardware/CPU/CPUID.cs Mon Oct 18 07:18:14 2010 +0000 +++ b/Hardware/CPU/CPUID.cs Sun Oct 31 22:08:47 2010 +0000 @@ -107,7 +107,7 @@ throw new ArgumentOutOfRangeException("thread"); UIntPtr mask = (UIntPtr)(1L << thread); - if (WinRing0.CpuidTx(CPUID_0, 0, + if (Opcode.CpuidTx(CPUID_0, 0, out eax, out ebx, out ecx, out edx, mask)) { if (eax > 0) maxCpuid = eax; @@ -131,7 +131,7 @@ break; } eax = ebx = ecx = edx = 0; - if (WinRing0.CpuidTx(CPUID_EXT, 0, + if (Opcode.CpuidTx(CPUID_EXT, 0, out eax, out ebx, out ecx, out edx, mask)) { if (eax > CPUID_EXT) maxCpuidExt = eax - CPUID_EXT; @@ -149,19 +149,19 @@ cpuidData = new uint[maxCpuid + 1, 4]; for (uint i = 0; i < (maxCpuid + 1); i++) - WinRing0.CpuidTx(CPUID_0 + i, 0, + Opcode.CpuidTx(CPUID_0 + i, 0, out cpuidData[i, 0], out cpuidData[i, 1], out cpuidData[i, 2], out cpuidData[i, 3], mask); cpuidExtData = new uint[maxCpuidExt + 1, 4]; for (uint i = 0; i < (maxCpuidExt + 1); i++) - WinRing0.CpuidTx(CPUID_EXT + i, 0, + Opcode.CpuidTx(CPUID_EXT + i, 0, out cpuidExtData[i, 0], out cpuidExtData[i, 1], out cpuidExtData[i, 2], out cpuidExtData[i, 3], mask); StringBuilder nameBuilder = new StringBuilder(); for (uint i = 2; i <= 4; i++) { - if (WinRing0.CpuidTx(CPUID_EXT + i, 0, + if (Opcode.CpuidTx(CPUID_EXT + i, 0, out eax, out ebx, out ecx, out edx, mask)) { AppendRegister(nameBuilder, eax);