From c33e8a0a27208bfa288435af1d29141e3d5e3608 Mon Sep 17 00:00:00 2001 From: David Marcec Date: Fri, 19 Jan 2018 15:20:48 -0800 Subject: [PATCH] changed perms to u32 --- src/core/hle/kernel/svc.cpp | 2 +- src/core/hle/kernel/svc_wrap.h | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 7c59021b23..59613b2064 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -737,7 +737,7 @@ static ResultCode SetThreadCoreMask(u64, u64, u64) { return RESULT_SUCCESS; } -static ResultCode CreateSharedMemory(Handle* handle, u64 sz, u64 localPerm, u64 remotePerm) { +static ResultCode CreateSharedMemory(Handle* handle, u64 sz, u32 localPerm, u32 remotePerm) { LOG_TRACE(Kernel_SVC, "called, sz=0x%llx, localPerms=0x%08x, remotePerms=0x%08x", sz, localPerm, remotePerm); auto sharedMemHandle = SharedMemory::Create( diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h index a0d45c7d09..7a165d8dc5 100644 --- a/src/core/hle/kernel/svc_wrap.h +++ b/src/core/hle/kernel/svc_wrap.h @@ -145,12 +145,13 @@ void SvcWrap() { FuncReturn(retval); } -template +template void SvcWrap() { - u32 param_1 = 0; - u32 retval = func(¶m_1, PARAM(1), PARAM(2), PARAM(3)).raw; - Core::CPU().SetReg(1, param_1); - FuncReturn(retval); + u32 param_1 = 0; + u32 retval = + func(¶m_1, PARAM(1), (u32)(PARAM(2) & 0xFFFFFFFF), (u32)(PARAM(3) & 0xFFFFFFFF)).raw; + Core::CPU().SetReg(1, param_1); + FuncReturn(retval); } ////////////////////////////////////////////////////////////////////////////////////////////////////