summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-01-18 23:44:15 -0500
committerGravatar bunnei2018-01-18 23:44:15 -0500
commite1ee8f4657235225a6cf1333b4b126ebb7931449 (patch)
treed1c5f82540db0a33e7c2620c6b550e0e97e6c748
parentsvc: Add additional fields to MemoryInfo struct. (diff)
downloadyuzu-e1ee8f4657235225a6cf1333b4b126ebb7931449.tar.gz
yuzu-e1ee8f4657235225a6cf1333b4b126ebb7931449.tar.xz
yuzu-e1ee8f4657235225a6cf1333b4b126ebb7931449.zip
svc: Fix svcGetInfo MapRegionBaseAddr.
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/svc.cpp2
-rw-r--r--src/core/hle/kernel/vm_manager.cpp5
-rw-r--r--src/core/hle/kernel/vm_manager.h3
3 files changed, 9 insertions, 1 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 45da842ef..339374aff 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -314,7 +314,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
314 *result = g_current_process->allowed_thread_priority_mask; 314 *result = g_current_process->allowed_thread_priority_mask;
315 break; 315 break;
316 case GetInfoType::MapRegionBaseAddr: 316 case GetInfoType::MapRegionBaseAddr:
317 *result = vm_manager.GetAddressSpaceBaseAddr(); 317 *result = vm_manager.GetMapRegionBaseAddr();
318 break; 318 break;
319 case GetInfoType::MapRegionSize: 319 case GetInfoType::MapRegionSize:
320 *result = vm_manager.GetAddressSpaceSize(); 320 *result = vm_manager.GetAddressSpaceSize();
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index bf261699e..93662a45e 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -375,6 +375,11 @@ u64 VMManager::GetAddressSpaceSize() {
375 return MAX_ADDRESS; 375 return MAX_ADDRESS;
376} 376}
377 377
378VAddr VMManager::GetMapRegionBaseAddr() {
379 LOG_WARNING(Kernel, "(STUBBED) called");
380 return Memory::HEAP_VADDR;
381}
382
378VAddr VMManager::GetNewMapRegionBaseAddr() { 383VAddr VMManager::GetNewMapRegionBaseAddr() {
379 LOG_WARNING(Kernel, "(STUBBED) called"); 384 LOG_WARNING(Kernel, "(STUBBED) called");
380 return 0x8000000; 385 return 0x8000000;
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h
index 7a7fee54a..b17385c7c 100644
--- a/src/core/hle/kernel/vm_manager.h
+++ b/src/core/hle/kernel/vm_manager.h
@@ -192,6 +192,9 @@ public:
192 /// Gets the total address space address size, used by svcGetInfo 192 /// Gets the total address space address size, used by svcGetInfo
193 u64 GetAddressSpaceSize(); 193 u64 GetAddressSpaceSize();
194 194
195 /// Gets the map region base address, used by svcGetInfo
196 VAddr GetMapRegionBaseAddr();
197
195 /// Gets the base address for a new memory region, used by svcGetInfo 198 /// Gets the base address for a new memory region, used by svcGetInfo
196 VAddr GetNewMapRegionBaseAddr(); 199 VAddr GetNewMapRegionBaseAddr();
197 200