ahmed2007/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

svc: Use more correct values for GetInfo MapRegion and NewMapRegion.

Browse source
This commit is contained in:
bunnei 2018-03-14 22:09:22 -04:00
parent 8581404482
commit 34a29ad051
3 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/kernel/svc.cpp
View file

@ -317,13 +317,13 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
*result = Core::CurrentProcess()->allowed_thread_priority_mask; *result = Core::CurrentProcess()->allowed_thread_priority_mask;
break; break;
case GetInfoType::MapRegionBaseAddr: case GetInfoType::MapRegionBaseAddr:
*result = vm_manager.GetMapRegionBaseAddr(); *result = Memory::MAP_REGION_VADDR;
break; break;
case GetInfoType::MapRegionSize: case GetInfoType::MapRegionSize:
*result = vm_manager.GetAddressSpaceSize(); *result = Memory::MAP_REGION_SIZE;
break; break;
case GetInfoType::HeapRegionBaseAddr: case GetInfoType::HeapRegionBaseAddr:
*result = vm_manager.GetNewMapRegionBaseAddr() + vm_manager.GetNewMapRegionSize(); *result = Memory::HEAP_VADDR;
break; break;
case GetInfoType::HeapRegionSize: case GetInfoType::HeapRegionSize:
*result = Memory::HEAP_SIZE; *result = Memory::HEAP_SIZE;
@ -347,10 +347,10 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
*result = vm_manager.GetAddressSpaceSize(); *result = vm_manager.GetAddressSpaceSize();
break; break;
case GetInfoType::NewMapRegionBaseAddr: case GetInfoType::NewMapRegionBaseAddr:
*result = vm_manager.GetNewMapRegionBaseAddr(); *result = Memory::NEW_MAP_REGION_VADDR;
break; break;
case GetInfoType::NewMapRegionSize: case GetInfoType::NewMapRegionSize:
*result = vm_manager.GetNewMapRegionSize(); *result = Memory::NEW_MAP_REGION_SIZE;
break; break;
case GetInfoType::IsVirtualAddressMemoryEnabled: case GetInfoType::IsVirtualAddressMemoryEnabled:
*result = Core::CurrentProcess()->is_virtual_address_memory_enabled; *result = Core::CurrentProcess()->is_virtual_address_memory_enabled;

15
src/core/hle/kernel/vm_manager.cpp
View file

@ -395,19 +395,4 @@ u64 VMManager::GetAddressSpaceSize() {
return MAX_ADDRESS; return MAX_ADDRESS;
} }
VAddr VMManager::GetMapRegionBaseAddr() {
LOG_WARNING(Kernel, "(STUBBED) called");
return Memory::HEAP_VADDR;
}
VAddr VMManager::GetNewMapRegionBaseAddr() {
LOG_WARNING(Kernel, "(STUBBED) called");
return 0x8000000;
}
u64 VMManager::GetNewMapRegionSize() {
LOG_WARNING(Kernel, "(STUBBED) called");
return 0x8000000;
}
} // namespace Kernel } // namespace Kernel

9
src/core/hle/kernel/vm_manager.h
View file

@ -201,15 +201,6 @@ public:
/// Gets the total address space address size, used by svcGetInfo /// Gets the total address space address size, used by svcGetInfo
u64 GetAddressSpaceSize(); u64 GetAddressSpaceSize();
/// Gets the map region base address, used by svcGetInfo
VAddr GetMapRegionBaseAddr();
/// Gets the base address for a new memory region, used by svcGetInfo
VAddr GetNewMapRegionBaseAddr();
/// Gets the size for a new memory region, used by svcGetInfo
u64 GetNewMapRegionSize();
/// Each VMManager has its own page table, which is set as the main one when the owning process /// Each VMManager has its own page table, which is set as the main one when the owning process
/// is scheduled. /// is scheduled.
Memory::PageTable page_table; Memory::PageTable page_table;