aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-12 23:29:24 -0300
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-15 00:04:41 -0300
commit52158c1b8dccd3b469ab502a42a46a1d277928aa (patch)
tree7232d68efcb7d0570a12f628cf6a8634c7e51ed1 /src/core/memory.cpp
parentec514b16a66c0aca19e3f641836d836eacd59e75 (diff)
Memory: Read SharedPage directly from Memory::Read
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index aee1674b..8570689d 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)) {