diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h index e5e97e706cf6ee72df7ca39ae6413d9cff48d942..fdbed2524e70625030f57d5086ec6769c1663075 100644 --- a/vpx_ports/x86.h +++ b/vpx_ports/x86.h @@ -71,6 +71,7 @@ typedef enum { #endif #else /* end __SUNPRO__ */ #if ARCH_X86_64 +#if defined(_MSC_VER) && _MSC_VER > 1500 void __cpuidex(int CPUInfo[4], int info_type, int ecxvalue); #pragma intrinsic(__cpuidex) #define cpuid(func, func2, a, b, c, d) do {\ @@ -79,6 +80,15 @@ void __cpuidex(int CPUInfo[4], int info_type, int ecxvalue); a = regs[0]; b = regs[1]; c = regs[2]; d = regs[3];\ } while(0) #else +void __cpuid(int CPUInfo[4], int info_type); +#pragma intrinsic(__cpuid) +#define cpuid(func, func2, a, b, c, d) do {\ + int regs[4];\ + __cpuid(regs, func); \ + a = regs[0]; b = regs[1]; c = regs[2]; d = regs[3];\ + } while (0) +#endif +#else #define cpuid(func, func2, a, b, c, d)\ __asm mov eax, func\ __asm mov ecx, func2\