Skip to content

NativeAOT/linux/arm: Fix native linux/arm failure #102760

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
merged 1 commit into from
May 29, 2024
Merged

NativeAOT/linux/arm: Fix native linux/arm failure #102760

Show file tree
Hide file tree
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
16 changes: 11 additions & 5 deletions src/coreclr/jit/target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,24 +356,30 @@ static bool operator>(regMaskTP first, regMaskTP second)
return first.getLow() > second.getLow();
}

static regMaskTP operator<<(regMaskTP& first, const int b)
static regMaskTP operator<<(regMaskTP first, const int b)
{
regMaskTP result(first.getLow() << b);
return result;
}

static regMaskTP operator>>(regMaskTP& first, const int b)
static regMaskTP& operator<<=(regMaskTP& first, const int b)
{
first = first << b;
return first;
}
#endif

static regMaskTP operator>>(regMaskTP first, const int b)
{
regMaskTP result(first.getLow() >> b);
return result;
}

static regMaskTP& operator<<=(regMaskTP& first, const int b)
static regMaskTP& operator>>=(regMaskTP& first, const int b)
{
first = first << b;
first = first >> b;
return first;
}
#endif

static regMaskTP operator~(regMaskTP first)
{
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/jit/unwind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,12 @@ void Compiler::unwindPushPopMaskCFI(regMaskTP regMask, bool isFloat)
// because LLVM only know about D0-D31.
// As such pairs Sx,Sx+1 are referenced as D0-D15 registers in DWARF
// For that we process registers in pairs.
regBit >>= isFloat ? 2 : 1;
regNum = isFloat ? REG_PREV(REG_PREV(regNum)) : REG_PREV(regNum);
#else
regBit >>= 1;
regNum = REG_PREV(regNum);
#endif
regBit = genRegMask(regNum);
}
}

Expand Down