From 10c1ae8da0b981206a543cff6a2778a277f862df Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Mon, 5 Apr 2010 20:08:01 +0100 Subject: [PATCH 1/1] Fix one gcc 4.4 warning Properly fix previous warning. Patch from Joona. Signed-off-by: Marco Costalba --- src/misc.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/misc.cpp b/src/misc.cpp index c5160301..89a2f5ee 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -221,6 +221,7 @@ static int builtin_cpu_count() { static bool HT_enabled() { + char CPUString[0x20]; int CPUInfo[4] = {-1}; int nIds, nLogicalCPU, nCores; @@ -228,8 +229,13 @@ static bool HT_enabled() { __cpuid(CPUInfo, 0); nIds = CPUInfo[0]; + memset(CPUString, 0, sizeof(CPUString)); + memcpy(&CPUString[0], &CPUInfo[1], sizeof(int)); + memcpy(&CPUString[4], &CPUInfo[3], sizeof(int)); + memcpy(&CPUString[8], &CPUInfo[2], sizeof(int)); + // Not an Intel CPU or CPUID.4 not supported - if (!((CPUInfo[1] == 'uneG') && (CPUInfo[3] == 'Ieni') && (CPUInfo[2] == 'letn')) || nIds < 4) + if (strcmp(CPUString, "GenuineIntel") || nIds < 4) return false; // Detect if HT Technology is supported -- 2.39.2