summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/svc.cpp13
-rw-r--r--src/core/hle/kernel/svc_wrap.h5
2 files changed, 17 insertions, 1 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 533787ce2..1ab8cbd88 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -3,6 +3,7 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <algorithm> 5#include <algorithm>
6#include <cinttypes>
6 7
7#include "common/logging/log.h" 8#include "common/logging/log.h"
8#include "common/microprofile.h" 9#include "common/microprofile.h"
@@ -443,6 +444,16 @@ static ResultCode MapSharedMemory(Handle shared_memory_handle, VAddr addr, u64 s
443 return RESULT_SUCCESS; 444 return RESULT_SUCCESS;
444} 445}
445 446
447static ResultCode UnmapSharedMemory(Handle shared_memory_handle, VAddr addr, u64 size) {
448 LOG_WARNING(Kernel_SVC,
449 "called, shared_memory_handle=0x%08X, addr=0x%" PRIx64 ", size=0x%" PRIx64 "",
450 shared_memory_handle, addr, size);
451
452 SharedPtr<SharedMemory> shared_memory = g_handle_table.Get<SharedMemory>(shared_memory_handle);
453
454 return shared_memory->Unmap(g_current_process.get(), addr);
455}
456
446/// Query process memory 457/// Query process memory
447static ResultCode QueryProcessMemory(MemoryInfo* memory_info, PageInfo* /*page_info*/, 458static ResultCode QueryProcessMemory(MemoryInfo* memory_info, PageInfo* /*page_info*/,
448 Handle process_handle, u64 addr) { 459 Handle process_handle, u64 addr) {
@@ -802,7 +813,7 @@ static const FunctionDef SVC_Table[] = {
802 {0x11, nullptr, "SignalEvent"}, 813 {0x11, nullptr, "SignalEvent"},
803 {0x12, SvcWrap<ClearEvent>, "ClearEvent"}, 814 {0x12, SvcWrap<ClearEvent>, "ClearEvent"},
804 {0x13, SvcWrap<MapSharedMemory>, "MapSharedMemory"}, 815 {0x13, SvcWrap<MapSharedMemory>, "MapSharedMemory"},
805 {0x14, nullptr, "UnmapSharedMemory"}, 816 {0x14, SvcWrap<UnmapSharedMemory>, "UnmapSharedMemory"},
806 {0x15, SvcWrap<CreateTransferMemory>, "CreateTransferMemory"}, 817 {0x15, SvcWrap<CreateTransferMemory>, "CreateTransferMemory"},
807 {0x16, SvcWrap<CloseHandle>, "CloseHandle"}, 818 {0x16, SvcWrap<CloseHandle>, "CloseHandle"},
808 {0x17, SvcWrap<ResetSignal>, "ResetSignal"}, 819 {0x17, SvcWrap<ResetSignal>, "ResetSignal"},
diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h
index 7a165d8dc..b224f5e67 100644
--- a/src/core/hle/kernel/svc_wrap.h
+++ b/src/core/hle/kernel/svc_wrap.h
@@ -91,6 +91,11 @@ void SvcWrap() {
91 FuncReturn(func((u32)PARAM(0), PARAM(1), PARAM(2), (u32)PARAM(3)).raw); 91 FuncReturn(func((u32)PARAM(0), PARAM(1), PARAM(2), (u32)PARAM(3)).raw);
92} 92}
93 93
94template <ResultCode func(u32, u64, u64)>
95void SvcWrap() {
96 FuncReturn(func((u32)PARAM(0), PARAM(1), PARAM(2)).raw);
97}
98
94template <ResultCode func(u32*, u64, u64, s64)> 99template <ResultCode func(u32*, u64, u64, s64)>
95void SvcWrap() { 100void SvcWrap() {
96 u32 param_1 = 0; 101 u32 param_1 = 0;