Skip to content

Fix assert for ARM shuffle thunk #66642

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

Merged
BruceForstall merged 1 commit into from
Mar 15, 2022
Merged

Fix assert for ARM shuffle thunk #66642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/coreclr/vm/arm/stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,9 @@ VOID StubLinkerCPU::EmitShuffleThunk(ShuffleEntry *pShuffleEntryArray)
DWORD dwSrcIndex = pEntry->srcofs & ShuffleEntry::OFSMASK;
if (dwSrcIndex != (dwLastSrcIndex + 1))
{
_ASSERTE(dwSrcIndex > dwLastSrcIndex);
// If the gap is at the very beginning, then dwLastSrcIndex is still -1, so we need to allow
// for that. Note that the calculation below handles this properly, due to DWORD wrapping.
_ASSERTE((dwLastSrcIndex == (DWORD)-1) || (dwSrcIndex > dwLastSrcIndex));

// add r4, #gap_size
ThumbEmitIncrement(ThumbReg(4), (dwSrcIndex - dwLastSrcIndex - 1) * 4);
Expand All @@ -1528,7 +1530,9 @@ VOID StubLinkerCPU::EmitShuffleThunk(ShuffleEntry *pShuffleEntryArray)
DWORD dwDstIndex = pEntry->dstofs & ShuffleEntry::OFSMASK;
if (dwDstIndex != (dwLastDstIndex + 1))
{
_ASSERTE(dwDstIndex > dwLastDstIndex);
// If the gap is at the very beginning, then dwLastDstIndex is still -1, so we need to allow
// for that. Note that the calculation below handles this properly, due to DWORD wrapping.
_ASSERTE((dwLastDstIndex == (DWORD)-1) || (dwDstIndex > dwLastDstIndex));

// add r5, #gap_size
ThumbEmitIncrement(ThumbReg(5), (dwDstIndex - dwLastDstIndex - 1) * 4);
Expand Down