Fix one gcc 4.4 warning

Properly fix previous warning. Patch from Joona.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2010-04-05 20:08:01 +01:00
parent 3a62738174
commit 10c1ae8da0
+7 -1
View File
@@ -221,6 +221,7 @@ static int builtin_cpu_count() {
static bool HT_enabled() { static bool HT_enabled() {
char CPUString[0x20];
int CPUInfo[4] = {-1}; int CPUInfo[4] = {-1};
int nIds, nLogicalCPU, nCores; int nIds, nLogicalCPU, nCores;
@@ -228,8 +229,13 @@ static bool HT_enabled() {
__cpuid(CPUInfo, 0); __cpuid(CPUInfo, 0);
nIds = 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; return false;
// Detect if HT Technology is supported // Detect if HT Technology is supported