Mercurial > hg > graal-jvmci-8

changeset 22795:f06c27e55164

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kevinw
date Thu, 18 Dec 2014 09:52:55 +0000
parents a8c8adf853c2 (diff) 5217ec74ac63 (current diff)
children 4181e5e64dd0 c1c044c745b2
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/vm_version_x86.hpp	Thu Dec 18 08:54:32 2014 +0000
+++ b/src/cpu/x86/vm/vm_version_x86.hpp	Thu Dec 18 09:52:55 2014 +0000
@@ -570,10 +570,12 @@
   static uint cores_per_cpu()  {
     uint result = 1;
     if (is_intel()) {
-      if (supports_processor_topology()) {
+      bool supports_topology = supports_processor_topology();
+      if (supports_topology) {
         result = _cpuid_info.tpl_cpuidB1_ebx.bits.logical_cpus /
                  _cpuid_info.tpl_cpuidB0_ebx.bits.logical_cpus;
-      } else {
+      }
+      if (!supports_topology || result == 0) {
         result = (_cpuid_info.dcp_cpuid4_eax.bits.cores_per_cpu + 1);
       }
     } else if (is_amd()) {