summaryrefslogtreecommitdiffstats
path: root/src/core/hle/svc.cpp
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2015-07-17 08:23:22 +0200
committerSubv <subv2112@gmail.com>2015-07-17 18:03:56 +0200
commit9e2962081ac21e626ea375781fea16ee301e7241 (patch)
tree8d5c41f276bc1dfedea021fe2516175d59a0e64d /src/core/hle/svc.cpp
parentMerge pull request #936 from archshift/kill-sourceforge (diff)
downloadyuzu-9e2962081ac21e626ea375781fea16ee301e7241.tar
yuzu-9e2962081ac21e626ea375781fea16ee301e7241.tar.gz
yuzu-9e2962081ac21e626ea375781fea16ee301e7241.tar.bz2
yuzu-9e2962081ac21e626ea375781fea16ee301e7241.tar.lz
yuzu-9e2962081ac21e626ea375781fea16ee301e7241.tar.xz
yuzu-9e2962081ac21e626ea375781fea16ee301e7241.tar.zst
yuzu-9e2962081ac21e626ea375781fea16ee301e7241.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/svc.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 6cde4fc87..9d441ccfc 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -22,6 +22,7 @@
#include "core/hle/kernel/shared_memory.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/timer.h"
+#include "core/hle/kernel/vm_manager.h"
#include "core/hle/function_wrappers.h"
#include "core/hle/result.h"
@@ -530,8 +531,19 @@ static ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count)
}
/// Query memory
-static ResultCode QueryMemory(void* info, void* out, u32 addr) {
- LOG_ERROR(Kernel_SVC, "(UNIMPLEMENTED) called addr=0x%08X", addr);
+static ResultCode QueryMemory(MemoryInfo* memory_info, PageInfo* page_info, u32 addr) {
+ auto vma = Kernel::g_current_process->address_space->FindVMA(addr);
+
+ if (vma == Kernel::g_current_process->address_space->vma_map.end())
+ return ResultCode(ErrorDescription::InvalidAddress, ErrorModule::OS, ErrorSummary::InvalidArgument, ErrorLevel::Usage);
+
+ memory_info->base_address = vma->second.base;
+ memory_info->permission = static_cast<u32>(vma->second.permissions);
+ memory_info->size = vma->second.size;
+ memory_info->state = static_cast<u32>(vma->second.meminfo_state);
+
+ page_info->flags = 0;
+ LOG_TRACE(Kernel_SVC, "called addr=0x%08X", addr);
return RESULT_SUCCESS;
}