diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2016-12-31 15:01:30 +0100 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2017-02-03 18:32:47 +0100 |
commit | 2b36d4c9d773381b91c2251b0e8f890d6f6f090a (patch) | |
tree | 414c9fbd44d8d1835b1af3fd5c20ca2b2f69aa75 /src/core/arm/dynarmic/arm_dynarmic.cpp | |
parent | Support looping HLE audio (#2422) (diff) | |
download | yuzu-2b36d4c9d773381b91c2251b0e8f890d6f6f090a.tar yuzu-2b36d4c9d773381b91c2251b0e8f890d6f6f090a.tar.gz yuzu-2b36d4c9d773381b91c2251b0e8f890d6f6f090a.tar.bz2 yuzu-2b36d4c9d773381b91c2251b0e8f890d6f6f090a.tar.lz yuzu-2b36d4c9d773381b91c2251b0e8f890d6f6f090a.tar.xz yuzu-2b36d4c9d773381b91c2251b0e8f890d6f6f090a.tar.zst yuzu-2b36d4c9d773381b91c2251b0e8f890d6f6f090a.zip |
Diffstat (limited to 'src/core/arm/dynarmic/arm_dynarmic.cpp')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 9f25e3b00..99f4d4ab4 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -7,6 +7,7 @@ #include "common/assert.h" #include "common/microprofile.h" #include "core/arm/dynarmic/arm_dynarmic.h" +#include "core/arm/dynarmic/arm_dynarmic_cp15.h" #include "core/arm/dyncom/arm_dyncom_interpreter.h" #include "core/core.h" #include "core/core_timing.h" @@ -39,10 +40,11 @@ static bool IsReadOnlyMemory(u32 vaddr) { return false; } -static Dynarmic::UserCallbacks GetUserCallbacks(ARMul_State* interpeter_state) { +static Dynarmic::UserCallbacks GetUserCallbacks( + const std::shared_ptr<ARMul_State>& interpeter_state) { Dynarmic::UserCallbacks user_callbacks{}; user_callbacks.InterpreterFallback = &InterpreterFallback; - user_callbacks.user_arg = static_cast<void*>(interpeter_state); + user_callbacks.user_arg = static_cast<void*>(interpeter_state.get()); user_callbacks.CallSVC = &SVC::CallSVC; user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory; user_callbacks.MemoryReadCode = &Memory::Read32; @@ -55,12 +57,13 @@ static Dynarmic::UserCallbacks GetUserCallbacks(ARMul_State* interpeter_state) { user_callbacks.MemoryWrite32 = &Memory::Write32; user_callbacks.MemoryWrite64 = &Memory::Write64; user_callbacks.page_table = Memory::GetCurrentPageTablePointers(); + user_callbacks.coprocessors[15] = std::make_shared<DynarmicCP15>(interpeter_state); return user_callbacks; } ARM_Dynarmic::ARM_Dynarmic(PrivilegeMode initial_mode) { - interpreter_state = std::make_unique<ARMul_State>(initial_mode); - jit = std::make_unique<Dynarmic::Jit>(GetUserCallbacks(interpreter_state.get())); + interpreter_state = std::make_shared<ARMul_State>(initial_mode); + jit = std::make_unique<Dynarmic::Jit>(GetUserCallbacks(interpreter_state)); } void ARM_Dynarmic::SetPC(u32 pc) { |