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

Merge remote-tracking branch 'GliniakRepo/experimentals' into canary_experimental

Browse Source
This commit is contained in:
Gliniak
2022-05-19 10:51:44 +02:00
parent e901567193 e9b9302cd3
commit 6c6c5ac14b
12 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/xenia/kernel/xboxkrnl/xboxkrnl_audio_xma.cc
View File

@@ -385,6 +385,9 @@ dword_result_t XMABlockWhileInUse_entry(lpvoid_t context_ptr) {
if (!context.input_buffer_0_valid && !context.input_buffer_1_valid) {
break;
}
if (!context.work_buffer_ptr) {
break;
}
xe::threading::Sleep(std::chrono::milliseconds(1));
} while (true);
return 0;

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

@@ -372,6 +372,12 @@ dword_result_t MmAllocatePhysicalMemoryEx_entry(
// min_addr_range/max_addr_range are bounds in physical memory, not virtual.
uint32_t heap_base = heap->heap_base();
uint32_t heap_physical_address_offset = heap->GetPhysicalAddress(heap_base);
// TODO(Gliniak): Games like 545108B4 compares min_addr_range with value returned.
// 0x1000 offset causes it to go below that minimal range and goes haywire
if (min_addr_range && max_addr_range) {
heap_physical_address_offset = 0;
}
uint32_t heap_min_addr =
xe::sat_sub(min_addr_range.value(), heap_physical_address_offset);
uint32_t heap_max_addr =