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

Jump to bottom

Fix big endian issue in Interlocked test cases #101429

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Fix big endian issue in Interlocked test cases #101429

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee68a0
Fix big endian issue in Interlocked test cases
Apr 23, 2024
a552af5
Fix big endian issue in Interlocked test cases
Apr 23, 2024
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
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Threading/Interlocked.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public static unsafe ushort Exchange(ref ushort location1, ushort value)
nuint offset = Unsafe.OpportunisticMisalignment(ref location1, sizeof(uint));
ref uint alignedRef = ref Unsafe.As<ushort, uint>(ref Unsafe.SubtractByteOffset(ref location1, offset));
int bitOffset =
(int)((BitConverter.IsLittleEndian ? offset : sizeof(uint) - offset - sizeof(byte)) * 8); // to bit offset
(int)((BitConverter.IsLittleEndian ? offset : sizeof(uint) - offset - sizeof(short)) * 8); // to bit offset
giritrivedi marked this conversation as resolved.
Show resolved Hide resolved
Debug.Assert(bitOffset is 0 or 16);
uint mask = ~((uint)ushort.MaxValue << bitOffset);
uint shiftedValue = (uint)value << bitOffset;
Expand Down Expand Up @@ -308,7 +308,7 @@ public static unsafe ushort CompareExchange(ref ushort location1, ushort value,
nuint offset = Unsafe.OpportunisticMisalignment(ref location1, sizeof(uint));
ref uint alignedRef = ref Unsafe.As<ushort, uint>(ref Unsafe.SubtractByteOffset(ref location1, offset));
int bitOffset =
(int)((BitConverter.IsLittleEndian ? offset : sizeof(uint) - offset - sizeof(byte)) * 8); // to bit offset
(int)((BitConverter.IsLittleEndian ? offset : sizeof(uint) - offset - sizeof(short)) * 8); // to bit offset
giritrivedi marked this conversation as resolved.
Show resolved Hide resolved
Debug.Assert(bitOffset is 0 or 16);
uint mask = ~((uint)ushort.MaxValue << bitOffset);
uint shiftedValue = (uint)value << bitOffset;
Expand Down
Loading