mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-27 04:36:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove _M_X86 in favour of _M_X86_64

Browse source
This commit is contained in:
Zopolis4 2022-08-08 10:18:36 +10:00
commit f0d2ce4683
No known key found for this signature in database
GPG key ID: C1117D56FBC82774
16 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Common/CMakeLists.txt
View file

@ -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

4
Source/Core/Common/Hash.cpp
View file

@ -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;

6
Source/Core/Common/Intrinsics.h
View file

@ -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