Properly fix previous warning. Patch from Joona.
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
static bool HT_enabled() {
static bool HT_enabled() {
int CPUInfo[4] = {-1};
int nIds, nLogicalCPU, nCores;
int CPUInfo[4] = {-1};
int nIds, nLogicalCPU, nCores;
__cpuid(CPUInfo, 0);
nIds = CPUInfo[0];
__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
// 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
return false;
// Detect if HT Technology is supported