citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #2626 from yuriks/msvc2017 

Fix building with MSVC 2017
This commit is contained in:
bunnei 2017-03-15 21:01:24 -04:00 committed by GitHub
parent eb435816e3 24e0b1ed8d
commit bc510f942c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/boost vendored

@ -1 +1 @@
Subproject commit f005c955f8147a29667aa0b65257abc3dd520b0c
Subproject commit 351972396392c97a659b9a02f34ce9269293d21f

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

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