thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/artart78/ppsspp into artart78-master

Browse source
This commit is contained in:
Henrik Rydgard 2012-11-04 23:59:26 +01:00
commit 6bed1afb72
40 changed files with 979 additions and 849 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Core/HLE/sceKernelEventFlag.cpp
View file

@ -178,6 +178,13 @@ retry:
goto retry;
}
}
if (wokeThreads)
{
// Probably useful to make things go faster: trigger thread change directly after the event flag has been set
__KernelReSchedule();
}
RETURN(0);
}
else
@ -211,9 +218,9 @@ void sceKernelWaitEventFlag()
th.wait = wait;
th.outAddr = outBitsPtr;
e->waitingThreads.push_back(th);
u32 timeout;
if (Memory::IsValidAddress(timeoutPtr))
timeout = Memory::Read_U32(timeoutPtr);
//u32 timeout;
//if (Memory::IsValidAddress(timeoutPtr))
// timeout = Memory::Read_U32(timeoutPtr);
__KernelWaitCurThread(WAITTYPE_EVENTFLAG, id, 0, 0, false);
}
@ -250,9 +257,9 @@ void sceKernelWaitEventFlagCB()
th.wait = wait;
th.outAddr = outBitsPtr;
e->waitingThreads.push_back(th);
u32 timeout;
if (Memory::IsValidAddress(timeoutPtr))
timeout = Memory::Read_U32(timeoutPtr);
//u32 timeout;
//if (Memory::IsValidAddress(timeoutPtr))
// timeout = Memory::Read_U32(timeoutPtr);
__KernelWaitCurThread(WAITTYPE_EVENTFLAG, id, 0, 0, true);
}