diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-25 05:56:06 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-25 05:56:06 +0200 |
| commit | 890c7261d2d6d6a760512ebe93c565ee87220983 (patch) | |
| tree | 7d822f01da90c37c188faa76578c0d1733136d06 /src/core/mem_map_funcs.cpp | |
| parent | added functions to map Heap and Shared memory space (diff) | |
| download | yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.gz yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.bz2 yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.lz yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.xz yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.zst yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.zip | |
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index eff0cf4b8..b2c39c57c 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -43,17 +43,22 @@ inline void _Read(T &var, const u32 addr) { // Hardware I/O register reads // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space - } else if ((vaddr & 0xFF000000) == 0x10000000 || (vaddr & 0xFF000000) == 0x1E000000) { + } else if ((vaddr >= HARDWARE_IO_VADDR) && (vaddr < HARDWARE_IO_VADDR_END)) { HW::Read<T>(var, vaddr); // FCRAM - GSP heap - } else if ((vaddr > HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { + } else if ((vaddr >= HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { var = *((const T*)&g_heap_gsp[vaddr & HEAP_GSP_MASK]); // FCRAM - application heap - } else if ((vaddr > HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) { + } else if ((vaddr >= HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) { var = *((const T*)&g_heap[vaddr & HEAP_MASK]); + // Shared memory + } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { + NOTICE_LOG(OSHLE, "wtf read"); + var = *((const T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK]); + /*else if ((vaddr & 0x3F800000) == 0x04000000) { var = *((const T*)&m_pVRAM[vaddr & VRAM_MASK]);*/ @@ -74,17 +79,22 @@ inline void _Write(u32 addr, const T data) { // Hardware I/O register writes // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space - } else if ((vaddr & 0xFF000000) == 0x10000000 || (vaddr & 0xFF000000) == 0x1E000000) { + } else if ((vaddr >= HARDWARE_IO_VADDR) && (vaddr < HARDWARE_IO_VADDR_END)) { HW::Write<T>(vaddr, data); // FCRAM - GSP heap - } else if ((vaddr > HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { + } else if ((vaddr >= HEAP_GSP_VADDR) && (vaddr < HEAP_GSP_VADDR_END)) { *(T*)&g_heap_gsp[vaddr & HEAP_GSP_MASK] = data; // FCRAM - application heap - } else if ((vaddr > HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) { + } else if ((vaddr >= HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) { *(T*)&g_heap[vaddr & HEAP_MASK] = data; + // Shared memory + } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { + NOTICE_LOG(OSHLE, "wtf read"); + *(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data; + } else if ((vaddr & 0xFF000000) == 0x14000000) { _assert_msg_(MEMMAP, false, "umimplemented write to GSP heap"); } else if ((vaddr & 0xFFF00000) == 0x1EC00000) { @@ -116,6 +126,11 @@ u8 *GetPointer(const u32 addr) { } else if ((vaddr >= HEAP_VADDR) && (vaddr < HEAP_VADDR_END)) { return g_heap + (vaddr & HEAP_MASK); + // Shared memory + } else if ((vaddr > SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { + NOTICE_LOG(OSHLE, "wtf read"); + return g_shared_mem + (vaddr & SHARED_MEMORY_MASK); + } else { ERROR_LOG(MEMMAP, "Unknown GetPointer @ 0x%08x", vaddr); return 0; |