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

Fix completely wrong thread status switching.

Browse source 
Wow, kinda surprised this even worked...
But now things that use sceKernelRotateThreadReadyQueue are broken again.
This commit is contained in:
Unknown W. Brackets 2013-02-09 14:27:16 -08:00
parent 411c711dac
commit b8ca8a44aa
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Core/HLE/sceKernelThread.cpp
View file

@ -1182,10 +1182,6 @@ Thread *__KernelNextThread() {
void __KernelReSchedule(const char *reason)
{
// TODO: Not sure if this is correct?
if (__GetCurrentThread() && __GetCurrentThread()->isRunning())
__KernelChangeReadyState(currentThread, true);
// cancel rescheduling when in interrupt or callback, otherwise everything will be fucked up
if (__IsInInterrupt() || __KernelInCallback())
{
@ -1208,6 +1204,10 @@ void __KernelReSchedule(const char *reason)
return;
}
// TODO: Not sure if this is correct? Probably should remove.
if (__GetCurrentThread() && __GetCurrentThread()->isRunning())
__KernelChangeReadyState(currentThread, true);
retry:
Thread *nextThread = __KernelNextThread();
@ -1439,6 +1439,8 @@ int sceKernelStartThread(SceUID threadToStartID, u32 argSize, u32 argBlockPtr)
threadToStartID,argSize,argBlockPtr);
__KernelResetThread(startThread);
if (currentThread)
__KernelChangeReadyState(currentThread, true);
__KernelChangeReadyState(startThread, threadToStartID, true, true);
u32 sp = startThread->context.r[MIPS_REG_SP];
@ -1602,7 +1604,7 @@ u32 sceKernelResumeDispatchThread(u32 suspended)
int sceKernelRotateThreadReadyQueue(int priority)
{
DEBUG_LOG(HLE,"sceKernelRotateThreadReadyQueue : rescheduling");
ERROR_LOG(HLE, "sceKernelRotateThreadReadyQueue(%x)", priority);
// TODO: Does it try better-priority threads? Is 0 special?
if (!threadReadyQueue[priority].empty())
@ -2278,15 +2280,15 @@ void __KernelSwitchContext(Thread *target, const char *reason)
oldName = cur->GetName();
if (cur->isRunning())
{
__KernelChangeReadyState(cur, oldUID, false);
cur->nt.status = (cur->nt.status | THREADSTATUS_READY) & ~THREADSTATUS_RUNNING;
}
__KernelChangeReadyState(cur, oldUID, true);
}
currentThread = target->GetUID();
if (target && target->isRunning())
__KernelChangeReadyState(target, currentThread, true);
if (target)
{
__KernelChangeReadyState(target, currentThread, false);
target->nt.status = (target->nt.status | THREADSTATUS_RUNNING) & ~THREADSTATUS_READY;
}
__KernelLoadContext(&target->context);