diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-03-25 16:17:46 +0100 |
|---|---|---|
| committer | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-03-26 14:38:07 +0200 |
| commit | 7f50c070b232b68df04609f60f02db559e97cc4f (patch) | |
| tree | 56a5e524b73cf09ffa912fe086eea746e8ba9da9 /Source/Core | |
| parent | 9217a9eba4d3bd9d171bf812fd4b4318bc8a0b01 (diff) | |
JitInterface: Convert m_jit to unique_ptr.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/PowerPC/JitInterface.cpp | 19 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/JitInterface.h | 5 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index 2f56cf4a95..beec9559e6 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -46,9 +46,9 @@ JitInterface::JitInterface(Core::System& system) : m_system(system) JitInterface::~JitInterface() = default; -void JitInterface::SetJit(JitBase* jit) +void JitInterface::SetJit(std::unique_ptr<JitBase> jit) { - m_jit = jit; + m_jit = std::move(jit); } void JitInterface::DoState(PointerWrap& p) @@ -65,31 +65,31 @@ CPUCoreBase* JitInterface::InitJitCore(PowerPC::CPUCore core) { #if _M_X86 case PowerPC::CPUCore::JIT64: - m_jit = new Jit64(system); + m_jit = std::make_unique<Jit64>(system); break; #endif #if _M_ARM_64 case PowerPC::CPUCore::JITARM64: - m_jit = new JitArm64(system); + m_jit = std::make_unique<JitArm64>(system); break; #endif case PowerPC::CPUCore::CachedInterpreter: - m_jit = new CachedInterpreter(system); + m_jit = std::make_unique<CachedInterpreter>(system); break; default: // Under this case the caller overrides the CPU core to the default and logs that // it performed the override. - m_jit = nullptr; + m_jit.reset(); return nullptr; } m_jit->Init(); - return m_jit; + return m_jit.get(); } CPUCoreBase* JitInterface::GetCore() const { - return m_jit; + return m_jit.get(); } void JitInterface::SetProfilingState(ProfilingState state) @@ -319,7 +319,6 @@ void JitInterface::Shutdown() if (m_jit) { m_jit->Shutdown(); - delete m_jit; - m_jit = nullptr; + m_jit.reset(); } } diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h index 9551caadbc..1ba54cc2c9 100644 --- a/Source/Core/Core/PowerPC/JitInterface.h +++ b/Source/Core/Core/PowerPC/JitInterface.h @@ -3,6 +3,7 @@ #pragma once +#include <memory> #include <string> #include <variant> @@ -94,11 +95,11 @@ public: static void CompileExceptionCheckFromJIT(JitInterface& jit_interface, ExceptionType type); /// used for the page fault unit test, don't use outside of tests! - void SetJit(JitBase* jit); + void SetJit(std::unique_ptr<JitBase> jit); void Shutdown(); private: - JitBase* m_jit = nullptr; + std::unique_ptr<JitBase> m_jit; Core::System& m_system; }; |
