fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Memory] Ensure writecombine buffers are writable

Browse Source
This commit is contained in:
Herman S.
2025-10-07 10:23:16 +09:00
committed by Radosław Gliński
parent 88527a0b82
commit ac00d09244
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/xenia/memory.cc
View File

@@ -83,10 +83,13 @@ void CrashDump() {
} }
xe::memory::PageAccess ToPageAccess(uint32_t protect) { xe::memory::PageAccess ToPageAccess(uint32_t protect) {
if ((protect & kMemoryProtectRead) && !(protect & kMemoryProtectWrite)) { // Write-combine memory is CPU-writable (for GPU uploads)
bool is_writable =
(protect & kMemoryProtectWrite) || (protect & kMemoryProtectWriteCombine);
if ((protect & kMemoryProtectRead) && !is_writable) {
return xe::memory::PageAccess::kReadOnly; return xe::memory::PageAccess::kReadOnly;
} else if ((protect & kMemoryProtectRead) && } else if ((protect & kMemoryProtectRead) && is_writable) {
(protect & kMemoryProtectWrite)) {
return xe::memory::PageAccess::kReadWrite; return xe::memory::PageAccess::kReadWrite;
} else { } else {
return xe::memory::PageAccess::kNoAccess; return xe::memory::PageAccess::kNoAccess;
@@ -1457,14 +1460,29 @@ xe::memory::PageAccess BaseHeap::QueryRangeAccess(uint32_t low_address,
} }
uint32_t low_page_number = (low_address - heap_base_) >> page_size_shift_; uint32_t low_page_number = (low_address - heap_base_) >> page_size_shift_;
uint32_t high_page_number = (high_address - heap_base_) >> page_size_shift_; uint32_t high_page_number = (high_address - heap_base_) >> page_size_shift_;
uint32_t protect = kMemoryProtectRead | kMemoryProtectWrite; bool all_readable = true;
bool all_writable = true;
{ {
auto global_lock = global_critical_region_.Acquire(); auto global_lock = global_critical_region_.Acquire();
for (uint32_t i = low_page_number; protect && i <= high_page_number; ++i) { for (uint32_t i = low_page_number; i <= high_page_number; ++i) {
protect &= page_table_[i].current_protect; uint32_t page_protect = page_table_[i].current_protect;
if (!(page_protect & kMemoryProtectRead)) {
all_readable = false;
}
// Check if page is writable in any form (Write or WriteCombine)
if (!(page_protect & kMemoryProtectWrite) &&
!(page_protect & kMemoryProtectWriteCombine)) {
all_writable = false;
}
} }
} }
return ToPageAccess(protect); if (all_readable && all_writable) {
return xe::memory::PageAccess::kReadWrite;
} else if (all_readable) {
return xe::memory::PageAccess::kReadOnly;
} else {
return xe::memory::PageAccess::kNoAccess;
}
} }
VirtualHeap::VirtualHeap() = default; VirtualHeap::VirtualHeap() = default;