diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-29 23:16:12 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-30 18:31:35 -0400 |
| commit | 235dddb3f134208e30683c951158616427568af7 (patch) | |
| tree | 04ad6514440466d92d3bb6805c5a0e291b5a434f /src/core/mem_map_funcs.cpp | |
| parent | c37390f8e26e50d0ac34687357454ff45b3690dd (diff) | |
added virtual memory map for ExeFS (where ARM11 code is supposed to be loaded)
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index b524d19d9c..2284b535cc 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -58,6 +58,10 @@ inline void _Read(T &var, const u32 addr) { } 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_MASK]); + // FCRAM - GSP heap } else if ((vaddr >= HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { var = *((const T*)&g_heap_gsp[vaddr & HEAP_GSP_MASK]); @@ -94,6 +98,10 @@ inline void _Write(u32 addr, const T data) { } 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_MASK] = data; + // FCRAM - GSP heap } else if ((vaddr >= HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { *(T*)&g_heap_gsp[vaddr & HEAP_GSP_MASK] = data; @@ -127,8 +135,12 @@ inline void _Write(u32 addr, const T data) { u8 *GetPointer(const u32 addr) { const u32 vaddr = _VirtualAddress(addr); + // ExeFS:/.code is loaded here + if ((vaddr >= EXEFS_CODE_VADDR) && (vaddr < EXEFS_CODE_VADDR_END)) { + return g_exefs_code + (vaddr & EXEFS_CODE_MASK); + // FCRAM - GSP heap - if ((vaddr >= HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { + } else if ((vaddr >= HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { return g_heap_gsp + (vaddr & HEAP_GSP_MASK); // FCRAM - application heap |