///////////////////////////////////////////////////////////////////////////////
// MuldeR's Utilities for Qt
-// Copyright (C) 2004-2016 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#define WIN32_LEAN_AND_MEAN 1
#include <Windows.h>
+//ASM
+#include <intrin.h>
+
//MUtils
#include <MUtils/CPUFeatures.h>
#include <MUtils/OSSupport.h>
//Initialize variables to zero
memset(&features, 0, sizeof(cpu_info_t));
memset(&systemInfo, 0, sizeof(SYSTEM_INFO));
- memset(cpuInfo, 0, sizeof(cpuInfo));
+ memset(&cpuInfo[0], 0, sizeof(cpuInfo));
//Detect the CPU identifier string
MY_CPUID(&cpuInfo[0], 0);
//Detect extended feature flags
if (max_basic_cap >= 7)
{
- MY_CPUID(&cpuInfo[1], 7);
+ MY_CPUID(&cpuInfo[0], 7);
if (features.features & FLAG_AVX)
{
- features.features |= CHECK_FLAG(cpuInfo[2], 0x00000020, FLAG_AVX2);
+ features.features |= CHECK_FLAG(cpuInfo[1], 0x00000020, FLAG_AVX2);
}
}