Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Reschedule/delay after sceKernelLoadModule() a bit.

Browse source 
Fixes Twin Brave demo, at least.
This commit is contained in:
Unknown W. Brackets 2013-03-07 23:18:33 -08:00
parent 82059b19da
commit eb34f416d9
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Core/HLE/sceKernelModule.cpp
View file

@ -29,6 +29,7 @@
#include "../FileSystems/FileSystem.h" #include "../FileSystems/FileSystem.h"
#include "../FileSystems/MetaFileSystem.h" #include "../FileSystems/MetaFileSystem.h"
#include "../Util/BlockAllocator.h" #include "../Util/BlockAllocator.h"
#include "../CoreTiming.h"
#include "../PSPLoaders.h" #include "../PSPLoaders.h"
#include "../System.h" #include "../System.h"
#include "../MemMap.h" #include "../MemMap.h"
@ -229,13 +230,24 @@ struct SceKernelSMOption {
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// STATE BEGIN // STATE BEGIN
static int actionAfterModule; static int actionAfterModule;
static int eventLoadModule = -1;
static SceUID mainModuleID; // hack static SceUID mainModuleID; // hack
// STATE END // STATE END
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
void __KernelModuleLoaded(u64 userdata, int cycleslate)
{
u32 error;
SceUID threadID = userdata & 0xFFFFFFFF;
SceUID moduleID = __KernelGetWaitValue(threadID, error);
if (error == 0 && moduleID != 0)
__KernelResumeThreadFromWait(threadID, moduleID);
}
void __KernelModuleInit() void __KernelModuleInit()
{ {
actionAfterModule = __KernelRegisterActionType(AfterModuleEntryCall::Create); actionAfterModule = __KernelRegisterActionType(AfterModuleEntryCall::Create);
eventLoadModule = CoreTiming::RegisterEvent("LoadModule", __KernelModuleLoaded);
} }
void __KernelModuleDoState(PointerWrap &p) void __KernelModuleDoState(PointerWrap &p)
@ -243,6 +255,8 @@ void __KernelModuleDoState(PointerWrap &p)
p.Do(mainModuleID); p.Do(mainModuleID);
p.Do(actionAfterModule); p.Do(actionAfterModule);
__KernelRestoreActionType(actionAfterModule, AfterModuleEntryCall::Create); __KernelRestoreActionType(actionAfterModule, AfterModuleEntryCall::Create);
p.Do(eventLoadModule);
CoreTiming::RestoreRegisterEvent(eventLoadModule, "LoadModule", __KernelModuleLoaded);
p.DoMarker("sceKernelModule"); p.DoMarker("sceKernelModule");
} }
@ -761,8 +775,10 @@ int sceKernelLoadExec(const char *filename, u32 paramPtr)
u32 sceKernelLoadModule(const char *name, u32 flags, u32 optionAddr) u32 sceKernelLoadModule(const char *name, u32 flags, u32 optionAddr)
{ {
if(!name) if (!name) {
return 0; ERROR_LOG(LOADER, "sceKernelLoadModule(NULL, %08x): Bad name", flags);
return SCE_KERNEL_ERROR_ILLEGAL_ADDR;
}
PSPFileInfo info = pspFileSystem.GetFileInfo(name); PSPFileInfo info = pspFileSystem.GetFileInfo(name);
std::string error_string; std::string error_string;
@ -810,6 +826,9 @@ u32 sceKernelLoadModule(const char *name, u32 flags, u32 optionAddr)
INFO_LOG(HLE,"%i=sceKernelLoadModule(name=%s,flag=%08x,(...))", module->GetUID(), name, flags); INFO_LOG(HLE,"%i=sceKernelLoadModule(name=%s,flag=%08x,(...))", module->GetUID(), name, flags);
} }
// TODO: This is not the right timing and probably not the right wait type, just an approximation.
CoreTiming::ScheduleEvent(usToCycles(500), eventLoadModule, __KernelGetCurThread());
__KernelWaitCurThread(WAITTYPE_SEMA, -1, module->GetUID(), 0, false, "module loaded");
return module->GetUID(); return module->GetUID();
} }