diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-29 16:54:44 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-16 06:03:46 +0200 |
commit | e2c7954be5ccabc7c5f87000db01cef040ca4b47 (patch) | |
tree | 5b3288c66f6941a9d6be0f2907c3526bb3b7e6ac /src/core/mem_map.cpp | |
parent | Process: Store kernel compatibility version during loading (diff) | |
download | yuzu-e2c7954be5ccabc7c5f87000db01cef040ca4b47.tar yuzu-e2c7954be5ccabc7c5f87000db01cef040ca4b47.tar.gz yuzu-e2c7954be5ccabc7c5f87000db01cef040ca4b47.tar.bz2 yuzu-e2c7954be5ccabc7c5f87000db01cef040ca4b47.tar.lz yuzu-e2c7954be5ccabc7c5f87000db01cef040ca4b47.tar.xz yuzu-e2c7954be5ccabc7c5f87000db01cef040ca4b47.tar.zst yuzu-e2c7954be5ccabc7c5f87000db01cef040ca4b47.zip |
Diffstat (limited to 'src/core/mem_map.cpp')
-rw-r--r-- | src/core/mem_map.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index c95dea064..f6a063825 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp @@ -93,42 +93,6 @@ u32 MapBlock_HeapLinear(u32 size, u32 operation, u32 permissions) { return block.GetVirtualAddress(); } -PAddr VirtualToPhysicalAddress(const VAddr addr) { - if (addr == 0) { - return 0; - } else if (addr >= VRAM_VADDR && addr < VRAM_VADDR_END) { - return addr - VRAM_VADDR + VRAM_PADDR; - } else if (addr >= LINEAR_HEAP_VADDR && addr < LINEAR_HEAP_VADDR_END) { - return addr - LINEAR_HEAP_VADDR + FCRAM_PADDR; - } else if (addr >= DSP_RAM_VADDR && addr < DSP_RAM_VADDR_END) { - return addr - DSP_RAM_VADDR + DSP_RAM_PADDR; - } else if (addr >= IO_AREA_VADDR && addr < IO_AREA_VADDR_END) { - return addr - IO_AREA_VADDR + IO_AREA_PADDR; - } - - LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08x", addr); - // To help with debugging, set bit on address so that it's obviously invalid. - return addr | 0x80000000; -} - -VAddr PhysicalToVirtualAddress(const PAddr addr) { - if (addr == 0) { - return 0; - } 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 + LINEAR_HEAP_VADDR; - } 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) { - return addr - IO_AREA_PADDR + IO_AREA_VADDR; - } - - LOG_ERROR(HW_Memory, "Unknown physical address @ 0x%08x", addr); - // To help with debugging, set bit on address so that it's obviously invalid. - return addr | 0x80000000; -} - void Init() { InitMemoryMap(); LOG_DEBUG(HW_Memory, "initialized OK"); |