eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 3 Projects Releases 2 Packages Wiki Activity Actions 2

Clean-up mem_map constants and fix framebuffer translation errors

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2015-02-08 11:38:00 -02:00
parent 64196976b9
commit 34b009cf38
3 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/core/mem_map_funcs.cpp
View file

@ -23,10 +23,12 @@ VAddr PhysicalToVirtualAddress(const PAddr addr) {
// to virtual address translations here. This is quite hacky, but necessary until we implement
// proper MMU emulation.
// TODO: Screw it, I'll let bunnei figure out how to do this properly.
if ((addr >= VRAM_PADDR) && (addr < VRAM_PADDR_END)) {
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 + FCRAM_VADDR;
} else if ((addr >= FCRAM_PADDR) && (addr < FCRAM_PADDR_END)) {
return addr - FCRAM_PADDR + HEAP_LINEAR_VADDR;
}
LOG_ERROR(HW_Memory, "Unknown physical address @ 0x%08x", addr);
@ -39,10 +41,12 @@ PAddr VirtualToPhysicalAddress(const VAddr addr) {
// to virtual address translations here. This is quite hacky, but necessary until we implement
// proper MMU emulation.
// TODO: Screw it, I'll let bunnei figure out how to do this properly.
if ((addr >= VRAM_VADDR) && (addr < VRAM_VADDR_END)) {
return addr - 0x07000000;
} else if ((addr >= FCRAM_VADDR) && (addr < FCRAM_VADDR_END)) {
return addr - FCRAM_VADDR + FCRAM_PADDR;
if (addr == 0) {
return 0;
} else if ((addr >= VRAM_VADDR) && (addr < VRAM_VADDR_END)) {
return addr - VRAM_VADDR + VRAM_PADDR;
} else if ((addr >= HEAP_LINEAR_VADDR) && (addr < HEAP_LINEAR_VADDR_END)) {
return addr - HEAP_LINEAR_VADDR + FCRAM_PADDR;
}
LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08x", addr);