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

Invalidate MMIO Ranges when memory is released or access protections are changed.

This commit is contained in:
Dr. Chat 2015-11-08 19:14:06 -06:00
parent 529227e4e6
commit c98d10545e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/xenia/memory.cc
View File

@ -1128,21 +1128,30 @@ bool PhysicalHeap::Decommit(uint32_t address, uint32_t size) {
bool PhysicalHeap::Release(uint32_t base_address, uint32_t* out_region_size) { bool PhysicalHeap::Release(uint32_t base_address, uint32_t* out_region_size) {
auto global_lock = global_critical_region_.Acquire(); auto global_lock = global_critical_region_.Acquire();
uint32_t parent_base_address = GetPhysicalAddress(base_address); uint32_t parent_base_address = GetPhysicalAddress(base_address);
uint32_t region_size = 0;
if (QuerySize(base_address, &region_size)) {
cpu::MMIOHandler::global_handler()->InvalidateRange(parent_base_address,
region_size);
}
if (!parent_heap_->Release(parent_base_address, out_region_size)) { if (!parent_heap_->Release(parent_base_address, out_region_size)) {
XELOGE("PhysicalHeap::Release failed due to parent heap failure"); XELOGE("PhysicalHeap::Release failed due to parent heap failure");
return false; return false;
} }
return BaseHeap::Release(base_address, out_region_size); return BaseHeap::Release(base_address, out_region_size);
} }
bool PhysicalHeap::Protect(uint32_t address, uint32_t size, uint32_t protect) { bool PhysicalHeap::Protect(uint32_t address, uint32_t size, uint32_t protect) {
auto global_lock = global_critical_region_.Acquire(); auto global_lock = global_critical_region_.Acquire();
uint32_t parent_address = GetPhysicalAddress(address); uint32_t parent_address = GetPhysicalAddress(address);
bool parent_result = parent_heap_->Protect(parent_address, size, protect); cpu::MMIOHandler::global_handler()->InvalidateRange(parent_address, size);
if (!parent_result) {
if (!parent_heap_->Protect(parent_address, size, protect)) {
XELOGE("PhysicalHeap::Protect failed due to parent heap failure"); XELOGE("PhysicalHeap::Protect failed due to parent heap failure");
return false; return false;
} }
return BaseHeap::Protect(address, size, protect); return BaseHeap::Protect(address, size, protect);
} }