Merge pull request #2738 from lioncash/bitfield

Common: Fix BitField mask generation.
dolphin-emu · Oct 4, 2015 · 0fdaacc · 0fdaacc
2 parents 81414b4 + 5c26428
commit 0fdaacc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Core/Common/BitField.h b/Source/Core/Common/BitField.h
@@ -146,7 +146,7 @@ struct BitField
 		if (std::numeric_limits<T>::is_signed)
 		{
 			std::size_t shift = 8 * sizeof(T) - bits;
-			return (T)(((storage & GetMask()) << (shift - position)) >> shift);
+			return (T)((storage << (shift - position)) >> shift);
 		}
 		else
 		{
@@ -173,7 +173,7 @@ struct BitField
 
 	__forceinline StorageType GetMask() const
 	{
-		return ((~(StorageTypeU)0) >> (8 * sizeof(T) - bits)) << position;
+		return (((StorageTypeU)~0) >> (8 * sizeof(T) - bits)) << position;
 	}
 
 	StorageType storage;