izzy/xenia-edge
0
0
Fork 0
mirror of https://github.com/izzy2lost/xenia-edge.git synced 2026-07-06 00:20:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Avoid alignment related assert

Browse Source 
Physical addresses need actual alignment, virtual ones just need page alignment
This commit is contained in:
Herman S.
2025-09-29 17:41:14 +09:00
parent 33c3248b44
commit a545f52554
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xenia/memory.cc
+8 -2
View File
@@ -1573,7 +1573,10 @@ bool PhysicalHeap::AllocFixed(uint32_t base_address, uint32_t size,
// Shouldn't be possible for it to be allocated already.
uint32_t address =
heap_base_ + parent_base_address - GetPhysicalAddress(heap_base_);
if (!BaseHeap::AllocFixed(address, size, alignment, allocation_type,
// The physical memory is already aligned properly by the parent heap.
// We only need page alignment for the virtual address since the actual
// memory alignment requirement has been satisfied in physical space.
if (!BaseHeap::AllocFixed(address, size, page_size_, allocation_type,
protect)) {
XELOGE(
"PhysicalHeap::Alloc unable to pin physical memory in physical heap");
@@ -1614,7 +1617,10 @@ bool PhysicalHeap::AllocRange(uint32_t low_address, uint32_t high_address,
// Shouldn't be possible for it to be allocated already.
uint32_t address =
heap_base_ + parent_address - GetPhysicalAddress(heap_base_);
if (!BaseHeap::AllocFixed(address, size, alignment, allocation_type,
// The physical memory is already aligned properly by the parent heap.
// We only need page alignment for the virtual address since the actual
// memory alignment requirement has been satisfied in physical space.
if (!BaseHeap::AllocFixed(address, size, page_size_, allocation_type,
protect)) {
XELOGE(
"PhysicalHeap::Alloc unable to pin physical memory in physical heap");