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

Fixing warnings/bug in NtQueryVirtualMemory.

This commit is contained in:
Ben Vanik 2014-08-15 22:27:07 -07:00
parent 1a39f5bd06
commit 48fbefa75e
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/alloy/memory.h
View File

@ -58,7 +58,8 @@ class Memory {
uint32_t alignment = 0x20) = 0; uint32_t alignment = 0x20) = 0;
virtual int HeapFree(uint64_t address, size_t size) = 0; virtual int HeapFree(uint64_t address, size_t size) = 0;
virtual size_t QueryInformation(uint64_t base_address, MEMORY_BASIC_INFORMATION mem_info) = 0; virtual size_t QueryInformation(uint64_t base_address,
MEMORY_BASIC_INFORMATION* mem_info) = 0;
virtual size_t QuerySize(uint64_t base_address) = 0; virtual size_t QuerySize(uint64_t base_address) = 0;
virtual int Protect(uint64_t address, size_t size, uint32_t access) = 0; virtual int Protect(uint64_t address, size_t size, uint32_t access) = 0;

5
src/xenia/cpu/xenon_memory.cc
View File

@ -415,10 +415,11 @@ int XenonMemory::HeapFree(uint64_t address, size_t size) {
} }
} }
size_t XenonMemory::QueryInformation(uint64_t base_address, MEMORY_BASIC_INFORMATION mem_info) { size_t XenonMemory::QueryInformation(uint64_t base_address,
MEMORY_BASIC_INFORMATION* mem_info) {
uint8_t* p = Translate(base_address); uint8_t* p = Translate(base_address);
return VirtualQuery(p, &mem_info, sizeof(mem_info)); return VirtualQuery(p, mem_info, sizeof(MEMORY_BASIC_INFORMATION));
} }
size_t XenonMemory::QuerySize(uint64_t base_address) { size_t XenonMemory::QuerySize(uint64_t base_address) {

3
src/xenia/cpu/xenon_memory.h
View File

@ -54,7 +54,8 @@ public:
uint32_t alignment = 0x20) override; uint32_t alignment = 0x20) override;
int HeapFree(uint64_t address, size_t size) override; int HeapFree(uint64_t address, size_t size) override;
size_t QueryInformation(uint64_t base_address, MEMORY_BASIC_INFORMATION mem_info) override; size_t QueryInformation(uint64_t base_address,
MEMORY_BASIC_INFORMATION* mem_info) override;
size_t QuerySize(uint64_t base_address) override; size_t QuerySize(uint64_t base_address) override;
int Protect(uint64_t address, size_t size, uint32_t access) override; int Protect(uint64_t address, size_t size, uint32_t access) override;

45
src/xenia/kernel/xboxkrnl_memory.cc
View File

@ -195,28 +195,39 @@ X_STATUS xeNtQueryVirtualMemory(
assert_not_null(state); assert_not_null(state);
MEMORY_BASIC_INFORMATION mem_info; MEMORY_BASIC_INFORMATION mem_info;
size_t result = state->memory()->QueryInformation(base_address, mem_info); size_t result = state->memory()->QueryInformation(base_address, &mem_info);
if (!result) { if (!result) {
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
memory_basic_information->base_address = (uint32_t) mem_info.BaseAddress; auto membase = state->memory()->membase();
memory_basic_information->allocation_base = (uint32_t) mem_info.AllocationBase; memory_basic_information->base_address = static_cast<uint32_t>(
memory_basic_information->allocation_protect = mem_info.AllocationProtect; reinterpret_cast<uint8_t*>(mem_info.BaseAddress) - membase);
memory_basic_information->region_size = mem_info.RegionSize; memory_basic_information->allocation_base = static_cast<uint32_t>(
memory_basic_information->state = mem_info.State; reinterpret_cast<uint8_t*>(mem_info.AllocationBase) - membase);
memory_basic_information->protect = mem_info.Protect; memory_basic_information->allocation_protect = mem_info.AllocationProtect;
memory_basic_information->type = mem_info.Type; memory_basic_information->region_size =
static_cast<uint32_t>(mem_info.RegionSize);
memory_basic_information->state = mem_info.State;
memory_basic_information->protect = mem_info.Protect;
memory_basic_information->type = mem_info.Type;
if (swap) { if (swap) {
memory_basic_information->base_address = poly::byte_swap(memory_basic_information->base_address); memory_basic_information->base_address =
memory_basic_information->allocation_base = poly::byte_swap(memory_basic_information->allocation_base); poly::byte_swap(memory_basic_information->base_address);
memory_basic_information->allocation_protect = poly::byte_swap(memory_basic_information->allocation_protect); memory_basic_information->allocation_base =
memory_basic_information->region_size = poly::byte_swap(memory_basic_information->region_size); poly::byte_swap(memory_basic_information->allocation_base);
memory_basic_information->state = poly::byte_swap(memory_basic_information->state); memory_basic_information->allocation_protect =
memory_basic_information->protect = poly::byte_swap(memory_basic_information->protect); poly::byte_swap(memory_basic_information->allocation_protect);
memory_basic_information->type = poly::byte_swap(memory_basic_information->type); memory_basic_information->region_size =
poly::byte_swap(memory_basic_information->region_size);
memory_basic_information->state =
poly::byte_swap(memory_basic_information->state);
memory_basic_information->protect =
poly::byte_swap(memory_basic_information->protect);
memory_basic_information->type =
poly::byte_swap(memory_basic_information->type);
} }
XELOGE("NtQueryVirtualMemory NOT IMPLEMENTED"); XELOGE("NtQueryVirtualMemory NOT IMPLEMENTED");
@ -232,8 +243,8 @@ SHIM_CALL NtQueryVirtualMemory_shim(
X_MEMORY_BASIC_INFORMATION *memory_basic_information = (X_MEMORY_BASIC_INFORMATION*)SHIM_MEM_ADDR(memory_basic_information_ptr); X_MEMORY_BASIC_INFORMATION *memory_basic_information = (X_MEMORY_BASIC_INFORMATION*)SHIM_MEM_ADDR(memory_basic_information_ptr);
XELOGD( XELOGD(
"NtQueryVirtualMemory(%.8X, %.8X)", "NtQueryVirtualMemory(%.8X, %.8X)",
base_address, memory_basic_information_ptr); base_address, memory_basic_information_ptr);
X_STATUS result = xeNtQueryVirtualMemory(base_address, memory_basic_information, true); X_STATUS result = xeNtQueryVirtualMemory(base_address, memory_basic_information, true);
SHIM_SET_RETURN_32(result); SHIM_SET_RETURN_32(result);