diff options
| author | 2014-12-03 21:36:32 -0800 | |
|---|---|---|
| committer | 2014-12-13 18:29:57 -0800 | |
| commit | 23ae8aa4d344fb5661b5801ae3dcdd709469a718 (patch) | |
| tree | 503300ab215295d51be3093eed2592b349bcd8cc /src/core/mem_map_funcs.cpp | |
| parent | Merge pull request #274 from lioncash/kernel (diff) | |
| download | yuzu-23ae8aa4d344fb5661b5801ae3dcdd709469a718.tar.gz yuzu-23ae8aa4d344fb5661b5801ae3dcdd709469a718.tar.xz yuzu-23ae8aa4d344fb5661b5801ae3dcdd709469a718.zip | |
MemMap: Added AXI_WRAM & SHARED_PAGE along with other stuff
Got rid of I/O address's since the I/O addresses range's overlap with other
address's types such as vram, these I/O addresses need to be done in an different
way.
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 7f7e77233..d8720990e 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; |