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

[Memory] Temporarily disable allocation in 0xE0000000

This commit is contained in:
Triang3l 2019-08-15 00:06:27 +03:00
parent 6ab7720951
commit 0451153760
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/memory.cc
View File

@ -168,8 +168,9 @@ bool Memory::Initialize() {
// Prepare physical heaps. // Prepare physical heaps.
heaps_.physical.Initialize(this, physical_membase_, 0x00000000, 0x20000000, heaps_.physical.Initialize(this, physical_membase_, 0x00000000, 0x20000000,
4096); 4096);
// HACK: should be 64k, but with us overlaying A and E it needs to be 4.
heaps_.vA0000000.Initialize(this, virtual_membase_, 0xA0000000, 0x20000000, heaps_.vA0000000.Initialize(this, virtual_membase_, 0xA0000000, 0x20000000,
64 * 1024, &heaps_.physical); 4 * 1024, &heaps_.physical);
heaps_.vC0000000.Initialize(this, virtual_membase_, 0xC0000000, 0x20000000, heaps_.vC0000000.Initialize(this, virtual_membase_, 0xC0000000, 0x20000000,
16 * 1024 * 1024, &heaps_.physical); 16 * 1024 * 1024, &heaps_.physical);
heaps_.vE0000000.Initialize(this, virtual_membase_, 0xE0000000, 0x1FD00000, heaps_.vE0000000.Initialize(this, virtual_membase_, 0xE0000000, 0x1FD00000,
@ -332,7 +333,8 @@ const BaseHeap* Memory::LookupHeap(uint32_t address) const {
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) {
return &heaps_.vE0000000; // HACK: should be vE0000000
return &heaps_.vA0000000;
} else if (page_size <= 64 * 1024) { } else if (page_size <= 64 * 1024) {
return &heaps_.vA0000000; return &heaps_.vA0000000;
} else { } else {