ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[RSP] Disable __cpuid() detection for non-MSVC compiles.

This commit is contained in:
unknown 2015-10-29 20:48:31 -04:00
parent 3c64df1837
commit 1f7ab970e8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/RSP/Main.cpp
View File

@ -272,8 +272,9 @@ void DetectCpuSpecs(void)
DWORD Intel_Features = 0; DWORD Intel_Features = 0;
DWORD AMD_Features = 0; DWORD AMD_Features = 0;
#if defined(_MSC_VER)
__try { __try {
#if defined(_M_IX86) && defined(_MSC_VER) #ifdef _M_IX86
_asm { _asm {
/* Intel features */ /* Intel features */
mov eax, 1 mov eax, 1
@ -296,6 +297,13 @@ void DetectCpuSpecs(void)
__except (EXCEPTION_EXECUTE_HANDLER) { __except (EXCEPTION_EXECUTE_HANDLER) {
AMD_Features = Intel_Features = 0; AMD_Features = Intel_Features = 0;
} }
#else
/*
* To do: With GCC, there is <cpuid.h>, but __cpuid() there is a macro and
* needs five arguments, not two. Also, GCC lacks SEH.
*/
AMD_Features = Intel_Features = 0;
#endif
if (Intel_Features & 0x02000000) if (Intel_Features & 0x02000000)
{ {