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
#define ASM_PUSHECX "pushl %%ecx\n\t"
#endif
- int ret = 0;
asm volatile(
ASM_PUSHF
ASM_POPEAX
#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, 21
+ and eax, 1
+ push ecx
+ popfd
+
+ mov eax, ret
+ };
+#endif
return !!ret;
}
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)
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;
buf[2] = ecx;
break;
case CPU_PROCINFO_AND_FEATUREBITS:
- buf[0] = eax; /* The so called "signature" of the CPU. */
- buf[1] = edx; /* Feature flags #1. */
- buf[2] = ecx; /* Feature flags #2. */
- buf[3] = ebx; /* Additional feature information. */
+ buf[0] = (eax & 0x0F); /* Stepping */
+ buf[1] = (eax >> 4) & 0x0F; /* Model */
+ buf[2] = (eax >> 8) & 0x0F; /* Family */
+ buf[3] = (eax >> 16) & 0x0F; /* Extended Model. */
+ buf[4] = (eax >> 24) & 0x0F; /* Extended Family. */
+
+ buf[5] = edx; /* Feature flags #1. */
+ buf[6] = ecx; /* Feature flags #2. */
+
+ /* Additional Feature information. */
+ buf[7] = ebx & 0xFF;
+ buf[8] = (ebx >> 8) & 0xFF;
+ buf[9] = (ebx >> 16) & 0xFF;
+ buf[10] = (ebx >> 24) & 0xFF;
break;
case CPU_CACHE_AND_TLBD_INFO:
buf[0] = eax;