diff options
| author | purpasmart96 <kanzoconfigz@hotmail.com> | 2014-12-03 21:36:32 -0800 |
|---|---|---|
| committer | purpasmart96 <kanzoconfigz@hotmail.com> | 2014-12-13 18:29:57 -0800 |
| commit | 23ae8aa4d344fb5661b5801ae3dcdd709469a718 (patch) | |
| tree | 503300ab215295d51be3093eed2592b349bcd8cc /src/core/mem_map_funcs.cpp | |
| parent | 9ce11b2d925b08352f9349ecbf228431581331f4 (diff) | |
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 7f7e772331..d8720990ef 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) { if (vaddr >= KERNEL_MEMORY_VADDR && vaddr < KERNEL_MEMORY_VADDR_END) { var = *((const T*)&g_kernel_mem[vaddr - KERNEL_MEMORY_VADDR]); - // Hardware I/O register reads - // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space - } else if ((vaddr >= HARDWARE_IO_VADDR) && (vaddr < HARDWARE_IO_VADDR_END)) { - HW::Read<T>(var, vaddr); - // ExeFS:/.code is loaded here } else if ((vaddr >= EXEFS_CODE_VADDR) && (vaddr < EXEFS_CODE_VADDR_END)) { var = *((const T*)&g_exefs_code[vaddr - EXEFS_CODE_VADDR]); @@ -103,11 +98,6 @@ inline void Write(const VAddr vaddr, const T data) { if (vaddr >= KERNEL_MEMORY_VADDR && vaddr < KERNEL_MEMORY_VADDR_END) { *(T*)&g_kernel_mem[vaddr - KERNEL_MEMORY_VADDR] = data; - // Hardware I/O register writes - // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space - } else if ((vaddr >= HARDWARE_IO_VADDR) && (vaddr < HARDWARE_IO_VADDR_END)) { - HW::Write<T>(vaddr, data); - // ExeFS:/.code is loaded here } else if ((vaddr >= EXEFS_CODE_VADDR) && (vaddr < EXEFS_CODE_VADDR_END)) { *(T*)&g_exefs_code[vaddr - EXEFS_CODE_VADDR] = data; |