From bc36555f24553b7fa64d0c7bc42e113f98bcd149 Mon Sep 17 00:00:00 2001 From: sum2012 Date: Sun, 18 May 2014 04:20:48 +0800 Subject: [PATCH] sysclib_memset change to WrapU_UII --- Core/HLE/FunctionWrappers.h | 5 ----- Core/HLE/sceKernelInterrupt.cpp | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Core/HLE/FunctionWrappers.h b/Core/HLE/FunctionWrappers.h index 9277aa1e24..7d2b3cecbf 100644 --- a/Core/HLE/FunctionWrappers.h +++ b/Core/HLE/FunctionWrappers.h @@ -582,11 +582,6 @@ template void WrapU_UUU() { RETURN(retval); } -template void WrapI_UII() { - int retval = func(PARAM(0), PARAM(1), PARAM(2)); - RETURN(retval); -} - template void WrapV_IUU() { func(PARAM(0), PARAM(1), PARAM(2)); } diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 89ed236558..1d5847de84 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -651,7 +651,7 @@ int sysclib_sprintf(u32 dst, u32 fmt) { return sprintf((char *)Memory::GetPointer(dst), "%s", Memory::GetCharPointer(fmt)); } -int sysclib_memset(u32 destAddr, int data, int size) { +u32 sysclib_memset(u32 destAddr, int data, int size) { ERROR_LOG(SCEKERNEL, "Untested sysclib_memset(dest=%08x, data=%d ,size=%d)", destAddr, data, size); if (destAddr != 0) memset(Memory::GetPointer(destAddr), data, size); @@ -667,7 +667,7 @@ const HLEFunction SysclibForKernel[] = {0x52DF196C, WrapU_U, "strlen"}, {0x81D0D1F7, WrapI_UUU, "memcmp"}, {0x7661e728, WrapI_UU, "sprintf"}, - {0x10F3BB61, WrapI_UII, "memset" }, + {0x10F3BB61, WrapU_UII, "memset" }, }; void Register_Kernel_Library()