diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-13 04:29:24 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-15 05:04:41 +0200 |
| commit | 52158c1b8dccd3b469ab502a42a46a1d277928aa (patch) | |
| tree | 7232d68efcb7d0570a12f628cf6a8634c7e51ed1 /src/core/memory.cpp | |
| parent | Memory: Read ConfigMem directly from Memory::Read (diff) | |
| download | yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar.gz yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar.bz2 yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar.lz yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar.xz yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar.zst yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.zip | |
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index aee1674b6..8570689dd 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -47,7 +47,8 @@ inline void Read(T &var, const VAddr vaddr) { // Shared page } else if ((vaddr >= SHARED_PAGE_VADDR) && (vaddr < SHARED_PAGE_VADDR_END)) { - SharedPage::Read<T>(var, vaddr); + const u8* raw_memory = (const u8*)&SharedPage::shared_page; + var = *((const T*)&raw_memory[vaddr - SHARED_PAGE_VADDR]); // DSP memory } else if ((vaddr >= DSP_RAM_VADDR) && (vaddr < DSP_RAM_VADDR_END)) { |