sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed cpuid reported supported on unsupported compilers

Browse Source 
Former-commit-id: 4f5fc2251882ae04d9131242d0f9d7f8a3a3e6dc
This commit is contained in:
Lynix
2014-04-21 10:43:46 +02:00
parent 531fa2ce84
commit 55fe71ee21
1 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Core/Win32/HardwareInfoImpl.cpp
View File

@@ -37,10 +37,10 @@ unsigned int NzHardwareInfoImpl::GetProcessorCount()
bool NzHardwareInfoImpl::IsCpuidSupported() bool NzHardwareInfoImpl::IsCpuidSupported()
{ {
#if defined(NAZARA_COMPILER_MSVC)
#ifdef NAZARA_PLATFORM_x64 #ifdef NAZARA_PLATFORM_x64
return true; // Toujours supporté sur un processeur 64 bits return true; // Toujours supporté sur un processeur 64 bits
#else #else
#if defined(NAZARA_COMPILER_MSVC)
int supported; int supported;
__asm __asm
{ {
@@ -59,7 +59,11 @@ bool NzHardwareInfoImpl::IsCpuidSupported()
}; };
return supported != 0; return supported != 0;
#endif // NAZARA_PLATFORM_x64
#elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL) #elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)
#ifdef NAZARA_PLATFORM_x64
return true; // Toujours supporté sur un processeur 64 bits
#else
int supported; int supported;
asm volatile (" pushfl\n" asm volatile (" pushfl\n"
" pop %%eax\n" " pop %%eax\n"
@@ -78,8 +82,8 @@ bool NzHardwareInfoImpl::IsCpuidSupported()
: "eax", "ecx", "memory"); // clobbered register : "eax", "ecx", "memory"); // clobbered register
return supported != 0; return supported != 0;
#endif // NAZARA_PLATFORM_x64
#else #else
return false; return false;
#endif #endif
#endif
} }