Do not use cpuid outside x86 architectures in disasmtool.

master
Andrei Vlad LUTAS 2 months ago
parent 9a66dc05c7
commit 173e2e295d

@ -6,8 +6,6 @@
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#include <Windows.h> #include <Windows.h>
#include <Intrin.h> #include <Intrin.h>
#else
#include <cpuid.h>
#endif // WIN32 #endif // WIN32
#include <stdbool.h> #include <stdbool.h>
@ -23,6 +21,11 @@
#include "disasmtool.h" #include "disasmtool.h"
#if !defined(WIN32) && (defined(ND_ARCH_X64) || defined(ND_ARCH_X86))
#include <cpuid.h>
#endif // defined(ND_ARCH_X64) || defined(ND_ARCH_X86)
const char *gSpaces[16] = const char *gSpaces[16] =
{ {
@ -71,6 +74,7 @@ nd_memset(void *s, int c, size_t n)
#endif // !defined(BDDISASM_HAS_MEMSET) #endif // !defined(BDDISASM_HAS_MEMSET)
#if defined(ND_ARCH_X64) || defined(ND_ARCH_X86)
#ifdef WIN32 #ifdef WIN32
#define cpuid __cpuid #define cpuid __cpuid
#else #else
@ -82,7 +86,8 @@ void cpuid(int cpuInfo[4], int function_id)
unsigned int *cpuinfo = (unsigned int *)cpuInfo; unsigned int *cpuinfo = (unsigned int *)cpuInfo;
__get_cpuid(function_id, &cpuinfo[0], &cpuinfo[1], &cpuinfo[2], &cpuinfo[3]); __get_cpuid(function_id, &cpuinfo[0], &cpuinfo[1], &cpuinfo[2], &cpuinfo[3]);
} }
#endif //WIN32 #endif // WIN32
#endif // defined(ND_ARCH_X64) || defined(ND_ARCH_X86)
#define FG_Black "\033[1;30m" #define FG_Black "\033[1;30m"

Loading…
Cancel
Save