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

Fix typo in XamAlloc 

Few other inconsistencies in xboxkrnl_memory
This commit is contained in:
Dr. Chat 2017-04-17 22:57:29 -05:00
parent 5ac61aa48a
commit 7f4ee2a070
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/xam/xam_info.cc
View File

@ -162,7 +162,7 @@ void XamLoaderTerminateTitle() {
} }
DECLARE_XAM_EXPORT(XamLoaderTerminateTitle, ExportTag::kSketchy); DECLARE_XAM_EXPORT(XamLoaderTerminateTitle, ExportTag::kSketchy);
dword_result_t XamAlloc(dword_t unk, dword_t size, lpword_t out_ptr) { dword_result_t XamAlloc(dword_t unk, dword_t size, lpdword_t out_ptr) {
assert_true(unk == 0); assert_true(unk == 0);
// Allocate from the heap. Not sure why XAM does this specially, perhaps // Allocate from the heap. Not sure why XAM does this specially, perhaps

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

@ -301,16 +301,13 @@ dword_result_t MmAllocatePhysicalMemoryEx(dword_t flags, dword_t region_size,
DECLARE_XBOXKRNL_EXPORT(MmAllocatePhysicalMemoryEx, DECLARE_XBOXKRNL_EXPORT(MmAllocatePhysicalMemoryEx,
ExportTag::kImplemented | ExportTag::kMemory); ExportTag::kImplemented | ExportTag::kMemory);
dword_result_t MmFreePhysicalMemory(dword_t type, dword_t base_address) { void MmFreePhysicalMemory(dword_t type, dword_t base_address) {
// base_address = result of MmAllocatePhysicalMemory. // base_address = result of MmAllocatePhysicalMemory.
assert_true((base_address & 0x1F) == 0); assert_true((base_address & 0x1F) == 0);
auto heap = kernel_state()->memory()->LookupHeap(base_address); auto heap = kernel_state()->memory()->LookupHeap(base_address);
if (heap->Release(base_address)) { heap->Release(base_address);
return X_STATUS_SUCCESS;
}
return X_STATUS_UNSUCCESSFUL;
} }
DECLARE_XBOXKRNL_EXPORT(MmFreePhysicalMemory, ExportTag::kImplemented); DECLARE_XBOXKRNL_EXPORT(MmFreePhysicalMemory, ExportTag::kImplemented);
@ -326,14 +323,11 @@ dword_result_t MmQueryAddressProtect(dword_t base_address) {
} }
DECLARE_XBOXKRNL_EXPORT(MmQueryAddressProtect, ExportTag::kImplemented); DECLARE_XBOXKRNL_EXPORT(MmQueryAddressProtect, ExportTag::kImplemented);
dword_result_t MmSetAddressProtect(lpvoid_t base_address, dword_t region_size, void MmSetAddressProtect(lpvoid_t base_address, dword_t region_size,
dword_t protect_bits) { dword_t protect_bits) {
uint32_t protect = FromXdkProtectFlags(protect_bits); uint32_t protect = FromXdkProtectFlags(protect_bits);
auto heap = kernel_memory()->LookupHeap(base_address); auto heap = kernel_memory()->LookupHeap(base_address);
if (heap->Protect(base_address.guest_address(), region_size, protect)) { heap->Protect(base_address.guest_address(), region_size, protect);
return X_STATUS_SUCCESS;
}
return X_STATUS_UNSUCCESSFUL;
} }
DECLARE_XBOXKRNL_EXPORT(MmSetAddressProtect, DECLARE_XBOXKRNL_EXPORT(MmSetAddressProtect,
ExportTag::kImplemented | ExportTag::kMemory); ExportTag::kImplemented | ExportTag::kMemory);
@ -387,7 +381,7 @@ dword_result_t MmQueryStatistics(
} }
// Zero out the struct. // Zero out the struct.
std::memset(stats_ptr, 0, size); stats_ptr.Zero();
// Set the constants the game is likely asking for. // Set the constants the game is likely asking for.
// These numbers are mostly guessed. If the game is just checking for // These numbers are mostly guessed. If the game is just checking for
@ -478,7 +472,7 @@ dword_result_t MmMapIoSpace(dword_t unk0, lpvoid_t src_address, dword_t size,
assert_true(size == 0x40); assert_true(size == 0x40);
assert_true(flags == 0x404); assert_true(flags == 0x404);
return 0; return src_address.guest_address();
} }
DECLARE_XBOXKRNL_EXPORT(MmMapIoSpace, ExportTag::kImplemented); DECLARE_XBOXKRNL_EXPORT(MmMapIoSpace, ExportTag::kImplemented);