From f034e71ba4fe2e2bc1c169ceec18f366fcdd07fd Mon Sep 17 00:00:00 2001
From: SirLynix <lynix680@gmail.com>
Date: Wed, 12 Apr 2023 14:10:55 +0200
Subject: [PATCH] Core/HardwareInfo: Fix compilation for other arch than x86

---
 src/Nazara/Core/Posix/HardwareInfoImpl.cpp | 32 +++++++++----------
 src/Nazara/Core/Win32/HardwareInfoImpl.cpp | 36 ++++++++++++----------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/Nazara/Core/Posix/HardwareInfoImpl.cpp b/src/Nazara/Core/Posix/HardwareInfoImpl.cpp
index 64fd0aba1..0c25634c5 100644
--- a/src/Nazara/Core/Posix/HardwareInfoImpl.cpp
+++ b/src/Nazara/Core/Posix/HardwareInfoImpl.cpp
@@ -11,26 +11,26 @@ namespace Nz
 {
 	void HardwareInfoImpl::Cpuid(UInt32 functionId, UInt32 subFunctionId, UInt32 registers[4])
 	{
-	#if (defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)) && !defined(NAZARA_PLATFORM_WEB)
+#if defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL) && (defined(NAZARA_ARCH_x86) || defined(NAZARA_ARCH_x86_64))
 		// https://en.wikipedia.org/wiki/CPUID
 		asm volatile(
-			#ifdef NAZARA_ARCH_x86_64
+#ifdef NAZARA_ARCH_x86_64
 			"pushq %%rbx     \n\t" // save %rbx
-			#else
+#else
 			"pushl %%ebx     \n\t" // save %ebx
-			#endif
+#endif
 			"cpuid            \n\t"
 			"movl %%ebx ,%[ebx]  \n\t" // write the result into output var
-			#ifdef NAZARA_ARCH_x86_64
+#ifdef NAZARA_ARCH_x86_64
 			"popq %%rbx \n\t"
-			#else
+#else
 			"popl %%ebx \n\t"
-			#endif
+#endif
 			: "=a"(registers[0]), [ebx] "=r"(registers[1]), "=c"(registers[2]), "=d"(registers[3])
 			: "a"(functionId), "c" (subFunctionId));
-	#else
+#else
 		NazaraInternalError("Cpuid has been called although it is not supported");
-	#endif
+#endif
 	}
 
 	unsigned int HardwareInfoImpl::GetProcessorCount()
@@ -49,12 +49,9 @@ namespace Nz
 
 	bool HardwareInfoImpl::IsCpuidSupported()
 	{
-	#ifdef NAZARA_ARCH_x86_64
-		return true; // cpuid is always supported on x64 arch
-	#elif defined(NAZARA_PLATFORM_WEB)
-		return false;
-	#else
-		#if defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)
+#if defined(NAZARA_ARCH_x86_64)
+		return true; // cpuid is always supported on x86_64 arch
+#elif defined(NAZARA_ARCH_x86) && (defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL))
 		int supported;
 		asm volatile ("	pushfl\n"
 					  " pop %%eax\n"
@@ -73,9 +70,8 @@ namespace Nz
 					  : "eax", "ecx", "memory"); // clobbered register
 
 		return supported != 0;
-		#else
+#else
 		return false;
-		#endif
-	#endif
+#endif
 	}
 }
diff --git a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
index c13de0572..b334f4b6d 100644
--- a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
+++ b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
@@ -16,31 +16,31 @@ namespace Nz
 {
 	void HardwareInfoImpl::Cpuid(UInt32 functionId, UInt32 subFunctionId, UInt32 registers[4])
 	{
-	#if defined(NAZARA_COMPILER_MSVC)
+#if defined(NAZARA_COMPILER_MSVC) && (defined(NAZARA_ARCH_x86) || defined(NAZARA_ARCH_x86_64))
 		static_assert(sizeof(UInt32) == sizeof(int));
 
 		// Use intrinsic function if available
 		__cpuidex(reinterpret_cast<int*>(registers), static_cast<int>(functionId), static_cast<int>(subFunctionId));
-	#elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)
+#elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL) && (defined(NAZARA_ARCH_x86) || defined(NAZARA_ARCH_x86_64))
 		// https://en.wikipedia.org/wiki/CPUID
 		asm volatile(
-			#ifdef NAZARA_ARCH_x86_64
+#ifdef NAZARA_ARCH_x86_64
 			"pushq %%rbx     \n\t" // save %rbx
-			#else
+#else
 			"pushl %%ebx     \n\t" // save %ebx
-			#endif
+#endif
 			"cpuid            \n\t"
 			"movl %%ebx ,%[ebx]  \n\t" // write the result into output var
-			#ifdef NAZARA_ARCH_x86_64
+#ifdef NAZARA_ARCH_x86_64
 			"popq %%rbx \n\t"
-			#else
+#else
 			"popl %%ebx \n\t"
-			#endif
+#endif
 			: "=a"(registers[0]), [ebx] "=r"(registers[1]), "=c"(registers[2]), "=d"(registers[3]) // output
 			: "a"(functionId), "c" (subFunctionId));                                               // input
-	#else
+#else
 		NazaraInternalError("Cpuid has been called although it is not supported");
-	#endif
+#endif
 	}
 
 	unsigned int HardwareInfoImpl::GetProcessorCount()
@@ -63,10 +63,10 @@ namespace Nz
 
 	bool HardwareInfoImpl::IsCpuidSupported()
 	{
-	#ifdef NAZARA_ARCH_x86_64
-		return true; // cpuid is always supported on x64 arch
-	#else
-		#if defined(NAZARA_COMPILER_MSVC)
+#if defined(NAZARA_ARCH_x86_64)
+		return true; // cpuid is always supported on x86_64 arch
+#elif defined(NAZARA_ARCH_x86)
+	#if defined(NAZARA_COMPILER_MSVC)
 		int supported;
 		__asm
 		{
@@ -85,7 +85,7 @@ namespace Nz
 		};
 
 		return supported != 0;
-		#elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)
+	#elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)
 		int supported;
 		asm volatile (" pushfl\n"
 		              " pop %%eax\n"
@@ -104,10 +104,12 @@ namespace Nz
 		              : "eax", "ecx", "memory"); // clobbered register
 
 		return supported != 0;
-		#else
+	#else
 		return false;
-		#endif
 	#endif
+#else
+		return false;
+#endif
 	}
 }