From e9815052f1e527941f6239c7890853b789ce5e8b Mon Sep 17 00:00:00 2001 From: raven02 Date: Sun, 27 Apr 2014 16:33:30 +0800 Subject: [PATCH 1/2] Stub SysMemUserForUser_ACBD88CA/945E45DA --- Core/HLE/sceKernelMemory.cpp | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index e13224a79e..676464b3f3 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -1818,11 +1818,22 @@ u32 GetMemoryBlockPtr(u32 uid, u32 addr) { } } -u32 SysMemUserForUser_D8DE5C1E(){ - ERROR_LOG(SCEKERNEL,"HACKIMPL SysMemUserForUser_D8DE5C1E Returning 0"); - return 0; //according to jpcsp always returns 0 +u32 SysMemUserForUser_D8DE5C1E() { + // Called by Evangelion Jo and return 0 here to go in-game. + ERROR_LOG(SCEKERNEL,"UNIMPL SysMemUserForUser_D8DE5C1E()"); + return 0; +} + +u32 SysMemUserForUser_ACBD88CA() { + ERROR_LOG_REPORT_ONCE(SysMemUserForUser_ACBD88CA, SCEKERNEL, "UNIMPL SysMemUserForUser_ACBD88CA()"); + return 0; +} + +u32 SysMemUserForUser_945E45DA() { + // Called by Evangelion Jo and expected return 0 here. + ERROR_LOG_REPORT_ONCE(SysMemUserForUser945E45DA, SCEKERNEL, "UNIMPL SysMemUserForUser_945E45DA()"); + return 0; } -// These aren't really in sysmem, but they are memory related? enum { @@ -2139,11 +2150,11 @@ const HLEFunction SysMemUserForUser[] = { {0x358ca1bb,&WrapI_I,"sceKernelSetCompiledSdkVersion606"}, {0xfc114573,&WrapI_V,"sceKernelGetCompiledSdkVersion"}, {0x2a3e5280,0,"sceKernelQueryMemoryInfo"}, - {0xacbd88ca,0,"SysMemUserForUser_ACBD88CA"}, - {0x945e45da,0,"SysMemUserForUser_945E45DA"}, + { 0xacbd88ca, WrapU_V, "SysMemUserForUser_ACBD88CA" }, + { 0x945e45da, WrapU_V, "SysMemUserForUser_945E45DA" }, {0xa6848df8,0,"sceKernelSetUsersystemLibWork"}, {0x6231a71d,0,"sceKernelSetPTRIG"}, - {0x39f49610,0,"sceKernelGetPTRIG"}, + {0x39f49610,0,"sceKernelGetPTRIG"}, // Obscure raw block API {0xDB83A952,WrapU_UU,"SysMemUserForUser_DB83A952"}, // GetMemoryBlockAddr {0x50F61D8A,WrapU_U,"SysMemUserForUser_50F61D8A"}, // FreeMemoryBlock From 9806b46586b7c1ccaf797cbfe60436f21abdae8d Mon Sep 17 00:00:00 2001 From: raven02 Date: Mon, 28 Apr 2014 15:30:32 +0800 Subject: [PATCH 2/2] Fix space issues --- Core/HLE/sceKernelMemory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index 676464b3f3..aa8514e86c 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -2150,8 +2150,8 @@ const HLEFunction SysMemUserForUser[] = { {0x358ca1bb,&WrapI_I,"sceKernelSetCompiledSdkVersion606"}, {0xfc114573,&WrapI_V,"sceKernelGetCompiledSdkVersion"}, {0x2a3e5280,0,"sceKernelQueryMemoryInfo"}, - { 0xacbd88ca, WrapU_V, "SysMemUserForUser_ACBD88CA" }, - { 0x945e45da, WrapU_V, "SysMemUserForUser_945E45DA" }, + {0xacbd88ca,WrapU_V,"SysMemUserForUser_ACBD88CA"}, + {0x945e45da,WrapU_V,"SysMemUserForUser_945E45DA"}, {0xa6848df8,0,"sceKernelSetUsersystemLibWork"}, {0x6231a71d,0,"sceKernelSetPTRIG"}, {0x39f49610,0,"sceKernelGetPTRIG"},