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

Guarding protect-on-release behavior behind --protect_on_release. 

Workaround for #456 until it can be identified.
This commit is contained in:
Ben Vanik 2015-12-05 23:27:25 -08:00
parent 81d0376106
commit 295c62c7a4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/xenia/memory.cc
View File

@ -25,6 +25,8 @@
DEFINE_bool(protect_zero, false, DEFINE_bool(protect_zero, false,
"Protect the zero page from reads and writes."); "Protect the zero page from reads and writes.");
DEFINE_bool(protect_on_release, false,
"Protect released memory to prevent accesses.");
DEFINE_bool(scribble_heap, false, DEFINE_bool(scribble_heap, false,
"Scribble 0xCD into all allocated heap memory."); "Scribble 0xCD into all allocated heap memory.");
@ -811,11 +813,16 @@ bool BaseHeap::Release(uint32_t base_address, uint32_t* out_region_size) {
xe::memory::page_size() == xe::memory::page_size() ==
0 && 0 &&
((base_page_number * page_size_) % xe::memory::page_size() == 0))) { ((base_page_number * page_size_) % xe::memory::page_size() == 0))) {
if (!xe::memory::Protect( // TODO(benvanik): figure out why games are using memory after releasing it.
membase_ + heap_base_ + base_page_number * page_size_, // It's possible this is some virtual/physical stuff where the GPU still can
base_page_entry.region_page_count * page_size_, // access it.
xe::memory::PageAccess::kNoAccess, nullptr)) { if (FLAGS_protect_on_release) {
XELOGW("BaseHeap::Release failed due to host VirtualProtect failure"); if (!xe::memory::Protect(
membase_ + heap_base_ + base_page_number * page_size_,
base_page_entry.region_page_count * page_size_,
xe::memory::PageAccess::kNoAccess, nullptr)) {
XELOGW("BaseHeap::Release failed due to host VirtualProtect failure");
}
} }
} }