Merge pull request #1351 from rsw0x/issue_8973

Issue 8973 - core.cpuid.coresPerCPU returning incorrect value.
dlang · Aug 23, 2015 · f3d9ec7 · f3d9ec7
2 parents dad70ec + c3a9ff6
commit f3d9ec7
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/core/cpuid.d b/src/core/cpuid.d
@@ -735,15 +735,10 @@ void cpuidX86()
             cpuid;
             mov c, ECX;
         }
-        uint apicsize = (c>>12) & 0xF;
-        if (apicsize == 0) {
-            // use legacy method
-            if (hyperThreadingBit)  maxCores = c & 0xFF;
-            else maxCores = 1;
-        } else {
-            // maxcores = 2^ apicsize
-            maxCores = 1;
-            while (apicsize) { maxCores<<=1; --apicsize; }
+        //http://support.amd.com/TechDocs/25481.pdf pg.36
+        maxCores = 1;
+        if (hyperThreadingBit) {
+            maxCores += c & 0xFF;
         }
     }