move cpuid stuff to util/arch/x86

2025-09-29 19:24:25 +03:00 · 2020-09-17 20:35:39 +03:00
parent 2d89df44ae
commit 6a40793719
8 changed files with 16 additions and 8 deletions
--- a/src/dispatcher.c
+++ b/src/dispatcher.c
@@ -30,7 +30,9 @@
 #include "hs_common.h"
 #include "hs_runtime.h"
 #include "ue2common.h"
-#include "util/cpuid_inline.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_inline.h"
+#endif
 #include "util/join.h"

 #if defined(DISABLE_AVX512_DISPATCH)
--- a/src/hs.cpp
+++ b/src/hs.cpp
@@ -44,8 +44,10 @@
 #include "parser/prefilter.h"
 #include "parser/unsupported.h"
 #include "util/compile_error.h"
-#include "util/cpuid_flags.h"
-#include "util/cpuid_inline.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_flags.h"
+#include "util/arch/x86/cpuid_inline.h"
+#endif
 #include "util/depth.h"
 #include "util/popcount.h"
 #include "util/target_info.h"
--- a/src/hs_valid_platform.c
+++ b/src/hs_valid_platform.c
@@ -26,9 +26,11 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#include "config.h"
 #include "hs_common.h"
-#include "util/cpuid_flags.h"
-#include "util/cpuid_inline.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_inline.h"
+#endif

 HS_PUBLIC_API
 hs_error_t HS_CDECL hs_valid_platform(void) {
--- a/src/util/arch/x86/cpuid_flags.c
+++ b/src/util/arch/x86/cpuid_flags.c
--- a/src/util/arch/x86/cpuid_flags.h
+++ b/src/util/arch/x86/cpuid_flags.h
--- a/src/util/arch/x86/cpuid_inline.h
+++ b/src/util/arch/x86/cpuid_inline.h
--- a/src/util/target_info.cpp
+++ b/src/util/target_info.cpp
@@ -29,7 +29,9 @@

 #include "hs_compile.h" // for various hs_platform_info flags
 #include "target_info.h"
-#include "util/cpuid_flags.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_flags.h"
+#endif

 namespace ue2 {