Просмотр исходного кода

Merge pull request #2366 from MerryMage/MemoryReadCode

arm_dynarmic: Provide MemoryReadCode callback
bunnei 9 лет назад
Родитель
Сommit
76890672a0
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 1
      externals/dynarmic
  2. 1 0
      src/core/arm/dynarmic/arm_dynarmic.cpp

+ 1 - 1
externals/dynarmic

@@ -1 +1 @@
-Subproject commit 34e19f135c0dd2feac4f77660f51aa4ea28a7386
+Subproject commit 36082087ded632079b16d24137fdd0c450ce82ea

+ 1 - 0
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.user_arg = static_cast<void*>(interpeter_state);
     user_callbacks.CallSVC = &SVC::CallSVC;
     user_callbacks.CallSVC = &SVC::CallSVC;
     user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory;
     user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory;
+    user_callbacks.MemoryReadCode = &Memory::Read32;
     user_callbacks.MemoryRead8 = &Memory::Read8;
     user_callbacks.MemoryRead8 = &Memory::Read8;
     user_callbacks.MemoryRead16 = &Memory::Read16;
     user_callbacks.MemoryRead16 = &Memory::Read16;
     user_callbacks.MemoryRead32 = &Memory::Read32;
     user_callbacks.MemoryRead32 = &Memory::Read32;