summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/svc_wrap.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-12-14 21:30:02 +0100
committerGitHub <noreply@github.com>2018-12-14 21:30:02 +0100
commit1a23970d172602497af57969824551e77ae9dfe7 (patch)
treeeb5c6849e4c83f70779b4f67ee6e1094421ac8e3 /src/core/hle/kernel/svc_wrap.h
parentMerge pull request #1871 from lioncash/move (diff)
parentsvc: Enable svcQueryProcessMemory (diff)
downloadyuzu-1a23970d172602497af57969824551e77ae9dfe7.tar
yuzu-1a23970d172602497af57969824551e77ae9dfe7.tar.gz
yuzu-1a23970d172602497af57969824551e77ae9dfe7.tar.bz2
yuzu-1a23970d172602497af57969824551e77ae9dfe7.tar.lz
yuzu-1a23970d172602497af57969824551e77ae9dfe7.tar.xz
yuzu-1a23970d172602497af57969824551e77ae9dfe7.tar.zst
yuzu-1a23970d172602497af57969824551e77ae9dfe7.zip
Diffstat (limited to 'src/core/hle/kernel/svc_wrap.h')
-rw-r--r--src/core/hle/kernel/svc_wrap.h22
1 files changed, 5 insertions, 17 deletions
diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h
index f38e0cb6f..2f758b959 100644
--- a/src/core/hle/kernel/svc_wrap.h
+++ b/src/core/hle/kernel/svc_wrap.h
@@ -7,9 +7,7 @@
#include "common/common_types.h"
#include "core/arm/arm_interface.h"
#include "core/core.h"
-#include "core/hle/kernel/svc.h"
#include "core/hle/result.h"
-#include "core/memory.h"
namespace Kernel {
@@ -132,6 +130,11 @@ void SvcWrap() {
func(Param(0), Param(1), static_cast<u32>(Param(2)), static_cast<u32>(Param(3))).raw);
}
+template <ResultCode func(u64, u64, u32, u64)>
+void SvcWrap() {
+ FuncReturn(func(Param(0), Param(1), static_cast<u32>(Param(2)), Param(3)).raw);
+}
+
template <ResultCode func(u32, u64, u32)>
void SvcWrap() {
FuncReturn(func(static_cast<u32>(Param(0)), Param(1), static_cast<u32>(Param(2))).raw);
@@ -191,21 +194,6 @@ void SvcWrap() {
FuncReturn(retval);
}
-template <ResultCode func(MemoryInfo*, PageInfo*, u64)>
-void SvcWrap() {
- MemoryInfo memory_info = {};
- PageInfo page_info = {};
- u32 retval = func(&memory_info, &page_info, Param(2)).raw;
-
- Memory::Write64(Param(0), memory_info.base_address);
- Memory::Write64(Param(0) + 8, memory_info.size);
- Memory::Write32(Param(0) + 16, memory_info.type);
- Memory::Write32(Param(0) + 20, memory_info.attributes);
- Memory::Write32(Param(0) + 24, memory_info.permission);
-
- FuncReturn(retval);
-}
-
template <ResultCode func(u32*, u64, u64, u32)>
void SvcWrap() {
u32 param_1 = 0;