From 90e56db174a82672fbecb92f97c67d564216651b Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 31 Jul 2013 00:00:45 -0700 Subject: [PATCH 1/2] Don't report 0, it seems like it's okay. --- Core/HLE/sceKernelModule.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 803a15b436..c8fbe957a1 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -605,8 +605,13 @@ Module *__KernelLoadELFFromPtr(const u8 *ptr, u32 loadAddress, std::string *erro DEBUG_LOG(LOADER, "Importing Module %s, stubs at %08x", modulename, entry->firstSymAddr); if (entry->size != 5 && entry->size != 6) { - WARN_LOG_REPORT(LOADER, "Unexpected module entry size %d", entry->size); - needReport = true; + if (entry->size != 7) { + WARN_LOG_REPORT(LOADER, "Unexpected module entry size %d", entry->size); + needReport = true; + } else if (entry->extra != 0) { + WARN_LOG_REPORT(LOADER, "Unexpected module entry with non-zero 7th value %08x", entry->extra); + needReport = true; + } } // If nidData is 0, only variables are being imported. From 9a241e8e2470be8d12eaea8186b5c6fbe5a272f6 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 31 Jul 2013 00:01:21 -0700 Subject: [PATCH 2/2] Add a couple new HLE functions for logging. --- Core/HLE/scePower.cpp | 1 + Core/HLE/sceUmd.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp index 1493f85c69..8a2fac8527 100644 --- a/Core/HLE/scePower.cpp +++ b/Core/HLE/scePower.cpp @@ -372,6 +372,7 @@ static const HLEFunction scePower[] = { {0xebd177d6,WrapU_UUU,"scePower_EBD177D6"}, // This is also the same as SetClockFrequency {0x469989ad,WrapU_UUU,"scePower_469989ad"}, // This is also the same as SetClockFrequency {0xa85880d0,WrapU_V,"scePower_a85880d0_IsPSPNonFat"}, + {0x3951af53,0,"scePowerWaitRequestCompletion"}, }; //890129c in tyshooter looks bogus diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index b13d1095fd..e9a0913078 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -350,13 +350,14 @@ const HLEFunction sceUmdUser[] = {0x56202973,WrapI_UU,"sceUmdWaitDriveStatWithTimer"}, {0x4A9E5E29,WrapI_UU,"sceUmdWaitDriveStatCB"}, {0x6af9b50a,WrapU_V,"sceUmdCancelWaitDriveStat"}, - {0x6B4A146C,&WrapU_V,"sceUmdGetDriveStat"}, {0x20628E6F,&WrapU_V,"sceUmdGetErrorStat"}, {0x340B7686,WrapU_U,"sceUmdGetDiscInfo"}, {0xAEE7404D,&WrapU_U,"sceUmdRegisterUMDCallBack"}, {0xBD2BDE07,&WrapI_I,"sceUmdUnRegisterUMDCallBack"}, {0x87533940,WrapU_V,"sceUmdReplaceProhibit"}, {0xCBE9F02A,WrapU_V,"sceUmdReplacePermit"}, + {0x14c6c45c,0,"sceUmdUser_14C6C45C"}, + {0xb103fa38,0,"sceUmdUser_B103FA38"}, }; void Register_sceUmdUser()