archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve vm::reservation_op

Browse source 
Remove XABORT, sync status handling with SPU/PPU transaction.
Limit max number of transaction attempts in loop.
Add Ack template parameter, as in vm::reservation_light_op.
Remove utils::tx_abort, improve utils::tx_start as well.
This commit is contained in:
Nekotekina 2020-10-20 08:41:10 +03:00
parent dc8252bb9f
commit 4384ae15b4
3 changed files with 55 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Utilities/asm.h
View file

@ -4,7 +4,7 @@
namespace utils
{
// Transaction helper (Max = max attempts) (result = pair of success and op result, which is only meaningful on success)
// Transaction helper (Max = max attempts) (result = pair of success and op result)
template <uint Max = 10, typename F, typename R = std::invoke_result_t<F>>
inline auto tx_start(F op)
{
@ -48,9 +48,8 @@ namespace utils
#ifndef _MSC_VER
__asm__ volatile ("movl %%eax, %0;" : "=r" (status) :: "memory");
#endif
if (!(status & _XABORT_RETRY)) [[unlikely]]
if (!status) [[unlikely]]
{
// In order to abort transaction, tx_abort() can be used, so there is no need for "special" return value
break;
}
}
@ -65,18 +64,6 @@ namespace utils
}
};
// Special function to abort transaction
[[noreturn]] FORCE_INLINE void tx_abort()
{
#ifndef _MSC_VER
__asm__ volatile ("xabort $0;" ::: "memory");
__builtin_unreachable();
#else
_xabort(0);
__assume(0);
#endif
}
// Rotate helpers
#if defined(__GNUG__)