diff options
| author | purpasmart96 <kanzoconfigz@hotmail.com> | 2014-12-30 04:35:06 +0100 |
|---|---|---|
| committer | purpasmart96 <kanzoconfigz@hotmail.com> | 2014-12-30 04:35:06 +0100 |
| commit | d5049cbba53d242b8461859fd02000b294164e77 (patch) | |
| tree | 9f5888bf28cf41ce61e80d690d0981986da20be0 /src/core/mem_map_funcs.cpp | |
| parent | Merge pull request #253 from purpasmart96/mem_map (diff) | |
| download | yuzu-d5049cbba53d242b8461859fd02000b294164e77.tar yuzu-d5049cbba53d242b8461859fd02000b294164e77.tar.gz yuzu-d5049cbba53d242b8461859fd02000b294164e77.tar.bz2 yuzu-d5049cbba53d242b8461859fd02000b294164e77.tar.lz yuzu-d5049cbba53d242b8461859fd02000b294164e77.tar.xz yuzu-d5049cbba53d242b8461859fd02000b294164e77.tar.zst yuzu-d5049cbba53d242b8461859fd02000b294164e77.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index fdf382ed6..97ef1c5a3 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -82,6 +82,10 @@ inline void Read(T &var, const VAddr vaddr) { } else if ((vaddr >= CONFIG_MEMORY_VADDR) && (vaddr < CONFIG_MEMORY_VADDR_END)) { ConfigMem::Read<T>(var, vaddr); + // DSP memory + } else if ((vaddr >= DSP_MEMORY_VADDR) && (vaddr < DSP_MEMORY_VADDR_END)) { + var = *((const T*)&g_dsp_mem[vaddr - DSP_MEMORY_VADDR]); + // VRAM } else if ((vaddr >= VRAM_VADDR) && (vaddr < VRAM_VADDR_END)) { var = *((const T*)&g_vram[vaddr - VRAM_VADDR]); @@ -122,8 +126,10 @@ inline void Write(const VAddr vaddr, const T data) { } else if ((vaddr >= VRAM_VADDR) && (vaddr < VRAM_VADDR_END)) { *(T*)&g_vram[vaddr - VRAM_VADDR] = data; - //} else if ((vaddr & 0xFFF00000) == 0x1FF00000) { - // _assert_msg_(MEMMAP, false, "umimplemented write to DSP memory"); + // DSP memory + } else if ((vaddr >= DSP_MEMORY_VADDR) && (vaddr < DSP_MEMORY_VADDR_END)) { + *(T*)&g_dsp_mem[vaddr - DSP_MEMORY_VADDR] = data; + //} else if ((vaddr & 0xFFFF0000) == 0x1FF80000) { // _assert_msg_(MEMMAP, false, "umimplemented write to Configuration Memory"); //} else if ((vaddr & 0xFFFFF000) == 0x1FF81000) { |