Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Memory: Make PhysicalToVirtualAddress return a boost::optional

Browse source 
And fix a few places in the code to take advantage of that.
This commit is contained in:
Yuri Kunde Schlesner 2017-06-21 20:21:49 -07:00
parent 72b69cea4b
commit 326e7c7020
4 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/hle/kernel/shared_memory.cpp
View file

@ -149,7 +149,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
if (base_address == 0 && target_address == 0) {
// Calculate the address at which to map the memory block.
target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address);
target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address).value();
}
// Map the memory block into the target process

2
src/core/hle/service/apt/apt.cpp
View file

@ -82,7 +82,7 @@ void GetSharedFont(Service::Interface* self) {
// The shared font has to be relocated to the new address before being passed to the
// application.
VAddr target_address =
Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address);
Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address).value();
if (!shared_font_relocated) {
BCFNT::RelocateSharedFont(shared_font_mem, target_address);
shared_font_relocated = true;