diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2017-02-03 00:31:07 +0100 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2017-02-03 18:32:51 +0100 |
| commit | e2815408fd6a21b701fa94fd3391e93b638aa912 (patch) | |
| tree | 85ab27b63d02df2d5da6b08937acb501bf5b95b3 /src/core/arm | |
| parent | arm_dynarmic: CP15 support (diff) | |
| download | yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar.gz yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar.bz2 yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar.lz yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar.xz yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.tar.zst yuzu-e2815408fd6a21b701fa94fd3391e93b638aa912.zip | |
Diffstat (limited to 'src/core/arm')
| -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( user_callbacks.InterpreterFallback = &InterpreterFallback; user_callbacks.user_arg = static_cast<void*>(interpeter_state.get()); 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; - user_callbacks.MemoryRead64 = &Memory::Read64; - user_callbacks.MemoryWrite8 = &Memory::Write8; - user_callbacks.MemoryWrite16 = &Memory::Write16; - user_callbacks.MemoryWrite32 = &Memory::Write32; - user_callbacks.MemoryWrite64 = &Memory::Write64; + user_callbacks.memory.IsReadOnlyMemory = &IsReadOnlyMemory; + user_callbacks.memory.ReadCode = &Memory::Read32; + user_callbacks.memory.Read8 = &Memory::Read8; + user_callbacks.memory.Read16 = &Memory::Read16; + user_callbacks.memory.Read32 = &Memory::Read32; + user_callbacks.memory.Read64 = &Memory::Read64; + user_callbacks.memory.Write8 = &Memory::Write8; + user_callbacks.memory.Write16 = &Memory::Write16; + user_callbacks.memory.Write32 = &Memory::Write32; + user_callbacks.memory.Write64 = &Memory::Write64; user_callbacks.page_table = Memory::GetCurrentPageTablePointers(); user_callbacks.coprocessors[15] = std::make_shared<DynarmicCP15>(interpeter_state); return user_callbacks; |