From bd413d4caf6705f2b5df8f90b7d04d6e9ec032a7 Mon Sep 17 00:00:00 2001 From: raven02 Date: Sun, 31 Mar 2013 18:09:27 +0800 Subject: [PATCH] Revert sceKernelSysClock2USec() --- Core/HLE/sceKernelTime.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Core/HLE/sceKernelTime.cpp b/Core/HLE/sceKernelTime.cpp index 9090adf2ed..072d7ede7e 100644 --- a/Core/HLE/sceKernelTime.cpp +++ b/Core/HLE/sceKernelTime.cpp @@ -99,17 +99,16 @@ u64 sceKernelUSec2SysClockWide(u32 usec) return usec; } -int sceKernelSysClock2USec(u32 sysclockPtr, u32 lowPtr, u32 highPtr) +int sceKernelSysClock2USec(u32 sysclockPtr, u32 highPtr, u32 lowPtr) { DEBUG_LOG(HLE, "sceKernelSysClock2USec(clock = %08x, lo = %08x, hi = %08x)", sysclockPtr, highPtr, lowPtr); - u64 sysClock = Memory::Read_U64(sysclockPtr); - if (Memory::IsValidAddress(lowPtr)) { - Memory::Write_U32((u32)(sysClock / 1000000), lowPtr); - if (Memory::IsValidAddress(highPtr)) - Memory::Write_U32((u32)(sysClock % 1000000), highPtr); - } else - if (Memory::IsValidAddress(highPtr)) - Memory::Write_U32((int) sysClock, highPtr); + u64 time = Memory::Read_U64(sysclockPtr); + u32 highResult = (u32)(time / 1000000); + u32 lowResult = (u32)(time % 1000000); + if (Memory::IsValidAddress(highPtr)) + Memory::Write_U32(highResult, highPtr); + if (Memory::IsValidAddress(lowPtr)) + Memory::Write_U32(lowResult, lowPtr); hleEatCycles(2 * 222); return 0; }