thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be more deterministic about the time.

Browse source 
This way, if a state is loaded, the game doesn't know.
Also, if the host is slow/sped up, it won't get out of sync.
This commit is contained in:
Unknown W. Brackets 2013-01-02 01:09:44 -08:00
parent 4a713309a3
commit 1c156784b6
3 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Core/HLE/sceKernel.cpp
View file

@ -79,6 +79,7 @@ void __KernelInit()
}
SaveState::Init();
__KernelTimeInit();
__InterruptsInit();
__KernelMemoryInit();
__KernelThreadingInit();
@ -154,6 +155,7 @@ void __KernelDoState(PointerWrap &p)
__KernelModuleDoState(p);
__KernelMutexDoState(p);
__KernelSemaDoState(p);
__KernelTimeDoState(p);
__AudioDoState(p);
__CtrlDoState(p);

27
Core/HLE/sceKernelTime.cpp
View file

@ -30,10 +30,28 @@
#include "../CoreTiming.h"
//////////////////////////////////////////////////////////////////////////
// State
//////////////////////////////////////////////////////////////////////////
// The time when the game started.
time_t start_time;
//////////////////////////////////////////////////////////////////////////
// Other clock stuff
//////////////////////////////////////////////////////////////////////////
void __KernelTimeInit()
{
time(&start_time);
}
void __KernelTimeDoState(PointerWrap &p)
{
p.Do(start_time);
p.DoMarker("sceKernelTime");
}
struct SceKernelSysClock
{
u32 lo;
@ -114,17 +132,16 @@ u32 sceKernelLibcClock()
u32 sceKernelLibcTime(u32 outPtr)
{
time_t t;
time(&t);
u32 t = (u32) start_time + (u32) (CoreTiming::GetTicks() / CPU_HZ);
DEBUG_LOG(HLE, "%i = sceKernelLibcTime(%08X)", (u32) t, outPtr);
DEBUG_LOG(HLE, "%i = sceKernelLibcTime(%08X)", t, outPtr);
if (Memory::IsValidAddress(outPtr))
Memory::Write_U32((u32) t, outPtr);
Memory::Write_U32(t, outPtr);
else if (outPtr != 0)
return 0;
return (u32) t;
return t;
}
void sceKernelLibcGettimeofday()

3
Core/HLE/sceKernelTime.h
View file

@ -27,3 +27,6 @@ void sceKernelSysClock2USec();
void sceKernelSysClock2USecWide();
u32 sceKernelUSec2SysClockWide(u32 usec);
u32 sceKernelLibcClock();
void __KernelTimeInit();
void __KernelTimeDoState(PointerWrap &p);