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

[Core] Remove hardcoded type field from HeapAllocationInfo

This commit is contained in:
DrChat 2018-02-10 16:47:53 -06:00
parent 4db94473ec
commit 325599948a
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/xenia/kernel/xboxkrnl/xboxkrnl_memory.cc
View File

@ -273,14 +273,11 @@ dword_result_t NtQueryVirtualMemory(
return X_STATUS_INVALID_PARAMETER; return X_STATUS_INVALID_PARAMETER;
} }
memory_basic_information_ptr->base_address = memory_basic_information_ptr->base_address = alloc_info.base_address;
static_cast<uint32_t>(alloc_info.base_address); memory_basic_information_ptr->allocation_base = alloc_info.allocation_base;
memory_basic_information_ptr->allocation_base =
static_cast<uint32_t>(alloc_info.allocation_base);
memory_basic_information_ptr->allocation_protect = memory_basic_information_ptr->allocation_protect =
ToXdkProtectFlags(alloc_info.allocation_protect); ToXdkProtectFlags(alloc_info.allocation_protect);
memory_basic_information_ptr->region_size = memory_basic_information_ptr->region_size = alloc_info.region_size;
static_cast<uint32_t>(alloc_info.region_size);
uint32_t x_state = 0; uint32_t x_state = 0;
if (alloc_info.state & kMemoryAllocationReserve) { if (alloc_info.state & kMemoryAllocationReserve) {
x_state |= X_MEM_RESERVE; x_state |= X_MEM_RESERVE;
@ -290,7 +287,7 @@ dword_result_t NtQueryVirtualMemory(
} }
memory_basic_information_ptr->state = x_state; memory_basic_information_ptr->state = x_state;
memory_basic_information_ptr->protect = ToXdkProtectFlags(alloc_info.protect); memory_basic_information_ptr->protect = ToXdkProtectFlags(alloc_info.protect);
memory_basic_information_ptr->type = alloc_info.type; memory_basic_information_ptr->type = X_MEM_PRIVATE;
return X_STATUS_SUCCESS; return X_STATUS_SUCCESS;
} }

2
src/xenia/memory.cc
View File

@ -1096,14 +1096,12 @@ bool BaseHeap::QueryRegionInfo(uint32_t base_address,
out_info->region_size = 0; out_info->region_size = 0;
out_info->state = 0; out_info->state = 0;
out_info->protect = 0; out_info->protect = 0;
out_info->type = 0;
if (start_page_entry.state) { if (start_page_entry.state) {
// Committed/reserved region. // Committed/reserved region.
out_info->allocation_base = start_page_entry.base_address * page_size_; out_info->allocation_base = start_page_entry.base_address * page_size_;
out_info->allocation_protect = start_page_entry.allocation_protect; out_info->allocation_protect = start_page_entry.allocation_protect;
out_info->state = start_page_entry.state; out_info->state = start_page_entry.state;
out_info->protect = start_page_entry.current_protect; out_info->protect = start_page_entry.current_protect;
out_info->type = 0x20000;
for (uint32_t page_number = start_page_number; for (uint32_t page_number = start_page_number;
page_number < start_page_number + start_page_entry.region_page_count; page_number < start_page_number + start_page_entry.region_page_count;
++page_number) { ++page_number) {

2
src/xenia/memory.h
View File

@ -63,8 +63,6 @@ struct HeapAllocationInfo {
uint32_t state; uint32_t state;
// The access protection of the pages in the region. // The access protection of the pages in the region.
uint32_t protect; uint32_t protect;
// The type of pages in the region (private).
uint32_t type;
}; };
// Describes a single page in the page table. // Describes a single page in the page table.