Skip to content

Commit

Permalink
New u128 type stub
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nekotekina
Nekotekina committed Aug 24, 2015
1 parent 8d758b9 commit 07b9379
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 70 deletions.
56 changes: 0 additions & 56 deletions Utilities/BEType.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,62 +386,6 @@ inline v128 operator ~(const v128& other)
return v128::from64(~other._u64[0], ~other._u64[1]);
}

static force_inline v128 sync_val_compare_and_swap(volatile v128* dest, v128 comp, v128 exch)
{
#if !defined(_MSC_VER)
auto res = __sync_val_compare_and_swap((volatile __int128_t*)dest, (__int128_t&)comp, (__int128_t&)exch);
return (v128&)res;
#else
_InterlockedCompareExchange128((volatile long long*)dest, exch._u64[1], exch._u64[0], (long long*)&comp);
return comp;
#endif
}

static force_inline bool sync_bool_compare_and_swap(volatile v128* dest, v128 comp, v128 exch)
{
#if !defined(_MSC_VER)
return __sync_bool_compare_and_swap((volatile __int128_t*)dest, (__int128_t&)comp, (__int128_t&)exch);
#else
return _InterlockedCompareExchange128((volatile long long*)dest, exch._u64[1], exch._u64[0], (long long*)&comp) != 0;
#endif
}

static force_inline v128 sync_lock_test_and_set(volatile v128* dest, v128 value)
{
while (true)
{
const v128 old = *(v128*)dest;
if (sync_bool_compare_and_swap(dest, old, value)) return old;
}
}

static force_inline v128 sync_fetch_and_or(volatile v128* dest, v128 value)
{
while (true)
{
const v128 old = *(v128*)dest;
if (sync_bool_compare_and_swap(dest, old, value | old)) return old;
}
}

static force_inline v128 sync_fetch_and_and(volatile v128* dest, v128 value)
{
while (true)
{
const v128 old = *(v128*)dest;
if (sync_bool_compare_and_swap(dest, old, value & old)) return old;
}
}

static force_inline v128 sync_fetch_and_xor(volatile v128* dest, v128 value)
{
while (true)
{
const v128 old = *(v128*)dest;
if (sync_bool_compare_and_swap(dest, old, value ^ old)) return old;
}
}

template<typename T, std::size_t Size = sizeof(T)> struct se_t;

template<typename T> struct se_t<T, 2>
Expand Down
161 changes: 153 additions & 8 deletions Utilities/GNU.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,43 +85,85 @@ typedef int clockid_t;
int clock_gettime(clockid_t clk_id, struct timespec *tp);

#endif /* __APPLE__ */
#endif /* __GNUG__ */

#if defined(_MSC_VER)
// Unsigned 128-bit number implementation
struct alignas(16) uint128_t
{
uint64_t lo, hi;

uint128_t& operator ++()
{
if (!++lo) ++hi;
return *this;
}

uint128_t& operator --()
{
if (!lo--) hi--;
return *this;
}

uint128_t operator ++(int)
{
uint128_t value = *this;
if (!++lo) ++hi;
return value;
}

uint128_t operator --(int)
{
uint128_t value = *this;
if (!lo--) hi--;
return value;
}
};

using __uint128_t = uint128_t;
#endif

// SFINAE Helper type
template<typename T, typename TT = void> using if_integral_t = std::enable_if_t<std::is_integral<T>::value || std::is_same<std::remove_cv_t<T>, __uint128_t>::value, TT>;

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, T> sync_val_compare_and_swap(volatile T* dest, T2 comp, T2 exch)
#if defined(__GNUG__)

template<typename T, typename T2> inline if_integral_t<T, T> sync_val_compare_and_swap(volatile T* dest, T2 comp, T2 exch)
{
return __sync_val_compare_and_swap(dest, comp, exch);
}

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, bool> sync_bool_compare_and_swap(volatile T* dest, T2 comp, T2 exch)
template<typename T, typename T2> inline if_integral_t<T, bool> sync_bool_compare_and_swap(volatile T* dest, T2 comp, T2 exch)
{
return __sync_bool_compare_and_swap(dest, comp, exch);
}

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, T> sync_lock_test_and_set(volatile T* dest, T2 value)
template<typename T, typename T2> inline if_integral_t<T, T> sync_lock_test_and_set(volatile T* dest, T2 value)
{
return __sync_lock_test_and_set(dest, value);
}

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, T> sync_fetch_and_add(volatile T* dest, T2 value)
template<typename T, typename T2> inline if_integral_t<T, T> sync_fetch_and_add(volatile T* dest, T2 value)
{
return __sync_fetch_and_add(dest, value);
}

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, T> sync_fetch_and_sub(volatile T* dest, T2 value)
template<typename T, typename T2> inline if_integral_t<T, T> sync_fetch_and_sub(volatile T* dest, T2 value)
{
return __sync_fetch_and_sub(dest, value);
}

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, T> sync_fetch_and_or(volatile T* dest, T2 value)
template<typename T, typename T2> inline if_integral_t<T, T> sync_fetch_and_or(volatile T* dest, T2 value)
{
return __sync_fetch_and_or(dest, value);
}

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, T> sync_fetch_and_and(volatile T* dest, T2 value)
template<typename T, typename T2> inline if_integral_t<T, T> sync_fetch_and_and(volatile T* dest, T2 value)
{
return __sync_fetch_and_and(dest, value);
}

template<typename T, typename T2> inline std::enable_if_t<std::is_arithmetic<T>::value, T> sync_fetch_and_xor(volatile T* dest, T2 value)
template<typename T, typename T2> inline if_integral_t<T, T> sync_fetch_and_xor(volatile T* dest, T2 value)
{
return __sync_fetch_and_xor(dest, value);
}
Expand Down Expand Up @@ -152,6 +194,12 @@ inline uint64_t sync_val_compare_and_swap(volatile uint64_t* dest, uint64_t comp
return _InterlockedCompareExchange64((volatile long long*)dest, exch, comp);
}

inline uint128_t sync_val_compare_and_swap(volatile uint128_t* dest, uint128_t comp, uint128_t exch)
{
_InterlockedCompareExchange128((volatile long long*)dest, exch.hi, exch.lo, (long long*)&comp);
return comp;
}

inline bool sync_bool_compare_and_swap(volatile uint8_t* dest, uint8_t comp, uint8_t exch)
{
return (uint8_t)_InterlockedCompareExchange8((volatile char*)dest, exch, comp) == comp;
Expand All @@ -172,6 +220,11 @@ inline bool sync_bool_compare_and_swap(volatile uint64_t* dest, uint64_t comp, u
return (uint64_t)_InterlockedCompareExchange64((volatile long long*)dest, exch, comp) == comp;
}

inline bool sync_bool_compare_and_swap(volatile uint128_t* dest, uint128_t comp, uint128_t exch)
{
return _InterlockedCompareExchange128((volatile long long*)dest, exch.hi, exch.lo, (long long*)&comp) != 0;
}

// atomic exchange functions

inline uint8_t sync_lock_test_and_set(volatile uint8_t* dest, uint8_t value)
Expand All @@ -194,6 +247,18 @@ inline uint64_t sync_lock_test_and_set(volatile uint64_t* dest, uint64_t value)
return _InterlockedExchange64((volatile long long*)dest, value);
}

inline uint128_t sync_lock_test_and_set(volatile uint128_t* dest, uint128_t value)
{
while (true)
{
uint128_t old;
old.lo = dest->lo;
old.hi = dest->hi;

if (sync_bool_compare_and_swap(dest, old, value)) return old;
}
}

// atomic add functions

inline uint8_t sync_fetch_and_add(volatile uint8_t* dest, uint8_t value)
Expand All @@ -216,6 +281,22 @@ inline uint64_t sync_fetch_and_add(volatile uint64_t* dest, uint64_t value)
return _InterlockedExchangeAdd64((volatile long long*)dest, value);
}

inline uint128_t sync_fetch_and_add(volatile uint128_t* dest, uint128_t value)
{
while (true)
{
uint128_t old;
old.lo = dest->lo;
old.hi = dest->hi;

uint128_t _new;
_new.lo = old.lo + value.lo;
_new.hi = old.hi + value.hi + (_new.lo < value.lo);

if (sync_bool_compare_and_swap(dest, old, _new)) return old;
}
}

// atomic sub functions

inline uint8_t sync_fetch_and_sub(volatile uint8_t* dest, uint8_t value)
Expand All @@ -238,6 +319,22 @@ inline uint64_t sync_fetch_and_sub(volatile uint64_t* dest, uint64_t value)
return _InterlockedExchangeAdd64((volatile long long*)dest, -(long long)value);
}

inline uint128_t sync_fetch_and_sub(volatile uint128_t* dest, uint128_t value)
{
while (true)
{
uint128_t old;
old.lo = dest->lo;
old.hi = dest->hi;

uint128_t _new;
_new.lo = old.lo - value.lo;
_new.hi = old.hi - value.hi - (old.lo < value.lo);

if (sync_bool_compare_and_swap(dest, old, _new)) return old;
}
}

// atomic `bitwise or` functions

inline uint8_t sync_fetch_and_or(volatile uint8_t* dest, uint8_t value)
Expand All @@ -260,6 +357,22 @@ inline uint64_t sync_fetch_and_or(volatile uint64_t* dest, uint64_t value)
return _InterlockedOr64((volatile long long*)dest, value);
}

inline uint128_t sync_fetch_and_or(volatile uint128_t* dest, uint128_t value)
{
while (true)
{
uint128_t old;
old.lo = dest->lo;
old.hi = dest->hi;

uint128_t _new;
_new.lo = old.lo | value.lo;
_new.hi = old.hi | value.hi;

if (sync_bool_compare_and_swap(dest, old, _new)) return old;
}
}

// atomic `bitwise and` functions

inline uint8_t sync_fetch_and_and(volatile uint8_t* dest, uint8_t value)
Expand All @@ -282,6 +395,22 @@ inline uint64_t sync_fetch_and_and(volatile uint64_t* dest, uint64_t value)
return _InterlockedAnd64((volatile long long*)dest, value);
}

inline uint128_t sync_fetch_and_and(volatile uint128_t* dest, uint128_t value)
{
while (true)
{
uint128_t old;
old.lo = dest->lo;
old.hi = dest->hi;

uint128_t _new;
_new.lo = old.lo & value.lo;
_new.hi = old.hi & value.hi;

if (sync_bool_compare_and_swap(dest, old, _new)) return old;
}
}

// atomic `bitwise xor` functions

inline uint8_t sync_fetch_and_xor(volatile uint8_t* dest, uint8_t value)
Expand All @@ -304,6 +433,22 @@ inline uint64_t sync_fetch_and_xor(volatile uint64_t* dest, uint64_t value)
return _InterlockedXor64((volatile long long*)dest, value);
}

inline uint128_t sync_fetch_and_xor(volatile uint128_t* dest, uint128_t value)
{
while (true)
{
uint128_t old;
old.lo = dest->lo;
old.hi = dest->hi;

uint128_t _new;
_new.lo = old.lo ^ value.lo;
_new.hi = old.hi ^ value.hi;

if (sync_bool_compare_and_swap(dest, old, _new)) return old;
}
}

#endif /* _MSC_VER */

inline uint32_t cntlz32(uint32_t arg)
Expand Down
10 changes: 4 additions & 6 deletions rpcs3/Emu/Memory/atomic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ template<typename T> struct _to_atomic_subtype<T, 8>

template<typename T> struct _to_atomic_subtype<T, 16>
{
using type = v128;
using type = u128;
};

template<typename T> using atomic_subtype_t = typename _to_atomic_subtype<T>::type;
Expand Down Expand Up @@ -127,7 +127,7 @@ template<typename T> union _atomic_base
data = value;
}

force_inline static void write_relaxed(volatile v128& data, const v128& value)
force_inline static void write_relaxed(volatile u128& data, const u128& value)
{
sync_lock_test_and_set(&data, value);
}
Expand All @@ -137,9 +137,9 @@ template<typename T> union _atomic_base
return data;
}

force_inline static v128 read_relaxed(const volatile v128& value)
force_inline static u128 read_relaxed(const volatile u128& value)
{
return sync_val_compare_and_swap(const_cast<volatile v128*>(&value), {}, {});
return sync_val_compare_and_swap(const_cast<volatile u128*>(&value), u128{0}, u128{0});
}

public:
Expand Down Expand Up @@ -240,8 +240,6 @@ template<typename T> union _atomic_base
}
};

template<typename T> using if_integral_t = std::enable_if_t<std::is_integral<T>::value>;

template<typename T, typename = if_integral_t<T>> inline T operator ++(_atomic_base<T>& left)
{
return left.from_subtype(sync_fetch_and_add(&left.sub_data, 1) + 1);
Expand Down
4 changes: 4 additions & 0 deletions rpcs3/stdafx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ using s64 = std::int64_t;
using f32 = float;
using f64 = double;

using u128 = __uint128_t;

CHECK_SIZE_ALIGN(u128, 16, 16);

// bool type replacement for PS3/PSV
class b8
{
Expand Down

0 comments on commit 07b9379

Please sign in to comment.