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

common: Work around GCC8 _xgetbv bug 

clang and earlier GCC versions do not provide the _xgetbv intrinsic.
GCC8 does, but unfortunately it's broken.
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85684).

Re-use our _xgetbv implementation to avoid the bug, but rename it to
avoid compilation errors as well.
This commit is contained in:
Jonathan Li 2018-05-11 01:42:27 +01:00
parent 5ec5265ec4
commit 171e7f016d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/include/x86emitter/x86_intrin.h
View File

@ -34,6 +34,7 @@
#define cpuid __cpuid #define cpuid __cpuid
#define cpuidex __cpuidex #define cpuidex __cpuidex
#define xgetbv _xgetbv
#else #else
@ -49,8 +50,9 @@ static __inline__ __attribute__((always_inline)) void cpuid(int CPUInfo[], const
__cpuid(InfoType, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); __cpuid(InfoType, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]);
} }
#if __GNUC__ < 8 // _xgetbv on gcc 8 is broken (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85684).
static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsigned int index) // It also isn't present on clang and earlier versions of gcc.
static __inline__ __attribute__((always_inline)) unsigned long long xgetbv(unsigned int index)
{ {
unsigned int eax, edx; unsigned int eax, edx;
__asm__ __volatile__("xgetbv" __asm__ __volatile__("xgetbv"
@ -58,7 +60,6 @@ static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsi
: "c"(index)); : "c"(index));
return ((unsigned long long)edx << 32) | eax; return ((unsigned long long)edx << 32) | eax;
} }
#endif
#endif #endif

2
common/src/x86emitter/cpudetect.cpp
View File

@ -297,7 +297,7 @@ void x86capabilities::Identify()
if ((Flags2 >> 27) & 1) // OSXSAVE if ((Flags2 >> 27) & 1) // OSXSAVE
{ {
if ((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS). if ((xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS).
{ {
hasAVX = (Flags2 >> 28) & 1; //avx hasAVX = (Flags2 >> 28) & 1; //avx
hasFMA = (Flags2 >> 12) & 1; //fma hasFMA = (Flags2 >> 12) & 1; //fma