diff options
| author |  Yuri Kunde Schlesner | 2016-03-05 22:16:27 -0800 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2016-03-05 22:16:27 -0800 |
| commit | 2d40891b4526b4559f20efaaea320f004fccc063 (patch) | |
| tree | 33a2235a50da38de52ace3b28ef4ae0a6dd28d97 /src/core/memory.cpp | |
| parent | Merge pull request #1455 from yuriks/ResultVal-union (diff) | |
| parent | Memory: Do correct Phys->Virt address translation for non-APP linheap (diff) | |
| download | yuzu-2d40891b4526b4559f20efaaea320f004fccc063.tar.gz yuzu-2d40891b4526b4559f20efaaea320f004fccc063.tar.xz yuzu-2d40891b4526b4559f20efaaea320f004fccc063.zip | |
Merge pull request #1463 from yuriks/non-app-region
Memory: Do correct Phys->Virt address translation for non-APP linheap
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 4753c63a7..7de5bd15d 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -291,7 +291,7 @@ VAddr PhysicalToVirtualAddress(const PAddr addr) { | |||
| 291 | } else if (addr >= VRAM_PADDR && addr < VRAM_PADDR_END) { | 291 | } else if (addr >= VRAM_PADDR && addr < VRAM_PADDR_END) { |
| 292 | return addr - VRAM_PADDR + VRAM_VADDR; | 292 | return addr - VRAM_PADDR + VRAM_VADDR; |
| 293 | } else if (addr >= FCRAM_PADDR && addr < FCRAM_PADDR_END) { | 293 | } else if (addr >= FCRAM_PADDR && addr < FCRAM_PADDR_END) { |
| 294 | return addr - FCRAM_PADDR + Kernel::g_current_process->GetLinearHeapBase(); | 294 | return addr - FCRAM_PADDR + Kernel::g_current_process->GetLinearHeapAreaAddress(); |
| 295 | } else if (addr >= DSP_RAM_PADDR && addr < DSP_RAM_PADDR_END) { | 295 | } else if (addr >= DSP_RAM_PADDR && addr < DSP_RAM_PADDR_END) { |
| 296 | return addr - DSP_RAM_PADDR + DSP_RAM_VADDR; | 296 | return addr - DSP_RAM_PADDR + DSP_RAM_VADDR; |
| 297 | } else if (addr >= IO_AREA_PADDR && addr < IO_AREA_PADDR_END) { | 297 | } else if (addr >= IO_AREA_PADDR && addr < IO_AREA_PADDR_END) { |