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

Properly delete alarms after they run.

Browse source 
Also fix refer, based on tests.
This commit is contained in:
Unknown W. Brackets 2012-12-21 12:28:28 -08:00
parent 522b16bb89
commit dbec955a99
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Core/HLE/sceKernelAlarm.cpp
View file

@ -64,8 +64,15 @@ public:
// A non-zero result means to reschedule. // A non-zero result means to reschedule.
if (result > 0) if (result > 0)
__KernelScheduleAlarm(alarm, (u64) usToCycles(result)); __KernelScheduleAlarm(alarm, (u64) usToCycles(result));
else if (result < 0) else
{
if (result < 0)
WARN_LOG(HLE, "Alarm requested reschedule for negative value %u, ignoring", (unsigned) result); WARN_LOG(HLE, "Alarm requested reschedule for negative value %u, ignoring", (unsigned) result);
// Delete the alarm if it's not rescheduled.
__ReleaseSubInterruptHandler(PSP_SYSTIMER0_INTR, alarm->GetUID());
kernelObjects.Destroy<Alarm>(alarm->GetUID());
}
} }
Alarm *alarm; Alarm *alarm;
@ -167,14 +174,13 @@ int sceKernelReferAlarmStatus(SceUID uid, u32 infoPtr)
u32 size = Memory::Read_U32(infoPtr); u32 size = Memory::Read_U32(infoPtr);
// Alarms actually respect size and write (kinda) what it can hold. // Alarms actually respect size and write (kinda) what it can hold.
// Intentionally 1 not 4. if (size > 0)
if (size >= 1)
Memory::Write_U32(alarm->alm.size, infoPtr); Memory::Write_U32(alarm->alm.size, infoPtr);
if (size >= 12) if (size > 4)
Memory::Write_U64(alarm->alm.schedule, infoPtr + 4); Memory::Write_U64(alarm->alm.schedule, infoPtr + 4);
if (size >= 16) if (size > 12)
Memory::Write_U32(alarm->alm.handlerPtr, infoPtr + 12); Memory::Write_U32(alarm->alm.handlerPtr, infoPtr + 12);
if (size >= 20) if (size > 16)
Memory::Write_U32(alarm->alm.commonPtr, infoPtr + 16); Memory::Write_U32(alarm->alm.commonPtr, infoPtr + 16);
return 0; return 0;