summaryrefslogtreecommitdiff
path: root/src/core/mem_map_funcs.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-29 21:57:04 -0500
committerGravatar bunnei2014-12-29 21:57:04 -0500
commit78bb86293f3c04dff4d383f16d5e2d4a5c540a53 (patch)
treecff64cf20a4c84a290d2657f2b9d0de9e47e4ef1 /src/core/mem_map_funcs.cpp
parentMerge pull request #362 from bunnei/dyncom-cleanup (diff)
parentMemMap: Added AXI_WRAM & SHARED_PAGE along with other stuff (diff)
downloadyuzu-78bb86293f3c04dff4d383f16d5e2d4a5c540a53.tar.gz
yuzu-78bb86293f3c04dff4d383f16d5e2d4a5c540a53.tar.xz
yuzu-78bb86293f3c04dff4d383f16d5e2d4a5c540a53.zip
Merge pull request #253 from purpasmart96/mem_map
MemMap: Removed I/O address's and added more stuff
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
-rw-r--r--src/core/mem_map_funcs.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 0f378eaee..fdf382ed6 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -58,11 +58,6 @@ inline void Read(T &var, const VAddr vaddr) {
58 if (vaddr >= KERNEL_MEMORY_VADDR && vaddr < KERNEL_MEMORY_VADDR_END) { 58 if (vaddr >= KERNEL_MEMORY_VADDR && vaddr < KERNEL_MEMORY_VADDR_END) {
59 var = *((const T*)&g_kernel_mem[vaddr - KERNEL_MEMORY_VADDR]); 59 var = *((const T*)&g_kernel_mem[vaddr - KERNEL_MEMORY_VADDR]);
60 60
61 // Hardware I/O register reads
62 // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space
63 } else if ((vaddr >= HARDWARE_IO_VADDR) && (vaddr < HARDWARE_IO_VADDR_END)) {
64 HW::Read<T>(var, vaddr);
65
66 // ExeFS:/.code is loaded here 61 // ExeFS:/.code is loaded here
67 } else if ((vaddr >= EXEFS_CODE_VADDR) && (vaddr < EXEFS_CODE_VADDR_END)) { 62 } else if ((vaddr >= EXEFS_CODE_VADDR) && (vaddr < EXEFS_CODE_VADDR_END)) {
68 var = *((const T*)&g_exefs_code[vaddr - EXEFS_CODE_VADDR]); 63 var = *((const T*)&g_exefs_code[vaddr - EXEFS_CODE_VADDR]);
@@ -103,11 +98,6 @@ inline void Write(const VAddr vaddr, const T data) {
103 if (vaddr >= KERNEL_MEMORY_VADDR && vaddr < KERNEL_MEMORY_VADDR_END) { 98 if (vaddr >= KERNEL_MEMORY_VADDR && vaddr < KERNEL_MEMORY_VADDR_END) {
104 *(T*)&g_kernel_mem[vaddr - KERNEL_MEMORY_VADDR] = data; 99 *(T*)&g_kernel_mem[vaddr - KERNEL_MEMORY_VADDR] = data;
105 100
106 // Hardware I/O register writes
107 // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space
108 } else if ((vaddr >= HARDWARE_IO_VADDR) && (vaddr < HARDWARE_IO_VADDR_END)) {
109 HW::Write<T>(vaddr, data);
110
111 // ExeFS:/.code is loaded here 101 // ExeFS:/.code is loaded here
112 } else if ((vaddr >= EXEFS_CODE_VADDR) && (vaddr < EXEFS_CODE_VADDR_END)) { 102 } else if ((vaddr >= EXEFS_CODE_VADDR) && (vaddr < EXEFS_CODE_VADDR_END)) {
113 *(T*)&g_exefs_code[vaddr - EXEFS_CODE_VADDR] = data; 103 *(T*)&g_exefs_code[vaddr - EXEFS_CODE_VADDR] = data;