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

Ignore vtimer handler arg changes w/ NULL handler.

Browse Source 
Per tests, this is what the PSP does.  Could matter in edge cases.
This commit is contained in:
Unknown W. Brackets committed 2013-07-07 21:16:48 -07:00
1 parent bf652e4f46
commit 96bb532abb
1 file changed
+16 -4
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceKernelVTimer.cpp
+16 -4
View File
@@ -383,7 +383,10 @@ u32 sceKernelStopVTimer(u32 uid) {
}
u32 sceKernelSetVTimerHandler(u32 uid, u32 scheduleAddr, u32 handlerFuncAddr, u32 commonAddr) {
DEBUG_LOG(HLE, "sceKernelSetVTimerHandler(%08x, %08x, %08x, %08x)", uid, scheduleAddr, handlerFuncAddr, commonAddr);
if (uid == 0) {
WARN_LOG(HLE, "sceKernelSetVTimerHandler(%08x, %08x, %08x, %08x): invalid vtimer", uid, scheduleAddr, handlerFuncAddr, commonAddr);
return SCE_KERNEL_ERROR_ILLEGAL_VTID;
}
u32 error;
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
@@ -393,9 +396,12 @@ u32 sceKernelSetVTimerHandler(u32 uid, u32 scheduleAddr, u32 handlerFuncAddr, u3
return error;
}
DEBUG_LOG(HLE, "sceKernelSetVTimerHandler(%08x, %08x, %08x, %08x)", uid, scheduleAddr, handlerFuncAddr, commonAddr);
u64 schedule = Memory::Read_U64(scheduleAddr);
vt->nvt.handlerAddr = handlerFuncAddr;
vt->nvt.commonAddr = commonAddr;
if (handlerFuncAddr)
vt->nvt.commonAddr = commonAddr;
__KernelScheduleVTimer(vt, schedule);
@@ -403,7 +409,10 @@ u32 sceKernelSetVTimerHandler(u32 uid, u32 scheduleAddr, u32 handlerFuncAddr, u3
}
u32 sceKernelSetVTimerHandlerWide(u32 uid, u64 schedule, u32 handlerFuncAddr, u32 commonAddr) {
DEBUG_LOG(HLE, "sceKernelSetVTimerHandlerWide(%08x, %llu, %08x, %08x)", uid, schedule, handlerFuncAddr, commonAddr);
if (uid == 0) {
WARN_LOG(HLE, "sceKernelSetVTimerHandlerWide(%08x, %llu, %08x, %08x): invalid vtimer", uid, schedule, handlerFuncAddr, commonAddr);
return SCE_KERNEL_ERROR_ILLEGAL_VTID;
}
u32 error;
VTimer *vt = kernelObjects.Get<VTimer>(uid, error);
@@ -413,8 +422,11 @@ u32 sceKernelSetVTimerHandlerWide(u32 uid, u64 schedule, u32 handlerFuncAddr, u3
return error;
}
DEBUG_LOG(HLE, "sceKernelSetVTimerHandlerWide(%08x, %llu, %08x, %08x)", uid, schedule, handlerFuncAddr, commonAddr);
vt->nvt.handlerAddr = handlerFuncAddr;
vt->nvt.commonAddr = commonAddr;
if (handlerFuncAddr)
vt->nvt.commonAddr = commonAddr;
__KernelScheduleVTimer(vt, schedule);