From f298f00e1b3dfd14eeeac65524c9703f0758fa5a Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Mon, 23 Feb 2015 20:40:05 +0100 Subject: [PATCH] Clean up the intrinsics #ifdef mess --- Source/Core/Common/Atomic_Win32.h | 2 +- Source/Core/Common/Hash.cpp | 6 ++---- Source/Core/Common/x64CPUDetect.cpp | 8 ++------ Source/Core/Common/x64FPURoundMode.cpp | 7 +------ Source/Core/Core/DSP/DSPHWInterface.cpp | 5 +---- Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp | 3 +-- Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp | 3 +-- Source/Core/VideoBackends/OGL/TextureCache.cpp | 4 ---- Source/Core/VideoCommon/TextureDecoder_x64.cpp | 8 +------- Source/Core/VideoCommon/VertexLoaderX64.cpp | 7 +------ 10 files changed, 11 insertions(+), 42 deletions(-) diff --git a/Source/Core/Common/Atomic_Win32.h b/Source/Core/Common/Atomic_Win32.h index ee763aaea2..17afb8c8cc 100644 --- a/Source/Core/Common/Atomic_Win32.h +++ b/Source/Core/Common/Atomic_Win32.h @@ -6,10 +6,10 @@ #pragma once -#include #include #include "Common/Common.h" +#include "Common/Intrinsics.h" // Atomic operations are performed in a single step by the CPU. It is // impossible for other threads to see the operation "half-done." diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index 63caced040..7efc4549d7 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -4,11 +4,9 @@ #include #include "Common/CommonFuncs.h" -#include "Common/Hash.h" -#if _M_SSE >= 0x402 #include "Common/CPUDetect.h" -#include -#endif +#include "Common/Hash.h" +#include "Common/Intrinsics.h" static u64 (*ptrHashFunction)(const u8 *src, u32 len, u32 samples) = &GetMurmurHash3; diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp index 8ad8046c8b..d4d3eba05e 100644 --- a/Source/Core/Common/x64CPUDetect.cpp +++ b/Source/Core/Common/x64CPUDetect.cpp @@ -7,13 +7,9 @@ #include "Common/CommonTypes.h" #include "Common/CPUDetect.h" +#include "Common/Intrinsics.h" -#ifdef _WIN32 -#include -#else - -//#include -#include +#ifndef _WIN32 #if defined __FreeBSD__ #include diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp index 90143d7e13..b04579b850 100644 --- a/Source/Core/Common/x64FPURoundMode.cpp +++ b/Source/Core/Common/x64FPURoundMode.cpp @@ -7,12 +7,7 @@ #include "Common/CommonTypes.h" #include "Common/CPUDetect.h" #include "Common/FPURoundMode.h" - -#ifdef _WIN32 -# include -#else -# include -#endif +#include "Common/Intrinsics.h" namespace FPURoundMode { diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp index fc133484b8..b9d41f8c1e 100644 --- a/Source/Core/Core/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/DSP/DSPHWInterface.cpp @@ -25,6 +25,7 @@ #include "Common/Atomic.h" #include "Common/CPUDetect.h" +#include "Common/Intrinsics.h" #include "Common/MemoryUtil.h" #include "Common/Thread.h" @@ -36,10 +37,6 @@ #include "Core/DSP/DSPInterpreter.h" #include "Core/DSP/DSPTables.h" -#if _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__) -#include -#endif - static void gdsp_do_dma(); void gdsp_ifx_init() diff --git a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp index d5e3646f18..3f2c86a0e2 100644 --- a/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp @@ -9,6 +9,7 @@ #include #include "Common/Common.h" +#include "Common/Intrinsics.h" #include "Common/StdMakeUnique.h" #include "Common/StringUtil.h" #include "Core/PatchEngine.h" @@ -135,11 +136,9 @@ ps_adds1 #ifdef _WIN32 #include -#include #else #include #include -#include #if defined(__clang__) #if !__has_builtin(__builtin_ia32_rdtsc) diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index dfda1c3917..6246dfa2ae 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -2,9 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include - #include "Common/CommonTypes.h" +#include "Common/Intrinsics.h" #include "Common/MathUtil.h" #include "Core/HW/MMIO.h" diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index e579909a9d..bfed930245 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -6,10 +6,6 @@ #include #include -#ifdef _WIN32 -#include -#endif - #include "Common/CommonPaths.h" #include "Common/FileUtil.h" #include "Common/Hash.h" diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index 9d0b75582f..4a1f0a36a6 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp @@ -8,18 +8,12 @@ #include "Common/Common.h" //#include "VideoCommon.h" // to get debug logs #include "Common/CPUDetect.h" +#include "Common/Intrinsics.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VideoConfig.h" -#if _M_SSE >= 0x401 -#include -#include -#elif _M_SSE >= 0x301 && !(defined __GNUC__ && !defined __SSSE3__) -#include -#endif - // This avoids a harmless warning from a system header in Clang; // see http://llvm.org/bugs/show_bug.cgi?id=16093 #if defined(__clang__) && (__clang_major__ * 100 + __clang_minor__ < 304) diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp index 5c962095bd..ae6623db90 100644 --- a/Source/Core/VideoCommon/VertexLoaderX64.cpp +++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp @@ -1,10 +1,5 @@ -#ifdef _MSC_VER -#include -#else -#include -#endif - #include "Common/CPUDetect.h" +#include "Common/Intrinsics.h" #include "Common/JitRegister.h" #include "Common/x64ABI.h" #include "VideoCommon/VertexLoaderX64.h"