midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common/cpu_detect: Add missing include and fix namespace scope

Browse Source
This commit is contained in:
Yuri Kunde Schlesner 2017-03-12 21:55:15 -07:00
parent eb435816e3
commit 6ca816e011
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/x64/cpu_detect.cpp
View File

@ -8,9 +8,9 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "cpu_detect.h" #include "cpu_detect.h"
namespace Common { #ifdef _MSC_VER
#include <intrin.h>
#ifndef _MSC_VER #else
#if defined(__DragonFly__) || defined(__FreeBSD__) #if defined(__DragonFly__) || defined(__FreeBSD__)
// clang-format off // clang-format off
@ -37,13 +37,15 @@ static inline void __cpuid(int info[4], int function_id) {
} }
#define _XCR_XFEATURE_ENABLED_MASK 0 #define _XCR_XFEATURE_ENABLED_MASK 0
static u64 _xgetbv(u32 index) { static inline u64 _xgetbv(u32 index) {
u32 eax, edx; u32 eax, edx;
__asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index)); __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
return ((u64)edx << 32) | eax; return ((u64)edx << 32) | eax;
} }
#endif // ifndef _MSC_VER #endif // _MSC_VER
namespace Common {
// Detects the various CPU features // Detects the various CPU features
static CPUCaps Detect() { static CPUCaps Detect() {