summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorN00byKing <N00byKing@users.noreply.github.com>2018-02-22 20:16:43 +0100
committerN00byKing <N00byKing@hotmail.de>2018-02-25 11:38:06 +0100
commit2b41c6e5738c2052fd0aaa1cf8e5475c37614115 (patch)
tree404594c84a9f1e036632a5ad0f20e20dfbd9836d /src/core
parentMerge pull request #211 from shinyquagsire23/time_local (diff)
downloadyuzu-2b41c6e5738c2052fd0aaa1cf8e5475c37614115.tar
yuzu-2b41c6e5738c2052fd0aaa1cf8e5475c37614115.tar.gz
yuzu-2b41c6e5738c2052fd0aaa1cf8e5475c37614115.tar.bz2
yuzu-2b41c6e5738c2052fd0aaa1cf8e5475c37614115.tar.lz
yuzu-2b41c6e5738c2052fd0aaa1cf8e5475c37614115.tar.xz
yuzu-2b41c6e5738c2052fd0aaa1cf8e5475c37614115.tar.zst
yuzu-2b41c6e5738c2052fd0aaa1cf8e5475c37614115.zip
Diffstat (limited to 'src/core')
-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 cbd5b69aa..92bb80404 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <algorithm>
+#include <inttypes.h>
#include "common/logging/log.h"
#include "common/microprofile.h"
@@ -443,6 +444,16 @@ static ResultCode MapSharedMemory(Handle shared_memory_handle, VAddr addr, u64 s
return RESULT_SUCCESS;
}
+static ResultCode UnmapSharedMemory(Handle shared_memory_handle, VAddr addr, u64 size) {
+ LOG_WARNING(Kernel_SVC,
+ "called, shared_memory_handle=0x%08X, addr=0x%" PRIx64 ", size=0x%" PRIx64 "",
+ shared_memory_handle, addr, size);
+
+ SharedPtr<SharedMemory> shared_memory = g_handle_table.Get<SharedMemory>(shared_memory_handle);
+
+ return shared_memory->Unmap(g_current_process.get(), addr);
+}
+
/// Query process memory
static ResultCode QueryProcessMemory(MemoryInfo* memory_info, PageInfo* /*page_info*/,
Handle process_handle, u64 addr) {
@@ -792,7 +803,7 @@ static const FunctionDef SVC_Table[] = {
{0x11, nullptr, "SignalEvent"},
{0x12, nullptr, "ClearEvent"},
{0x13, SvcWrap<MapSharedMemory>, "MapSharedMemory"},
- {0x14, nullptr, "UnmapSharedMemory"},
+ {0x14, SvcWrap<UnmapSharedMemory>, "UnmapSharedMemory"},
{0x15, SvcWrap<CreateTransferMemory>, "CreateTransferMemory"},
{0x16, SvcWrap<CloseHandle>, "CloseHandle"},
{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() {
FuncReturn(func((u32)PARAM(0), PARAM(1), PARAM(2), (u32)PARAM(3)).raw);
}
+template <ResultCode func(u32, u64, u64)>
+void SvcWrap() {
+ FuncReturn(func((u32)PARAM(0), PARAM(1), PARAM(2)).raw);
+}
+
template <ResultCode func(u32*, u64, u64, s64)>
void SvcWrap() {
u32 param_1 = 0;