diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-16 00:56:28 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-16 00:56:28 +0200 |
| commit | 4910b6f3369f33a2dc6728e4156a62368c2c9cb1 (patch) | |
| tree | fbe6b506640e26bff70fd001fce63990aedda3ee /src/core/mem_map_funcs.cpp | |
| parent | added ability to load AXF files (same as ELF) (diff) | |
| download | yuzu-4910b6f3369f33a2dc6728e4156a62368c2c9cb1.tar yuzu-4910b6f3369f33a2dc6728e4156a62368c2c9cb1.tar.gz yuzu-4910b6f3369f33a2dc6728e4156a62368c2c9cb1.tar.bz2 yuzu-4910b6f3369f33a2dc6728e4156a62368c2c9cb1.tar.lz yuzu-4910b6f3369f33a2dc6728e4156a62368c2c9cb1.tar.xz yuzu-4910b6f3369f33a2dc6728e4156a62368c2c9cb1.tar.zst yuzu-4910b6f3369f33a2dc6728e4156a62368c2c9cb1.zip | |
Diffstat (limited to '')
| -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 8ab647714..86e9eaa20 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -73,6 +73,10 @@ inline void _Read(T &var, const u32 addr) { } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { var = *((const T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK]); + // System memory + } else if ((vaddr >= SYSTEM_MEMORY_VADDR) && (vaddr < SYSTEM_MEMORY_VADDR_END)) { + var = *((const T*)&g_system_mem[vaddr & SYSTEM_MEMORY_MASK]); + // Config memory } else if ((vaddr >= CONFIG_MEMORY_VADDR) && (vaddr < CONFIG_MEMORY_VADDR_END)) { ConfigMem::Read<T>(var, vaddr); @@ -115,6 +119,10 @@ inline void _Write(u32 addr, const T data) { } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { *(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data; + // System memory + } else if ((vaddr >= SYSTEM_MEMORY_VADDR) && (vaddr < SYSTEM_MEMORY_VADDR_END)) { + *(T*)&g_system_mem[vaddr & SYSTEM_MEMORY_MASK] = data; + // VRAM } else if ((vaddr >= VRAM_VADDR) && (vaddr < VRAM_VADDR_END)) { *(T*)&g_vram[vaddr & VRAM_MASK] = data; @@ -153,9 +161,13 @@ u8 *GetPointer(const u32 addr) { return g_heap + (vaddr & HEAP_MASK); // Shared memory - } else if ((vaddr > SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { + } else if ((vaddr >= SHARED_MEMORY_VADDR) && (vaddr < SHARED_MEMORY_VADDR_END)) { return g_shared_mem + (vaddr & SHARED_MEMORY_MASK); + // System memory + } else if ((vaddr >= SYSTEM_MEMORY_VADDR) && (vaddr < SYSTEM_MEMORY_VADDR_END)) { + return g_system_mem + (vaddr & SYSTEM_MEMORY_MASK); + // VRAM } else if ((vaddr > VRAM_VADDR) && (vaddr < VRAM_VADDR_END)) { return g_vram + (vaddr & VRAM_MASK); |