diff options
author | Zhuowei Zhang <zhuoweizhang@yahoo.com> | 2015-01-02 06:41:34 +0100 |
---|---|---|
committer | Zhuowei Zhang <zhuoweizhang@yahoo.com> | 2015-01-16 04:16:13 +0100 |
commit | edb8450420149cc5fa11dfd2fd2c0c3cd20beffa (patch) | |
tree | 00f7e56449ae0a64f80b9573a2f2e2ade7457ff5 /src/core/mem_map_funcs.cpp | |
parent | Merge pull request #441 from Kingcom/CallStack (diff) | |
download | yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar.gz yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar.bz2 yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar.lz yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar.xz yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar.zst yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/mem_map_funcs.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 97ef1c5a3..0e3b81b28 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -9,6 +9,7 @@ #include "core/mem_map.h" #include "core/hw/hw.h" #include "hle/config_mem.h" +#include "hle/shared_page.h" namespace Memory { @@ -82,6 +83,10 @@ inline void Read(T &var, const VAddr vaddr) { } else if ((vaddr >= CONFIG_MEMORY_VADDR) && (vaddr < CONFIG_MEMORY_VADDR_END)) { ConfigMem::Read<T>(var, vaddr); + // Shared page + } else if ((vaddr >= SHARED_PAGE_VADDR) && (vaddr < SHARED_PAGE_VADDR_END)) { + SharedPage::Read<T>(var, vaddr); + // DSP memory } else if ((vaddr >= DSP_MEMORY_VADDR) && (vaddr < DSP_MEMORY_VADDR_END)) { var = *((const T*)&g_dsp_mem[vaddr - DSP_MEMORY_VADDR]); |