diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 1ed8b80d94..bc67dd807a 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -947,7 +947,7 @@ int SavedataParam::EncryptData(unsigned int mode, return -5; /* Verify encryption */ - if (sceChnnlsv_21BE78B4_(ctx2) < 0) + if (sceSdCleanList_(ctx2) < 0) return -6; /* Build the file hash from this PSP */ @@ -989,7 +989,7 @@ int SavedataParam::DecryptSave(unsigned int mode, unsigned char *data, int *data return -6; /* Verify that it decrypted correctly */ - if (sceChnnlsv_21BE78B4_(ctx2) < 0) + if (sceSdCleanList_(ctx2) < 0) return -7; if (expectedHash) { diff --git a/Core/HLE/HLETables.cpp b/Core/HLE/HLETables.cpp index d12f07d0c2..0e0999c0f9 100644 --- a/Core/HLE/HLETables.cpp +++ b/Core/HLE/HLETables.cpp @@ -183,9 +183,9 @@ const HLEFunction KDebugForKernel[] = {0X24C32559, nullptr, "sceKernelDipsw", '?', "" }, {0XD636B827, nullptr, "sceKernelRemoveByDebugSection", '?', "" }, {0X5282DD5E, nullptr, "sceKernelDipswSet", '?', "" }, - {0X9F8703E4, nullptr, "KDebugForKernel_9F8703E4", '?', "" }, - {0X333DCEC7, nullptr, "KDebugForKernel_333DCEC7", '?', "" }, - {0XE892D9A1, nullptr, "KDebugForKernel_E892D9A1", '?', "" }, + {0X9F8703E4, nullptr, "sceKernelDipswCpTime", '?', "" }, + {0X333DCEC7, nullptr, "sceKernelSm1RegisterOperations", '?', "" }, + {0XE892D9A1, nullptr, "sceKernelSm1ReferOperations", '?', "" }, {0XA126F497, nullptr, "KDebugForKernel_A126F497", '?', "" }, {0XB7251823, nullptr, "sceKernelAcceptMbogoSig", '?', "" }, }; diff --git a/Core/HLE/sceChnnlsv.cpp b/Core/HLE/sceChnnlsv.cpp index fc73837687..b82e447151 100644 --- a/Core/HLE/sceChnnlsv.cpp +++ b/Core/HLE/sceChnnlsv.cpp @@ -497,14 +497,14 @@ int sceSdSetMember_(pspChnnlsvContext2& ctx, u8* data, int alignedLen) return res; } -static int sceChnnlsv_21BE78B4(u32 ctxAddr) { +static int sceSdCleanList(u32 ctxAddr) { auto ctx = PSPPointer::Create(ctxAddr); if (!ctx.IsValid()) return hleLogError(SCEMISC, 0, "Invalid pointer"); - return hleLogSuccessI(SCEMISC, sceChnnlsv_21BE78B4_(*ctx)); + return hleLogSuccessI(SCEMISC, sceSdCleanList_(*ctx)); } -int sceChnnlsv_21BE78B4_(pspChnnlsvContext2& ctx) +int sceSdCleanList_(pspChnnlsvContext2& ctx) { memset(ctx.cryptedData, 0, 16); ctx.unkn = 0; @@ -520,7 +520,7 @@ const HLEFunction sceChnnlsv[] = {0XC4C494F8, &WrapI_UUU, "sceSdGetLastIndex", 'i', "xxx" }, {0XABFDFC8B, &WrapI_UIIUU, "sceSdCreateList", 'i', "xiixx"}, {0X850A7FA1, &WrapI_UUI, "sceSdSetMember", 'i', "xxi" }, - {0X21BE78B4, &WrapI_U, "sceChnnlsv_21BE78B4", 'i', "x" }, + {0X21BE78B4, &WrapI_U, "sceSdCleanList", 'i', "x" }, }; void Register_sceChnnlsv() diff --git a/Core/HLE/sceChnnlsv.h b/Core/HLE/sceChnnlsv.h index 14def2e780..3636e14b08 100644 --- a/Core/HLE/sceChnnlsv.h +++ b/Core/HLE/sceChnnlsv.h @@ -38,7 +38,7 @@ int sceSdSetIndex_(pspChnnlsvContext1& ctx, int value); int sceSdRemoveValue_(pspChnnlsvContext1& ctx, u8* data, int length); int sceSdCreateList_(pspChnnlsvContext2& ctx2, int mode, int uknw, u8* data, u8* cryptkey); int sceSdSetMember_(pspChnnlsvContext2& ctx, u8* data, int alignedLen); -int sceChnnlsv_21BE78B4_(pspChnnlsvContext2& ctx); +int sceSdCleanList_(pspChnnlsvContext2& ctx); int sceSdGetLastIndex_(pspChnnlsvContext1& ctx, u8* in_hash, u8* in_key); void Register_sceChnnlsv(); diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index d1d83ba453..54fac48c6b 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -3035,7 +3035,7 @@ const HLEFunction IoFileMgrForKernel[] = { {0x3251EA56, &WrapU_IU, "sceIoPollAsync", 'i', "iP", HLE_KERNEL_SYSCALL }, {0xE23EEC33, &WrapI_IU, "sceIoWaitAsync", 'i', "iP", HLE_KERNEL_SYSCALL }, {0x35DBD746, &WrapI_IU, "sceIoWaitAsyncCB", 'i', "iP", HLE_KERNEL_SYSCALL }, - {0xBD17474F, nullptr, "IoFileMgrForKernel_BD17474F", '?', "" }, + {0xBD17474F, nullptr, "sceIoGetIobUserLevel", '?', "" }, {0x76DA16E3, nullptr, "IoFileMgrForKernel_76DA16E3", '?', "" }, }; diff --git a/Core/HLE/sceKernelHeap.cpp b/Core/HLE/sceKernelHeap.cpp index b90bfdc034..d099fc3819 100644 --- a/Core/HLE/sceKernelHeap.cpp +++ b/Core/HLE/sceKernelHeap.cpp @@ -7,6 +7,7 @@ #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceKernelHeap.h" #include "Core/HLE/sceKernelMemory.h" +#include "Core/Reporting.h" #include "Core/Util/BlockAllocator.h" static const u32 KERNEL_HEAP_BLOCK_HEADER_SIZE = 8; @@ -112,9 +113,9 @@ static u32 sceKernelPartitionMaxFreeMemSize(int partitionId) { return hleLogWarning(SCEKERNEL, allocator->GetLargestFreeBlockSize()); } -static u32 SysMemForKernel_536AD5E1() +static u32 sceKernelGetUidmanCB() { - ERROR_LOG(SCEKERNEL, "UNIMP SysMemForKernel_536AD5E1"); + ERROR_LOG_REPORT(SCEKERNEL, "UNIMP sceKernelGetUidmanCB"); return 0; } @@ -165,9 +166,9 @@ const HLEFunction SysMemForKernel[] = { { 0x9697CD32, &WrapU_I, "sceKernelPartitionTotalFreeMemSize", 'x', "i" , HLE_KERNEL_SYSCALL }, { 0xE6581468, &WrapU_I, "sceKernelPartitionMaxFreeMemSize", 'x', "i" , HLE_KERNEL_SYSCALL }, { 0X3FC9AE6A, &WrapU_V, "sceKernelDevkitVersion", 'x', "" , HLE_KERNEL_SYSCALL }, - { 0X536AD5E1, &WrapU_V, "SysMemForKernel_536AD5E1", 'i', "i" , HLE_KERNEL_SYSCALL }, + { 0X536AD5E1, &WrapU_V, "sceKernelGetUidmanCB", 'i', "i" , HLE_KERNEL_SYSCALL }, { 0X7B749390, &WrapI_IU, "sceKernelFreeHeapMemory", 'i', "ix" , HLE_KERNEL_SYSCALL }, - { 0XEB7A74DB , &WrapI_IUU, "sceKernelAllocHeapMemoryWithOption", 'i', "ixp" , HLE_KERNEL_SYSCALL }, + { 0XEB7A74DB, &WrapI_IUU, "sceKernelAllocHeapMemoryWithOption", 'i', "ixp" , HLE_KERNEL_SYSCALL }, }; void Register_SysMemForKernel() { diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 37773c66cf..5b730160d5 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -2708,8 +2708,8 @@ const HLEFunction ModuleMgrForKernel[] = {0x50F0C1EC, &WrapV_UUUUU, "sceKernelStartModule", 'v', "xxxxx", HLE_NOT_IN_INTERRUPT | HLE_NOT_DISPATCH_SUSPENDED | HLE_KERNEL_SYSCALL }, {0x977DE386, &WrapU_CUU, "sceKernelLoadModule", 'x', "sxx", HLE_KERNEL_SYSCALL }, {0xA1A78C58, &WrapU_CUU, "sceKernelLoadModuleForLoadExecVSHDisc", 'x', "sxx", HLE_KERNEL_SYSCALL }, //fix for tiger x dragon - {0xCC1D3699, &WrapU_UUU, "sceKernelSelfStopUnloadModule", 'x', "xxx", HLE_KERNEL_SYSCALL }, // used in Dissidia final fantasy chinese patch - {0XD1FF982A, &WrapU_UUUUU, "sceKernelStopModule", 'x', "xxxxx", HLE_KERNEL_SYSCALL | HLE_NOT_IN_INTERRUPT | HLE_NOT_DISPATCH_SUSPENDED }, // used in Dissidia final fantasy chinese patch + {0xCC1D3699, &WrapU_UUU, "sceKernelStopUnloadSelfModule", 'x', "xxx", HLE_KERNEL_SYSCALL }, // used in Dissidia final fantasy chinese patch + {0XD1FF982A, &WrapU_UUUUU, "sceKernelStopModule", 'x', "xxxxx", HLE_KERNEL_SYSCALL | HLE_NOT_IN_INTERRUPT | HLE_NOT_DISPATCH_SUSPENDED }, // used in Dissidia final fantasy chinese patch {0x748CBED9, &WrapU_UU, "sceKernelQueryModuleInfo", 'x', "xx", HLE_KERNEL_SYSCALL }, {0x644395E2, &WrapU_UUU, "sceKernelGetModuleIdList", 'x', "xxx", HLE_KERNEL_SYSCALL }, {0X2E0911AA, &WrapU_U, "sceKernelUnloadModule", 'x', "x" , HLE_KERNEL_SYSCALL }, diff --git a/Core/HLE/sceOpenPSID.cpp b/Core/HLE/sceOpenPSID.cpp index 9d47b48374..f15b7bc142 100644 --- a/Core/HLE/sceOpenPSID.cpp +++ b/Core/HLE/sceOpenPSID.cpp @@ -20,6 +20,7 @@ #include "Core/HLE/proAdhoc.h" #include "Core/HLE/sceOpenPSID.h" #include "Core/MemMapHelpers.h" +#include "Core/Reporting.h" SceOpenPSID dummyOpenPSID = { 0x10, 0x02, 0xA3, 0x44, 0x13, 0xF5, 0x93, 0xB0, 0xCC, 0x6E, 0xD1, 0x32, 0x27, 0x85, 0x0F, 0x9D }; @@ -79,8 +80,8 @@ static s32 sceDdrdb_F013F8BF(u32 pDataPtr, u32 pSigPtr) { } // unkPtr might be a pointer to OpenPSID -static s32 sceOpenPSID_B29330DE(u32 unkPtr) { - ERROR_LOG(HLE, "UNIMPL %s(%08x)", __FUNCTION__, unkPtr); +static s32 sceOpenPSIDGetProductCode(u32 unkPtr) { + ERROR_LOG_REPORT(HLE, "UNIMPL %s(%08x)", __FUNCTION__, unkPtr); return 0; } @@ -88,8 +89,8 @@ static s32 sceOpenPSID_B29330DE(u32 unkPtr) { const HLEFunction sceOpenPSID[] = { - {0XC69BEBCE, &WrapI_U, "sceOpenPSIDGetOpenPSID", 'i', "x" }, - {0xB29330DE, &WrapI_U, "sceOpenPSID_B29330DE", 'i', "x" }, + {0xC69BEBCE, &WrapI_U, "sceOpenPSIDGetOpenPSID", 'i', "x" }, + {0xB29330DE, &WrapI_U, "sceOpenPSIDGetProductCode", 'i', "x" }, }; void Register_sceOpenPSID()