diff options
| author | bunnei <bunneidev@gmail.com> | 2022-11-10 17:11:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 17:11:27 -0800 |
| commit | d05b183f2118a5e2c919c35023549f30201bdd7c (patch) | |
| tree | 082cf6bb2e372c3233872b836fa96bdc0c25f279 /src/core/arm/exclusive_monitor.cpp | |
| parent | 83eb9cf7dabc7685215b423ffae9a650fa9a3f50 (diff) | |
| parent | cbaf642ffe4b05f8796798ebdc5c6892605928cc (diff) | |
Merge pull request #9198 from liamwhite/arm64
Initial ARM64 support
Diffstat (limited to 'src/core/arm/exclusive_monitor.cpp')
| -rw-r--r-- | src/core/arm/exclusive_monitor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/exclusive_monitor.cpp b/src/core/arm/exclusive_monitor.cpp index 2db0b035d..20550faeb 100644 --- a/src/core/arm/exclusive_monitor.cpp +++ b/src/core/arm/exclusive_monitor.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#ifdef ARCHITECTURE_x86_64 +#if defined(ARCHITECTURE_x86_64) || defined(ARCHITECTURE_arm64) #include "core/arm/dynarmic/arm_exclusive_monitor.h" #endif #include "core/arm/exclusive_monitor.h" @@ -13,7 +13,7 @@ ExclusiveMonitor::~ExclusiveMonitor() = default; std::unique_ptr<Core::ExclusiveMonitor> MakeExclusiveMonitor(Memory::Memory& memory, std::size_t num_cores) { -#ifdef ARCHITECTURE_x86_64 +#if defined(ARCHITECTURE_x86_64) || defined(ARCHITECTURE_arm64) return std::make_unique<Core::DynarmicExclusiveMonitor>(memory, num_cores); #else // TODO(merry): Passthrough exclusive monitor |