mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity

svc: Improve svcGetInfo.

Browse source
This commit is contained in:
bunnei 2018-01-01 16:01:06 -05:00
parent e9710a2cf7
commit 72f671fd7a
2 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/core/hle/svc.cpp
View file

@ -194,16 +194,38 @@ static void OutputDebugString(VAddr address, s32 len) {
LOG_DEBUG(Debug_Emulated, "%.*s", len, string.data()); LOG_DEBUG(Debug_Emulated, "%.*s", len, string.data());
} }
/// Gets system/memory information for the current process
static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id) { static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id) {
LOG_TRACE(Kernel_SVC, "called, info_id=0x%X, info_sub_id=0x%X, handle=0x%08X", info_id, info_sub_id, handle); LOG_TRACE(Kernel_SVC, "called info_id=0x%X, info_sub_id=0x%X, handle=0x%08X", info_id,
info_sub_id, handle);
if (!handle) { auto& vm_manager = Kernel::g_current_process->vm_manager;
switch (info_id) { switch (static_cast<GetInfoType>(info_id)) {
case 0xB: case GetInfoType::TotalMemoryUsage:
*result = 0; // Used for PRNG seed *result = vm_manager.GetTotalMemoryUsage();
return RESULT_SUCCESS; break;
} case GetInfoType::TotalHeapUsage:
*result = vm_manager.GetTotalHeapUsage();
break;
case GetInfoType::RandomEntropy:
*result = 0;
break;
case GetInfoType::AddressSpaceBaseAddr:
*result = vm_manager.GetAddressSpaceBaseAddr();
break;
case GetInfoType::AddressSpaceSize:
*result = vm_manager.GetAddressSpaceSize();
break;
case GetInfoType::NewMapRegionBaseAddr:
*result = vm_manager.GetNewMapRegionBaseAddr();
break;
case GetInfoType::NewMapRegionSize:
*result = vm_manager.GetNewMapRegionSize();
break;
default:
UNIMPLEMENTED();
} }
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

40
src/core/hle/svc.h
View file

@ -26,35 +26,19 @@ struct PageInfo {
namespace SVC { namespace SVC {
/// Values accepted by svcGetSystemInfo's type parameter. /// Values accepted by svcGetInfo
enum class SystemInfoType { enum class GetInfoType : u64 {
/** // 1.0.0+
* Reports total used memory for all regions or a specific one, according to the extra TotalMemoryUsage = 6,
* parameter. See `SystemInfoMemUsageRegion`. TotalHeapUsage = 7,
*/ RandomEntropy = 11,
REGION_MEMORY_USAGE = 0, // 2.0.0+
/** AddressSpaceBaseAddr = 12,
* Returns the memory usage for certain allocations done internally by the kernel. AddressSpaceSize = 13,
*/ NewMapRegionBaseAddr = 14,
KERNEL_ALLOCATED_PAGES = 2, NewMapRegionSize = 15,
/**
* "This returns the total number of processes which were launched directly by the kernel.
* For the ARM11 NATIVE_FIRM kernel, this is 5, for processes sm, fs, pm, loader, and pxi."
*/
KERNEL_SPAWNED_PIDS = 26,
};
/**
* Accepted by svcGetSystemInfo param with REGION_MEMORY_USAGE type. Selects a region to query
* memory usage of.
*/
enum class SystemInfoMemUsageRegion {
ALL = 0,
APPLICATION = 1,
SYSTEM = 2,
BASE = 3,
}; };
void CallSVC(u32 immediate); void CallSVC(u32 immediate);
} // namespace } // namespace SVC