summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-12-22 20:25:15 +0100
committerGitHub <noreply@github.com>2016-12-22 20:25:15 +0100
commit76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8 (patch)
tree19f8051a39d913b8d4b7c7012ee48ba07df700fd
parentMerge pull request #2343 from bunnei/core-cleanup (diff)
parentarm_dynarmic: Provide MemoryReadCode callback (diff)
downloadyuzu-76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8.tar
yuzu-76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8.tar.gz
yuzu-76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8.tar.bz2
yuzu-76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8.tar.lz
yuzu-76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8.tar.xz
yuzu-76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8.tar.zst
yuzu-76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8.zip
m---------externals/dynarmic0
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp1
2 files changed, 1 insertions, 0 deletions
diff --git a/externals/dynarmic b/externals/dynarmic
-Subproject 34e19f135c0dd2feac4f77660f51aa4ea28a738
+Subproject 36082087ded632079b16d24137fdd0c450ce82e
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 5290382ff..9f25e3b00 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -45,6 +45,7 @@ static Dynarmic::UserCallbacks GetUserCallbacks(ARMul_State* interpeter_state) {
user_callbacks.user_arg = static_cast<void*>(interpeter_state);
user_callbacks.CallSVC = &SVC::CallSVC;
user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory;
+ user_callbacks.MemoryReadCode = &Memory::Read32;
user_callbacks.MemoryRead8 = &Memory::Read8;
user_callbacks.MemoryRead16 = &Memory::Read16;
user_callbacks.MemoryRead32 = &Memory::Read32;