diff options
| author |  Yuri Kunde Schlesner | 2015-05-12 23:29:24 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-15 00:04:41 -0300 |
| commit | 52158c1b8dccd3b469ab502a42a46a1d277928aa (patch) | |
| tree | 7232d68efcb7d0570a12f628cf6a8634c7e51ed1 /src/core/memory.cpp | |
| parent | Memory: Read ConfigMem directly from Memory::Read (diff) | |
| download | yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar.gz yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.tar.xz yuzu-52158c1b8dccd3b469ab502a42a46a1d277928aa.zip | |
Memory: Read SharedPage directly from Memory::Read
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) { | |||
| 47 | 47 | ||
| 48 | // Shared page | 48 | // Shared page |
| 49 | } else if ((vaddr >= SHARED_PAGE_VADDR) && (vaddr < SHARED_PAGE_VADDR_END)) { | 49 | } else if ((vaddr >= SHARED_PAGE_VADDR) && (vaddr < SHARED_PAGE_VADDR_END)) { |
| 50 | SharedPage::Read<T>(var, vaddr); | 50 | const u8* raw_memory = (const u8*)&SharedPage::shared_page; |
| 51 | var = *((const T*)&raw_memory[vaddr - SHARED_PAGE_VADDR]); | ||
| 51 | 52 | ||
| 52 | // DSP memory | 53 | // DSP memory |
| 53 | } else if ((vaddr >= DSP_RAM_VADDR) && (vaddr < DSP_RAM_VADDR_END)) { | 54 | } else if ((vaddr >= DSP_RAM_VADDR) && (vaddr < DSP_RAM_VADDR_END)) { |