diff options
author | Lioncash <mathew1800@gmail.com> | 2018-12-19 04:30:53 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-12-19 04:30:56 +0100 |
commit | 43e1189688a948e167ade54fdf2ba4007289aefd (patch) | |
tree | b00f881250c7c0679e401251aed411b72f2cea59 /src/core | |
parent | kernel/process: Make process_id a 64-bit value (diff) | |
download | yuzu-43e1189688a948e167ade54fdf2ba4007289aefd.tar yuzu-43e1189688a948e167ade54fdf2ba4007289aefd.tar.gz yuzu-43e1189688a948e167ade54fdf2ba4007289aefd.tar.bz2 yuzu-43e1189688a948e167ade54fdf2ba4007289aefd.tar.lz yuzu-43e1189688a948e167ade54fdf2ba4007289aefd.tar.xz yuzu-43e1189688a948e167ade54fdf2ba4007289aefd.tar.zst yuzu-43e1189688a948e167ade54fdf2ba4007289aefd.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/svc_wrap.h | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 348a22904..c8b60b16c 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -365,7 +365,7 @@ static ResultCode GetThreadId(u32* thread_id, Handle thread_handle) { } /// Get the ID of the specified process -static ResultCode GetProcessId(u32* process_id, Handle process_handle) { +static ResultCode GetProcessId(u64* process_id, Handle process_handle) { LOG_TRACE(Kernel_SVC, "called process=0x{:08X}", process_handle); const auto& handle_table = Core::CurrentProcess()->GetHandleTable(); diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h index 2f758b959..2a2c2c5ea 100644 --- a/src/core/hle/kernel/svc_wrap.h +++ b/src/core/hle/kernel/svc_wrap.h @@ -73,7 +73,15 @@ void SvcWrap() { template <ResultCode func(u32*, u64)> void SvcWrap() { u32 param_1 = 0; - u32 retval = func(¶m_1, Param(1)).raw; + const u32 retval = func(¶m_1, Param(1)).raw; + Core::CurrentArmInterface().SetReg(1, param_1); + FuncReturn(retval); +} + +template <ResultCode func(u64*, u32)> +void SvcWrap() { + u64 param_1 = 0; + const u32 retval = func(¶m_1, static_cast<u32>(Param(1))).raw; Core::CurrentArmInterface().SetReg(1, param_1); FuncReturn(retval); } |