piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 69fc7bbdad
commit f0d2ce4683
16 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/UICommon/CMakeLists.txt
View File

@ -38,7 +38,7 @@ PRIVATE
)
if ((DEFINED CMAKE_ANDROID_ARCH_ABI AND CMAKE_ANDROID_ARCH_ABI MATCHES "x86|x86_64") OR
(NOT DEFINED CMAKE_ANDROID_ARCH_ABI AND _M_X86))
(NOT DEFINED CMAKE_ANDROID_ARCH_ABI AND _M_X86_64))
target_link_libraries(uicommon PRIVATE bdisasm)
endif()

6
Source/Core/UICommon/Disassembler.cpp
View File

@ -9,7 +9,7 @@
#include <fmt/format.h>
#include <llvm-c/Disassembler.h>
#include <llvm-c/Target.h>
#elif defined(_M_X86)
#elif defined(_M_X86_64)
#include <disasm.h> // Bochs
#endif
@ -117,7 +117,7 @@ std::string HostDisassemblerLLVM::DisassembleHostBlock(const u8* code_start, con
return x86_disasm.str();
}
#elif defined(_M_X86)
#elif defined(_M_X86_64)
class HostDisassemblerX86 : public HostDisassembler
{
public:
@ -163,7 +163,7 @@ std::unique_ptr<HostDisassembler> GetNewDisassembler(const std::string& arch)
return std::make_unique<HostDisassemblerLLVM>("aarch64-none-unknown", 4, "cortex-a57");
if (arch == "armv7")
return std::make_unique<HostDisassemblerLLVM>("armv7-none-unknown", 4, "cortex-a15");
#elif defined(_M_X86)
#elif defined(_M_X86_64)
if (arch == "x86")
return std::make_unique<HostDisassemblerX86>();
#endif