mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Merge pull request #22139 from hrydgard/more-nid-names
Apply proper names to some more HLE functions
This commit is contained in:
8 files changed
+17
-18
No files matched your search
@@ -7,9 +7,10 @@ static int sceChkregCheckRegion(int unknown1, int unknown2) {
|
||||
return hleLogWarning(Log::sceMisc, 1);
|
||||
}
|
||||
|
||||
int sceChkreg_driver_6894A027(u32 unknown1, u32 unknown2) {
|
||||
if (Memory::IsValid4AlignedAddress(unknown1)) {
|
||||
Memory::WriteUnchecked_U32(1, unknown1);
|
||||
// uofw: s32 sceChkregGetPsFlags(u8 *pPsFlags, s32 index)
|
||||
static int sceChkregGetPsFlags(u32 pPsFlags, int index) {
|
||||
if (Memory::IsValid4AlignedAddress(pPsFlags)) {
|
||||
Memory::WriteUnchecked_U32(1, pPsFlags);
|
||||
}
|
||||
return hleLogWarning(Log::sceMisc, 0);
|
||||
}
|
||||
@@ -31,7 +32,7 @@ int sceChkregGetPsCode(u32 ptr) {
|
||||
static const HLEFunction sceChkreg[] = {
|
||||
{0x54495B19, &WrapI_II<sceChkregCheckRegion>, "sceChkregCheckRegion", 'i', "ii" },
|
||||
{0x59F8491D, &WrapI_U< sceChkregGetPsCode>, "sceChkregGetPsCode", 'i', "x"},
|
||||
{0x6894A027, &WrapI_UU<sceChkreg_driver_6894A027>, "sceChkreg_driver_6894A027", 'i', "xx" },
|
||||
{0x6894A027, &WrapI_UI<sceChkregGetPsFlags>, "sceChkregGetPsFlags", 'i', "xi" },
|
||||
{0x7939C851, &WrapI_V<sceChkregGetPspModel>, "sceChkregGetPspModel", 'i', "" },
|
||||
};
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ const HLEFunction sceImpose[] = {
|
||||
{0XFCD44963, nullptr, "sceImpose_FCD44963", '?', "" },
|
||||
{0XA9884B00, nullptr, "sceImpose_A9884B00", '?', "" },
|
||||
{0XBB3F5DEC, nullptr, "sceImpose_BB3F5DEC", '?', "" },
|
||||
{0X9BA61B49, nullptr, "sceImpose_9BA61B49", '?', "" },
|
||||
{0X9BA61B49, nullptr, "sceImpose_9BA61B49", '?', "" }, // jpcsp: isHomeButtonPressed() -> bool
|
||||
{0XFF1A2F07, nullptr, "sceImpose_FF1A2F07", '?', "" },
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -3063,7 +3063,7 @@ const HLEFunction IoFileMgrForKernel[] = {
|
||||
{0xE23EEC33, &WrapI_IU<sceIoWaitAsync>, "sceIoWaitAsync", 'i', "iP", HLE_KERNEL_SYSCALL },
|
||||
{0x35DBD746, &WrapI_IU<sceIoWaitAsyncCB>, "sceIoWaitAsyncCB", 'i', "iP", HLE_KERNEL_SYSCALL },
|
||||
{0xBD17474F, nullptr, "sceIoGetIobUserLevel", '?', "" },
|
||||
{0x76DA16E3, nullptr, "IoFileMgrForKernel_76DA16E3", '?', "" },
|
||||
{0x76DA16E3, nullptr, "sceIoTerminateFd", '?', "" },
|
||||
};
|
||||
|
||||
void Register_IoFileMgrForKernel() {
|
||||
|
||||
@@ -982,7 +982,7 @@ const HLEFunction LoadExecForUser[] =
|
||||
{0XBD2F1094, &WrapI_CU<sceKernelLoadExec>, "sceKernelLoadExec", 'i', "sx" },
|
||||
{0X2AC9954B, &WrapV_V<sceKernelExitGameWithStatus>, "sceKernelExitGameWithStatus", 'v', "" },
|
||||
{0X362A956B, &WrapI_V<LoadExecForUser_362A956B>, "LoadExecForUser_362A956B", 'i', "" },
|
||||
{0X8ADA38D3, nullptr, "LoadExecForUser_8ADA38D3", '?', "" },
|
||||
{0X8ADA38D3, nullptr, "sceKernelLoadExecNpDrm", '?', "" },
|
||||
};
|
||||
|
||||
void Register_LoadExecForUser()
|
||||
|
||||
@@ -1676,9 +1676,7 @@ static u32 SysMemUserForUser_D8DE5C1E() {
|
||||
}
|
||||
|
||||
// Real name per uofw's src/kd/sysmem/exports.exp: sceKernelTotalMemSize - the total size (not
|
||||
// free size, see sceKernelMaxFreeMemSize above) of the user memory partition. Was previously
|
||||
// an unconditional `return 0` - real callers doing size-based decisions (e.g. "is there enough
|
||||
// memory to enable feature X") would see 0 total memory instead of a real, sane value.
|
||||
// free size, see sceKernelMaxFreeMemSize above) of the user memory partition.
|
||||
static u32 sceKernelTotalMemSize() {
|
||||
return hleLogDebug(Log::sceKernel, PSP_GetUserMemoryEnd() - PSP_GetUserMemoryBase());
|
||||
}
|
||||
@@ -2116,7 +2114,7 @@ const HLEFunction SysMemUserForUser[] = {
|
||||
{0X358CA1BB, &WrapI_I<sceKernelSetCompiledSdkVersion606>, "sceKernelSetCompiledSdkVersion606", 'i', "i" },
|
||||
{0XFC114573, &WrapI_V<sceKernelGetCompiledSdkVersion>, "sceKernelGetCompiledSdkVersion", 'i', "" },
|
||||
{0X2A3E5280, nullptr, "sceKernelQueryMemoryInfo", '?', "" },
|
||||
{0XACBD88CA, &WrapU_V<sceKernelTotalMemSize>, "sceKernelTotalMemSize", 'x', "" },
|
||||
{0XACBD88CA, &WrapU_V<sceKernelTotalMemSize>, "sceKernelTotalMemSize", 'x', "" },
|
||||
{0X945E45DA, &WrapU_V<SysMemUserForUser_945E45DA>, "SysMemUserForUser_945E45DA", 'x', "" },
|
||||
{0XA6848DF8, nullptr, "sceKernelSetUsersystemLibWork", '?', "" },
|
||||
{0X6231A71D, nullptr, "sceKernelSetPTRIG", '?', "" },
|
||||
|
||||
@@ -2986,8 +2986,8 @@ const HLEFunction ModuleMgrForUser[] = {
|
||||
{0XFEF27DC1, &WrapU_CU<sceKernelLoadModuleDNAS>, "sceKernelLoadModuleDNAS", 'x', "sx" },
|
||||
{0X644395E2, &WrapU_UUU<sceKernelGetModuleIdList>, "sceKernelGetModuleIdList", 'x', "xxx" },
|
||||
{0XF2D8D1B4, &WrapU_CUU<sceKernelLoadModuleNpDrm>, "sceKernelLoadModuleNpDrm", 'x', "sxx" },
|
||||
{0XE4C4211C, nullptr, "ModuleMgrForUser_E4C4211C", '?', "" },
|
||||
{0XFBE27467, nullptr, "ModuleMgrForUser_FBE27467", '?', "" },
|
||||
{0XE4C4211C, nullptr, "sceKernelLoadModuleWithBlockOffset", '?', "" },
|
||||
{0XFBE27467, nullptr, "sceKernelLoadModuleByIDWithBlockOffset", '?', "" },
|
||||
};
|
||||
|
||||
const HLEFunction ModuleMgrForKernel[] = {
|
||||
|
||||
@@ -620,7 +620,7 @@ static const HLEFunction scePower[] = {
|
||||
{0X34F9C463, &WrapU_V<scePowerGetPllClockFrequencyInt>, "scePowerGetPllClockFrequencyInt", 'x', "" },
|
||||
{0XEA382A27, &WrapF_V<scePowerGetPllClockFrequencyFloat>, "scePowerGetPllClockFrequencyFloat", 'f', "" },
|
||||
{0XEBD177D6, &WrapU_UUU<scePowerSetClockFrequency>, "scePowerSetClockFrequency350", 'x', "xxx"}, // This is also the same as SetClockFrequency
|
||||
{0X469989AD, &WrapU_UUU<scePowerSetClockFrequency>, "scePower_469989ad", 'x', "xxx"}, // This is also the same as SetClockFrequency
|
||||
{0X469989AD, &WrapU_UUU<scePowerSetClockFrequency>, "scePowerSetClockFrequency630", 'x', "xxx"}, // This is also the same as SetClockFrequency
|
||||
{0X545A7F3C, nullptr, "scePower_545A7F3C", '?', "" }, // TODO: Supposedly the same as SetClockFrequency also?
|
||||
{0XA4E93389, nullptr, "scePower_A4E93389", '?', "" }, // TODO: Supposedly the same as SetClockFrequency also?
|
||||
{0XA85880D0, &WrapU_V<scePowerCheckWlanCoexistenceClock>, "scePowerCheckWlanCoexistenceClock", 'x', "" },
|
||||
|
||||
@@ -1587,10 +1587,10 @@ const HLEFunction sceUtility[] = {
|
||||
{0X417BED54, nullptr, "sceNetplayDialogUpdate", '?', "" },
|
||||
{0XB6CEE597, nullptr, "sceNetplayDialogGetStatus", '?', "" },
|
||||
|
||||
{0X28D35634, nullptr, "sceUtility_28D35634", '?', "" },
|
||||
{0X70267ADF, nullptr, "sceUtility_70267ADF", '?', "" },
|
||||
{0XECE1D3E5, nullptr, "sceUtility_ECE1D3E5", '?', "" },
|
||||
{0XEF3582B2, nullptr, "sceUtility_EF3582B2", '?', "" },
|
||||
{0X28D35634, nullptr, "sceUtility_28D35634", '?', "" }, // jpcsp: getAuthName(char *authNameOut64)
|
||||
{0X70267ADF, nullptr, "sceUtility_70267ADF", '?', "" }, // jpcsp: setAuthKey(const char *authKey64)
|
||||
{0XECE1D3E5, nullptr, "sceUtility_ECE1D3E5", '?', "" }, // jpcsp: setAuthName(const char *authName64)
|
||||
{0XEF3582B2, nullptr, "sceUtility_EF3582B2", '?', "" }, // jpcsp: getAuthKey(char *authKeyOut64)
|
||||
|
||||
{0x05e242a1, nullptr, "sceUtility_05e242a1", '?', "" },
|
||||
{0x644b513b, nullptr, "sceUtility_644b513b", '?', "" },
|
||||
|
||||
Reference in new issue
Block a user