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

Refactored code 

Former-commit-id: b4f0723b03152a657acd41758c297ac4a9bf1a50
This commit is contained in:
Lynix 2015-02-24 16:16:56 +01:00
parent ee6ca790a5
commit 60b6b2f4de
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,8 @@
void NzHardwareInfoImpl::Cpuid(nzUInt32 code, nzUInt32 result[4]) void NzHardwareInfoImpl::Cpuid(nzUInt32 code, nzUInt32 result[4])
{ {
#if defined(NAZARA_COMPILER_MSVC) #if defined(NAZARA_COMPILER_MSVC)
static_assert(sizeof(nzUInt32) == sizeof(int), "Assertion failed");
__cpuid(reinterpret_cast<int*>(result), static_cast<int>(code)); // Visual propose une fonction intrinsèque pour le cpuid __cpuid(reinterpret_cast<int*>(result), static_cast<int>(code)); // Visual propose une fonction intrinsèque pour le cpuid
#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)
// Source: http://stackoverflow.com/questions/1666093/cpuid-implementations-in-c // Source: http://stackoverflow.com/questions/1666093/cpuid-implementations-in-c
@ -37,10 +39,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,11 +61,7 @@ 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"
@ -82,8 +80,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
} }