From ade93ea76d6244306a551b03d9440f816bb151ba Mon Sep 17 00:00:00 2001 From: dev <dev@robertfoss.se> Date: Thu, 2 Apr 2015 15:58:46 +0000 Subject: [PATCH] Added model name for Xeon E3-1230v2 --- .../support/CPUInformation/IntelInfoImpl.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java index e1799659d7..687dab72e5 100644 --- a/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java +++ b/core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java @@ -156,8 +156,8 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo isPentiumMCompatible = true; isCore2Compatible = true; isX64 = true; - if (extmodel >= 2) - isCoreiCompatible = true; + if (extmodel >= 2) { + isCoreiCompatible = true; } switch (model) { case 0: @@ -329,21 +329,20 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo break; // Ivy Bridge 22 nm case 0x3a: - modelString = "Ivy Bridge"; + modelString = "Ivy Bridge (22nm)"; break; // Haswell 22 nm case 0x3c: - modelString = "Haswell"; + modelString = "Haswell (22nm)"; break; // Broadwell 14 nm case 0x3d: - modelString = "Broadwell"; + modelString = "Broadwell (14nm)"; + break; + // Ivy Bridge 22 nm + case 0x3e: + modelString = "Xeon Ivy Bridge (22nm)"; break; - - // following are for extended model == 4 - // most flags are set above - // isCoreiCompatible = true is the default - // Atom Silvermont / Bay Trail / Avoton 22 nm // Supports SSE 4.2 case 0x4d: @@ -351,8 +350,7 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo modelString = "Bay Trail / Avoton"; break; - // others - + // others default: modelString = "Intel model " + model; break; -- GitLab