diff options
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) { | |||
| 93 | return block.GetVirtualAddress(); | 93 | return block.GetVirtualAddress(); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | PAddr VirtualToPhysicalAddress(const VAddr addr) { | ||
| 97 | if (addr == 0) { | ||
| 98 | return 0; | ||
| 99 | } else if (addr >= VRAM_VADDR && addr < VRAM_VADDR_END) { | ||
| 100 | return addr - VRAM_VADDR + VRAM_PADDR; | ||
| 101 | } else if (addr >= LINEAR_HEAP_VADDR && addr < LINEAR_HEAP_VADDR_END) { | ||
| 102 | return addr - LINEAR_HEAP_VADDR + FCRAM_PADDR; | ||
| 103 | } else if (addr >= DSP_RAM_VADDR && addr < DSP_RAM_VADDR_END) { | ||
| 104 | return addr - DSP_RAM_VADDR + DSP_RAM_PADDR; | ||
| 105 | } else if (addr >= IO_AREA_VADDR && addr < IO_AREA_VADDR_END) { | ||
| 106 | return addr - IO_AREA_VADDR + IO_AREA_PADDR; | ||
| 107 | } | ||
| 108 | |||
| 109 | LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08x", addr); | ||
| 110 | // To help with debugging, set bit on address so that it's obviously invalid. | ||
| 111 | return addr | 0x80000000; | ||
| 112 | } | ||
| 113 | |||
| 114 | VAddr PhysicalToVirtualAddress(const PAddr addr) { | ||
| 115 | if (addr == 0) { | ||
| 116 | return 0; | ||
| 117 | } else if (addr >= VRAM_PADDR && addr < VRAM_PADDR_END) { | ||
| 118 | return addr - VRAM_PADDR + VRAM_VADDR; | ||
| 119 | } else if (addr >= FCRAM_PADDR && addr < FCRAM_PADDR_END) { | ||
| 120 | return addr - FCRAM_PADDR + LINEAR_HEAP_VADDR; | ||
| 121 | } else if (addr >= DSP_RAM_PADDR && addr < DSP_RAM_PADDR_END) { | ||
| 122 | return addr - DSP_RAM_PADDR + DSP_RAM_VADDR; | ||
| 123 | } else if (addr >= IO_AREA_PADDR && addr < IO_AREA_PADDR_END) { | ||
| 124 | return addr - IO_AREA_PADDR + IO_AREA_VADDR; | ||
| 125 | } | ||
| 126 | |||
| 127 | LOG_ERROR(HW_Memory, "Unknown physical address @ 0x%08x", addr); | ||
| 128 | // To help with debugging, set bit on address so that it's obviously invalid. | ||
| 129 | return addr | 0x80000000; | ||
| 130 | } | ||
| 131 | |||
| 132 | void Init() { | 96 | void Init() { |
| 133 | InitMemoryMap(); | 97 | InitMemoryMap(); |
| 134 | LOG_DEBUG(HW_Memory, "initialized OK"); | 98 | LOG_DEBUG(HW_Memory, "initialized OK"); |