preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-15 23:40:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Oops, still need to switch back from interrupts.

Browse Source 
There's the real problem: don't leave the thread "running".
This commit is contained in:
Unknown W. Brackets committed 2013-02-02 19:14:00 -08:00
1 parent d1c2d5ddc4
commit dd8002a42c
1 file changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceKernelThread.cpp
+9 -6
View File
@@ -690,6 +690,10 @@ bool __KernelSwitchOffThread(const char *reason)
if (threadID != threadIdleID[0] && threadID != threadIdleID[1])
{
Thread *current = __GetCurrentThread();
if (current && current->isRunning())
current->nt.status = (current->nt.status | THREADSTATUS_READY) & ~THREADSTATUS_RUNNING;
u32 error;
// Idle 0 chosen entirely arbitrarily.
Thread *t = kernelObjects.Get<Thread>(threadIdleID[0], error);
@@ -718,7 +722,10 @@ void __KernelIdle()
u32 error;
Thread *t = kernelObjects.Get<Thread>(currentCallbackThreadID, error);
if (t)
{
t->nt.status = (t->nt.status | THREADSTATUS_RUNNING) & ~THREADSTATUS_READY;
__KernelSwitchContext(t, "idle");
}
else
{
WARN_LOG(HLE, "UNTESTED - Callback thread deleted during interrupt?");
@@ -2364,10 +2371,8 @@ void __KernelExecuteMipsCallOnCurrentThread(int callId, bool reschedAfter)
}
if (call->cbId != 0)
{
g_inCbCount++;
currentCallbackThreadID = currentThread;
}
currentCallbackThreadID = currentThread;
}
void __KernelReturnFromMipsCall()
@@ -2404,10 +2409,8 @@ void __KernelReturnFromMipsCall()
cur->currentCallbackId = call->savedId;
if (call->cbId != 0)
{
g_inCbCount--;
currentCallbackThreadID = 0;
}
currentCallbackThreadID = 0;
// yeah! back in the real world, let's keep going. Should we process more callbacks?
if (!__KernelExecutePendingMipsCalls(call->reschedAfter))