RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-05 08:10:10 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[orbis-kernel] Fix timeout conversion in _umtx_op

Browse source 
Use __uint128_t
This commit is contained in:
Ivan Chikish 2023-07-10 21:48:02 +03:00
parent 205b7d91cf
commit aa5adc7b6d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
orbis-kernel/src/sys/sys_umtx.cpp
View file

@ -34,7 +34,7 @@ orbis::SysResult orbis::sys__umtx_op(Thread *thread, ptr<void> obj, sint op,
return ErrorCode::FAULT;
auto with_timeout = [&](auto op) -> orbis::ErrorCode {
timespec *ts = nullptr;
timespec timeout;
timespec timeout{};
if (uaddr2 != nullptr) {
auto result = ureadTimespec(timeout, (ptr<timespec>)uaddr2);
if (result != ErrorCode{}) {
@ -43,18 +43,19 @@ orbis::SysResult orbis::sys__umtx_op(Thread *thread, ptr<void> obj, sint op,
ts = &timeout;
}
std::uint64_t usec = 0;
__uint128_t usec = timeout.sec;
auto start = std::chrono::steady_clock::now();
if (!ts) {
usec = -1;
while (true) {
if (auto r = op(usec); r != ErrorCode::TIMEDOUT)
if (auto r = op(-1); r != ErrorCode::TIMEDOUT)
return r;
}
} else {
usec *= 1000'000;
usec += (timeout.nsec + 999) / 1000;
usec += timeout.sec * 1000'000;
if (usec >= UINT64_MAX)
usec = -2;
std::uint64_t udiff = 0;
while (true) {
if (auto r = op(usec - udiff); r != ErrorCode::TIMEDOUT)