diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-29 23:08:51 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-29 23:08:51 -0500 |
| commit | b3240f645580d30f9b8e1771430556f51102d7ff (patch) | |
| tree | 7d33f0427cd1e4e92c5f733e742100c72e5d193c /src/core/mem_map_funcs.cpp | |
| parent | 66f70143c3ac4c4733ae3779b2d0e27e4dec1a68 (diff) | |
| parent | d5049cbba53d242b8461859fd02000b294164e77 (diff) | |
Merge pull request #368 from purpasmart96/dsp_mem
MemMap: Add support for DSP Read & Writes in the memory map
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -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) { |