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.

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

Fix bitfield unallocated #34

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/aarch64/simulator-aarch64.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5474,17 +5474,18 @@ void Simulator::VisitBitfield(const Instruction* instr) {

if (instr->GetSixtyFourBits() != instr->GetBitN()) {
VisitUnallocated(instr);
return;
}

if ((instr->GetSixtyFourBits() == 0) && ((S > 31) || (R > 31))) {
VisitUnallocated(instr);
return;
}

int diff = S - R;
uint64_t mask;
if (diff >= 0) {
mask = ~UINT64_C(0) >> (64 - (diff + 1));
mask = (static_cast<unsigned>(diff) < (reg_size - 1)) ? mask : reg_mask;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff=31 reg_size=32 mask=reg_mask=0xFFFFFFFF
diff=63 reg_size=64 mask=reg_mask

} else {
mask = ~UINT64_C(0) >> (64 - (S + 1));
mask = RotateRight(mask, R, reg_size);
Expand Down