From 173e2e295d9e39dc588be1f2e39bd85d7f06fdea Mon Sep 17 00:00:00 2001 From: Andrei Vlad LUTAS Date: Tue, 7 May 2024 17:38:01 +0300 Subject: [PATCH] Do not use cpuid outside x86 architectures in disasmtool. --- disasmtool/disasmtool.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/disasmtool/disasmtool.c b/disasmtool/disasmtool.c index e27e93c..ff72190 100644 --- a/disasmtool/disasmtool.c +++ b/disasmtool/disasmtool.c @@ -6,8 +6,6 @@ #define _CRT_SECURE_NO_WARNINGS #include #include -#else -#include #endif // WIN32 #include @@ -23,6 +21,11 @@ #include "disasmtool.h" +#if !defined(WIN32) && (defined(ND_ARCH_X64) || defined(ND_ARCH_X86)) +#include +#endif // defined(ND_ARCH_X64) || defined(ND_ARCH_X86) + + const char *gSpaces[16] = { @@ -71,6 +74,7 @@ nd_memset(void *s, int c, size_t n) #endif // !defined(BDDISASM_HAS_MEMSET) +#if defined(ND_ARCH_X64) || defined(ND_ARCH_X86) #ifdef WIN32 #define cpuid __cpuid #else @@ -82,7 +86,8 @@ void cpuid(int cpuInfo[4], int function_id) unsigned int *cpuinfo = (unsigned int *)cpuInfo; __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"