diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-07-24 10:48:07 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-07-24 10:48:07 +0800 |
| commit | 4799cde613a131c312793d194414e3b3b015877a (patch) | |
| tree | f6a056fefab85872a41a919ceed8459f24e0ec9e | |
| parent | 0b7686584e4bda026e895692b532b302ca734270 (diff) | |
| parent | 1a078117b5ae862b18ef5362accef4b4d0a6b7c4 (diff) | |
| download | php-git-4799cde613a131c312793d194414e3b3b015877a.tar.gz | |
Merge branch 'master' of https://github.com/oerdnj/php-src
* 'master' of https://github.com/oerdnj/php-src:
Use __cpuid_count() from cpuid.h instead of custom assembly
| -rw-r--r-- | Zend/zend_cpuinfo.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_cpuinfo.c b/Zend/zend_cpuinfo.c index 43252a7cca..70e1dbf4fa 100644 --- a/Zend/zend_cpuinfo.c +++ b/Zend/zend_cpuinfo.c @@ -29,12 +29,9 @@ typedef struct _zend_cpu_info { static zend_cpu_info cpuinfo = {0}; #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#include <cpuid.h> static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) { - __asm__ __volatile__ ( - "cpuid" - : "=a"(cpuinfo->eax), "=b"(cpuinfo->ebx), "=c"(cpuinfo->ecx), "=d"(cpuinfo->edx) - : "a"(func), "c"(subfunc) - ); + __cpuid_count(func, subfunc, cpuinfo->eax, cpuinfo->ebx, cpuinfo->ecx, cpuinfo->edx); } #elif defined(ZEND_WIN32) # include <intrin.h> |