diff -r 50de2faf3336 -r 958e9fe8afdf Hardware/CPU/AMD0FCPU.cs --- a/Hardware/CPU/AMD0FCPU.cs Mon Sep 27 23:48:41 2010 +0000 +++ b/Hardware/CPU/AMD0FCPU.cs Thu Sep 30 16:51:09 2010 +0000 @@ -92,7 +92,7 @@ for (int i = 0; i < coreClocks.Length; i++) { coreClocks[i] = new Sensor(CoreString(i), i + 1, SensorType.Clock, this, settings); - if (hasTSC) + if (HasTimeStampCounter) ActivateSensor(coreClocks[i]); } @@ -138,7 +138,7 @@ } } - if (hasTSC) { + if (HasTimeStampCounter) { double newBusClock = 0; for (int i = 0; i < coreClocks.Length; i++) { @@ -151,11 +151,12 @@ // 8-13 hold StartFID, we don't use that here. double curMP = 0.5 * ((eax & 0x3F) + 8); double maxMP = 0.5 * ((eax >> 16 & 0x3F) + 8); - coreClocks[i].Value = (float)(curMP * MaxClock / maxMP); - newBusClock = (float)(MaxClock / maxMP); + coreClocks[i].Value = + (float)(curMP * TimeStampCounterFrequency / maxMP); + newBusClock = (float)(TimeStampCounterFrequency / maxMP); } else { // Fail-safe value - if the code above fails, we'll use this instead - coreClocks[i].Value = (float)MaxClock; + coreClocks[i].Value = (float)TimeStampCounterFrequency; } }