ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trying, and failing, to get E0000000 range addresses to work.

This commit is contained in:
Ben Vanik 2015-05-17 21:26:44 -07:00
parent 4d32c7af05
commit f5f7d15366
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/xenia/memory.cc
View File

@ -161,8 +161,11 @@ int Memory::Initialize() {
// Prepare physical heaps. // Prepare physical heaps.
heaps_.physical.Initialize(physical_membase_, 0x00000000, 0x20000000, 4096); heaps_.physical.Initialize(physical_membase_, 0x00000000, 0x20000000, 4096);
// HACK: should be 64k, but with us overlaying A and E it needs to be 4.
/*heaps_.vA0000000.Initialize(virtual_membase_, 0xA0000000, 0x20000000,
64 * 1024, &heaps_.physical);*/
heaps_.vA0000000.Initialize(virtual_membase_, 0xA0000000, 0x20000000, heaps_.vA0000000.Initialize(virtual_membase_, 0xA0000000, 0x20000000,
64 * 1024, &heaps_.physical); 4 * 1024, &heaps_.physical);
heaps_.vC0000000.Initialize(virtual_membase_, 0xC0000000, 0x20000000, heaps_.vC0000000.Initialize(virtual_membase_, 0xC0000000, 0x20000000,
16 * 1024 * 1024, &heaps_.physical); 16 * 1024 * 1024, &heaps_.physical);
heaps_.vE0000000.Initialize(virtual_membase_, 0xE0000000, 0x1FD00000, 4096, heaps_.vE0000000.Initialize(virtual_membase_, 0xE0000000, 0x1FD00000, 4096,
@ -285,8 +288,7 @@ BaseHeap* Memory::LookupHeap(uint32_t address) {
BaseHeap* Memory::LookupHeapByType(bool physical, uint32_t page_size) { BaseHeap* Memory::LookupHeapByType(bool physical, uint32_t page_size) {
if (physical) { if (physical) {
if (page_size <= 4096) { if (page_size <= 4096) {
// HACK // HACK: should be vE0000000
//return &heaps_.vE0000000;
return &heaps_.vA0000000; return &heaps_.vA0000000;
} else if (page_size <= 64 * 1024) { } else if (page_size <= 64 * 1024) {
return &heaps_.vA0000000; return &heaps_.vA0000000;
@ -1000,6 +1002,9 @@ bool PhysicalHeap::Alloc(uint32_t size, uint32_t alignment,
"PhysicalHeap::Alloc unable to alloc physical memory in parent heap"); "PhysicalHeap::Alloc unable to alloc physical memory in parent heap");
return false; return false;
} }
if (heap_base_ >= 0xE0000000) {
parent_address -= 0x1000;
}
// Given the address we've reserved in the parent heap, pin that here. // Given the address we've reserved in the parent heap, pin that here.
// Shouldn't be possible for it to be allocated already. // Shouldn't be possible for it to be allocated already.
@ -1035,6 +1040,9 @@ bool PhysicalHeap::AllocFixed(uint32_t base_address, uint32_t size,
"PhysicalHeap::Alloc unable to alloc physical memory in parent heap"); "PhysicalHeap::Alloc unable to alloc physical memory in parent heap");
return false; return false;
} }
if (heap_base_ >= 0xE0000000) {
parent_base_address -= 0x1000;
}
// Given the address we've reserved in the parent heap, pin that here. // Given the address we've reserved in the parent heap, pin that here.
// Shouldn't be possible for it to be allocated already. // Shouldn't be possible for it to be allocated already.
@ -1075,6 +1083,9 @@ bool PhysicalHeap::AllocRange(uint32_t low_address, uint32_t high_address,
"PhysicalHeap::Alloc unable to alloc physical memory in parent heap"); "PhysicalHeap::Alloc unable to alloc physical memory in parent heap");
return false; return false;
} }
if (heap_base_ >= 0xE0000000) {
parent_address -= 0x1000;
}
// Given the address we've reserved in the parent heap, pin that here. // Given the address we've reserved in the parent heap, pin that here.
// Shouldn't be possible for it to be allocated already. // Shouldn't be possible for it to be allocated already.