diff options
| author | Zopolis4 <creatorsmithmdt@gmail.com> | 2022-08-08 10:18:36 +1000 |
|---|---|---|
| committer | Zopolis4 <creatorsmithmdt@gmail.com> | 2023-11-28 23:03:20 +1100 |
| commit | f0d2ce4683abc5eece182802a6b78a3c6ec579f6 (patch) | |
| tree | d0a4af508b78e0b802886970f93a6d213c46f41d /Source/Core/Common | |
| parent | 69fc7bbdad2a6b41a9cce99a61fd25c0fc166a41 (diff) | |
Remove _M_X86 in favour of _M_X86_64
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Hash.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Intrinsics.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index d3e635925e..2c4ec7a6f1 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -220,7 +220,7 @@ if(_M_ARM_64) ArmFPURoundMode.cpp ) else() - if(_M_X86) #X86 + if(_M_X86_64) #X86 target_sources(common PRIVATE x64ABI.cpp x64ABI.h diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index 51182a0463..683efc54fc 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -359,7 +359,7 @@ static u64 GetHash64_SSE42_CRC32(const u8* src, u32 len, u32 samples) return h[0] + (h[1] << 10) + (h[2] << 21) + (h[3] << 32); } -#elif defined(_M_X86) +#elif defined(_M_X86_64) FUNCTION_TARGET_SSE42 static u64 GetHash64_SSE42_CRC32(const u8* src, u32 len, u32 samples) @@ -433,7 +433,7 @@ static u64 SetHash64Function(const u8* src, u32 len, u32 samples) { if (cpu_info.bCRC32) { -#if defined(_M_X86_64) || defined(_M_X86) +#if defined(_M_X86_64) s_texture_hash_func = &GetHash64_SSE42_CRC32; #elif defined(_M_ARM_64) s_texture_hash_func = &GetHash64_ARMv8_CRC32; diff --git a/Source/Core/Common/Intrinsics.h b/Source/Core/Common/Intrinsics.h index 0a6e477bb7..f81bd49755 100644 --- a/Source/Core/Common/Intrinsics.h +++ b/Source/Core/Common/Intrinsics.h @@ -3,7 +3,7 @@ #pragma once -#if defined(_M_X86) +#if defined(_M_X86_64) /** * It is assumed that all compilers used to build Dolphin support intrinsics up to and including @@ -49,13 +49,13 @@ #endif // defined(_MSC_VER) || defined(__INTEL_COMPILER) -#endif // _M_X86 +#endif // _M_X86_64 /** * Define the FUNCTION_TARGET macros to nothing if they are not needed, or not on an X86 platform. * This way when a function is defined with FUNCTION_TARGET you don't need to define a second * version without the macro around a #ifdef guard. Be careful when using intrinsics, as all use - * should still be placed around a #ifdef _M_X86 if the file is compiled on all architectures. + * should still be placed around a #ifdef _M_X86_64 if the file is compiled on all architectures. */ #ifndef FUNCTION_TARGET_SSE42 #define FUNCTION_TARGET_SSE42 |