diff options
| author |  MerryMage | 2017-02-02 23:31:07 +0000 |
|---|---|---|
| committer | MerryMage | 2017-02-03 17:32:51 +0000 |
| commit | e2815408fd6a21b701fa94fd3391e93b638aa912 (patch) | |
| tree | 85ab27b63d02df2d5da6b08937acb501bf5b95b3 /src/core | |
| parent | arm_dynarmic: CP15 support (diff) | |
| download | yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar.gz yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar.xz yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.zip | |
arm_dynarmic: Update memory interface
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 99f4d4ab4..7d2790b08 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -46,16 +46,16 @@ static Dynarmic::UserCallbacks GetUserCallbacks( | |||
| 46 | user_callbacks.InterpreterFallback = &InterpreterFallback; | 46 | user_callbacks.InterpreterFallback = &InterpreterFallback; |
| 47 | user_callbacks.user_arg = static_cast<void*>(interpeter_state.get()); | 47 | user_callbacks.user_arg = static_cast<void*>(interpeter_state.get()); |
| 48 | user_callbacks.CallSVC = &SVC::CallSVC; | 48 | user_callbacks.CallSVC = &SVC::CallSVC; |
| 49 | user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory; | 49 | user_callbacks.memory.IsReadOnlyMemory = &IsReadOnlyMemory; |
| 50 | user_callbacks.MemoryReadCode = &Memory::Read32; | 50 | user_callbacks.memory.ReadCode = &Memory::Read32; |
| 51 | user_callbacks.MemoryRead8 = &Memory::Read8; | 51 | user_callbacks.memory.Read8 = &Memory::Read8; |
| 52 | user_callbacks.MemoryRead16 = &Memory::Read16; | 52 | user_callbacks.memory.Read16 = &Memory::Read16; |
| 53 | user_callbacks.MemoryRead32 = &Memory::Read32; | 53 | user_callbacks.memory.Read32 = &Memory::Read32; |
| 54 | user_callbacks.MemoryRead64 = &Memory::Read64; | 54 | user_callbacks.memory.Read64 = &Memory::Read64; |
| 55 | user_callbacks.MemoryWrite8 = &Memory::Write8; | 55 | user_callbacks.memory.Write8 = &Memory::Write8; |
| 56 | user_callbacks.MemoryWrite16 = &Memory::Write16; | 56 | user_callbacks.memory.Write16 = &Memory::Write16; |
| 57 | user_callbacks.MemoryWrite32 = &Memory::Write32; | 57 | user_callbacks.memory.Write32 = &Memory::Write32; |
| 58 | user_callbacks.MemoryWrite64 = &Memory::Write64; | 58 | user_callbacks.memory.Write64 = &Memory::Write64; |
| 59 | user_callbacks.page_table = Memory::GetCurrentPageTablePointers(); | 59 | user_callbacks.page_table = Memory::GetCurrentPageTablePointers(); |
| 60 | user_callbacks.coprocessors[15] = std::make_shared<DynarmicCP15>(interpeter_state); | 60 | user_callbacks.coprocessors[15] = std::make_shared<DynarmicCP15>(interpeter_state); |
| 61 | return user_callbacks; | 61 | return user_callbacks; |