From f19a66d2d31f6a912e1ac7b96ab276257b51e19a Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 3 Sep 2025 18:37:45 +0000 Subject: [PATCH] [nce] fix macos Signed-off-by: lizzie --- src/dynarmic/src/dynarmic/CMakeLists.txt | 3 +-- src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dynarmic/src/dynarmic/CMakeLists.txt b/src/dynarmic/src/dynarmic/CMakeLists.txt index 8aa0f41afa..5a922b0a95 100644 --- a/src/dynarmic/src/dynarmic/CMakeLists.txt +++ b/src/dynarmic/src/dynarmic/CMakeLists.txt @@ -339,8 +339,7 @@ elseif (APPLE) "${MACH_EXC_DEFS_DIR}/mach/mach_exc.defs" ) target_sources(dynarmic PRIVATE - backend/exception_handler_macos.cpp - backend/exception_handler_macos_mig.c + backend/exception_handler_posix.cpp ) endif() elseif (UNIX) diff --git a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp index 26be5d5ae3..52f1de0c0a 100644 --- a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp +++ b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp @@ -191,11 +191,11 @@ private: ExceptionHandler::ExceptionHandler() = default; ExceptionHandler::~ExceptionHandler() = default; -#if defined(MCL_ARCHITECTURE_X86_64) +#if defined(ARCHITECTURE_x86_64) void ExceptionHandler::Register(X64::BlockOfCode& code) { impl = std::make_unique(mcl::bit_cast(code.getCode()), code.GetTotalCodeSize()); } -#elif defined(MCL_ARCHITECTURE_ARM64) +#elif defined(ARCHITECTURE_arm64) void ExceptionHandler::Register(oaknut::CodeBlock& mem, std::size_t size) { impl = std::make_unique(mcl::bit_cast(mem.ptr()), size); }