diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 95a7422a84..04d4de9ce4 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -255,7 +255,7 @@ endif() add_subdirectory(nx_tzdb) # PowerPC emitter -if (ARCHITECTURE_ppc64) +if (ARCHITECTURE_powerpc64) add_subdirectory(powah) endif() diff --git a/externals/cmake-modules/DetectArchitecture.cmake b/externals/cmake-modules/DetectArchitecture.cmake index 105963c8c2..3d6e933d76 100644 --- a/externals/cmake-modules/DetectArchitecture.cmake +++ b/externals/cmake-modules/DetectArchitecture.cmake @@ -166,7 +166,7 @@ detect_architecture_symbols( "_M_MRX000") detect_architecture_symbols( - ARCH ppc64 + ARCH powerpc64 SYMBOLS "__ppc64__" "__powerpc64__" @@ -174,7 +174,7 @@ detect_architecture_symbols( "_M_PPC64") detect_architecture_symbols( - ARCH ppc + ARCH powerpc SYMBOLS "__ppc__" "__ppc" diff --git a/externals/powah/tests.cpp b/externals/powah/tests.cpp index ce3ea9933c..e65f293175 100644 --- a/externals/powah/tests.cpp +++ b/externals/powah/tests.cpp @@ -253,7 +253,7 @@ TEST_CASE("ppc64: functor-1", "[ppc64]") { REQUIRE(data[15] == EB32(0x2000804e)); } -#if defined(ARCHITECTURE_ppc64) +#if defined(ARCHITECTURE_powerpc64) /* 0: d619637c mullw 3, 3, 3 4: 20006378 clrldi 3, 3, 32 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 02217af5c7..2d60b1e1c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(.) # Dynarmic -if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64 OR ARCHITECTURE_loongarch64 OR ARCHITECTURE_ppc64) AND NOT YUZU_STATIC_ROOM) +if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64 OR ARCHITECTURE_loongarch64 OR ARCHITECTURE_powerpc64) AND NOT YUZU_STATIC_ROOM) add_subdirectory(dynarmic) add_library(dynarmic::dynarmic ALIAS dynarmic) endif() diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 6dbd0adf71..8399b82463 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1251,7 +1251,7 @@ if (HAS_NCE) target_link_libraries(core PRIVATE merry::oaknut) endif() -if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64 OR ARCHITECTURE_ppc64 OR ARCHITECTURE_powerpc64) +if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64 OR ARCHITECTURE_riscv64 OR ARCHITECTURE_powerpc64 OR ARCHITECTURE_powerpc64) target_sources(core PRIVATE arm/dynarmic/arm_dynarmic.h arm/dynarmic/arm_dynarmic_64.cpp diff --git a/src/dynarmic/src/dynarmic/backend/exception_handler.h b/src/dynarmic/src/dynarmic/backend/exception_handler.h index f854e42c82..772e2c138e 100644 --- a/src/dynarmic/src/dynarmic/backend/exception_handler.h +++ b/src/dynarmic/src/dynarmic/backend/exception_handler.h @@ -30,7 +30,7 @@ class CodeBlock; namespace Dynarmic::Backend::LoongArch64 { class CodeBlock; } // namespace Dynarmic::Backend::LoongArch64 -#elif defined(ARCHITECTURE_ppc64) +#elif defined(ARCHITECTURE_powerpc64) namespace Dynarmic::Backend::PPC64 { class CodeBlock; } @@ -57,7 +57,7 @@ struct FakeCall { struct FakeCall { u64 call_pc; }; -#elif defined(ARCHITECTURE_ppc64) +#elif defined(ARCHITECTURE_powerpc64) struct FakeCall { }; #else @@ -77,7 +77,7 @@ public: void Register(RV64::CodeBlock& mem, std::size_t mem_size); #elif defined(ARCHITECTURE_loongarch64) void Register(LoongArch64::CodeBlock& mem, std::size_t mem_size); -#elif defined(ARCHITECTURE_ppc64) +#elif defined(ARCHITECTURE_powerpc64) void Register(PPC64::CodeBlock& mem, std::size_t mem_size); #else # error "Invalid architecture" diff --git a/src/dynarmic/src/dynarmic/backend/exception_handler_generic.cpp b/src/dynarmic/src/dynarmic/backend/exception_handler_generic.cpp index c18481a688..9e92ff1ffa 100644 --- a/src/dynarmic/src/dynarmic/backend/exception_handler_generic.cpp +++ b/src/dynarmic/src/dynarmic/backend/exception_handler_generic.cpp @@ -24,7 +24,7 @@ void ExceptionHandler::Register(oaknut::CodeBlock&, std::size_t) void ExceptionHandler::Register(RV64::CodeBlock&, std::size_t) #elif defined(ARCHITECTURE_loongarch64) void ExceptionHandler::Register(LoongArch64::CodeBlock&, std::size_t) -#elif defined(ARCHITECTURE_ppc64) +#elif defined(ARCHITECTURE_powerpc64) void ExceptionHandler::Register(PPC64::CodeBlock&, std::size_t) #else # error "Invalid architecture" diff --git a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp index 3d7fd8eb21..14015a55f6 100644 --- a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp +++ b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp @@ -35,7 +35,7 @@ # include "dynarmic/backend/riscv64/code_block.h" #elif defined(ARCHITECTURE_loongarch64) # include "dynarmic/backend/loongarch64/code_block.h" -#elif defined(ARCHITECTURE_ppc64) +#elif defined(ARCHITECTURE_powerpc64) # include "dynarmic/backend/ppc64/code_block.h" #else # error "Invalid architecture" @@ -233,7 +233,7 @@ void ExceptionHandler::Register(RV64::CodeBlock& mem, std::size_t size) { void ExceptionHandler::Register(LoongArch64::CodeBlock& mem, std::size_t size) { impl = std::make_unique(std::bit_cast(mem.ptr()), size); } -#elif defined(ARCHITECTURE_ppc64) +#elif defined(ARCHITECTURE_powerpc64) void ExceptionHandler::Register(PPC64::CodeBlock& mem, std::size_t size) { impl = std::make_unique(std::bit_cast(mem.ptr()), size); } diff --git a/src/dynarmic/src/dynarmic/common/context.h b/src/dynarmic/src/dynarmic/common/context.h index 87b8febc17..db7af8e0ae 100644 --- a/src/dynarmic/src/dynarmic/common/context.h +++ b/src/dynarmic/src/dynarmic/common/context.h @@ -148,7 +148,7 @@ # else # error "unknown platform" # endif -#elif defined(ARCHITECTURE_ppc64) +#elif defined(ARCHITECTURE_powerpc64) # if defined(__FreeBSD__) # define CTX_PC (mctx.mc_srr0) # define CTX_SP (mctx.mc_gpr[1])