summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2016-12-22 16:55:51 +0100
committerMerryMage <MerryMage@users.noreply.github.com>2016-12-22 17:07:14 +0100
commitf8cf87ce349d3e51d661cf49f00f1325e34bfefc (patch)
treeb2f7085433ceef351600cc02d6c6ecf7fa15e2f6
parentMerge pull request #2285 from mailwl/csnd-format (diff)
downloadyuzu-f8cf87ce349d3e51d661cf49f00f1325e34bfefc.tar
yuzu-f8cf87ce349d3e51d661cf49f00f1325e34bfefc.tar.gz
yuzu-f8cf87ce349d3e51d661cf49f00f1325e34bfefc.tar.bz2
yuzu-f8cf87ce349d3e51d661cf49f00f1325e34bfefc.tar.lz
yuzu-f8cf87ce349d3e51d661cf49f00f1325e34bfefc.tar.xz
yuzu-f8cf87ce349d3e51d661cf49f00f1325e34bfefc.tar.zst
yuzu-f8cf87ce349d3e51d661cf49f00f1325e34bfefc.zip
Diffstat (limited to '')
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 fc4254670..f99fe08c4 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;