mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 07:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

bf_t fix

Browse Source
This commit is contained in:
Nekotekina 2017-03-04 16:54:43 +03:00
parent 8e4a09d9e5
commit d9c78cf495
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Utilities/BitField.h
View File

@ -7,6 +7,7 @@ struct bf_base
{ {
using type = T; using type = T;
using vtype = simple_t<type>; using vtype = simple_t<type>;
using utype = typename std::make_unsigned<vtype>::type;
// Datatype bitsize // Datatype bitsize
static constexpr uint bitmax = sizeof(T) * 8; static_assert(N - 1 < bitmax, "bf_base<> error: N out of bounds"); static constexpr uint bitmax = sizeof(T) * 8; static_assert(N - 1 < bitmax, "bf_base<> error: N out of bounds");
@ -15,7 +16,7 @@ struct bf_base
static constexpr uint bitsize = N; static constexpr uint bitsize = N;
// Value mask // Value mask
static constexpr vtype vmask = static_cast<vtype>(~std::make_unsigned_t<vtype>{} >> (bitmax - bitsize)); static constexpr utype vmask = static_cast<utype>(~utype{} >> (bitmax - bitsize));
protected: protected:
type m_data; type m_data;
@ -27,14 +28,15 @@ struct bf_t : bf_base<T, N>
{ {
using type = typename bf_t::type; using type = typename bf_t::type;
using vtype = typename bf_t::vtype; using vtype = typename bf_t::vtype;
using utype = typename bf_t::utype;
// Field offset // Field offset
static constexpr uint bitpos = I; static_assert(bitpos + N <= bf_t::bitmax, "bf_t<> error: I out of bounds"); static constexpr uint bitpos = I; static_assert(bitpos + N <= bf_t::bitmax, "bf_t<> error: I out of bounds");
// Get bitmask of size N, at I pos // Get bitmask of size N, at I pos
static constexpr vtype data_mask() static constexpr utype data_mask()
{ {
return bf_t::vmask << bitpos; return static_cast<utype>(~utype{} >> (bf_t::bitmax - bf_t::bitsize) << bitpos);
} }
// Bitfield extraction helper // Bitfield extraction helper
@ -50,7 +52,7 @@ struct bf_t : bf_base<T, N>
// Load unsigned value // Load unsigned value
static constexpr T2 extract(const T& data) static constexpr T2 extract(const T& data)
{ {
return (data >> bitpos) & bf_t::vmask; return static_cast<T2>((static_cast<utype>(data) >> bitpos) & bf_t::vmask);
} }
}; };
@ -60,7 +62,7 @@ struct bf_t : bf_base<T, N>
// Load signed value (sign-extended) // Load signed value (sign-extended)
static constexpr T2 extract(const T& data) static constexpr T2 extract(const T& data)
{ {
return data << (bf_t::bitmax - bitpos - N) >> (bf_t::bitmax - N); return static_cast<T2>(static_cast<vtype>(static_cast<utype>(data) << (bf_t::bitmax - bitpos - N)) >> (bf_t::bitmax - N));
} }
}; };
@ -73,7 +75,7 @@ struct bf_t : bf_base<T, N>
// Bitfield insertion // Bitfield insertion
static constexpr vtype insert(vtype value) static constexpr vtype insert(vtype value)
{ {
return (value & bf_t::vmask) << bitpos; return static_cast<vtype>((value & bf_t::vmask) << bitpos);
} }
// Load bitfield value // Load bitfield value
@ -85,7 +87,7 @@ struct bf_t : bf_base<T, N>
// Load raw data with mask applied // Load raw data with mask applied
constexpr T unshifted() const constexpr T unshifted() const
{ {
return this->m_data & data_mask(); return static_cast<T>(this->m_data & data_mask());
} }
// Optimized bool conversion (must be removed if inappropriate) // Optimized bool conversion (must be removed if inappropriate)
@ -97,14 +99,14 @@ struct bf_t : bf_base<T, N>
// Store bitfield value // Store bitfield value
bf_t& operator =(vtype value) bf_t& operator =(vtype value)
{ {
this->m_data = (this->m_data & ~data_mask()) | insert(value); this->m_data = static_cast<vtype>((this->m_data & ~data_mask()) | insert(value));
return *this; return *this;
} }
vtype operator ++(int) vtype operator ++(int)
{ {
vtype result = *this; utype result = *this;
*this = result + 1; *this = static_cast<vtype>(result + 1);
return result; return result;
} }
@ -115,8 +117,8 @@ struct bf_t : bf_base<T, N>
vtype operator --(int) vtype operator --(int)
{ {
vtype result = *this; utype result = *this;
*this = result - 1; *this = static_cast<vtype>(result - 1);
return result; return result;
} }
@ -142,19 +144,19 @@ struct bf_t : bf_base<T, N>
bf_t& operator &=(vtype right) bf_t& operator &=(vtype right)
{ {
this->m_data &= (right & bf_t::vmask) << bitpos; this->m_data &= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
return *this; return *this;
} }
bf_t& operator |=(vtype right) bf_t& operator |=(vtype right)
{ {
this->m_data |= (right & bf_t::vmask) << bitpos; this->m_data |= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
return *this; return *this;
} }
bf_t& operator ^=(vtype right) bf_t& operator ^=(vtype right)
{ {
this->m_data ^= (right & bf_t::vmask) << bitpos; this->m_data ^= static_cast<vtype>((static_cast<utype>(right) & bf_t::vmask) << bitpos);
return *this; return *this;
} }
}; };
@ -165,23 +167,24 @@ struct cf_t : bf_base<typename F::type, F::bitsize + cf_t<Fields...>::bitsize>
{ {
using type = typename cf_t::type; using type = typename cf_t::type;
using vtype = typename cf_t::vtype; using vtype = typename cf_t::vtype;
using utype = typename cf_t::utype;
// Get disjunction of all "data" masks of concatenated values // Get disjunction of all "data" masks of concatenated values
static constexpr vtype data_mask() static constexpr vtype data_mask()
{ {
return F::data_mask() | cf_t<Fields...>::data_mask(); return static_cast<vtype>(F::data_mask() | cf_t<Fields...>::data_mask());
} }
// Extract all bitfields and concatenate // Extract all bitfields and concatenate
static constexpr vtype extract(const type& data) static constexpr vtype extract(const type& data)
{ {
return F::extract(data) << cf_t<Fields...>::bitsize | cf_t<Fields...>::extract(data); return static_cast<vtype>(static_cast<utype>(F::extract(data)) << cf_t<Fields...>::bitsize | cf_t<Fields...>::extract(data));
} }
// Split bitfields and insert them // Split bitfields and insert them
static constexpr vtype insert(vtype value) static constexpr vtype insert(vtype value)
{ {
return F::insert(value >> cf_t<Fields...>::bitsize) | cf_t<Fields...>::insert(value); return static_cast<vtype>(F::insert(value >> cf_t<Fields...>::bitsize) | cf_t<Fields...>::insert(value));
} }
// Load value // Load value