summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-12-22 14:25:15 -0500
committerGitHub <noreply@github.com>2016-12-22 14:25:15 -0500
commit76890672a0bf38abd0b6fd7d898fbfd4a7ae86d8 (patch)
tree19f8051a39d913b8d4b7c7012ee48ba07df700fd
parentaa47af7fb6efd0bda54cca2373ed978e538f6d61 (diff)
parentf8cf87ce349d3e51d661cf49f00f1325e34bfefc (diff)
Merge pull request #2366 from MerryMage/MemoryReadCode
arm_dynarmic: Provide MemoryReadCode callback
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;