From 450341b397766caa32138882acb52790f4120963 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 26 Jan 2020 10:28:23 -0400 Subject: ArmInterface: Delegate Exclusive monitor factory to exclusive monitor interfasce. --- src/core/arm/exclusive_monitor.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/core/arm/exclusive_monitor.cpp') 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 MakeExclusiveMonitor(Memory::Memory& memory, std::size_t num_cores) { +#ifdef ARCHITECTURE_x86_64 + return std::make_unique(memory, num_cores); +#else + // TODO(merry): Passthrough exclusive monitor + return nullptr; +#endif +} + } // namespace Core -- cgit v1.2.3 From 2d1984c20c75e03ec79eeb3806b12efa1679b977 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 26 Jan 2020 16:14:18 -0400 Subject: System: Address Feedback --- src/core/arm/exclusive_monitor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core/arm/exclusive_monitor.cpp') diff --git a/src/core/arm/exclusive_monitor.cpp b/src/core/arm/exclusive_monitor.cpp index 00e6a19d5..94570e520 100644 --- a/src/core/arm/exclusive_monitor.cpp +++ b/src/core/arm/exclusive_monitor.cpp @@ -12,7 +12,8 @@ namespace Core { ExclusiveMonitor::~ExclusiveMonitor() = default; -std::unique_ptr MakeExclusiveMonitor(Memory::Memory& memory, std::size_t num_cores) { +std::unique_ptr MakeExclusiveMonitor(Memory::Memory& memory, + std::size_t num_cores) { #ifdef ARCHITECTURE_x86_64 return std::make_unique(memory, num_cores); #else -- cgit v1.2.3