Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Always specify retval when resuming a thread.

Browse Source
This commit is contained in:
Unknown W. Brackets 2013-09-08 12:02:18 -07:00
parent 035f5660e4
commit 6d8213b0c5
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/HLE/sceKernelThread.cpp
View File

@ -1548,22 +1548,6 @@ void __KernelLoadContext(ThreadContext *ctx, bool vfpuEnabled)
currentMIPS->llBit = 0;
}
u32 __KernelResumeThreadFromWait(SceUID threadID)
{
u32 error;
Thread *t = kernelObjects.Get<Thread>(threadID, error);
if (t)
{
t->resumeFromWait();
return 0;
}
else
{
ERROR_LOG(SCEKERNEL, "__KernelResumeThreadFromWait(%d): bad thread: %08x", threadID, error);
return error;
}
}
u32 __KernelResumeThreadFromWait(SceUID threadID, u32 retval)
{
u32 error;
@ -1655,7 +1639,7 @@ void hleScheduledWakeup(u64 userdata, int cyclesLate)
SceUID threadID = (SceUID)userdata;
u32 error;
if (__KernelGetWaitID(threadID, WAITTYPE_DELAY, error) == threadID)
__KernelResumeThreadFromWait(threadID);
__KernelResumeThreadFromWait(threadID, 0);
}
void __KernelScheduleWakeup(SceUID threadID, s64 usFromNow)
@ -2543,7 +2527,7 @@ int sceKernelWakeupThread(SceUID uid)
DEBUG_LOG(SCEKERNEL,"sceKernelWakeupThread(%i) - wakeupCount incremented to %i", uid, t->nt.wakeupCount);
} else {
VERBOSE_LOG(SCEKERNEL,"sceKernelWakeupThread(%i) - woke thread at %i", uid, t->nt.wakeupCount);
__KernelResumeThreadFromWait(uid);
__KernelResumeThreadFromWait(uid, 0);
hleReSchedule("thread woken up");
}
return 0;

3
Core/HLE/sceKernelThread.h
View File

@ -151,8 +151,7 @@ const char *__KernelGetThreadName(SceUID threadID);
void __KernelSaveContext(ThreadContext *ctx, bool vfpuEnabled);
void __KernelLoadContext(ThreadContext *ctx, bool vfpuEnabled);
u32 __KernelResumeThreadFromWait(SceUID threadID); // can return an error value
u32 __KernelResumeThreadFromWait(SceUID threadID, u32 retval);
u32 __KernelResumeThreadFromWait(SceUID threadID, u32 retval); // can return an error value
u32 __KernelResumeThreadFromWait(SceUID threadID, u64 retval);
inline u32 __KernelResumeThreadFromWait(SceUID threadID, int retval)