mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-07-27 04:25:12 +00:00
Remove coalesce on PoolCommit
Windows makes this more difficult.
This commit is contained in:
parent
75f2ba5047
commit
b2cb05eeb7
@ -320,7 +320,6 @@ int MemoryManager::PoolCommit(VAddr virtual_addr, size_t size, MemoryProt prot)
|
|||||||
new_vma.type = Core::VMAType::Pooled;
|
new_vma.type = Core::VMAType::Pooled;
|
||||||
new_vma.is_exec = false;
|
new_vma.is_exec = false;
|
||||||
new_vma.phys_base = 0;
|
new_vma.phys_base = 0;
|
||||||
MergeAdjacent(vma_map, new_vma_handle);
|
|
||||||
|
|
||||||
// Perform the mapping
|
// Perform the mapping
|
||||||
void* out_addr = impl.Map(mapped_addr, size, alignment, -1, false);
|
void* out_addr = impl.Map(mapped_addr, size, alignment, -1, false);
|
||||||
@ -473,7 +472,7 @@ void MemoryManager::PoolDecommit(VAddr virtual_addr, size_t size) {
|
|||||||
vma.name = "anon";
|
vma.name = "anon";
|
||||||
MergeAdjacent(vma_map, new_it);
|
MergeAdjacent(vma_map, new_it);
|
||||||
|
|
||||||
if (vma_base.type != VMAType::Reserved && vma_base.type != VMAType::PoolReserved) {
|
if (type != VMAType::Reserved && type != VMAType::PoolReserved) {
|
||||||
// Unmap the memory region.
|
// Unmap the memory region.
|
||||||
impl.Unmap(vma_base_addr, vma_base_size, start_in_vma, start_in_vma + size, phys_base,
|
impl.Unmap(vma_base_addr, vma_base_size, start_in_vma, start_in_vma + size, phys_base,
|
||||||
is_exec, false, false);
|
is_exec, false, false);
|
||||||
|
Loading…
Reference in New Issue
Block a user