cemu-project_Mirror/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-04-29 06:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

coreinit: Clean up time functions

Browse source
This commit is contained in:
Exzap 2025-01-30 03:49:17 +01:00
parent c714e8cb6b
commit ec2d7c086a
16 changed files with 40 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Cafe/HW/Espresso/Recompiler/PPCRecompilerX64.cpp
View file

@ -114,13 +114,13 @@ void* ATTR_MS_ABI PPCRecompiler_virtualHLE(PPCInterpreter_t* hCPU, uint32 hleFun
void ATTR_MS_ABI PPCRecompiler_getTBL(PPCInterpreter_t* hCPU, uint32 gprIndex) void ATTR_MS_ABI PPCRecompiler_getTBL(PPCInterpreter_t* hCPU, uint32 gprIndex)
{ {
uint64 coreTime = coreinit::coreinit_getTimerTick(); uint64 coreTime = coreinit::OSGetSystemTime();
hCPU->gpr[gprIndex] = (uint32)(coreTime&0xFFFFFFFF); hCPU->gpr[gprIndex] = (uint32)(coreTime&0xFFFFFFFF);
} }
void ATTR_MS_ABI PPCRecompiler_getTBU(PPCInterpreter_t* hCPU, uint32 gprIndex) void ATTR_MS_ABI PPCRecompiler_getTBU(PPCInterpreter_t* hCPU, uint32 gprIndex)
{ {
uint64 coreTime = coreinit::coreinit_getTimerTick(); uint64 coreTime = coreinit::OSGetSystemTime();
hCPU->gpr[gprIndex] = (uint32)((coreTime>>32)&0xFFFFFFFF); hCPU->gpr[gprIndex] = (uint32)((coreTime>>32)&0xFFFFFFFF);
} }

2
src/Cafe/HW/Latte/Core/LatteCommandProcessor.cpp
View file

@ -799,7 +799,7 @@ LatteCMDPtr LatteCP_itHLESampleTimer(LatteCMDPtr cmd, uint32 nWords)
{ {
cemu_assert_debug(nWords == 1); cemu_assert_debug(nWords == 1);
MPTR timerMPTR = (MPTR)LatteReadCMD(); MPTR timerMPTR = (MPTR)LatteReadCMD();
memory_writeU64(timerMPTR, coreinit::coreinit_getTimerTick()); memory_writeU64(timerMPTR, coreinit::OSGetSystemTime());
return cmd; return cmd;
} }

6
src/Cafe/IOSU/legacy/iosu_acp.cpp
View file

@ -469,7 +469,7 @@ namespace iosu
entry->ukn0C = 0; entry->ukn0C = 0;
entry->sizeA = _swapEndianU64(0); // ukn entry->sizeA = _swapEndianU64(0); // ukn
entry->sizeB = _swapEndianU64(dirSize); entry->sizeB = _swapEndianU64(dirSize);
entry->time = _swapEndianU64((coreinit::coreinit_getOSTime() / ESPRESSO_TIMER_CLOCK)); entry->time = _swapEndianU64((coreinit::OSGetTime() / ESPRESSO_TIMER_CLOCK));
sprintf(entry->path, "%susr/save/%08x/%08x/meta/", devicePath, (uint32)(titleId >> 32), (uint32)(titleId & 0xFFFFFFFF)); sprintf(entry->path, "%susr/save/%08x/%08x/meta/", devicePath, (uint32)(titleId >> 32), (uint32)(titleId & 0xFFFFFFFF));
count++; count++;
} }
@ -504,7 +504,7 @@ namespace iosu
entry->ukn0C = 0; entry->ukn0C = 0;
entry->sizeA = _swapEndianU64(0); entry->sizeA = _swapEndianU64(0);
entry->sizeB = _swapEndianU64(0); entry->sizeB = _swapEndianU64(0);
entry->time = _swapEndianU64((coreinit::coreinit_getOSTime() / ESPRESSO_TIMER_CLOCK)); entry->time = _swapEndianU64((coreinit::OSGetTime() / ESPRESSO_TIMER_CLOCK));
sprintf(entry->path, "%susr/save/%08x/%08x/meta/", devicePath, (uint32)(titleId >> 32), (uint32)(titleId & 0xFFFFFFFF)); sprintf(entry->path, "%susr/save/%08x/%08x/meta/", devicePath, (uint32)(titleId >> 32), (uint32)(titleId & 0xFFFFFFFF));
count++; count++;
} }
@ -584,7 +584,7 @@ namespace iosu
uint64 _ACPGetTimestamp() uint64 _ACPGetTimestamp()
{ {
return coreinit::coreinit_getOSTime() / ESPRESSO_TIMER_CLOCK; return coreinit::OSGetTime() / ESPRESSO_TIMER_CLOCK;
} }
nnResult ACPUpdateSaveTimeStamp(uint32 persistentId, uint64 titleId, ACPDeviceType deviceType) nnResult ACPUpdateSaveTimeStamp(uint32 persistentId, uint64 titleId, ACPDeviceType deviceType)

2
src/Cafe/OS/libs/camera/camera.cpp
View file

@ -186,7 +186,7 @@ namespace camera
if (g_cameraCounter == 0) if (g_cameraCounter == 0)
{ {
coreinit::OSCreateAlarm(g_alarm_camera.GetPtr()); coreinit::OSCreateAlarm(g_alarm_camera.GetPtr());
coreinit::OSSetPeriodicAlarm(g_alarm_camera.GetPtr(), coreinit::coreinit_getOSTime(), (uint64)ESPRESSO_TIMER_CLOCK / 60ull, RPLLoader_MakePPCCallable(ppcCAMUpdate60)); coreinit::OSSetPeriodicAlarm(g_alarm_camera.GetPtr(), coreinit::OSGetTime(), (uint64)ESPRESSO_TIMER_CLOCK / 60ull, RPLLoader_MakePPCCallable(ppcCAMUpdate60));
} }
g_cameraCounter++; g_cameraCounter++;

8
src/Cafe/OS/libs/coreinit/coreinit_Alarm.cpp
View file

@ -166,7 +166,7 @@ namespace coreinit
void alarm_update() void alarm_update()
{ {
cemu_assert_debug(!__OSHasSchedulerLock()); cemu_assert_debug(!__OSHasSchedulerLock());
uint64 currentTick = coreinit::coreinit_getOSTime(); uint64 currentTick = coreinit::OSGetTime();
if (!OSHostAlarm::quickCheckForAlarm(currentTick)) if (!OSHostAlarm::quickCheckForAlarm(currentTick))
return; return;
__OSLockScheduler(); __OSLockScheduler();
@ -233,7 +233,7 @@ namespace coreinit
if (period == 0) if (period == 0)
return; return;
uint64 currentTime = coreinit_getOSTime(); uint64 currentTime = OSGetTime();
uint64 ticksSinceStart = currentTime - startTime; uint64 ticksSinceStart = currentTime - startTime;
uint64 numPeriods = ticksSinceStart / period; uint64 numPeriods = ticksSinceStart / period;
@ -267,7 +267,7 @@ namespace coreinit
void OSSetAlarm(OSAlarm_t* alarm, uint64 delayInTicks, MPTR handlerFunc) void OSSetAlarm(OSAlarm_t* alarm, uint64 delayInTicks, MPTR handlerFunc)
{ {
__OSLockScheduler(); __OSLockScheduler();
__OSInitiateAlarm(alarm, coreinit_getOSTime() + delayInTicks, 0, handlerFunc, false); __OSInitiateAlarm(alarm, OSGetTime() + delayInTicks, 0, handlerFunc, false);
__OSUnlockScheduler(); __OSUnlockScheduler();
} }
@ -310,7 +310,7 @@ namespace coreinit
while( true ) while( true )
{ {
OSWaitEvent(g_alarmEvent.GetPtr()); OSWaitEvent(g_alarmEvent.GetPtr());
uint64 currentTick = coreinit_getOSTime(); uint64 currentTick = OSGetTime();
while (true) while (true)
{ {
// get alarm to fire // get alarm to fire

8
src/Cafe/OS/libs/coreinit/coreinit_Spinlock.cpp
View file

@ -86,11 +86,11 @@ namespace coreinit
else else
{ {
// loop until lock acquired or timeout occurred // loop until lock acquired or timeout occurred
uint64 timeoutValue = coreinit_getTimerTick() + coreinit::EspressoTime::ConvertNsToTimerTicks(timeout); uint64 timeoutValue = OSGetSystemTime() + coreinit::EspressoTime::ConvertNsToTimerTicks(timeout);
while (!spinlock->ownerThread.atomic_compare_exchange(nullptr, currentThread)) while (!spinlock->ownerThread.atomic_compare_exchange(nullptr, currentThread))
{ {
OSYieldThread(); OSYieldThread();
if (coreinit_getTimerTick() >= timeoutValue) if (OSGetSystemTime() >= timeoutValue)
{ {
return false; return false;
} }
@ -182,11 +182,11 @@ namespace coreinit
else else
{ {
// loop until lock acquired or timeout occurred // loop until lock acquired or timeout occurred
uint64 timeoutValue = coreinit_getTimerTick() + coreinit::EspressoTime::ConvertNsToTimerTicks(timeout); uint64 timeoutValue = OSGetSystemTime() + coreinit::EspressoTime::ConvertNsToTimerTicks(timeout);
while (!spinlock->ownerThread.atomic_compare_exchange(nullptr, currentThread)) while (!spinlock->ownerThread.atomic_compare_exchange(nullptr, currentThread))
{ {
OSYieldThread(); OSYieldThread();
if (coreinit_getTimerTick() >= timeoutValue) if (OSGetSystemTime() >= timeoutValue)
{ {
return false; return false;
} }

2
src/Cafe/OS/libs/coreinit/coreinit_Thread.cpp
View file

@ -655,7 +655,7 @@ namespace coreinit
StackAllocator<OSThreadQueue> _threadQueue; StackAllocator<OSThreadQueue> _threadQueue;
OSInitThreadQueue(_threadQueue.GetPointer()); OSInitThreadQueue(_threadQueue.GetPointer());
__OSLockScheduler(); __OSLockScheduler();
OSHostAlarm* hostAlarm = OSHostAlarmCreate(coreinit_getOSTime() + ticks, 0, _OSSleepTicks_alarmHandler, _threadQueue.GetPointer()); OSHostAlarm* hostAlarm = OSHostAlarmCreate(OSGetTime() + ticks, 0, _OSSleepTicks_alarmHandler, _threadQueue.GetPointer());
_threadQueue.GetPointer()->queueAndWait(OSGetCurrentThread()); _threadQueue.GetPointer()->queueAndWait(OSGetCurrentThread());
OSHostAlarmDestroy(hostAlarm); OSHostAlarmDestroy(hostAlarm);
__OSUnlockScheduler(); __OSUnlockScheduler();

31
src/Cafe/OS/libs/coreinit/coreinit_Time.cpp
View file

@ -3,38 +3,32 @@
namespace coreinit namespace coreinit
{ {
uint64 coreinit_GetMFTB()
uint64 coreinit_getTimerTick()
{ {
// bus clock is 1/5th of core clock // bus clock is 1/5th of core clock
// timer clock is 1/4th of bus clock // timer clock is 1/4th of bus clock
return PPCInterpreter_getMainCoreCycleCounter() / 20ULL; return PPCInterpreter_getMainCoreCycleCounter() / 20ULL;
} }
uint64 coreinit_getOSTime() uint64 OSGetSystemTime()
{ {
return coreinit_getTimerTick() + ppcCyclesSince2000TimerClock; return coreinit_GetMFTB();
}
void export_OSGetTick(PPCInterpreter_t* hCPU)
{
uint64 osTime = coreinit_getOSTime();
osLib_returnFromFunction(hCPU, (uint32)osTime);
} }
uint64 OSGetTime() uint64 OSGetTime()
{ {
return coreinit_getOSTime(); return OSGetSystemTime() + ppcCyclesSince2000TimerClock;
} }
void export_OSGetSystemTime(PPCInterpreter_t* hCPU) uint32 OSGetSystemTick()
{ {
osLib_returnFromFunction64(hCPU, coreinit_getTimerTick()); return static_cast<uint32>(coreinit_GetMFTB());
} }
void export_OSGetSystemTick(PPCInterpreter_t* hCPU) uint32 OSGetTick()
{ {
osLib_returnFromFunction(hCPU, (uint32)coreinit_getTimerTick()); uint64 osTime = OSGetTime();
return static_cast<uint32>(osTime);
} }
uint32 getLeapDaysUntilYear(uint32 year) uint32 getLeapDaysUntilYear(uint32 year)
@ -360,14 +354,13 @@ namespace coreinit
void InitializeTimeAndCalendar() void InitializeTimeAndCalendar()
{ {
cafeExportRegister("coreinit", OSGetTime, LogType::Placeholder); cafeExportRegister("coreinit", OSGetTime, LogType::Placeholder);
osLib_addFunction("coreinit", "OSGetSystemTime", export_OSGetSystemTime); cafeExportRegister("coreinit", OSGetSystemTime, LogType::Placeholder);
osLib_addFunction("coreinit", "OSGetTick", export_OSGetTick); cafeExportRegister("coreinit", OSGetTick, LogType::Placeholder);
osLib_addFunction("coreinit", "OSGetSystemTick", export_OSGetSystemTick); cafeExportRegister("coreinit", OSGetSystemTick, LogType::Placeholder);
cafeExportRegister("coreinit", OSTicksToCalendarTime, LogType::Placeholder); cafeExportRegister("coreinit", OSTicksToCalendarTime, LogType::Placeholder);
cafeExportRegister("coreinit", OSCalendarTimeToTicks, LogType::Placeholder); cafeExportRegister("coreinit", OSCalendarTimeToTicks, LogType::Placeholder);
//timeTest(); //timeTest();
} }
}; };

12
src/Cafe/OS/libs/coreinit/coreinit_Time.h
View file

@ -50,15 +50,11 @@ namespace coreinit
}; };
void OSTicksToCalendarTime(uint64 ticks, OSCalendarTime_t* calenderStruct); void OSTicksToCalendarTime(uint64 ticks, OSCalendarTime_t* calenderStruct);
uint64 OSGetSystemTime();
uint64 OSGetTime(); uint64 OSGetTime();
uint32 OSGetSystemTick();
uint64 coreinit_getOSTime(); uint32 OSGetTick();
uint64 coreinit_getTimerTick();
static uint64 OSGetSystemTime()
{
return coreinit_getTimerTick();
}
void InitializeTimeAndCalendar(); void InitializeTimeAndCalendar();
}; };

2
src/Cafe/OS/libs/dmae/dmae.cpp
View file

@ -11,7 +11,7 @@ uint64 dmaeRetiredTimestamp = 0;
uint64 dmae_getTimestamp() uint64 dmae_getTimestamp()
{ {
return coreinit::coreinit_getTimerTick(); return coreinit::OSGetSystemTime();
} }
void dmae_setRetiredTimestamp(uint64 timestamp) void dmae_setRetiredTimestamp(uint64 timestamp)

2
src/Cafe/OS/libs/gx2/GX2.cpp
View file

@ -322,7 +322,7 @@ uint64 _prevReturnedGPUTime = 0;
uint64 Latte_GetTime() uint64 Latte_GetTime()
{ {
uint64 gpuTime = coreinit::coreinit_getTimerTick(); uint64 gpuTime = coreinit::OSGetSystemTime();
gpuTime *= 20000ULL; gpuTime *= 20000ULL;
if (gpuTime <= _prevReturnedGPUTime) if (gpuTime <= _prevReturnedGPUTime)
gpuTime = _prevReturnedGPUTime + 1; // avoid ever returning identical timestamps gpuTime = _prevReturnedGPUTime + 1; // avoid ever returning identical timestamps

2
src/Cafe/OS/libs/gx2/GX2_Misc.cpp
View file

@ -54,7 +54,7 @@ void gx2Export_GX2GetGPUTimeout(PPCInterpreter_t* hCPU)
void gx2Export_GX2SampleTopGPUCycle(PPCInterpreter_t* hCPU) void gx2Export_GX2SampleTopGPUCycle(PPCInterpreter_t* hCPU)
{ {
cemuLog_log(LogType::GX2, "GX2SampleTopGPUCycle(0x{:08x})", hCPU->gpr[3]); cemuLog_log(LogType::GX2, "GX2SampleTopGPUCycle(0x{:08x})", hCPU->gpr[3]);
memory_writeU64(hCPU->gpr[3], coreinit::coreinit_getTimerTick()); memory_writeU64(hCPU->gpr[3], coreinit::OSGetSystemTime());
osLib_returnFromFunction(hCPU, 0); osLib_returnFromFunction(hCPU, 0);
} }

2
src/Cafe/OS/libs/nn_acp/nn_acp.cpp
View file

@ -315,7 +315,7 @@ namespace acp
ppcDefineParamU32BEPtr(timestamp64, 0); ppcDefineParamU32BEPtr(timestamp64, 0);
ppcDefineParamU32BEPtr(ukn, 1); // probably timezone or offset? Could also be a bool for success/failed ppcDefineParamU32BEPtr(ukn, 1); // probably timezone or offset? Could also be a bool for success/failed
uint64 t = coreinit::coreinit_getOSTime() + (uint64)((sint64)(ppcCyclesSince2000_UTC - ppcCyclesSince2000) / 20LL); uint64 t = coreinit::OSGetTime() + (uint64)((sint64)(ppcCyclesSince2000_UTC - ppcCyclesSince2000) / 20LL);
timestamp64[0] = (uint32)(t >> 32); timestamp64[0] = (uint32)(t >> 32);
timestamp64[1] = (uint32)(t & 0xFFFFFFFF); timestamp64[1] = (uint32)(t & 0xFFFFFFFF);

2
src/Cafe/OS/libs/padscore/padscore.cpp
View file

@ -760,7 +760,7 @@ namespace padscore
void start() void start()
{ {
OSCreateAlarm(&g_padscore.alarm); OSCreateAlarm(&g_padscore.alarm);
const uint64 start_tick = coreinit::coreinit_getOSTime(); const uint64 start_tick = coreinit::OSGetTime();
const uint64 period_tick = coreinit::EspressoTime::GetTimerClock() / 200; // every 5ms const uint64 period_tick = coreinit::EspressoTime::GetTimerClock() / 200; // every 5ms
MPTR handler = PPCInterpreter_makeCallableExportDepr(TickFunction); MPTR handler = PPCInterpreter_makeCallableExportDepr(TickFunction);
OSSetPeriodicAlarm(&g_padscore.alarm, start_tick, period_tick, handler); OSSetPeriodicAlarm(&g_padscore.alarm, start_tick, period_tick, handler);

4
src/Cafe/OS/libs/vpad/vpad.cpp
View file

@ -267,7 +267,7 @@ namespace vpad
{ {
if (channel <= 1 && vpadDelayEnabled) if (channel <= 1 && vpadDelayEnabled)
{ {
uint64 currentTime = coreinit::coreinit_getOSTime(); uint64 currentTime = coreinit::OSGetTime();
const auto dif = currentTime - vpad::g_vpad.controller_data[channel].drcLastCallTime; const auto dif = currentTime - vpad::g_vpad.controller_data[channel].drcLastCallTime;
if (dif <= (ESPRESSO_TIMER_CLOCK / 60ull)) if (dif <= (ESPRESSO_TIMER_CLOCK / 60ull))
{ {
@ -1149,7 +1149,7 @@ namespace vpad
void start() void start()
{ {
coreinit::OSCreateAlarm(&g_vpad.alarm); coreinit::OSCreateAlarm(&g_vpad.alarm);
const uint64 start_tick = coreinit::coreinit_getOSTime(); const uint64 start_tick = coreinit::OSGetTime();
const uint64 period_tick = coreinit::EspressoTime::GetTimerClock() * 5 / 1000; const uint64 period_tick = coreinit::EspressoTime::GetTimerClock() * 5 / 1000;
const MPTR handler = PPCInterpreter_makeCallableExportDepr(TickFunction); const MPTR handler = PPCInterpreter_makeCallableExportDepr(TickFunction);
coreinit::OSSetPeriodicAlarm(&g_vpad.alarm, start_tick, period_tick, handler); coreinit::OSSetPeriodicAlarm(&g_vpad.alarm, start_tick, period_tick, handler);

2
src/gui/dialogs/SaveImport/SaveImportWindow.cpp
View file

@ -304,7 +304,7 @@ void SaveImportWindow::OnImport(wxCommandEvent& event)
auto new_node = info_node.append_child("account"); auto new_node = info_node.append_child("account");
new_node.append_attribute("persistentId").set_value(new_persistend_id_string.c_str()); new_node.append_attribute("persistentId").set_value(new_persistend_id_string.c_str());
auto timestamp = new_node.append_child("timestamp"); auto timestamp = new_node.append_child("timestamp");
timestamp.text().set(fmt::format("{:016x}", coreinit::coreinit_getOSTime() / ESPRESSO_TIMER_CLOCK).c_str()); // TODO time not initialized yet? timestamp.text().set(fmt::format("{:016x}", coreinit::OSGetTime() / ESPRESSO_TIMER_CLOCK).c_str()); // TODO time not initialized yet?
if(!doc.save_file(saveinfo.c_str())) if(!doc.save_file(saveinfo.c_str()))
cemuLog_log(LogType::Force, "couldn't insert save entry in saveinfo.xml: {}", _pathToUtf8(saveinfo)); cemuLog_log(LogType::Force, "couldn't insert save entry in saveinfo.xml: {}", _pathToUtf8(saveinfo));