Skip to content
Snippets Groups Projects
Commit 6ca816e0 authored by Yuri Kunde Schlesner's avatar Yuri Kunde Schlesner
Browse files

common/cpu_detect: Add missing include and fix namespace scope

parent eb435816
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/common/x64/cpu_detect.cpp
+ 7
− 5
View file @ 6ca816e0
...@@ -8,9 +8,9 @@ ...@@ -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) { ...@@ -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() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment