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

Fix running threads in processing callbacks state.

Browse source 
ActionAfterMipsCall was setting it back when it saved it.
This commit is contained in:
Unknown W. Brackets 2012-12-08 15:28:54 -08:00
parent 9cd47e210b
commit ff7e1d7be9
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Core/HLE/sceKernelThread.cpp
View file

@ -1664,6 +1664,7 @@ void __KernelCallAddress(Thread *thread, u32 entryPoint, Action *afterAction, bo
after->waitType = thread->nt.waitType; after->waitType = thread->nt.waitType;
after->waitId = thread->nt.waitID; after->waitId = thread->nt.waitID;
after->waitInfo = thread->waitInfo; after->waitInfo = thread->waitInfo;
after->isProcessingCallbacks = thread->isProcessingCallbacks;
afterAction = after; afterAction = after;
@ -1841,8 +1842,9 @@ void ActionAfterCallback::run() {
// Check callbacks on the current thread only. // Check callbacks on the current thread only.
// Returns true if any callbacks were processed on the current thread. // Returns true if any callbacks were processed on the current thread.
bool __KernelCheckThreadCallbacks(Thread *thread) { bool __KernelCheckThreadCallbacks(Thread *thread, bool force)
if (!thread->isProcessingCallbacks) {
if (!thread->isProcessingCallbacks && !force)
return false; return false;
for (int i = 0; i < THREAD_CALLBACK_NUM_TYPES; i++) { for (int i = 0; i < THREAD_CALLBACK_NUM_TYPES; i++) {
@ -1865,7 +1867,7 @@ bool __KernelCheckCallbacks() {
for (std::vector<Thread *>::iterator iter = threadqueue.begin(); iter != threadqueue.end(); iter++) { for (std::vector<Thread *>::iterator iter = threadqueue.begin(); iter != threadqueue.end(); iter++) {
Thread *thread = *iter; Thread *thread = *iter;
if (thread->isProcessingCallbacks && __KernelCheckThreadCallbacks(thread)) { if (__KernelCheckThreadCallbacks(thread, false)) {
processed = true; processed = true;
} }
} }
@ -1877,13 +1879,7 @@ bool __KernelForceCallbacks()
{ {
Thread *curThread = __GetCurrentThread(); Thread *curThread = __GetCurrentThread();
// This thread can now process callbacks. bool callbacksProcessed = __KernelCheckThreadCallbacks(curThread, true);
curThread->isProcessingCallbacks = true;
bool callbacksProcessed = __KernelCheckThreadCallbacks(curThread);
// Note - same thread as above - checking callbacks may switch threads.
curThread->isProcessingCallbacks = false;
return callbacksProcessed; return callbacksProcessed;
} }