citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #2366 from MerryMage/MemoryReadCode 

arm_dynarmic: Provide MemoryReadCode callback
This commit is contained in:
bunnei 2016-12-22 14:25:15 -05:00 committed by GitHub
parent aa47af7fb6 f8cf87ce34
commit 76890672a0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/dynarmic vendored

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

1
src/core/arm/dynarmic/arm_dynarmic.cpp
View File

@ -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;