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

[Memory] Removed redundant BaseHeap::IsGuestPhysicalHeap

Browse Source
This commit is contained in:
Gliniak
2020-09-16 20:31:53 +02:00
committed by Rick Gibbed
parent 26b0aa0cc4
commit a6868d1f8a
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/kernel/xfile.cc
View File

@@ -122,14 +122,14 @@ X_STATUS XFile::Read(uint32_t buffer_guest_address, uint32_t buffer_length,
const xe::BaseHeap* buffer_end_heap =
memory()->LookupHeap(buffer_guest_high_address);
if (!buffer_start_heap || !buffer_end_heap ||
buffer_start_heap->IsGuestPhysicalHeap() !=
buffer_end_heap->IsGuestPhysicalHeap() ||
(buffer_start_heap->IsGuestPhysicalHeap() &&
(buffer_start_heap->heap_type() == HeapType::kGuestPhysical) !=
(buffer_end_heap->heap_type() == HeapType::kGuestPhysical) ||
(buffer_start_heap->heap_type() == HeapType::kGuestPhysical &&
buffer_start_heap != buffer_end_heap)) {
result = X_STATUS_ACCESS_VIOLATION;
} else {
xe::PhysicalHeap* buffer_physical_heap =
buffer_start_heap->IsGuestPhysicalHeap()
buffer_start_heap->heap_type() == HeapType::kGuestPhysical
? static_cast<xe::PhysicalHeap*>(buffer_start_heap)
: nullptr;
if (buffer_physical_heap &&