From ae963d75f8ac37dd870054c20ff14f4e5418f661 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Wed, 6 May 2015 23:18:04 -0300
Subject: [PATCH] Common: Move SSE detection ifdefs to platform.h
---
src/common/common.h | 16 ----------------
src/common/hash.cpp | 2 ++
src/common/platform.h | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/common/common.h b/src/common/common.h
index 00d1d14f94..e8d32bc937 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -39,20 +39,4 @@
#define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x
#endif
-#if defined _M_GENERIC
-# define _M_SSE 0x0
-#elif defined __GNUC__
-# if defined __SSE4_2__
-# define _M_SSE 0x402
-# elif defined __SSE4_1__
-# define _M_SSE 0x401
-# elif defined __SSSE3__
-# define _M_SSE 0x301
-# elif defined __SSE3__
-# define _M_SSE 0x300
-# endif
-#elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008
-# define _M_SSE 0x402
-#endif
-
#include "swap.h"
diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 0624dab8df..3e62beff41 100644
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -5,6 +5,8 @@
#include <algorithm>
#include "common/hash.h"
+#include "common/platform.h"
+
#if _M_SSE >= 0x402
#include "common/cpu_detect.h"
#include <nmmintrin.h>
diff --git a/src/common/platform.h b/src/common/platform.h
index fc680d549a..1516dc88a7 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -63,6 +63,25 @@
#define EMU_ARCHITECTURE_X86
#endif
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Feature detection
+
+#if defined _M_GENERIC
+# define _M_SSE 0x0
+#elif defined __GNUC__
+# if defined __SSE4_2__
+# define _M_SSE 0x402
+# elif defined __SSE4_1__
+# define _M_SSE 0x401
+# elif defined __SSSE3__
+# define _M_SSE 0x301
+# elif defined __SSE3__
+# define _M_SSE 0x300
+# endif
+#elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008
+# define _M_SSE 0x402
+#endif
+
////////////////////////////////////////////////////////////////////////////////////////////////////
// Compiler-Specific Definitions
--
GitLab