diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-01-26 15:28:23 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-01-26 15:28:23 +0100 |
commit | 450341b397766caa32138882acb52790f4120963 (patch) | |
tree | 141d9ddddd6f585c1df8fc2a1465f473bebc354b /src/core/arm | |
parent | Core: Refactor CPU Management. (diff) | |
download | yuzu-450341b397766caa32138882acb52790f4120963.tar yuzu-450341b397766caa32138882acb52790f4120963.tar.gz yuzu-450341b397766caa32138882acb52790f4120963.tar.bz2 yuzu-450341b397766caa32138882acb52790f4120963.tar.lz yuzu-450341b397766caa32138882acb52790f4120963.tar.xz yuzu-450341b397766caa32138882acb52790f4120963.tar.zst yuzu-450341b397766caa32138882acb52790f4120963.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/exclusive_monitor.cpp | 13 | ||||
-rw-r--r-- | src/core/arm/exclusive_monitor.h | 10 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/core/arm/exclusive_monitor.cpp b/src/core/arm/exclusive_monitor.cpp index abd59ff4b..00e6a19d5 100644 --- a/src/core/arm/exclusive_monitor.cpp +++ b/src/core/arm/exclusive_monitor.cpp @@ -2,10 +2,23 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#ifdef ARCHITECTURE_x86_64 +#include "core/arm/dynarmic/arm_dynarmic.h" +#endif #include "core/arm/exclusive_monitor.h" +#include "core/memory.h" namespace Core { ExclusiveMonitor::~ExclusiveMonitor() = default; +std::unique_ptr<Core::ExclusiveMonitor> MakeExclusiveMonitor(Memory::Memory& memory, std::size_t num_cores) { +#ifdef ARCHITECTURE_x86_64 + return std::make_unique<Core::DynarmicExclusiveMonitor>(memory, num_cores); +#else + // TODO(merry): Passthrough exclusive monitor + return nullptr; +#endif +} + } // namespace Core diff --git a/src/core/arm/exclusive_monitor.h b/src/core/arm/exclusive_monitor.h index f59aca667..18461f296 100644 --- a/src/core/arm/exclusive_monitor.h +++ b/src/core/arm/exclusive_monitor.h @@ -1,11 +1,17 @@ -// Copyright 2018 yuzu emulator team +// Copyright 2020 yuzu emulator team // Licensed under GPLv2 or any later version // Refer to the license.txt file included. #pragma once +#include <memory> + #include "common/common_types.h" +namespace Memory { +class Memory; +} + namespace Core { class ExclusiveMonitor { @@ -22,4 +28,6 @@ public: virtual bool ExclusiveWrite128(std::size_t core_index, VAddr vaddr, u128 value) = 0; }; +std::unique_ptr<Core::ExclusiveMonitor> MakeExclusiveMonitor(Memory::Memory& memory, std::size_t num_cores); + } // namespace Core |