shifathosn
/
AnyPS5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert(libkernel): move the process time fix to its own pull request

This commit is contained in:
TideOPL 2026-10-08 11:00:22 +01:00
parent 74a4d47133
commit 8b28f53a4d
3 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/libs/prx/libkernel/CMakeLists.txt
View File

@ -84,16 +84,6 @@ if(BUILD_TESTING)
set_tests_properties(guest_posix_sem_init guest_posix_sem_post PROPERTIES ENVIRONMENT_MODIFICATION
"PATH=path_list_prepend:$<TARGET_FILE_DIR:libkernel>")
endif()
add_test_executable(guest_process_time_tests ${LIBS_INCLUDE_DIR}/tests/GuestProcessTime.cpp)
target_include_directories(guest_process_time_tests PRIVATE ${LIBS_INCLUDE_DIR})
target_link_libraries(guest_process_time_tests PRIVATE libkernel libc)
configure_windows_unwind(guest_process_time_tests)
add_test(NAME guest_process_time COMMAND guest_process_time_tests)
add_test(NAME guest_process_time_counter COMMAND guest_process_time_tests counter)
if(WIN32)
set_tests_properties(guest_process_time guest_process_time_counter PROPERTIES ENVIRONMENT_MODIFICATION
"PATH=path_list_prepend:$<TARGET_FILE_DIR:libkernel>")
endif()
add_library(guest_module_fixture SHARED ${LIBS_INCLUDE_DIR}/tests/GuestModuleFixture.cpp)
target_include_directories(guest_module_fixture PRIVATE ${LIBS_INCLUDE_DIR})
add_custom_command(TARGET guest_module_fixture POST_BUILD

6
core/libs/prx/libkernel/Time/Time.cpp
View File

@ -147,13 +147,11 @@ static const bool g_timerSelfTest = [] {
extern "C" {
std::uint64_t APS5_VABI sceKernelGetProcessTime() {
const std::uint64_t start = GetStartNanos();
return (GetMonotonicNanos() - start) / 1000ULL;
return (GetMonotonicNanos() - GetStartNanos()) / 1000ULL;
}
std::uint64_t APS5_VABI sceKernelGetProcessTimeCounter() {
const std::uint64_t start = GetStartNanos();
return GetMonotonicNanos() - start;
return GetMonotonicNanos() - GetStartNanos();
}
std::uint64_t APS5_VABI sceKernelGetProcessTimeCounterFrequency() {

24
core/libs/tests/GuestProcessTime.cpp
View File

@ -1,24 +0,0 @@
#include "prx/libkernel/Time/include/Time.hpp"
#include <cstdint>
#include <cstdio>
#include <cstdlib>
#include <cstring>
static void Require(bool condition, const char* message) {
if (!condition) {
std::fprintf(stderr, "%s\n", message);
std::abort();
}
}
int main(int argc, char** argv) {
constexpr std::uint64_t minuteMicros = 60ULL * 1000 * 1000;
if (argc > 1 && std::strcmp(argv[1], "counter") == 0) {
Require(sceKernelGetProcessTimeCounter() < minuteMicros * 1000, "first process time counter wrapped");
return 0;
}
const std::uint64_t first = sceKernelGetProcessTime();
Require(first < minuteMicros, "first process time wrapped");
Require(sceKernelGetProcessTime() >= first, "process time went backwards");
return 0;
}