diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-06 07:09:59 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-06 07:09:59 +0100 |
commit | 6aa90e13f99ea032754733057f7c13f94fd10aa2 (patch) | |
tree | 33a2235a50da38de52ace3b28ef4ae0a6dd28d97 /src/core/memory.cpp | |
parent | Merge pull request #1455 from yuriks/ResultVal-union (diff) | |
download | yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.gz yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.bz2 yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.lz yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.xz yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.tar.zst yuzu-6aa90e13f99ea032754733057f7c13f94fd10aa2.zip |
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) { } else if (addr >= VRAM_PADDR && addr < VRAM_PADDR_END) { return addr - VRAM_PADDR + VRAM_VADDR; } else if (addr >= FCRAM_PADDR && addr < FCRAM_PADDR_END) { - return addr - FCRAM_PADDR + Kernel::g_current_process->GetLinearHeapBase(); + return addr - FCRAM_PADDR + Kernel::g_current_process->GetLinearHeapAreaAddress(); } else if (addr >= DSP_RAM_PADDR && addr < DSP_RAM_PADDR_END) { return addr - DSP_RAM_PADDR + DSP_RAM_VADDR; } else if (addr >= IO_AREA_PADDR && addr < IO_AREA_PADDR_END) { |