preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-03 11:15:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Thread: Better/minor accuracy for sysclock delay.

Browse Source 
Certain negative values shouldn't cause a delay, could help if a game has
a bug.
This commit is contained in:
Unknown W. Brackets
2016-05-31 09:55:19 -07:00
parent baac12b327
commit 197f3393df
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceKernelThread.cpp
+25 -16
View File
@@ -2413,6 +2413,17 @@ static s64 __KernelDelayThreadUs(u64 usec) {
if (usec < 200) {
return 210;
}
if (usec > 0x8000000000000000ULL) {
// Wrap around (behavior seen on firmware) and potentially wake up soon.
usec -= 0x8000000000000000ULL;
}
if (usec > 0x0010000000000000ULL) {
// This will probably overflow when we convert to cycles.
// Note: converting millenia to hundreds of years. Should be safe, basically perma-delay.
usec >>= 12;
}
// It never wakes up right away. It usually takes at least 15 extra us, but let's be nicer.
return usec + 10;
}
@@ -2439,40 +2450,38 @@ int sceKernelDelayThread(u32 usec) {
return hleLogSuccessI(SCEKERNEL, 0, "delaying %lld usecs", delayUs);
}
int sceKernelDelaySysClockThreadCB(u32 sysclockAddr)
{
int sceKernelDelaySysClockThreadCB(u32 sysclockAddr) {
auto sysclock = PSPPointer<SceKernelSysClock>::Create(sysclockAddr);
if (!sysclock.IsValid()) {
ERROR_LOG(SCEKERNEL, "sceKernelDelaySysClockThreadCB(%08x) - bad pointer", sysclockAddr);
return -1;
// Note: crashes on real firmware.
return hleLogError(SCEKERNEL, SCE_KERNEL_ERROR_ILLEGAL_ADDRESS, "bad pointer");
}
// TODO: Which unit?
// This is just a u64 of usecs. All bits are respected, but overflow can happen for very large values.
u64 usec = sysclock->lo | ((u64)sysclock->hi << 32);
DEBUG_LOG(SCEKERNEL, "sceKernelDelaySysClockThreadCB(%08x (%llu))", sysclockAddr, usec);
SceUID curThread = __KernelGetCurThread();
__KernelScheduleWakeup(curThread, __KernelDelayThreadUs(usec));
s64 delayUs = __KernelDelayThreadUs(usec);
__KernelScheduleWakeup(curThread, delayUs);
__KernelWaitCurThread(WAITTYPE_DELAY, curThread, 0, 0, true, "thread delayed");
return 0;
return hleLogSuccessI(SCEKERNEL, 0, "delaying %lld usecs", delayUs);
}
int sceKernelDelaySysClockThread(u32 sysclockAddr)
{
int sceKernelDelaySysClockThread(u32 sysclockAddr) {
auto sysclock = PSPPointer<SceKernelSysClock>::Create(sysclockAddr);
if (!sysclock.IsValid()) {
ERROR_LOG(SCEKERNEL, "sceKernelDelaySysClockThread(%08x) - bad pointer", sysclockAddr);
return -1;
// Note: crashes on real firmware.
return hleLogError(SCEKERNEL, SCE_KERNEL_ERROR_ILLEGAL_ADDRESS, "bad pointer");
}
// TODO: Which unit?
// This is just a u64 of usecs. All bits are respected, but overflow can happen for very large values.
u64 usec = sysclock->lo | ((u64)sysclock->hi << 32);
DEBUG_LOG(SCEKERNEL, "sceKernelDelaySysClockThread(%08x (%llu))", sysclockAddr, usec);
SceUID curThread = __KernelGetCurThread();
__KernelScheduleWakeup(curThread, __KernelDelayThreadUs(usec));
s64 delayUs = __KernelDelayThreadUs(usec);
__KernelScheduleWakeup(curThread, delayUs);
__KernelWaitCurThread(WAITTYPE_DELAY, curThread, 0, 0, false, "thread delayed");
return 0;
return hleLogSuccessI(SCEKERNEL, 0, "delaying %lld usecs", delayUs);
}
u32 __KernelGetThreadPrio(SceUID id)