Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'patch-6' of https://github.com/sum2012/ppsspp into sum2012-patch-6

Browse Source
This commit is contained in:
Henrik Rydgård 2013-05-31 18:31:21 +02:00
commit e5e2636d1d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/HLE/sceKernelModule.cpp
View File

@ -1103,21 +1103,22 @@ void sceKernelStartModule(u32 moduleId, u32 argsize, u32 argAddr, u32 returnValu
int attribute = module->nm.attribute;
u32 entryAddr = module->nm.entry_addr;
if ((entryAddr == -1) || entryAddr == module->memoryBlockAddr - 1)
if (module->nm.module_start_func != 0 && module->nm.module_start_func != (u32)-1)
{
if (module->nm.module_start_func != 0 && module->nm.module_start_func != (u32)-1)
{
entryAddr = module->nm.module_start_func;
attribute = module->nm.module_start_thread_attr;
}
else if (optionAddr)
entryAddr = module->nm.module_start_func;
attribute = module->nm.module_start_thread_attr;
}
else if ((entryAddr == -1) || entryAddr == module->memoryBlockAddr - 1)
{
if (optionAddr)
{
// TODO: Does sceKernelStartModule() really give an error when no entry only if you pass options?
attribute = smoption.attribute;
}
else
{
// TODO: Why are we just returning the module ID in this case?
ERROR_LOG_REPORT(HLE, "sceKernelStartModule(): doing nothing for some reason?");
WARN_LOG(HLE, "sceKernelStartModule(): module has no start or entry func");
RETURN(moduleId);
return;
}