summaryrefslogtreecommitdiff
path: root/src/core/mem_map_funcs.cpp
diff options
context:
space:
mode:
authorGravatar Zhuowei Zhang2015-01-01 21:41:34 -0800
committerGravatar Zhuowei Zhang2015-01-15 22:16:13 -0500
commitedb8450420149cc5fa11dfd2fd2c0c3cd20beffa (patch)
tree00f7e56449ae0a64f80b9573a2f2e2ade7457ff5 /src/core/mem_map_funcs.cpp
parentMerge pull request #441 from Kingcom/CallStack (diff)
downloadyuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar.gz
yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.tar.xz
yuzu-edb8450420149cc5fa11dfd2fd2c0c3cd20beffa.zip
Add some support for the shared page (currently 3d slider is implemented)
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
-rw-r--r--src/core/mem_map_funcs.cpp5
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 @@
9#include "core/mem_map.h" 9#include "core/mem_map.h"
10#include "core/hw/hw.h" 10#include "core/hw/hw.h"
11#include "hle/config_mem.h" 11#include "hle/config_mem.h"
12#include "hle/shared_page.h"
12 13
13namespace Memory { 14namespace Memory {
14 15
@@ -82,6 +83,10 @@ inline void Read(T &var, const VAddr vaddr) {
82 } else if ((vaddr >= CONFIG_MEMORY_VADDR) && (vaddr < CONFIG_MEMORY_VADDR_END)) { 83 } else if ((vaddr >= CONFIG_MEMORY_VADDR) && (vaddr < CONFIG_MEMORY_VADDR_END)) {
83 ConfigMem::Read<T>(var, vaddr); 84 ConfigMem::Read<T>(var, vaddr);
84 85
86 // Shared page
87 } else if ((vaddr >= SHARED_PAGE_VADDR) && (vaddr < SHARED_PAGE_VADDR_END)) {
88 SharedPage::Read<T>(var, vaddr);
89
85 // DSP memory 90 // DSP memory
86 } else if ((vaddr >= DSP_MEMORY_VADDR) && (vaddr < DSP_MEMORY_VADDR_END)) { 91 } else if ((vaddr >= DSP_MEMORY_VADDR) && (vaddr < DSP_MEMORY_VADDR_END)) {
87 var = *((const T*)&g_dsp_mem[vaddr - DSP_MEMORY_VADDR]); 92 var = *((const T*)&g_dsp_mem[vaddr - DSP_MEMORY_VADDR]);