Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Bit[T].cs #107

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update Bit[T].cs #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b32f89a
Update Bit[T].cs
DdeadliestT Jun 2, 2023
d2441b7
Update BitTests.cs
DdeadliestT Jun 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 171 additions & 8 deletions csharp/Platform.Numbers.Tests/BitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ public static class BitTests
[InlineData(01, 00)] // 0000 0001 (first, 0)
[InlineData(08, 03)] // 0000 1000 (forth, 3)
[InlineData(88, 03)] // 0101 1000 (forth, 3)
public static void GetLowestBitPositionTest(ulong value, int expectedPosition)
public static void GetLowestBitPositionTestForUint(uint value, int expectedPosition)
{
Assert.True(Bit.GetLowestPosition(value) == expectedPosition);
}

[Fact]
public static void PartialReadWriteTest()
public static void PartialReadWriteTestForUint()
{
{
uint firstValue = 1;
Expand Down Expand Up @@ -87,10 +87,10 @@ public static void PartialReadWriteTest()
Assert.True(secondValue == unpackagedSecondValue);

// Using universal functions:
var readMasksAndShiftFor0And1 = GetReadMaskAndShift(0, 1);
var readMasksAndShiftFor1AndMinus1 = GetReadMaskAndShift(1, -1);
var writeMasksAndShiftFor0And1 = GetWriteMasksAndShift(0, 1);
var writeMasksAndShiftFor1AndMinus1 = GetWriteMasksAndShift(1, -1);
var readMasksAndShiftFor0And1 = GetReadMaskAndShiftForUint(0, 1);
var readMasksAndShiftFor1AndMinus1 = GetReadMaskAndShiftForUint(1, -1);
var writeMasksAndShiftFor0And1 = GetWriteMasksAndShiftForUint(0, 1);
var writeMasksAndShiftFor1AndMinus1 = GetWriteMasksAndShiftForUint(1, -1);

Assert.True(PartialRead(value, readMasksAndShiftFor0And1) == firstValue);
Assert.True(PartialRead(value, readMasksAndShiftFor1AndMinus1) == secondValue);
Expand Down Expand Up @@ -135,7 +135,7 @@ private static uint PartialRead(uint target, int shift, int limit)
var targetMask = sourceMask << shift;
return (target & targetMask) >> shift;
}
private static Tuple<uint, uint, int> GetWriteMasksAndShift(int shift, int limit)
private static Tuple<uint, uint, int> GetWriteMasksAndShiftForUint(int shift, int limit)
{
if (shift < 0)
{
Expand All @@ -149,7 +149,7 @@ private static Tuple<uint, uint, int> GetWriteMasksAndShift(int shift, int limit
var targetMask = ~(sourceMask << shift);
return new Tuple<uint, uint, int>(targetMask, sourceMask, shift);
}
private static Tuple<uint, int> GetReadMaskAndShift(int shift, int limit)
private static Tuple<uint, int> GetReadMaskAndShiftForUint(int shift, int limit)
{
if (shift < 0)
{
Expand All @@ -173,5 +173,168 @@ public static void BugWithLoadingConstantOf8Test()
{
Bit<byte>.PartialWrite(0, 1, 5, -5);
}

// TESTS FOR ULONG
[Theory]
[InlineData(00, -1)] // 0000 0000 (none, -1)
[InlineData(01, 00)] // 0000 0001 (first, 0)
[InlineData(08, 03)] // 0000 1000 (forth, 3)
[InlineData(88, 03)] // 0101 1000 (forth, 3)
public static void GetLowestBitPositionTestForUlong(ulong value, int expectedPosition)
{
Assert.True(Bit.GetLowestPosition(value) == expectedPosition);
}

[Fact]
public static void PartialReadWriteTestForUlong()
{
{
ulong firstValue = 1;
ulong secondValue = 1543;

// Pack (join) two values at the same time
ulong value = secondValue << 1 | firstValue;

ulong unpackagedFirstValue = value & 1;
ulong unpackagedSecondValue = (value & 0xFFFFFFFE) >> 1;

Assert.True(firstValue == unpackagedFirstValue);
Assert.True(secondValue == unpackagedSecondValue);

// Using universal functions:
Assert.True(PartialRead(value, 0, 1) == firstValue);
Assert.True(PartialRead(value, 1, -1) == secondValue);

firstValue = 0;
secondValue = 6892;

value = PartialWrite(value, firstValue, 0, 1);
value = PartialWrite(value, secondValue, 1, -1);

Assert.True(PartialRead(value, 0, 1) == firstValue);
Assert.True(PartialRead(value, 1, -1) == secondValue);
}

{
ulong firstValue = 1;
ulong secondValue = 1543;

// Pack (join) two values at the same time
ulong value = secondValue << 1 | firstValue;

ulong unpackagedFirstValue = value & 1;
ulong unpackagedSecondValue = (value & 0xFFFFFFFE) >> 1;

Assert.True(firstValue == unpackagedFirstValue);
Assert.True(secondValue == unpackagedSecondValue);

// Using universal functions:
Assert.True(Bit<ulong>.PartialRead(value, 0, 1) == firstValue);
Assert.True(Bit<ulong>.PartialRead(value, 1, -1) == secondValue);

firstValue = 0;
secondValue = 6892;

value = Bit<ulong>.PartialWrite(value, firstValue, 0, 1);
value = Bit<ulong>.PartialWrite(value, secondValue, 1, -1);

Assert.True(Bit<ulong>.PartialRead(value, 0, 1) == firstValue);
Assert.True(Bit<ulong>.PartialRead(value, 1, -1) == secondValue);
}

{
ulong firstValue = 1;
ulong secondValue = 1543;

// Pack (join) two values at the same time
ulong value = secondValue << 1 | firstValue;

ulong unpackagedFirstValue = value & 1;
ulong unpackagedSecondValue = (value & 0xFFFFFFFE) >> 1;

Assert.True(firstValue == unpackagedFirstValue);
Assert.True(secondValue == unpackagedSecondValue);

// Using universal functions:
var readMasksAndShiftFor0And1 = GetReadMaskAndShiftForUlong(0, 1);
var readMasksAndShiftFor1AndMinus1 = GetReadMaskAndShiftForUlong(1, -1);
var writeMasksAndShiftFor0And1 = GetWriteMasksAndShiftForUlong(0, 1);
var writeMasksAndShiftFor1AndMinus1 = GetWriteMasksAndShiftForUlong(1, -1);

Assert.True(PartialRead(value, readMasksAndShiftFor0And1) == firstValue);
Assert.True(PartialRead(value, readMasksAndShiftFor1AndMinus1) == secondValue);

firstValue = 0;
secondValue = 6892;

value = PartialWrite(value, firstValue, writeMasksAndShiftFor0And1);
value = PartialWrite(value, secondValue, writeMasksAndShiftFor1AndMinus1);

Assert.True(PartialRead(value, readMasksAndShiftFor0And1) == firstValue);
Assert.True(PartialRead(value, readMasksAndShiftFor1AndMinus1) == secondValue);
}
}

// TODO: Can be optimized using precalculation of TargetMask and SourceMask
private static ulong PartialWrite(ulong target, ulong source, int shift, int limit)
{
if (shift < 0)
{
shift = 64 + shift;
}
if (limit < 0)
{
limit = 64 + limit;
}
var sourceMask = ~(ulong.MaxValue << limit) & ulong.MaxValue;
var targetMask = ~(sourceMask << shift);
return target & targetMask | (source & sourceMask) << shift;
}
private static ulong PartialRead(ulong target, int shift, int limit)
{
if (shift < 0)
{
shift = 64 + shift;
}
if (limit < 0)
{
limit = 64 + limit;
}
var sourceMask = ~(ulong.MaxValue << limit) & ulong.MaxValue;
var targetMask = sourceMask << shift;
return (target & targetMask) >> shift;
}
private static Tuple<ulong, ulong, int> GetWriteMasksAndShiftForUlong(int shift, int limit)
{
if (shift < 0)
{
shift = 64 + shift;
}
if (limit < 0)
{
limit = 64 + limit;
}
var sourceMask = ~(ulong.MaxValue << limit) & ulong.MaxValue;
var targetMask = ~(sourceMask << shift);
return new Tuple<ulong, ulong, int>(targetMask, sourceMask, shift);
}
private static Tuple<ulong, int> GetReadMaskAndShiftForUlong(int shift, int limit)
{
if (shift < 0)
{
shift = 64 + shift;
}
if (limit < 0)
{
limit = 64 + limit;
}
var sourceMask = ~(ulong.MaxValue << limit) & ulong.MaxValue;
var targetMask = sourceMask << shift;
return new Tuple<ulong, int>(targetMask, shift);
}
private static ulong PartialWrite(ulong target, ulong targetMask, ulong source, ulong sourceMask, int shift) => target & targetMask | (source & sourceMask) << shift;
private static ulong PartialWrite(ulong target, ulong source, Tuple<ulong, ulong, int> masksAndShift) => PartialWrite(target, masksAndShift.Item1, source, masksAndShift.Item2, masksAndShift.Item3);
private static ulong PartialRead(ulong target, ulong targetMask, int shift) => (target & targetMask) >> shift;
private static ulong PartialRead(ulong target, Tuple<ulong, int> masksAndShift) => PartialRead(target, masksAndShift.Item1, masksAndShift.Item2);
}
}
8 changes: 4 additions & 4 deletions csharp/Platform.Numbers/Bit[T].cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public static T PartialWrite(T target, T source, int shift, int limit)
{
if (shift < 0)
{
shift = 32 + shift;
shift = BitsSize + shift;
}
if (limit < 0)
{
limit = 32 + limit;
limit = BitsSize + limit;
}
var sourceMask = ~(T.MaxValue << limit) & T.MaxValue;
var targetMask = ~(sourceMask << shift);
Expand All @@ -40,11 +40,11 @@ public static T PartialRead(T target, int shift, int limit)
{
if (shift < 0)
{
shift = 32 + shift;
shift = BitsSize + shift;
}
if (limit < 0)
{
limit = 32 + limit;
limit = BitsSize + limit;
}
var sourceMask = ~(T.MaxValue << limit) & T.MaxValue;
var targetMask = sourceMask << shift;
Expand Down
Loading