ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #559 from lioncash/field 

bitfield: Make interface fully constexpr
This commit is contained in:
Connor McLaughlin 2020-06-23 19:58:06 +10:00 committed by GitHub
parent 6de24f620e a27aa45e6a
commit 3ca9d578b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/bitfield.h
View File

@ -21,97 +21,97 @@ struct BitField
return ((static_cast<BackingDataType>(~0)) >> (8 * sizeof(BackingDataType) - BitCount)) << BitIndex; return ((static_cast<BackingDataType>(~0)) >> (8 * sizeof(BackingDataType) - BitCount)) << BitIndex;
} }
ALWAYS_INLINE operator DataType() const { return GetValue(); } ALWAYS_INLINE constexpr operator DataType() const { return GetValue(); }
ALWAYS_INLINE BitField& operator=(DataType value) ALWAYS_INLINE constexpr BitField& operator=(DataType value)
{ {
SetValue(value); SetValue(value);
return *this; return *this;
} }
ALWAYS_INLINE DataType operator++() ALWAYS_INLINE constexpr DataType operator++()
{ {
DataType value = GetValue() + 1; DataType value = GetValue() + 1;
SetValue(value); SetValue(value);
return GetValue(); return GetValue();
} }
ALWAYS_INLINE DataType operator++(int) ALWAYS_INLINE constexpr DataType operator++(int)
{ {
DataType value = GetValue(); DataType value = GetValue();
SetValue(value + 1); SetValue(value + 1);
return value; return value;
} }
ALWAYS_INLINE DataType operator--() ALWAYS_INLINE constexpr DataType operator--()
{ {
DataType value = GetValue() - 1; DataType value = GetValue() - 1;
SetValue(value); SetValue(value);
return GetValue(); return GetValue();
} }
ALWAYS_INLINE DataType operator--(int) ALWAYS_INLINE constexpr DataType operator--(int)
{ {
DataType value = GetValue(); DataType value = GetValue();
SetValue(value - 1); SetValue(value - 1);
return value; return value;
} }
ALWAYS_INLINE BitField& operator+=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator+=(DataType rhs)
{ {
SetValue(GetValue() + rhs); SetValue(GetValue() + rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator-=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator-=(DataType rhs)
{ {
SetValue(GetValue() - rhs); SetValue(GetValue() - rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator*=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator*=(DataType rhs)
{ {
SetValue(GetValue() * rhs); SetValue(GetValue() * rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator/=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator/=(DataType rhs)
{ {
SetValue(GetValue() / rhs); SetValue(GetValue() / rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator&=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator&=(DataType rhs)
{ {
SetValue(GetValue() & rhs); SetValue(GetValue() & rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator|=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator|=(DataType rhs)
{ {
SetValue(GetValue() | rhs); SetValue(GetValue() | rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator^=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator^=(DataType rhs)
{ {
SetValue(GetValue() ^ rhs); SetValue(GetValue() ^ rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator<<=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator<<=(DataType rhs)
{ {
SetValue(GetValue() << rhs); SetValue(GetValue() << rhs);
return *this; return *this;
} }
ALWAYS_INLINE BitField& operator>>=(DataType rhs) ALWAYS_INLINE constexpr BitField& operator>>=(DataType rhs)
{ {
SetValue(GetValue() >> rhs); SetValue(GetValue() >> rhs);
return *this; return *this;
} }
ALWAYS_INLINE DataType GetValue() const ALWAYS_INLINE constexpr DataType GetValue() const
{ {
if constexpr (std::is_same_v<DataType, bool>) if constexpr (std::is_same_v<DataType, bool>)
{ {
@ -128,7 +128,7 @@ struct BitField
} }
} }
ALWAYS_INLINE void SetValue(DataType value) ALWAYS_INLINE constexpr void SetValue(DataType value)
{ {
data = (data & ~GetMask()) | ((static_cast<BackingDataType>(value) << BitIndex) & GetMask()); data = (data & ~GetMask()) | ((static_cast<BackingDataType>(value) << BitIndex) & GetMask());
} }