1.1 --- a/Hardware/CPU/AMD0FCPU.cs Mon Sep 27 23:48:41 2010 +0000
1.2 +++ b/Hardware/CPU/AMD0FCPU.cs Thu Sep 30 16:51:09 2010 +0000
1.3 @@ -92,7 +92,7 @@
1.4 for (int i = 0; i < coreClocks.Length; i++) {
1.5 coreClocks[i] = new Sensor(CoreString(i), i + 1, SensorType.Clock,
1.6 this, settings);
1.7 - if (hasTSC)
1.8 + if (HasTimeStampCounter)
1.9 ActivateSensor(coreClocks[i]);
1.10 }
1.11
1.12 @@ -138,7 +138,7 @@
1.13 }
1.14 }
1.15
1.16 - if (hasTSC) {
1.17 + if (HasTimeStampCounter) {
1.18 double newBusClock = 0;
1.19
1.20 for (int i = 0; i < coreClocks.Length; i++) {
1.21 @@ -151,11 +151,12 @@
1.22 // 8-13 hold StartFID, we don't use that here.
1.23 double curMP = 0.5 * ((eax & 0x3F) + 8);
1.24 double maxMP = 0.5 * ((eax >> 16 & 0x3F) + 8);
1.25 - coreClocks[i].Value = (float)(curMP * MaxClock / maxMP);
1.26 - newBusClock = (float)(MaxClock / maxMP);
1.27 + coreClocks[i].Value =
1.28 + (float)(curMP * TimeStampCounterFrequency / maxMP);
1.29 + newBusClock = (float)(TimeStampCounterFrequency / maxMP);
1.30 } else {
1.31 // Fail-safe value - if the code above fails, we'll use this instead
1.32 - coreClocks[i].Value = (float)MaxClock;
1.33 + coreClocks[i].Value = (float)TimeStampCounterFrequency;
1.34 }
1.35 }
1.36