cpuid: Use __asm for MSVC

[ccan] / ccan / cpuid / cpuid.c

diff --git a/ccan/cpuid/cpuid.c b/ccan/cpuid/cpuid.c
index 55a089213797f2e24527b69c46d1315f1fc784ad..57883e2bd0982b17fccdeaf34fd5da945c1134ea 100644 (file)
--- a/ccan/cpuid/cpuid.c
+++ b/ccan/cpuid/cpuid.c
@@ -92,13 +92,19 @@ static struct {
 
 bool cpuid_is_supported(void)
 {
+       int ret = 0;
+#if defined(__GNUC__) || defined(__clang__)
        /* The following assembly code uses EAX as the return value,
         * but we store the value of EAX into ret since GCC uses EAX
         * as the return register for every C function.  That's a double
         * operation, but there's no other way to do this unless doing this
-        * function entirely in assembly.  */
-
-       /* This check is to make sure that the compiler is actually compiling
+        * function entirely in assembly.
+        *
+        * The following assembly code has been shamelessly stolen from:
+        *      http://wiki.osdev.org/CPUID
+        * and converted to work with AT&T syntax.
+        *
+        * This check is to make sure that the compiler is actually compiling
         * for 64-bit.
         *
         * The compiler can be 32-bit and the system 64-bit so the 
@@ -111,16 +117,15 @@ bool cpuid_is_supported(void)
 #define ASM_POPF       "popfq\n\t"
 #define ASM_PUSHEAX    "pushq %%rax\n\t"
 #define ASM_POPEAX     "popq %%rax\n\t"
-#define ASM_PUSHECX    "popq %%rcx\n\t"
+#define ASM_PUSHECX    "pushq %%rcx\n\t"
 #elif UINTPTR_MAX == 0xffffffff
 #define ASM_PUSHF      "pushfl\n\t"
 #define ASM_POPF       "popfl\n\t"
 #define ASM_PUSHEAX    "pushl %%eax\n\t"
 #define ASM_POPEAX     "popl %%eax\n\t"
-#define ASM_PUSHECX    "popl %%ecx\n\t"
+#define ASM_PUSHECX    "pushl %%ecx\n\t"
 #endif
 
-       int ret = 0;
        asm volatile(
                ASM_PUSHF
                ASM_POPEAX
@@ -143,7 +148,26 @@ bool cpuid_is_supported(void)
 #undef ASM_PUSHEAX
 #undef ASM_POPEAX
 #undef ASM_PUSHECX
-
+#elif defined _MSC_VER
+       __asm {
+               pushfd
+               pop eax
+               mov ecx, eax
+               xor eax, 0x200000
+               push eax
+               popfd
+
+               pushfd
+               pop eax
+               xor eax, ecx
+               shr eax, 0x21
+               and eax, 0x1
+               push ecx
+               popfd
+
+               mov eax, ret
+       };
+#endif
        return !!ret;
 }
 
@@ -157,7 +181,7 @@ bool cpuid_test_feature(cpuid_t feature)
 
 bool cpuid_has_feature(int feature, bool extended)
 {
-       uint32_t eax, ebx, ecx, edx;
+       uint32_t eax, ebx, ecx, edx, i;
 
        if (!extended)
                ___cpuid(CPU_PROCINFO_AND_FEATUREBITS, &eax, &ebx, &ecx, &edx);
@@ -205,8 +229,6 @@ cputype_t cpuid_get_cpu_type(void)
                uint32_t i;
 
                ___cpuid(CPU_VENDORID, &i, &u.bufu32[0], &u.bufu32[2], &u.bufu32[1]);
-               u.buf[12] = '\0';
-
                for (i = 0; i < sizeof(cpuids) / sizeof(cpuids[0]); ++i) {
                        if (strncmp(cpuids[i], u.buf, 12) == 0) {
                                cputype = (cputype_t)i;
@@ -218,9 +240,14 @@ cputype_t cpuid_get_cpu_type(void)
        return cputype;
 }
 
-const char *cpuid_get_cpu_type_string(const cputype_t cputype)
+bool cpuid_sprintf_cputype(const cputype_t cputype, char *buf)
 {
-       return cpuids[(int)cputype];
+       if (cputype == CT_NONE)
+               return false;
+
+       memcpy(buf, cpuids[(int)cputype], 12);
+       buf[12] = '\0';
+       return true;
 }
 
 uint32_t cpuid_highest_ext_func_supported(void)
@@ -228,11 +255,19 @@ uint32_t cpuid_highest_ext_func_supported(void)
        static uint32_t highest;
 
        if (!highest) {
+#if defined(__GNUC__) || defined(__clang__)
                asm volatile(
                        "cpuid\n\t"
                        : "=a" (highest)
                        : "a" (CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED)
                );
+#elif defined _MSC_VER
+               __asm {
+                       mov eax, CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED
+                       cpuid
+                       mov highest, eax
+               };
+#endif
        }
 
        return highest;
@@ -248,9 +283,16 @@ void cpuid(cpuid_t info, uint32_t *buf)
                return;
 
        if (info == CPU_PROC_BRAND_STRING) {
-               ___cpuid(CPU_PROC_BRAND_STRING,           &buf[0], &buf[1], &buf[2],  &buf[3]);
-               ___cpuid(CPU_PROC_BRAND_STRING_INTERNAL0, &buf[4], &buf[5], &buf[6],  &buf[7]);
-               ___cpuid(CPU_PROC_BRAND_STRING_INTERNAL1, &buf[8], &buf[9], &buf[10], &buf[11]);
+               static char cached[48] = { 0 };
+               if (cached[0] == '\0') {
+                       ___cpuid(CPU_PROC_BRAND_STRING,           &buf[0], &buf[1], &buf[2],  &buf[3]);
+                       ___cpuid(CPU_PROC_BRAND_STRING_INTERNAL0, &buf[4], &buf[5], &buf[6],  &buf[7]);
+                       ___cpuid(CPU_PROC_BRAND_STRING_INTERNAL1, &buf[8], &buf[9], &buf[10], &buf[11]);
+
+                       memcpy(cached, buf, sizeof cached);
+               } else
+                       buf = (uint32_t *)cached;
+
                return;
        } else if (info == CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED) {
                *buf = cpuid_highest_ext_func_supported();
@@ -289,13 +331,16 @@ void cpuid(cpuid_t info, uint32_t *buf)
                        buf[3] = edx;
                        break;
                case CPU_EXTENDED_L2_CACHE_FEATURES:
-                       *buf = ecx;
+                       buf[0] = ecx & 0xFF;            /* Line size.  */
+                       buf[1] = (ecx >> 12) & 0xFF;    /* Associativity.  */
+                       buf[2] = ecx >> 16;             /* Cache size.  */
                        break;
                case CPU_ADV_POWER_MGT_INFO:
                        *buf = edx;
                        break;
                case CPU_VIRT_PHYS_ADDR_SIZES:
-                       *buf = eax;
+                       buf[0] = eax & 0xFF;            /* physical.  */
+                       buf[1] = (eax >> 8) & 0xFF;     /* virtual.  */
                        break;
                default:
                        *buf = 0xbaadf00d;
@@ -304,4 +349,3 @@ void cpuid(cpuid_t info, uint32_t *buf)
 }
 
 #endif
-